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

Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0

Browse Source
This commit is contained in:
Florian HENRY 2021-01-12 21:44:48 +01:00
commit 78e3dd3fa8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/user/class/usergroup.class.php
View File

@ -675,6 +675,10 @@ class UserGroup extends CommonObject
{ {
global $user, $conf; global $user, $conf;
if (empty($this->nom) && !empty($this->name)) {
$this->nom = $this->name;
}
$entity = $conf->entity; $entity = $conf->entity;
if (!empty($conf->multicompany->enabled) && $conf->entity == 1) if (!empty($conf->multicompany->enabled) && $conf->entity == 1)
{ {