fix facture mention

gestion/lib/Constants/DevisMentionConstant.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace OCA\Gestion\Constants;
 abstract class DevisMentionConstant 
 {   const FACTURED = "facturé";
+    const FACTURED_FORMATTED = "facturé";
     const MENTION = "Mention";
     const NEW = "Nouveau";
     const CANCELED = "CANCELED";

gestion/lib/Db/Bdd.php

@@ -1334,7 +1334,7 @@ class Bdd {
 
         $factureId = $this->getFactureIdByDevisId($devisId);
         //update devis status
-        $this->gestion_update('devis','mentions','facturé',$devisId,$idNextcloud);
+        $this->gestion_update('devis','mentions',DevisMentionConstant::FACTURED_FORMATTED,$devisId,$idNextcloud);
         return $factureId;
     }
 
@@ -2297,11 +2297,11 @@ class Bdd {
             WHERE YEAR(devis.date) = ? AND 
             MONTH(devis.date) = ? AND 
             devis.id_thanato IN ($sqlConditionsPlaceholder) AND
-            devis.mentions = ? 
+            (devis.mentions = ? OR devis.mentions = ?)
             ORDER BY devis.date ASC;";
         $devisList = $this->execSQLNoJsonReturn(
             $sql, 
-            array_merge([$currentYear, $currentMonth],$thanatoIds,["facturé"]));
+            array_merge([$currentYear, $currentMonth],$thanatoIds,[DevisMentionConstant::FACTURED,DevisMentionConstant::FACTURED_FORMATTED]));
         return $devisList;
     }
 
@@ -2455,16 +2455,18 @@ class Bdd {
                 facture.date_paiement,
                 devis.id as devis_id,
                 devis.id_client as devis_client_id,
-                devis.date as devis_date
+                devis.date as devis_date,
+                devis.mentions as devis_mention
                 FROM ".$this->tableprefix."facture as facture
                 LEFT JOIN ".$this->tableprefix."devis as devis on facture.id_devis = devis.id
                 WHERE YEAR(facture.date_paiement) = ? AND 
                 MONTH(facture.date_paiement) = ? AND 
-                devis.id_client = ? 
+                devis.id_client = ? AND
+                (devis.mentions = ? OR devis.mentions = ?)
                 ORDER BY facture.date_paiement ASC;";
             $factureList = $this->execSQLNoJsonReturn(
                 $sql, 
-                [$currentYear,$monthValue,$clientId]);
+                [$currentYear,$monthValue,$clientId,DevisMentionConstant::FACTURED,DevisMentionConstant::FACTURED_FORMATTED]);
 
             $factureDevisIds = [];
             foreach($factureList as $facture){

gestion/src/js/objects/devis.mjs

@@ -174,7 +174,11 @@ export class Devis {
     oReq.setRequestHeader("Content-Type", "application/json");
     oReq.onload = function(e){
       if (this.status == 200) {
-        let devis_temp = (JSON.parse(JSON.parse(this.response))).filter((d)=>(d.mentions != "facturé"));
+        let devis_temp = (JSON.parse(JSON.parse(this.response))).filter((d)=>(
+          d.mentions != FacturedDevisMentionConstant && 
+          d.mentions != FacturedDevisMentionConstantFormatted &&
+          d.mentions != CanceledDevisMentionConstant
+        ));
         devis_temp = JSON.stringify(JSON.stringify(devis_temp));
         callback(JSON.parse(devis_temp));
       }else{