From 53aae1a4b817c5e12f22d918032a594fb6bcb7b1 Mon Sep 17 00:00:00 2001 From: Benjamin Chanudet Date: Mon, 1 Sep 2025 20:33:12 +0200 Subject: [PATCH] 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);