root/THANASOFT-DV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into production

Browse Source
This commit is contained in:
Tiavina 2025-04-30 18:05:52 +03:00
commit 5396c6ad1b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2426,13 +2426,15 @@ class Bdd {
client.nom as nom_client,
client.entreprise as client_entreprise,
client.adresse as client_adresse,
facture.num as facture_num
facture.num as facture_num,
facture_on_group as facture_on_group_num
FROM ".$this->tableprefix."devis as devis
LEFT JOIN ".$this->tableprefix."thanato as thanato on devis.id_thanato = thanato.id
LEFT JOIN ".$this->tableprefix."lieu as lieu on devis.id_lieu = lieu.id
LEFT JOIN ".$this->tableprefix."defunt as defunt on devis.id_defunt = defunt.id
LEFT JOIN ".$this->tableprefix."client as client on devis.id_client = client.id
LEFT JOIN ".$this->tableprefix."facture as facture on devis.id = facture.id_devis
LEFT JOIN ".$this->tableprefix."facture as facture_on_group on devis.fk_facture_id = facture_on_group.id
WHERE devis.date = ? AND
devis.id_thanato = ? AND
(devis.mentions = ? OR devis.mentions = ?)

3
gestion/lib/Service/ExportThanatoStatisticService.php
View File

@ -317,8 +317,9 @@ class ExportThanatoStatisticService {
private function populateDevisDataIntoThanatoExportFileContent(string $fileContent,array $devis){
$produitAsString = $this->getFormatDevisProduitsAsString($devis["produits"]);
$factureNum = $devis["facture_num"] ?? $devis["facture_on_group_num"] ?? "";
$fileContent = $fileContent.
FileExportHelpers::FormatTextForExport($devis["facture_num"]).';'.
FileExportHelpers::FormatTextForExport($factureNum).';'.
FileExportHelpers::FormatTextForExport($devis['nom_thanato'] . ' ' . $devis['prenom_thanatho']).';'.
FileExportHelpers::FormatTextForExport($devis["date"]).';'.
FileExportHelpers::FormatTextForExport($devis["startTime"]).';'.