From c17cc300f8d6c4c9fb2b1c367bcc0ebb898c8ebd Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 20 Nov 2007 13:29:55 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20ajout=20de=20la=20d=E9tection=20des=20ca?=
 =?UTF-8?q?ract=E8res=20sp=E9ciaux?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/lib/functions.inc.php                     | 15 ++++++++-------
 htdocs/livraison/mods/pdf/pdf_typhon.modules.php |  7 ++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 3ef7cd72734..10b06dfda38 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -3212,13 +3212,14 @@ function dol_textishtml($msg,$option=0)
 	}
 	else
 	{
-		if (eregi('<html',$msg))       return true;
-		elseif (eregi('<body',$msg))   return true;
-		elseif (eregi('<br',$msg))     return true;
-		elseif (eregi('<table',$msg))  return true;
-		elseif (eregi('<font',$msg))   return true;
-		elseif (eregi('<strong',$msg)) return true;
-		elseif (eregi('<img',$msg))    return true;
+		if (eregi('<html',$msg))             return true;
+		elseif (eregi('<body',$msg))         return true;
+		elseif (eregi('<br',$msg))           return true;
+		elseif (eregi('<table',$msg))        return true;
+		elseif (eregi('<font',$msg))         return true;
+		elseif (eregi('<strong',$msg))       return true;
+		elseif (eregi('<img',$msg))          return true;
+		elseif (eregi('&[A-Z0-9]+;',$msg))   return true;
 		return false;
 	}
 }
diff --git a/htdocs/livraison/mods/pdf/pdf_typhon.modules.php b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php
index 3fd53c7bae6..8d6b638221a 100644
--- a/htdocs/livraison/mods/pdf/pdf_typhon.modules.php
+++ b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php
@@ -240,9 +240,10 @@ class pdf_typhon extends ModelePDFDeliveryOrder
             }
             
             $pdf->SetFont('Arial','', 9);   // Dans boucle pour gérer multi-page
-
-            $pdf->SetXY ($this->posxdesc-1, $curY);
-            $pdf->MultiCell(108, 4, $libelleproduitservice, 0, 'J');
+            
+            $pdf->writeHTMLCell(108, 4, $this->posxdesc-1, $curY, $libelleproduitservice, 0, 1);
+            
+            $pdf->SetFont('Arial','', 9);   // On repositionne la police par défaut
 
             $nexY = $pdf->GetY();
 /*