From b7809c788a58a5a2d3dddd37c02644eeefae0e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 7 Jul 2015 12:27:36 +0200 Subject: [PATCH] FIX #2832: Fixed a problem with special characters in expense report PDF model --- htdocs/expensereport/class/expensereport.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index e36040743ad..04f5628a224 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -417,22 +417,22 @@ class ExpenseReport extends CommonObject global $langs; if ($mode == 0) - return $langs->trans($this->statuts[$status]); + return $langs->transnoentities($this->statuts[$status]); if ($mode == 1) - return $langs->trans($this->statuts_short[$status]); + return $langs->transnoentities($this->statuts_short[$status]); if ($mode == 2) - return img_picto($langs->trans($this->statuts_short[$status]), $this->statuts_logo[$status]).' '.$langs->trans($this->statuts_short[$status]); + return img_picto($langs->transnoentities($this->statuts_short[$status]), $this->statuts_logo[$status]).' '.$langs->transnoentities($this->statuts_short[$status]); if ($mode == 3) - return img_picto($langs->trans($this->statuts_short[$status]), $this->statuts_logo[$status]); + return img_picto($langs->transnoentities($this->statuts_short[$status]), $this->statuts_logo[$status]); if ($mode == 4) - return img_picto($langs->trans($this->statuts_short[$status]),$this->statuts_logo[$status]).' '.$langs->trans($this->statuts[$status]); + return img_picto($langs->transnoentities($this->statuts_short[$status]),$this->statuts_logo[$status]).' '.$langs->transnoentities($this->statuts[$status]); if ($mode == 5) - return ''.$langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),$this->statuts_logo[$status]); + return ''.$langs->transnoentities($this->statuts_short[$status]).' '.img_picto($langs->transnoentities($this->statuts_short[$status]),$this->statuts_logo[$status]); }