Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 10:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Works on migration of FPDF to TCPDF

Browse Source
This commit is contained in:
Laurent Destailleur
2010-09-07 22:36:45 +00:00
parent 6cb8145f13
commit 6e84b54b81
16 changed files with 274 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/includes/modules/action/rapport.pdf.php
View File

@@ -160,7 +160,7 @@ class CommActionRapport
$y=$this->_pagehead($pdf, $outputlangs, $pagenb); $y=$this->_pagehead($pdf, $outputlangs, $pagenb);
$y++; $y++;
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$sql = "SELECT s.nom as societe, s.rowid as socid, s.client,"; $sql = "SELECT s.nom as societe, s.rowid as socid, s.client,";
$sql.= " a.id, a.datep as dp, a.datep2 as dp2,"; $sql.= " a.id, a.datep as dp, a.datep2 as dp2,";
@@ -200,7 +200,7 @@ class CommActionRapport
$pagenb++; $pagenb++;
$y=$this->_pagehead($pdf, $outputlangs, $pagenb); $y=$this->_pagehead($pdf, $outputlangs, $pagenb);
$y++; $y++;
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
} }
$y++; $y++;
@@ -246,7 +246,7 @@ class CommActionRapport
$pdf->AddPage(); $pdf->AddPage();
// Show title // Show title
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->SetXY($this->marge_gauche, $this->marge_haute); $pdf->SetXY($this->marge_gauche, $this->marge_haute);
$pdf->MultiCell(80, 1, $this->title, 0, 'L', 0); $pdf->MultiCell(80, 1, $this->title, 0, 'L', 0);
$pdf->SetXY($this->page_largeur-$this->marge_droite-40, $this->marge_haute); $pdf->SetXY($this->page_largeur-$this->marge_droite-40, $this->marge_haute);

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

@@ -198,38 +198,38 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
$outputlangs->load("banks"); $outputlangs->load("banks");
$title = $outputlangs->transnoentities("CheckReceipt"); $title = $outputlangs->transnoentities("CheckReceipt");
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->Text(10, 10, $title); $pdf->Text(10, 10, $title);
$pdf->SetFont('Arial','',10); $pdf->SetFont('','',10);
$pdf->Text(10, 19, $outputlangs->transnoentities("Numero")); $pdf->Text(10, 19, $outputlangs->transnoentities("Numero"));
$pdf->SetFont('Arial','',10); $pdf->SetFont('','',10);
$pdf->Text(10, 27, $outputlangs->transnoentities("Date") ); $pdf->Text(10, 27, $outputlangs->transnoentities("Date") );
$pdf->SetFont('Arial','',10); $pdf->SetFont('','',10);
$pdf->Text(10, 35, $outputlangs->transnoentities("Owner")); $pdf->Text(10, 35, $outputlangs->transnoentities("Owner"));
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->Text(32, 35, $outputlangs->convToOutputCharset($this->account->proprio)); $pdf->Text(32, 35, $outputlangs->convToOutputCharset($this->account->proprio));
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->Text(32, 19, $outputlangs->convToOutputCharset($this->number)); $pdf->Text(32, 19, $outputlangs->convToOutputCharset($this->number));
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->Text(32, 27, dol_print_date($this->date,"day",false,$outputlangs)); $pdf->Text(32, 27, dol_print_date($this->date,"day",false,$outputlangs));
$pdf->SetFont('Arial','',10); $pdf->SetFont('','',10);
$pdf->Text(10, 43, $outputlangs->transnoentities("Account")); $pdf->Text(10, 43, $outputlangs->transnoentities("Account"));
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->Text(32, 43, $outputlangs->convToOutputCharset($this->account->code_banque)); $pdf->Text(32, 43, $outputlangs->convToOutputCharset($this->account->code_banque));
$pdf->Text(51, 43, $outputlangs->convToOutputCharset($this->account->code_guichet)); $pdf->Text(51, 43, $outputlangs->convToOutputCharset($this->account->code_guichet));
$pdf->Text(68, 43, $outputlangs->convToOutputCharset($this->account->number)); $pdf->Text(68, 43, $outputlangs->convToOutputCharset($this->account->number));
$pdf->Text(104, 43, $outputlangs->convToOutputCharset($this->account->cle_rib)); $pdf->Text(104, 43, $outputlangs->convToOutputCharset($this->account->cle_rib));
$pdf->SetFont('Arial','',10); $pdf->SetFont('','',10);
$pdf->Text(114, 19, $outputlangs->transnoentities("Signature")); $pdf->Text(114, 19, $outputlangs->transnoentities("Signature"));
$pdf->Rect(9, 47, 192, 7); $pdf->Rect(9, 47, 192, 7);
@@ -237,21 +237,21 @@ 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('Arial','',10); $pdf->SetFont('','',10);
$pdf->Text(10, 52, $outputlangs->transnoentities("NumberOfCheques")); $pdf->Text(10, 52, $outputlangs->transnoentities("NumberOfCheques"));
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->Text(57, 52, $this->nbcheque); $pdf->Text(57, 52, $this->nbcheque);
$pdf->SetFont('Arial','',10); $pdf->SetFont('','',10);
$pdf->Text(148, 52, "Total"); $pdf->Text(148, 52, "Total");
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->SetXY (170, 47); $pdf->SetXY (170, 47);
$pdf->MultiCell(31, 7, price($this->amount), 0, 'C', 0); $pdf->MultiCell(31, 7, price($this->amount), 0, 'C', 0);
// Tableau // Tableau
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$pdf->Text(11,$this->tab_top + 6,$outputlangs->transnoentities("Num")); $pdf->Text(11,$this->tab_top + 6,$outputlangs->transnoentities("Num"));
$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);
@@ -289,7 +289,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
// x=10 - Num // x=10 - Num
// x=30 - Banque // x=30 - Banque
// x=100 - Emetteur // x=100 - Emetteur
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$oldprowid = 0; $oldprowid = 0;
$pdf->SetFillColor(220,220,220); $pdf->SetFillColor(220,220,220);
$yp = 0; $yp = 0;
@@ -335,7 +335,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
// Line of free text // Line of free text
$ligne=(! empty($conf->global->$paramfreetext))?$outputlangs->convToOutputCharset($conf->global->$paramfreetext):""; $ligne=(! empty($conf->global->$paramfreetext))?$outputlangs->convToOutputCharset($conf->global->$paramfreetext):"";
$pdf->SetFont('Arial','',7); $pdf->SetFont('','',7);
$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

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

