diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php index b42baef..874e658 100644 --- a/gestion/lib/Db/Bdd.php +++ b/gestion/lib/Db/Bdd.php @@ -3159,6 +3159,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; @@ -3177,6 +3178,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"]; @@ -3526,6 +3528,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(' ', ' ', $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 {