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

Fix #31917: Correct the PDF font size.

Browse Source
This commit is contained in:
kujiu 2010-12-26 20:22:58 +00:00
parent 507714811f
commit 059642ebbd
11 changed files with 239 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
View File

@ -195,42 +195,43 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
function Header(&$pdf, $page, $pages, $outputlangs) function Header(&$pdf, $page, $pages, $outputlangs)
{ {
global $langs; global $langs;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$outputlangs->load("compta"); $outputlangs->load("compta");
$outputlangs->load("banks"); $outputlangs->load("banks");
$title = $outputlangs->transnoentities("CheckReceipt"); $title = $outputlangs->transnoentities("CheckReceipt");
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$pdf->SetXY(10,8); $pdf->SetXY(10,8);
$pdf->MultiCell(0,2,$title,0,'L'); $pdf->MultiCell(0,2,$title,0,'L');
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$pdf->SetXY(10,14); $pdf->SetXY(10,14);
$pdf->MultiCell(22,2,$outputlangs->transnoentities("Ref"),0,'L'); $pdf->MultiCell(22,2,$outputlangs->transnoentities("Ref"),0,'L');
$pdf->SetXY(32,14); $pdf->SetXY(32,14);
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->number), 0, 'L'); $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->number), 0, 'L');
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$pdf->SetXY(10,20); $pdf->SetXY(10,20);
$pdf->MultiCell(22,2,$outputlangs->transnoentities("Date"),0,'L'); $pdf->MultiCell(22,2,$outputlangs->transnoentities("Date"),0,'L');
$pdf->SetXY(32,20); $pdf->SetXY(32,20);
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$pdf->MultiCell(60, 2, dol_print_date($this->date,"day",false,$outputlangs)); $pdf->MultiCell(60, 2, dol_print_date($this->date,"day",false,$outputlangs));
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$pdf->SetXY(10,26); $pdf->SetXY(10,26);
$pdf->MultiCell(22,2,$outputlangs->transnoentities("Owner"),0,'L'); $pdf->MultiCell(22,2,$outputlangs->transnoentities("Owner"),0,'L');
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$pdf->SetXY(32,26); $pdf->SetXY(32,26);
$pdf->MultiCell(60,2,$outputlangs->convToOutputCharset($this->account->proprio),0,'L'); $pdf->MultiCell(60,2,$outputlangs->convToOutputCharset($this->account->proprio),0,'L');
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$pdf->SetXY(10,32); $pdf->SetXY(10,32);
$pdf->MultiCell(0,2,$outputlangs->transnoentities("Account"),0,'L'); $pdf->MultiCell(0,2,$outputlangs->transnoentities("Account"),0,'L');
pdf_bank($pdf,$outputlangs,32,30,$this->account,1); pdf_bank($pdf,$outputlangs,32,30,$this->account,1);
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$pdf->SetXY(114,16); $pdf->SetXY(114,16);
$pdf->MultiCell(40, 2, $outputlangs->transnoentities("Signature"), 0, 'L'); $pdf->MultiCell(40, 2, $outputlangs->transnoentities("Signature"), 0, 'L');
@ -239,24 +240,24 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
$pdf->line(140, 47, 140, 54); $pdf->line(140, 47, 140, 54);
$pdf->line(170, 47, 170, 54); $pdf->line(170, 47, 170, 54);
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$pdf->SetXY(10,49); $pdf->SetXY(10,49);
$pdf->MultiCell(40, 2, $outputlangs->transnoentities("NumberOfCheques"), 0, 'L'); $pdf->MultiCell(40, 2, $outputlangs->transnoentities("NumberOfCheques"), 0, 'L');
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$pdf->SetXY(57,49); $pdf->SetXY(57,49);
$pdf->MultiCell(40, 2, $this->nbcheque, 0, 'L'); $pdf->MultiCell(40, 2, $this->nbcheque, 0, 'L');
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$pdf->SetXY(148,49); $pdf->SetXY(148,49);
$pdf->MultiCell(40, 2, $langs->trans("Total")); $pdf->MultiCell(40, 2, $langs->trans("Total"));
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$pdf->SetXY (170, 49); $pdf->SetXY (170, 49);
$pdf->MultiCell(31, 2, price($this->amount), 0, 'C', 0); $pdf->MultiCell(31, 2, price($this->amount), 0, 'C', 0);
// Tableau // Tableau
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY (11, $this->tab_top+2); $pdf->SetXY (11, $this->tab_top+2);
$pdf->MultiCell(40,2,$outputlangs->transnoentities("Num"), 0, 'L'); $pdf->MultiCell(40,2,$outputlangs->transnoentities("Num"), 0, 'L');
$pdf->line(40, $this->tab_top, 40, $this->tab_top + $this->tab_height + 10); $pdf->line(40, $this->tab_top, 40, $this->tab_top + $this->tab_height + 10);
@ -296,7 +297,8 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
// x=10 - Num // x=10 - Num
// x=30 - Banque // x=30 - Banque
// x=100 - Emetteur // x=100 - Emetteur
$pdf->SetFont('','', 9); $default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetFont('','', $default_font_size - 1);
$oldprowid = 0; $oldprowid = 0;
$pdf->SetFillColor(220,220,220); $pdf->SetFillColor(220,220,220);
$yp = 0; $yp = 0;
@ -332,6 +334,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
function _pagefoot(&$pdf,$object,$outputlangs) function _pagefoot(&$pdf,$object,$outputlangs)
{ {
global $conf; global $conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
//return pdf_pagefoot($pdf,$outputlangs,'BANK_CHEQUERECEIPT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object); //return pdf_pagefoot($pdf,$outputlangs,'BANK_CHEQUERECEIPT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object);
$paramfreetext='BANK_CHEQUERECEIPT_FREE_TEXT'; $paramfreetext='BANK_CHEQUERECEIPT_FREE_TEXT';
@ -342,7 +345,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
// Line of free text // Line of free text
$line=(! empty($conf->global->$paramfreetext))?$outputlangs->convToOutputCharset($conf->global->$paramfreetext):""; $line=(! empty($conf->global->$paramfreetext))?$outputlangs->convToOutputCharset($conf->global->$paramfreetext):"";
$pdf->SetFont('','',7); $pdf->SetFont('','', $default_font_size - 3);
$pdf->SetDrawColor(224,224,224); $pdf->SetDrawColor(224,224,224);
// On positionne le debut du bas de page selon nbre de lignes de ce bas de page // On positionne le debut du bas de page selon nbre de lignes de ce bas de page

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

@ -107,6 +107,8 @@ class pdf_edison extends ModelePDFCommandes
$outputlangs->load("products"); $outputlangs->load("products");
$outputlangs->load("orders"); $outputlangs->load("orders");
$default_font_size = pdf_getPDFFontSize($outputlangs);
if ($conf->commande->dir_output) if ($conf->commande->dir_output)
{ {
// Definition of $dir and $file // Definition of $dir and $file
@ -174,7 +176,7 @@ class pdf_edison extends ModelePDFCommandes
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 1, $outputlangs); $this->_pagehead($pdf, $object, 1, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -185,7 +187,7 @@ class pdf_edison extends ModelePDFCommandes
$pdf->SetFillColor(220,220,220); $pdf->SetFillColor(220,220,220);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY (10, $tab_top + 10 ); $pdf->SetXY (10, $tab_top + 10 );
@ -198,13 +200,13 @@ class pdf_edison extends ModelePDFCommandes
{ {
$curY = $nexY; $curY = $nexY;
$pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page
// Description de la ligne produit // Description de la ligne produit
pdf_writelinedesc($pdf,$object,$i,$outputlangs,100,3,30,$curY,1); pdf_writelinedesc($pdf,$object,$i,$outputlangs,100,3,30,$curY,1);
//$pdf->writeHTMLCell(100, 3, 30, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1); //$pdf->writeHTMLCell(100, 3, 30, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
$pdf->SetFont('','', 9); // On repositionne la police par defaut $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$ref = pdf_getlineref($object, $i, $outputlangs); $ref = pdf_getlineref($object, $i, $outputlangs);
@ -250,7 +252,7 @@ class pdf_edison extends ModelePDFCommandes
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -269,7 +271,7 @@ class pdf_edison extends ModelePDFCommandes
$tab2_top = 241; $tab2_top = 241;
$tab2_lh = 4; $tab2_lh = 4;
$pdf->SetFont('','', 11); $pdf->SetFont('','', $default_font_size + 1);
$pdf->SetXY (132, $tab2_top + 0); $pdf->SetXY (132, $tab2_top + 0);
$pdf->MultiCell(42, $tab2_lh, $langs->transnoentities("TotalHT"), 0, 'R', 0); $pdf->MultiCell(42, $tab2_lh, $langs->transnoentities("TotalHT"), 0, 'R', 0);
@ -323,13 +325,14 @@ class pdf_edison extends ModelePDFCommandes
function _tableau_info(&$pdf, $object, $posy, $outputlangs) function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{ {
global $conf; global $conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
// If France, show VAT mention if not applicable // If France, show VAT mention if not applicable
if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1) if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1)
{ {
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
@ -339,12 +342,12 @@ class pdf_edison extends ModelePDFCommandes
// Show payments conditions // Show payments conditions
if ($object->cond_reglement_code || $object->cond_reglement) if ($object->cond_reglement_code || $object->cond_reglement)
{ {
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$titre = $outputlangs->transnoentities("PaymentConditions").':'; $titre = $outputlangs->transnoentities("PaymentConditions").':';
$pdf->MultiCell(80, 4, $titre, 0, 'L'); $pdf->MultiCell(80, 4, $titre, 0, 'L');
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY(52, $posy); $pdf->SetXY(52, $posy);
$lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc); $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement); $lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
@ -361,7 +364,7 @@ class pdf_edison extends ModelePDFCommandes
{ {
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -373,12 +376,12 @@ class pdf_edison extends ModelePDFCommandes
&& $object->mode_reglement_code != 'CHQ' && $object->mode_reglement_code != 'CHQ'
&& $object->mode_reglement_code != 'VIR') && $object->mode_reglement_code != 'VIR')
{ {
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$titre = $outputlangs->transnoentities("PaymentMode").':'; $titre = $outputlangs->transnoentities("PaymentMode").':';
$pdf->MultiCell(80, 5, $titre, 0, 'L'); $pdf->MultiCell(80, 5, $titre, 0, 'L');
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY(50, $posy); $pdf->SetXY(50, $posy);
//print "xxx".$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code);exit; //print "xxx".$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code);exit;
$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement); $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
@ -399,24 +402,24 @@ class pdf_edison extends ModelePDFCommandes
$account->fetch($conf->global->FACTURE_CHQ_NUMBER); $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0);
$posy=$pdf->GetY()+1; $posy=$pdf->GetY()+1;
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0);
$posy=$pdf->GetY()+2; $posy=$pdf->GetY()+2;
} }
if ($conf->global->FACTURE_CHQ_NUMBER == -1) if ($conf->global->FACTURE_CHQ_NUMBER == -1)
{ {
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$outputlangs->convToOutputCharset($this->emetteur->nom).' '.$outputlangs->transnoentities('SendTo').':',0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$outputlangs->convToOutputCharset($this->emetteur->nom).' '.$outputlangs->transnoentities('SendTo').':',0,'L',0);
$posy=$pdf->GetY()+1; $posy=$pdf->GetY()+1;
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
$posy=$pdf->GetY()+2; $posy=$pdf->GetY()+2;
} }
@ -459,8 +462,9 @@ class pdf_edison extends ModelePDFCommandes
global $langs,$conf; global $langs,$conf;
$langs->load("main"); $langs->load("main");
$langs->load("bills"); $langs->load("bills");
$default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$pdf->SetXY(30,$tab_top + 2); $pdf->SetXY(30,$tab_top + 2);
$pdf->MultiCell(0,4,$outputlangs->transnoentities("Designation"),0,'L'); $pdf->MultiCell(0,4,$outputlangs->transnoentities("Designation"),0,'L');
@ -487,7 +491,7 @@ class pdf_edison extends ModelePDFCommandes
$pdf->line(10, $tab_top + 8, 200, $tab_top + 8); $pdf->line(10, $tab_top + 8, 200, $tab_top + 8);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), 95); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), 95);
$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
@ -498,6 +502,7 @@ class pdf_edison extends ModelePDFCommandes
{ {
global $conf,$langs,$mysoc; global $conf,$langs,$mysoc;
$langs->load("orders"); $langs->load("orders");
$default_font_size = pdf_getPDFFontSize($outputlangs);
pdf_pagehead($pdf,$outputlangs,$this->page_hauteur); pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
@ -522,7 +527,7 @@ class pdf_edison extends ModelePDFCommandes
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
} }
@ -539,13 +544,13 @@ class pdf_edison extends ModelePDFCommandes
// Sender name // Sender name
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Sender properties // Sender properties
$carac_emetteur = pdf_build_address($outputlangs,$this->emetteur); $carac_emetteur = pdf_build_address($outputlangs,$this->emetteur);
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($this->marge_gauche,$posy+7); $pdf->SetXY($this->marge_gauche,$posy+7);
$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L'); $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
@ -580,17 +585,17 @@ class pdf_edison extends ModelePDFCommandes
// Show customer/recipient // Show customer/recipient
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$pdf->SetXY(102,42); $pdf->SetXY(102,42);
$pdf->MultiCell(96, 4, $carac_client_name, 0, 'L'); $pdf->MultiCell(96, 4, $carac_client_name, 0, 'L');
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY(102,$pdf->GetY()); $pdf->SetXY(102,$pdf->GetY());
$pdf->MultiCell(96, 4, $carac_client, 0, 'L'); $pdf->MultiCell(96, 4, $carac_client, 0, 'L');
$pdf->rect(100, 40, 100, 40); $pdf->rect(100, 40, 100, 40);
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('','B',12); $pdf->SetFont('','B', $default_font_size + 2);
$pdf->SetXY(11, 88); $pdf->SetXY(11, 88);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,'day',false,$outputlangs), 0, 'L'); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,'day',false,$outputlangs), 0, 'L');
$pdf->SetXY(11, 94); $pdf->SetXY(11, 94);

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