@@ -178,7 +178,7 @@ class pdf_edison extends ModelePDFCommandes
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $com, 1, $outputlangs); $this->_pagehead($pdf, $com, 1, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -189,7 +189,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('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->SetXY (10, $tab_top + 10 ); $pdf->SetXY (10, $tab_top + 10 );
@@ -245,7 +245,7 @@ class pdf_edison extends ModelePDFCommandes
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $com, 0, $outputlangs); $this->_pagehead($pdf, $com, 0, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -265,7 +265,7 @@ class pdf_edison extends ModelePDFCommandes
$tab2_lh = 7; $tab2_lh = 7;
$tab2_height = $tab2_lh * 4; $tab2_height = $tab2_lh * 4;
$pdf->SetFont('Arial','', 11); $pdf->SetFont('','', 11);
$pdf->Rect(132, $tab2_top, 68, $tab2_height); $pdf->Rect(132, $tab2_top, 68, $tab2_height);
@@ -328,12 +328,12 @@ class pdf_edison extends ModelePDFCommandes
{ {
global $conf; global $conf;
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
// 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('Arial','B',8); $pdf->SetFont('','B',8);
$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);
@@ -343,12 +343,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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY(50, $posy); $pdf->SetXY(50, $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);
@@ -365,7 +365,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('Arial','B',8); $pdf->SetFont('','B',8);
$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);
@@ -377,12 +377,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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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);
@@ -403,24 +403,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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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;
} }
@@ -464,7 +464,7 @@ class pdf_edison extends ModelePDFCommandes
$langs->load("main"); $langs->load("main");
$langs->load("bills"); $langs->load("bills");
$pdf->SetFont('Arial','',11); $pdf->SetFont('','',11);
$pdf->Text(30,$tab_top + 5,$outputlangs->transnoentities("Designation")); $pdf->Text(30,$tab_top + 5,$outputlangs->transnoentities("Designation"));
@@ -486,7 +486,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('Arial','',10); $pdf->SetFont('','',10);
$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre); $pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
} }
@@ -520,7 +520,7 @@ class pdf_edison extends ModelePDFCommandes
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$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');
} }
@@ -537,13 +537,13 @@ class pdf_edison extends ModelePDFCommandes
// Sender name // Sender name
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$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('Arial','',9); $pdf->SetFont('','',9);
$pdf->SetXY($this->marge_gauche,$posy+7); $pdf->SetXY($this->marge_gauche,$posy+7);
$pdf->MultiCell(80, 4, $carac_emetteur); $pdf->MultiCell(80, 4, $carac_emetteur);
@@ -578,17 +578,17 @@ class pdf_edison extends ModelePDFCommandes
// Show customer/recipient // Show customer/recipient
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->SetXY(102,42); $pdf->SetXY(102,42);
$pdf->MultiCell(96, 4, $carac_client_name); $pdf->MultiCell(96, 4, $carac_client_name);
$pdf->SetFont('Arial','',9); $pdf->SetFont('','',9);
$pdf->SetXY(102,$pdf->GetY()); $pdf->SetXY(102,$pdf->GetY());
$pdf->MultiCell(96, 4, $carac_client); $pdf->MultiCell(96, 4, $carac_client);
$pdf->rect(100, 40, 100, 40); $pdf->rect(100, 40, 100, 40);
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',12); $pdf->SetFont('','B',12);
$pdf->Text(11, 88, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,'day',false,$outputlangs)); $pdf->Text(11, 88, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,'day',false,$outputlangs));
$pdf->Text(11, 94, $outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->ref)); $pdf->Text(11, 94, $outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->ref));
} }

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

@@ -209,7 +209,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $com, 1, $outputlangs); $this->_pagehead($pdf, $com, 1, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -224,7 +224,7 @@ class pdf_einstein extends ModelePDFCommandes
{ {
$tab_top = 88; $tab_top = 88;
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', 9); // 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($com->note_public), 0, 'J'); $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($com->note_public), 0, 'J');
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
@@ -254,10 +254,10 @@ class pdf_einstein extends ModelePDFCommandes
// Description of product line // Description of product line
$libelleproduitservice=pdf_getlinedesc($com->lignes[$i],$outputlangs); $libelleproduitservice=pdf_getlinedesc($com->lignes[$i],$outputlangs);
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page
$pdf->writeHTMLCell($this->posxtva-$this->posxdesc-1, 3, $this->posxdesc-1, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1); $pdf->writeHTMLCell($this->posxtva-$this->posxdesc-1, 3, $this->posxdesc-1, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
$pdf->SetFont('Arial','', 9); // On repositionne la police par defaut $pdf->SetFont('','', 9); // On repositionne la police par defaut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
// TVA // TVA
@@ -350,7 +350,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $com, 0, $outputlangs); $this->_pagehead($pdf, $com, 0, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -435,12 +435,12 @@ class pdf_einstein extends ModelePDFCommandes
{ {
global $conf; global $conf;
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
// 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('Arial','B',8); $pdf->SetFont('','B',8);
$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);
@@ -450,12 +450,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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY(50, $posy); $pdf->SetXY(50, $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);
@@ -472,7 +472,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('Arial','B',8); $pdf->SetFont('','B',8);
$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);
@@ -485,12 +485,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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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');
@@ -510,24 +510,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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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;
} }
@@ -571,7 +571,7 @@ class pdf_einstein extends ModelePDFCommandes
$tab2_top = $posy; $tab2_top = $posy;
$tab2_hl = 5; $tab2_hl = 5;
$tab2_height = $tab2_hl * 4; $tab2_height = $tab2_hl * 4;
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
// Tableau total // Tableau total
$lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x; $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x;
@@ -742,7 +742,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('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
} }
@@ -760,7 +760,7 @@ class pdf_einstein extends ModelePDFCommandes
// Amount in (at tab_top - 1) // Amount in (at tab_top - 1)
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
$pdf->Text($this->page_largeur - $this->marge_droite - $pdf->GetStringWidth($titre), $tab_top-1, $titre); $pdf->Text($this->page_largeur - $this->marge_droite - $pdf->GetStringWidth($titre), $tab_top-1, $titre);
@@ -771,7 +771,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('Arial','',9); $pdf->SetFont('','',9);
$pdf->SetXY ($this->posxdesc-1, $tab_top+2); $pdf->SetXY ($this->posxdesc-1, $tab_top+2);
$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L'); $pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
@@ -833,7 +833,7 @@ class pdf_einstein extends ModelePDFCommandes
//Print content //Print content
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('Arial','B',13); $pdf->SetFont('','B',13);
$posy=$this->marge_haute; $posy=$this->marge_haute;
@@ -850,7 +850,7 @@ class pdf_einstein extends ModelePDFCommandes
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$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');
} }
@@ -861,13 +861,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('Arial','B',13); $pdf->SetFont('','B',13);
$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('Arial','B',12); $pdf->SetFont('','B',12);
$posy+=6; $posy+=6;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@@ -875,7 +875,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('Arial','',9); $pdf->SetFont('','',9);
$posy+=5; $posy+=5;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@@ -895,7 +895,7 @@ class pdf_einstein extends ModelePDFCommandes
// Show sender frame // Show sender frame
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$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);
@@ -905,12 +905,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('Arial','B',10); $pdf->SetFont('','B',10);
$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('Arial','',9); $pdf->SetFont('','',9);
$pdf->MultiCell(80, 4, $carac_emetteur); $pdf->MultiCell(80, 4, $carac_emetteur);
@@ -946,18 +946,18 @@ class pdf_einstein extends ModelePDFCommandes
// Show recipient frame // Show recipient frame
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY($posx+2,$posy-5); $pdf->SetXY($posx+2,$posy-5);
$pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":"); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":");
$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('Arial','B',10); $pdf->SetFont('','B',10);
$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('Arial','',9); $pdf->SetFont('','',9);
$posy=$pdf->GetY()-9; //Auto Y coord readjust for multiline name $posy=$pdf->GetY()-9; //Auto Y coord readjust for multiline name
$pdf->SetXY($posx+2,$posy+6); $pdf->SetXY($posx+2,$posy+6);
$pdf->MultiCell(86,4, $carac_client); $pdf->MultiCell(86,4, $carac_client);

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

