From dd09cb5f6989ba1ecb543911e29a43c1e36cd990 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Mon, 1 Sep 2025 19:29:28 +0200 Subject: [PATCH 1/4] Fix CI --- htdocs/core/class/commonobjectline.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index 6ae0caf40d9..00601990196 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -246,6 +246,11 @@ abstract class CommonObjectLine extends CommonObject */ public $multicurrency_subprice; + /** + * @var float Multicurrency subprice + */ + public $multicurrency_subprice_ttc; + /** * @var float Multicurrency total without tax */ From 53aae1a4b817c5e12f22d918032a594fb6bcb7b1 Mon Sep 17 00:00:00 2001 From: Benjamin Chanudet Date: Mon, 1 Sep 2025 20:33:12 +0200 Subject: [PATCH 2/4] FIX #35147 SQL Error on Beluga Export when ExpenseReport is enabled (#35149) * Fix SQL error when ExpenseReport module is enabled (#35147) * fix date filtering that prevents data to be displayed * add date and amount for expense reports * Update pdf_beluga.modules.php --------- Co-authored-by: Laurent Destailleur --- htdocs/core/modules/project/doc/pdf_beluga.modules.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php index 51ba7d63d1d..0dde16a0c15 100644 --- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php +++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php @@ -426,9 +426,9 @@ class pdf_beluga extends ModelePDFProjects 'title' => "ListExpenseReportsAssociatedProject", 'class' => 'ExpenseReport', 'table' => 'expensereport', - 'datefieldname' => 'dated', + 'datefieldname' => 'date_debut', 'margin' => 'minus', - 'disableamount' => 1, + 'disableamount' => 0, 'test' => isModEnabled('expensereport') && $user->hasRight('expensereport', 'lire'), 'lang' => 'trip'), 'agenda' => array( @@ -644,6 +644,9 @@ class pdf_beluga extends ModelePDFProjects if (empty($date)) { $date = $element->datev; // Intervention card } + if (empty($date)) { + $date = $element->date_debut; // Expense report + } } $pdf->SetXY($this->posxdate, $curY); From a1b99da514d3beaae8877c34683e30cf6434f0c0 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Tue, 2 Sep 2025 11:58:35 +0200 Subject: [PATCH 3/4] Prepare 21.0.4 --- htdocs/filefunc.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 9a70d71dbda..219b8dc7747 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -36,7 +36,7 @@ if (!defined('DOL_APPLICATION_TITLE')) { define('DOL_APPLICATION_TITLE', 'Dolibarr'); } if (!defined('DOL_VERSION')) { - define('DOL_VERSION', '21.0.3'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c + define('DOL_VERSION', '21.0.4'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c } if (!defined('EURO')) { From 55d177883f2af8f956f4b0fd05a3c2b82e847f95 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Tue, 2 Sep 2025 12:00:46 +0200 Subject: [PATCH 4/4] Doc --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9c0c80d8ec5..4e5b1b12de4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,12 @@ English Dolibarr ChangeLog -------------------------------------------------------------- +***** ChangeLog for 21.0.4 compared to 21.0.3 ***** +FIX: #35147 SQL Error on Beluga Export when ExpenseReport is enabled (#35149) +FIX: error when using a code too large in dictionary +FIX: Security when using feature Advanced Target of emailing (hidden in v21, default in v22+). Possible + SQL injection by users with permission to make and send mass emailing. + ***** ChangeLog for 21.0.3 compared to 21.0.2 ***** FIX: #34843 (#34875)