@ -110,6 +110,7 @@ class pdf_einstein extends ModelePDFCommandes
function write_file($object,$outputlangs) function write_file($object,$outputlangs)
{ {
global $user,$langs,$conf; global $user,$langs,$conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@ -204,7 +205,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 1, $outputlangs); $this->_pagehead($pdf, $object, 1, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -219,7 +220,7 @@ class pdf_einstein extends ModelePDFCommandes
{ {
$tab_top = 88; $tab_top = 88;
$pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page
$pdf->SetXY ($this->posxdesc-1, $tab_top); $pdf->SetXY ($this->posxdesc-1, $tab_top);
$pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'L'); $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'L');
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
@ -246,13 +247,13 @@ class pdf_einstein extends ModelePDFCommandes
{ {
$curY = $nexY; $curY = $nexY;
$pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page
// Description of product line // Description of product line
$curX = $this->posxdesc-1; $curX = $this->posxdesc-1;
pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY); pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY);
$pdf->SetFont('','', 9); // On repositionne la police par defaut $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
// TVA // TVA
@ -349,7 +350,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -433,13 +434,14 @@ class pdf_einstein extends ModelePDFCommandes
function _tableau_info(&$pdf, $object, $posy, $outputlangs) function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{ {
global $conf; global $conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
// If France, show VAT mention if not applicable // If France, show VAT mention if not applicable
if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1) if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1)
{ {
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
@ -449,12 +451,12 @@ class pdf_einstein extends ModelePDFCommandes
// Show payments conditions // Show payments conditions
if ($object->cond_reglement_code || $object->cond_reglement) if ($object->cond_reglement_code || $object->cond_reglement)
{ {
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$titre = $outputlangs->transnoentities("PaymentConditions").':'; $titre = $outputlangs->transnoentities("PaymentConditions").':';
$pdf->MultiCell(80, 4, $titre, 0, 'L'); $pdf->MultiCell(80, 4, $titre, 0, 'L');
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY(52, $posy); $pdf->SetXY(52, $posy);
$lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc); $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement); $lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
@ -471,7 +473,7 @@ class pdf_einstein extends ModelePDFCommandes
{ {
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -484,12 +486,12 @@ class pdf_einstein extends ModelePDFCommandes
&& $object->mode_reglement_code != 'CHQ' && $object->mode_reglement_code != 'CHQ'
&& $object->mode_reglement_code != 'VIR') && $object->mode_reglement_code != 'VIR')
{ {
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$titre = $outputlangs->transnoentities("PaymentMode").':'; $titre = $outputlangs->transnoentities("PaymentMode").':';
$pdf->MultiCell(80, 5, $titre, 0, 'L'); $pdf->MultiCell(80, 5, $titre, 0, 'L');
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY(50, $posy); $pdf->SetXY(50, $posy);
$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement); $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
$pdf->MultiCell(80, 5, $lib_mode_reg,0,'L'); $pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
@ -509,24 +511,24 @@ class pdf_einstein extends ModelePDFCommandes
$account->fetch($conf->global->FACTURE_CHQ_NUMBER); $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0);
$posy=$pdf->GetY()+1; $posy=$pdf->GetY()+1;
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0);
$posy=$pdf->GetY()+2; $posy=$pdf->GetY()+2;
} }
if ($conf->global->FACTURE_CHQ_NUMBER == -1) if ($conf->global->FACTURE_CHQ_NUMBER == -1)
{ {
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$outputlangs->convToOutputCharset($this->emetteur->nom).' '.$outputlangs->transnoentities('SendTo').':',0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$outputlangs->convToOutputCharset($this->emetteur->nom).' '.$outputlangs->transnoentities('SendTo').':',0,'L',0);
$posy=$pdf->GetY()+1; $posy=$pdf->GetY()+1;
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
$posy=$pdf->GetY()+2; $posy=$pdf->GetY()+2;
} }
@ -565,11 +567,12 @@ class pdf_einstein extends ModelePDFCommandes
*/ */
function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs) function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{ {
global $conf,$mysoc; global $conf,$mysoc;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$tab2_top = $posy; $tab2_top = $posy;
$tab2_hl = 4; $tab2_hl = 4;
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
// Tableau total // Tableau total
$lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x; $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x;
@ -740,7 +743,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1);
// Fin // Fin
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
} }
@ -757,8 +760,9 @@ class pdf_einstein extends ModelePDFCommandes
global $conf; global $conf;
// Amount in (at tab_top - 1) // Amount in (at tab_top - 1)
$default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top -3); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top -3);
$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
@ -770,7 +774,7 @@ class pdf_einstein extends ModelePDFCommandes
// line prend une position y en 3eme et 4eme param // line prend une position y en 3eme et 4eme param
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY ($this->posxdesc-1, $tab_top+1); $pdf->SetXY ($this->posxdesc-1, $tab_top+1);
$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L'); $pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
@ -821,6 +825,7 @@ class pdf_einstein extends ModelePDFCommandes
$outputlangs->load("bills"); $outputlangs->load("bills");
$outputlangs->load("propal"); $outputlangs->load("propal");
$outputlangs->load("companies"); $outputlangs->load("companies");
$default_font_size = pdf_getPDFFontSize($outputlangs);
pdf_pagehead($pdf,$outputlangs,$this->page_hauteur); pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
@ -832,7 +837,7 @@ class pdf_einstein extends ModelePDFCommandes
//Print content //Print content
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B',13); $pdf->SetFont('','B', $default_font_size + 3);
$posy=$this->marge_haute; $posy=$this->marge_haute;
@ -849,7 +854,7 @@ class pdf_einstein extends ModelePDFCommandes
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size -2);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
} }
@ -860,13 +865,13 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L'); $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
} }
$pdf->SetFont('','B',13); $pdf->SetFont('','B', $default_font_size + 3);
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$title=$outputlangs->transnoentities("Order"); $title=$outputlangs->transnoentities("Order");
$pdf->MultiCell(100, 4, $title, '' , 'R'); $pdf->MultiCell(100, 4, $title, '' , 'R');
$pdf->SetFont('','B',12); $pdf->SetFont('','B', $default_font_size + 2);
$posy+=6; $posy+=6;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@ -874,7 +879,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R'); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
$posy+=2; $posy+=2;
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$posy+=5; $posy+=5;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@ -894,7 +899,7 @@ class pdf_einstein extends ModelePDFCommandes
// Show sender frame // Show sender frame
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx,$posy-5); $pdf->SetXY($posx,$posy-5);
$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":"); $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":");
$pdf->SetXY($posx,$posy); $pdf->SetXY($posx,$posy);
@ -904,12 +909,12 @@ class pdf_einstein extends ModelePDFCommandes
// Show sender name // Show sender name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Show sender information // Show sender information
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+8);
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L'); $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
@ -945,18 +950,18 @@ class pdf_einstein extends ModelePDFCommandes
// Show recipient frame // Show recipient frame
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx+2,$posy-5); $pdf->SetXY($posx+2,$posy-5);
$pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L'); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L');
$pdf->rect($posx, $posy, 100, $hautcadre); $pdf->rect($posx, $posy, 100, $hautcadre);
// Show recipient name // Show recipient name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell(96,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(96,4, $carac_client_name, 0, 'L');
// Show recipient information // Show recipient information
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+8);
$pdf->MultiCell(86,4, $carac_client, 0, 'L'); $pdf->MultiCell(86,4, $carac_client, 0, 'L');
} }

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

