From 7d62a04fda173412db0c946394ced439d34f3e3c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 19 Jan 2026 18:16:57 +0100 Subject: [PATCH] Fix CI --- htdocs/accountancy/class/bookkeeping.class.php | 6 +++++- htdocs/admin/dav.php | 5 ++--- phpstan.neon.dist | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php index c6a92434596..672a2777e49 100644 --- a/htdocs/accountancy/class/bookkeeping.class.php +++ b/htdocs/accountancy/class/bookkeeping.class.php @@ -3146,7 +3146,7 @@ class BookKeeping extends CommonObject } } - // Insert bookkeeping record for income statement + // Insert bookkeeping record for income statement (loss or profit when closing) if (!$error && $income_statement_amount != 0) { $mt = $income_statement_amount; $accountingaccount = new AccountingAccount($this->db); @@ -3165,6 +3165,7 @@ class BookKeeping extends CommonObject $bookkeeping->thirdparty_code = ''; if ($separate_auxiliary_account) { + /* $obj->subledger_account is not defined here, so all this code do nothing $bookkeeping->subledger_account = $obj->subledger_account; $sql = 'SELECT'; $sql .= " subledger_label"; @@ -3180,6 +3181,9 @@ class BookKeeping extends CommonObject } $objtmp = $this->db->fetch_object($result); $bookkeeping->subledger_label = $objtmp->subledger_label ?? null; // latest subledger label used + */ + $bookkeeping->subledger_account = null; + $bookkeeping->subledger_label = null; } else { $bookkeeping->subledger_account = null; $bookkeeping->subledger_label = null; diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php index 0afe48564ea..60ade49afca 100644 --- a/htdocs/admin/dav.php +++ b/htdocs/admin/dav.php @@ -24,9 +24,6 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/dav/dav.lib.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -37,6 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/dav/dav.lib.php'; * * @var string $dolibarr_main_url_root */ +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/dav/dav.lib.php'; // Load translation files required by the page $langs->loadLangs(array("admin", "other", "agenda")); diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 8a3c5c3c29b..e0e0e2fc2e3 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -78,6 +78,7 @@ parameters: - '#Empty array passed to foreach#' - '#Unable to resolve the template type T#' - '#in empty\(\) always exists and is always falsy#' + - '#in empty\(\) always exists and is not falsy#' internalErrorsCountLimit: 50 cache: # nodesByFileCountMax: 512