From 7ad0a325599776231ca235afc65493ffba6e7e33 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 23 Mar 2015 04:51:24 +0100
Subject: [PATCH] Fix for multicompany users.

---
 htdocs/user/home.php  | 2 +-
 htdocs/user/index.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index c9b3693f1ac..ffc71ae8798 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -161,7 +161,7 @@ if ($resql)
         {
 			if (! empty($conf->multicompany->enabled))
 	        {
-	        	if ($obj->admin && ! $obj->entity)
+	        	if (empty($obj->entity))
 	        	{
 	        		print ' ('.$langs->trans("AllEntities").')';
 	        	}
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 5d0b0ac77e4..9e3e40b2e59 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -125,9 +125,11 @@ if ($result)
     print '<td width="1%">&nbsp;</td>';
     print "</tr>\n";
 
-    //SearchBar
+    // SearchBar
+    $colspan=7;
+    if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) $colspan++;
     print '<tr class="liste_titre">';
-    print '<td colspan="7">&nbsp;</td>';
+    print '<td colspan="'.$colspan.'">&nbsp;</td>';
 
 	// Status
     print '<td>';