@ -76,6 +76,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
function write_file(&$object, $outputlangs) function write_file(&$object, $outputlangs)
{ {
global $user,$conf,$langs,$mysoc; global $user,$conf,$langs,$mysoc;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$object->fetch_thirdparty(); $object->fetch_thirdparty();
@ -179,13 +180,13 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$pdf->SetMargins(10, 10, 10); $pdf->SetMargins(10, 10, 10);
$pdf->SetAutoPageBreak(1,0); $pdf->SetAutoPageBreak(1,0);
$pdf->SetFont('','', 7); $pdf->SetFont('','', $default_font_size - 3);
// New page // New page
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $this->expe, $outputlangs); $this->_pagehead($pdf, $this->expe, $outputlangs);
$pdf->SetFont('','', 7); $pdf->SetFont('','', $default_font_size - 3);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -194,7 +195,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$tab_height = 70; $tab_height = 70;
$pdf->SetFillColor(240,240,240); $pdf->SetFillColor(240,240,240);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','', 7); $pdf->SetFont('','', $default_font_size - 3);
$pdf->SetXY (10, $tab_top + 5 ); $pdf->SetXY (10, $tab_top + 5 );
$iniY = $pdf->GetY(); $iniY = $pdf->GetY();
$curY = $pdf->GetY(); $curY = $pdf->GetY();
@ -213,20 +214,20 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$pdf->rect(20+3, $curY+1, 3, 3); $pdf->rect(20+3, $curY+1, 3, 3);
//Insertion de la reference du produit //Insertion de la reference du produit
$pdf->SetXY (30, $curY+1 ); $pdf->SetXY (30, $curY+1 );
$pdf->SetFont('','B', 7); $pdf->SetFont('','B', $default_font_size - 3);
$pdf->MultiCell(24, 3, $outputlangs->convToOutputCharset($object->lines[$i]->ref), 0, 'L', 0); $pdf->MultiCell(24, 3, $outputlangs->convToOutputCharset($object->lines[$i]->ref), 0, 'L', 0);
//Insertion du libelle //Insertion du libelle
$pdf->SetFont('','', 7); $pdf->SetFont('','', $default_font_size - 3);
$pdf->SetXY (50, $curY+1 ); $pdf->SetXY (50, $curY+1 );
//$libelleproduitservice=pdf_getlinedesc($object->$origin,$i,$outputlangs); //$libelleproduitservice=pdf_getlinedesc($object->$origin,$i,$outputlangs);
$libelleproduitservice = pdf_writelinedesc($pdf,$object->$origin,$i,$outputlangs,90,3,50,$curY+1,1); $libelleproduitservice = pdf_writelinedesc($pdf,$object->$origin,$i,$outputlangs,90,3,50,$curY+1,1);
//$pdf->writeHTMLCell(90, 3, 50, $curY+1, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 'L', 0); //$pdf->writeHTMLCell(90, 3, 50, $curY+1, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 'L', 0);
//Insertion de la quantite commandee //Insertion de la quantite commandee
$pdf->SetFont('','', 7); $pdf->SetFont('','', $default_font_size - 3);
$pdf->SetXY (140, $curY+1 ); $pdf->SetXY (140, $curY+1 );
$pdf->MultiCell(30, 3, $object->lines[$i]->qty_asked, 0, 'C', 0); $pdf->MultiCell(30, 3, $object->lines[$i]->qty_asked, 0, 'C', 0);
//Insertion de la quantite a envoyer //Insertion de la quantite a envoyer
$pdf->SetFont('','', 7); $pdf->SetFont('','', $default_font_size - 3);
$pdf->SetXY (170, $curY+1 ); $pdf->SetXY (170, $curY+1 );
$pdf->MultiCell(30, 3, $object->lines[$i]->qty_shipped, 0, 'C', 0); $pdf->MultiCell(30, 3, $object->lines[$i]->qty_shipped, 0, 'C', 0);
@ -247,7 +248,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$this->_pagehead($pdf, $this->expe, $outputlangs); $this->_pagehead($pdf, $this->expe, $outputlangs);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','', 7); $pdf->SetFont('','', $default_font_size - 3);
} }
} }
//Insertion du pied de page //Insertion du pied de page
@ -285,11 +286,12 @@ Class pdf_expedition_merou extends ModelePdfExpedition
function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs) function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs)
{ {
global $langs; global $langs;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$langs->load("main"); $langs->load("main");
$langs->load("bills"); $langs->load("bills");
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY(10,$tab_top); $pdf->SetXY(10,$tab_top);
$pdf->MultiCell(10,5,"LS",0,'C',1); $pdf->MultiCell(10,5,"LS",0,'C',1);
$pdf->line(20, $tab_top, 20, $tab_top + $tab_height); $pdf->line(20, $tab_top, 20, $tab_top + $tab_height);
@ -315,7 +317,8 @@ Class pdf_expedition_merou extends ModelePdfExpedition
*/ */
function _pagefoot(&$pdf, $object, $outputlangs) function _pagefoot(&$pdf, $object, $outputlangs)
{ {
$pdf->SetFont('','',8); $default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetFont('','', $default_font_size - 2);
$pdf->SetY(-23); $pdf->SetY(-23);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("GoodStatusDeclaration") , 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("GoodStatusDeclaration") , 0, 'L');
$pdf->SetY(-13); $pdf->SetY(-13);
@ -337,6 +340,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
function _pagehead(&$pdf, $object, $outputlangs) function _pagehead(&$pdf, $object, $outputlangs)
{ {
global $conf, $langs; global $conf, $langs;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$origin = $object->origin; $origin = $object->origin;
@ -368,7 +372,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L'); $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L'); $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
} }
@ -382,7 +386,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
//*********************Entete**************************** //*********************Entete****************************
//Nom du Document //Nom du Document
$pdf->SetXY($Xoff,7); $pdf->SetXY($Xoff,7);
$pdf->SetFont('','B',12); $pdf->SetFont('','B', $default_font_size + 2);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->MultiCell(0, 3, $outputlangs->transnoentities("SendingSheet"), '' , 'L'); // Bordereau expedition $pdf->MultiCell(0, 3, $outputlangs->transnoentities("SendingSheet"), '' , 'L'); // Bordereau expedition
//Num Expedition //Num Expedition
@ -390,7 +394,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$Xoff = 142; $Xoff = 142;
//$pdf->rect($Xoff, $Yoff, 85, 8); //$pdf->rect($Xoff, $Yoff, 85, 8);
$pdf->SetXY($Xoff,$Yoff); $pdf->SetXY($Xoff,$Yoff);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->MultiCell(0, 3, $outputlangs->transnoentities("RefSending").': '.$outputlangs->convToOutputCharset($object->ref), '' , 'R'); $pdf->MultiCell(0, 3, $outputlangs->transnoentities("RefSending").': '.$outputlangs->convToOutputCharset($object->ref), '' , 'R');
//$this->Code39($Xoff+43, $Yoff+1, $object->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true); //$this->Code39($Xoff+43, $Yoff+1, $object->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true);
@ -414,7 +418,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
{ {
$Yoff = $Yoff+4; $Yoff = $Yoff+4;
$pdf->SetXY($Xoff,$Yoff); $pdf->SetXY($Xoff,$Yoff);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$text=$linkedobject->ref; $text=$linkedobject->ref;
if ($linkedobject->ref_client) $text.=' ('.$linkedobject->ref_client.')'; if ($linkedobject->ref_client) $text.=' ('.$linkedobject->ref_client.')';
$pdf->MultiCell(0, 3, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R'); $pdf->MultiCell(0, 3, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
@ -441,7 +445,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
// Sender properties // Sender properties
$carac_emetteur = pdf_build_address($outputlangs,$this->emetteur); $carac_emetteur = pdf_build_address($outputlangs,$this->emetteur);
$pdf->SetFont('','',7); $pdf->SetFont('','', $default_font_size - 3);
$pdf->SetXY($blSocX,$blSocY+3); $pdf->SetXY($blSocX,$blSocY+3);
$pdf->MultiCell(80, 2, $carac_emetteur, 0, 'L'); $pdf->MultiCell(80, 2, $carac_emetteur, 0, 'L');
@ -458,13 +462,13 @@ Class pdf_expedition_merou extends ModelePdfExpedition
//Date Expedition //Date Expedition
$Yoff = $Yoff+7; $Yoff = $Yoff+7;
$pdf->SetXY($blSocX-80,$blSocY+20); $pdf->SetXY($blSocX-80,$blSocY+20);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->MultiCell(50, 8, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date_delivery,'day',false,$outputlangs,true), '' , 'L'); $pdf->MultiCell(50, 8, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date_delivery,'day',false,$outputlangs,true), '' , 'L');
// Deliverer // Deliverer
$pdf->SetXY($blSocX-80,$blSocY+23); $pdf->SetXY($blSocX-80,$blSocY+23);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->MultiCell(50, 8, $outputlangs->transnoentities("Deliverer")." ".$outputlangs->convToOutputCharset($this->livreur->getFullName($outputlangs)), '' , 'L'); $pdf->MultiCell(50, 8, $outputlangs->transnoentities("Deliverer")." ".$outputlangs->convToOutputCharset($this->livreur->getFullName($outputlangs)), '' , 'L');
@ -514,16 +518,16 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$pdf->Rect($blDestX, $Yoff-1, $blW, 20); $pdf->Rect($blDestX, $Yoff-1, $blW, 20);
//Titre //Titre
$pdf->SetFont('','B',7); $pdf->SetFont('','B', $default_font_size - 3);
$pdf->SetXY($blDestX,$Yoff-4); $pdf->SetXY($blDestX,$Yoff-4);
$pdf->MultiCell($blW,3, $outputlangs->transnoentities("Recipient"), 0, 'L'); $pdf->MultiCell($blW,3, $outputlangs->transnoentities("Recipient"), 0, 'L');
// Show customer/recipient // Show customer/recipient
$pdf->SetFont('','B',7); $pdf->SetFont('','B', $default_font_size - 3);
$pdf->SetXY($blDestX,$Yoff); $pdf->SetXY($blDestX,$Yoff);
$pdf->MultiCell($blW,3, $carac_client_name, 0, 'L'); $pdf->MultiCell($blW,3, $carac_client_name, 0, 'L');
$pdf->SetFont('','',7); $pdf->SetFont('','', $default_font_size - 3);
$pdf->SetXY($blDestX,$Yoff+4); $pdf->SetXY($blDestX,$Yoff+4);
$pdf->MultiCell($blW,2, $carac_client, 0, 'L'); $pdf->MultiCell($blW,2, $carac_client, 0, 'L');
} }

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

@ -76,6 +76,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
function _pagehead(&$pdf, $object, $showadress=1, $outputlangs) function _pagehead(&$pdf, $object, $showadress=1, $outputlangs)
{ {
global $conf,$langs,$mysoc; global $conf,$langs,$mysoc;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$langs->load("orders"); $langs->load("orders");
pdf_pagehead($pdf,$outputlangs,$this->page_hauteur); pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
@ -88,7 +89,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
//Prepare la suite //Prepare la suite
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B',13); $pdf->SetFont('','B', $default_font_size + 3);
$posy=$this->marge_haute; $posy=$this->marge_haute;
@ -105,7 +106,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
} }
@ -145,14 +146,14 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
$posx=100; $posx=100;
$posy=$this->marge_haute; $posy=$this->marge_haute;
$pdf->SetFont('','B',13); $pdf->SetFont('','B', $default_font_size + 3);
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$title=$outputlangs->transnoentities("SendingSheet"); $title=$outputlangs->transnoentities("SendingSheet");
$pdf->MultiCell(100, 4, $title, '' , 'R'); $pdf->MultiCell(100, 4, $title, '' , 'R');
$posy+=1; $posy+=1;
$pdf->SetFont('','',12); $pdf->SetFont('','', $default_font_size + 2);
$posy+=5; $posy+=5;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@ -174,7 +175,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
} }
$pdf->SetFont('','', 14); $pdf->SetFont('','', $default_font_size + 4);
$Yoff=40; $Yoff=40;
// Add list of linked orders // Add list of linked orders
@ -193,7 +194,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
$result=$newobject->fetch($val[$i]); $result=$newobject->fetch($val[$i]);
if ($result >= 0) if ($result >= 0)
{ {
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$text=$newobject->ref; $text=$newobject->ref;
if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')'; if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')';
$Yoff = $Yoff+8; $Yoff = $Yoff+8;
@ -220,6 +221,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
function write_file(&$object, $outputlangs) function write_file(&$object, $outputlangs)
{ {
global $user,$conf,$langs; global $user,$conf,$langs;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$object->fetch_thirdparty(); $object->fetch_thirdparty();
@ -305,7 +307,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 1, $outputlangs); $this->_pagehead($pdf, $object, 1, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -323,7 +325,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
} }
$this->tableau_top = 80; $this->tableau_top = 80;
$pdf->SetFont('','', 10); $pdf->SetFont('','', $default_font_size);
$curY = $this->tableau_top + 4; $curY = $this->tableau_top + 4;
$pdf->writeHTMLCell(100, 3, 12, $curY, $outputlangs->trans("Description"), 0, 0); $pdf->writeHTMLCell(100, 3, 12, $curY, $outputlangs->trans("Description"), 0, 0);
$curY = $this->tableau_top + 4; $curY = $this->tableau_top + 4;
@ -342,14 +344,14 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
$pdf->i25($this->marge_gauche+3, ($curY - 2), "000000".$object->lines[$i]->fk_product, 1, 8); $pdf->i25($this->marge_gauche+3, ($curY - 2), "000000".$object->lines[$i]->fk_product, 1, 8);
} }
$pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page
// Description de la ligne produit // Description de la ligne produit
//$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs); //$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs);
pdf_writelinedesc($pdf,$object,$i,$outputlangs,150,3,$this->posxdesc,$curY); pdf_writelinedesc($pdf,$object,$i,$outputlangs,150,3,$this->posxdesc,$curY);
//$pdf->writeHTMLCell(150, 3, $this->posxdesc, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1); //$pdf->writeHTMLCell(150, 3, $this->posxdesc, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
$pdf->SetFont('','', 9); // On repositionne la police par defaut $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$pdf->SetXY (160, $curY); $pdf->SetXY (160, $curY);

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

