';
-// Name
-print '| '.$langs->trans("Name").' | ';
-print ''.$object->name;
-if (!$object->entity)
+// Name (already in dol_banner, we keep it to have the GlobalGroup picto, but we should move it in dol_banner)
+if (! empty($conf->mutlicompany->enabled))
{
- print img_picto($langs->trans("GlobalGroup"),'redstar');
+ print ' |
| '.$langs->trans("Name").' | ';
+ print ''.$object->name;
+ if (!$object->entity)
+ {
+ print img_picto($langs->trans("GlobalGroup"),'redstar');
+ }
+ print " |
\n";
}
-print "\n";
// Note
-print '| '.$langs->trans("Note").' | ';
-print ''.nl2br($object->note).' | ';
+print '
| '.$langs->trans("Description").' | ';
+print ''.dol_htmlentitiesbr($object->note).' | ';
print "
\n";
-$langs->load("admin");
-
// LDAP DN
print '| LDAP '.$langs->trans("LDAPGroupDn").' | '.$conf->global->LDAP_GROUP_DN." |
\n";
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 94a9c9c1883..46477879b14 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -205,14 +205,17 @@ if ($object->id)
print '';
- // Nom
- print '| '.$langs->trans("Name").' | ';
- print ''.$object->name.'';
- if (! $object->entity)
+ // Name (already in dol_banner, we keep it to have the GlobalGroup picto, but we should move it in dol_banner)
+ if (! empty($conf->mutlicompany->enabled))
{
- print img_picto($langs->trans("GlobalGroup"),'redstar');
+ print ' |
| '.$langs->trans("Name").' | ';
+ print ''.$object->name.'';
+ if (! $object->entity)
+ {
+ print img_picto($langs->trans("GlobalGroup"),'redstar');
+ }
+ print " |
\n";
}
- print "\n";
// Note
print '| '.$langs->trans("Description").' | ';