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

Fix: for multicompany transverse mode

Browse Source
This commit is contained in:
Regis Houssin 2012-07-10 13:43:38 +02:00
parent 02f30aeee2
commit 1af4834f10
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/user/fiche.php
View File

@ -1402,15 +1402,19 @@ else
{ {
$mc->getInfo($group_entity); $mc->getInfo($group_entity);
print ($nb > 0 ? ', ' : '').$mc->label; print ($nb > 0 ? ', ' : '').$mc->label;
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$fuser->id.'&amp;action=removegroup&amp;group='.$group->id.'&amp;entity='.$group_entity.'">';
print img_delete($langs->trans("RemoveFromGroup"));
print '</a>';
$nb++; $nb++;
} }
} }
} }
print '<td align="right">'; print '<td align="right">';
if ($caneditgroup) if ($caneditgroup && empty($conf->multicompany->transverse_mode))
{ {
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$fuser->id.'&amp;action=removegroup&amp;group='.$group->id.'&amp;entity='.$group->usergroup_entity.'">'; print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$fuser->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
print img_delete($langs->trans("RemoveFromGroup")); print img_delete($langs->trans("RemoveFromGroup"));
print '</a>';
} }
else else
{ {

10
htdocs/user/group/fiche.php
View File

@ -428,7 +428,7 @@ else
print '</td>'; print '</td>';
print '<td>'.$useringroup->lastname.'</td>'; print '<td>'.$useringroup->lastname.'</td>';
print '<td>'.$useringroup->firstname.'</td>'; print '<td>'.$useringroup->firstname.'</td>';
if (! empty($conf->multicompany->enabled) && $conf->entity == 1) if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
{ {
print '<td class="valeur">'; print '<td class="valeur">';
if (! empty($useringroup->usergroup_entity)) if (! empty($useringroup->usergroup_entity))
@ -438,6 +438,9 @@ else
{ {
$mc->getInfo($group_entity); $mc->getInfo($group_entity);
print ($nb > 0 ? ', ' : '').$mc->label; print ($nb > 0 ? ', ' : '').$mc->label;
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'&amp;entity='.$group_entity.'">';
print img_delete($langs->trans("RemoveFromGroup"));
print '</a>';
$nb++; $nb++;
} }
} }
@ -445,10 +448,11 @@ else
} }
print '<td align="center">'.$useringroup->getLibStatut(3).'</td>'; print '<td align="center">'.$useringroup->getLibStatut(3).'</td>';
print '<td align="right">'; print '<td align="right">';
if ($user->admin) if (! empty($user->admin) && empty($conf->multicompany->enabled))
{ {
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'&amp;entity='.$useringroup->usergroup_entity.'">'; print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'">';
print img_delete($langs->trans("RemoveFromGroup")); print img_delete($langs->trans("RemoveFromGroup"));
print '</a>';
} }
else else
{ {