diff --git a/gestion/lib/Controller/PageController.php b/gestion/lib/Controller/PageController.php index addbea7..f74490a 100644 --- a/gestion/lib/Controller/PageController.php +++ b/gestion/lib/Controller/PageController.php @@ -585,7 +585,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, "Saint Senoux le, ".utf8_decode($date_formated), 0, 0, ''); + $pdf->Cell( 60, 8, "Bourges France 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"); @@ -643,7 +643,7 @@ class PageController extends Controller { // date facture $pdf->SetFont('Arial','',11); $pdf->SetXY( 122, 15 ); - $pdf->Cell( 60, 8, "Saint Senoux le, ".utf8_decode($date_formated), 0, 0, ''); + $pdf->Cell( 60, 8, "Bourges France, 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"); @@ -848,7 +848,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('ComicSans','',11); $pdf->SetXY( 122, 60 ); - $pdf->Cell( 60, 8, "Saint Senoux le, ".utf8_decode($date_formated), 0, 0, ''); + $pdf->Cell( 60, 8, "Bourges France le, ".utf8_decode($date_formated), 0, 0, ''); // observations $pdf->SetFont( "ComicSans", "BU", 10 ); $pdf->SetXY( 10, 85 ) ; $pdf->Cell($pdf->GetStringWidth("Objet:"), 0, "Objet:", 0, "L"); @@ -905,7 +905,7 @@ class PageController extends Controller { // date facture $pdf->SetFont('ComicSans','',11); $pdf->SetXY( 122, 15 ); - $pdf->Cell( 60, 8, "Saint Senoux le, ".utf8_decode($date_formated), 0, 0, ''); + $pdf->Cell( 60, 8, "Bourges France 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"); @@ -2022,14 +2022,14 @@ class PageController extends Controller { // logo : 80 de largeur et 55 de hauteur $logo = $this->getLogo(); if($logo != 'nothing'){ - $pdf->Image($this->defaultImagePath."logo.png", 15, 15, 55, 30); + $pdf->Image($this->defaultImagePath."logo.png", 15, 15, 50,35); } $pdf->setXY(15, 15); $pdf->SetFont('ComicSans', '', 10); $pdf->MultiCell(0, 5, utf8_decode(html_entity_decode("N : ".$numFacture)), '', 'R'); $pdf->setXY(15, 55); $pdf->SetFont('ComicSans', 'B', 15); $pdf->Cell(80, 10, 'RAPPORT DE SOIN', 1, 1, 'C'); $pdf->SetY(60); - $pdf->SetFont('ComicSans', '', 10); $pdf->MultiCell(0, 5, utf8_decode(html_entity_decode("Saint Senoux le, ".$today)), '', 'R'); + $pdf->SetFont('ComicSans', '', 10); $pdf->MultiCell(0, 5, utf8_decode(html_entity_decode("Bourges France le, ".$today)), '', 'R'); $pdf->SetY($pdf->GetY()+15); $pdf->SetFont('ComicSans', '', 10); $pdf->MultiCell(0, 5, utf8_decode(html_entity_decode($nomDefunt."\n".$age."ans\n".(strcmp($defunt->sexe, 'm')==0 ? 'Masculin' : 'Féminin'))), '', 'L'); @@ -2283,7 +2283,7 @@ class PageController extends Controller { // logo : 80 de largeur et 55 de hauteur $logo = $this->getLogo(); if($logo != 'nothing'){ - $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25); + $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 50,35); } $pdf->SetY(45); $pdf->SetFont('ComicSans', 'B', 15); $pdf->Cell(0, 10, utf8_decode(html_entity_decode("ATTESTATION BIJOU(X)")), 0, 0, 'C'); @@ -2341,7 +2341,7 @@ class PageController extends Controller { $pdf->setY($pdf->GetY()+10); $pdf->SetFont('ComicSans', '', 10); $pdf->MultiCell(0, 5, utf8_decode(html_entity_decode("Cette attestation est remise pour faire valoir ce que de droit. - Fait à Saint Senoux le ".$today)), '','J',0); + Fait à Bourges France ".$today)), '','J',0); $pdf->setY($pdf->GetY()+10); diff --git a/gestion/lib/Service/Certificate/PdfHandler/CareCertificatePdfHandler.php b/gestion/lib/Service/Certificate/PdfHandler/CareCertificatePdfHandler.php index fdb7225..f752512 100644 --- a/gestion/lib/Service/Certificate/PdfHandler/CareCertificatePdfHandler.php +++ b/gestion/lib/Service/Certificate/PdfHandler/CareCertificatePdfHandler.php @@ -42,7 +42,7 @@ class CareCertificatePdfHandler extends FPDF { function Header() { if($this->logo != "nothing"){ - $this->Image($this->imagePath."logo.png", 10, 10, 85, 25); + $this->Image($this->imagePath."logo.png", 10, 10,50,35); } else{ $this->Cell(55,30,''); @@ -81,8 +81,7 @@ class CareCertificatePdfHandler extends FPDF { private function SetCareCertificateContent(){ $this->SetFont('ComicSans', '', 14); - $this->Cell(0,7,FileExportHelpers::FormatTextForExport('La Société '. $this->devisOfDefunt['configuration']->entreprise. ' habilitée sous le numéro ' . $this->devisOfDefunt['thanato_reference'] . ', certifie par '),0,1); - $this->Cell(0,7,FileExportHelpers::FormatTextForExport('la présente que : '),0,1); + $this->MultiCell(0,7,FileExportHelpers::FormatTextForExport('La Société '. $this->devisOfDefunt['configuration']->entreprise. ' habilitée sous le numéro ' . $this->devisOfDefunt['thanato_reference'] . ', certifie par la présente que : ')); $this->SetFont('ComicSans', 'B', 14); $this->Cell(0,12, 'Mr/Mme ' . FileExportHelpers::FormatTextForExport($this->devisOfDefunt['thanato_nom'] . ' ' . $this->devisOfDefunt['thanato_prenom']),0,1); $this->SetFont('ComicSans', '', 14); @@ -96,9 +95,9 @@ class CareCertificatePdfHandler extends FPDF { $this->SetFont('ComicSans', '', 14); $this->Cell(0,12, FileExportHelpers::FormatTextForExport("La présente attestion est établie pour faire valoir ce que de droit."),0,5); $this->Ln(5); - $this->Cell(0,12,FileExportHelpers::FormatTextForExport('Fait à '). FileExportHelpers::FormatTextForExport($this->devisOfDefunt['configuration']->adresse)); + $this->MultiAlignCell(120,7,FileExportHelpers::FormatTextForExport('Fait à '). FileExportHelpers::FormatTextForExport($this->devisOfDefunt['configuration']->adresse),0); $this->SetX(140); - $this->Cell(0,12,'le '. $this->devisOfDefunt['devis_date']->format('d/m/Y'),0); + $this->Cell(0,7,'le '. $this->devisOfDefunt['devis_date']->format('d/m/Y'),0); } private function SetCareCertificateTitle(){ diff --git a/gestion/lib/Service/Certificate/PdfHandler/PacemakerCertificatePdfHandler.php b/gestion/lib/Service/Certificate/PdfHandler/PacemakerCertificatePdfHandler.php index 8c06ff1..67acc1a 100644 --- a/gestion/lib/Service/Certificate/PdfHandler/PacemakerCertificatePdfHandler.php +++ b/gestion/lib/Service/Certificate/PdfHandler/PacemakerCertificatePdfHandler.php @@ -42,7 +42,7 @@ class PacemakerCertificatePdfHandler extends FPDF { function Header() { if($this->logo != "nothing"){ - $this->Image($this->imagePath."logo.png", 10, 10, 85, 25); + $this->Image($this->imagePath."logo.png", 10, 10, 50,35); } else{ $this->Cell(55,30,''); @@ -105,9 +105,10 @@ class PacemakerCertificatePdfHandler extends FPDF { FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_product_brand']),0,1); $this->Cell(0,12, FileExportHelpers::FormatTextForExport("La présente attestion est établie pour faire valoir ce que de droit."),0,5); $this->Ln(5); - $this->Cell(0,12,FileExportHelpers::FormatTextForExport('Fait à '). FileExportHelpers::FormatTextForExport($this->devisOfDefunt['configuration']->adresse)); + + $this->MultiAlignCell(120,7,FileExportHelpers::FormatTextForExport('Fait à '). FileExportHelpers::FormatTextForExport($this->devisOfDefunt['configuration']->adresse),0); $this->SetX(140); - $this->Cell(0,12,'le '. $this->devisOfDefunt['devis_date']->format('d/m/Y'),0); + $this->Cell(0,7,'le '. $this->devisOfDefunt['devis_date']->format('d/m/Y'),0); } private function SetPacemakerCertificateTitle(){ diff --git a/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php b/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php index 7d5552b..812c95b 100644 --- a/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php +++ b/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php @@ -40,7 +40,7 @@ class DevisPdfHandler extends FPDF { function Header() { if($this->logo != "nothing"){ - $this->Image($this->logoPath."logo.png", 10, 10, 75, 25); + $this->Image($this->logoPath."logo.png", 2, 2, 50,35); } else{ $this->Cell(55,30,''); diff --git a/gestion/lib/Service/InvoicePdfHandler.php b/gestion/lib/Service/InvoicePdfHandler.php index 4ed361c..6ecefe6 100644 --- a/gestion/lib/Service/InvoicePdfHandler.php +++ b/gestion/lib/Service/InvoicePdfHandler.php @@ -45,7 +45,7 @@ class InvoicePdfHandler extends FPDF { function Header() { if($this->logo != "nothing"){ - $this->Image($this->logoPath."logo.png", 10, 10, 75, 25); + $this->Image($this->logoPath."logo.png", 2, 2, 50,35); } else{ $this->Cell(55,30,''); diff --git a/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php b/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php index badeb84..bc40f49 100644 --- a/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php +++ b/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php @@ -171,7 +171,7 @@ class InvoiceRecapService { // logo : 80 de largeur et 55 de hauteur if($doesLogoExist){ - $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25); + $pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35); } //adresse de mon entreprise @@ -276,7 +276,7 @@ class InvoiceRecapService { $pdf->SetMargins(0,0,10); if($doesLogoExist){ - $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25); + $pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35); } //adresse de mon entreprise @@ -579,7 +579,7 @@ class InvoiceRecapService { // logo : 80 de largeur et 55 de hauteur if($doesLogoExist){ - $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25); + $pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35); } //adresse de mon entreprise @@ -682,7 +682,7 @@ class InvoiceRecapService { $pdf->SetAutoPagebreak(False); $pdf->SetMargins(0,0,10); if($doesLogoExist){ - $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25); + $pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35); } //adresse de mon entreprise