diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php index d5438a5..96d0e27 100644 --- a/gestion/lib/Db/Bdd.php +++ b/gestion/lib/Db/Bdd.php @@ -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 = ?) diff --git a/gestion/lib/Service/ExportThanatoStatisticService.php b/gestion/lib/Service/ExportThanatoStatisticService.php index ba58f67..f158dd3 100644 --- a/gestion/lib/Service/ExportThanatoStatisticService.php +++ b/gestion/lib/Service/ExportThanatoStatisticService.php @@ -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"]).';'.