From 0a16109206a9bac55f39c98bfbea18f9e0442121 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 21 Feb 2004 03:41:07 +0000
Subject: [PATCH] =?UTF-8?q?Le=20lien=20prospect=20-=20contact=20=E9tait=20?=
 =?UTF-8?q?ko.=20Les=20rubriques=20propales=20sont=20conditionn=E9es=20sur?=
 =?UTF-8?q?=20l'activit=E9=20du=20module.=20Produits=20et=20Services=20par?=
 =?UTF-8?q?tagent=20le=20m=EAme=20menu.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/pre.inc.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/comm/pre.inc.php b/htdocs/comm/pre.inc.php
index 704c6098167..451eb4bcbe9 100644
--- a/htdocs/comm/pre.inc.php
+++ b/htdocs/comm/pre.inc.php
@@ -35,13 +35,15 @@ function llxHeader($head = "", $urlp = "") {
 
   $menu->add(DOL_URL_ROOT."/comm/clients.php", "Clients");
 
-  $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php", "Contacts");
+  $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=c", "Contacts");
 
-  $menu->add(DOL_URL_ROOT."/comm/prospect/", "Prospects");
+  $menu->add(DOL_URL_ROOT."/comm/prospect/prospects.php", "Prospects");
+
+  $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=p", "Contacts");
 
   $menu->add(DOL_URL_ROOT."/comm/action/index.php", "Actions");
 
-  if ($user->rights->propale->lire)
+  if ($conf->propal->enabled && $user->rights->propale->lire)
     {
       $menu->add(DOL_URL_ROOT."/comm/propal.php", "Prop. commerciales");
       $menu->add_submenu("propal.php?viewstatut=0", "Brouillons");
@@ -56,20 +58,18 @@ function llxHeader($head = "", $urlp = "") {
       $menu->add(DOL_URL_ROOT."/commande/index.php", "Commandes");
     }
 
-
   if ($conf->fichinter->enabled ) 
     {
       $menu->add(DOL_URL_ROOT."/fichinter/index.php", "Fiches d'intervention");
     }
 
-  if ($conf->produit->enabled )
+  if ($conf->produit->enabled || $conf->service->enabled)
     {
-      $menu->add(DOL_URL_ROOT."/product/index.php", "Produits");
-    }
-
-  if ($conf->service->enabled ) 
-    {
-      $menu->add(DOL_URL_ROOT."/product/index.php", "Services");	# Pour l'instant product et service partagent le meme rep.
+	  $chaine="";
+	  if ($conf->produit->enabled) { $chaine.="Produits"; }
+	  if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
+	  if ($conf->service->enabled) { $chaine.="Services"; }
+      $menu->add(DOL_URL_ROOT."/product/index.php", "Produits/Services");
     }
 
   if ($conf->projet->enabled )