From 5132e76b1a75acbd2eb2707f370fd7723e7847fa Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 25 Sep 2009 10:53:58 +0000 Subject: [PATCH] Fix: problem with special characters --- htdocs/includes/modules/fichinter/pdf_soleil.modules.php | 8 ++++---- htdocs/install/upgrade2.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index 12db4b2562a..71754459662 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -128,7 +128,7 @@ class pdf_soleil extends ModelePDFFicheinter $pdf=new FPDI_Protection('P','mm',$this->format); $pdfrights = array('print'); // Ne permet que l'impression du document $pdfuserpass = ''; // Mot de passe pour l'utilisateur final - $pdfownerpass = NULL; // Mot de passe du propri�taire, cr�� al�atoirement si pas d�fini + $pdfownerpass = NULL; // Mot de passe du proprietaire, cree aleatoirement si pas defini $pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass); } else @@ -285,10 +285,10 @@ class pdf_soleil extends ModelePDFFicheinter $pdf->writeHTMLCell(0, 3, $this->marge_gauche, $tab_top + $j * $height, dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".dol_print_date($fichinterligne->datei,'dayhour',false,$outputlangs,true)." - ".$outputlangs->transnoentities("Duration")." : ".ConvertSecondToTime($fichinterligne->duration),1,$outputlangs->charset_output), 0, 1, 0); $tab_height+=4; - + $pdf->SetXY (10, $tab_top + 4 + $j * $height); - $pdf->writeHTMLCell(0, 3, $this->marge_gauche, $tab_top + 4 + $j * $height, - dol_htmlentitiesbr($outputlangs->convToOutputCharset($fichinterligne->desc),1), 0, 1, 0); + $desc = dol_htmlentitiesbr($fichinterligne->desc,1); + $pdf->writeHTMLCell(0, 3, $this->marge_gauche, $tab_top + 4 + $j * $height, $desc, 0, 1, 0); $tab_height+=dol_nboflines_bis($fichinterligne->desc,52,$outputlangs->charset_output)*4; $j++; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 7a3730cabe3..6440364db33 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -1851,7 +1851,7 @@ function migrate_commande_livraison($db,$langs,$conf) } /* - * Migration des d�tails commandes dans les d�tails livraisons + * Migration des details commandes dans les details livraisons */ function migrate_detail_livraison($db,$langs,$conf) {