From 4343b56b2b8c22588eb807c8bf50084a461018ba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2005 18:31:30 +0000 Subject: [PATCH] =?UTF-8?q?Ajout=20page=20des=20propales=20ferm=E9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/pre.inc.php | 17 +++++++------- htdocs/comm/propal/pre.inc.php | 21 ++++++++++++++---- htdocs/comm/propal/stats/pre.inc.php | 33 +++++++++++++++++++++++++--- 3 files changed, 55 insertions(+), 16 deletions(-) diff --git a/htdocs/comm/pre.inc.php b/htdocs/comm/pre.inc.php index 0bcbab44571..bd6a33e5df6 100644 --- a/htdocs/comm/pre.inc.php +++ b/htdocs/comm/pre.inc.php @@ -22,10 +22,10 @@ */ /** - \file htdocs/comm/pre.inc.php - \ingroup commercial - \brief Fichier de gestion du menu gauche de l'espace commercial - \version $Revision$ + \file htdocs/comm/pre.inc.php + \ingroup commercial + \brief Fichier de gestion du menu gauche de l'espace commercial + \version $Revision$ */ require("../main.inc.php"); @@ -44,7 +44,6 @@ function llxHeader($head = "", $title = "") // Clients $menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers")); - if ($user->rights->societe->creer) { $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=c", $langs->trans("MenuNewCustomer")); @@ -55,7 +54,6 @@ function llxHeader($head = "", $title = "") // Prospects $menu->add(DOL_URL_ROOT."/comm/prospect/index.php", $langs->trans("Prospects")); - if ($user->rights->societe->creer) { $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=p", $langs->trans("MenuNewProspect")); @@ -71,9 +69,10 @@ function llxHeader($head = "", $title = "") { $langs->load("propal"); $menu->add(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop")); - $menu->add_submenu("propal.php?viewstatut=0", $langs->trans("PropalsDraft")); - $menu->add_submenu("propal.php?viewstatut=1", $langs->trans("PropalsOpened")); - $menu->add_submenu("./propal/stats/", $langs->trans("Statistics")); + $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=0", $langs->trans("PropalsDraft")); + $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=1", $langs->trans("PropalsOpened")); + $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=2,3,4", $langs->trans("PropalStatusClosedShort")); + $menu->add_submenu(DOL_URL_ROOT."/comm/propal/stats/", $langs->trans("Statistics")); } if ($conf->contrat->enabled) diff --git a/htdocs/comm/propal/pre.inc.php b/htdocs/comm/propal/pre.inc.php index e3315560440..87d185d868b 100644 --- a/htdocs/comm/propal/pre.inc.php +++ b/htdocs/comm/propal/pre.inc.php @@ -21,7 +21,8 @@ * */ -/** \file htdocs/comm/propal/pre.inc.php +/** + \file htdocs/comm/propal/pre.inc.php \ingroup propale \brief Fichier de gestion du menu gauche du module propale \version $Revision$ @@ -32,16 +33,26 @@ require("../../main.inc.php"); function llxHeader($head = "", $urlp = "") { global $user, $conf, $langs; + $langs->load("companies"); + top_menu($head); $menu = new Menu(); + // Clients $menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers")); - + if ($user->rights->societe->creer) + { + $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=c", $langs->trans("MenuNewCustomer")); + } $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=c", $langs->trans("Contacts")); + // Prospects $menu->add(DOL_URL_ROOT."/comm/prospect/prospects.php", $langs->trans("Prospects")); - + if ($user->rights->societe->creer) + { + $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=p", $langs->trans("MenuNewProspect")); + } $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=p", $langs->trans("Contacts")); @@ -54,6 +65,7 @@ function llxHeader($head = "", $urlp = "") { $menu->add(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop")); $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=0", $langs->trans("PropalsDraft")); $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=1", $langs->trans("PropalsOpened")); + $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=2,3,4", $langs->trans("PropalStatusClosedShort")); $menu->add_submenu(DOL_URL_ROOT."/comm/propal/stats/", $langs->trans("Statistics")); } @@ -71,7 +83,8 @@ function llxHeader($head = "", $urlp = "") { if ($conf->fichinter->enabled ) { - $menu->add(DOL_URL_ROOT."/fichinter/index.php", "Fiches d'intervention"); + $langs->load("interventions"); + $menu->add(DOL_URL_ROOT."/fichinter/index.php", $langs->trans("Interventions")); } if ($conf->produit->enabled || $conf->service->enabled) diff --git a/htdocs/comm/propal/stats/pre.inc.php b/htdocs/comm/propal/stats/pre.inc.php index af3283bd6df..8824dbcc6a2 100644 --- a/htdocs/comm/propal/stats/pre.inc.php +++ b/htdocs/comm/propal/stats/pre.inc.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004-2005 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,22 +20,40 @@ * $Source$ * */ + +/** + \file htdocs/comm/propal/stats/pre.inc.php + \ingroup propale + \brief Fichier de gestion du menu gauche du module propale stats + \version $Revision$ +*/ + require("../../../main.inc.php"); require(DOL_DOCUMENT_ROOT."/bargraph.class.php"); function llxHeader($head = "", $urlp = "") { global $user, $conf, $langs; + $langs->load("companies"); + top_menu($head); $menu = new Menu(); + // Clients $menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers")); - + if ($user->rights->societe->creer) + { + $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=c", $langs->trans("MenuNewCustomer")); + } $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=c", $langs->trans("Contacts")); + // Prospects $menu->add(DOL_URL_ROOT."/comm/prospect/prospects.php", $langs->trans("Prospects")); - + if ($user->rights->societe->creer) + { + $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=p", $langs->trans("MenuNewProspect")); + } $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=p", $langs->trans("Contacts")); @@ -47,6 +66,7 @@ function llxHeader($head = "", $urlp = "") { $menu->add(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop")); $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=0", $langs->trans("PropalsDraft")); $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=1", $langs->trans("PropalsOpened")); + $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=2,3,4", $langs->trans("PropalStatusClosedShort")); $menu->add_submenu(DOL_URL_ROOT."/comm/propal/stats/", $langs->trans("Statistics")); } @@ -62,9 +82,16 @@ function llxHeader($head = "", $urlp = "") { $menu->add(DOL_URL_ROOT."/commande/index.php", $langs->trans("Orders")); } + if ($user->rights->mailing->lire) + { + $langs->load("mails"); + $menu->add(DOL_URL_ROOT."/comm/mailing/", $langs->trans("EMailings")); + } + if ($conf->fichinter->enabled ) { - $menu->add(DOL_URL_ROOT."/fichinter/index.php", "Fiches d'intervention"); + $langs->load("interventions"); + $menu->add(DOL_URL_ROOT."/fichinter/index.php", $langs->trans("Interventions")); } if ($conf->produit->enabled || $conf->service->enabled)