lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX wrong users count in multicompany transverse mode

Browse Source
This commit is contained in:
Regis Houssin 2021-09-08 10:25:27 +02:00
parent 52419f28c5
commit 8c95ada9fd
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/user/class/user.class.php
View File

@ -3298,14 +3298,21 @@ class User extends CommonObject
public function load_state_board() public function load_state_board()
{ {
// phpcs:enable // phpcs:enable
global $conf;
$this->nb = array(); $this->nb = array();
$sql = "SELECT count(u.rowid) as nb"; $sql = "SELECT DISTINCT count(u.rowid) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."user as u"; $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE u.statut > 0"; if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
$sql .= " WHERE ug.entity IN (".getEntity('usergroup').")";
$sql .= " AND ug.fk_user = u.rowid ";
} else {
$sql .= " WHERE u.entity IN (".getEntity('user').")";
}
$sql .= " AND u.statut > 0";
//$sql.= " AND employee != 0"; //$sql.= " AND employee != 0";
$sql .= " AND u.entity IN (".getEntity('user').")";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {