From 03cd6c913018b897048b81792d22f46441290d3f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 27 May 2008 23:00:02 +0000 Subject: [PATCH] Fix: Bad menus --- htdocs/compta/bank/pre.inc.php | 6 +- htdocs/compta/paiement/cheque/pre.inc.php | 90 +++++++++++++++++------ 2 files changed, 70 insertions(+), 26 deletions(-) diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php index 8f564c9ae41..1d9abe285fc 100644 --- a/htdocs/compta/bank/pre.inc.php +++ b/htdocs/compta/bank/pre.inc.php @@ -85,9 +85,9 @@ function llxHeader($head = "") { $langs->load("bills"); - $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque); - $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); - $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->cheque); + $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque); + $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=bank&mainmenu=bank&action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); + $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->cheque); } left_menu($menu->liste); diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index 9283c90d759..7667e69f914 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -14,39 +14,83 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ - * */ + +/** + \file htdocs/compta/paiement/cheque/pre.inc.php + \ingroup compta + \brief Fichier gestionnaire du menu cheques + \version $Id$ +*/ + require("../../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/remisecheque.class.php'); $langs->load("bills"); $langs->load("compta"); - -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/remisecheque.class.php'); +$langs->load("banks"); function llxHeader($head = "", $title="") { - global $user, $langs; - $langs->load("bills"); - - top_menu($head, $title); + global $db, $user, $conf, $langs; + + top_menu($head); + + $menu = new Menu(); + if ($user->rights->banque->lire) + { + $sql = "SELECT rowid, label, courant"; + $sql.= " FROM ".MAIN_DB_PREFIX."bank_account"; + $sql.= " WHERE clos = 0"; + $resql = $db->query($sql); + if ($resql) + { + $numr = $db->num_rows($resql); + $i = 0; + + while ($i < $numr) + { + $objp = $db->fetch_object($resql); + $menu->add(DOL_URL_ROOT."/compta/bank/fiche.php?id=".$objp->rowid,$objp->label,0,$user->rights->banque->lire); +/* + $menu->add_submenu(DOL_URL_ROOT."/compta/bank/annuel.php?account=".$objp->rowid ,$langs->trans("IOMonthlyReporting")); + $menu->add_submenu(DOL_URL_ROOT."/compta/bank/graph.php?account=".$objp->rowid ,$langs->trans("Graph")); + if ($objp->courant != 2) $menu->add_submenu(DOL_URL_ROOT."/compta/bank/releve.php?account=".$objp->rowid ,$langs->trans("AccountStatements")); +*/ + $i++; + } + } + $db->free($resql); + } + $menu->add(DOL_URL_ROOT."/compta/bank/index.php",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire); + + $menu->add_submenu(DOL_URL_ROOT."/compta/bank/fiche.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer); + $menu->add_submenu(DOL_URL_ROOT."/compta/bank/categ.php",$langs->trans("Categories"),1,$user->rights->banque->configurer); - $menu = new Menu(); + $menu->add_submenu(DOL_URL_ROOT."/compta/bank/search.php",$langs->trans("SearchTransaction"),1,$user->rights->banque->lire); + $menu->add_submenu(DOL_URL_ROOT."/compta/bank/budget.php",$langs->trans("ByCategories"),1,$user->rights->banque->lire); - $menu->add("/compta/paiement/liste.php",$langs->trans("Payments")); - - $menu->add(DOL_URL_ROOT."/compta/paiement/cheque/index.php",$langs->trans("MenuChequeDeposits")); - $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?action=new",$langs->trans("NewCheckDeposit")); - $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php",$langs->trans("List")); - - $menu->add(DOL_URL_ROOT."/compta/paiement/rapport.php",$langs->trans("Reportings")); - - $menu->add(DOL_URL_ROOT."/compta/facture.php",$langs->trans("Bills")); - $menu->add_submenu(DOL_URL_ROOT."/compta/facture/impayees.php",$langs->trans("Unpayed")); - - left_menu($menu->liste); + if ($user->rights->banque->transfer) + { + $menu->add_submenu(DOL_URL_ROOT."/compta/bank/virement.php",$langs->trans("BankTransfers"),1,$user->rights->banque->transfer); + } + + if ($conf->global->COMPTA_ONLINE_PAYMENT_BPLC) + { + $menu->add(DOL_URL_ROOT."/compta/bank/bplc.php","Transactions BPLC"); + } + + // Gestion cheques + if ($conf->facture->enabled && $conf->banque->enabled) + { + $langs->load("bills"); + + $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque); + $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=bank&mainmenu=bank&action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); + $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->cheque); + } + + left_menu($menu->liste); } ?>