diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php index a46a3242be3..e6749ebb86b 100644 --- a/htdocs/commande/commande.class.php +++ b/htdocs/commande/commande.class.php @@ -2291,9 +2291,6 @@ class Commande extends CommonObject { $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = co.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid"; - } - if ($conf->categorie->enabled && !$user->rights->categorie->voir) - { $sql.= " WHERE IFNULL(c.visible,1)=1"; } $resql=$this->db->query($sql); diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index 74d65621e71..ac6b17315d6 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -2707,9 +2707,6 @@ class Facture extends CommonObject { $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"; - } - if ($conf->categorie->enabled && !$user->rights->categorie->voir) - { $sql.= " WHERE IFNULL(c.visible,1)=1"; } $resql=$this->db->query($sql); diff --git a/htdocs/fourn/fournisseur.class.php b/htdocs/fourn/fournisseur.class.php index 5d4830a9a66..b9be4aae232 100644 --- a/htdocs/fourn/fournisseur.class.php +++ b/htdocs/fourn/fournisseur.class.php @@ -189,13 +189,12 @@ class Fournisseur extends Societe $this->nb=array(); - $sql = "SELECT count(s.rowid) as nb, s.fournisseur"; + $sql = "SELECT count(s.rowid) as nb"; if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.fournisseur = 1"; if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; - $sql.= " GROUP BY s.fournisseur"; $resql=$this->db->query($sql); if ($resql) { diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index e4fb9432bd6..1cff62e997a 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -2069,9 +2069,6 @@ class Propal extends CommonObject { $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"; - } - if ($conf->categorie->enabled && !$user->rights->categorie->voir) - { $sql.= " WHERE IFNULL(c.visible,1)=1"; } $resql=$this->db->query($sql);