|
@@ -4350,7 +4350,7 @@ function vatrate($rate, $addpercent=false, $info_bits=0, $usestarfornpr=0)
|
|
|
* @param string $currency_code To add currency symbol (''=add nothing, 'auto'=Use default currency, 'XXX'=add currency symbols for XXX currency)
|
|
|
* @return string Chaine avec montant formate
|
|
|
*
|
|
|
- * @see price2num Revert function of price
|
|
|
+ * @see price2num() Revert function of price
|
|
|
*/
|
|
|
function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerounding=-1, $currency_code='')
|
|
|
{
|
|
@@ -4413,7 +4413,11 @@ function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou
|
|
|
if ($currency_code == 'auto') $currency_code=$conf->currency;
|
|
|
|
|
|
$listofcurrenciesbefore=array('USD','GBP','AUD','MXN','PEN','CNY');
|
|
|
- if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
|
|
|
+ $listoflanguagesbefore=array('nl_NL');
|
|
|
+ if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore))
|
|
|
+ {
|
|
|
+ $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
|
|
|
+ }
|
|
|
else
|
|
|
{
|
|
|
$tmpcur=$outlangs->getCurrencySymbol($currency_code);
|