@@ -174,13 +174,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('Arial','', 7); $pdf->SetFont('','', 7);
// New page // New page
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $this->expe, $outputlangs); $this->_pagehead($pdf, $this->expe, $outputlangs);
$pdf->SetFont('Arial','', 7); $pdf->SetFont('','', 7);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -189,7 +189,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('Arial','', 7); $pdf->SetFont('','', 7);
$pdf->SetXY (10, $tab_top + 5 ); $pdf->SetXY (10, $tab_top + 5 );
$iniY = $pdf->GetY(); $iniY = $pdf->GetY();
$curY = $pdf->GetY(); $curY = $pdf->GetY();
@@ -212,18 +212,18 @@ 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('Arial','B', 7); $pdf->SetFont('','B', 7);
$pdf->MultiCell(24, 3, $outputlangs->convToOutputCharset($object->commande->lignes[$i]->ref), 0, 'L', 0); $pdf->MultiCell(24, 3, $outputlangs->convToOutputCharset($object->commande->lignes[$i]->ref), 0, 'L', 0);
//Insertion du libelle //Insertion du libelle
$pdf->SetFont('Arial','', 7); $pdf->SetFont('','', 7);
$pdf->SetXY (50, $curY+1 ); $pdf->SetXY (50, $curY+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('Arial','', 7); $pdf->SetFont('','', 7);
$pdf->SetXY (140, $curY+1 ); $pdf->SetXY (140, $curY+1 );
$pdf->MultiCell(30, 3, $object->lignes[$i]->qty_asked, 0, 'C', 0); $pdf->MultiCell(30, 3, $object->lignes[$i]->qty_asked, 0, 'C', 0);
//Insertion de la quantite a envoyer //Insertion de la quantite a envoyer
$pdf->SetFont('Arial','', 7); $pdf->SetFont('','', 7);
$pdf->SetXY (170, $curY+1 ); $pdf->SetXY (170, $curY+1 );
$pdf->MultiCell(30, 3, $object->lignes[$i]->qty_shipped, 0, 'C', 0); $pdf->MultiCell(30, 3, $object->lignes[$i]->qty_shipped, 0, 'C', 0);
@@ -244,7 +244,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$this->_pagehead($pdf, $this->expe, $outputlangs); $this->_pagehead($pdf, $this->expe, $outputlangs);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','', 7); $pdf->SetFont('','', 7);
} }
} }
//Insertion du pied de page //Insertion du pied de page
@@ -286,7 +286,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$langs->load("main"); $langs->load("main");
$langs->load("bills"); $langs->load("bills");
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$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);
@@ -312,7 +312,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
*/ */
function _pagefoot(&$pdf, $object, $outputlangs) function _pagefoot(&$pdf, $object, $outputlangs)
{ {
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$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);
@@ -363,7 +363,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$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');
} }
@@ -377,7 +377,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('Arial','B',12); $pdf->SetFont('','B',12);
$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
@@ -385,7 +385,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('Arial','',8); $pdf->SetFont('','',8);
$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);
@@ -408,7 +408,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
{ {
$Yoff = $Yoff+4; $Yoff = $Yoff+4;
$pdf->SetXY($Xoff,$Yoff); $pdf->SetXY($Xoff,$Yoff);
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$text=$newobject->ref; $text=$newobject->ref;
if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')'; if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')';
$pdf->MultiCell(0, 3, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R'); $pdf->MultiCell(0, 3, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
@@ -435,7 +435,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('Arial','',7); $pdf->SetFont('','',7);
$pdf->SetXY($blSocX,$blSocY+3); $pdf->SetXY($blSocX,$blSocY+3);
$pdf->MultiCell(80, 2, $carac_emetteur); $pdf->MultiCell(80, 2, $carac_emetteur);
@@ -453,13 +453,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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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');
@@ -509,16 +509,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('Arial','B',7); $pdf->SetFont('','B',7);
$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('Arial','B',7); $pdf->SetFont('','B',7);
$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('Arial','',7); $pdf->SetFont('','',7);
//$posy=$pdf->GetY(); //Auto Y coord readjust for multiline name //$posy=$pdf->GetY(); //Auto Y coord readjust for multiline name
$pdf->SetXY($blDestX,$pdf->GetY()); $pdf->SetXY($blDestX,$pdf->GetY());
$pdf->MultiCell($blW,2, $carac_client); $pdf->MultiCell($blW,2, $carac_client);

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

@@ -88,7 +88,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('Arial','B',13); $pdf->SetFont('','B',13);
$posy=$this->marge_haute; $posy=$this->marge_haute;
@@ -105,7 +105,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$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,13 +145,13 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
$posx=100; $posx=100;
$posy=$this->marge_haute; $posy=$this->marge_haute;
$pdf->SetFont('Arial','B',13); $pdf->SetFont('','B',13);
$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');
$pdf->SetFont('Arial','B',12); $pdf->SetFont('','B',12);
$posy+=5; $posy+=5;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@@ -173,7 +173,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
} }
$pdf->SetFont('Arial','', 14); $pdf->SetFont('','', 14);
$Yoff=40; $Yoff=40;
// Add list of linked orders // Add list of linked orders
@@ -194,7 +194,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
{ {
$Yoff = $Yoff+8; $Yoff = $Yoff+8;
$pdf->SetXY($Xoff,$Yoff); $pdf->SetXY($Xoff,$Yoff);
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$text=$newobject->ref; $text=$newobject->ref;
if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')'; if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')';
$pdf->Text($posx, $Yoff, $outputlangs->transnoentities("RefOrder") ." : ".$outputlangs->transnoentities($text)); $pdf->Text($posx, $Yoff, $outputlangs->transnoentities("RefOrder") ." : ".$outputlangs->transnoentities($text));
@@ -299,7 +299,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('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -317,7 +317,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
} }
$this->tableau_top = 80; $this->tableau_top = 80;
$pdf->SetFont('Arial','', 10); $pdf->SetFont('','', 10);
$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;
@@ -339,10 +339,10 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
// Description de la ligne produit // Description de la ligne produit
$libelleproduitservice=pdf_getlinedesc($object->lignes[$i],$outputlangs); $libelleproduitservice=pdf_getlinedesc($object->lignes[$i],$outputlangs);
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page
$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('Arial','', 9); // On repositionne la police par defaut $pdf->SetFont('','', 9); // On repositionne la police par defaut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$pdf->SetXY (160, $curY); $pdf->SetXY (160, $curY);

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

@@ -198,7 +198,7 @@ class pdf_oursin extends ModelePDFFactures
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $fac, 1, $outputlangs); $this->_pagehead($pdf, $fac, 1, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -206,7 +206,7 @@ class pdf_oursin extends ModelePDFFactures
$tab_height = 110; $tab_height = 110;
$pdf->SetFillColor(220,220,220); $pdf->SetFillColor(220,220,220);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->SetXY ($this->marges['g'], $tab_top + $this->marges['g'] ); $pdf->SetXY ($this->marges['g'], $tab_top + $this->marges['g'] );
$iniY = $pdf->GetY(); $iniY = $pdf->GetY();
@@ -265,7 +265,7 @@ class pdf_oursin extends ModelePDFFactures
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $fac, 0, $outputlangs); $this->_pagehead($pdf, $fac, 0, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
} }
@@ -329,7 +329,7 @@ class pdf_oursin extends ModelePDFFactures
$tab3_width = 80; $tab3_width = 80;
$tab3_height = 4; $tab3_height = 4;
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY ($tab3_posx, $tab3_top - 5); $pdf->SetXY ($tab3_posx, $tab3_top - 5);
$pdf->MultiCell(60, 5, $outputlangs->transnoentities("PaymentsAlreadyDone"), 0, 'L', 0); $pdf->MultiCell(60, 5, $outputlangs->transnoentities("PaymentsAlreadyDone"), 0, 'L', 0);
@@ -346,7 +346,7 @@ class pdf_oursin extends ModelePDFFactures
$y=0; $y=0;
$pdf->SetFont('Arial','',6); $pdf->SetFont('','',6);
// Loop on each credit note included // Loop on each credit note included
$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,"; $sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
@@ -467,12 +467,12 @@ class pdf_oursin extends ModelePDFFactures
{ {
global $conf; global $conf;
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
// 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('Arial','B',8); $pdf->SetFont('','B',8);
$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);
@@ -482,12 +482,12 @@ class pdf_oursin extends ModelePDFFactures
// 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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY(50, $posy); $pdf->SetXY(50, $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);
@@ -506,7 +506,7 @@ class pdf_oursin extends ModelePDFFactures
{ {
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$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);
@@ -518,12 +518,12 @@ class pdf_oursin extends ModelePDFFactures
&& $object->mode_reglement_code != 'CHQ' && $object->mode_reglement_code != 'CHQ'
&& $object->mode_reglement_code != 'VIR') && $object->mode_reglement_code != 'VIR')
{ {
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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');
@@ -543,24 +543,24 @@ class pdf_oursin extends ModelePDFFactures
$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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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;
} }
@@ -608,7 +608,7 @@ class pdf_oursin extends ModelePDFFactures
$tab2_top = $this->marges['h']+202; $tab2_top = $this->marges['h']+202;
$tab2_hl = 5; $tab2_hl = 5;
$tab2_height = $tab2_hl * 4; $tab2_height = $tab2_hl * 4;
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
// Tableau total // Tableau total
$col1x=$this->marges['g']+110; $col2x=$this->marges['g']+164; $col1x=$this->marges['g']+110; $col2x=$this->marges['g']+164;
@@ -677,7 +677,7 @@ class pdf_oursin extends ModelePDFFactures
$index++; $index++;
$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
$pdf->SetTextColor(22,137,210); $pdf->SetTextColor(22,137,210);
$pdf->SetFont('Arial','B', 11); $pdf->SetFont('','B', 11);
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), 0, 'L', 0); $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), 0, 'L', 0);
$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), 0, 'R', 0); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), 0, 'R', 0);
@@ -691,7 +691,7 @@ class pdf_oursin extends ModelePDFFactures
if ($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) if ($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0)
{ {
$pdf->SetFont('Arial','', 10); $pdf->SetFont('','', 10);
// Already paid + Deposits // Already paid + Deposits
$index++; $index++;
@@ -733,7 +733,7 @@ class pdf_oursin extends ModelePDFFactures
$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), 0, 'R', 0); $pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), 0, 'R', 0);
// Fin // Fin
$pdf->SetFont('Arial','B', 11); $pdf->SetFont('','B', 11);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
} }
@@ -754,7 +754,7 @@ class pdf_oursin extends ModelePDFFactures
$pdf->line( $this->marges['g'], $tab_top+8, 210-$this->marges['d'], $tab_top+8 ); $pdf->line( $this->marges['g'], $tab_top+8, 210-$this->marges['d'], $tab_top+8 );
$pdf->line( $this->marges['g'], $tab_top + $tab_height, 210-$this->marges['d'], $tab_top + $tab_height ); $pdf->line( $this->marges['g'], $tab_top + $tab_height, 210-$this->marges['d'], $tab_top + $tab_height );
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->Text($this->marges['g']+1,$tab_top + 5, $outputlangs->transnoentities("Designation")); $pdf->Text($this->marges['g']+1,$tab_top + 5, $outputlangs->transnoentities("Designation"));
if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
@@ -802,7 +802,7 @@ class pdf_oursin extends ModelePDFFactures
} }
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('Arial','B',13); $pdf->SetFont('','B',13);
$pdf->SetXY($this->marges['g'],6); $pdf->SetXY($this->marges['g'],6);
@@ -819,7 +819,7 @@ class pdf_oursin extends ModelePDFFactures
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L'); $pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
$pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L'); $pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
} }
@@ -836,7 +836,7 @@ class pdf_oursin extends ModelePDFFactures
*/ */
$posy=$this->marges['h']+24; $posy=$this->marges['h']+24;
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY($this->marges['g'],$posy-5); $pdf->SetXY($this->marges['g'],$posy-5);
@@ -849,13 +849,13 @@ class pdf_oursin extends ModelePDFFactures
// Sender name // Sender name
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$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('Arial','',9); $pdf->SetFont('','',9);
$pdf->SetXY($this->marge_gauche,$posy+9); $pdf->SetXY($this->marge_gauche,$posy+9);
$pdf->MultiCell(80, 4, $carac_emetteur); $pdf->MultiCell(80, 4, $carac_emetteur);
@@ -863,9 +863,9 @@ class pdf_oursin extends ModelePDFFactures
// Client destinataire // Client destinataire
$posy=45; $posy=45;
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY($this->marges['g']+100,$posy-5); $pdf->SetXY($this->marges['g']+100,$posy-5);
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
// If BILLING contact defined on invoice, we use it // If BILLING contact defined on invoice, we use it
$usecontact=false; $usecontact=false;
@@ -892,11 +892,11 @@ class pdf_oursin extends ModelePDFFactures
$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');
// Show customer/recipient // Show customer/recipient
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->SetXY($this->marges['g']+100,$posy+4); $pdf->SetXY($this->marges['g']+100,$posy+4);
$pdf->MultiCell(86,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(86,4, $carac_client_name, 0, 'L');
$pdf->SetFont('Arial','B',9); $pdf->SetFont('','B',9);
$pdf->SetXY($this->marges['g']+100,$posy+6); $pdf->SetXY($this->marges['g']+100,$posy+6);
$pdf->MultiCell(86,4, $carac_client); $pdf->MultiCell(86,4, $carac_client);
@@ -904,7 +904,7 @@ class pdf_oursin extends ModelePDFFactures
* ref facture * ref facture
*/ */
$posy=70; $posy=70;
$pdf->SetFont('Arial','B',13); $pdf->SetFont('','B',13);
$pdf->SetXY($this->marges['g'],$posy-5); $pdf->SetXY($this->marges['g'],$posy-5);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$title=$outputlangs->transnoentities("Invoice"); $title=$outputlangs->transnoentities("Invoice");
@@ -913,7 +913,7 @@ class pdf_oursin extends ModelePDFFactures
if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit"); if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProForma"); if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProForma");
$pdf->MultiCell(100, 10, $title.' '.$outputlangs->transnoentities("Of").' '.dol_print_date($object->date,"day",false,$outputlangs,true), '' , 'L'); $pdf->MultiCell(100, 10, $title.' '.$outputlangs->transnoentities("Of").' '.dol_print_date($object->date,"day",false,$outputlangs,true), '' , 'L');
$pdf->SetFont('Arial','B',11); $pdf->SetFont('','B',11);
$pdf->SetXY($this->marges['g'],$posy); $pdf->SetXY($this->marges['g'],$posy);
$pdf->SetTextColor(22,137,210); $pdf->SetTextColor(22,137,210);
$pdf->MultiCell(100, 10, $outputlangs->transnoentities("RefBill")." : " . $outputlangs->transnoentities($object->ref), '', 'L'); $pdf->MultiCell(100, 10, $outputlangs->transnoentities("RefBill")." : " . $outputlangs->transnoentities($object->ref), '', 'L');
@@ -956,7 +956,7 @@ class pdf_oursin extends ModelePDFFactures
{ {
$posy+=5; $posy+=5;
$pdf->SetXY($this->marges['g'],$posy); $pdf->SetXY($this->marges['g'],$posy);
$pdf->SetFont('Arial','',9); $pdf->SetFont('','',9);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'L');
} }
@@ -964,7 +964,7 @@ class pdf_oursin extends ModelePDFFactures
{ {
$posy+=4; $posy+=4;
$pdf->SetXY($this->marges['g'],$posy); $pdf->SetXY($this->marges['g'],$posy);
$pdf->SetFont('Arial','',9); $pdf->SetFont('','',9);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'L');
} }
@@ -989,7 +989,7 @@ class pdf_oursin extends ModelePDFFactures
{ {
$posy+=4; $posy+=4;
$pdf->SetXY($this->marges['g'],$posy); $pdf->SetXY($this->marges['g'],$posy);
$pdf->SetFont('Arial','',9); $pdf->SetFont('','',9);
$pdf->MultiCell(60, 3, $outputlangs->transnoentities("RefProposal")." : ".$outputlangs->transnoentities($newobject->ref)); $pdf->MultiCell(60, 3, $outputlangs->transnoentities("RefProposal")." : ".$outputlangs->transnoentities($newobject->ref));
} }
} }
@@ -1015,7 +1015,7 @@ class pdf_oursin extends ModelePDFFactures
{ {
$posy+=4; $posy+=4;
$pdf->SetXY($this->marges['g'],$posy); $pdf->SetXY($this->marges['g'],$posy);
$pdf->SetFont('Arial','',9); $pdf->SetFont('','',9);
$text=$newobject->ref; $text=$newobject->ref;
if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')'; if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')';
$pdf->MultiCell(60, 3, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text)); $pdf->MultiCell(60, 3, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text));
@@ -1027,7 +1027,7 @@ class pdf_oursin extends ModelePDFFactures
// Amount in (at tab_top - 1) // Amount in (at tab_top - 1)
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $pdf->SetFont('','',10);
$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 94, $titre); $pdf->Text(200 - $pdf->GetStringWidth($titre), 94, $titre);
} }

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

