From 4160b6f43bcfa82312fabaaa187f93666495d549 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 31 Mar 2006 13:33:53 +0000
Subject: [PATCH] =?UTF-8?q?d=E9but=20ajout=20possibilit=E9=20de=20d=E9term?=
 =?UTF-8?q?iner=20si=20le=20contenu=20d'une=20cat=E9gorie=20sera=20visible?=
 =?UTF-8?q?=20ou=20=20non=20dans=20la=20liste=20des=20produits/services,?=
 =?UTF-8?q?=20ceci=20afin=20de=20pouvoir=20cacher=20les=20sous-produits=20?=
 =?UTF-8?q?=20par=20exemple.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/product/popuprop.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

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 "</tr>\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);