From e2306ccf7a5c8e09f82d8f298da003ff222d4ef8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Mar 2008 23:32:53 +0000 Subject: [PATCH] Fix: cheques sending to bank --- htdocs/compta/paiement/cheque/fiche.php | 23 ++++++++++--------- .../menus/barre_left/eldy_backoffice.php | 3 +-- .../menus/barre_left/eldy_frontoffice.php | 7 +++--- htdocs/includes/modules/modBanque.class.php | 3 +-- htdocs/lib/functions.inc.php | 6 ++++- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index 10a33ad32cf..2bcafd44f5a 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -1,6 +1,6 @@ - * Copyright (C) 2007 Laurent Destailleur +/* Copyright (C) 2006 Rodolphe Quiedeville + * Copyright (C) 2007-2008 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 @@ -145,7 +145,7 @@ if ($_GET['action'] == 'new') { $h=0; $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/cheque/fiche.php?action=new'; - $head[$h][1] = $langs->trans("NewCheckDeposit"); + $head[$h][1] = $langs->trans("MenuChequeDeposits"); $hselected = $h; $h++; @@ -198,11 +198,7 @@ else if ($mesg) print $mesg.'
'; -/* - * - * - * - */ + if ($_GET['action'] == 'new') { $accounts = array(); @@ -272,9 +268,14 @@ if ($_GET['action'] == 'new') print ""; print '
'; - print ''; - print $langs->trans('NewCheckDepositOn',$account_label); - print ''; + if ($user->rights->banque->modifier) + { + print ''.$langs->trans('NewCheckDepositOn',$account_label).''; + } + else + { + print ''.$langs->trans('NewCheckDepositOn',$account_label).''; + } print '

'; } diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index cf59dc0113a..1d1604da403 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -524,9 +524,8 @@ class MenuLeft { if ($conf->facture->enabled && $conf->banque->enabled) { $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=checks",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->lire); - if (eregi("checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->creer); + if (eregi("checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->modifier); if (eregi("checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=checks",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->lire); - } // Bank-Caisse diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index f15c1611d4e..db9903234e2 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -510,10 +510,9 @@ class MenuLeft { /* if ($conf->facture->enabled && $conf->banque->enabled) { - $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=checks",$langs->trans("MenuChequeDeposits"),0,$user->rights->facture->lire); - if (eregi("checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->facture->creer); - if (eregi("checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=checks",$langs->trans("MenuChequesReceipts"),1,$user->rights->facture->lire); - + $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=checks",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->lire); + if (eregi("checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->modifier); + if (eregi("checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=checks",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->lire); } */ diff --git a/htdocs/includes/modules/modBanque.class.php b/htdocs/includes/modules/modBanque.class.php index 279eab9abdf..ec5f78ad55a 100644 --- a/htdocs/includes/modules/modBanque.class.php +++ b/htdocs/includes/modules/modBanque.class.php @@ -17,12 +17,11 @@ * 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$ */ /** \defgroup banque Module banque \brief Module pour gérer la tenue d'un compte bancaire et rapprochements + \version $Id$ */ /** diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 57bda6b35f6..f44abbcf531 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -1248,7 +1248,7 @@ function restrictedArea($user, $feature='societe', $objectid=0, $dbtablename='') { if (! $user->rights->fournisseur->commande->lire) $readok=0; } - else if (! empty($features)) + else if (! empty($feature)) { if (! $user->rights->$feature->lire) $readok=0; } @@ -1276,6 +1276,10 @@ function restrictedArea($user, $feature='societe', $objectid=0, $dbtablename='') { if (! $user->rights->fournisseur->commande->creer) $createok=0; } + else if ($feature == 'banque') + { + if (! $user->rights->banque->modifier) $createok=0; + } else { if (! $user->rights->$feature->creer) $createok=0;