diff --git a/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php b/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php index 3dd178c..0b0d1b2 100644 --- a/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php +++ b/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php @@ -80,7 +80,7 @@ class DevisPdfHandler extends FPDF { $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->devisData['configuration_adresse_city']), 0, 0);border: $this->Cell(0, 7, trim(FileExportHelpers::FormatTextForExport($this->devisData['client_adress_city'])), 0, 1,'R'); $this->Cell(0, 7, FileExportHelpers::FormatTextForExport('Tél : ') . FileExportHelpers::FormatTextForExport($this->devisData['configuration']->telephone),0,0); - $this->Cell(0, 7, FileExportHelpers::FormatTextForExport('Numéro') . ' Siret: ' . $this->devisData['siret'], 0, 1,'R'); + $this->Cell(0, 7, 'Siret: ' . $this->devisData['siret'], 0, 1,'R'); $this->Cell(0, 7, 'Mail : ' . $this->devisData['configuration']->mail, 0, 1); $this->Ln(3); } diff --git a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php index 60162fc..7e208a7 100644 --- a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php +++ b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php @@ -84,7 +84,7 @@ class InvoiceGroupPdfHandler extends FPDF { $height = $originalHeight * $scale; // Calculer la position pour centrer l'image $x = (210 - $width) / 2 + 15; // Décalage à droite de 15 mm - $y = ((297 - $height) / 2 ) + 19; // 297 mm est la hauteur d'une page A4 + $y = ((297 - $height) / 2 ) + 21; // 297 mm est la hauteur d'une page A4 // Ajouter l'image en filigrane $this->Image($imagePath, $x, $y, $width, $height); // Chemin, position x, position y, largeur, hauteur @@ -265,14 +265,15 @@ class InvoiceGroupPdfHandler extends FPDF { $this->SetLineWidth(0.2); $gapBetweenStartingOfArticlesTableAndColumnName = 7; - $tableHeight = $this->thereIsOrderOrCaseNumber ? 137 : 137 + 7; + $additionnalheight = 0.75; + $tableHeight = $this->thereIsOrderOrCaseNumber ? (137 + $additionnalheight) : ( 137 + 6 + $additionnalheight); $this->Rect(3, $this->startingYOfArticlesTable, 204, $tableHeight, "D"); // $this->RoundedRect(3, $this->startingYOfArticlesTable, 204, $tableHeight,5 ,'1234',"D"); // cadre titre des colonnes $this->Line(3, $this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName, 207,$this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName); // les traits verticaux colonnes $additionalMargRight = 1; - $endingLine = 234; + $endingLine = 233 + $additionnalheight; $this->Line(27 + $additionalMargRight, $this->startingYOfArticlesTable, 27+ $additionalMargRight , $endingLine); $this->Line(142 + $additionalMargRight, $this->startingYOfArticlesTable, 142+ $additionalMargRight , $endingLine); $this->Line(164 + $additionalMargRight, $this->startingYOfArticlesTable, 164+ $additionalMargRight , $endingLine); diff --git a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceOgfPdfHandler.php b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceOgfPdfHandler.php index 729c93f..fc0baa9 100644 --- a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceOgfPdfHandler.php +++ b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceOgfPdfHandler.php @@ -57,7 +57,7 @@ class InvoiceOgfPdfHandler extends InvoiceGroupPdfHandler { $this->Cell(0, $this->interLigneHeader, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city']))); $clientInfoYAxis += $this->interLigneHeader; $this->SetXY($clientInfoXAxis,$clientInfoYAxis); - $this->Cell(0, $this->interLigneHeader, FileExportHelpers::FormatTextForExport('Numéro') . ' Siret: ' . $this->factureData['siret']); + $this->Cell(0, $this->interLigneHeader, 'Siret: ' . $this->factureData['siret']); $clientInfoYAxis += $this->interLigneHeader; $this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->Cell(0, $this->interLigneHeader, FileExportHelpers::FormatTextForExport('Mail : ') . $this->factureData['client_mail']); diff --git a/gestion/lib/Service/InvoicePdfHandler.php b/gestion/lib/Service/InvoicePdfHandler.php index e0afbe9..f7e7615 100644 --- a/gestion/lib/Service/InvoicePdfHandler.php +++ b/gestion/lib/Service/InvoicePdfHandler.php @@ -77,7 +77,7 @@ class InvoicePdfHandler extends FPDF $height = $originalHeight * $scale; // Calculer la position pour centrer l'image $x = (210 - $width) / 2 + 15; // Décalage à droite de 15 mm - $y = ((297 - $height) / 2 ) + 19; // 297 mm est la hauteur d'une page A4 + $y = ((297 - $height) / 2 ) + 21; // 297 mm est la hauteur d'une page A4 // Ajouter l'image en filigrane $this->Image($imagePath, $x, $y, $width, $height); // Chemin, position x, position y, largeur, hauteur @@ -186,7 +186,7 @@ class InvoicePdfHandler extends FPDF $this->Cell(0, $this->interLigneHeader, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city']))); $clientInfoYAxis += $this->interLigneHeader; $this->SetXY($clientInfoXAxis, $clientInfoYAxis); - $this->Cell(0, $this->interLigneHeader, FileExportHelpers::FormatTextForExport('Numéro') . ' Siret: ' . $this->factureData['siret']); + $this->Cell(0, $this->interLigneHeader,'Siret: ' . $this->factureData['siret']); $clientInfoYAxis += $this->interLigneHeader; $this->SetXY($clientInfoXAxis, $clientInfoYAxis); $this->Cell(0, $this->interLigneHeader, FileExportHelpers::FormatTextForExport('Mail : ') . $this->factureData['client_mail']); @@ -246,10 +246,11 @@ class InvoicePdfHandler extends FPDF private function DrawArticlesTable() { + $this->startingYOfArticlesTable = $this->startingYOfArticlesTable - 2; $this->SetLineWidth(0.2); $gapBetweenStartingOfArticlesTableAndColumnName = 8; - $tableHeight = $this->thereIsOrderOrCaseNumber ? $this->articleTablesHeight : $this->articleTablesHeight + 7; - $this->Rect(3, $this->startingYOfArticlesTable, 204, $tableHeight, "D"); + $tableHeight = $this->thereIsOrderOrCaseNumber ? $this->articleTablesHeight : $this->articleTablesHeight + 9; + $this->Rect(3, $this->startingYOfArticlesTable , 204, $tableHeight, "D"); // cadre titre des colonnes $this->Line(3, $this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName, 207, $this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName); // les traits verticaux colonnes @@ -268,7 +269,7 @@ class InvoicePdfHandler extends FPDF $columnNameY = $this->startingYOfArticlesTable - 1; $this->SetFont('ComicSans', '', 10); $this->SetXY(12 + $additionalMargRight, $columnNameY); - $this->Cell(7, 10, "Date", 0, 0, 'C'); + $this->Cell(7, 10, "Datess", 0, 0, 'C'); $this->SetXY(30 + $additionalMargRight, $columnNameY); $this->Cell(100, 10, "Description", 0, 0, 'C'); @@ -385,7 +386,7 @@ class InvoicePdfHandler extends FPDF public function SetFactureContent() { $this->AddPage(); - $this->SetMargins(2, 0, 3); + $this->SetMargins(3, 0, 3); $this->DrawInvoiceCompanyAndClientInfo(); $this->DrawInvoiceInfoTable(); $this->DrawArticlesTable(); diff --git a/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php b/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php index 54020b6..5eee398 100644 --- a/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php +++ b/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php @@ -322,7 +322,7 @@ class InvoiceRecapService { $pdf->Cell( 0, 7, trim(utf8_decode(html_entity_decode($clientGroupFacturation["postal_code"]. ' '.$clientGroupFacturation["city"])))); $clientInfoYAxis += 7; $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); - $pdf->Cell( 0, 7, FileExportHelpers::FormatTextForExport('Numéro') . ' Siret: ' . FileExportHelpers::FormatTextForExport($clientGroupFacturation["siret_number"])); + $pdf->Cell( 0, 7, 'Siret: ' . FileExportHelpers::FormatTextForExport($clientGroupFacturation["siret_number"])); $clientInfoYAxis += 7; $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); $pdf->Cell( 0, 7, 'Email: ' . utf8_decode(html_entity_decode($clientGroupFacturation["email"])),0,1); @@ -738,7 +738,7 @@ class InvoiceRecapService { $pdf->Cell( 0, 7, trim(utf8_decode(html_entity_decode($clientCity)))); $clientInfoYAxis += 7; $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); - $pdf->Cell( 0, 7, FileExportHelpers::FormatTextForExport('Numéro') . ' Siret: ' . FileExportHelpers::FormatTextForExport($tvaIntraCommuValue)); + $pdf->Cell( 0, 7, 'Siret: ' . FileExportHelpers::FormatTextForExport($tvaIntraCommuValue)); $clientInfoYAxis += 7; $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); $pdf->Cell( 0, 7, 'Email: ' . utf8_decode(html_entity_decode($clientMail)),0,1); diff --git a/gestion/lib/Service/InvoiceRecap/PdfHandler/InvoiceRecapPdfHandler.php b/gestion/lib/Service/InvoiceRecap/PdfHandler/InvoiceRecapPdfHandler.php index 1de2bf0..ebba274 100644 --- a/gestion/lib/Service/InvoiceRecap/PdfHandler/InvoiceRecapPdfHandler.php +++ b/gestion/lib/Service/InvoiceRecap/PdfHandler/InvoiceRecapPdfHandler.php @@ -83,7 +83,7 @@ class InvoiceRecapPdfHandler extends FPDF { $current_client = ''; $clientAddress = ''; $clientCity = ''; - $date_facture; + $date_facture = ''; $j=1; foreach ($client as $key => $facture) { if($j==1) { @@ -194,7 +194,7 @@ class InvoiceRecapPdfHandler extends FPDF { if($clientCity != ''){ $pdf->Cell( 0, 6, trim(utf8_decode(html_entity_decode($clientCity))), 0, 1, 'R'); } - $pdf->Cell( 0, 6, FileExportHelpers::FormatTextForExport('Numéro') . ' Siret: ' . FileExportHelpers::FormatTextForExport($tvaIntraCommuValue), 0, 1, 'R'); + $pdf->Cell( 0, 6, ' Siret: ' . FileExportHelpers::FormatTextForExport($tvaIntraCommuValue), 0, 1, 'R'); $pdf->Cell( 0, 6, 'Email: ' . utf8_decode(html_entity_decode($facture['mail_client'])), 0, 1, 'R'); // ***********************