slambert/Thanasoft-H2F
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fixes/fix-document-recap-and-multiple-facture-cogf' into releases/release-h2f

Browse Source
This commit is contained in:
Tiavina 2025-01-22 16:11:31 +03:00
commit 92e9b46bf0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gestion/lib/Db/Bdd.php
View File

@ -2299,7 +2299,7 @@ class Bdd {
LEFT JOIN ".$this->tableprefix."defunt as defunt on devis.id_defunt = defunt.id LEFT JOIN ".$this->tableprefix."defunt as defunt on devis.id_defunt = defunt.id
LEFT JOIN ".$this->tableprefix."lieu as lieu on devis.id_lieu = lieu.id LEFT JOIN ".$this->tableprefix."lieu as lieu on devis.id_lieu = lieu.id
LEFT JOIN ".$this->tableprefix."thanato as thanato on devis.id_thanato = thanato.id LEFT JOIN ".$this->tableprefix."thanato as thanato on devis.id_thanato = thanato.id
WHERE devis.id_client IN ($clientIdsSqlPlaceholder) ? AND WHERE devis.id_client IN ($clientIdsSqlPlaceholder) AND
YEAR(facture.date_paiement) = ?"; YEAR(facture.date_paiement) = ?";
$conditions = array_merge($clientIds,[$year]); $conditions = array_merge($clientIds,[$year]);