From 2beb605b3c6e04c63199d54e442e05b2678ad10e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 6 Nov 2008 19:56:24 +0000
Subject: [PATCH] UTF8 Support

---
 htdocs/expedition/fiche.php                               | 1 +
 htdocs/includes/modules/commande/pdf_einstein.modules.php | 6 +++---
 htdocs/includes/modules/facture/pdf_crabe.modules.php     | 8 ++++----
 .../includes/modules/propale/pdf_propale_azur.modules.php | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 600e0657eea..3cd4c16ac3a 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -42,6 +42,7 @@ $langs->load('deliveries');
 $langs->load('orders');
 $langs->load('stocks');
 $langs->load('other');
+$langs->load('propal');
 
 if (! $user->rights->expedition->lire)
 accessforbidden();
diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php
index 4aec7dbe567..a800433ae5c 100644
--- a/htdocs/includes/modules/commande/pdf_einstein.modules.php
+++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php
@@ -498,7 +498,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('Arial','B',8);
-					$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0);
+					$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$outputlangs->convToutputCharset($account->proprio)).':',0,'L',0);
 					$posy=$pdf->GetY()+1;
 
 					$pdf->SetXY($this->marge_gauche, $posy);
@@ -511,12 +511,12 @@ class pdf_einstein extends ModelePDFCommandes
 				{
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('Arial','B',8);
-					$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$this->emetteur->nom.' '.$outputlangs->transnoentities('SendTo').':',0,'L',0);
+					$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$outputlangs->convToutputCharset($this->emetteur->nom).' '.$outputlangs->transnoentities('SendTo').':',0,'L',0);
 					$posy=$pdf->GetY()+1;
 
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('Arial','',8);
-					$pdf->MultiCell(80, 6, $this->emetteur->adresse_full, 0, 'L', 0);
+					$pdf->MultiCell(80, 6, $outputlangs->convToutputCharset($this->emetteur->adresse_full), 0, 'L', 0);
 
 					$posy=$pdf->GetY()+2;
 				}
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index c143e32643c..f499b5e275d 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -661,12 +661,12 @@ class pdf_crabe extends ModelePDFFactures
 		
 		                $pdf->SetXY($this->marge_gauche, $posy);
 		                $pdf->SetFont('Arial','B',8);
-		                $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0);
+		                $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$outputlangs->convToutputCharset($account->proprio)).':',0,'L',0);
 			            $posy=$pdf->GetY()+1;
 		
 		                $pdf->SetXY($this->marge_gauche, $posy);
 		                $pdf->SetFont('Arial','',8);
-		                $pdf->MultiCell(80, 3, $account->adresse_proprio, 0, 'L', 0);
+		                $pdf->MultiCell(80, 3, $outputlangs->convToutputCharset($account->adresse_proprio), 0, 'L', 0);
 		
 			            $posy=$pdf->GetY()+2;
 		            }
@@ -674,12 +674,12 @@ class pdf_crabe extends ModelePDFFactures
 		            {
 		                $pdf->SetXY($this->marge_gauche, $posy);
 		                $pdf->SetFont('Arial','B',8);
-		                $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$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;
 		
 		                $pdf->SetXY($this->marge_gauche, $posy);
 		                $pdf->SetFont('Arial','',8);
-		                $pdf->MultiCell(80, 6, $this->emetteur->adresse_full, 0, 'L', 0);
+		                $pdf->MultiCell(80, 6, $outputlangs->convToOutputCharset($this->emetteur->adresse_full), 0, 'L', 0);
 		
 			            $posy=$pdf->GetY()+2;
 		            }
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index ff82120c28c..17ce2821b3d 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -508,7 +508,7 @@ class pdf_propale_azur extends ModelePDFPropales
 
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('Arial','B',8);
-					$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0);
+					$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$outputlangs->convToutputCharset($account->proprio)).':',0,'L',0);
 					$posy=$pdf->GetY()+1;
 
 					$pdf->SetXY($this->marge_gauche, $posy);