diff --git a/htdocs/user/index.php b/htdocs/user/index.php index ac1ebc9e1c57ef129b3939b615d34cc87d4692a1..5d0b0ac77e4da282c16242f3528dbc222d019b4e 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -114,6 +114,10 @@ if ($result) print_liste_field_titre($langs->trans("LastName"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_societe",$param,"","",$sortfield,$sortorder); + if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) + { + print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder); + } print_liste_field_titre($langs->trans("DateCreation"),$_SERVER['PHP_SELF'],"u.datec",$param,"",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u2.login",$param,"",'align="center"',$sortfield,$sortorder); @@ -165,9 +169,20 @@ if ($result) $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1); } + else if ($obj->ldap_sid) + { + print $langs->trans("DomainUser"); + } + else + { + print $langs->trans("InternalUser"); + } + print '</td>'; + // Multicompany enabled - else if (! empty($conf->multicompany->enabled)) + if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) { + print '<td>'; if (! $obj->entity) { print $langs->trans("AllEntities"); @@ -181,16 +196,8 @@ if ($result) print $mc->label; } } + print '</td>'; } - else if ($obj->ldap_sid) - { - print $langs->trans("DomainUser"); - } - else - { - print $langs->trans("InternalUser"); - } - print '</td>'; // Date creation print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datec),"dayhour").'</td>';