From a14298cf93edc2e64ba8cc76cb4f81711f265c35 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Dec 2010 20:09:21 +0000 Subject: [PATCH] Fix: Regression when adding dol_buildpath --- htdocs/compta/bank/pre.inc.php | 12 ++++---- htdocs/compta/paiement/cheque/pre.inc.php | 34 ++++------------------- htdocs/includes/menus/standard/empty.php | 24 ++++++++-------- 3 files changed, 23 insertions(+), 47 deletions(-) diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php index d9910938a84..7934785b956 100644 --- a/htdocs/compta/bank/pre.inc.php +++ b/htdocs/compta/bank/pre.inc.php @@ -67,20 +67,20 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0 $numr = $db->num_rows($resql); $i = 0; - if ($numr > 0) $menu->add(dol_buildpath('/compta/bank/index.php',1),$langs->trans("BankAccounts"),0,$user->rights->banque->lire); + if ($numr > 0) $menu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire); while ($i < $numr) { $objp = $db->fetch_object($resql); - $menu->add_submenu(dol_buildpath('/compta/bank/fiche.php?id='.$objp->rowid,1),$objp->label,1,$user->rights->banque->lire); + $menu->add_submenu('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire); if ($objp->rappro && $objp->courant != 2) // If not cash account and can be reconciliate { - $menu->add_submenu(dol_buildpath('/compta/bank/rappro.php?account='.$objp->rowid,1),$langs->trans("Conciliate"),2,$user->rights->banque->consolidate); + $menu->add_submenu('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate); } /* - $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")); + $menu->add_submenu("/compta/bank/annuel.php?account=".$objp->rowid ,$langs->trans("IOMonthlyReporting")); + $menu->add_submenu("/compta/bank/graph.php?account=".$objp->rowid ,$langs->trans("Graph")); + if ($objp->courant != 2) $menu->add_submenu("/compta/bank/releve.php?account=".$objp->rowid ,$langs->trans("AccountStatements")); */ $i++; } diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index 8ea35412484..56fec9f4063 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -41,30 +41,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) { @@ -79,16 +55,16 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0 $numr = $db->num_rows($resql); $i = 0; - if ($numr > 0) $menu->add(DOL_URL_ROOT."/compta/bank/index.php",$langs->trans("BankAccounts"),0,$user->rights->banque->lire); + if ($numr > 0) $menu->add("/compta/bank/index.php",$langs->trans("BankAccounts"),0,$user->rights->banque->lire); while ($i < $numr) { $objp = $db->fetch_object($resql); - $menu->add_submenu(DOL_URL_ROOT."/compta/bank/fiche.php?id=".$objp->rowid,$objp->label,1,$user->rights->banque->lire); + $menu->add_submenu("/compta/bank/fiche.php?id=".$objp->rowid,$objp->label,1,$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")); + $menu->add_submenu("/compta/bank/annuel.php?account=".$objp->rowid ,$langs->trans("IOMonthlyReporting")); + $menu->add_submenu("/compta/bank/graph.php?account=".$objp->rowid ,$langs->trans("Graph")); + if ($objp->courant != 2) $menu->add_submenu("/compta/bank/releve.php?account=".$objp->rowid ,$langs->trans("AccountStatements")); */ $i++; } diff --git a/htdocs/includes/menus/standard/empty.php b/htdocs/includes/menus/standard/empty.php index 4eabed0c404..2e2cd5feaa1 100644 --- a/htdocs/includes/menus/standard/empty.php +++ b/htdocs/includes/menus/standard/empty.php @@ -150,18 +150,18 @@ class MenuLeft { // ***** START ***** $langs->load("admin"); // Load translation file admin.lang - $newmenu->add(DOL_URL_ROOT."/admin/index.php?leftmenu=setup", $langs->trans("Setup"),0); - $newmenu->add(DOL_URL_ROOT."/admin/company.php", $langs->trans("MenuCompanySetup"),1); - $newmenu->add(DOL_URL_ROOT."/admin/modules.php", $langs->trans("Modules"),1); - $newmenu->add(DOL_URL_ROOT."/admin/menus.php", $langs->trans("Menus"),1); - $newmenu->add(DOL_URL_ROOT."/admin/ihm.php", $langs->trans("GUISetup"),1); - $newmenu->add(DOL_URL_ROOT."/admin/boxes.php", $langs->trans("Boxes"),1); - $newmenu->add(DOL_URL_ROOT."/admin/delais.php",$langs->trans("Alerts"),1); - $newmenu->add(DOL_URL_ROOT."/admin/perms.php", $langs->trans("Security"),1); - $newmenu->add(DOL_URL_ROOT."/admin/mails.php", $langs->trans("EMails"),1); - $newmenu->add(DOL_URL_ROOT."/admin/limits.php", $langs->trans("Limits"),1); - $newmenu->add(DOL_URL_ROOT."/admin/dict.php", $langs->trans("DictionnarySetup"),1); - $newmenu->add(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup"),1); + $newmenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"),0); + $newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1); + $newmenu->add("/admin/modules.php", $langs->trans("Modules"),1); + $newmenu->add("/admin/menus.php", $langs->trans("Menus"),1); + $newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1); + $newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1); + $newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1); + $newmenu->add("/admin/perms.php", $langs->trans("Security"),1); + $newmenu->add("/admin/mails.php", $langs->trans("EMails"),1); + $newmenu->add("/admin/limits.php", $langs->trans("Limits"),1); + $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1); + $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1); // ***** END *****