Merge branch 'fixes/fix-facture-mention' into staging

gestion/lib/Db/Bdd.php

@@ -1118,7 +1118,14 @@ class Bdd {
                                                             `user_id`
                                                         ) 
                                                 VALUES (NOW(),?,?,0,0,0,?,0,?,?,?);";
-        $this->execSQLNoData($sql, array($idNextcloud,"Nom du defunt",'Ajouter un lieu',$this->l->t('New'),$this->l->t('Comment'),$last));
+        $this->execSQLNoData($sql, array(
+            $idNextcloud,
+            "Nom du defunt",
+            'Ajouter un lieu',
+            DevisMentionConstant::NEW,
+            '',
+            $last
+        ));
         return true;
     }
 
@@ -1180,7 +1187,7 @@ class Bdd {
             $thanatoId,
             $this->l->t('New'),
             $locationId,
-            $this->l->t('Mention'),
+            DevisMentionConstant::NEW,
             $devisComment,
             $last,
             $devisNumber,

gestion/src/js/constants/invoiceConstant.js

@@ -1,4 +1,5 @@
 export const FacturedDevisMentionConstant = "facturé";
+export const FacturedDevisMentionConstantFormatted = "facturé";
 export const DefaultDevisMentionConstant = "Mention";
 export const NewDevisMentionConstant = "Nouveau";
 export const CanceledDevisMentionConstant = "CANCELED";

gestion/src/js/objects/devis.mjs

@@ -1,7 +1,7 @@
 import { generateUrl } from "@nextcloud/router";
 import { updateDB } from "../modules/ajaxRequest.mjs";
 import { baseUrl, checkSelectPurJs, LoadDT, showDone } from "../modules/mainFunction.mjs";
-import { NewDevisMentionConstant,FacturedDevisMentionConstant,DefaultDevisMentionConstant,CanceledDevisMentionConstant } from "../constants/invoiceConstant.js";
+import { NewDevisMentionConstant,FacturedDevisMentionConstant,DefaultDevisMentionConstant,CanceledDevisMentionConstant, FacturedDevisMentionConstantFormatted } from "../constants/invoiceConstant.js";
 export class Devis {
 
   /**
@@ -43,6 +43,9 @@ export class Devis {
       case CanceledDevisMentionConstant:
         labelValue =  "Annulé"
           break;
+      case FacturedDevisMentionConstantFormatted:
+        labelValue = "Facturé"
+          break;
       default:
         labelValue = mention
     }
@@ -77,7 +80,7 @@ export class Devis {
 
   static getDevisMentionCssStyle(mention){
     let style = "display:inline; border-radius: 5px; padding: 8px;";
-    if(mention === FacturedDevisMentionConstant){
+    if(mention === FacturedDevisMentionConstant || mention === FacturedDevisMentionConstantFormatted){
       style += " background-color:green !important; color: white";
     }
     else if(mention === CanceledDevisMentionConstant){