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

Fix: Plantage apres choix dollar australien

Browse Source
This commit is contained in:
Laurent Destailleur 2008-02-02 18:11:00 +00:00
parent 0ae23441df
commit ec43df0139
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/admin/company.php
View File

@ -746,7 +746,7 @@ llxFooter('$Date$ - $Revision$');
*/ */
function currency_name($code_iso,$withcode=0) function currency_name($code_iso,$withcode=0)
{ {
global $langs; global $langs,$db;
// Si il existe une traduction, on peut renvoyer de suite le libellé // Si il existe une traduction, on peut renvoyer de suite le libellé
if ($langs->trans("Currency".$code_iso)!="Currency".$code_iso) if ($langs->trans("Currency".$code_iso)!="Currency".$code_iso)
@ -754,19 +754,20 @@ function currency_name($code_iso,$withcode=0)
return $langs->trans("Currency".$code_iso); return $langs->trans("Currency".$code_iso);
} }
// Si pas de traduction, on consulte libellé par défaut en table // Si pas de traduction, on consulte le libellé par défaut en table
$sql = "SELECT label FROM ".MAIN_DB_PREFIX."c_currencies"; $sql = "SELECT label FROM ".MAIN_DB_PREFIX."c_currencies";
$sql.= " WHERE code_iso='$code_iso';"; $sql.= " WHERE code_iso='".$code_iso."'";
if ($this->db->query($sql)) $resql=$db->query($sql);
if ($resql)
{ {
$num = $this->db->num_rows(); $num = $db->num_rows($resql);
if ($num) if ($num)
{ {
$obj = $this->db->fetch_object(); $obj = $db->fetch_object($resql);
$label=($obj->label!='-'?$obj->label:''); $label=($obj->label!='-'?$obj->label:'');
if ($withcode) return $label==$code_iso?"$code_iso":"$code_iso - $label"; if ($withcode) return ($label==$code_iso)?"$code_iso":"$code_iso - $label";
else return $label; else return $label;
} }
else else