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

avoir name

Browse Source
This commit is contained in:
Tiavina 2025-04-10 18:09:32 +03:00
parent 3eb59aab8e
commit 3c5e61f52e
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3155,6 +3155,7 @@ class Bdd {
return null; return null;
} }
$products = $this->getDevisProduits($factureData["devis_id"]); $products = $this->getDevisProduits($factureData["devis_id"]);
$isDevisNegative = $this->isDevisNegative($factureData['devis_id'],$factureData['client_id']);
$factureData = $this->setDevisStartAndEndTime($factureData); $factureData = $this->setDevisStartAndEndTime($factureData);
$factureData["products"] = $products; $factureData["products"] = $products;
@ -3173,6 +3174,7 @@ class Bdd {
$factureData["client_real_adress"] = $clientAdresses["address"]; $factureData["client_real_adress"] = $clientAdresses["address"];
$factureData["client_adress_city"] = $clientAdresses["city"]; $factureData["client_adress_city"] = $clientAdresses["city"];
} }
$factureData['is_negative'] = $isDevisNegative;
$configurationAdresses = FileExportHelpers::GetAddressAndCityFromAddress($configuration->adresse); $configurationAdresses = FileExportHelpers::GetAddressAndCityFromAddress($configuration->adresse);
$factureData["configuration_adresse"] = $configurationAdresses["address"]; $factureData["configuration_adresse"] = $configurationAdresses["address"];
@ -3522,6 +3524,7 @@ class Bdd {
devis.comment as devis_comment, devis.comment as devis_comment,
devis.order_number as order_number, devis.order_number as order_number,
devis.case_number as case_number, devis.case_number as case_number,
client.id as client_id,
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,

2
gestion/lib/Service/InvoicePdfHandler.php
View File

@ -144,7 +144,7 @@ class InvoicePdfHandler extends FPDF
$factureNum = $this->factureData['num']; $factureNum = $this->factureData['num'];
$factureNum = str_replace('/', '-', $factureNum); $factureNum = str_replace('/', '-', $factureNum);
$defuntNom = str_replace(' ', ' ', $this->factureData['defunt_nom']); $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() private function DrawInvoiceCompanyInfo()

5
gestion/lib/Service/InvoicePdfService.php
View File

@ -99,6 +99,11 @@ class InvoicePdfService {
$pdf->SetFactureContent(); $pdf->SetFactureContent();
$pdfContent = $pdf->Output('','S'); $pdfContent = $pdf->Output('','S');
$pdfFilename = $pdf->GetInvoiceFilename(); $pdfFilename = $pdf->GetInvoiceFilename();
$prefixPdf = "FACTURE";
if($invoicePdfData['is_negative']){
$prefixPdf = "AVOIR";
}
$pdfFilename = $prefixPdf."_".$pdfFilename;
$filenames = []; $filenames = [];
foreach($factureFolders as $folder){ foreach($factureFolders as $folder){
try { try {