From 4951edfbd02b9d0688b321c39280efada047478f Mon Sep 17 00:00:00 2001 From: yveslg <32737403+yveslg@users.noreply.github.com> Date: Sun, 8 Feb 2026 20:09:40 +0100 Subject: [PATCH] Fix/accountancy pdf wrong labels (#37153) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * FIX #37147 Limit account fetch to active chart of accounts in PDF exports When multiple chart of accounts have the same account number, the PDF exports (balance and ledger) could retrieve the wrong account label. * FIX #37147 Decode HTML entities in balance PDF account group labels The balance PDF export was displaying HTML entities (like &EACUTE;) instead of properly decoded characters (like É) in account group labels. --- htdocs/core/modules/accountancy/doc/pdf_balance.modules.php | 6 +++--- htdocs/core/modules/accountancy/doc/pdf_ledger.modules.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/modules/accountancy/doc/pdf_balance.modules.php b/htdocs/core/modules/accountancy/doc/pdf_balance.modules.php index 2f17ce5d428..d1374bff835 100644 --- a/htdocs/core/modules/accountancy/doc/pdf_balance.modules.php +++ b/htdocs/core/modules/accountancy/doc/pdf_balance.modules.php @@ -303,7 +303,7 @@ class pdf_balance extends ModelePdfAccountancy $groupDebit = $groupCredit = $totalDebit = $totalCredit = 0; for ($i = 0; $i < $nblines; $i++) { $accountingAccount = new AccountingAccount($this->db); - $accountingAccount->fetch(0, $object->lines[$i]->numero_compte); + $accountingAccount->fetch(0, $object->lines[$i]->numero_compte, true); // Init the first account group if (empty($accountGroup)) { @@ -317,7 +317,7 @@ class pdf_balance extends ModelePdfAccountancy $curY, $nexY, $default_font_size, - $langs->trans('Total') . ' ' . $langs->trans('AccountancyGroup' . $accountGroup), + $langs->transnoentitiesnoconv('Total') . ' ' . $langs->transnoentitiesnoconv('AccountancyGroup' . $accountGroup), $tab_top_newpage, $groupDebit, $groupCredit @@ -503,7 +503,7 @@ class pdf_balance extends ModelePdfAccountancy $curY, $nexY, $default_font_size, - $langs->trans('Total') . ' ' . $langs->trans('AccountancyGroup' . $accountingAccount->pcg_type), + $langs->transnoentitiesnoconv('Total') . ' ' . $langs->transnoentitiesnoconv('AccountancyGroup' . $accountingAccount->pcg_type), $tab_top_newpage, $groupDebit, $groupCredit diff --git a/htdocs/core/modules/accountancy/doc/pdf_ledger.modules.php b/htdocs/core/modules/accountancy/doc/pdf_ledger.modules.php index 848954f80a4..0c7ccb6b0b0 100644 --- a/htdocs/core/modules/accountancy/doc/pdf_ledger.modules.php +++ b/htdocs/core/modules/accountancy/doc/pdf_ledger.modules.php @@ -336,7 +336,7 @@ class pdf_ledger extends ModelePdfAccountancy } else { if (empty($account) || $account != $object->lines[$i]->numero_compte) { $accountingAccount = new AccountingAccount($this->db); - $accountingAccount->fetch(0, $object->lines[$i]->numero_compte); + $accountingAccount->fetch(0, $object->lines[$i]->numero_compte, true); // Add the subtotal line if (!empty($account)) {