diff --git a/htdocs/admin/bom_extrafields.php b/htdocs/admin/bom_extrafields.php deleted file mode 100644 index dbba8557312..00000000000 --- a/htdocs/admin/bom_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) 2024-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/bom_extrafields.php - * \ingroup bom - * \brief Page to setup extra fields of BOM - */ - -// 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.'/bom/lib/bom.lib.php'; - -// Load translation files required by the page -$langs->loadLangs(array('mrp', 'admin')); - -$form = new Form($db); - -// List of supported format -$type2label = ExtraFields::getListOfTypesLabels(); - -$action = GETPOST('action', 'aZ09'); -$attrname = GETPOST('attrname', 'alpha'); -$elementtype = 'bom_bom'; - -if (!$user->admin) { - accessforbidden(); -} - - -/* - * Actions - */ - -require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; - - - -/* - * View - */ - -$textobject = $langs->transnoentitiesnoconv("BOM"); - -$help_url = ''; -llxHeader('', $langs->trans("BOMsSetup"), $help_url, '', 0, 0, '', '', '', 'mod-admin page-bom_extrafiels'); - - -$linkback = ''.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').''.$langs->trans("BackToModuleList").''; - -print load_fiche_titre($langs->trans("BOMsSetup"), $linkback, 'title_setup'); - - -$head = bomAdminPrepareHead(); - -print dol_get_fiche_head($head, 'bom_extrafields', $langs->trans("ExtraFields"), -1, 'account'); - -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/bomline_extrafields.php b/htdocs/admin/bomline_extrafields.php deleted file mode 100644 index a1fa9a25267..00000000000 --- a/htdocs/admin/bomline_extrafields.php +++ /dev/null @@ -1,122 +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-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/bomline_extrafields.php - * \ingroup bom - * \brief Page to setup extra fields of BOM - */ - -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 . '/bom/lib/bom.lib.php'; - -// Load translation files required by the page -$langs->loadLangs(array('mrp', 'admin')); - -$form = new Form($db); - -// List of supported format -$type2label = ExtraFields::getListOfTypesLabels(); - -$action = GETPOST('action', 'aZ09'); -$attrname = GETPOST('attrname', 'alpha'); -$elementtype = 'bom_bomline'; - -if (!$user->admin) { - accessforbidden(); -} - - -/* - * Actions - */ - -require DOL_DOCUMENT_ROOT . '/core/actions_extrafields.inc.php'; - - -/* - * View - */ - -$textobject = $langs->transnoentitiesnoconv("BOM"); - - -$help_url = ''; -llxHeader('', $langs->trans("BOMsSetup"), $help_url, '', 0, 0, '', '', '', 'mod-admin page-bomline_extrafields'); - - -$linkback = ''.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').''.$langs->trans("BackToModuleList").''; - -print load_fiche_titre($langs->trans("BOMsSetup"), $linkback, 'title_setup'); - - -$head = bomAdminPrepareHead(); - -print dol_get_fiche_head($head, 'bomline_extrafields', $langs->trans("ExtraFields"), -1, 'account'); - -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 '
'; - 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/bom/lib/bom.lib.php b/htdocs/bom/lib/bom.lib.php index 5233d354586..3a271052246 100644 --- a/htdocs/bom/lib/bom.lib.php +++ b/htdocs/bom/lib/bom.lib.php @@ -45,7 +45,7 @@ function bomAdminPrepareHead() $head[$h][2] = 'settings'; $h++; - $head[$h][0] = dolBuildUrl(DOL_URL_ROOT."/admin/bom_extrafields.php"); + $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/extrafields.php', array('elementtype' => 'bom_bom')); $head[$h][1] = $langs->trans("ExtraFields"); $nbExtrafields = (isset($extrafields->attributes['bom_bom']['label']) && is_countable($extrafields->attributes['bom_bom']['label'])) ? count($extrafields->attributes['bom_bom']['label']) : 0; if ($nbExtrafields > 0) { @@ -54,7 +54,7 @@ function bomAdminPrepareHead() $head[$h][2] = 'bom_extrafields'; $h++; - $head[$h][0] = dolBuildUrl(DOL_URL_ROOT."/admin/bomline_extrafields.php"); + $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/extrafields.php', array('elementtype' => 'bom_bomline')); $head[$h][1] = $langs->trans("ExtraFieldsLines"); $nbExtrafields = (isset($extrafields->attributes['bom_bomline']['label']) && is_countable($extrafields->attributes['bom_bomline']['label'])) ? count($extrafields->attributes['bom_bomline']['label']) : 0; if ($nbExtrafields > 0) { diff --git a/htdocs/core/lib/admin_extrafields.lib.php b/htdocs/core/lib/admin_extrafields.lib.php index 2517b9e3b24..8d9083f543b 100644 --- a/htdocs/core/lib/admin_extrafields.lib.php +++ b/htdocs/core/lib/admin_extrafields.lib.php @@ -286,5 +286,27 @@ function getExtrafieldsAdminMap() 'helpurl' => '', 'langs' => array('admin', 'banks', 'other'), ), + 'bom_bom' => array( + 'headfunction' => 'bomAdminPrepareHead', + 'headfile' => 'bom/lib/bom.lib.php', + 'tabid' => 'bom_extrafields', + 'headlabel' => 'ExtraFields', + 'textobject' => 'BOM', + 'headpicto' => 'account', + 'title' => 'BOMsSetup', + 'helpurl' => '', + 'langs' => array('mrp', 'admin'), + ), + 'bom_bomline' => array( + 'headfunction' => 'bomAdminPrepareHead', + 'headfile' => 'bom/lib/bom.lib.php', + 'tabid' => 'bomline_extrafields', + 'headlabel' => 'ExtraFields', + 'textobject' => 'BOM', + 'headpicto' => 'account', + 'title' => 'BOMsSetup', + 'helpurl' => '', + 'langs' => array('mrp', 'admin'), + ), ); }