diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 58094b92b56..1c643049a8f 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -69,7 +69,17 @@ print "\n"; $sql = "SELECT p.rowid, p.label, p.ref, fk_product_type, count(*) as c"; $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."product as p"; +if ($conf->categorie->enabled && !$user->rights->categorie->voir) +{ + $sql .= ", ".MAIN_DB_PREFIX."categorie_product as cp"; + $sql .= ", ".MAIN_DB_PREFIX."categorie as c"; +} $sql .= " WHERE p.rowid = pd.fk_product group by (p.rowid)"; +if ($conf->categorie->enabled && !$user->rights->categorie->voir) +{ + $sql .= " AND cp.fk_product = p.rowid"; + $sql .= " AND cp.fk_categorie = c.rowid AND c.visible = 1"; +} $sql .= " ORDER BY $sortfield $sortorder "; $sql .= $db->plimit( $limit ,$offset);