Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0

This commit is contained in:
ldestailleur 2025-09-02 12:02:40 +02:00
commit ee38ff0aaf
2 changed files with 11 additions and 2 deletions

View file

@ -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 22.0.1 compared to 22.0.0 *****

View file

@ -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);