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

Fix: comaptibility with multicompany and transverse mode

Browse Source
This commit is contained in:
Regis Houssin 2012-09-04 11:09:17 +02:00
parent e20b0b2e7b
commit 8de657a215
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/core/class/html.form.class.php
View File

@ -964,7 +964,7 @@ class Form
// On recherche les utilisateurs // On recherche les utilisateurs
$sql = "SELECT u.rowid, u.name as lastname, u.firstname, u.login, u.admin, u.entity"; $sql = "SELECT u.rowid, u.name as lastname, u.firstname, u.login, u.admin, u.entity";
if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity) if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
{ {
$sql.= ", e.label"; $sql.= ", e.label";
} }
@ -977,7 +977,16 @@ class Form
} }
else else
{ {
$sql.= " WHERE u.entity IN (0,".$conf->entity.")"; if (! empty($conf->multicompany->transverse_mode))
{
$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
$sql.= " WHERE ug.fk_user = u.rowid";
$sql.= " AND ug.entity = ".$conf->entity;
}
else
{
$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
}
} }
if (! empty($user->societe_id)) $sql.= " AND u.fk_societe = ".$user->societe_id; if (! empty($user->societe_id)) $sql.= " AND u.fk_societe = ".$user->societe_id;
if (is_array($exclude) && $excludeUsers) $sql.= " AND u.rowid NOT IN ('".$excludeUsers."')"; if (is_array($exclude) && $excludeUsers) $sql.= " AND u.rowid NOT IN ('".$excludeUsers."')";