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

Work on FPDF replacement by TCPDF

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-01 01:37:16 +00:00
parent ded3200073
commit 8fdafbcc5f
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/includes/modules/facture/modules_facture.php
View File

@ -29,9 +29,10 @@
*/ */
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Requis car utilise dans les classes qui heritent require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Requis car utilise dans les classes qui heritent
require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
//require_once(DOL_DOCUMENT_ROOT.'/includes/tcpdf/tcpdf.php');
/** /**

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

@ -132,7 +132,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
global $mysoc; global $mysoc;
$pdf->SetXY ($curx, $cury); $pdf->SetXY ($curx, $cury);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('','B',8);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0); $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
$cury+=4; $cury+=4;
@ -143,12 +143,12 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
if ($usedetailedbban) if ($usedetailedbban)
{ {
$pdf->SetFont('Arial','',6); $pdf->SetFont('','',6);
$pdf->SetXY ($curx, $cury); $pdf->SetXY ($curx, $cury);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
$cury+=3; $cury+=3;
$pdf->SetFont('Arial','B',6); $pdf->SetFont('','B',6);
$pdf->line($curx+1, $cury+1, $curx+1, $cury+10 ); $pdf->line($curx+1, $cury+1, $curx+1, $cury+10 );
$pdf->SetXY ($curx, $cury+1); $pdf->SetXY ($curx, $cury+1);
$pdf->MultiCell(18, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0); $pdf->MultiCell(18, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0);
@ -163,7 +163,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
$pdf->MultiCell(13, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0); $pdf->MultiCell(13, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0);
$pdf->line($curx+73, $cury+1, $curx+73, $cury+10 ); $pdf->line($curx+73, $cury+1, $curx+73, $cury+10 );
$pdf->SetFont('Arial','',8); $pdf->SetFont('','',8);
$pdf->SetXY ($curx, $cury+6); $pdf->SetXY ($curx, $cury+6);
$pdf->MultiCell(18, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0); $pdf->MultiCell(18, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0);
$pdf->SetXY ($curx+18, $cury+6); $pdf->SetXY ($curx+18, $cury+6);
@ -175,12 +175,12 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
} }
else else
{ {
$pdf->SetFont('Arial','B',6); $pdf->SetFont('','B',6);
$pdf->SetXY ($curx, $cury); $pdf->SetXY ($curx, $cury);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
$cury+=3; $cury+=3;
$pdf->SetFont('Arial','B',6); $pdf->SetFont('','B',6);
$pdf->SetXY ($curx, $cury); $pdf->SetXY ($curx, $cury);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
$cury-=9; $cury-=9;
@ -192,7 +192,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
if ($account->getCountryCode() == 'IN') $ibankey="IFSC"; if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
if ($account->getCountryCode() == 'IN') $bickey="SWIFT"; if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
$pdf->SetFont('Arial','',6); $pdf->SetFont('','',6);
$pdf->SetXY ($curx, $cury+12); $pdf->SetXY ($curx, $cury+12);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0);
$pdf->SetXY ($curx, $cury+22); $pdf->SetXY ($curx, $cury+22);
@ -288,7 +288,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
$ligne2.=($ligne2?" - ":"").$outputlangs->transnoentities("VATIntraShort").": ".$outputlangs->convToOutputCharset($fromcompany->tva_intra); $ligne2.=($ligne2?" - ":"").$outputlangs->transnoentities("VATIntraShort").": ".$outputlangs->convToOutputCharset($fromcompany->tva_intra);
} }
$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