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

This commit is contained in:
Laurent Destailleur 2017-05-06 13:07:02 +02:00
commit a9bb2eb24c

View File

@ -1440,9 +1440,9 @@ class Form
{ {
if (! empty($conf->multicompany->transverse_mode)) if (! empty($conf->multicompany->transverse_mode))
{ {
$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
$sql.= " WHERE ug.fk_user = u.rowid"; $sql.= " ON ug.fk_user = u.rowid";
$sql.= " AND ug.entity = ".$conf->entity; $sql.= " WHERE ug.entity = ".$conf->entity;
} }
else else
{ {