From 3c5e61f52e2576c2d9e594fc7484bf474e097a76 Mon Sep 17 00:00:00 2001
From: Tiavina <tiavina@ezway-technology.com>
Date: Thu, 10 Apr 2025 18:09:32 +0300
Subject: [PATCH] avoir name

---
 gestion/lib/Db/Bdd.php                    | 3 +++
 gestion/lib/Service/InvoicePdfHandler.php | 2 +-
 gestion/lib/Service/InvoicePdfService.php | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php
index 002031a..d275089 100644
--- a/gestion/lib/Db/Bdd.php
+++ b/gestion/lib/Db/Bdd.php
@@ -3155,6 +3155,7 @@ class Bdd {
             return null;
         }
         $products = $this->getDevisProduits($factureData["devis_id"]);
+        $isDevisNegative = $this->isDevisNegative($factureData['devis_id'],$factureData['client_id']);
         $factureData = $this->setDevisStartAndEndTime($factureData);
 
         $factureData["products"] = $products;
@@ -3173,6 +3174,7 @@ class Bdd {
             $factureData["client_real_adress"] = $clientAdresses["address"];
             $factureData["client_adress_city"] = $clientAdresses["city"];
         }
+        $factureData['is_negative'] = $isDevisNegative;
 
         $configurationAdresses = FileExportHelpers::GetAddressAndCityFromAddress($configuration->adresse);
         $factureData["configuration_adresse"] = $configurationAdresses["address"];
@@ -3522,6 +3524,7 @@ class Bdd {
                     devis.comment as devis_comment,
                     devis.order_number as order_number,
                     devis.case_number as case_number,
+                    client.id as client_id,
                     client.nom as client_nom,
                     client.entreprise as client_entreprise,
                     client.adresse as client_adresse,
diff --git a/gestion/lib/Service/InvoicePdfHandler.php b/gestion/lib/Service/InvoicePdfHandler.php
index a91e961..63aae4f 100644
--- a/gestion/lib/Service/InvoicePdfHandler.php
+++ b/gestion/lib/Service/InvoicePdfHandler.php
@@ -144,7 +144,7 @@ class InvoicePdfHandler extends FPDF
         $factureNum = $this->factureData['num'];
         $factureNum = str_replace('/', '-', $factureNum);
         $defuntNom = str_replace('&nbsp;', ' ', $this->factureData['defunt_nom']);
-        return $this->factureData['configuration']->facture_prefixe . '_' . $factureNum . '_' . mb_strtoupper($defuntNom, 'UTF-8');
+        return $factureNum . '_' . mb_strtoupper($defuntNom, 'UTF-8');
     }
 
     private function DrawInvoiceCompanyInfo()
diff --git a/gestion/lib/Service/InvoicePdfService.php b/gestion/lib/Service/InvoicePdfService.php
index 1e49346..81822ce 100644
--- a/gestion/lib/Service/InvoicePdfService.php
+++ b/gestion/lib/Service/InvoicePdfService.php
@@ -99,6 +99,11 @@ class InvoicePdfService {
         $pdf->SetFactureContent();
         $pdfContent = $pdf->Output('','S');
         $pdfFilename = $pdf->GetInvoiceFilename();
+        $prefixPdf = "FACTURE";
+        if($invoicePdfData['is_negative']){
+            $prefixPdf = "AVOIR";
+        }
+        $pdfFilename = $prefixPdf."_".$pdfFilename;
         $filenames = [];
         foreach($factureFolders as $folder){
             try {