diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 76d3385dd65a82afb7bf52705c4172fc58f0215b..9c82216d5bee6c3ae727fec1ef709a00b63dac55 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -1,6 +1,6 @@ <?php /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> - * Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2004-2017 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2017 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com> * Copyright (C) 2016 Marcos GarcĂa <marcosgdf@gmail.com> @@ -204,7 +204,7 @@ else } if ($socid > 0) $sql.= " AND u.fk_soc = ".$socid; //if ($search_user != '') $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user); -if ($search_supervisor > 0) $sql.= " AND u.fk_user = ".$db->escape($search_supervisor); +if ($search_supervisor > 0) $sql.= " AND u.fk_user IN (".$db->escape($search_supervisor).")"; if ($search_thirdparty != '') $sql.= natural_search(array('s.nom'), $search_thirdparty); if ($search_login != '') $sql.= natural_search("u.login", $search_login); if ($search_lastname != '') $sql.= natural_search("u.lastname", $search_lastname); @@ -360,9 +360,12 @@ if (! empty($arrayfields['u.entity']['checked'])) { print '<td class="liste_titre"></td>'; } +// Supervisor if (! empty($arrayfields['u.fk_user']['checked'])) { - print '<td class="liste_titre"></td>'; + print '<td class="liste_titre">'; + print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, array(), 0, '', 0, 0, 0, 0, '', 0, '', 'maxwidth200'); + print '</td>'; } if (! empty($arrayfields['u.datelastlogin']['checked'])) {