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

Fix: avoid error if $mc object not exists

Browse Source 
TODO check if user not linked with the current entity before change
entity (thirdparty, invoice, etc.) !!
This commit is contained in:
Regis Houssin 2015-07-13 09:54:26 +02:00
parent 08c38feb98
commit cf92f704d8
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/user/card.php
View File

@ -2195,7 +2195,8 @@ else
} }
// Multicompany // Multicompany
if (! empty($conf->multicompany->enabled)) // TODO check if user not linked with the current entity before change entity (thirdparty, invoice, etc.) !!
if (! empty($conf->multicompany->enabled) && is_object($mc))
{ {
if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity) if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
{ {

29
htdocs/user/home.php
View File

@ -180,21 +180,18 @@ if ($resql)
$entity=$obj->entity; $entity=$obj->entity;
$entitystring=''; $entitystring='';
// TODO Set of entitystring should be done with a hook // TODO Set of entitystring should be done with a hook
if (is_object($mc)) if (! empty($conf->multicompany->enabled) && is_object($mc))
{ {
if (! empty($conf->multicompany->enabled)) if (empty($entity))
{ {
if (empty($entity)) $entitystring=$langs->trans("AllEntities");
{ }
$entitystring=$langs->trans("AllEntities"); else
} {
else $mc->getInfo($entity);
{ $entitystring=$mc->label;
$mc->getInfo($entity); }
$entitystring=$mc->label; }
}
}
}
print ($entitystring?' ('.$entitystring.')':''); print ($entitystring?' ('.$entitystring.')':'');
print '</td>'; print '</td>';
@ -259,7 +256,7 @@ if ($canreadperms)
print img_picto($langs->trans("GlobalGroup"),'redstar'); print img_picto($langs->trans("GlobalGroup"),'redstar');
} }
print "</td>"; print "</td>";
if (! empty($conf->multicompany->enabled)) if (! empty($conf->multicompany->enabled) && is_object($mc))
{ {
$mc->getInfo($obj->entity); $mc->getInfo($obj->entity);
print '<td>'; print '<td>';