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

fix enlever devis annuler

Browse Source
This commit is contained in:
Tolotsoa 2025-10-06 18:46:17 +03:00
parent 1a4068481f
commit 5855be2655
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3484,6 +3484,7 @@ class Bdd
devis.comment as devis_comment, devis.comment as devis_comment,
devis.id_client as devis_id_client, devis.id_client as devis_id_client,
devis.devis_full_number, devis.devis_full_number,
devis.mentions,
client.nom as client_nom, client.nom as client_nom,
client.entreprise as client_entreprise, client.entreprise as client_entreprise,
client.adresse as client_adresse, client.adresse as client_adresse,
@ -3538,6 +3539,7 @@ class Bdd
devis.comment as devis_comment, devis.comment as devis_comment,
devis.id_client as devis_id_client, devis.id_client as devis_id_client,
devis.devis_full_number, devis.devis_full_number,
devis.mentions,
client.nom as client_nom, client.nom as client_nom,
client.entreprise as client_entreprise, client.entreprise as client_entreprise,
client.adresse as client_adresse, client.adresse as client_adresse,

5
gestion/lib/Service/Devis/DevisDataProcessor.php
View File

@ -23,6 +23,11 @@ class DevisDataProcessor
$data_devis = []; $data_devis = [];
foreach ($devisData as $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->createDevisStructure($devis, $currentConfig);
$devis_temp = $this->calculateDevisAmounts($devis_temp, $devis, $filter, $idNextCloud); $devis_temp = $this->calculateDevisAmounts($devis_temp, $devis, $filter, $idNextCloud);
$data_devis[] = $devis_temp; $data_devis[] = $devis_temp;