diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 71de3ffaea1..a06173496b9 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -22,10 +22,10 @@ */ /** - \file htdocs/fourn/index.php - \ingroup fournisseur - \brief Page accueil de la zone fournisseurs - \version $Revision$ + \file htdocs/fourn/index.php + \ingroup fournisseur + \brief Page accueil de la zone fournisseurs + \version $Revision$ */ require("./pre.inc.php"); @@ -33,14 +33,6 @@ require("./pre.inc.php"); if (!$user->rights->societe->lire) accessforbidden(); - -$page = isset($_GET["page"])?$_GET["page"]:''; -$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:''; -$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:''; -$socname = isset($_GET["socname"])?$_GET["socname"]:''; -$search_nom = isset($_GET["search_nom"])?$_GET["search_nom"]:''; -$search_ville = isset($_GET["search_ville"])?$_GET["search_ville"]:''; - $langs->load("suppliers"); $langs->load("orders"); $langs->load("companies"); @@ -55,18 +47,53 @@ if ($user->societe_id > 0) $socid = $user->societe_id; } -if ($page == -1) { $page = 0 ; } - -$offset = $conf->liste_limit * $page ; -if (! $sortorder) $sortorder="ASC"; -if (! $sortfield) $sortfield="nom"; - +print ''; +print '\n"; +print '\n"; +print "
'; /* - * Mode Liste + * Liste des categories * */ +$sql = "SELECT rowid, label"; +$sql.= " FROM ".MAIN_DB_PREFIX."fournisseur_categorie"; +$sql .= " ORDER BY label ASC"; +$resql = $db->query($sql); +if ($resql) +{ + $num = $db->num_rows($resql); + $i = 0; + + print ''; + print '\n"; + + $var=True; + + while ($obj = $db->fetch_object($resql)) + { + $var=!$var; + print "\n"; + print '\n"; + print "\n"; + } + print "
'; + print $langs->trans("Category"); + print "
'.stripslashes($obj->label).''; + print "
\n"; + + $db->free($resql); +} +else +{ + dolibarr_print_error($db); +} +print "
'; + +/* + * Liste des 10 derniers saisis + * + */ $sql = "SELECT s.idp, s.nom, s.ville,".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, st.libelle as stcomm, s.prefix_comm"; $sql.= " , code_fournisseur, code_compta_fournisseur"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; @@ -75,20 +102,8 @@ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PR $sql.= " WHERE s.fk_stcomm = st.id AND s.fournisseur=1"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql .= " AND s.idp=".$socid; -if ($socname) { - $sql .= " AND lower(s.nom) like '%".strtolower($socname)."%'"; - $sortfield = "lower(s.nom)"; - $sortorder = "ASC"; -} -if ($search_nom) -{ - $sql .= " AND s.nom LIKE '%".$search_nom."%'"; -} -if ($search_ville) -{ - $sql .= " AND s.ville LIKE '%".$search_ville."%'"; -} -$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset); + +$sql .= " ORDER BY s.datec DESC LIMIT 10; "; $resql = $db->query($sql); if ($resql) @@ -96,57 +111,28 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print_barre_liste($langs->trans("ListOfSuppliers"), $page, "index.php", "", $sortfield, $sortorder, '', $num); - - print '
'; print ''; print ''; - print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","",'valign="middle"',$sortfield); - print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.ville","","",'valign="middle"',$sortfield); - print_liste_field_titre($langs->trans("SupplierCode"),$_SERVER["PHP_SELF"],"s.code_client","","",'align="left"',$sortfield); - print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta","","",'align="left"',$sortfield); - print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"datec","","",'align="center"',$sortfield); - print ''; + print "\n"; + print "\n"; + print "\n"; print "\n"; - print ''; - - print ''; - print ''; - - print ''; - - print ''; - - - print ''; - - print ''; - $var=True; - while ($i < min($num,$conf->liste_limit)) + while ($obj = $db->fetch_object($resql) ) { - $obj = $db->fetch_object($resql); $var=!$var; print ""; print '\n"; - print "\n"; print ''; - print ''; print ''; - print "\n"; print "\n"; - $i++; } print "
 ".$langs->trans("Company")."".$langs->trans("SupplierCode")."".$langs->trans("DateCreation")."
'; - print ''; - print ''; - print ''; - print '
'.img_object($langs->trans("ShowSupplier"),"company").''; print " idp\">$obj->nom".$obj->ville."'.$obj->code_fournisseur.' '.$obj->code_compta_fournisseur.' '.dolibarr_print_date($obj->datec).' 
\n"; - print "
\n"; + $db->free($resql); } else @@ -154,6 +140,9 @@ else dolibarr_print_error($db); } +print "
\n"; + $db->close(); llxFooter('$Date$ - $Revision$');