From 60dc11872e6af09dd5e185993471db0a3aba5ad5 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 10 Jul 2012 13:35:22 +0200
Subject: [PATCH] Fix: for multicompany transverse mode

---
 htdocs/user/fiche.php       | 24 ++++++++++++++----------
 htdocs/user/group/fiche.php |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index c18f584a34d..8d5418636bc 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1313,15 +1313,15 @@ else
                 $usergroup=new UserGroup($db);
                 $groupslist = $usergroup->listGroupsForUser($fuser->id);
 
-                if (! empty($groupslist))
+                if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
                 {
-                    if( ! ($conf->multicompany->enabled && $conf->multicompany->transverse_mode))
-                    {
-                        foreach($groupslist as $groupforuser)
-                        {
-                            $exclude[]=$groupforuser->id;
-                        }
-                    }
+                	if (! empty($groupslist))
+                	{
+                		foreach($groupslist as $groupforuser)
+                		{
+                			$exclude[]=$groupforuser->id;
+                		}
+                	}
                 }
 
                 if ($caneditgroup)
@@ -1400,15 +1400,19 @@ else
                         		{
                         			$mc->getInfo($group_entity);
                         			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++;
                         		}
                         	}
                         }
                         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 '</a>';
                         }
                         else
                         {
diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php
index bcc8339425d..f347d52b83a 100644
--- a/htdocs/user/group/fiche.php
+++ b/htdocs/user/group/fiche.php
@@ -426,7 +426,7 @@ else
             		print '</td>';
             		print '<td>'.$useringroup->lastname.'</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">';
             			if (! empty($useringroup->usergroup_entity))