diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php index 424e0a5..613c567 100644 --- a/gestion/lib/Db/Bdd.php +++ b/gestion/lib/Db/Bdd.php @@ -3484,6 +3484,7 @@ class Bdd devis.comment as devis_comment, devis.id_client as devis_id_client, devis.devis_full_number, + devis.mentions, client.nom as client_nom, client.entreprise as client_entreprise, client.adresse as client_adresse, @@ -3538,6 +3539,7 @@ class Bdd devis.comment as devis_comment, devis.id_client as devis_id_client, devis.devis_full_number, + devis.mentions, client.nom as client_nom, client.entreprise as client_entreprise, client.adresse as client_adresse, diff --git a/gestion/lib/Service/Devis/DevisDataProcessor.php b/gestion/lib/Service/Devis/DevisDataProcessor.php index fda4b70..78cb20e 100644 --- a/gestion/lib/Service/Devis/DevisDataProcessor.php +++ b/gestion/lib/Service/Devis/DevisDataProcessor.php @@ -23,6 +23,11 @@ class DevisDataProcessor $data_devis = []; foreach ($devisData as $devis) { + // Exclure les devis annulés des récapitulatifs + if (isset($devis['mentions']) && $devis['mentions'] === 'CANCELED') { + continue; + } + $devis_temp = $this->createDevisStructure($devis, $currentConfig); $devis_temp = $this->calculateDevisAmounts($devis_temp, $devis, $filter, $idNextCloud); $data_devis[] = $devis_temp;