Homognisation des menus

This commit is contained in:
Rodolphe Quiedeville 2005-04-05 08:31:10 +00:00
parent 7b95ae4f8c
commit c4aaffbbf5
2 changed files with 24 additions and 36 deletions

View File

@ -1,5 +1,5 @@
<?PHP
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
@ -21,9 +21,10 @@
*
*/
/** \file htdocs/fourn/commande/pre.inc.php
\ingroup compta
\brief Fichier gestionnaire du menu commandes fournisseurs
/**
\file htdocs/fourn/commande/pre.inc.php
\ingroup compta
\brief Fichier gestionnaire du menu commandes fournisseurs
*/
require("../../main.inc.php");
@ -42,14 +43,15 @@ function llxHeader($head = "", $title = "")
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/fourn/index.php", "Fournisseurs");
$menu->add(DOL_URL_ROOT."/fourn/commande/", $langs->trans("Orders"));
$menu->add_submenu(DOL_URL_ROOT."/fourn/commande/liste.php", $langs->trans("List"));
$menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers"));
$menu->add_submenu(DOL_URL_ROOT."/fourn/contact.php",$langs->trans("Contacts"));
$langs->load("bills");
$menu->add(DOL_URL_ROOT."/fourn/facture/index.php", $langs->trans("Bills"));
$menu->add(DOL_URL_ROOT."/fourn/commande/", $langs->trans("Orders"));
$menu->add_submenu(DOL_URL_ROOT."/fourn/commande/liste.php", $langs->trans("List"));
left_menu($menu->liste);
}

View File

@ -47,40 +47,26 @@ function llxHeader($head = "", $title = "", $addons='') {
$menu->add($addons[0][0], $addons[0][1]);
}
if ($conf->fournisseur->enabled)
{
$menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers"));
// Sécurité accés client
if ($user->societe_id == 0)
{
$menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=f",$langs->trans("NewSupplier"));
}
}
$menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers"));
$menu->add_submenu(DOL_URL_ROOT."/fourn/contact.php",$langs->trans("Contacts"));
if ($conf->societe->enabled)
$langs->load("bills");
$menu->add(DOL_URL_ROOT."/fourn/facture/index.php", $langs->trans("Bills"));
if ($user->societe_id == 0)
{
$menu->add_submenu(DOL_URL_ROOT."/fourn/contact.php",$langs->trans("Contacts"));
$menu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"));
}
if ($conf->facture->enabled)
{
$langs->load("bills");
$menu->add(DOL_URL_ROOT."/fourn/facture/index.php", $langs->trans("Bills"));
if ($user->societe_id == 0)
{
$menu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"));
}
$menu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments"));
}
$menu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments"));
if ($conf->commande->enabled)
{
$langs->load("orders");
$menu->add_submenu(DOL_URL_ROOT."/fourn/commande/",$langs->trans("Orders"));
}
$langs->load("orders");
$menu->add(DOL_URL_ROOT."/fourn/commande/",$langs->trans("Orders"));
if ($conf->produit->enabled || $conf->service->enabled)
{