diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index e46b465dfad..1a97e3ea099 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -47,7 +47,6 @@ $statut=isset($_GET["statut"])?$_GET["statut"]:''; llxHeader(); - $link=''; if ($statut == '') $link=''.$langs->trans("IncludeClosedAccount").''; if ($statut == 'all') $link=''.$langs->trans("OnlyOpenedAccount").''; diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php index af7caeb264c..558664d0c89 100644 --- a/htdocs/compta/bank/pre.inc.php +++ b/htdocs/compta/bank/pre.inc.php @@ -32,6 +32,18 @@ require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $langs->load("banks"); $langs->load("categories"); + +/** + * + * @param $head + * @param $title + * @param $help_url + * @param $target + * @param $disablejs + * @param $disablehead + * @param $arrayofjs + * @param $arrayofcss + */ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='') { global $db, $user, $conf, $langs; @@ -41,30 +53,6 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0 $menu = new Menu(); - - $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("Rubriques"),1,$user->rights->banque->configurer); - - $menu->add_submenu(DOL_URL_ROOT."/compta/bank/search.php",$langs->trans("ListTransactions"),1,$user->rights->banque->lire); - $menu->add_submenu(DOL_URL_ROOT."/compta/bank/budget.php",$langs->trans("ListTransactionsByCategory"),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); - } - - // 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); - } - // Entry for each bank account if ($user->rights->banque->lire) { @@ -96,6 +84,6 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0 $db->free($resql); } - left_menu($menu->liste); + left_menu('', $help_url, '', $menu->liste); } ?> diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index fcce15db1a9..9017e0b6171 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -41,7 +41,7 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0 $menu = new Menu(); - +/* $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); @@ -64,7 +64,7 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0 $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); } - +*/ // Entry for each bank account if ($user->rights->banque->lire) { @@ -96,7 +96,7 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0 $db->free($resql); } - left_menu($menu->liste); + left_menu('', $help_url, '', $menu->liste); } ?> diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php index 3ed2e7445c9..6b46cc95b88 100644 --- a/htdocs/compta/prelevement/bon.php +++ b/htdocs/compta/prelevement/bon.php @@ -28,6 +28,8 @@ require('../../main.inc.php'); require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"; $langs->load("bills"); +$langs->load("categories"); + /* * Securite acces client diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index dfc0dadc69e..f782da8e38f 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -28,6 +28,7 @@ require('../../main.inc.php'); $langs->load("widthdrawals"); +$langs->load("categories"); // Security check $socid = isset($_GET["socid"])?$_GET["socid"]:''; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index d7e18b415d1..f3d419cad7d 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; $langs->load("widthdrawals"); $langs->load("companies"); +$langs->load("categories"); // Security check $socid = isset($_GET["socid"])?$_GET["socid"]:''; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 06d739b5319..a3ad11760a5 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -31,6 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.clas require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("companies"); +$langs->load("categories"); // Securite acces client if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/compta/prelevement/facturesrejets.php b/htdocs/compta/prelevement/facturesrejets.php index d2493c977ce..30dc422d5d2 100644 --- a/htdocs/compta/prelevement/facturesrejets.php +++ b/htdocs/compta/prelevement/facturesrejets.php @@ -24,12 +24,15 @@ require('../../main.inc.php'); require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"; +$langs->load("categories"); -/* - * Security check - */ +// Security check if ($user->societe_id > 0) accessforbidden(); + +/* + * View + */ llxHeader('',$langs->trans("WithdrawalReceipt")); $h = 0; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index fd1e40b279f..154eac2a223 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -29,9 +29,14 @@ require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class. require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); +$langs->load("categories"); + // Securite acces client if ($user->societe_id > 0) accessforbidden(); +/* + * View + */ llxHeader('',$langs->trans("WithdrawalReceipt")); $h = 0; diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index af1004e30b1..0c312e8bbff 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -31,7 +31,8 @@ require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class. if ($user->societe_id > 0) accessforbidden(); $langs->load("withdrawals"); -$langs->load("main"); +$langs->load("categories"); + /* * View diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index 05c0f727723..a18dcb0342f 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -33,7 +33,7 @@ accessforbidden(); $langs->load("bills"); $langs->load("withdrawals"); -$langs->load("main"); +$langs->load("categories"); // Security check diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 4d71e656998..43e14ea8109 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -30,6 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); $langs->load("withdrawals"); +$langs->load("categories"); // Security check $socid = isset($_GET["socid"])?$_GET["socid"]:''; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index fc96c0892ee..323f7ed9f34 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -37,7 +37,7 @@ if ($user->societe_id > 0) accessforbidden(); $langs->load("bills"); $langs->load("withdrawals"); -$langs->load("main"); +$langs->load("categories"); if ($_POST["action"] == 'confirm_rejet') @@ -92,7 +92,7 @@ $h++; if ($_GET["id"]) { $lipre = new LignePrelevement($db, $user); - + $lipre->statuts[0] = $langs->trans("StatusWaiting"); $lipre->statuts[2] = $langs->trans("StatusCredited"); $lipre->statuts[3] = $langs->trans("StatusRefused"); @@ -156,7 +156,7 @@ if ($_GET["id"]) $soc->fetch($lipre->socid); $rej = new RejetPrelevement($db, $user); - + $rej->motifs[0] = $langs->trans("StatusMotif0"); $rej->motifs[1] = $langs->trans("StatusMotif1"); $rej->motifs[2] = $langs->trans("StatusMotif2"); diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index b62ba813590..49d112b2c49 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -32,6 +32,8 @@ require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); // Security check if ($user->societe_id > 0) accessforbidden(); +$langs->load("categories"); + /* * View diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index 8c598a969ff..bb8d6be6e75 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -29,6 +29,7 @@ require('../../main.inc.php'); $langs->load("withdrawals"); $langs->load("companies"); +$langs->load("categories"); // Security check $socid = isset($_GET["socid"])?$_GET["socid"]:''; diff --git a/htdocs/compta/prelevement/liste_factures.php b/htdocs/compta/prelevement/liste_factures.php index 1171b7494a9..26ab1f112a6 100644 --- a/htdocs/compta/prelevement/liste_factures.php +++ b/htdocs/compta/prelevement/liste_factures.php @@ -31,6 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("withdrawals"); $langs->load("companies"); +$langs->load("categories"); // Security check $socid = isset($_GET["socid"])?$_GET["socid"]:''; diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index b1afab7748e..41dd6782f05 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -27,6 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("withdrawals"); $langs->load("companies"); +$langs->load("categories"); // Security check $socid = isset($_GET["socid"])?$_GET["socid"]:''; diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index 150084a7717..039b8edd584 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -29,6 +29,7 @@ require('../../main.inc.php'); $langs->load("withdrawals"); $langs->load("companies"); +$langs->load("categories"); // Security check $socid = isset($_GET["socid"])?$_GET["socid"]:''; diff --git a/htdocs/ftp/pre.inc.php b/htdocs/ftp/pre.inc.php index 3a4307d92d9..fa6d25abc1c 100644 --- a/htdocs/ftp/pre.inc.php +++ b/htdocs/ftp/pre.inc.php @@ -53,6 +53,6 @@ function llxHeader($head = '', $title='', $help_url='', $morehtml='') } - left_menu($menu->liste, $help_url, $morehtml); + left_menu($menu->liste, $help_url, $morehtml, ''); } ?> diff --git a/htdocs/includes/menus/barre_left/auguria.lib.php b/htdocs/includes/menus/barre_left/auguria.lib.php index ba7d76026ce..41cfb6c270b 100644 --- a/htdocs/includes/menus/barre_left/auguria.lib.php +++ b/htdocs/includes/menus/barre_left/auguria.lib.php @@ -30,7 +30,7 @@ * * @param unknown_type $db */ -function print_left_auguria_menu($db,$menu_array) +function print_left_auguria_menu($db,$menu_array_before,$menu_array_after) { global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc; @@ -99,17 +99,18 @@ function print_left_auguria_menu($db,$menu_array) if ($mainmenu && ! in_array($mainmenu,$overwritemenufor)) { $mainmenu=""; } } - //var_dump($newmenu->liste); - //var_dump($this->menu_array); /** * Si on est sur un cas gere de surcharge du menu, on ecrase celui par defaut */ - if ($mainmenu) { - if ($leftmenu == 'bank') $menu_array=array_merge($menu_array,$newmenu->liste); - else $menu_array=$newmenu->liste; - } - + //var_dump($menu_array_before);exit; + //var_dump($menu_array_after);exit; + $menu_array=$newmenu->liste; + //if ($mainmenu) { + if (is_array($menu_array_before)) $menu_array=array_merge($menu_array_before, $menu_array); + if (is_array($menu_array_after)) $menu_array=array_merge($menu_array, $menu_array_after); + //} + //var_dump($menu_array);exit; // Affichage du menu $alt=0; diff --git a/htdocs/includes/menus/barre_left/auguria_backoffice.php b/htdocs/includes/menus/barre_left/auguria_backoffice.php index 57874b9f9d5..3bdb7d8b765 100644 --- a/htdocs/includes/menus/barre_left/auguria_backoffice.php +++ b/htdocs/includes/menus/barre_left/auguria_backoffice.php @@ -39,16 +39,23 @@ class MenuLeft { var $require_top=array("auguria_backoffice"); // Si doit etre en phase avec un gestionnaire de menu du haut particulier + var $db; + var $menu_array; + var $menu_array_after; + /** - * \brief Constructeur - * \param db Handler d'acces base de donnee - * \param menu_array Tableau des entree de menu defini dans les fichier pre.inc.php + * \brief Constructor + * \param db Database handler + * \param menu_array Table of menu entries to show before entries of menu handler + * \param menu_array_after Table of menu entries to show after entries of menu handler + * */ - function MenuLeft($db,&$menu_array='') + function MenuLeft($db,&$menu_array='',&$menu_array_after='') { $this->db=$db; $this->menu_array=$menu_array; + $this->menu_array_after=$menu_array_after; } @@ -60,7 +67,7 @@ class MenuLeft { { require_once(DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/auguria.lib.php'); - $res=print_left_auguria_menu($this->db,$this->menu_array); + $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after); return $res; } diff --git a/htdocs/includes/menus/barre_left/auguria_frontoffice.php b/htdocs/includes/menus/barre_left/auguria_frontoffice.php index 33d8c3037a7..5ad33345018 100644 --- a/htdocs/includes/menus/barre_left/auguria_frontoffice.php +++ b/htdocs/includes/menus/barre_left/auguria_frontoffice.php @@ -39,16 +39,22 @@ class MenuLeft { var $require_top=array("auguria_frontoffice"); // Si doit etre en phase avec un gestionnaire de menu du haut particulier + var $db; + var $menu_array; + var $menu_array_after; + /** - * \brief Constructeur - * \param db Handler d'acces base de donnee - * \param menu_array Tableau des entree de menu defini dans les fichier pre.inc.php + * \brief Constructor + * \param db Database handler + * \param menu_array Table of menu entries to show before entries of menu handler + * \param menu_array_after Table of menu entries to show after entries of menu handler */ - function MenuLeft($db,&$menu_array='') + function MenuLeft($db,&$menu_array='',&$menu_array_after='') { $this->db=$db; $this->menu_array=$menu_array; + $this->menu_array_after=$menu_array_after; } @@ -60,7 +66,7 @@ class MenuLeft { { require_once(DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/auguria.lib.php'); - $res=print_left_auguria_menu($this->db,$this->menu_array); + $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after); $conf->global->MAIN_SEARCHFORM_SOCIETE=0; $conf->global->MAIN_SEARCHFORM_CONTACT=0; diff --git a/htdocs/includes/menus/barre_left/eldy.lib.php b/htdocs/includes/menus/barre_left/eldy.lib.php index 2edfc0ad750..2b7a9f0a847 100644 --- a/htdocs/includes/menus/barre_left/eldy.lib.php +++ b/htdocs/includes/menus/barre_left/eldy.lib.php @@ -30,7 +30,7 @@ * * @param unknown_type $db */ -function print_left_eldy_menu($db,$menu_array) +function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) { global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc; @@ -504,44 +504,6 @@ function print_left_eldy_menu($db,$menu_array) } - // Prelevements - if ($conf->prelevement->enabled) - { - $langs->load("withdrawals"); - $langs->load("banks"); - - $newmenu->add(DOL_URL_ROOT."/compta/prelevement/index.php?leftmenu=withdraw",$langs->trans("StandingOrders"),0,$user->rights->prelevement->bons->lire); - - if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/create.php",$langs->trans("NewStandingOrder"),1,$user->rights->prelevement->bons->creer); - - //if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("StandingOrder"),1,$user->rights->prelevement->bons->lire); - if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php?status=0",$langs->trans("StandingOrderToProcess"),1,$user->rights->prelevement->bons->lire); - //if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php?status=1",$langs->trans("StandingOrderProcessed"),2,$user->rights->prelevement->bons->lire); - - if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/bons.php",$langs->trans("WithdrawalsReceipts"),1,$user->rights->prelevement->bons->lire); - if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/liste.php",$langs->trans("WithdrawalsLines"),1,$user->rights->prelevement->bons->lire); - if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/liste_factures.php",$langs->trans("WithdrawedBills"),1,$user->rights->prelevement->bons->lire); - if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/rejets.php",$langs->trans("Rejects"),1,$user->rights->prelevement->bons->lire); - if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/stats.php",$langs->trans("Statistics"),1,$user->rights->prelevement->bons->lire); - - //if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/config.php",$langs->trans("Setup"),1,$user->rights->prelevement->bons->configurer); - } - - // Gestion cheques - if ($conf->facture->enabled && $conf->banque->enabled) - { - $newmenu->add(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=checks",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque); - if (preg_match("/checks/i",$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); - if (preg_match("/checks/i",$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=checks",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->cheque); - } - - // Bank-Caisse - if ($conf->banque->enabled) - { - $langs->load("banks"); - $newmenu->add(DOL_URL_ROOT."/compta/bank/index.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire); - } - // Rapports if ($conf->compta->enabled || $conf->accounting->enabled) { @@ -570,6 +532,58 @@ function print_left_eldy_menu($db,$menu_array) } + /* + * Menu BANK + */ + if ($mainmenu == 'bank') + { + $langs->load("withdrawals"); + $langs->load("banks"); + $langs->load("bills"); + + // Bank-Caisse + if ($conf->banque->enabled) + { + $langs->load("banks"); + $newmenu->add(DOL_URL_ROOT."/compta/bank/index.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire); + + $newmenu->add_submenu(DOL_URL_ROOT."/compta/bank/fiche.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer); + $newmenu->add_submenu(DOL_URL_ROOT."/compta/bank/categ.php",$langs->trans("Rubriques"),1,$user->rights->banque->configurer); + + $newmenu->add_submenu(DOL_URL_ROOT."/compta/bank/search.php",$langs->trans("ListTransactions"),1,$user->rights->banque->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/compta/bank/budget.php",$langs->trans("ListTransactionsByCategory"),1,$user->rights->banque->lire); + } + + // Prelevements + if ($conf->prelevement->enabled) + { + $newmenu->add(DOL_URL_ROOT."/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank",$langs->trans("StandingOrders"),0,$user->rights->prelevement->bons->lire); + + if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/create.php?mainmenu=bank",$langs->trans("NewStandingOrder"),1,$user->rights->prelevement->bons->creer); + + //if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("StandingOrder"),1,$user->rights->prelevement->bons->lire); + if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php?status=0&mainmenu=bank",$langs->trans("StandingOrderToProcess"),1,$user->rights->prelevement->bons->lire); + //if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php?status=1",$langs->trans("StandingOrderProcessed"),2,$user->rights->prelevement->bons->lire); + + if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/bons.php?mainmenu=bank",$langs->trans("WithdrawalsReceipts"),1,$user->rights->prelevement->bons->lire); + if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/liste.php?mainmenu=bank",$langs->trans("WithdrawalsLines"),1,$user->rights->prelevement->bons->lire); + if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/liste_factures.php?mainmenu=bank",$langs->trans("WithdrawedBills"),1,$user->rights->prelevement->bons->lire); + if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/rejets.php?mainmenu=bank",$langs->trans("Rejects"),1,$user->rights->prelevement->bons->lire); + if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/stats.php?mainmenu=bank",$langs->trans("Statistics"),1,$user->rights->prelevement->bons->lire); + + //if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/config.php",$langs->trans("Setup"),1,$user->rights->prelevement->bons->configurer); + } + + // Gestion cheques + if ($conf->facture->enabled && $conf->banque->enabled) + { + $newmenu->add(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque); + if (preg_match("/checks/i",$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new&mainmenu=bank",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); + if (preg_match("/checks/i",$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=checks&mainmenu=bank",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->cheque); + } + + } + /* * Menu PRODUITS-SERVICES */ @@ -850,9 +864,13 @@ function print_left_eldy_menu($db,$menu_array) /** * Si on est sur un cas gere de surcharge du menu, on ecrase celui par defaut */ - if ($mainmenu) { - $menu_array=$newmenu->liste; - } + //var_dump($menu_array_before);exit; + //var_dump($menu_array_after);exit; + //if ($mainmenu) { + $menu_array=$newmenu->liste; + if (is_array($menu_array_before)) $menu_array=array_merge($menu_array_before, $menu_array); + if (is_array($menu_array_after)) $menu_array=array_merge($menu_array, $menu_array_after); + //} // Affichage du menu $alt=0; diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 5081c433ff3..e690f0d9055 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -37,20 +37,24 @@ */ class MenuLeft { - var $db; - var $menu_array; var $require_top=array("eldy_backoffice"); // Si doit etre en phase avec un gestionnaire de menu du haut particulier + var $db; + var $menu_array; + var $menu_array_after; + /** - * \brief Constructeur - * \param db Handler d'acces base de donnee - * \param menu_array Tableau des entree de menu defini dans les fichier pre.inc.php + * \brief Constructor + * \param db Database handler + * \param menu_array Table of menu entries to show before entries of menu handler + * \param menu_array_after Table of menu entries to show after entries of menu handler */ - function MenuLeft($db,&$menu_array='') + function MenuLeft($db,&$menu_array='',&$menu_array_after='') { $this->db=$db; $this->menu_array=$menu_array; + $this->menu_array_after=$menu_array_after; } @@ -62,7 +66,7 @@ class MenuLeft { { require_once(DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/eldy.lib.php'); - $res=print_left_eldy_menu($this->db,$this->menu_array); + $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after); return $res; } diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index 51dd929c25d..1f81bee2ada 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -36,20 +36,24 @@ */ class MenuLeft { - var $db; - var $menu_array; var $require_top=array("eldy_frontoffice"); // Si doit etre en phase avec un gestionnaire de menu du haut particulier + var $db; + var $menu_array; + var $menu_array_after; + /** - * \brief Constructeur - * \param db Handler d'acces base de donnee - * \param menu_array Tableau des entree de menu defini dans les fichier pre.inc.php + * \brief Constructor + * \param db Database handler + * \param menu_array Table of menu entries to show before entries of menu handler + * \param menu_array_after Table of menu entries to show after entries of menu handler */ - function MenuLeft($db,&$menu_array='') + function MenuLeft($db,&$menu_array='',&$menu_array_after='') { $this->db=$db; $this->menu_array=$menu_array; + $this->menu_array_after=$menu_array_after; } @@ -61,7 +65,7 @@ class MenuLeft { { require_once(DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/eldy.lib.php'); - $res=print_left_eldy_menu($this->db,$this->menu_array); + $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after); $conf->global->MAIN_SEARCHFORM_SOCIETE=0; $conf->global->MAIN_SEARCHFORM_CONTACT=0; diff --git a/htdocs/includes/menus/barre_left/empty.php b/htdocs/includes/menus/barre_left/empty.php index 830957ee850..8fca51210ff 100644 --- a/htdocs/includes/menus/barre_left/empty.php +++ b/htdocs/includes/menus/barre_left/empty.php @@ -30,16 +30,22 @@ class MenuLeft { var $require_top=array("empty"); // If this top menu handler must be used with a particular left menu handler + var $db; + var $menu_array; + var $menu_array_after; + /** - * \brief Constructor - * \param db Dabatase handler - * \param menu_array Menu array that you will override in showmenu() function + * \brief Constructor + * \param db Database handler + * \param menu_array Table of menu entries to show before entries of menu handler + * \param menu_array_after Table of menu entries to show after entries of menu handler */ - function MenuLeft($db,&$menu_array='') + function MenuLeft($db,&$menu_array='',&$menu_array_after='') { $this->db=$db; $this->menu_array=$menu_array; + $this->menu_array_after=$menu_array_after; } diff --git a/htdocs/includes/menus/barre_top/eldy.lib.php b/htdocs/includes/menus/barre_top/eldy.lib.php index ca3a3da100c..82c2a634289 100644 --- a/htdocs/includes/menus/barre_top/eldy.lib.php +++ b/htdocs/includes/menus/barre_top/eldy.lib.php @@ -188,7 +188,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) } // Financial - if ($conf->compta->enabled || $conf->accounting->enabled || $conf->banque->enabled + if ($conf->compta->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled) { $langs->load("compta"); @@ -228,6 +228,46 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) } } + // Bank + if ($conf->banque->enabled || $conf->prelevement->enabled) + { + $langs->load("compta"); + $langs->load("banks"); + + $classname=""; + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") + { + $classname='class="tmenusel"'; $_SESSION['idmenu']=''; + } + else + { + $classname = 'class="tmenu"'; + } + + $idsel='bank'; + if ($user->rights->banque->lire) + { + print_start_menu_entry($idsel); + print '
'; + print ''; + print_text_menu_entry($langs->trans("MenuBankCash")); + print ''; + print_end_menu_entry(); + } + else + { + if (! $hideifnotallowed) + { + print_start_menu_entry($idsel); + print '
'; + print ''; + print_text_menu_entry($langs->trans("MenuBankCash")); + print ''; + print_end_menu_entry(); + } + } + } + // Projects if ($conf->projet->enabled) { diff --git a/htdocs/langs/en_IN/compta.lang b/htdocs/langs/en_IN/compta.lang new file mode 100644 index 00000000000..390f591429f --- /dev/null +++ b/htdocs/langs/en_IN/compta.lang @@ -0,0 +1,8 @@ +# Dolibarr language file - en_IN - compta +CHARSET=UTF-8 +CheckReceipt=Cheque deposit +CheckReceiptShort=Cheque deposit +NewCheckDeposit=New cheque deposit +NoWaitingChecks=No cheques waiting for deposit. +DateChequeReceived=Cheque receiving input date +NbOfCheques=Nb of cheques diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index edef1d57c6d..0d75e1cc11d 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1011,13 +1011,14 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a /** * \brief Show left menu bar - * \param menu_array Table menu entries + * \param menu_array_before Table of menu entries to show before entries of menu handler * \param helppagename Name of wiki page for help ('' by default). - * Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage - * For other external page: http://server/url + * Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage + * For other external page: http://server/url * \param moresearchform Search Form Permanent Supplemental + * \param menu_array_after Table of menu entries to show after entries of menu handler */ -function left_menu($menu_array, $helppagename='', $moresearchform='') +function left_menu($menu_array_before, $helppagename='', $moresearchform='', $menu_array_after='') { global $user, $conf, $langs, $db; @@ -1083,10 +1084,11 @@ function left_menu($menu_array, $helppagename='', $moresearchform='') $conf->left_menu='eldy_backoffice.php'; include_once(DOL_DOCUMENT_ROOT ."/includes/menus/barre_left/".$conf->left_menu); } - $menuleft=new MenuLeft($db,$menu_array); - $menuleft->showmenu(); + $menuleft=new MenuLeft($db,$menu_array_before,$menu_array_after); + $menuleft->showmenu(); // output menu_array and menu found in database + // Show other forms if ($searchform) { print "\n"; @@ -1097,11 +1099,13 @@ function left_menu($menu_array, $helppagename='', $moresearchform='') print "\n"; } + // More search form if ($moresearchform) { print $moresearchform; } + // Bookmarks if ($bookmarks) { print "\n"; @@ -1144,9 +1148,9 @@ function left_menu($menu_array, $helppagename='', $moresearchform='') } } + // Link to bugtrack if (! empty($conf->global->MAIN_SHOW_BUGTRACK_LINK)) { - // Link to bugtrack $bugbaseurl='http://savannah.nongnu.org/bugs/?'; $bugbaseurl.='func=additem&group=dolibarr&privacy=1&'; $bugbaseurl.="&details=";