From 38f6ec0baed69e7ad0fdee5feaf4c008621b58ff Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 5 Jan 2008 12:04:19 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20droit=20sur=20le=20module=20cat=E9gorie?=
 =?UTF-8?q?=20non=20r=E9cup=E9r=E9s=20et=20gestion=20des=20doublons=20lors?=
 =?UTF-8?q?que=20le=20produit=20apparatient=20=E0=20plusieurs=20cat=E9gori?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/product/liste.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index 1aaadb2b4db..a4c7ff4daf1 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -29,11 +29,12 @@
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/product.class.php');
-require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
+if ($conf->categorie->enabled) require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
 
 $langs->load("products");
 
 $user->getrights('produit');
+if ($conf->categorie->enabled) $user->getrights('categorie');
 
 if (!$user->rights->produit->lire)
   accessforbidden();
@@ -62,7 +63,7 @@ if (isset($_POST["button_removefilter_x"]))
   $snom="";
 }
 
-if (isset($_REQUEST['catid']))
+if ($conf->categorie->enabled && isset($_REQUEST['catid']))
 {
   $catid = $_REQUEST['catid'];
 }
@@ -93,13 +94,11 @@ else
     }
 }
 
-
-
-$sql = 'SELECT p.rowid, p.ref, p.label, p.price, p.price_ttc, p.price_base_type,';
+$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.price, p.price_ttc, p.price_base_type,';
 $sql.= ' p.fk_product_type, '.$db->pdate('p.tms').' as datem,';
 $sql.= ' p.duration, p.envente as statut, p.seuil_stock_alerte';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
-if ($catid || ($conf->categorie->enabled && !$user->rights->categorie->voir))
+if ($conf->categorie->enabled && ($catid || !$user->rights->categorie->voir))
 {
   $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";