diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php index d88b77e8e58..2ae42db699f 100644 --- a/htdocs/fourn/commande/liste.php +++ b/htdocs/fourn/commande/liste.php @@ -31,6 +31,8 @@ $langs->load("orders"); $sref=isset($_GET['search_ref'])?$_GET['search_ref']:$_POST['search_ref']; $snom=isset($_GET['search_nom'])?$_GET['search_nom']:$_POST['search_nom']; +$suser=isset($_GET['search_user'])?$_GET['search_user']:$_POST['search_user']; +$sttc=isset($_GET['search_ttc'])?$_GET['search_ttc']:$_POST['search_ttc']; $sall=isset($_GET['search_all'])?$_GET['search_all']:$_POST['search_all']; $page = ( is_numeric($_GET["page"]) ? $_GET["page"] : 0 ); @@ -70,21 +72,31 @@ $offset = $conf->liste_limit * $page ; * Mode Liste */ -$sql = "SELECT s.rowid as socid, s.nom, ".$db->pdate("cf.date_commande")." as dc,"; -$sql.= " cf.rowid,cf.ref, cf.fk_statut"; +$sql = "SELECT s.rowid as socid, s.nom, ".$db->pdate("cf.date_commande")." as dc"; +$sql.= ", cf.rowid,cf.ref, cf.fk_statut, cf.total_ttc, cf.fk_user_author"; +$sql.= ", u.login"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON cf.fk_user_author = u.rowid"; $sql.= " WHERE cf.fk_soc = s.rowid "; $sql.= " AND s.entity = ".$conf->entity; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($sref) { - $sql.= " AND cf.ref like '%".addslashes($sref)."%'"; + $sql.= " AND cf.ref LIKE '%".addslashes($sref)."%'"; } if ($snom) { - $sql.= " AND s.nom like '%".addslashes($snom)."%'"; + $sql.= " AND s.nom LIKE '%".addslashes($snom)."%'"; +} +if ($suser) +{ + $sql.= " AND u.login LIKE '%".addslashes($suser)."%'"; +} +if ($sttc) +{ + $sql .= " AND ROUND(total_ttc) = ROUND(".price2num($sttc).")"; } if ($sall) { @@ -113,6 +125,8 @@ if ($resql) print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cf.ref","","",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","",'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Author"),$_SERVER["PHP_SELF"],"u.login","","",'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"total_ttc","","",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("OrderDate"),$_SERVER["PHP_SELF"],"dc","","",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cf.fk_statut","","",'align="right"',$sortfield,$sortorder); print "\n"; @@ -121,12 +135,16 @@ if ($resql) print ''; print ''; + print ''; + print ''; print ''; print ''; print ''; print ''; $var=true; + + $userstatic = new User($db); while ($i < min($num,$conf->liste_limit)) { @@ -138,9 +156,20 @@ if ($resql) // Ref print ''.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.''."\n"; - // Soci�t� + // Company print ''.img_object($langs->trans("ShowCompany"),"company").' '; print $obj->nom.''."\n"; + + // Author + $userstatic->id=$obj->fk_user_author; + $userstatic->login=$obj->login; + print ""; + if ($userstatic->id) print $userstatic->getLoginUrl(1); + else print " "; + print ""; + + // Amount + print ''.price($obj->total_ttc).""; // Date print "";