Fix for multicompany users.

This commit is contained in:
Laurent Destailleur 2015-03-23 04:51:24 +01:00
parent e269aa83b5
commit 7ad0a32559
2 changed files with 5 additions and 3 deletions

View File

@ -161,7 +161,7 @@ if ($resql)
{ {
if (! empty($conf->multicompany->enabled)) if (! empty($conf->multicompany->enabled))
{ {
if ($obj->admin && ! $obj->entity) if (empty($obj->entity))
{ {
print ' ('.$langs->trans("AllEntities").')'; print ' ('.$langs->trans("AllEntities").')';
} }

View File

@ -126,8 +126,10 @@ if ($result)
print "</tr>\n"; print "</tr>\n";
// SearchBar // SearchBar
$colspan=7;
if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) $colspan++;
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="7">&nbsp;</td>'; print '<td colspan="'.$colspan.'">&nbsp;</td>';
// Status // Status
print '<td>'; print '<td>';