diff --git a/htdocs/index.php b/htdocs/index.php index c932aad6234020ee6215420cbd40ddd6eaf97001..94445337720713427e68bf4b0857afa769338401 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -238,7 +238,7 @@ if (empty($user->societe_id)) "ExpenseReports"); // Dashboard Link lines $links=array( - DOL_URL_ROOT.'/user/list.php', + DOL_URL_ROOT.'/user/index.php', DOL_URL_ROOT.'/societe/list.php?type=c', DOL_URL_ROOT.'/societe/list.php?type=p', DOL_URL_ROOT.'/societe/list.php?type=f', diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 27c2a7d63cee91b22985d0b9dae5535cd45757a0..955753a73a39abf201f924909762cca04aaf8602 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -2594,6 +2594,7 @@ class User extends CommonObject $sql = "SELECT count(u.rowid) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE u.statut > 0"; + //$sql.= " AND employee != 0"; $sql.= " AND u.entity IN (".getEntity('user', 1).")"; $resql=$this->db->query($sql); diff --git a/htdocs/user/index.php b/htdocs/user/index.php index ce597483d76a20afe8f5dc4fe4fa258b1474e99d..c4e769d6ffd2612e0140000ac4e586dc316d8e13 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -191,7 +191,7 @@ else { $sql.= " WHERE u.entity IN (".getEntity('user',1).")"; } -if ($mode = "employee") $sql.= " AND u.employee = 1"; +if ($mode == "employee") $sql.= " AND u.employee = 1"; 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 = ".$search_supervisor;