lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3159 from marcosgdf/develop

Browse Source 
FIX #2832: Fixed a problem with special characters in expense report PDF model
This commit is contained in:
Laurent Destailleur 2015-07-07 19:35:50 +02:00
commit 455a697f1a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/expensereport/class/expensereport.class.php
View File

@ -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 '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$status]).' </span>'.img_picto($langs->trans($this->statuts_short[$status]),$this->statuts_logo[$status]);
return '<span class="hideonsmartphone">'.$langs->transnoentities($this->statuts_short[$status]).' </span>'.img_picto($langs->transnoentities($this->statuts_short[$status]),$this->statuts_logo[$status]);
}