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

Fix: No error once multicompany module has been removed.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-05-30 13:08:01 +02:00
parent efd9337c9f
commit 4a96fd0d77
2 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/user/fiche.php
View File

@ -1300,19 +1300,23 @@ else
} }
// Multicompany // Multicompany
if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity) // TODO This should be done with hook formObjectOption
if (is_object($mc))
{ {
print '<tr><td valign="top">'.$langs->trans("Entity").'</td><td width="75%" class="valeur">'; if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
if ($object->admin && ! $object->entity) {
{ print '<tr><td valign="top">'.$langs->trans("Entity").'</td><td width="75%" class="valeur">';
print $langs->trans("AllEntities"); if ($object->admin && ! $object->entity)
} {
else print $langs->trans("AllEntities");
{ }
$mc->getInfo($object->entity); else
print $mc->label; {
} $mc->getInfo($object->entity);
print "</td></tr>\n"; print $mc->label;
}
print "</td></tr>\n";
}
} }
// Other attributes // Other attributes

36
htdocs/user/home.php
View File

@ -148,26 +148,30 @@ if ($resql)
$companystatic->canvas=$obj->canvas; $companystatic->canvas=$obj->canvas;
print $companystatic->getNomUrl(1); print $companystatic->getNomUrl(1);
} }
else if (! empty($conf->multicompany->enabled))
{
if ($obj->admin && ! $obj->entity)
{
print $langs->trans("AllEntities");
}
else
{
$mc->getInfo($obj->entity);
print $mc->label;
}
}
else if ($obj->ldap_sid)
{
print $langs->trans("DomainUser");
}
else else
{ {
print $langs->trans("InternalUser"); print $langs->trans("InternalUser");
} }
if ($obj->ldap_sid)
{
print ' ('.$langs->trans("DomainUser").')';
}
// TODO This should be done with a hook
if (is_object($mc))
{
if (! empty($conf->multicompany->enabled))
{
if ($obj->admin && ! $obj->entity)
{
print ' ('.$langs->trans("AllEntities").')';
}
else
{
$mc->getInfo($obj->entity);
print ' ('.$mc->label.')';
}
}
}
print '</td>'; print '</td>';
print '<td align="right">'.dol_print_date($db->jdate($obj->datec),'dayhour').'</td>'; print '<td align="right">'.dol_print_date($db->jdate($obj->datec),'dayhour').'</td>';
print '<td align="right">'; print '<td align="right">';