diff --git a/htdocs/product/pre.inc.php b/htdocs/product/pre.inc.php index 4fd00a8b6b5..29aa999cf02 100644 --- a/htdocs/product/pre.inc.php +++ b/htdocs/product/pre.inc.php @@ -22,7 +22,7 @@ */ /*! - \file htdocs/pre.inc.php + \file htdocs/product/pre.inc.php \ingroup product,service \brief Fichier gestionnaire du menu gauche des produits et services \version $Revision$ @@ -36,10 +36,6 @@ function llxHeader($head = "", $urlp = "", $title="") global $user, $conf, $langs; $langs->load("products"); - /* - * - * - */ top_menu($head, $title); $menu = new Menu(); @@ -85,6 +81,12 @@ function llxHeader($head = "", $urlp = "", $title="") $menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers")); } + if ($conf->commande->enabled) + { + $langs->load("orders"); + $menu->add(DOL_URL_ROOT."/commande/", $langs->trans("Orders")); + } + $menu->add(DOL_URL_ROOT."/product/stats/", $langs->trans("Statistics")); if ($conf->propal->enabled) { diff --git a/htdocs/product/stats/pre.inc.php b/htdocs/product/stats/pre.inc.php index 0e7d52951f1..165f4ed3a83 100644 --- a/htdocs/product/stats/pre.inc.php +++ b/htdocs/product/stats/pre.inc.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2001-2004 Rodolphe Quiedeville + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -19,19 +20,24 @@ * $Source$ * */ + +/*! + \file htdocs/product/stats/pre.inc.php + \ingroup product,service + \brief Fichier gestionnaire du menu gauche des statistiques de produits et services + \version $Revision$ +*/ + require("../../main.inc.php"); require(DOL_DOCUMENT_ROOT."/bargraph.class.php"); -$types[0] = "produit"; -$types[1] = "service"; - -function llxHeader($head = "", $urlp = "") +function llxHeader($head = "", $urlp = "", $title="") { global $user, $conf, $langs; $langs->load("products"); - top_menu($head); + top_menu($head, $title); $menu = new Menu(); @@ -39,15 +45,22 @@ function llxHeader($head = "", $urlp = "") { $menu->add(DOL_URL_ROOT."/product/index.php?type=0", $langs->trans("Products")); $menu->add_submenu(DOL_URL_ROOT."/product/liste.php?type=0", $langs->trans("List")); + + if ($user->societe_id == 0 && $user->rights->produit->creer) + { $menu->add_submenu(DOL_URL_ROOT."/product/fiche.php?action=create&type=0", $langs->trans("NewProduct")); } + } if ($conf->service->enabled) { $menu->add(DOL_URL_ROOT."/product/index.php?type=1", $langs->trans("Services")); $menu->add_submenu(DOL_URL_ROOT."/product/liste.php?type=1", $langs->trans("List")); + if ($user->societe_id == 0 && $user->rights->produit->creer) + { $menu->add_submenu(DOL_URL_ROOT."/product/fiche.php?action=create&type=1", $langs->trans("NewService")); } + } if ($conf->boutique->enabled) { @@ -78,9 +91,10 @@ function llxHeader($head = "", $urlp = "") } $menu->add(DOL_URL_ROOT."/product/stats/", $langs->trans("Statistics")); - if ($conf->propal->enabled) { + if ($conf->propal->enabled) + { $menu->add_submenu(DOL_URL_ROOT."/product/popuprop.php", $langs->trans("Popularity")); - } + } if ($conf->stock->enabled) {