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

Merge branch 'fixes/fix-facture-tva-amount' into staging

Browse Source
This commit is contained in:
Tiavina 2025-01-03 10:57:56 +03:00
commit 3fe1872ab3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gestion/lib/Controller/PageController.php
View File

@ -546,7 +546,7 @@ class PageController extends Controller {
$pdf->SetXY( $_x, $_y ); $pdf->Cell( 100, 8, utf8_decode('Groupe COGF'), 0, 0, ''); $_y += 8;
// date facture
$pdf->SetFont('Arial','',11); $pdf->SetXY( 122, 60 );
$pdf->Cell( 60, 8, "Croth le, ".utf8_decode($date_formated), 0, 0, '');
$pdf->Cell( 60, 8, "Saint Senoux le, ".utf8_decode($date_formated), 0, 0, '');
// observations
$pdf->SetFont( "Arial", "BU", 10 ); $pdf->SetXY( 10, 85 ) ; $pdf->Cell($pdf->GetStringWidth("Objet:"), 0, "Objet:", 0, "L");
@ -604,7 +604,7 @@ class PageController extends Controller {
// date facture
$pdf->SetFont('Arial','',11); $pdf->SetXY( 122, 15 );
$pdf->Cell( 60, 8, "Croth le, ".utf8_decode($date_formated), 0, 0, '');
$pdf->Cell( 60, 8, "Saint Senoux le, ".utf8_decode($date_formated), 0, 0, '');
// n° facture, date echeance et reglement et obs
$pdf->SetLineWidth(0.1); $pdf->SetFillColor(255); $pdf->Rect(100, 30, 85, 8, "DF");
@ -1090,7 +1090,7 @@ class PageController extends Controller {
$pdf->SetXY( $_x, $_y ); $pdf->MultiCell( 80, 4, utf8_decode(html_entity_decode($adresse)), 0, 0, '');
// date facture
$pdf->SetFont('Arial','',11); $pdf->SetXY( 122, 60 );
$pdf->Cell( 60, 8, "Croth le, ".utf8_decode($date_formated), 0, 0, '');
$pdf->Cell( 60, 8, "Saint Senoux le, ".utf8_decode($date_formated), 0, 0, '');
// observations
$pdf->SetFont( "Arial", "BU", 10 ); $pdf->SetXY( 10, 85 ) ; $pdf->Cell($pdf->GetStringWidth("Objet:"), 0, "Objet:", 0, "L");
@ -1147,7 +1147,7 @@ class PageController extends Controller {
// date facture
$pdf->SetFont('Arial','',11); $pdf->SetXY( 122, 15 );
$pdf->Cell( 60, 8, "Croth le, ".utf8_decode($date_formated), 0, 0, '');
$pdf->Cell( 60, 8, "Saint Senoux le, ".utf8_decode($date_formated), 0, 0, '');
// n° facture, date echeance et reglement et obs
$pdf->SetLineWidth(0.1); $pdf->SetFillColor(255); $pdf->Rect(100, 30, 85, 8, "DF");
@ -2260,7 +2260,7 @@ class PageController extends Controller {
$pdf->setY($pdf->GetY()+10);
$pdf->MultiCell(0, 5, utf8_decode(html_entity_decode("Cette attestation est remise pour faire valoir ce que de droit.
Fait à Croth le ".$today->format('d/m/Y'))), '','J',0);
Fait à Saint Senoux le ".$today->format('d/m/Y'))), '','J',0);
$pdf->setY($pdf->GetY()+10);
// signature
@ -2359,7 +2359,7 @@ class PageController extends Controller {
$pdf->setXY(15, 55); $pdf->SetFont('Arial', 'B', 15); $pdf->Cell(80, 10, 'RAPPORT DE SOIN', 1, 1, 'C');
$pdf->SetY(60);
$pdf->SetFont('Arial', '', 10); $pdf->MultiCell(0, 5, utf8_decode(html_entity_decode("Croth le, ".$today)), '', 'R');
$pdf->SetFont('Arial', '', 10); $pdf->MultiCell(0, 5, utf8_decode(html_entity_decode("Saint Senoux le, ".$today)), '', 'R');
$pdf->SetY($pdf->GetY()+15);
$pdf->SetFont('Arial', '', 10); $pdf->MultiCell(0, 5, utf8_decode(html_entity_decode($nomDefunt."\n".$age."ans\n".(strcmp($defunt->sexe, 'm')==0 ? 'Masculin' : 'Féminin'))), '', 'L');
@ -2640,7 +2640,7 @@ class PageController extends Controller {
$pdf->setY($pdf->GetY()+5);
$pdf->SetFont('Arial', '', 10); $pdf->MultiCell(0, 5, utf8_decode(html_entity_decode("Cette attestation est remise pour faire valoir ce que de droit.
Fait à Croth le ".$today)), '','J',0);
Fait à Saint Senoux le ".$today)), '','J',0);
$pdf->setY($pdf->GetY()+10);