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

Merge branch 'hytat/fixe/fixing-pdf-retour-3' into staging

Browse Source
This commit is contained in:
Narindra ezway 2025-04-04 18:53:38 +03:00
commit 5942f66467
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php
View File

@ -265,6 +265,8 @@ class InvoiceGroupPdfHandler extends FPDF {
$products = $currentDevis["products"]; $products = $currentDevis["products"];
$productIncrement = 0; $productIncrement = 0;
foreach($products as $product){ foreach($products as $product){
$this->SetFont('ComicSans', '', 8);
$valueHt = $product['produit_price'] * $product["quantite"]; $valueHt = $product['produit_price'] * $product["quantite"];
$valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt,$tvaValue); $valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt,$tvaValue);
$totalHt+=$valueHt; $totalHt+=$valueHt;
@ -296,7 +298,6 @@ class InvoiceGroupPdfHandler extends FPDF {
$this->Cell($maxDescriptionWidth, 6, $productDescription); $this->Cell($maxDescriptionWidth, 6, $productDescription);
} }
$this->SetFont('ComicSans', '', 8);
$this->SetXY( 135,$yValue ); $this->SetXY( 135,$yValue );
$this->Cell(20, 6, number_format($valueHt,2,'.','').chr(128), 0, 0, 'C'); $this->Cell(20, 6, number_format($valueHt,2,'.','').chr(128), 0, 0, 'C');

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

@ -283,6 +283,9 @@ class InvoicePdfHandler extends FPDF
$products = $this->factureData["products"]; $products = $this->factureData["products"];
$yValue = $this->startingYOfArticlesTable + 11; $yValue = $this->startingYOfArticlesTable + 11;
foreach ($products as $product) { foreach ($products as $product) {
$this->SetFont('ComicSans', '', 8);
$valueHt = $product['produit_price']; $valueHt = $product['produit_price'];
$valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt, $tvaValue); $valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt, $tvaValue);
$totalHt += $valueHt; $totalHt += $valueHt;
@ -301,7 +304,6 @@ class InvoicePdfHandler extends FPDF
$this->MultiAlignCell(102, 6, utf8_decode(html_entity_decode($productDescription)), 0, '0',); $this->MultiAlignCell(102, 6, utf8_decode(html_entity_decode($productDescription)), 0, '0',);
$this->SetFont('ComicSans', '', 7);
$this->SetXY(135, $yValue); $this->SetXY(135, $yValue);
$this->Cell(20, 6, number_format($valueHt, 2, '.', '') . chr(128), 0, 0, 'C'); $this->Cell(20, 6, number_format($valueHt, 2, '.', '') . chr(128), 0, 0, 'C');