@@ -181,7 +181,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('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -201,11 +201,11 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
// Description de la ligne produit // Description de la ligne produit
$libelleproduitservice=pdf_getlinedesc($object->lignes[$i],$outputlangs); $libelleproduitservice=pdf_getlinedesc($object->lignes[$i],$outputlangs);
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page
$pdf->writeHTMLCell(100, 3, 30, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1); $pdf->writeHTMLCell(100, 3, 30, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$pdf->SetXY (10, $curY ); $pdf->SetXY (10, $curY );
@@ -275,7 +275,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('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -323,7 +323,7 @@ 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('Arial','',11); $pdf->SetFont('','',11);
$pdf->Text(30,$tab_top + 5,$outputlangs->transnoentities("Designation")); $pdf->Text(30,$tab_top + 5,$outputlangs->transnoentities("Designation"));
@@ -344,7 +344,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $pdf->SetFont('','',10);
// $titre = $langs->transnoentities("AmountInCurrency",$langs->transnoentitiesnoconv("Currency".$conf->monnaie)); // $titre = $langs->transnoentities("AmountInCurrency",$langs->transnoentitiesnoconv("Currency".$conf->monnaie));
// $pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre); // $pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
@@ -363,7 +363,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
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('Arial','B',13); $pdf->SetFont('','B',13);
$posy=$this->marge_haute; $posy=$this->marge_haute;
@@ -372,14 +372,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('Arial','B',12); $pdf->SetFont('','B',12);
$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('Arial','',9); $pdf->SetFont('','',9);
$pdf->SetXY($this->marge_gauche,$posy+4); $pdf->SetXY($this->marge_gauche,$posy+4);
$pdf->MultiCell(80, 3, $carac_emetteur); $pdf->MultiCell(80, 3, $carac_emetteur);
@@ -413,18 +413,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('Arial','B',11); $pdf->SetFont('','B',11);
$pdf->SetXY(102,42); $pdf->SetXY(102,42);
$pdf->MultiCell(96,5, $carac_client_name); $pdf->MultiCell(96,5, $carac_client_name);
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->SetXY(102,47); $pdf->SetXY(102,47);
$pdf->MultiCell(96,5, $carac_client); $pdf->MultiCell(96,5, $carac_client);
$pdf->rect(100, 40, 100, 40); $pdf->rect(100, 40, 100, 40);
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',12); $pdf->SetFont('','B',12);
$pdf->Text(11, 88, $outputlangs->transnoentities("Date")." : " . dol_print_date(($object->date_delivery?$object->date_delivery:$date->valid),"day",false,$outputlangs,true)); $pdf->Text(11, 88, $outputlangs->transnoentities("Date")." : " . dol_print_date(($object->date_delivery?$object->date_delivery:$date->valid),"day",false,$outputlangs,true));
$pdf->Text(11, 94, $outputlangs->transnoentities("DeliveryOrder")." ".$outputlangs->convToOutputCharset($object->ref)); $pdf->Text(11, 94, $outputlangs->transnoentities("DeliveryOrder")." ".$outputlangs->convToOutputCharset($object->ref));
@@ -436,7 +436,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$pdf->MultiCell(96, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R'); $pdf->MultiCell(96, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
} }
$pdf->SetFont('Arial','B',9); $pdf->SetFont('','B',9);
// Add list of linked orders // Add list of linked orders
// TODO mutualiser // TODO mutualiser
@@ -457,7 +457,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
{ {
$posy+=4; $posy+=4;
$pdf->SetXY(102,$posy); $pdf->SetXY(102,$posy);
$pdf->SetFont('Arial','',9); $pdf->SetFont('','',9);
$text=$newobject->ref; $text=$newobject->ref;
if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')'; if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')';
$pdf->Text(11, 94, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R'); $pdf->Text(11, 94, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');

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

@@ -214,7 +214,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('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -228,7 +228,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
{ {
$tab_top = 88; $tab_top = 88;
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', 9); // 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, 'J'); $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'J');
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
@@ -258,11 +258,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// Description de la ligne produit // Description de la ligne produit
$libelleproduitservice=pdf_getlinedesc($object->lignes[$i],$outputlangs); $libelleproduitservice=pdf_getlinedesc($object->lignes[$i],$outputlangs);
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page
$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('Arial','', 9); // On repositionne la police par defaut $pdf->SetFont('','', 9); // On repositionne la police par defaut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
/* /*
@@ -339,7 +339,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('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -403,7 +403,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->AddPage('P', 'A4'); $pdf->AddPage('P', 'A4');
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs);
$pdf-> SetY(40); $pdf-> SetY(40);
@@ -453,7 +453,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// 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('Arial','',8); $pdf->SetFont('','',8);
//$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); //$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
//$pdf->Text($this->page_largeur - $this->marge_droite - $pdf->GetStringWidth($titre), $tab_top-1, $titre); //$pdf->Text($this->page_largeur - $this->marge_droite - $pdf->GetStringWidth($titre), $tab_top-1, $titre);
@@ -464,7 +464,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// line prend une position y en 3eme param // line prend une position y en 3eme param
$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->SetFont('Arial','',10); $pdf->SetFont('','',10);
$pdf->SetXY ($this->posxdesc-1, $tab_top+2); $pdf->SetXY ($this->posxdesc-1, $tab_top+2);
$pdf->MultiCell(80,2, $outputlangs->transnoentities("Designation"),'','L'); $pdf->MultiCell(80,2, $outputlangs->transnoentities("Designation"),'','L');
@@ -480,7 +480,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('Arial','',10); $pdf->SetFont('','',10);
$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);
@@ -505,7 +505,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
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('Arial','B',13); $pdf->SetFont('','B',13);
$posy=$this->marge_haute; $posy=$this->marge_haute;
@@ -522,19 +522,19 @@ class pdf_typhon extends ModelePDFDeliveryOrder
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','B',12); $pdf->SetFont('','B',12);
$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('Arial','',12); $pdf->SetFont('','',12);
$posy+=5; $posy+=5;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@@ -579,7 +579,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
{ {
$posy+=4; $posy+=4;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
$pdf->SetFont('Arial','',9); $pdf->SetFont('','',9);
$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');
@@ -595,7 +595,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('Arial','',8); $pdf->SetFont('','',8);
$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").":");
@@ -609,20 +609,20 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// Nom emetteur // Nom emetteur
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$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('Arial','',9); $pdf->SetFont('','',9);
$pdf->SetXY($this->marge_gauche+2,$posy+9); $pdf->SetXY($this->marge_gauche+2,$posy+9);
$pdf->MultiCell(80, 3, $carac_emetteur); $pdf->MultiCell(80, 3, $carac_emetteur);
// Client destinataire // Client destinataire
$posy=42; $posy=42;
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY(102,$posy-5); $pdf->SetXY(102,$posy-5);
$pdf->MultiCell(80,5, $outputlangs->transnoentities("DeliveryAddress").":"); $pdf->MultiCell(80,5, $outputlangs->transnoentities("DeliveryAddress").":");
@@ -655,10 +655,10 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// Show customer/recipient // Show customer/recipient
$pdf->SetXY(102,$posy+3); $pdf->SetXY(102,$posy+3);
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->MultiCell(106,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(106,4, $carac_client_name, 0, 'L');
$pdf->SetFont('Arial','',9); $pdf->SetFont('','',9);
$pdf->SetXY(102,$posy+7); $pdf->SetXY(102,$posy+7);
$pdf->MultiCell(86,4, $carac_client); $pdf->MultiCell(86,4, $carac_client);
} }

2
htdocs/includes/modules/member/cards/pdf_standard.class.php
View File

@@ -113,7 +113,7 @@ class pdf_standard {
if ($pt > 3) { if ($pt > 3) {
$this->_Char_Size = $pt; $this->_Char_Size = $pt;
$this->_Line_Height = $this->_Get_Height_Chars($pt); $this->_Line_Height = $this->_Get_Height_Chars($pt);
$pdf->SetFont('Arial','',$pt); $pdf->SetFont('','',$pt);
} }
} }

2
htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
View File

@@ -113,7 +113,7 @@ class pdf_standardlabel {
if ($pt > 3) { if ($pt > 3) {
$this->_Char_Size = $pt; $this->_Char_Size = $pt;
$this->_Line_Height = $this->_Get_Height_Chars($pt); $this->_Line_Height = $this->_Get_Height_Chars($pt);
$pdf->SetFont('Arial','',$pt); $pdf->SetFont('','',$pt);
} }
} }

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

@@ -182,7 +182,7 @@ class pdf_baleine extends ModelePDFProjects
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $object, 1, $outputlangs); $this->_pagehead($pdf, $object, 1, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -194,7 +194,7 @@ class pdf_baleine extends ModelePDFProjects
// Affiche notes // Affiche notes
if (! empty($object->note_public)) if (! empty($object->note_public))
{ {
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->SetXY ($this->posxref-1, $tab_top-2); $pdf->SetXY ($this->posxref-1, $tab_top-2);
$pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'J'); $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'J');
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
@@ -229,7 +229,7 @@ class pdf_baleine extends ModelePDFProjects
$dateend=dol_print_date($object->lines[$i]->date_end,'day'); $dateend=dol_print_date($object->lines[$i]->date_end,'day');
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page
$pdf->SetXY($this->posxref, $curY); $pdf->SetXY($this->posxref, $curY);
$pdf->MultiCell(60, 3, $outputlangs->convToOutputCharset($ref), 0, 'L'); $pdf->MultiCell(60, 3, $outputlangs->convToOutputCharset($ref), 0, 'L');
@@ -243,7 +243,7 @@ class pdf_baleine extends ModelePDFProjects
$pdf->MultiCell(20, 3, $dateend, 0, 'L'); $pdf->MultiCell(20, 3, $dateend, 0, 'L');
$pdf->SetFont('Arial','', 9); // On repositionne la police par defaut $pdf->SetFont('','', 9); // On repositionne la police par defaut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$nexY+=2; // Passe espace entre les lignes $nexY+=2; // Passe espace entre les lignes
@@ -271,7 +271,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('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -322,7 +322,7 @@ class pdf_baleine extends ModelePDFProjects
// 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('Arial','',8); $pdf->SetFont('','',8);
//$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); //$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
//$pdf->Text($this->page_largeur - $this->marge_droite - $pdf->GetStringWidth($titre), $tab_top-1, $titre); //$pdf->Text($this->page_largeur - $this->marge_droite - $pdf->GetStringWidth($titre), $tab_top-1, $titre);
@@ -333,7 +333,7 @@ class pdf_baleine extends ModelePDFProjects
// line prend une position y en 3eme param // line prend une position y en 3eme param
$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->SetFont('Arial','',10); $pdf->SetFont('','',10);
$pdf->SetXY ($this->posxref-1, $tab_top+2); $pdf->SetXY ($this->posxref-1, $tab_top+2);
$pdf->MultiCell(80,2, $outputlangs->transnoentities("Tasks"),'','L'); $pdf->MultiCell(80,2, $outputlangs->transnoentities("Tasks"),'','L');
@@ -353,7 +353,7 @@ class pdf_baleine extends ModelePDFProjects
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('Arial','B',13); $pdf->SetFont('','B',13);
$posy=$this->marge_haute; $posy=$this->marge_haute;
@@ -370,18 +370,18 @@ class pdf_baleine extends ModelePDFProjects
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$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, $outputlangs->transnoentities($this->emetteur->nom), 0, 'L'); else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->nom), 0, 'L');
$pdf->SetFont('Arial','B',13); $pdf->SetFont('','B',13);
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Project")." ".$outputlangs->convToOutputCharset($object->ref), '' , 'R'); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Project")." ".$outputlangs->convToOutputCharset($object->ref), '' , 'R');
$pdf->SetFont('Arial','',12); $pdf->SetFont('','',12);
$posy+=6; $posy+=6;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@@ -412,7 +412,7 @@ class pdf_baleine extends ModelePDFProjects
{ {
$posy+=4; $posy+=4;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
$pdf->SetFont('Arial','',9); $pdf->SetFont('','',9);
$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');

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

@@ -207,7 +207,7 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $propale, 1, $outputlangs); $this->_pagehead($pdf, $propale, 1, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 4 $pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 4
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -223,7 +223,7 @@ class pdf_propale_azur extends ModelePDFPropales
{ {
$tab_top = 88; $tab_top = 88;
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', 9); // 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($propale->note_public), 0, 'J'); $pdf->MultiCell(190, 4, $outputlangs->convToOutputCharset($propale->note_public), 0, 'J');
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
@@ -253,12 +253,12 @@ class pdf_propale_azur extends ModelePDFPropales
// Description de la ligne produit // Description de la ligne produit
$libelleproduitservice=pdf_getlinedesc($propale->lignes[$i],$outputlangs); $libelleproduitservice=pdf_getlinedesc($propale->lignes[$i],$outputlangs);
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page
// Description // Description
$pdf->writeHTMLCell($this->posxtva-$this->posxdesc-1, 4, $this->posxdesc-1, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1); $pdf->writeHTMLCell($this->posxtva-$this->posxdesc-1, 4, $this->posxdesc-1, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
$pdf->SetFont('Arial','', 9); // On repositionne la police par defaut $pdf->SetFont('','', 9); // On repositionne la police par defaut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
// TVA // TVA
@@ -358,7 +358,7 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $propale, 0, $outputlangs); $this->_pagehead($pdf, $propale, 0, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -450,12 +450,12 @@ class pdf_propale_azur extends ModelePDFPropales
{ {
global $conf; global $conf;
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
// 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('Arial','B',8); $pdf->SetFont('','B',8);
$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);
@@ -465,12 +465,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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY(50, $posy); $pdf->SetXY(50, $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);
@@ -489,7 +489,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('Arial','B',8); $pdf->SetFont('','B',8);
$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);
@@ -501,11 +501,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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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');
@@ -525,24 +525,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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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;
} }
@@ -587,7 +587,7 @@ class pdf_propale_azur extends ModelePDFPropales
$tab2_top = $posy; $tab2_top = $posy;
$tab2_hl = 5; $tab2_hl = 5;
$tab2_height = $tab2_hl * 4; $tab2_height = $tab2_hl * 4;
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
// Tableau total // Tableau total
$lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x; $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x;
@@ -775,7 +775,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('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
} }
@@ -793,7 +793,7 @@ class pdf_propale_azur 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('Arial','',8); $pdf->SetFont('','',8);
$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
$pdf->Text($this->page_largeur - $this->marge_droite - $pdf->GetStringWidth($titre), $tab_top-1, $titre); $pdf->Text($this->page_largeur - $this->marge_droite - $pdf->GetStringWidth($titre), $tab_top-1, $titre);
@@ -804,7 +804,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('Arial','',9); $pdf->SetFont('','',9);
$pdf->SetXY ($this->posxdesc-1, $tab_top+2); $pdf->SetXY ($this->posxdesc-1, $tab_top+2);
$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L'); $pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
@@ -866,7 +866,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('Arial','B',13); $pdf->SetFont('','B',13);
$posy=$this->marge_haute; $posy=$this->marge_haute;
@@ -883,7 +883,7 @@ class pdf_propale_azur extends ModelePDFPropales
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$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');
} }
@@ -894,13 +894,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('Arial','B',13); $pdf->SetFont('','B',13);
$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('Arial','B',12); $pdf->SetFont('','B',12);
$posy+=6; $posy+=6;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@@ -908,7 +908,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('Arial','',10); $pdf->SetFont('','',10);
if ($object->ref_client) if ($object->ref_client)
{ {
@@ -958,7 +958,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('Arial','',8); $pdf->SetFont('','',8);
$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);
@@ -968,11 +968,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('Arial','B',10); $pdf->SetFont('','B',10);
$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('Arial','',9); $pdf->SetFont('','',9);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+8);
$pdf->MultiCell(80, 4, $carac_emetteur); $pdf->MultiCell(80, 4, $carac_emetteur);
@@ -1008,7 +1008,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('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY($posx,$posy-5); $pdf->SetXY($posx,$posy-5);
$pdf->MultiCell(80, 4, $outputlangs->transnoentities("BillTo").":"); $pdf->MultiCell(80, 4, $outputlangs->transnoentities("BillTo").":");
$pdf->rect($posx, $posy, 100, $hautcadre); $pdf->rect($posx, $posy, 100, $hautcadre);
@@ -1016,11 +1016,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('Arial','B',10); $pdf->SetFont('','B',10);
$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('Arial','',9); $pdf->SetFont('','',9);
$posy=$pdf->GetY()-9; //Auto Y coord readjust for multiline name $posy=$pdf->GetY()-9; //Auto Y coord readjust for multiline name
$pdf->SetXY($posx+2,$posy+6); $pdf->SetXY($posx+2,$posy+6);
$pdf->MultiCell(86,4, $carac_client); $pdf->MultiCell(86,4, $carac_client);

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

@@ -171,7 +171,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $propale, 1, $outputlangs); $this->_pagehead($pdf, $propale, 1, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -193,11 +193,11 @@ class pdf_propale_jaune extends ModelePDFPropales
// Description de la ligne produit // Description de la ligne produit
$libelleproduitservice=pdf_getlinedesc($propale->lignes[$i],$outputlangs); $libelleproduitservice=pdf_getlinedesc($propale->lignes[$i],$outputlangs);
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page
$pdf->writeHTMLCell(102, 4, 30, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1); $pdf->writeHTMLCell(102, 4, 30, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
$pdf->SetFont('Arial','', 9); // On repositionne la police par d<>faut $pdf->SetFont('','', 9); // On repositionne la police par d<>faut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$ref=dol_htmlentitiesbr($propale->lignes[$i]->ref); $ref=dol_htmlentitiesbr($propale->lignes[$i]->ref);
@@ -245,7 +245,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $propale, 0, $outputlangs); $this->_pagehead($pdf, $propale, 0, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -264,7 +264,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$tab2_lh = 7; $tab2_lh = 7;
$tab2_height = $tab2_lh * 3; $tab2_height = $tab2_lh * 3;
$pdf->SetFont('Arial','', 10); $pdf->SetFont('','', 10);
$pdf->Rect(132, $tab2_top, 68, $tab2_height); $pdf->Rect(132, $tab2_top, 68, $tab2_height);
@@ -319,12 +319,12 @@ class pdf_propale_jaune extends ModelePDFPropales
{ {
global $conf; global $conf;
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
// 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('Arial','B',8); $pdf->SetFont('','B',8);
$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);
@@ -334,12 +334,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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY(50, $posy); $pdf->SetXY(50, $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);
@@ -356,7 +356,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('Arial','B',8); $pdf->SetFont('','B',8);
$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);
@@ -368,12 +368,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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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);
@@ -394,24 +394,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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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('Arial','B',8); $pdf->SetFont('','B',8);
$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('Arial','',8); $pdf->SetFont('','',8);
$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;
} }
@@ -455,7 +455,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$langs->load("main"); $langs->load("main");
$langs->load("bills"); $langs->load("bills");
$pdf->SetFont('Arial','',11); $pdf->SetFont('','',11);
$pdf->SetXY(10,$tab_top); $pdf->SetXY(10,$tab_top);
$pdf->MultiCell(20,10,$outputlangs->transnoentities("Ref"),0,'C',1); $pdf->MultiCell(20,10,$outputlangs->transnoentities("Ref"),0,'C',1);
@@ -482,7 +482,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('Arial','',10); $pdf->SetFont('','',10);
} }
@@ -504,7 +504,7 @@ class pdf_propale_jaune extends ModelePDFPropales
// Sender name // Sender name
$pdf->SetTextColor(0,0,00); $pdf->SetTextColor(0,0,00);
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$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
@@ -519,7 +519,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('Arial','',9); $pdf->SetFont('','',9);
$pdf->SetXY($this->marge_gauche+2,$posy+4); $pdf->SetXY($this->marge_gauche+2,$posy+4);
$pdf->MultiCell(80, 4, $carac_emetteur); $pdf->MultiCell(80, 4, $carac_emetteur);
@@ -527,7 +527,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('Arial','B',16); $pdf->SetFont('','B',16);
$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');
@@ -535,7 +535,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('Arial','B',12); $pdf->SetFont('','B',12);
$pdf->rect(10, 90, 100, 10); $pdf->rect(10, 90, 100, 10);
$pdf->rect(110, 90, 90, 10); $pdf->rect(110, 90, 90, 10);
@@ -546,7 +546,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->MultiCell(100, 10, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,'day',false,$outputlangs,true)); $pdf->MultiCell(100, 10, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,'day',false,$outputlangs,true));
$posy=15; $posy=15;
$pdf->SetFont('Arial','',10); $pdf->SetFont('','',10);
$posy+=5; $posy+=5;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@@ -604,11 +604,11 @@ class pdf_propale_jaune extends ModelePDFPropales
// Show recipient // Show recipient
$pdf->SetXY(102,$posy+3); $pdf->SetXY(102,$posy+3);
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->MultiCell(96,4, $outputlangs->convToOutputCharset($carac_client_name), 0, 'L'); $pdf->MultiCell(96,4, $outputlangs->convToOutputCharset($carac_client_name), 0, 'L');
// Show address // Show address
$pdf->SetFont('Arial','',9); $pdf->SetFont('','',9);
$posy=$pdf->GetY()-9; //Auto Y coord readjust for multiline name $posy=$pdf->GetY()-9; //Auto Y coord readjust for multiline name
$pdf->SetXY(102,$posy+6); $pdf->SetXY(102,$posy+6);
$pdf->MultiCell(86,4, $carac_client); $pdf->MultiCell(86,4, $carac_client);

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

@@ -198,7 +198,7 @@ class pdf_paiement
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $pages, 1, $outputlangs); $this->_pagehead($pdf, $pages, 1, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -231,16 +231,16 @@ class pdf_paiement
$title=$outputlangs->transnoentities("ListOfCustomerPayments"); $title=$outputlangs->transnoentities("ListOfCustomerPayments");
$title.=' - '.dol_print_date(dol_mktime(0,0,0,$this->month,1,$this->year),"%B %Y",false,$outputlangs,true); $title.=' - '.dol_print_date(dol_mktime(0,0,0,$this->month,1,$this->year),"%B %Y",false,$outputlangs,true);
$pdf->SetFont('Arial','B',12); $pdf->SetFont('','B',12);
$pdf->Text(70, 10, $title); $pdf->Text(70, 10, $title);
$pdf->SetFont('Arial','',12); $pdf->SetFont('','',12);
$pdf->Text(11, 16, $outputlangs->transnoentities("DateBuild")." : ".dol_print_date(time(),"day",false,$outputlangs,true)); $pdf->Text(11, 16, $outputlangs->transnoentities("DateBuild")." : ".dol_print_date(time(),"day",false,$outputlangs,true));
$pdf->SetFont('Arial','',12); $pdf->SetFont('','',12);
$pdf->Text(11, 22, $outputlangs->transnoentities("Page")." : ".$page); $pdf->Text(11, 22, $outputlangs->transnoentities("Page")." : ".$page);
$pdf->SetFont('Arial','',12); $pdf->SetFont('','',12);
$pdf->Text(11,$this->tab_top + 6,'Date'); $pdf->Text(11,$this->tab_top + 6,'Date');
@@ -269,7 +269,7 @@ class pdf_paiement
*/ */
function Body(&$pdf, $page, $lines, $outputlangs) function Body(&$pdf, $page, $lines, $outputlangs)
{ {
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$oldprowid = 0; $oldprowid = 0;
$pdf->SetFillColor(220,220,220); $pdf->SetFillColor(220,220,220);
$yp = 0; $yp = 0;
@@ -283,7 +283,7 @@ class pdf_paiement
$page++; $page++;
$pdf->AddPage(); $pdf->AddPage();
$this->_pagehead($pdf, $page, 0, $outputlangs); $this->_pagehead($pdf, $page, 0, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$yp = 0; $yp = 0;
} }

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

@@ -198,7 +198,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $com, 1, $outputlangs); $this->_pagehead($pdf, $com, 1, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -212,7 +212,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
{ {
$tab_top = 88; $tab_top = 88;
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', 9); // 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($com->note_public), 0, 'J'); $pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($com->note_public), 0, 'J');
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
@@ -242,11 +242,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Description de la ligne produit // Description de la ligne produit
$libelleproduitservice=pdf_getlinedesc($com->lignes[$i],$outputlangs,0,0,1); $libelleproduitservice=pdf_getlinedesc($com->lignes[$i],$outputlangs,0,0,1);
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page
$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('Arial','', 9); // On repositionne la police par defaut $pdf->SetFont('','', 9); // On repositionne la police par defaut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
@@ -311,7 +311,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->AddPage(); $pdf->AddPage();
$pagenb++; $pagenb++;
$this->_pagehead($pdf, $com, 0, $outputlangs); $this->_pagehead($pdf, $com, 0, $outputlangs);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3 $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -346,7 +346,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
{ {
$pdf->SetXY ($this->marge_gauche, 228); $pdf->SetXY ($this->marge_gauche, 228);
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorCreateBankAccount"),0,'L',0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorCreateBankAccount"),0,'L',0);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -393,7 +393,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$tab2_top = $posy; $tab2_top = $posy;
$tab2_hl = 5; $tab2_hl = 5;
$tab2_height = $tab2_hl * 4; $tab2_height = $tab2_hl * 4;
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->SetXY ($this->marge_gauche, $tab2_top + 0); $pdf->SetXY ($this->marge_gauche, $tab2_top + 0);
@@ -483,7 +483,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
if ($deja_regle > 0) if ($deja_regle > 0)
@@ -498,13 +498,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$index++; $index++;
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
//$pdf->SetFont('Arial','B', 9); //$pdf->SetFont('','B', 9);
$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1); $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle), $useborder, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle), $useborder, 'R', 1);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('','', 9);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
} }
@@ -522,7 +522,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// 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('Arial','',8); $pdf->SetFont('','',8);
$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
$pdf->Text($this->page_largeur - $this->marge_droite - $pdf->GetStringWidth($titre), $tab_top-1, $titre); $pdf->Text($this->page_largeur - $this->marge_droite - $pdf->GetStringWidth($titre), $tab_top-1, $titre);
@@ -533,7 +533,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// line prend une position y en 3eme param // line prend une position y en 3eme param
$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->SetFont('Arial','',10); $pdf->SetFont('','',10);
$pdf->SetXY ($this->posxdesc-1, $tab_top+2); $pdf->SetXY ($this->posxdesc-1, $tab_top+2);
$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L'); $pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
@@ -586,7 +586,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
//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('Arial','B',13); $pdf->SetFont('','B',13);
$posy=$this->marge_haute; $posy=$this->marge_haute;
@@ -603,7 +603,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
else else
{ {
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$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');
} }
@@ -614,11 +614,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L'); $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
} }
$pdf->SetFont('Arial','B',13); $pdf->SetFont('','B',13);
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("SupplierOrder")." ".$outputlangs->convToOutputCharset($object->ref), '' , 'R'); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("SupplierOrder")." ".$outputlangs->convToOutputCharset($object->ref), '' , 'R');
$pdf->SetFont('Arial','',12); $pdf->SetFont('','',12);
$posy+=6; $posy+=6;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@@ -639,7 +639,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$posy=42; $posy=42;
$hautcadre=40; $hautcadre=40;
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY($this->marge_gauche,$posy-5); $pdf->SetXY($this->marge_gauche,$posy-5);
$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillTo").":"); $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillTo").":");
@@ -653,21 +653,21 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Nom emetteur // Nom emetteur
$carac_emetteur_name=$outputlangs->convToOutputCharset($mysoc->nom); $carac_emetteur_name=$outputlangs->convToOutputCharset($mysoc->nom);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->SetXY($this->marge_gauche+2,$posy+3); $pdf->SetXY($this->marge_gauche+2,$posy+3);
$pdf->MultiCell(80, 4, $carac_emetteur_name, 0, 'L'); $pdf->MultiCell(80, 4, $carac_emetteur_name, 0, 'L');
// Sender properties // Sender properties
$carac_emetteur = pdf_build_address($outputlangs,$mysoc); $carac_emetteur = pdf_build_address($outputlangs,$mysoc);
$pdf->SetFont('Arial','',9); $pdf->SetFont('','',9);
$pdf->SetXY($this->marge_gauche+2,$posy+8); $pdf->SetXY($this->marge_gauche+2,$posy+8);
$pdf->MultiCell(80, 4, $carac_emetteur); $pdf->MultiCell(80, 4, $carac_emetteur);
// Client destinataire // Client destinataire
$posy=42; $posy=42;
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY(100,$posy-5); $pdf->SetXY(100,$posy-5);
$pdf->MultiCell(96, 4, $outputlangs->transnoentities("Supplier").":"); $pdf->MultiCell(96, 4, $outputlangs->transnoentities("Supplier").":");
// //
@@ -696,10 +696,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Show customer/recipient // Show customer/recipient
$pdf->SetXY(102,$posy+3); $pdf->SetXY(102,$posy+3);
$pdf->SetFont('Arial','B',10); $pdf->SetFont('','B',10);
$pdf->MultiCell(96,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(96,4, $carac_client_name, 0, 'L');
$pdf->SetFont('Arial','',9); $pdf->SetFont('','',9);
$pdf->SetXY(102,$posy+8); $pdf->SetXY(102,$posy+8);
$pdf->MultiCell(96,4, $carac_client); $pdf->MultiCell(96,4, $carac_client);
} }