diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php deleted file mode 100644 index b0d6961617c..00000000000 --- a/htdocs/admin/bank_extrafields.php +++ /dev/null @@ -1,116 +0,0 @@ - - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2014 Florian Henry - * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2024 Frédéric France - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/admin/bank_extrafields.php - * \ingroup bank - * \brief Page to setup extra fields of bank - */ - -// Load Dolibarr environment -require '../main.inc.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var ExtraFields $extrafields - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ - -require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; - -// Load translation files required by the page -$langs->loadLangs(array('banks', 'admin')); - -$form = new Form($db); - -// List of supported format -$type2label = ExtraFields::getListOfTypesLabels(); - -$action = GETPOST('action', 'aZ09'); -$attrname = GETPOST('attrname', 'alpha'); -$elementtype = 'bank_account'; //Must be the $element of the class that manage extrafield - -if (!$user->admin) { - accessforbidden(); -} - - -/* - * Actions - */ - -require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; - - - -/* - * View - */ - -$help_url = ''; -$page_name = "BankSetupModule"; - -llxHeader('', $langs->trans("BankSetupModule"), $help_url, '', 0, 0, '', '', '', 'mod-admin page-bank_extrafields'); - - -$linkback = ''.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').''.$langs->trans("BackToModuleList").''; - -print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup'); - - -$head = bank_admin_prepare_head(null); - -print dol_get_fiche_head($head, 'attributes', $langs->trans($page_name), -1, 'account'); - -$textobject = $langs->transnoentitiesnoconv("Bank"); - -require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; - -print dol_get_fiche_end(); - - -/* - * Creation of an optional field - */ -if ($action == 'create') { - print '
'; - print load_fiche_titre($langs->trans('NewAttribute')); - - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; -} - -/* - * Edition of an optional field - */ -if ($action == 'edit' && !empty($attrname)) { - print "
"; - print load_fiche_titre($langs->trans("FieldEdition", $attrname)); - - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; -} - -// End of page -llxFooter(); -$db->close(); diff --git a/htdocs/admin/bank_payments_extrafields.php b/htdocs/admin/bank_payments_extrafields.php deleted file mode 100644 index ccbcdf6fbb5..00000000000 --- a/htdocs/admin/bank_payments_extrafields.php +++ /dev/null @@ -1,114 +0,0 @@ - - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2014 Florian Henry - * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2022-2026 Frédéric France - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/admin/bank_payments_extrafields.php - * \ingroup bank - * \brief Page to setup extra fields of bankline - */ - -// Load Dolibarr environment -require '../main.inc.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var ExtraFields $extrafields - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ -require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; - -// Load translation files required by the page -$langs->loadLangs(array("admin", "companies", "bills", "other", "banks")); - -$form = new Form($db); - -// List of supported format -$type2label = ExtraFields::getListOfTypesLabels(); - -$action = GETPOST('action', 'aZ09'); -$attrname = GETPOST('attrname', 'alpha'); -$elementtype = 'paiement'; //Must be the $table_element of the class that manage extrafield - -if (!$user->admin) { - accessforbidden(); -} - - -/* - * Actions - */ - -require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; - -/* - * View - */ - - -$help_url = ''; -$page_name = "BankSetupModule"; - -llxHeader('', $langs->trans("BankSetupModule"), $help_url, '', 0, 0, '', '', '', 'mod-admin page-bank_payments_extrafields'); - - -$linkback = ''.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').''.$langs->trans("BackToModuleList").''; - -print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup'); - - -$head = bank_admin_prepare_head(null); - -print dol_get_fiche_head($head, 'bank_payments_extrafields', $langs->trans($page_name), -1, 'account'); - -$textobject = $langs->transnoentitiesnoconv("BankTransaction"); - -require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; - -print dol_get_fiche_end(); - - -/* - * Creation of an optional field - */ -if ($action == 'create') { - print '
'; - print load_fiche_titre($langs->trans('NewAttribute')); - - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; -} - -/* - * Edition of an optional field - */ -if ($action == 'edit' && !empty($attrname)) { - print "
"; - print load_fiche_titre($langs->trans("FieldEdition", $attrname)); - - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; -} - -// End of page -llxFooter(); -$db->close(); diff --git a/htdocs/admin/bank_various_payment_extrafields.php b/htdocs/admin/bank_various_payment_extrafields.php deleted file mode 100644 index a81ff78d981..00000000000 --- a/htdocs/admin/bank_various_payment_extrafields.php +++ /dev/null @@ -1,109 +0,0 @@ - - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2012 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2024 Alexandre Spangaro - * Copyright (C) 2024 Frédéric France - * Copyright (C) 2026 Solution Libre SAS - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/admin/bank_various_payment_extrafields.php - * \ingroup bank - * \brief Page to setup extra fields of various payments - */ - -// Load Dolibarr environment -require '../main.inc.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ -require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; - -// Load translation files required by the page -$langs->loadLangs(array("admin", "banks", "other")); - -$extrafields = new ExtraFields($db); -$form = new Form($db); - -// List of supported format -$type2label = ExtraFields::getListOfTypesLabels(); - -$action = GETPOST('action', 'aZ09'); -$attrname = GETPOST('attrname', 'alpha'); -$elementtype = 'payment_various'; // Must match the table_element of PaymentVarious - -if (!$user->admin) { - accessforbidden(); -} - - -/* - * Actions - */ - -require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; - - -/* - * View - */ - -$textobject = $langs->transnoentitiesnoconv("VariousPayments"); - -llxHeader('', $langs->trans("BankSetupModule")); - -$linkback = ''.$langs->trans("BackToModuleList").''; -print load_fiche_titre($langs->trans("BankSetupModule"), $linkback, 'title_setup'); - -$head = bank_admin_prepare_head(null); - -print dol_get_fiche_head($head, 'bank_various_payment_extrafields', $langs->trans("BankSetupModule"), -1, ''); - -require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; - -print dol_get_fiche_end(); - - -// Buttons -if ($action != 'create' && $action != 'edit') { - print '
'; - print ''.$langs->trans("NewAttribute").''; - print "
"; -} - - -// Creation of an optional field -if ($action == 'create') { - print '
'; - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; -} - -// Edition of an optional field -if ($action == 'edit' && !empty($attrname)) { - print "
"; - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; -} - -// End of page -llxFooter(); -$db->close(); diff --git a/htdocs/admin/bankline_extrafields.php b/htdocs/admin/bankline_extrafields.php deleted file mode 100644 index d5b58630116..00000000000 --- a/htdocs/admin/bankline_extrafields.php +++ /dev/null @@ -1,116 +0,0 @@ - - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2014 Florian Henry - * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2022-2026 Frédéric France - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/admin/bankline_extrafields.php - * \ingroup bank - * \brief Page to setup extra fields of bankline - */ - -// Load Dolibarr environment -require '../main.inc.php'; - -/** - * @var Conf $conf - * @var DoliDB $db - * @var ExtraFields $extrafields - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ - -require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; - -// Load translation files required by the page -$langs->loadLangs(array("admin", "companies", "bills", "other", "banks")); - -$form = new Form($db); - -// List of supported format -$type2label = ExtraFields::getListOfTypesLabels(); - -$action = GETPOST('action', 'aZ09'); -$attrname = GETPOST('attrname', 'alpha'); -$elementtype = 'bank'; //Must be the $table_element of the class that manage extrafield - -if (!$user->admin) { - accessforbidden(); -} - - -/* - * Actions - */ - -require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; - -/* - * View - */ - - -$help_url = ''; -$page_name = "BankSetupModule"; - -llxHeader('', $langs->trans("BankSetupModule"), $help_url, '', 0, 0, '', '', '', 'mod-admin page-bankline_extrafields'); - - -$linkback = ''.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').''.$langs->trans("BackToModuleList").''; - -print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup'); - - -$head = bank_admin_prepare_head(null); - -print dol_get_fiche_head($head, 'bankline_extrafields', $langs->trans($page_name), -1, 'account'); - -$textobject = $langs->transnoentitiesnoconv("BankTransaction"); - -require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; - -print dol_get_fiche_end(); - - -/* - * Creation of an optional field - */ -if ($action == 'create') { - print '
'; - print load_fiche_titre($langs->trans('NewAttribute')); - - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; -} - -/* - * Edition of an optional field - */ -if ($action == 'edit' && !empty($attrname)) { - print "
"; - print load_fiche_titre($langs->trans("FieldEdition", $attrname)); - - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; -} - -// End of page -llxFooter(); -$db->close(); diff --git a/htdocs/core/lib/admin_extrafields.lib.php b/htdocs/core/lib/admin_extrafields.lib.php index 1c0b4a93ad2..2517b9e3b24 100644 --- a/htdocs/core/lib/admin_extrafields.lib.php +++ b/htdocs/core/lib/admin_extrafields.lib.php @@ -242,5 +242,49 @@ function getExtrafieldsAdminMap() 'helpurl' => 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder', 'langs' => array('admin', 'members'), ), + 'bank_account' => array( + 'headfunction' => 'bank_admin_prepare_head', + 'headfile' => 'core/lib/bank.lib.php', + 'tabid' => 'attributes', + 'headlabel' => 'BankSetupModule', + 'textobject' => 'Bank', + 'headpicto' => 'account', + 'title' => 'BankSetupModule', + 'helpurl' => '', + 'langs' => array('banks', 'admin'), + ), + 'bank' => array( + 'headfunction' => 'bank_admin_prepare_head', + 'headfile' => 'core/lib/bank.lib.php', + 'tabid' => 'bankline_extrafields', + 'headlabel' => 'BankSetupModule', + 'textobject' => 'BankTransaction', + 'headpicto' => 'account', + 'title' => 'BankSetupModule', + 'helpurl' => '', + 'langs' => array('admin', 'companies', 'bills', 'other', 'banks'), + ), + 'paiement' => array( + 'headfunction' => 'bank_admin_prepare_head', + 'headfile' => 'core/lib/bank.lib.php', + 'tabid' => 'bank_payments_extrafields', + 'headlabel' => 'BankSetupModule', + 'textobject' => 'BankTransaction', + 'headpicto' => 'account', + 'title' => 'BankSetupModule', + 'helpurl' => '', + 'langs' => array('admin', 'companies', 'bills', 'other', 'banks'), + ), + 'payment_various' => array( + 'headfunction' => 'bank_admin_prepare_head', + 'headfile' => 'core/lib/bank.lib.php', + 'tabid' => 'bank_various_payment_extrafields', + 'headlabel' => 'BankSetupModule', + 'textobject' => 'VariousPayments', + 'headpicto' => '', + 'title' => 'BankSetupModule', + 'helpurl' => '', + 'langs' => array('admin', 'banks', 'other'), + ), ); } diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php index fc54af1e11d..bbdaa8a6640 100644 --- a/htdocs/core/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -198,7 +198,7 @@ function bank_report_prepare_head(Account $object) * @param ?CommonObject $object Object related to tabs * @return array Array of tabs to show */ -function bank_admin_prepare_head($object) +function bank_admin_prepare_head($object = null) { global $langs, $conf, $extrafields; @@ -229,7 +229,7 @@ function bank_admin_prepare_head($object) // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_admin'); - $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/bank_extrafields.php'); + $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/extrafields.php', array('elementtype' => 'bank_account')); $head[$h][1] = $langs->trans("ExtraFields").' ('.$langs->trans("BankAccounts").')'; $nbExtrafields = $extrafields->attributes['bank_account']['count']; if ($nbExtrafields > 0) { @@ -238,7 +238,7 @@ function bank_admin_prepare_head($object) $head[$h][2] = 'attributes'; $h++; - $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/bankline_extrafields.php'); + $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/extrafields.php', array('elementtype' => 'bank')); $head[$h][1] = $langs->trans("ExtraFields").' ('.$langs->trans("BankTransactions").')'; $nbExtrafields = $extrafields->attributes['bank']['count']; if ($nbExtrafields > 0) { @@ -247,7 +247,7 @@ function bank_admin_prepare_head($object) $head[$h][2] = 'bankline_extrafields'; $h++; - $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/bank_payments_extrafields.php'); + $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/extrafields.php', array('elementtype' => 'paiement')); $head[$h][1] = $langs->trans("ExtraFields").' ('.$langs->trans("Payments").')'; $nbExtrafields = $extrafields->attributes['paiement']['count']; if ($nbExtrafields > 0) { @@ -256,7 +256,7 @@ function bank_admin_prepare_head($object) $head[$h][2] = 'bank_payments_extrafields'; $h++; - $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/bank_various_payment_extrafields.php'); + $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/extrafields.php', array('elementtype' => 'payment_various')); $head[$h][1] = $langs->trans("ExtraFields").' ('.$langs->trans("VariousPayments").')'; $nbExtrafields = $extrafields->attributes['payment_various']['count']; if ($nbExtrafields > 0) {