vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fixes to currency number formatting - will pick first from currency master and also made explict options for number formatting

Browse source
This commit is contained in:
Rushabh Mehta 2013-01-28 10:42:31 +05:30
parent c5fc055928
commit 8d6846d21c
3 changed files with 38 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
public/js/legacy/utils/datatype.js
View file

@ -29,7 +29,11 @@ function fmt_money(v, format){
}
function format_currency(v, currency) {
return get_currency_symbol(currency) + " " + format_number(v);
var format = get_number_format()
if(locals["Currency"][currency]
&& locals["Currency"][currency].number_format)
format = locals["Currency"][currency].number_format;
return get_currency_symbol(currency) + " " + format_number(v, format);
}
function get_currency_symbol(currency) {
@ -61,20 +65,13 @@ function get_number_format() {
return global_number_format;
}
var global_number_format_info = null
function get_number_format_info(format) {
if(!global_number_format_info) {
if(!format)
format = get_number_format();
var result = format.match(/[^\d\-\+#]/g);
var info = {
decimal_str: (result && result[result.length-1]) || '.', //treat the right most symbol as decimal
group_sep: (result && result[1] && result[0]) || ',' //treat the left most symbol as group separator
}
info.precision = format.split(info.decimal_str)[1].length;
global_number_format_info = info;
}
return global_number_format_info
var number_format_info = {
"#,###.##": {decimal_str:".", group_sep:",", precision:2},
"#.###,##": {decimal_str:",", group_sep:".", precision:2},
"# ###.##": {decimal_str:".", group_sep:" ", precision:2},
"#,##,###.##": {decimal_str:".", group_sep:",", precision:2},
"#.###": {decimal_str:"", group_sep:".", precision:0},
"#,###": {decimal_str:"", group_sep:",", precision:0},
}
// to title case

5
public/js/lib/number_formatter.js
View file

@ -16,7 +16,10 @@ window['format_number'] = function(v, m, decimals){
if (!m) {
m = get_number_format();
}
var info = get_number_format_info(m);
var info = number_format_info[m];
if(!info) {
info = {decimal_str:".", group_sep:",", precision:2};
}
if(isNaN(+v)) {
v=0;

37
webnotes/utils/__init__.py
View file

@ -373,23 +373,16 @@ def fmt_money(amount, precision=None):
curr = webnotes.conn.get_value('Control Panel', None,
'currency_format') or 'Millions'
number_format = webnotes.conn.get_default("number_format") or "#,###.##"
breaks = re.findall('[^#\d]+', number_format)
if len(breaks) < 2:
webnotes.msgprint(_("Incorrect Number Format:") + number_format,
raise_exception=True)
decimal_str = breaks[-1]
comma_str = breaks[0]
if not precision:
precision = len(number_format.split(decimal_str)[-1]) or 2
amount = '%.*f' % (precision, flt(amount))
decimal_str, comma_str, precision = get_number_format_info(number_format)
val = 2
if curr == 'Millions': val = 3
amount = '%.*f' % (precision, flt(amount))
if amount.find('.') == -1: temp = '00'
else: temp = amount.split('.')[1]
if amount.find('.') == -1:
decimals = ''
else:
decimals = amount.split('.')[1]
l = []
minus = ''
@ -409,9 +402,23 @@ def fmt_money(amount, precision=None):
if len(amount) > 0: l.insert(0,amount)
amount = comma_str.join(l) + decimal_str + temp
amount = comma_str.join(l) + decimal_str + decimals
amount = minus + amount
return amount
def get_number_format_info(format):
if format=="#.###":
return "", ".", 0
elif format=="#,###":
return "", ",", 0
elif format=="#,###.##" or format=="#,##,###.##":
return ".", ",", 2
elif format=="#.###,##":
return ",", ".", 2
elif format=="# ###.##":
return ".", " ", 2
else:
return ".", ",", 2
#
# convet currency to words