Merge pull request #833 from djfm/development

[*] LO : set correct currency format for CHF
This commit is contained in:
Gregory Roussac
2013-10-11 01:58:10 -07:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -526,9 +526,9 @@ class ToolsCore
case 4:
$ret = number_format($price, $c_decimals, '.', ',').$blank.$c_char;
break;
/* 0'000.00 X Added for the switzerland currency */
/* X 0'000.00 Added for the switzerland currency */
case 5:
$ret = number_format($price, $c_decimals, '.', "'").$blank.$c_char;
$ret = $c_char.$blank.number_format($price, $c_decimals, '.', "'");
break;
}
if ($is_negative)
@@ -151,7 +151,7 @@ class AdminCurrenciesControllerCore extends AdminController
array('key' => 2, 'name' => '0 000,00X ('.$this->l('as with Euros').')'),
array('key' => 3, 'name' => 'X0.000,00'),
array('key' => 4, 'name' => '0,000.00X'),
array('key' => 5, 'name' => '0\'000.00X') // Added for the switzerland currency
array('key' => 5, 'name' => 'X0\'000.00') // Added for the switzerland currency
),
'name' => 'name',
'id' => 'key'