diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index c8e6c4d156b..4647a9de5ae 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005 Laurent Destailleur + * Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2010 Juanjo Menent * @@ -75,6 +75,8 @@ if ($_GET["action"] == "deletenotif") * View */ +$html=new Form($db); + llxHeader('',$langs->trans("WithdrawalsSetup")); $linkback=''.$langs->trans("BackToModuleList").''; @@ -117,39 +119,19 @@ print ''.$conf->global->PRELEVEMENT_NUMERO_COMPTE.''; print ''.$langs->trans("ResponsibleUser").''; print ''; print ''; -print ''; +print $html->select_users($conf->global->PRELEVEMENT_USER,'value6',1); +print ''; print ''; - -if (defined("PRELEVEMENT_USER") && $conf->global->PRELEVEMENT_USER > 0) +if ($conf->global->PRELEVEMENT_USER > 0) { $cuser = new User($db); - $cuser->fetch(PRELEVEMENT_USER); + $cuser->fetch($conf->global->PRELEVEMENT_USER); print $cuser->fullname; } else { - print $conf->global->PRELEVEMENT_USER; + print ' '; } - print ''; print ''; print ''; @@ -224,7 +206,7 @@ if ($resql) { $obj = $db->fetch_object($resql); $var=!$var; - + print ""; print ''.$obj->firstname." ".$obj->name.''; print ''.$obj->action.''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 81fe1d70b59..1dfc6300460 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -800,8 +800,8 @@ class Form if (is_array($include)) $includeUsers = implode("','",$include); // On recherche les utilisateurs - $sql = "SELECT u.rowid, u.name, u.firstname, u.login FROM"; - $sql.= " ".MAIN_DB_PREFIX ."user as u"; + $sql = "SELECT u.rowid, u.name, u.firstname, u.login, u.admin"; + $sql.= " FROM ".MAIN_DB_PREFIX ."user as u"; $sql.= " WHERE u.entity IN (0,".$conf->entity.")"; if (is_array($exclude) && $excludeUsers) $sql.= " AND u.rowid NOT IN ('".$excludeUsers."')"; if (is_array($include) && $includeUsers) $sql.= " AND u.rowid IN ('".$includeUsers."')"; @@ -836,6 +836,7 @@ class Form print '>'; } print $obj->name.($obj->name && $obj->firstname?' ':'').$obj->firstname; + //if ($obj->admin) print ' *'; if ($conf->global->MAIN_SHOW_LOGIN) print ' ('.$obj->login.')'; print ''; $i++;