diff --git a/htdocs/asset/admin/asset_extrafields.php b/htdocs/asset/admin/asset_extrafields.php index dfec16bfb66..5883ec96a91 100644 --- a/htdocs/asset/admin/asset_extrafields.php +++ b/htdocs/asset/admin/asset_extrafields.php @@ -6,7 +6,7 @@ * Copyright (C) 2014 Florian Henry * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2018 Alexandre Spangaro - * Copyright (C) 2024 Frédéric France + * 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 @@ -30,21 +30,21 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.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/asset.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + // Load translation files required by the page $langs->loadLangs(array("assets", "admin", "companies")); -$extrafields = new ExtraFields($db); $form = new Form($db); // List of supported format diff --git a/htdocs/asset/admin/assetmodel_extrafields.php b/htdocs/asset/admin/assetmodel_extrafields.php index 24ea12ec29f..6e0a320731f 100644 --- a/htdocs/asset/admin/assetmodel_extrafields.php +++ b/htdocs/asset/admin/assetmodel_extrafields.php @@ -6,7 +6,7 @@ * Copyright (C) 2014 Florian Henry * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2018 Alexandre Spangaro - * Copyright (C) 2024 Frédéric France + * 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 @@ -30,21 +30,21 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.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/asset.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + // Load translation files required by the page $langs->loadLangs(array("assets", "admin", "companies")); -$extrafields = new ExtraFields($db); $form = new Form($db); // List of supported format diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php index ee512a93110..8fccdb67ae2 100644 --- a/htdocs/asset/card.php +++ b/htdocs/asset/card.php @@ -1,7 +1,7 @@ * Copyright (C) 2018-2025 Alexandre Spangaro - * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2025-2026 MDW * * This program is free software; you can redistribute it and/or modify @@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user @@ -54,7 +55,6 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // Initialize a technical objects $object = new Asset($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('assetcard', 'globalcard')); // Note that conf->hooks_modules contains array diff --git a/htdocs/asset/depreciation.php b/htdocs/asset/depreciation.php index 8d18ee95f6f..74b4e84d8c4 100644 --- a/htdocs/asset/depreciation.php +++ b/htdocs/asset/depreciation.php @@ -2,7 +2,7 @@ /* Copyright (C) 2007-2017 Laurent Destailleur * Copyright (C) 2018 Alexandre Spangaro * Copyright (C) 2024 MDW - * Copyright (C) 2024-2025 Frédéric France + * 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 @@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.ph /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user @@ -51,7 +52,6 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Initialize a technical objects $object = new Asset($db); $assetdepreciationoptions = new AssetDepreciationOptions($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('assetdepreciation', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/asset/depreciation_options.php b/htdocs/asset/depreciation_options.php index 97483a0ad17..6027e8d5c69 100644 --- a/htdocs/asset/depreciation_options.php +++ b/htdocs/asset/depreciation_options.php @@ -1,7 +1,7 @@ * Copyright (C) 2018 Alexandre Spangaro - * Copyright (C) 2024 Frédéric France + * 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 @@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.ph /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user @@ -51,7 +52,6 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $ // Initialize a technical objects $object = new Asset($db); $assetdepreciationoptions = new AssetDepreciationOptions($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('assetdepreciationoptions', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/asset/disposal.php b/htdocs/asset/disposal.php index 1b1934827e6..95a10e1a5fa 100644 --- a/htdocs/asset/disposal.php +++ b/htdocs/asset/disposal.php @@ -1,7 +1,7 @@ * Copyright (C) 2018 Alexandre Spangaro - * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user @@ -49,7 +50,6 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Initialize a technical objects $object = new Asset($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('assetdisposal', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php index ba2dfc50f83..533e0ff0442 100644 --- a/htdocs/asset/document.php +++ b/htdocs/asset/document.php @@ -2,7 +2,7 @@ /* Copyright (C) 2007-2017 Laurent Destailleur * Copyright (C) 2018-2021 Alexandre Spangaro * Copyright (C) 2024 MDW - * Copyright (C) 2024-2025 Frédéric France + * 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 @@ -24,16 +24,17 @@ * \brief Page for attached files on assets */ +// 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 */ -// Load Dolibarr environment -require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php'; require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; @@ -70,7 +71,6 @@ if (!$sortfield) { // Initialize a technical objects $object = new Asset($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('assetdocument', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php index 75e6db23198..eb3fd206dd4 100644 --- a/htdocs/asset/list.php +++ b/htdocs/asset/list.php @@ -2,7 +2,7 @@ /* Copyright (C) 2007-2017 Laurent Destailleur * Copyright (C) 2018-2024 Alexandre Spangaro * Copyright (C) 2018 Ferran Marcet - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2024-2025 MDW * * This program is free software; you can redistribute it and/or modify @@ -25,16 +25,17 @@ * \brief List page for asset */ +// 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 */ -// Load Dolibarr environment -require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; @@ -73,7 +74,6 @@ $pagenext = $page + 1; // Initialize technical objects $object = new Asset($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array diff --git a/htdocs/asset/model/accountancy_codes.php b/htdocs/asset/model/accountancy_codes.php index ce517ee7cc7..e71f0c02cbf 100644 --- a/htdocs/asset/model/accountancy_codes.php +++ b/htdocs/asset/model/accountancy_codes.php @@ -1,7 +1,7 @@ * Copyright (C) 2018 Alexandre Spangaro - * Copyright (C) 2024 Frédéric France + * 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 @@ -28,6 +28,7 @@ require '../../main.inc.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user @@ -50,7 +51,6 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // Initialize a technical objects $object = new AssetModel($db); $assetaccountancycodes = new AssetAccountancyCodes($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id; $hookmanager->initHooks(array('assetmodelaccountancycodes', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php index 3607bedfa5b..649041b9cc8 100644 --- a/htdocs/asset/model/agenda.php +++ b/htdocs/asset/model/agenda.php @@ -1,7 +1,7 @@ * Copyright (C) ---Put here your own copyright and developer email--- - * Copyright (C) 2024 Frédéric France + * 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 @@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user @@ -79,7 +80,6 @@ if (!$sortorder) { // Initialize a technical objects $object = new AssetModel($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id; $hookmanager->initHooks(array('assetmodelagenda', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/asset/model/card.php b/htdocs/asset/model/card.php index 3ee0b82b325..5c8fe60c4c4 100644 --- a/htdocs/asset/model/card.php +++ b/htdocs/asset/model/card.php @@ -1,7 +1,7 @@ * Copyright (C) 2018 Alexandre Spangaro - * Copyright (C) 2024-2025 Frédéric France + * 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 @@ -25,6 +25,15 @@ // 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/asset.lib.php'; require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php'; @@ -32,14 +41,6 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php'; require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ - // Load translation files required by the page $langs->loadLangs(array("assets", "other")); @@ -57,7 +58,6 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $object = new AssetModel($db); $assetdepreciationoptions = new AssetDepreciationOptions($db); $assetaccountancycodes = new AssetAccountancyCodes($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id; $hookmanager->initHooks(array('assetmodelcard', 'globalcard')); // Note that conf->hooks_modules contains array diff --git a/htdocs/asset/model/depreciation_options.php b/htdocs/asset/model/depreciation_options.php index 38c599c0324..906ba6b8b22 100644 --- a/htdocs/asset/model/depreciation_options.php +++ b/htdocs/asset/model/depreciation_options.php @@ -1,7 +1,7 @@ * Copyright (C) 2018 Alexandre Spangaro - * Copyright (C) 2024 Frédéric France + * 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 @@ -25,18 +25,19 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php'; -require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php'; -require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.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/asset.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php'; +require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php'; + // Load translation files required by the page $langs->loadLangs(array("assets", "companies")); @@ -51,7 +52,6 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // Initialize a technical objects $object = new AssetModel($db); $assetdepreciationoptions = new AssetDepreciationOptions($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id; $hookmanager->initHooks(array('assetmodeldeprectationoptions', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php index aa761a3f032..f4317e2ab86 100644 --- a/htdocs/asset/model/list.php +++ b/htdocs/asset/model/list.php @@ -1,7 +1,7 @@ * Copyright (C) 2018-2024 Alexandre Spangaro - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2024-2025 MDW * * This program is free software; you can redistribute it and/or modify @@ -26,20 +26,21 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/asset/class/assetmodel.class.php'; - /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Societe $mysoc * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/asset/class/assetmodel.class.php'; + // Load translation files required by the page $langs->loadLangs(array("assets", "other")); @@ -69,7 +70,6 @@ $pagenext = $page + 1; // Initialize a technical objects $object = new AssetModel($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('assetmodellist')); // Note that conf->hooks_modules contains array diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php index a9e73605252..0827ab93f9e 100644 --- a/htdocs/asset/note.php +++ b/htdocs/asset/note.php @@ -1,7 +1,7 @@ * Copyright (C) 2018 Alexandre Spangaro - * Copyright (C) 2024-2025 Frédéric France + * 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 @@ -25,17 +25,18 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.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/asset.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php'; + // Load translation files required by the page $langs->loadLangs(array("assets", "companies")); @@ -48,7 +49,6 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Initialize a technical objects $object = new Asset($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('assetnote', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php index 96e63fbcf82..90f8dd53099 100644 --- a/htdocs/bom/bom_agenda.php +++ b/htdocs/bom/bom_agenda.php @@ -39,6 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php'; require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php'; + // Load translation files required by the page $langs->loadLangs(array('mrp', 'other')); diff --git a/htdocs/bookcal/admin/availabilities_extrafields.php b/htdocs/bookcal/admin/availabilities_extrafields.php index 1694ad378c8..f72a1c04462 100644 --- a/htdocs/bookcal/admin/availabilities_extrafields.php +++ b/htdocs/bookcal/admin/availabilities_extrafields.php @@ -5,7 +5,7 @@ * Copyright (C) 2012 Regis Houssin * Copyright (C) 2014 Florian Henry * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2024 Frédéric France + * 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 @@ -32,6 +32,7 @@ require '../../main.inc.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user @@ -42,7 +43,6 @@ require_once '../lib/bookcal.lib.php'; // Load translation files required by the page $langs->loadLangs(array('agenda', 'admin')); -$extrafields = new ExtraFields($db); $form = new Form($db); // List of supported format diff --git a/htdocs/bookcal/admin/calendar_extrafields.php b/htdocs/bookcal/admin/calendar_extrafields.php index a4d1f557ffc..6a9c813ed67 100644 --- a/htdocs/bookcal/admin/calendar_extrafields.php +++ b/htdocs/bookcal/admin/calendar_extrafields.php @@ -5,7 +5,7 @@ * Copyright (C) 2012 Regis Houssin * Copyright (C) 2014 Florian Henry * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -30,22 +30,20 @@ // Load Dolibarr environment require '../../main.inc.php'; - -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -require_once '../lib/bookcal.lib.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/class/extrafields.class.php'; +require_once '../lib/bookcal.lib.php'; // Load translation files required by the page $langs->loadLangs(array('agenda', 'admin')); -$extrafields = new ExtraFields($db); $form = new Form($db); // List of supported format diff --git a/htdocs/bookcal/availabilities_agenda.php b/htdocs/bookcal/availabilities_agenda.php index d12b04306dc..0b9f0e17daf 100644 --- a/htdocs/bookcal/availabilities_agenda.php +++ b/htdocs/bookcal/availabilities_agenda.php @@ -1,6 +1,6 @@ - * Copyright (C) 2024-2025 Frédéric France + * 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 @@ -24,20 +24,20 @@ // 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.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/class/availabilities.class.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ - // Load translation files required by the page $langs->loadLangs(array("agenda", "other")); @@ -80,7 +80,6 @@ if (!$sortorder) { // Initialize a technical objects $object = new Availabilities($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('availabilitiesagenda', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php index 4552c48cbcb..f0e5d960be4 100644 --- a/htdocs/bookcal/availabilities_card.php +++ b/htdocs/bookcal/availabilities_card.php @@ -1,7 +1,7 @@ * Copyright (C) 2022 Alice Adminson - * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -29,6 +29,7 @@ require '../main.inc.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Societe $mysoc * @var Translate $langs @@ -58,7 +59,6 @@ $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09'); // Initialize a technical objects $object = new Availabilities($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('availabilitiescard', 'globalcard')); // Note that conf->hooks_modules contains array diff --git a/htdocs/bookcal/availabilities_contact.php b/htdocs/bookcal/availabilities_contact.php index 5f6ea80136c..ff895a1525b 100644 --- a/htdocs/bookcal/availabilities_contact.php +++ b/htdocs/bookcal/availabilities_contact.php @@ -1,6 +1,6 @@ - * Copyright (C) 2024-2025 Frédéric France + * 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 @@ -24,18 +24,18 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -require_once DOL_DOCUMENT_ROOT.'/bookcal/class/availabilities.class.php'; -require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php'; - /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/bookcal/class/availabilities.class.php'; +require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php'; // Load translation files required by the page $langs->loadLangs(array("agenda", "companies", "other", "mails")); @@ -48,7 +48,6 @@ $action = GETPOST('action', 'aZ09'); // Initialize a technical objects $object = new Availabilities($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('availabilitiescontact', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/bookcal/availabilities_document.php b/htdocs/bookcal/availabilities_document.php index 11d070e4f01..eb9685bd1da 100644 --- a/htdocs/bookcal/availabilities_document.php +++ b/htdocs/bookcal/availabilities_document.php @@ -1,7 +1,7 @@ * Copyright (C) 2024 MDW - * Copyright (C) 2024-2025 Frédéric France + * 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 @@ -25,6 +25,14 @@ // 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/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; @@ -32,14 +40,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/class/availabilities.class.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ - // Load translation files required by the page $langs->loadLangs(array("agenda", "companies", "other", "mails")); @@ -70,7 +70,6 @@ if (!$sortfield) { // Initialize a technical objects $object = new Availabilities($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('availabilitiesdocument', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php index 502be196a5d..b93ed272bd1 100644 --- a/htdocs/bookcal/availabilities_list.php +++ b/htdocs/bookcal/availabilities_list.php @@ -1,7 +1,7 @@ * Copyright (C) 2022 Alice Adminson - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2024-2025 MDW * * This program is free software; you can redistribute it and/or modify @@ -26,6 +26,14 @@ // 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/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; @@ -33,14 +41,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; // load module libraries require_once __DIR__.'/class/availabilities.class.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ - // Load translation files required by the page $langs->loadLangs(array("agenda", "other")); @@ -73,7 +73,6 @@ $pagenext = $page + 1; // Initialize a technical objects $object = new Availabilities($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array diff --git a/htdocs/bookcal/availabilities_note.php b/htdocs/bookcal/availabilities_note.php index a72c6a0d3ce..93a3e4799ca 100644 --- a/htdocs/bookcal/availabilities_note.php +++ b/htdocs/bookcal/availabilities_note.php @@ -1,6 +1,6 @@ - * Copyright (C) 2024-2025 Frédéric France + * 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 @@ -24,16 +24,16 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/bookcal/class/availabilities.class.php'; -require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php'; - /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/bookcal/class/availabilities.class.php'; +require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php'; // Load translation files required by the page $langs->loadLangs(array("agenda", "companies")); @@ -42,12 +42,11 @@ $langs->loadLangs(array("agenda", "companies")); $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alpha'); $action = GETPOST('action', 'aZ09'); -$cancel = GETPOST('cancel', 'alpha'); +$cancel = GETPOST('cancel', 'alpha'); $backtopage = GETPOST('backtopage', 'alpha'); // Initialize a technical objects $object = new Availabilities($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('availabilitiesnote', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/bookcal/bookcalindex.php b/htdocs/bookcal/bookcalindex.php index 0c085c8763f..f746582519d 100644 --- a/htdocs/bookcal/bookcalindex.php +++ b/htdocs/bookcal/bookcalindex.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2024-2025 Frédéric France + * 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 @@ -27,8 +27,6 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -37,6 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; + // Load translation files required by the page $langs->loadLangs(array("agenda")); diff --git a/htdocs/bookcal/booking_list.php b/htdocs/bookcal/booking_list.php index b92dc9b1d7c..b673401193b 100644 --- a/htdocs/bookcal/booking_list.php +++ b/htdocs/bookcal/booking_list.php @@ -5,7 +5,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2017 Ferran Marcet - * Copyright (C) 2023-2024 Frédéric France + * Copyright (C) 2023-2026 Frédéric France * Copyright (C) 2024-2025 MDW * * This program is free software; you can redistribute it and/or modify @@ -33,6 +33,7 @@ require '../main.inc.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user diff --git a/htdocs/bookcal/calendar_agenda.php b/htdocs/bookcal/calendar_agenda.php index fb08035a08b..32899453433 100644 --- a/htdocs/bookcal/calendar_agenda.php +++ b/htdocs/bookcal/calendar_agenda.php @@ -1,7 +1,7 @@ * Copyright (C) 2023 Alice Adminson - * Copyright (C) 2024-2025 Frédéric France + * 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 @@ -25,6 +25,14 @@ // 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.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; @@ -32,14 +40,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/class/calendar.class.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_calendar.lib.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ - // Load translation files required by the page $langs->loadLangs(array("agenda", "other")); @@ -81,7 +81,6 @@ if (!$sortorder) { // Initialize a technical objects $object = new Calendar($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('calendaragenda', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/bookcal/calendar_card.php b/htdocs/bookcal/calendar_card.php index aa5c82a501a..e320b75c18f 100644 --- a/htdocs/bookcal/calendar_card.php +++ b/htdocs/bookcal/calendar_card.php @@ -1,7 +1,7 @@ * Copyright (C) 2023 Alice Adminson - * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -29,6 +29,7 @@ require '../main.inc.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Societe $mysoc * @var Translate $langs @@ -60,7 +61,6 @@ $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09'); // Initialize a technical objects $object = new Calendar($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('calendarcard', 'globalcard')); // Note that conf->hooks_modules contains array diff --git a/htdocs/bookcal/calendar_contact.php b/htdocs/bookcal/calendar_contact.php index c314c71778e..951d48d1690 100644 --- a/htdocs/bookcal/calendar_contact.php +++ b/htdocs/bookcal/calendar_contact.php @@ -1,7 +1,7 @@ * Copyright (C) 2023 Alice Adminson - * Copyright (C) 2024-2025 Frédéric France + * 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 @@ -25,32 +25,31 @@ // 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.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/class/calendar.class.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_calendar.lib.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ - // Load translation files required by the page $langs->loadLangs(array("agenda", "companies", "other", "mails")); $id = (GETPOST('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility $ref = GETPOST('ref', 'alpha'); $lineid = GETPOSTINT('lineid'); -$socid = GETPOSTINT('socid'); +$socid = GETPOSTINT('socid'); $action = GETPOST('action', 'aZ09'); // Initialize a technical objects $object = new Calendar($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('calendarcontact', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/bookcal/calendar_document.php b/htdocs/bookcal/calendar_document.php index 59f8e2c45a6..caebc3998cd 100644 --- a/htdocs/bookcal/calendar_document.php +++ b/htdocs/bookcal/calendar_document.php @@ -1,7 +1,7 @@ * Copyright (C) 2023 Alice Adminson - * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2024-2025 MDW * * This program is free software; you can redistribute it and/or modify @@ -26,6 +26,14 @@ // 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/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -34,18 +42,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/class/calendar.class.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_calendar.lib.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ - // Load translation files required by the page $langs->loadLangs(array("agenda", "companies", "other", "mails")); - $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm'); $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id')); @@ -72,7 +71,6 @@ if (!$sortfield) { // Initialize a technical objects $object = new Calendar($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('calendardocument', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php index ef97096b76a..badcb983b67 100644 --- a/htdocs/bookcal/calendar_list.php +++ b/htdocs/bookcal/calendar_list.php @@ -1,7 +1,7 @@ * Copyright (C) 2023 Alice Adminson - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2024-2025 MDW * * This program is free software; you can redistribute it and/or modify @@ -26,18 +26,19 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.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/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; + // load module libraries require_once __DIR__.'/class/calendar.class.php'; @@ -73,7 +74,6 @@ $pagenext = $page + 1; // Initialize a technical objects $object = new Calendar($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes diff --git a/htdocs/bookcal/calendar_note.php b/htdocs/bookcal/calendar_note.php index a3cd4662c32..3ffc5a137d9 100644 --- a/htdocs/bookcal/calendar_note.php +++ b/htdocs/bookcal/calendar_note.php @@ -1,7 +1,7 @@ * Copyright (C) 2023 Alice Adminson - * Copyright (C) 2024-2025 Frédéric France + * 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 @@ -25,18 +25,18 @@ // Load Dolibarr environment require '../main.inc.php'; - -require_once DOL_DOCUMENT_ROOT.'/bookcal/class/calendar.class.php'; -require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_calendar.lib.php'; - /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/bookcal/class/calendar.class.php'; +require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_calendar.lib.php'; + // Load translation files required by the page $langs->loadLangs(array("agenda", "companies")); @@ -49,7 +49,6 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Initialize a technical objects $object = new Calendar($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array('calendarnote', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index c79519f9254..7ef6fa346b5 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -4,7 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013-2023 Charlene BENKE * Copyright (C) 2024-2025 MDW - * Copyright (C) 2024 Frédéric France + * 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 @@ -28,10 +28,6 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -39,6 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; // Load translation files required by the page $langs->loadLangs(array('banks', 'categories')); diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 0db5bbcd208..65f289d30ad 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -8,7 +8,7 @@ * Copyright (C) 2016 Juanjo Menent * Copyright (C) 2017-2019 Alexandre Spangaro * Copyright (C) 2018 Ferran Marcet - * Copyright (C) 2018-2025 Frédéric France + * Copyright (C) 2018-2026 Frédéric France * Copyright (C) 2021 Gauthier VERDOL * Copyright (C) 2024-2025 MDW * @@ -34,6 +34,14 @@ // 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/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php'; @@ -59,14 +67,6 @@ require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ - // Load translation files required by the page $langs->loadLangs(array("banks", "bills", "categories", "companies", "margins", "salaries", "loan", "donations", "trips", "members", "compta", "accountancy")); @@ -147,7 +147,6 @@ if (($sortfield == 'b.datev' || $sortfield == 'b.datev,b.dateo,b.rowid')) { // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('banktransactionlist', $contextpage)); -$extrafields = new ExtraFields($db); $extrafieldsobjectkey = 'bank'; // Used by extrafields_..._tpl.php diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php index 8c83f68414f..b9197a2eee6 100644 --- a/htdocs/compta/bank/bilan.php +++ b/htdocs/compta/bank/bilan.php @@ -1,7 +1,7 @@ * Copyright (C) 2004 Laurent Destailleur - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2026 MDW * * This program is free software; you can redistribute it and/or modify @@ -27,8 +27,6 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -36,6 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; + // Load translation files required by the page $langs->loadLangs(array('banks', 'categories')); diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index 37bbbe629e4..b9e70da1621 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -6,7 +6,7 @@ * Copyright (C) 2014-2024 Alexandre Spangaro * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2016 Marcos García - * Copyright (C) 2018-2024 Frédéric France + * Copyright (C) 2018-2026 Frédéric France * Copyright (C) 2022 Charlene Benke * Copyright (C) 2024-2025 MDW * @@ -35,6 +35,7 @@ require '../../main.inc.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Societe $mysoc * @var Translate $langs @@ -66,7 +67,6 @@ $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $object = new Account($db); -$extrafields = new ExtraFields($db); // fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php index 6c237b9ca43..8663404dc9d 100644 --- a/htdocs/compta/bank/info.php +++ b/htdocs/compta/bank/info.php @@ -1,6 +1,6 @@ - * Copyright (C) 2024 Frédéric France + * 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 @@ -23,6 +23,9 @@ */ + +// Load Dolibarr environment +require '../../main.inc.php'; /** * @var Conf $conf * @var DoliDB $db @@ -30,9 +33,6 @@ * @var Translate $langs * @var User $user */ - -// Load Dolibarr environment -require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; @@ -88,7 +88,7 @@ $h++; print dol_get_fiche_head($head, $hselected, $langs->trans("LineRecord"), -1, 'accountline'); -$linkback = ''.$langs->trans("BackToList").''; +$linkback = ''.$langs->trans("BackToList").''; dol_banner_tab($object, 'rowid', $linkback); diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 8339565e3ce..c47c4a7a639 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -3420,9 +3420,9 @@ function validateZipFile($zip, $originalfilename, $zipfile, $langs) * Called by validateZipFile() * * @param string $dir Root dir to scan - * @param array $search Array with strings to search - * @param array $results Array with results - * @param int $count Count of errors + * @param array $search Array with strings to search + * @param array $results Array with results + * @param int<0,max> $count Count of errors * @return void */ function analyzeDirContents($dir, $search = array(), &$results = array(), &$count = 0) @@ -3450,9 +3450,15 @@ function analyzeDirContents($dir, $search = array(), &$results = array(), &$coun } if (in_array($ext, $pattern['types'])) { - if (strpos($content, ' 0) continue; // We discard files that are files into htdocs_... because it is files for core, so no need to be compatible with custom - if (strpos($path, 'phpunit') > 0) continue; // We discard files that are files into phpunit because it is files for core, so no need to be compatible with custom + if (strpos($content, ' 0) { + continue; + } // We discard files that are files into htdocs_... because it is files for core, so no need to be compatible with custom + if (strpos($path, 'phpunit') > 0) { + continue; + } // We discard files that are files into phpunit because it is files for core, so no need to be compatible with custom $regs = array(); if (!empty($pattern['multiple'])) { diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php index b22741dcf3f..22517ac67eb 100644 --- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php +++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php @@ -26,11 +26,13 @@ * @var string $extrafieldsobjectkey * @var string $extrafieldsobjectprefix * @var int $i + * @var array{nbfields:int,val:array,pos?:array} $totalarray */ ' @phan-var-force CommonObject $object @phan-var-force stdClass $obj @phan-var-force int $i +@phan-var-force array{nbfields:int,val:array,pos?:array} $totalarray '; // Protection to avoid direct call of template @@ -43,8 +45,6 @@ if (empty($extrafieldsobjectkey) && is_object($object)) { $extrafieldsobjectkey = $object->table_element; } -$totalarray = array(); - // Loop to show all columns of extrafields from $obj, $extrafields and $db if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafieldsobjectkey])) { // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ... if (array_key_exists('label', $extrafields->attributes[$extrafieldsobjectkey]) && is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label'])) { diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php index e945aa5ae1b..cc827f9b658 100644 --- a/htdocs/core/tpl/massactions_pre.tpl.php +++ b/htdocs/core/tpl/massactions_pre.tpl.php @@ -4,7 +4,7 @@ * Copyright (C) 2013-2014 Laurent Destailleur * Copyright (C) 2015 Marcos García * Copyright (C) 2024-2025 MDW - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2024 Ferran Marcet * * This program is free software; you can redistribute it and/or modify @@ -40,6 +40,7 @@ * @var CommonObject $object * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var Form $form * @var FormCompany $formcompany * @var HookManager $hookmanager @@ -205,11 +206,11 @@ if ($massaction == 'preaffectuser') { $valuefieldtasksrole .= ''; $formquestion[] = array( - 'type' => 'other', - 'name' => 'usertoaffect', - 'label' => $langs->trans("User"), - 'value' => $valuefielduser - ); + 'type' => 'other', + 'name' => 'usertoaffect', + 'label' => $langs->trans("User"), + 'value' => $valuefielduser + ); $formquestion[] = array( 'type' => 'other', 'name' => 'projectrole', @@ -378,7 +379,6 @@ if ($massaction == 'edit_extrafields') { require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $elementtype = $objecttmp->element; /** @var CommonObject $objecttmp */ - $extrafields = new ExtraFields($db); $keysuffix = ''; $extrafields->fetch_name_optionals_label($elementtype); $extrafields_list = $extrafields->attributes[$elementtype]['label']; diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index da752b4c185..869d6b0371a 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -60,6 +60,9 @@ if (isModEnabled('contract')) { if (getDolGlobalString('FICHEINTER_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').".php")) { require_once DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').'.php'; } +if (isModEnabled('category')) { + require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; +} require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; @@ -85,7 +88,7 @@ $lineid = GETPOSTINT('line_id'); $error = 0; -//PDF +// PDF $hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0)); $hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0)); $hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0)); @@ -531,8 +534,13 @@ if (empty($reshook)) { $object->array_options = $array_options; $result = $object->create($user); + if ($result > 0) { - $id = $result; // Force raffraichissement sur fiche venant d'etre cree + $id = $result; // Force refresh on a newly created record + + // Category association + $categories = GETPOST('categories', 'array'); + $object->setCategories($categories); } else { $langs->load("errors"); setEventMessages($object->error, $object->errors, 'errors'); @@ -571,6 +579,12 @@ if (empty($reshook)) { if ($result < 0) { dol_print_error($db, $object->error); } + } elseif ($action == 'settags' && isModEnabled('category') && $permissiontoadd) { + // Set tags + $result = $object->setCategories(GETPOST('categories', 'array')); + if ($result < 0) { + setEventMessages($object->error, $object->errors, 'errors'); + } } elseif ($action == 'setref_client' && $permissiontoadd) { // Set customer reference $result = $object->setRefClient($user, GETPOST('ref_client', 'alpha')); @@ -1087,6 +1101,14 @@ if ($action == 'create') { print ''; } + // Category + if (isModEnabled('category')) { + // Categories + print ''.$langs->trans("Categories").''; + print $form->selectCategories(Categorie::TYPE_FICHINTER, 'categories', $object); + print ""; + } + // Contract if (isModEnabled('contract') && is_object($formcontract)) { // This feature hang the application on large list of contracts, because the select component is not complete: it does not work like select of thirdparty or product to support large lists @@ -1468,6 +1490,33 @@ if ($action == 'create') { print ''; print ''; + // Categories + if (isModEnabled('category')) { + print ''; + print '
'; + print $langs->trans("Categories"); + print ''; + if ($permissiontoadd) { + print ''.img_edit().''; + } else { + print ' '; + } + print '
'; + print ''; + print ''; + if ($action == 'edittags') { + print '
'; + print ''; + print ''; + print $form->selectCategories(Categorie::TYPE_FICHINTER, 'categories', $object); + print ''; + print '
'; + } else { + print $form->showCategories($object->id, Categorie::TYPE_FICHINTER, 1); + } + print ""; + } + // Contract if (isModEnabled('contract')) { // This feature hang the application on large list of contracts, because the select component is not complete: it does not work like select of thirdparty or product to support large lists diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 194dbc9b3e9..44d2e129fe1 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -1605,6 +1605,22 @@ class Fichinter extends CommonObject return CommonObject::commonReplaceThirdparty($dbs, $origin_id, $dest_id, $tables); } + /** + * Sets object to given categories. + * + * Adds it to non existing supplied categories. + * Existing categories are left untouch. + * + * @param int[]|int $categories Category or categories IDs + * + * @return int Return integer <0 if KO, >0 if OK + */ + public function setCategories($categories) + { + require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; + return parent::setCategoriesCommon($categories, Categorie::TYPE_FICHINTER); + } + /** * Set customer reference number * diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index f2b36a46018..6c750f0d6b0 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -41,6 +41,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; if (isModEnabled('project')) { require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; } +if (isModEnabled('category')) { + require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php'; +} if (isModEnabled('contract')) { require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; } @@ -61,6 +65,9 @@ if (isModEnabled('project')) { if (isModEnabled('contract')) { $langs->load("contracts"); } +if (isModEnabled('category')) { + $langs->load("categories"); +} $action = GETPOST('action', 'aZ09'); $massaction = GETPOST('massaction', 'alpha'); @@ -96,6 +103,18 @@ $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_en $optioncss = GETPOST('optioncss', 'alpha'); $socid = GETPOSTINT('socid'); +$searchCategoryFichinterOperator = 0; +if (GETPOSTISSET('formfilteraction')) { + $searchCategoryFichinterOperator = GETPOSTINT('search_category_fichinter_operator'); +} elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) { + $searchCategoryFichinterOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT'); +} +$searchCategoryFichinterList = GETPOST('search_category_fichinter_list', 'array'); +$catid = GETPOST('catid', 'int'); +if (!empty($catid) && empty($searchCategoryFichinterList)) { + $searchCategoryFichinterList = array($catid); +} + $diroutputmassaction = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id; // Load variable for pagination @@ -206,6 +225,7 @@ if (empty($reshook)) { if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers $search_ref = ""; $search_ref_client = ""; + $searchCategoryFichinterList = array(); $search_company = ""; $search_projet_ref = ""; $search_contrat_ref = ""; @@ -339,6 +359,34 @@ if ($search_desc) { $sql .= natural_search(array('f.description'), $search_desc); } } +// Search for tag/category ($searchCategoryFichinterList is an array of ID) +if (!empty($searchCategoryFichinterList)) { + $searchCategoryFichinterSqlList = array(); + $listofcategoryid = ''; + foreach ($searchCategoryFichinterList as $searchCategoryFichinter) { + if (intval($searchCategoryFichinter) == -2) { + $searchCategoryFichinterSqlList[] = "NOT EXISTS (SELECT ck.fk_fichinter FROM ".MAIN_DB_PREFIX."categorie_fichinter as ck WHERE f.rowid = ck.fk_fichinter)"; + } elseif (intval($searchCategoryFichinter) > 0) { + if ($searchCategoryFichinterOperator == 0) { + $searchCategoryFichinterSqlList[] = " EXISTS (SELECT ck.fk_fichinter FROM ".MAIN_DB_PREFIX."categorie_fichinter as ck WHERE f.rowid = ck.fk_fichinter AND ck.fk_categorie = ".((int) $searchCategoryFichinter).")"; + } else { + $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryFichinter); + } + } + } + if ($listofcategoryid) { + $searchCategoryFichinterSqlList[] = " EXISTS (SELECT ck.fk_fichinter FROM ".MAIN_DB_PREFIX."categorie_fichinter as ck WHERE f.rowid = ck.fk_fichinter AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))"; + } + if ($searchCategoryFichinterOperator == 1) { + if (!empty($searchCategoryFichinterSqlList)) { + $sql .= " AND (".implode(' OR ', $searchCategoryFichinterSqlList).")"; + } + } else { + if (!empty($searchCategoryFichinterSqlList)) { + $sql .= " AND (".implode(' AND ', $searchCategoryFichinterSqlList).")"; + } + } +} if ($search_status != '' && $search_status >= 0) { $sql .= ' AND f.fk_statut = '.urlencode($search_status); } @@ -435,6 +483,10 @@ if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $s // Output page // -------------------------------------------------------------------- +$paramsCat = ''; +foreach ($searchCategoryFichinterList as $searchCategoryFichinter) { + $paramsCat .= "&search_category_fichinter_list[]=".urlencode($searchCategoryFichinter); +} llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist mod-fichinter page-list'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll @@ -465,6 +517,12 @@ if ($search_all) { if ($socid) { $param .= "&socid=".urlencode((string) ($socid)); } +if ($searchCategoryFichinterOperator == 1) { + $param .= "&search_category_fichinter_operator=".urlencode((string) $searchCategoryFichinterOperator); +} +foreach ($searchCategoryFichinterList as $searchCategoryFichinter) { + $param .= "&search_category_fichinter_list[]=".urlencode($searchCategoryFichinter); +} if ($search_ref) { $param .= "&search_ref=".urlencode($search_ref); } @@ -523,7 +581,10 @@ $arrayofmassactions = array( if (!empty($permissiontodelete)) { $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete"); } -if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) { +if (isModEnabled('category') && $user->hasRight('categorie', 'creer')) { + $arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag"); +} +if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) { $arrayofmassactions = array(); } $massactionbutton = $form->selectMassAction('', $arrayofmassactions); @@ -562,6 +623,14 @@ $objecttmp = new Fichinter($db); $trackid = 'int'.$object->id; include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; +if (!empty($catid)) { + print "
"; + $c = new Categorie($db); + $ways = $c->print_all_ways(' > ', 'fichinter/list.php'); + print " > ".$ways[0]."
\n"; + print "

"; +} + if ($search_all) { $setupstring = ''; foreach ($fieldstosearchall as $key => $val) { @@ -572,8 +641,12 @@ if ($search_all) { print '
'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'
'."\n"; } +// Filter on categories $moreforfilter = ''; - +if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) { + $formcategory = new FormCategory($db); + $moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_FICHINTER, $searchCategoryFichinterList, 'minwidth300', $searchCategoryFichinterOperator ? $searchCategoryFichinterOperator : 0); +} $parameters = array(); $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook if (empty($reshook)) { diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index c61dc24bf26..76cf25d2b6b 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -1,6 +1,6 @@ - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) ---Replace with your own copyright and developer email--- * * This program is free software; you can redistribute it and/or modify diff --git a/htdocs/workstation/lib/workstation.lib.php b/htdocs/workstation/lib/workstation.lib.php index 915c6c6444b..c24d7ccca4e 100644 --- a/htdocs/workstation/lib/workstation.lib.php +++ b/htdocs/workstation/lib/workstation.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2024 MDW * * This program is free software: you can redistribute it and/or modify @@ -30,9 +30,8 @@ */ function workstationAdminPrepareHead() { - global $conf, $db, $langs; + global $conf, $extrafields, $langs; - $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label('workstation_workstation'); $langs->load("workstation"); diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php index 5b9870bca04..f57a7dafe1d 100644 --- a/htdocs/workstation/workstation_card.php +++ b/htdocs/workstation/workstation_card.php @@ -26,14 +26,6 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -require_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php'; -require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php'; -require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php'; -require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstationusergroup.class.php'; -require_once DOL_DOCUMENT_ROOT.'/workstation/lib/workstation_workstation.lib.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -43,6 +35,14 @@ require_once DOL_DOCUMENT_ROOT.'/workstation/lib/workstation_workstation.lib.php * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php'; +require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php'; +require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstationusergroup.class.php'; +require_once DOL_DOCUMENT_ROOT.'/workstation/lib/workstation_workstation.lib.php'; + // Load translation files required by the page $langs->loadLangs(array('mrp', 'other')); @@ -53,18 +53,15 @@ $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); $cancel = GETPOST('cancel'); $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search -$backtopage = GETPOST('backtopage', 'alpha'); +$backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09'); -$groups = GETPOST('groups', 'array:int'); -$resources = GETPOST('resources', 'array:int'); -//$lineid = GETPOST('lineid', 'int'); +$groups = GETPOST('groups', 'array:int'); +$resources = GETPOST('resources', 'array:int'); // Initialize a technical objects $object = new Workstation($db); - -//$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id; $hookmanager->initHooks(array($object->element.'card', 'globalcard')); // Note that conf->hooks_modules contains array diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php index 4d897f2dc82..d90db1be316 100755 --- a/scripts/bank/export-bank-receipts.php +++ b/scripts/bank/export-bank-receipts.php @@ -40,6 +40,12 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } require_once $path."../../htdocs/master.inc.php"; +/** + * @var Conf $conf + * @var DoliDB $db + * @var HookManager $hookmanager + * @var Translate $langs + */ require_once DOL_DOCUMENT_ROOT.'/core/lib/functionscli.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; @@ -54,12 +60,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - */ // Global variables $version = DOL_VERSION; $error = 0;