diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index 080a1ac9f4e..88c76065aa5 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -173,7 +173,7 @@ class pdf_edison extends ModelePDFCommandes $pagenb++; $this->_pagehead($pdf, $object, 1, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); @@ -249,7 +249,7 @@ class pdf_edison extends ModelePDFCommandes $pagenb++; $this->_pagehead($pdf, $object, 0, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $nexY = $tab_top + 8; diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 47d0ad0d2ab..69a93e2eea4 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -203,7 +203,7 @@ class pdf_einstein extends ModelePDFCommandes $pagenb++; $this->_pagehead($pdf, $object, 1, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); @@ -219,7 +219,7 @@ class pdf_einstein extends ModelePDFCommandes $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetXY ($this->posxdesc-1, $tab_top); - $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'J'); + $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'L'); $nexY = $pdf->GetY(); $height_note=$nexY-$tab_top; @@ -348,7 +348,7 @@ class pdf_einstein extends ModelePDFCommandes $pagenb++; $this->_pagehead($pdf, $object, 0, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $nexY = $tab_top_newpage + 7; 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 d85687d1177..ec80f290aaf 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -184,7 +184,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pagenb++; $this->_pagehead($pdf, $this->expe, $outputlangs); $pdf->SetFont('','', 7); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); //Initialisation des coordonnees @@ -244,7 +244,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pdf->AddPage(); $pagenb++; $this->_pagehead($pdf, $this->expe, $outputlangs); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $pdf->SetFont('','', 7); } diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php index 165892a79ca..523a74ebd7f 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php @@ -300,7 +300,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition $pagenb++; $this->_pagehead($pdf, $object, 1, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $tab_top = 90; diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index aa5d9a11b38..4ec52a09068 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -206,7 +206,7 @@ class pdf_crabe extends ModelePDFFactures $pagenb++; $this->_pagehead($pdf, $object, 1, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $tab_top = 90; @@ -222,7 +222,7 @@ class pdf_crabe extends ModelePDFFactures $pdf->SetFont('','', 9); $pdf->SetXY ($this->posxdesc-1, $tab_top); //$pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'J', false, 1, '', '', true, 0, false, false, 0, 'T', true); - $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'J'); // FPDF + $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'L'); // FPDF $nexY = $pdf->GetY(); $height_note=$nexY-$tab_top; @@ -359,7 +359,7 @@ class pdf_crabe extends ModelePDFFactures $pagenb++; $this->_pagehead($pdf, $object, 0, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $nexY = $tab_top_newpage + 7; diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index a5b76948e3e..fc62f4a2b95 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -194,7 +194,7 @@ class pdf_oursin extends ModelePDFFactures $pagenb++; $this->_pagehead($pdf, $object, 1, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $tab_top = $this->marges['h']+90; @@ -265,7 +265,7 @@ class pdf_oursin extends ModelePDFFactures $pagenb++; $this->_pagehead($pdf, $object, 0, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); } diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index 8f9cfffba9c..fa570ad466b 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -159,7 +159,7 @@ class pdf_soleil extends ModelePDFFicheinter $pagenb++; $pdf->SetTextColor(0,0,0); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 4 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 // Pagehead @@ -265,7 +265,7 @@ class pdf_soleil extends ModelePDFFicheinter $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetXY ($this->posxdesc-1, $tab_top); - $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($fichinter->note_public), 0, 'J'); + $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($fichinter->note_public), 0, 'L'); $nexY = $pdf->GetY(); $height_note=$nexY-$tab_top; @@ -287,7 +287,7 @@ class pdf_soleil extends ModelePDFFicheinter $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetXY (10, $tab_top + 8 ); $desc=dol_htmlentitiesbr($fichinter->description,1); //print $outputlangs->convToOutputCharset($desc); exit; @@ -296,7 +296,7 @@ class pdf_soleil extends ModelePDFFicheinter $pdf->line(10, $nexY, 200, $nexY); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3. Then writeMultiCell must use 3 also. + $pdf->MultiCell(0, 3, ''); // Set interline to 3. Then writeMultiCell must use 3 also. //dol_syslog("desc=".dol_htmlentitiesbr($fichinter->description)); $nblignes = sizeof($fichinter->lines); diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index 9226406a018..1e50e644412 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -168,7 +168,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $pagenb++; $this->_pagehead($pdf, $object, 1, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $tab_top = 100; @@ -262,7 +262,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $pagenb++; $this->_pagehead($pdf, $object, 0, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $nexY = $tab_top_newpage + 7; diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index 8b447462da0..d60af248b44 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -202,7 +202,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pagenb++; $this->_pagehead($pdf, $object, 1, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $tab_top = 90; @@ -217,7 +217,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetXY ($this->posxdesc-1, $tab_top); - $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'J'); + $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'L'); $nexY = $pdf->GetY(); $height_note=$nexY-$tab_top; @@ -327,7 +327,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pagenb++; $this->_pagehead($pdf, $object, 0, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $nexY = $tab_top_newpage + 7; diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php index 4f4e024abd8..a3a60173d54 100644 --- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php @@ -170,7 +170,7 @@ class pdf_baleine extends ModelePDFProjects $pagenb++; $this->_pagehead($pdf, $object, 1, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $tab_top = 50; @@ -183,7 +183,7 @@ class pdf_baleine extends ModelePDFProjects { $pdf->SetFont('','', 9); $pdf->SetXY ($this->posxref-1, $tab_top-2); - $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'J'); + $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'L'); $nexY = $pdf->GetY(); $height_note=$nexY-($tab_top-2); @@ -259,7 +259,7 @@ class pdf_baleine extends ModelePDFProjects $pagenb++; $this->_pagehead($pdf, $object, 0, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $tab_top=$tab_top_newpage; diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 521713398ca..7abf78baa3f 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -203,7 +203,7 @@ class pdf_propale_azur extends ModelePDFPropales $pagenb++; $this->_pagehead($pdf, $object, 1, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 4 + $pdf->MultiCell(0, 4, ''); // Set interline to 4 $pdf->SetTextColor(0,0,0); $tab_top = 90; @@ -220,7 +220,7 @@ class pdf_propale_azur extends ModelePDFPropales $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetXY ($this->posxdesc-1, $tab_top); - $pdf->MultiCell(190, 4, $outputlangs->convToOutputCharset($object->note_public), 0, 'J'); + $pdf->MultiCell(190, 4, $outputlangs->convToOutputCharset($object->note_public), 0, 'L'); $nexY = $pdf->GetY(); $height_note=$nexY-$tab_top; @@ -348,7 +348,7 @@ class pdf_propale_azur extends ModelePDFPropales $pagenb++; $this->_pagehead($pdf, $object, 0, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $nexY = $tab_top_newpage + 7; diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index defef583442..eb01741d66f 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -167,7 +167,7 @@ class pdf_propale_jaune extends ModelePDFPropales $pagenb++; $this->_pagehead($pdf, $object, 1, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $tab_top = 100; @@ -245,7 +245,7 @@ class pdf_propale_jaune extends ModelePDFPropales $pagenb++; $this->_pagehead($pdf, $object, 0, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $nexY = $tab_top + 8; diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php index 9eb917d2a22..01a5da1b329 100644 --- a/htdocs/includes/modules/rapport/pdf_paiement.class.php +++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php @@ -199,7 +199,7 @@ class pdf_paiement $pagenb++; $this->_pagehead($pdf, $pages, 1, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 8db2f5726db..9bd2e363230 100755 --- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -183,7 +183,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $pagenb++; $this->_pagehead($pdf, $object, 1, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $tab_top = 90; @@ -198,7 +198,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetXY ($this->posxdesc-1, $tab_top); - $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'J'); + $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'L'); $nexY = $pdf->GetY(); $height_note=$nexY-$tab_top; @@ -295,7 +295,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $pagenb++; $this->_pagehead($pdf, $object, 0, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $nexY = $tab_top_newpage + 7; 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 872d5b3d20a..9edad6c0442 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -193,7 +193,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pagenb++; $this->_pagehead($pdf, $object, 1, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $tab_top = 90; @@ -208,7 +208,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetXY ($this->posxdesc-1, $tab_top); - $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'J'); + $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'L'); $nexY = $pdf->GetY(); $height_note=$nexY-$tab_top; @@ -305,7 +305,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pagenb++; $this->_pagehead($pdf, $object, 0, $outputlangs); $pdf->SetFont('','', 9); - $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 + $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); $nexY = $tab_top_newpage + 7; diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index bef0ab2f10a..ee2e1e721b1 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -35,7 +35,7 @@ */ function pdf_getPDFFont($outputlangs) { - $font='Helvetica'; // By default, for FPDI + $font='Helvetica'; // By default, for FPDI or ISO language on TCPDF if (class_exists('TCPDF')) // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower) { if ($outputlangs->trans('FONTFORPDF')!='FONTFORPDF') @@ -457,8 +457,12 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass $pdf->MultiCell(200, 2, $ligne2, 0, 'C', 0); } - $pdf->SetXY(-20,-$posy); - $pdf->MultiCell(11, 2, $pdf->PageNo().'/{nb}', 0, 'R', 0); + // Show page nb only on iso languages + if (pdf_getPDFFont($outputlangs) == 'Helvetica') + { + $pdf->SetXY(-20,-$posy); + $pdf->MultiCell(11, 2, $pdf->PageNo().'/{nb}', 0, 'R', 0); + } }