lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: Prepare TCPDF compatibility

Browse Source
This commit is contained in:
Laurent Destailleur 2010-11-22 19:25:49 +00:00
parent c6b8c66f51
commit 71aeaa6fc6
16 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/includes/modules/commande/pdf_edison.modules.php
View File

@ -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;

6
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@ -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;

4
htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
View File

@ -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);
}

2
htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
View File

@ -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;

6
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -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;

4
htdocs/includes/modules/facture/pdf_oursin.modules.php
View File

@ -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);
}

8
htdocs/includes/modules/fichinter/pdf_soleil.modules.php
View File

@ -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);

4
htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
View File

@ -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;

6
htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
View File

@ -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;

6
htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
View File

@ -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;

6
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -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;

4
htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
View File

@ -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;

2
htdocs/includes/modules/rapport/pdf_paiement.class.php
View File

@ -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);

6
htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View File

@ -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;

6
htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -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;

10
htdocs/lib/pdf.lib.php
View File

@ -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);
}
}