diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php
index 86460a7b7a5..4c2adddbe7b 100644
--- a/htdocs/commande/commande.class.php
+++ b/htdocs/commande/commande.class.php
@@ -2286,7 +2286,6 @@ class Commande extends CommonObject
 		$this->nb=array();
 
 		$sql = "SELECT count(co.rowid) as nb";
-		if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande as co";
 		if (!$user->rights->commercial->client->voir && !$user->societe_id)
 		{
diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php
index ac6b17315d6..94b36a11ce8 100644
--- a/htdocs/facture.class.php
+++ b/htdocs/facture.class.php
@@ -2703,11 +2703,11 @@ class Facture extends CommonObject
 
 		$sql = "SELECT count(f.rowid) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-		if ($conf->categorie->enabled && !$user->rights->categorie->voir)
+		if (!$user->rights->commercial->client->voir && !$user->societe_id)
 		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = f.rowid";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
-			$sql.= " WHERE IFNULL(c.visible,1)=1";
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql.= " WHERE sc.fk_user = " .$user->id;
 		}
 		$resql=$this->db->query($sql);
 		if ($resql)
diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php
index 1cff62e997a..ab8ed7cade4 100644
--- a/htdocs/propal.class.php
+++ b/htdocs/propal.class.php
@@ -2065,11 +2065,11 @@ class Propal extends CommonObject
 
 		$sql = "SELECT count(p.rowid) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
-		if ($conf->categorie->enabled && !$user->rights->categorie->voir)
+		if (!$user->rights->commercial->client->voir && !$user->societe_id)
 		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
-			$sql.= " WHERE IFNULL(c.visible,1)=1";
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql.= " WHERE sc.fk_user = " .$user->id;
 		}
 		$resql=$this->db->query($sql);
 		if ($resql)