From 626b9052e2e860df7a3d7e44425d1db107ec5110 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 2 Oct 2010 11:21:36 +0000 Subject: [PATCH] Works on migration of FPDF to TCPDF --- htdocs/includes/modules/commande/pdf_edison.modules.php | 6 +++--- htdocs/includes/modules/commande/pdf_einstein.modules.php | 4 ++-- .../modules/expedition/pdf/pdf_expedition_merou.modules.php | 4 ++-- htdocs/includes/modules/facture/pdf_oursin.modules.php | 4 ++-- htdocs/includes/modules/fichinter/pdf_soleil.modules.php | 4 ++-- .../includes/modules/livraison/pdf/pdf_sirocco.modules.php | 6 +++--- .../includes/modules/livraison/pdf/pdf_typhon.modules.php | 4 ++-- .../modules/supplier_order/pdf/pdf_muscadet.modules.php | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index e5a2da2c91a..561d1f435eb 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -548,7 +548,7 @@ class pdf_edison extends ModelePDFCommandes $pdf->SetFont('','',9); $pdf->SetXY($this->marge_gauche,$posy+7); - $pdf->MultiCell(80, 4, $carac_emetteur); + $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L'); // Client destinataire $client = new Societe($this->db); @@ -583,10 +583,10 @@ class pdf_edison extends ModelePDFCommandes $pdf->SetTextColor(0,0,0); $pdf->SetFont('','B',10); $pdf->SetXY(102,42); - $pdf->MultiCell(96, 4, $carac_client_name); + $pdf->MultiCell(96, 4, $carac_client_name, 0, 'L'); $pdf->SetFont('','',9); $pdf->SetXY(102,$pdf->GetY()); - $pdf->MultiCell(96, 4, $carac_client); + $pdf->MultiCell(96, 4, $carac_client, 0, 'L'); $pdf->rect(100, 40, 100, 40); diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index ace29139181..e6b73629fb9 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -907,7 +907,7 @@ class pdf_einstein extends ModelePDFCommandes // Show sender information $pdf->SetXY($posx+2,$posy+8); $pdf->SetFont('','',9); - $pdf->MultiCell(80, 4, $carac_emetteur); + $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L'); @@ -955,7 +955,7 @@ class pdf_einstein extends ModelePDFCommandes // Show recipient information $pdf->SetFont('','',9); $pdf->SetXY($posx+2,$posy+8); - $pdf->MultiCell(86,4, $carac_client); + $pdf->MultiCell(86,4, $carac_client, 0, 'L'); } } diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index 574ffdcd154..9e07c02416d 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -442,7 +442,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pdf->SetFont('','',7); $pdf->SetXY($blSocX,$blSocY+6); - $pdf->MultiCell(80, 2, $carac_emetteur); + $pdf->MultiCell(80, 2, $carac_emetteur, 0, 'L'); if ($object->client->code_client) @@ -524,7 +524,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pdf->SetFont('','',7); $pdf->SetXY($blDestX,$Yoff+4); - $pdf->MultiCell($blW,2, $carac_client); + $pdf->MultiCell($blW,2, $carac_client, 0, 'L'); } } ?> diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 52447283ce6..ad1ae8c9873 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -857,7 +857,7 @@ class pdf_oursin extends ModelePDFFactures $pdf->SetFont('','',9); $pdf->SetXY($this->marge_gauche,$posy+9); - $pdf->MultiCell(80, 4, $carac_emetteur); + $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L'); // Client destinataire @@ -898,7 +898,7 @@ class pdf_oursin extends ModelePDFFactures $pdf->SetFont('','B',9); $pdf->SetXY($this->marges['g']+100,$posy+8); - $pdf->MultiCell(86,4, $carac_client); + $pdf->MultiCell(86,4, $carac_client, 0, 'L'); /* * ref facture diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index 892ae38f2a4..acdb3c66c25 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -236,10 +236,10 @@ class pdf_soleil extends ModelePDFFicheinter $pdf->SetFont('','B',10); $fichinter->fetch_thirdparty(); $pdf->SetXY(102,42); - $pdf->MultiCell(86,4, $outputlangs->convToOutputCharset($carac_client_name), 0, 'L'); + $pdf->MultiCell(86,4, $carac_client_name, 0, 'L'); $pdf->SetFont('','',9); $pdf->SetXY(102,$pdf->GetY()); - $pdf->MultiCell(66,4, $outputlangs->convToOutputCharset($carac_client), 0, 'L'); + $pdf->MultiCell(66,4, $carac_client, 0, 'L'); $pdf->rect(100, 40, 100, 40); diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index e76dd23675a..389d692c5bd 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -369,7 +369,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $pdf->SetFont('','',9); $pdf->SetXY($this->marge_gauche,$posy+4); - $pdf->MultiCell(80, 3, $carac_emetteur); + $pdf->MultiCell(80, 3, $carac_emetteur, 0, 'L'); /* @@ -404,10 +404,10 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $pdf->SetFont('','B',11); $pdf->SetXY(102,42); - $pdf->MultiCell(96,5, $carac_client_name); + $pdf->MultiCell(96,5, $carac_client_name, 0, 'L'); $pdf->SetFont('','B',10); $pdf->SetXY(102,47); - $pdf->MultiCell(96,5, $carac_client); + $pdf->MultiCell(96,5, $carac_client, 0, 'L'); $pdf->rect(100, 40, 100, 40); diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index bf70a58d61b..a7bc81fc263 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -605,7 +605,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetFont('','',9); $pdf->SetXY($this->marge_gauche+2,$posy+9); - $pdf->MultiCell(80, 3, $carac_emetteur); + $pdf->MultiCell(80, 3, $carac_emetteur, 0, 'L'); // Client destinataire $posy=42; @@ -648,7 +648,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetFont('','',9); $pdf->SetXY(102,$posy+8); - $pdf->MultiCell(86,4, $carac_client); + $pdf->MultiCell(86,4, $carac_client, 0, 'L'); } } diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php index 8ff70b6f06e..d2cf0085e75 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -657,7 +657,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetFont('','',9); $pdf->SetXY($this->marge_gauche+2,$posy+8); - $pdf->MultiCell(80, 4, $carac_emetteur); + $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L'); // Client destinataire $posy=42; @@ -696,7 +696,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetFont('','',9); $pdf->SetXY(102,$posy+8); - $pdf->MultiCell(96,4, $carac_client); + $pdf->MultiCell(96,4, $carac_client, 0, 'L'); } }