From 626c235816d59b2e7289c0a03e9f9bd813a9f19a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 19 May 2008 19:32:08 +0000 Subject: [PATCH] Fix: Added cheque menus in menus --- htdocs/compta/bank/pre.inc.php | 14 +++++++++++--- htdocs/lib/functions.lib.php | 8 ++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php index 3426a0dcd7a..8f564c9ae41 100644 --- a/htdocs/compta/bank/pre.inc.php +++ b/htdocs/compta/bank/pre.inc.php @@ -69,9 +69,7 @@ function llxHeader($head = "") $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); - // Obsolete. Replaced by page Rapport E/S - // $menu->add_submenu(DOL_URL_ROOT."/compta/bank/bilan.php","Bilan",1,$user->rights->banque->lire); - + if ($user->rights->banque->transfer) { $menu->add_submenu(DOL_URL_ROOT."/compta/bank/virement.php",$langs->trans("BankTransfers"),1,$user->rights->banque->transfer); @@ -82,6 +80,16 @@ function llxHeader($head = "") $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",$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); + } + left_menu($menu->liste); } ?> diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 2dfb60a255a..81a2847894e 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -1299,6 +1299,10 @@ function restrictedArea($user, $feature='societe', $objectid=0, $dbtablename='') { if (! $user->rights->fournisseur->commande->lire) $readok=0; } + else if ($feature == 'cheque') + { + if (! $user->rights->banque->cheque) $readok=0; + } else if (! empty($feature)) { if (! $user->rights->$feature->lire) $readok=0; @@ -1331,6 +1335,10 @@ function restrictedArea($user, $feature='societe', $objectid=0, $dbtablename='') { if (! $user->rights->banque->modifier) $createok=0; } + else if ($feature == 'cheque') + { + if (! $user->rights->banque->cheque) $createok=0; + } else { if (! $user->rights->$feature->creer) $createok=0;