@ -84,6 +84,7 @@ class pdf_soleil extends ModelePDFFicheinter
function write_file($fichinter,$outputlangs) function write_file($fichinter,$outputlangs)
{ {
global $user,$langs,$conf,$mysoc; global $user,$langs,$conf,$mysoc;
$default_font_size = pdf_getPDFFontSize($outputlangs);
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@ -160,7 +161,7 @@ class pdf_soleil extends ModelePDFFicheinter
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
// Pagehead // Pagehead
@ -186,7 +187,7 @@ class pdf_soleil extends ModelePDFFicheinter
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
} }
@ -196,7 +197,7 @@ class pdf_soleil extends ModelePDFFicheinter
$posy=40; $posy=40;
$hautcadre=40; $hautcadre=40;
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche,$posy); $pdf->SetXY($this->marge_gauche,$posy);
$pdf->SetFillColor(230,230,230); $pdf->SetFillColor(230,230,230);
@ -207,13 +208,13 @@ class pdf_soleil extends ModelePDFFicheinter
// Sender name // Sender name
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Sender properties // Sender properties
$carac_emetteur = pdf_build_address($outputlangs,$this->emetteur); $carac_emetteur = pdf_build_address($outputlangs,$this->emetteur);
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($this->marge_gauche+2,$posy+9); $pdf->SetXY($this->marge_gauche+2,$posy+9);
$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L'); $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
@ -236,24 +237,24 @@ class pdf_soleil extends ModelePDFFicheinter
// Client destinataire // Client destinataire
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$fichinter->fetch_thirdparty(); $fichinter->fetch_thirdparty();
$pdf->SetXY(102,42); $pdf->SetXY(102,42);
$pdf->MultiCell(86,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(86,4, $carac_client_name, 0, 'L');
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY(102,$pdf->GetY()); $pdf->SetXY(102,$pdf->GetY());
$pdf->MultiCell(66,4, $carac_client, 0, 'L'); $pdf->MultiCell(66,4, $carac_client, 0, 'L');
$pdf->rect(100, 40, 100, 40); $pdf->rect(100, 40, 100, 40);
$pdf->SetTextColor(0,0,100); $pdf->SetTextColor(0,0,100);
$pdf->SetFont('','B',12); $pdf->SetFont('','B', $default_font_size + 2);
$pdf->SetXY(10,86); $pdf->SetXY(10,86);
$pdf->MultiCell(120, 4, $outputlangs->transnoentities("InterventionCard")." : ".$outputlangs->convToOutputCharset($fichinter->ref), 0, 'L'); $pdf->MultiCell(120, 4, $outputlangs->transnoentities("InterventionCard")." : ".$outputlangs->convToOutputCharset($fichinter->ref), 0, 'L');
$pdf->SetFillColor(220,220,220); $pdf->SetFillColor(220,220,220);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$tab_top = 100; $tab_top = 100;
@ -266,7 +267,7 @@ class pdf_soleil extends ModelePDFFicheinter
{ {
$tab_top = 98; $tab_top = 98;
$pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page
$pdf->SetXY ($this->posxdesc-1, $tab_top); $pdf->SetXY ($this->posxdesc-1, $tab_top);
$pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($fichinter->note_public), 0, 'L'); $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($fichinter->note_public), 0, 'L');
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
@ -288,7 +289,7 @@ class pdf_soleil extends ModelePDFFicheinter
$pdf->MultiCell(190,8,$outputlangs->transnoentities("Description"),0,'L',0); $pdf->MultiCell(190,8,$outputlangs->transnoentities("Description"),0,'L',0);
$pdf->line(10, $tab_top + 8, 200, $tab_top + 8 ); $pdf->line(10, $tab_top + 8, 200, $tab_top + 8 );
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetXY (10, $tab_top + 8 ); $pdf->SetXY (10, $tab_top + 8 );
@ -347,7 +348,7 @@ class pdf_soleil extends ModelePDFFicheinter
$pdf->SetXY(110,225); $pdf->SetXY(110,225);
$pdf->MultiCell(80,30, '', 1); $pdf->MultiCell(80,30, '', 1);
$pdf->SetFont('','', 9); // On repositionne la police par defaut $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
$this->_pagefoot($pdf,$fichinter,$outputlangs); $this->_pagefoot($pdf,$fichinter,$outputlangs);
$pdf->AliasNbPages(); $pdf->AliasNbPages();

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

@ -82,6 +82,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
function write_file($object,$outputlangs) function write_file($object,$outputlangs)
{ {
global $user,$conf,$langs; global $user,$conf,$langs;
$default_font_size = pdf_getPDFFontSize($outputlangs);
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@ -169,7 +170,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 1, $outputlangs); $this->_pagehead($pdf, $object, 1, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -186,14 +187,14 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
{ {
$curY = $nexY; $curY = $nexY;
$pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page
// Description de la ligne produit // Description de la ligne produit
//$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs); //$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs);
pdf_writelinedesc($pdf,$object,$i,$outputlangs,100,3,30,$curY,1); pdf_writelinedesc($pdf,$object,$i,$outputlangs,100,3,30,$curY,1);
//$pdf->writeHTMLCell(100, 3, 30, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1); //$pdf->writeHTMLCell(100, 3, 30, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
$pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$pdf->SetXY (10, $curY ); $pdf->SetXY (10, $curY );
@ -263,7 +264,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -311,7 +312,8 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
*/ */
function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs) function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs)
{ {
$pdf->SetFont('','',10); $default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetFont('','', $default_font_size);
$pdf->SetXY(30, $tab_top+1); $pdf->SetXY(30, $tab_top+1);
$pdf->MultiCell(60, 2, $outputlangs->transnoentities("Designation"), 0, 'L'); $pdf->MultiCell(60, 2, $outputlangs->transnoentities("Designation"), 0, 'L');
@ -332,13 +334,14 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
function _pagehead(&$pdf, $object, $showadress=1, $outputlangs) function _pagehead(&$pdf, $object, $showadress=1, $outputlangs)
{ {
global $langs,$conf,$mysoc; global $langs,$conf,$mysoc;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$outputlangs->load("companies"); $outputlangs->load("companies");
pdf_pagehead($pdf,$outputlangs,$this->page_hauteur); pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B',13); $pdf->SetFont('','B', $default_font_size + 3);
$posy=$this->marge_haute; $posy=$this->marge_haute;
@ -347,14 +350,14 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
if ($conf->global->MAIN_INFO_SOCIETE_NOM) if ($conf->global->MAIN_INFO_SOCIETE_NOM)
{ {
$pdf->SetTextColor(0,0,200); $pdf->SetTextColor(0,0,200);
$pdf->SetFont('','B',12); $pdf->SetFont('','B', $default_font_size + 2);
$pdf->MultiCell(76, 4, $outputlangs->convToOutputCharset(MAIN_INFO_SOCIETE_NOM), 0, 'L'); $pdf->MultiCell(76, 4, $outputlangs->convToOutputCharset(MAIN_INFO_SOCIETE_NOM), 0, 'L');
} }
// Sender properties // Sender properties
$carac_emetteur = pdf_build_address($outputlangs,$this->emetteur); $carac_emetteur = pdf_build_address($outputlangs,$this->emetteur);
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($this->marge_gauche,$posy+4); $pdf->SetXY($this->marge_gauche,$posy+4);
$pdf->MultiCell(80, 3, $carac_emetteur, 0, 'L'); $pdf->MultiCell(80, 3, $carac_emetteur, 0, 'L');
@ -388,18 +391,18 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target'); $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target');
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','B',11); $pdf->SetFont('','B', $default_font_size + 1);
$pdf->SetXY(102,42); $pdf->SetXY(102,42);
$pdf->MultiCell(96,5, $carac_client_name, 0, 'L'); $pdf->MultiCell(96,5, $carac_client_name, 0, 'L');
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$pdf->SetXY(102,47); $pdf->SetXY(102,47);
$pdf->MultiCell(96,5, $carac_client, 0, 'L'); $pdf->MultiCell(96,5, $carac_client, 0, 'L');
$pdf->rect(100, 40, 100, 40); $pdf->rect(100, 40, 100, 40);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B',11); $pdf->SetFont('','B', $default_font_size + 1);
$pdf->SetXY($this->page_largeur - $this->marge_droite - 100, 86); $pdf->SetXY($this->page_largeur - $this->marge_droite - 100, 86);
$pdf->MultiCell(100, 2, $outputlangs->transnoentities("Date")." : " . dol_print_date(($object->date_delivery?$object->date_delivery:$date->valid),"day",false,$outputlangs,true), 0, 'R'); $pdf->MultiCell(100, 2, $outputlangs->transnoentities("Date")." : " . dol_print_date(($object->date_delivery?$object->date_delivery:$date->valid),"day",false,$outputlangs,true), 0, 'R');
$pdf->SetXY($this->page_largeur - $this->marge_droite - 100, 92); $pdf->SetXY($this->page_largeur - $this->marge_droite - 100, 92);
@ -413,7 +416,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
} }
$pdf->SetFont('','B',9); $pdf->SetFont('','B', $default_font_size - 1);
// Add list of linked orders // Add list of linked orders
// TODO mutualiser // TODO mutualiser
@ -439,7 +442,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
{ {
$posy+=7; $posy+=7;
$pdf->SetXY($this->page_largeur - $this->marge_droite - 100,$posy); $pdf->SetXY($this->page_largeur - $this->marge_droite - 100,$posy);
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$text=$newobject->ref; $text=$newobject->ref;
if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')'; if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')';
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R'); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');

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

@ -104,6 +104,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
function write_file($object,$outputlangs) function write_file($object,$outputlangs)
{ {
global $user,$langs,$conf; global $user,$langs,$conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@ -203,7 +204,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 1, $outputlangs); $this->_pagehead($pdf, $object, 1, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -217,7 +218,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
{ {
$tab_top = 88; $tab_top = 88;
$pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page
$pdf->SetXY ($this->posxdesc-1, $tab_top); $pdf->SetXY ($this->posxdesc-1, $tab_top);
$pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'L'); $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'L');
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
@ -244,14 +245,14 @@ class pdf_typhon extends ModelePDFDeliveryOrder
{ {
$curY = $nexY; $curY = $nexY;
$pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page
// Description de la ligne produit // Description de la ligne produit
//$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs); //$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs);
pdf_writelinedesc($pdf,$object,$i,$outputlangs,108,3,$this->posxdesc-1,$curY); pdf_writelinedesc($pdf,$object,$i,$outputlangs,108,3,$this->posxdesc-1,$curY);
//$pdf->writeHTMLCell(108, 3, $this->posxdesc-1, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1); //$pdf->writeHTMLCell(108, 3, $this->posxdesc-1, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
$pdf->SetFont('','', 9); // On repositionne la police par defaut $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
/* /*
@ -328,7 +329,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -392,7 +393,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->AddPage('P', 'A4'); $pdf->AddPage('P', 'A4');
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs);
$pdf-> SetY(40); $pdf-> SetY(40);
@ -439,6 +440,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs) function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs)
{ {
global $conf,$mysoc; global $conf,$mysoc;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetDrawColor(128,128,128); $pdf->SetDrawColor(128,128,128);
@ -448,7 +450,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->line($this->marge_gauche, $tab_top+6, $this->page_largeur-$this->marge_droite, $tab_top+6); $pdf->line($this->marge_gauche, $tab_top+6, $this->page_largeur-$this->marge_droite, $tab_top+6);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$pdf->SetXY ($this->posxdesc-1, $tab_top+1); $pdf->SetXY ($this->posxdesc-1, $tab_top+1);
$pdf->MultiCell(80,2, $outputlangs->transnoentities("Designation"),'','L'); $pdf->MultiCell(80,2, $outputlangs->transnoentities("Designation"),'','L');
@ -464,7 +466,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->MultiCell(30, 2, $outputlangs->transnoentities("QtyShipped"),'','R'); $pdf->MultiCell(30, 2, $outputlangs->transnoentities("QtyShipped"),'','R');
// Modif Seb cadres signatures // Modif Seb cadres signatures
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$larg_sign = ($this->page_largeur-$this->marge_gauche-$this->marge_droite)/3; $larg_sign = ($this->page_largeur-$this->marge_gauche-$this->marge_droite)/3;
$pdf->Rect($this->marge_gauche, ($tab_top + $tab_height + 3), $larg_sign, 25 ); $pdf->Rect($this->marge_gauche, ($tab_top + $tab_height + 3), $larg_sign, 25 );
$pdf->SetXY ($this->marge_gauche + 2, $tab_top + $tab_height + 5); $pdf->SetXY ($this->marge_gauche + 2, $tab_top + $tab_height + 5);
@ -485,11 +487,12 @@ class pdf_typhon extends ModelePDFDeliveryOrder
function _pagehead(&$pdf, $object, $showadress=1, $outputlangs) function _pagehead(&$pdf, $object, $showadress=1, $outputlangs)
{ {
global $langs,$conf,$mysoc; global $langs,$conf,$mysoc;
$default_font_size = pdf_getPDFFontSize($outputlangs);
pdf_pagehead($pdf,$outputlangs,$this->page_hauteur); pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B',13); $pdf->SetFont('','B', $default_font_size + 3);
$posy=$this->marge_haute; $posy=$this->marge_haute;
@ -506,19 +509,19 @@ class pdf_typhon extends ModelePDFDeliveryOrder
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L'); $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L'); $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
} }
} }
else $pdf->MultiCell(100, 4, $this->emetteur->nom, 0, 'L'); else $pdf->MultiCell(100, 4, $this->emetteur->nom, 0, 'L');
$pdf->SetFont('','B',12); $pdf->SetFont('','B', $default_font_size + 2);
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DeliveryOrder")." ".$outputlangs->convToOutputCharset($object->ref), '' , 'R'); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("DeliveryOrder")." ".$outputlangs->convToOutputCharset($object->ref), '' , 'R');
$pdf->SetFont('','',12); $pdf->SetFont('','',$default_font_size + 2);
$posy+=5; $posy+=5;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@ -563,7 +566,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
{ {
$posy+=4; $posy+=4;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$text=$newobject->ref; $text=$newobject->ref;
if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')'; if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')';
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R'); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
@ -579,7 +582,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$posy=42; $posy=42;
$hautcadre=40; $hautcadre=40;
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche,$posy-5); $pdf->SetXY($this->marge_gauche,$posy-5);
$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":"); $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":");
@ -593,20 +596,20 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// Nom emetteur // Nom emetteur
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B',10); $pdf->SetFont('','B',$default_font_size);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Sender properties // Sender properties
$carac_emetteur = pdf_build_address($outputlangs,$this->emetteur); $carac_emetteur = pdf_build_address($outputlangs,$this->emetteur);
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($this->marge_gauche+2,$posy+9); $pdf->SetXY($this->marge_gauche+2,$posy+9);
$pdf->MultiCell(80, 3, $carac_emetteur, 0, 'L'); $pdf->MultiCell(80, 3, $carac_emetteur, 0, 'L');
// Client destinataire // Client destinataire
$posy=42; $posy=42;
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY(102,$posy-5); $pdf->SetXY(102,$posy-5);
$pdf->MultiCell(80,5, $outputlangs->transnoentities("DeliveryAddress").":", 0, 'L'); $pdf->MultiCell(80,5, $outputlangs->transnoentities("DeliveryAddress").":", 0, 'L');
@ -639,10 +642,10 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// Show customer/recipient // Show customer/recipient
$pdf->SetXY(102,$posy+3); $pdf->SetXY(102,$posy+3);
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell(106,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(106,4, $carac_client_name, 0, 'L');
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY(102,$posy+8); $pdf->SetXY(102,$posy+8);
$pdf->MultiCell(86,4, $carac_client, 0, 'L'); $pdf->MultiCell(86,4, $carac_client, 0, 'L');
} }

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

@ -262,7 +262,7 @@ class pdf_baleine extends ModelePDFProjects
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);

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

@ -109,6 +109,7 @@ class pdf_propale_azur extends ModelePDFPropales
function write_file($object,$outputlangs) function write_file($object,$outputlangs)
{ {
global $user,$langs,$conf; global $user,$langs,$conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@ -204,7 +205,7 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 1, $outputlangs); $this->_pagehead($pdf, $object, 1, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 4, ''); // Set interline to 4 $pdf->MultiCell(0, 4, ''); // Set interline to 4
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -220,7 +221,7 @@ class pdf_propale_azur extends ModelePDFPropales
{ {
$tab_top = 88; $tab_top = 88;
$pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page
$pdf->SetXY ($this->posxdesc-1, $tab_top); $pdf->SetXY ($this->posxdesc-1, $tab_top);
$pdf->MultiCell(190, 4, $outputlangs->convToOutputCharset($object->note_public), 0, 'L'); $pdf->MultiCell(190, 4, $outputlangs->convToOutputCharset($object->note_public), 0, 'L');
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
@ -247,13 +248,13 @@ class pdf_propale_azur extends ModelePDFPropales
{ {
$curY = $nexY; $curY = $nexY;
$pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page
// Description de la ligne produit // Description de la ligne produit
$curX = $this->posxdesc-1; $curX = $this->posxdesc-1;
pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY); pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY);
$pdf->SetFont('','', 9); // On repositionne la police par defaut $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
// TVA // TVA
@ -349,7 +350,7 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -440,13 +441,14 @@ class pdf_propale_azur extends ModelePDFPropales
function _tableau_info(&$pdf, $object, $posy, $outputlangs) function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{ {
global $conf; global $conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
// If France, show VAT mention if not applicable // If France, show VAT mention if not applicable
if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1) if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1)
{ {
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
@ -456,12 +458,12 @@ class pdf_propale_azur extends ModelePDFPropales
// Show payments conditions // Show payments conditions
if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement)) if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement))
{ {
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$titre = $outputlangs->transnoentities("PaymentConditions").':'; $titre = $outputlangs->transnoentities("PaymentConditions").':';
$pdf->MultiCell(80, 4, $titre, 0, 'L'); $pdf->MultiCell(80, 4, $titre, 0, 'L');
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY(52, $posy); $pdf->SetXY(52, $posy);
$lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc); $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement); $lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
@ -480,7 +482,7 @@ class pdf_propale_azur extends ModelePDFPropales
{ {
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -492,11 +494,11 @@ class pdf_propale_azur extends ModelePDFPropales
&& $object->mode_reglement_code != 'CHQ' && $object->mode_reglement_code != 'CHQ'
&& $object->mode_reglement_code != 'VIR') && $object->mode_reglement_code != 'VIR')
{ {
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$titre = $outputlangs->transnoentities("PaymentMode").':'; $titre = $outputlangs->transnoentities("PaymentMode").':';
$pdf->MultiCell(80, 5, $titre, 0, 'L'); $pdf->MultiCell(80, 5, $titre, 0, 'L');
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY(50, $posy); $pdf->SetXY(50, $posy);
$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement); $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
$pdf->MultiCell(80, 5, $lib_mode_reg,0,'L'); $pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
@ -516,24 +518,24 @@ class pdf_propale_azur extends ModelePDFPropales
$account->fetch($conf->global->FACTURE_CHQ_NUMBER); $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0);
$posy=$pdf->GetY()+1; $posy=$pdf->GetY()+1;
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0);
$posy=$pdf->GetY()+2; $posy=$pdf->GetY()+2;
} }
if ($conf->global->FACTURE_CHQ_NUMBER == -1) if ($conf->global->FACTURE_CHQ_NUMBER == -1)
{ {
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$outputlangs->convToOutputCharset($this->emetteur->nom).' '.$outputlangs->transnoentities('SendTo').':',0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$outputlangs->convToOutputCharset($this->emetteur->nom).' '.$outputlangs->transnoentities('SendTo').':',0,'L',0);
$posy=$pdf->GetY()+1; $posy=$pdf->GetY()+1;
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
$posy=$pdf->GetY()+2; $posy=$pdf->GetY()+2;
} }
@ -574,10 +576,11 @@ class pdf_propale_azur extends ModelePDFPropales
function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs) function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{ {
global $conf,$mysoc; global $conf,$mysoc;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$tab2_top = $posy; $tab2_top = $posy;
$tab2_hl = 4; $tab2_hl = 4;
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
// Tableau total // Tableau total
$lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x; $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x;
@ -765,7 +768,7 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1);
// Fin // Fin
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
} }
@ -780,10 +783,11 @@ class pdf_propale_azur extends ModelePDFPropales
function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs) function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs)
{ {
global $conf; global $conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Montants exprimes en (en tab_top - 1) // Montants exprimes en (en tab_top - 1)
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',8); $pdf->SetFont('','',$default_font_size - 2);
$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
@ -795,7 +799,7 @@ class pdf_propale_azur extends ModelePDFPropales
// line prend une position y en 3eme param // line prend une position y en 3eme param
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);
$pdf->SetFont('','',9); $pdf->SetFont('','',$default_font_size - 1);
$pdf->SetXY ($this->posxdesc-1, $tab_top+1); $pdf->SetXY ($this->posxdesc-1, $tab_top+1);
$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L'); $pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
@ -841,6 +845,7 @@ class pdf_propale_azur extends ModelePDFPropales
function _pagehead(&$pdf, $object, $showaddress=1, $outputlangs) function _pagehead(&$pdf, $object, $showaddress=1, $outputlangs)
{ {
global $conf,$langs; global $conf,$langs;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$outputlangs->load("main"); $outputlangs->load("main");
$outputlangs->load("bills"); $outputlangs->load("bills");
@ -857,7 +862,7 @@ class pdf_propale_azur extends ModelePDFPropales
//Prepare la suite //Prepare la suite
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B',13); $pdf->SetFont('','B', $default_font_size + 3);
$posy=$this->marge_haute; $posy=$this->marge_haute;
@ -874,7 +879,7 @@ class pdf_propale_azur extends ModelePDFPropales
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('','B',8); $pdf->SetFont('','B',$default_font_size - 2);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
} }
@ -885,13 +890,13 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L'); $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
} }
$pdf->SetFont('','B',13); $pdf->SetFont('','B',$default_font_size + 3);
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$title=$outputlangs->transnoentities("CommercialProposal"); $title=$outputlangs->transnoentities("CommercialProposal");
$pdf->MultiCell(100, 4, $title, '' , 'R'); $pdf->MultiCell(100, 4, $title, '' , 'R');
$pdf->SetFont('','B',12); $pdf->SetFont('','B',$default_font_size + 2);
$posy+=6; $posy+=6;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@ -899,7 +904,7 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R'); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
$posy+=1; $posy+=1;
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
if ($object->ref_client) if ($object->ref_client)
{ {
@ -949,7 +954,7 @@ class pdf_propale_azur extends ModelePDFPropales
// Show sender frame // Show sender frame
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx,$posy-5); $pdf->SetXY($posx,$posy-5);
$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L'); $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
$pdf->SetXY($posx,$posy); $pdf->SetXY($posx,$posy);
@ -959,11 +964,11 @@ class pdf_propale_azur extends ModelePDFPropales
// Show sender name // Show sender name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B',10); $pdf->SetFont('','B',$default_font_size);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Show sender information // Show sender information
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+8);
$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L'); $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
@ -999,7 +1004,7 @@ class pdf_propale_azur extends ModelePDFPropales
// Show recipient frame // Show recipient frame
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx,$posy-5); $pdf->SetXY($posx,$posy-5);
$pdf->MultiCell(80, 4, $outputlangs->transnoentities("BillTo").":", 0, 'L'); $pdf->MultiCell(80, 4, $outputlangs->transnoentities("BillTo").":", 0, 'L');
$pdf->rect($posx, $posy, 100, $hautcadre); $pdf->rect($posx, $posy, 100, $hautcadre);
@ -1007,11 +1012,11 @@ class pdf_propale_azur extends ModelePDFPropales
// Show recipient name // Show recipient name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell(96,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(96,4, $carac_client_name, 0, 'L');
// Show recipient information // Show recipient information
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+8);
$pdf->MultiCell(86,4, $carac_client, 0, 'L'); $pdf->MultiCell(86,4, $carac_client, 0, 'L');
} }

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

@ -85,6 +85,7 @@ class pdf_propale_jaune extends ModelePDFPropales
function write_file($object,$outputlangs) function write_file($object,$outputlangs)
{ {
global $user,$langs,$conf; global $user,$langs,$conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@ -168,7 +169,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 1, $outputlangs); $this->_pagehead($pdf, $object, 1, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -188,14 +189,14 @@ class pdf_propale_jaune extends ModelePDFPropales
{ {
$curY = $nexY; $curY = $nexY;
$pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page
// Description de la ligne produit // Description de la ligne produit
//$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs,1); //$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs,1);
pdf_writelinedesc($pdf,$object,$i,$outputlangs,102,4,30,$curY,1); pdf_writelinedesc($pdf,$object,$i,$outputlangs,102,4,30,$curY,1);
//$pdf->writeHTMLCell(102, 4, 30, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1); //$pdf->writeHTMLCell(102, 4, 30, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
$pdf->SetFont('','', 9); // On repositionne la police par defaut $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$ref = pdf_getlineref($object, $i, $outputlangs); $ref = pdf_getlineref($object, $i, $outputlangs);
@ -246,7 +247,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -264,7 +265,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$tab2_top = 254; $tab2_top = 254;
$tab2_lh = 4; $tab2_lh = 4;
$pdf->SetFont('','', 10); $pdf->SetFont('','', $default_font_size);
$pdf->SetXY (132, $tab2_top + 0); $pdf->SetXY (132, $tab2_top + 0);
$pdf->MultiCell(42, $tab2_lh, $outputlangs->transnoentities("TotalHT"), 0, 'R', 0); $pdf->MultiCell(42, $tab2_lh, $outputlangs->transnoentities("TotalHT"), 0, 'R', 0);
@ -310,13 +311,14 @@ class pdf_propale_jaune extends ModelePDFPropales
function _tableau_info(&$pdf, $object, $posy, $outputlangs) function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{ {
global $conf; global $conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetFont('','', 9); $pdf->SetFont('','', $default_font_size - 1);
// If France, show VAT mention if not applicable // If France, show VAT mention if not applicable
if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1) if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1)
{ {
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
@ -326,12 +328,12 @@ class pdf_propale_jaune extends ModelePDFPropales
// Show payments conditions // Show payments conditions
if ($object->cond_reglement_code || $object->cond_reglement) if ($object->cond_reglement_code || $object->cond_reglement)
{ {
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$titre = $outputlangs->transnoentities("PaymentConditions").':'; $titre = $outputlangs->transnoentities("PaymentConditions").':';
$pdf->MultiCell(80, 4, $titre, 0, 'L'); $pdf->MultiCell(80, 4, $titre, 0, 'L');
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY(52, $posy); $pdf->SetXY(52, $posy);
$lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc); $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement); $lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
@ -348,7 +350,7 @@ class pdf_propale_jaune extends ModelePDFPropales
{ {
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -360,12 +362,12 @@ class pdf_propale_jaune extends ModelePDFPropales
&& $object->mode_reglement_code != 'CHQ' && $object->mode_reglement_code != 'CHQ'
&& $object->mode_reglement_code != 'VIR') && $object->mode_reglement_code != 'VIR')
{ {
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$titre = $outputlangs->transnoentities("PaymentMode").':'; $titre = $outputlangs->transnoentities("PaymentMode").':';
$pdf->MultiCell(80, 5, $titre, 0, 'L'); $pdf->MultiCell(80, 5, $titre, 0, 'L');
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY(50, $posy); $pdf->SetXY(50, $posy);
//print "xxx".$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code);exit; //print "xxx".$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code);exit;
$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement); $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
@ -386,24 +388,24 @@ class pdf_propale_jaune extends ModelePDFPropales
$account->fetch($conf->global->FACTURE_CHQ_NUMBER); $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','B',8); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0);
$posy=$pdf->GetY()+1; $posy=$pdf->GetY()+1;
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0);
$posy=$pdf->GetY()+2; $posy=$pdf->GetY()+2;
} }
if ($conf->global->FACTURE_CHQ_NUMBER == -1) if ($conf->global->FACTURE_CHQ_NUMBER == -1)
{ {
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','B',8); $pdf->SetFont('','B',$default_font_size - 2);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$outputlangs->convToOutputCharset($this->emetteur->nom).' '.$outputlangs->transnoentities('SendTo').':',0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$outputlangs->convToOutputCharset($this->emetteur->nom).' '.$outputlangs->transnoentities('SendTo').':',0,'L',0);
$posy=$pdf->GetY()+1; $posy=$pdf->GetY()+1;
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
$posy=$pdf->GetY()+2; $posy=$pdf->GetY()+2;
} }
@ -449,12 +451,12 @@ class pdf_propale_jaune extends ModelePDFPropales
// Montants exprimes en (en tab_top - 1) // Montants exprimes en (en tab_top - 1)
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',8); $pdf->SetFont('','', $default_font_size - 2);
$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
$pdf->SetFont('','',11); $pdf->SetFont('','', $default_font_size + 1);
$pdf->SetXY(10,$tab_top); $pdf->SetXY(10,$tab_top);
$pdf->MultiCell(20,10,$outputlangs->transnoentities("Ref"),0,'L',1); $pdf->MultiCell(20,10,$outputlangs->transnoentities("Ref"),0,'L',1);
@ -481,7 +483,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->Rect(10, $tab_top, 190, $tab_height); $pdf->Rect(10, $tab_top, 190, $tab_height);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
} }
@ -495,6 +497,7 @@ class pdf_propale_jaune extends ModelePDFPropales
function _pagehead(&$pdf, $object, $showadress=1, $outputlangs) function _pagehead(&$pdf, $object, $showadress=1, $outputlangs)
{ {
global $conf,$langs; global $conf,$langs;
$default_font_size = pdf_getPDFFontSize($outputlangs);
pdf_pagehead($pdf,$outputlangs,$this->page_hauteur); pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
@ -510,7 +513,7 @@ class pdf_propale_jaune extends ModelePDFPropales
// Sender name // Sender name
$pdf->SetTextColor(0,0,00); $pdf->SetTextColor(0,0,00);
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Sender properties // Sender properties
@ -525,7 +528,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$carac_emetteur .= pdf_build_address($outputlangs,$this->emetteur); $carac_emetteur .= pdf_build_address($outputlangs,$this->emetteur);
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($this->marge_gauche+2,$posy+4); $pdf->SetXY($this->marge_gauche+2,$posy+4);
$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L'); $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
@ -533,7 +536,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->rect(10, 40, 80, 40); $pdf->rect(10, 40, 80, 40);
$pdf->SetXY(10,5); $pdf->SetXY(10,5);
$pdf->SetFont('','B',16); $pdf->SetFont('','B', $default_font_size + 6);
$pdf->SetTextColor(0,0,200); $pdf->SetTextColor(0,0,200);
$pdf->MultiCell(200, 20, $outputlangs->transnoentities("CommercialProposal"), '' , 'C'); $pdf->MultiCell(200, 20, $outputlangs->transnoentities("CommercialProposal"), '' , 'C');
@ -541,7 +544,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->rect(100, 40, 100, 40); $pdf->rect(100, 40, 100, 40);
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('','B',12); $pdf->SetFont('','B', $default_font_size + 2);
$pdf->rect(10, 90, 100, 10); $pdf->rect(10, 90, 100, 10);
$pdf->rect(110, 90, 90, 10); $pdf->rect(110, 90, 90, 10);
@ -552,7 +555,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->MultiCell(100, 10, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,'day',false,$outputlangs,true), 0, 'L'); $pdf->MultiCell(100, 10, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,'day',false,$outputlangs,true), 0, 'L');
$posy=15; $posy=15;
$pdf->SetFont('','',10); $pdf->SetFont('','', $default_font_size);
$posy+=5; $posy+=5;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@ -610,11 +613,11 @@ class pdf_propale_jaune extends ModelePDFPropales
// Show recipient // Show recipient
$pdf->SetXY(102,$posy+3); $pdf->SetXY(102,$posy+3);
$pdf->SetFont('','B',10); $pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell(96,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(96,4, $carac_client_name, 0, 'L');
// Show address // Show address
$pdf->SetFont('','',9); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY(102,$posy+8); $pdf->SetXY(102,$posy+8);
$pdf->MultiCell(86,4, $carac_client, 0, 'L'); $pdf->MultiCell(86,4, $carac_client, 0, 'L');
} }