From 1730d9e2b766f025a0841a2e11bd50b95a8d72c4 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Fri, 22 Mar 2013 09:30:04 +0100 Subject: [PATCH 1/5] display enhancement and normalize --- htdocs/admin/ecm.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php index 908b36dbabb..45a142d8190 100644 --- a/htdocs/admin/ecm.php +++ b/htdocs/admin/ecm.php @@ -70,6 +70,17 @@ llxHeader('',$langs->trans("ECMSetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("ECMSetup"),$linkback,'setup'); +print '
'; + +$h = 0; + +$head[$h][0] = DOL_URL_ROOT."/admin/ecm.php"; +$head[$h][1] = $langs->trans("Miscellanous"); +$head[$h][2] = 'general'; +$hselected=$h; +$h++; + +dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); print ''; print ''; From b44d5de58e4793fd4a6cee56317e5ab6725d902c Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Fri, 22 Mar 2013 09:38:48 +0100 Subject: [PATCH 2/5] display enhancement and normalize --- htdocs/admin/taxes.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index bf5e0db26a6..8e547bd4e21 100644 --- a/htdocs/admin/taxes.php +++ b/htdocs/admin/taxes.php @@ -121,6 +121,17 @@ $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans('TaxSetup'),$linkback,'setup'); +print '
'; + +$h = 0; + +$head[$h][0] = DOL_URL_ROOT."/admin/taxes.php"; +$head[$h][1] = $langs->trans("Miscellanous"); +$head[$h][2] = 'general'; +$hselected=$h; +$h++; + +dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); print '
'; From e506601214223d59ef7279abeedf26370fa16a68 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Fri, 22 Mar 2013 10:48:14 +0100 Subject: [PATCH 3/5] display enhancement and standardize --- htdocs/{compta/bank => }/admin/bank.php | 15 +++++++++++++-- htdocs/core/modules/modBanque.class.php | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) rename htdocs/{compta/bank => }/admin/bank.php (93%) diff --git a/htdocs/compta/bank/admin/bank.php b/htdocs/admin/bank.php similarity index 93% rename from htdocs/compta/bank/admin/bank.php rename to htdocs/admin/bank.php index a45fa29c912..98a08708dff 100644 --- a/htdocs/compta/bank/admin/bank.php +++ b/htdocs/admin/bank.php @@ -1,6 +1,7 @@ * Copyright (C) 2010-2012 Juanjo Menent + * Copyright (C) 2013 Philippe Grand * * 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 @@ -18,12 +19,12 @@ /** - * \file htdocs/compta/bank/admin/bank.php + * \file htdocs/admin/bank.php * \ingroup bank * \brief Page to setup the bank module */ -require '../../../main.inc.php'; +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; @@ -87,6 +88,16 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup'); print '
'; +$h = 0; + +$head[$h][0] = DOL_URL_ROOT."/admin/bank.php"; +$head[$h][1] = $langs->trans("Miscellanous"); +$head[$h][2] = 'general'; +$hselected=$h; +$h++; + +dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); + print '
'; print ''; print ''; diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php index 1bae9f61129..832d96a194b 100644 --- a/htdocs/core/modules/modBanque.class.php +++ b/htdocs/core/modules/modBanque.class.php @@ -65,7 +65,7 @@ class modBanque extends DolibarrModules // Config pages //------------- - $this->config_page_url = array("bank.php@compta/bank"); + $this->config_page_url = array("bank.php"); // Dependancies $this->depends = array(); From 12f1d1b6dd87a392dfe292fe37114281cffcdf91 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Fri, 22 Mar 2013 11:11:18 +0100 Subject: [PATCH 4/5] display enhancement and standardize --- htdocs/admin/stock.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 1f40461ca0f..ba28ea15635 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -3,6 +3,7 @@ * Copyright (C) 2008-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2012 Juanjo Menent + * Copyright (C) 2013 Philippe Grand * * 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 @@ -97,6 +98,16 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("StockSetup"),$linkback,'setup'); print '
'; +$h = 0; + +$head[$h][0] = DOL_URL_ROOT."/admin/stock.php"; +$head[$h][1] = $langs->trans("Miscellanous"); +$head[$h][2] = 'general'; +$hselected=$h; +$h++; + +dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); + $form=new Form($db); $var=true; print '
'.$langs->trans("Parameters").'
'; @@ -124,9 +135,12 @@ print '' print ''; print "\n"; print "\n"; - +print '
'; +print '
'; +print '
'; // Title rule for stock decrease +print ''; print ''; print " \n"; print " \n"; @@ -174,9 +188,11 @@ if (! empty($conf->expedition->enabled)) print ''; print "\n\n\n"; } - +print '
".$langs->trans("RuleForStockManagementDecrease")." 
'; +print '
'; // Title rule for stock increase +print ''; print ''; print " \n"; print " \n"; From 371c7194fa93fa419df40d871da21c5881c18ab7 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Fri, 22 Mar 2013 11:15:52 +0100 Subject: [PATCH 5/5] display enhancement and standardize --- htdocs/admin/mailing.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index ea5c9b7bbb4..87252252d65 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -103,6 +103,16 @@ llxHeader('',$langs->trans("MailingSetup")); $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("MailingSetup"),$linkback,'setup'); +$h = 0; + +$head[$h][0] = DOL_URL_ROOT."/admin/mailing.php"; +$head[$h][1] = $langs->trans("Miscellanous"); +$head[$h][2] = 'general'; +$hselected=$h; +$h++; + +dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); + dol_htmloutput_mesg($mesg);
".$langs->trans("RuleForStockManagementIncrease")."