diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 81306b47033..fc1dbe9b5ac 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -53,6 +53,7 @@ $search_ref=GETPOST('sf_ref')?GETPOST('sf_ref','alpha'):GETPOST('search_ref','al $search_refcustomer=GETPOST('search_refcustomer','alpha'); $search_societe=GETPOST('search_societe','alpha'); $search_montant_ht=GETPOST('search_montant_ht','alpha'); +$search_author=GETPOST('search_author','alpha'); $sall=GETPOST("sall"); $mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg")); @@ -97,6 +98,7 @@ if (GETPOST("button_removefilter_x")) $search_refcustomer=''; $search_societe=''; $search_montant_ht=''; + $search_author=''; $year=''; $month=''; } @@ -165,6 +167,10 @@ if ($search_societe) { $sql.= " AND s.nom LIKE '%".$db->escape(trim($search_societe))."%'"; } +if ($search_author) +{ + $sql.= " AND u.login LIKE '%".$db->escape(trim($search_author))."%'"; +} if ($search_montant_ht) { $sql.= " AND p.total_ht='".$db->escape(price2num(trim($search_montant_ht)))."'"; @@ -221,6 +227,7 @@ if ($result) if ($search_user > 0) $param.='&search_user='.$search_user; if ($search_sale > 0) $param.='&search_sale='.$search_sale; if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht; + if ($search_author) $param.='&search_author='.$search_author; print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num); // Lignes des champs de filtre @@ -248,7 +255,7 @@ if ($result) if (! empty($moreforfilter)) { print ''; - print ''; + print ''; print $moreforfilter; print ''; } @@ -282,10 +289,13 @@ if ($result) $formother->select_year($syear,'year',1, 20, 5); print ''; print ' '; - print ''; + print ''; print ''; print ''; - print ' '; + + print ''; + print ''; + print ''; print ''; $formpropal->select_propal_statut($viewstatut,1); print '';