From 30e28d5f8aad5139508df9bcd3ffb4fea9d0aee3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 12 Mar 2026 16:37:01 +0100 Subject: [PATCH] CI --- htdocs/admin/limits.php | 6 +++--- htdocs/admin/usergroup.php | 7 +++++-- htdocs/asset/model/accountancy_codes.php | 8 ++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 94ac345a736..8aab7d89509 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -27,16 +27,16 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; - /** * @var Conf $conf * @var DoliDB $db * @var HookManager $hookmanager + * @var Societe $mysoc * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Load translation files required by the page $langs->loadLangs(array('companies', 'products', 'admin')); diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php index ab7ed5a7386..7c0303b34dd 100644 --- a/htdocs/admin/usergroup.php +++ b/htdocs/admin/usergroup.php @@ -57,14 +57,17 @@ $modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions $type = 'group'; + /* * Action */ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php'; +$reg = array(); + if ($action == 'set_default') { - $ret = addDocumentModel($value, $type, $label, $scandir); + $ret = addDocumentModel($value, $type, '', ''); $res = true; } elseif ($action == 'del_default') { $ret = delDocumentModel($value, $type); @@ -85,7 +88,7 @@ if ($action == 'set_default') { // On active le modele $ret = delDocumentModel($value, $type); if ($ret > 0) { - $ret = addDocumentModel($value, $type, $label, $scandir); + $ret = addDocumentModel($value, $type, '', ''); } $res = true; } elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) { diff --git a/htdocs/asset/model/accountancy_codes.php b/htdocs/asset/model/accountancy_codes.php index 5c9e07546ca..ce517ee7cc7 100644 --- a/htdocs/asset/model/accountancy_codes.php +++ b/htdocs/asset/model/accountancy_codes.php @@ -25,10 +25,6 @@ // 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/assetaccountancycodes.class.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -36,6 +32,9 @@ require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php'; * @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/assetaccountancycodes.class.php'; // Load translation files required by the page $langs->loadLangs(array("assets", "companies")); @@ -46,6 +45,7 @@ $ref = GETPOST('ref', 'alpha'); $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'alpha'); $backtopage = GETPOST('backtopage', 'alpha'); +$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // Initialize a technical objects $object = new AssetModel($db);