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

Maxi debug for UTF8 support

Browse Source
This commit is contained in:
Laurent Destailleur 2008-10-29 21:34:55 +00:00
parent 447d3c1eae
commit 7134c6e191
8 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@
require_once(FPDFI_PATH.'fpdi_protection.php'); require_once(FPDFI_PATH.'fpdi_protection.php');
require_once(DOL_DOCUMENT_ROOT ."/includes/fpdf/fpdf_indexes.php"); require_once(DOL_DOCUMENT_ROOT ."/includes/fpdf/fpdf_indexes.php");
require_once(DOL_DOCUMENT_ROOT ."/includes/fpdf/fpdf_html.php"); require_once(DOL_DOCUMENT_ROOT ."/includes/fpdf/fpdf_html.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
/** /**
\class CommActionRapport \class CommActionRapport

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

@ -26,6 +26,7 @@
require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
/** /**

1
htdocs/includes/modules/dons/html_cerfafr.modules.php
View File

@ -25,6 +25,7 @@
*/ */
require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php");
require_once(DOL_DOCUMENT_ROOT."/don.class.php"); require_once(DOL_DOCUMENT_ROOT."/don.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
/** /**

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

@ -28,6 +28,8 @@
require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php";
require_once DOL_DOCUMENT_ROOT."/contact.class.php"; require_once DOL_DOCUMENT_ROOT."/contact.class.php";
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
/** /**
* \class pdf_expedition_merou * \class pdf_expedition_merou

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

@ -26,6 +26,7 @@
*/ */
require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php";
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
/** /**

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

@ -693,59 +693,55 @@ class pdf_crabe extends ModelePDFFactures
} }
/* /*
* Propose mode reglement par RIB * Si mode reglement non force ou si force a VIR, propose mode reglement par RIB
*/ */
if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
{ {
// Si mode reglement non force ou si force a VIR if (! empty($conf->global->FACTURE_RIB_NUMBER))
if ($conf->global->FACTURE_RIB_NUMBER)
{ {
if ($conf->global->FACTURE_RIB_NUMBER) $account = new Account($this->db);
{ $account->fetch($conf->global->FACTURE_RIB_NUMBER);
$account = new Account($this->db);
$account->fetch($conf->global->FACTURE_RIB_NUMBER); $this->marges['g']=$this->marge_gauche;
$this->marges['g']=$this->marge_gauche; $cury=$posy;
$pdf->SetXY ($this->marges['g'], $cury);
$cury=$posy; $pdf->SetFont('Arial','B',8);
$pdf->SetXY ($this->marges['g'], $cury); $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
$pdf->SetFont('Arial','B',8); $cury+=4;
$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0); $pdf->SetFont('Arial','B',6);
$cury+=4; $pdf->line($this->marges['g']+1, $cury, $this->marges['g']+1, $cury+10 );
$pdf->SetFont('Arial','B',6); $pdf->SetXY ($this->marges['g'], $cury);
$pdf->line($this->marges['g']+1, $cury, $this->marges['g']+1, $cury+10 ); $pdf->MultiCell(18, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0);
$pdf->SetXY ($this->marges['g'], $cury); $pdf->line($this->marges['g']+18, $cury, $this->marges['g']+18, $cury+10 );
$pdf->MultiCell(18, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0); $pdf->SetXY ($this->marges['g']+18, $cury);
$pdf->line($this->marges['g']+18, $cury, $this->marges['g']+18, $cury+10 ); $pdf->MultiCell(18, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0);
$pdf->SetXY ($this->marges['g']+18, $cury); $pdf->line($this->marges['g']+36, $cury, $this->marges['g']+36, $cury+10 );
$pdf->MultiCell(18, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0); $pdf->SetXY ($this->marges['g']+36, $cury);
$pdf->line($this->marges['g']+36, $cury, $this->marges['g']+36, $cury+10 ); $pdf->MultiCell(24, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0);
$pdf->SetXY ($this->marges['g']+36, $cury); $pdf->line($this->marges['g']+60, $cury, $this->marges['g']+60, $cury+10 );
$pdf->MultiCell(24, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0); $pdf->SetXY ($this->marges['g']+60, $cury);
$pdf->line($this->marges['g']+60, $cury, $this->marges['g']+60, $cury+10 ); $pdf->MultiCell(13, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0);
$pdf->SetXY ($this->marges['g']+60, $cury); $pdf->line($this->marges['g']+73, $cury, $this->marges['g']+73, $cury+10 );
$pdf->MultiCell(13, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0);
$pdf->line($this->marges['g']+73, $cury, $this->marges['g']+73, $cury+10 ); $pdf->SetFont('Arial','',8);
$pdf->SetXY ($this->marges['g'], $cury+5);
$pdf->SetFont('Arial','',8); $pdf->MultiCell(18, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0);
$pdf->SetXY ($this->marges['g'], $cury+5); $pdf->SetXY ($this->marges['g']+18, $cury+5);
$pdf->MultiCell(18, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0); $pdf->MultiCell(18, 3, $outputlangs->convToOutputCharset($account->code_guichet), 0, 'C', 0);
$pdf->SetXY ($this->marges['g']+18, $cury+5); $pdf->SetXY ($this->marges['g']+36, $cury+5);
$pdf->MultiCell(18, 3, $outputlangs->convToOutputCharset($account->code_guichet), 0, 'C', 0); $pdf->MultiCell(24, 3, $outputlangs->convToOutputCharset($account->number), 0, 'C', 0);
$pdf->SetXY ($this->marges['g']+36, $cury+5); $pdf->SetXY ($this->marges['g']+60, $cury+5);
$pdf->MultiCell(24, 3, $outputlangs->convToOutputCharset($account->number), 0, 'C', 0); $pdf->MultiCell(13, 3, $outputlangs->convToOutputCharset($account->cle_rib), 0, 'C', 0);
$pdf->SetXY ($this->marges['g']+60, $cury+5);
$pdf->MultiCell(13, 3, $outputlangs->convToOutputCharset($account->cle_rib), 0, 'C', 0); $pdf->SetXY ($this->marges['g'], $cury+12);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").' : ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0);
$pdf->SetXY ($this->marges['g'], $cury+12); $pdf->SetXY ($this->marges['g'], $cury+22);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").' : ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities("IbanPrefix").' : ' . $outputlangs->convToOutputCharset($account->iban_prefix), 0, 'L', 0);
$pdf->SetXY ($this->marges['g'], $cury+22); $pdf->SetXY ($this->marges['g'], $cury+25);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("IbanPrefix").' : ' . $outputlangs->convToOutputCharset($account->iban_prefix), 0, 'L', 0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities("BIC").' : ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
$pdf->SetXY ($this->marges['g'], $cury+25);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("BIC").' : ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0); $posy=$pdf->GetY()+2;
$posy=$pdf->GetY()+2;
}
} }
} }
} }

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

@ -28,6 +28,7 @@
*/ */
require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
/** /**

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

@ -25,6 +25,7 @@
\version $Id$ \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
/** /**