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

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Browse Source
This commit is contained in:
Laurent Destailleur 2019-06-13 12:12:37 +02:00
commit 3e6b7208cc
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/class/html.formother.class.php
View File

@ -404,7 +404,6 @@ class FormOther
if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) { if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
$sql_usr.= " WHERE u.entity IS NOT NULL"; // Show all users $sql_usr.= " WHERE u.entity IS NOT NULL"; // Show all users
} else { } else {
$sql_usr.= ",
$sql_usr.= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('user')."))"; $sql_usr.= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('user')."))";
$sql_usr.= " OR u.entity = 0"; // Show always superadmin $sql_usr.= " OR u.entity = 0"; // Show always superadmin
} }