From 9cf928f4033f85a066ce767e56d0c77dfbba8a66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 11 Nov 2007 22:03:24 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Le=20gestion=20des=20categories=20fourni?=
 =?UTF-8?q?sseurs=20etait=20en=20double=20dans=202=20tables=20diff=E9rente?=
 =?UTF-8?q?s.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/fourn/pre.inc.php   | 8 +++++++-
 htdocs/pre.inc.php         | 8 +++++++-
 htdocs/product/pre.inc.php | 8 ++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/pre.inc.php b/htdocs/fourn/pre.inc.php
index 781e69dbd00..12684664b8b 100644
--- a/htdocs/fourn/pre.inc.php
+++ b/htdocs/fourn/pre.inc.php
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 /**
@@ -95,6 +94,13 @@ function llxHeader($head = "", $title="", $addons='') {
     }
   }
   
+  if ($conf->categorie->enabled)
+	{
+		$langs->load("categories");
+		// Catégories fournisseurs
+		$menu->add(DOL_URL_ROOT."/categories/index.php?leftmenu=cat&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 0);
+	}
+  
   left_menu($menu->liste);
 }
 ?>
diff --git a/htdocs/pre.inc.php b/htdocs/pre.inc.php
index 33415082590..ae2147243a1 100644
--- a/htdocs/pre.inc.php
+++ b/htdocs/pre.inc.php
@@ -55,7 +55,13 @@ function llxHeader($head = "")
         }
       $menu->add_submenu(DOL_URL_ROOT."/contact/index.php",$langs->trans("Contacts"));
     }
-  
+
+	if ($conf->categorie->enabled)
+	{
+		$langs->load("categories");
+		$menu->add(DOL_URL_ROOT."/categories/index.php?type=0", $langs->trans("Categories"));
+	}
+	
   if ($conf->commercial->enabled && isset($user->rights->commercial->lire) && $user->rights->commercial->lire)
     {
       $langs->load("commercial");
diff --git a/htdocs/product/pre.inc.php b/htdocs/product/pre.inc.php
index fa712afdb39..fc77a9d880d 100644
--- a/htdocs/product/pre.inc.php
+++ b/htdocs/product/pre.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2007 Auguria SARL <info@auguria.org>
+ * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2007      Auguria SARL <info@auguria.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 /**
@@ -117,7 +116,8 @@ function llxHeader($head = "", $urlp = "", $title="")
 
 	if ($conf->categorie->enabled)
 	{
-		$menu->add(DOL_URL_ROOT."/categories/index.php?type=0", $langs->trans("Categories"));
+		$langs->load("categories");
+		$menu->add(DOL_URL_ROOT."/categories/index.php?type=0", $langs->trans("ProductsCategoriesShort"));
 	}
 
 	left_menu($menu->liste);