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

Fix: decimal support for italian language

Browse Source
This commit is contained in:
Laurent Destailleur 2008-10-20 02:18:54 +00:00
parent dad1e55637
commit 742b775f37
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/facture.class.php
View File

@ -1312,7 +1312,7 @@ class Facture extends CommonObject
$pu_ht=price2num($pu_ht); $pu_ht=price2num($pu_ht);
$pu_ttc=price2num($pu_ttc); $pu_ttc=price2num($pu_ttc);
$txtva=price2num($txtva); $txtva=price2num($txtva);
if ($price_base_type=='HT') if ($price_base_type=='HT')
{ {
$pu=$pu_ht; $pu=$pu_ht;

3
htdocs/lib/functions.lib.php
View File

@ -2100,7 +2100,8 @@ function price2num($amount,$rounding='',$alreadysqlnb=-1)
$dec=','; $thousand=' '; $dec=','; $thousand=' ';
if ($langs->trans("SeparatorDecimal") != "SeparatorDecimal") $dec=$langs->trans("SeparatorDecimal"); if ($langs->trans("SeparatorDecimal") != "SeparatorDecimal") $dec=$langs->trans("SeparatorDecimal");
if ($langs->trans("SeparatorThousand")!= "SeparatorThousand") $thousand=$langs->trans("SeparatorThousand"); if ($langs->trans("SeparatorThousand")!= "SeparatorThousand") $thousand=$langs->trans("SeparatorThousand");
//print 'x'.$dec.$thousand.'-';
if ($alreadysqlnb != 1) // If not a PHP number or unknown, we change format if ($alreadysqlnb != 1) // If not a PHP number or unknown, we change format
{ {
if ($thousand != ',' && $thousand != '.') $amount=str_replace(',','.',$amount); // To accept 2 notations for french users if ($thousand != ',' && $thousand != '.') $amount=str_replace(',','.',$amount); // To accept 2 notations for french users

7
htdocs/translate.class.php
View File

@ -265,8 +265,11 @@ class Translate {
//if ($this->charset_inputfile == 'UTF-8') $value=utf8_decode($value); //if ($this->charset_inputfile == 'UTF-8') $value=utf8_decode($value);
if ($this->charset_inputfile == 'ISO-8859-1') $value=utf8_encode($value); if ($this->charset_inputfile == 'ISO-8859-1') $value=utf8_encode($value);
//$this->setTransFromTab($key,$value); // We do not load Separator values for alternate files
$this->tab_translate[$key]=$value; if (! $alt || (! eregi('^Separator',$key)))
{
$this->tab_translate[$key]=$value;
}
if ($enablelangcacheinsession) $tabtranslatedomain[$key]=$value; // To save lang in session if ($enablelangcacheinsession) $tabtranslatedomain[$key]=$value; // To save lang in session
} }
} }