From d7291bc6558db249616043d42e5cae1801ff18fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 16 Feb 2009 20:56:08 +0000
Subject: [PATCH] Fix: UTF encoding

---
 .../includes/modules/facture/pdf_crabe.modules.php   | 10 +++++-----
 .../includes/modules/facture/pdf_oursin.modules.php  | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index b98b1728be6..ae27bbc1d05 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -624,7 +624,7 @@ class pdf_crabe extends ModelePDFFactures
 
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('Arial','B',8);
-						$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$outputlangs->convToOutputCharset($account->proprio)).':',0,'L',0);
+						$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0);
 						$posy=$pdf->GetY()+1;
 
 						$pdf->SetXY($this->marge_gauche, $posy);
@@ -711,7 +711,7 @@ class pdf_crabe extends ModelePDFFactures
 				if ($tvakey)    // On affiche pas taux 0
 				{
 					$this->atleastoneratenotnull++;
-	
+
 					$index++;
 					$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
 					$tvacompl='';
@@ -727,7 +727,7 @@ class pdf_crabe extends ModelePDFFactures
 					$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
 				}
 			}
-			
+
 			if (! $this->atleastoneratenotnull)	// If no vat at all
 			{
 				$index++;
@@ -737,7 +737,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', 1);
 			}
 		}
-			
+
 		// Total TTC
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
 		{
@@ -842,7 +842,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetXY ($this->posxtva-1, $tab_top+2);
 			$pdf->MultiCell($this->posxup-$this->posxtva-1,2, $outputlangs->transnoentities("VAT"),'','C');
 		}
-		
+
 		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
 		$pdf->SetXY ($this->posxup-1, $tab_top+2);
 		$pdf->MultiCell(18,2, $outputlangs->transnoentities("PriceUHT"),'','C');
diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php
index b0ca02ed9d4..59a81633282 100644
--- a/htdocs/includes/modules/facture/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php
@@ -536,7 +536,7 @@ class pdf_oursin extends ModelePDFFactures
 
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('Arial','B',8);
-						$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$outputlangs->convToOutputCharset($account->proprio)).':',0,'L',0);
+						$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0);
 						$posy=$pdf->GetY()+1;
 
 						$pdf->SetXY($this->marge_gauche, $posy);
@@ -590,7 +590,7 @@ class pdf_oursin extends ModelePDFFactures
 	function _tableau_tot(&$pdf, $fac, $deja_regle, $posy, $outputlangs)
 	{
 		global $conf,$langs;
-		
+
 		$langs->load("main");
 		$langs->load("bills");
 
@@ -602,7 +602,7 @@ class pdf_oursin extends ModelePDFFactures
 		// Tableau total
 		$col1x=$this->marges['g']+110; $col2x=$this->marges['g']+164;
 		$lltot = 200; $largcol2 = $lltot - $col2x;
-		
+
 		$pdf->SetXY ($this->marges['g'], $tab2_top + 0);
 
 		/*
@@ -633,7 +633,7 @@ class pdf_oursin extends ModelePDFFactures
 				if ($tvakey)    // On affiche pas taux 0
 				{
 					$this->atleastoneratenotnull++;
-	
+
 					$index++;
 					$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
 					$tvacompl='';
@@ -649,7 +649,7 @@ class pdf_oursin extends ModelePDFFactures
 					$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
 				}
 			}
-			
+
 			if (! $this->atleastoneratenotnull)	// If no vat at all
 			{
 				$index++;
@@ -672,7 +672,7 @@ class pdf_oursin extends ModelePDFFactures
 			$pdf->MultiCell($largcol2, $tab2_hl, price($fac->total_ttc), 0, 'R', 0);
 			$pdf->SetTextColor(0,0,0);
 		}
-		
+
 		$creditnoteamount=$fac->getSommeCreditNote();
 		$resteapayer = $fac->total_ttc - $deja_regle - $creditnoteamount;
 		if ($object->paye) $resteapayer=0;