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

Merge branch 'master' into edge

Browse source
This commit is contained in:
Anand Doshi 2013-03-01 13:45:29 +05:30
commit 489cf52887
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/page/data_import_tool/data_import_tool.py
View file

@ -129,7 +129,7 @@ def get_template():
webnotes.response['doctype'] = doctype
def getdocfield(fieldname):
"""get docfield from doclist of doctype"""
"""get docfield from doclist of doctype"""
l = [d for d in doctype_dl if d.doctype=='DocField' and d.fieldname==fieldname]
return l and l[0] or None
@ -256,6 +256,10 @@ def check_record(d, parenttype):
if parenttype and not d.get('parent'):
raise Exception, "parent is required."
global doctype_dl
if not doctype_dl:
doctype_dl = webnotes.model.doctype.get(d.doctype)
for key in d:
docfield = getdocfield(key)
val = d[key]

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

@ -107,7 +107,7 @@ function flt(v, decimals) {
}
// strip groups (,)
if(wn.number_format_info[get_number_format()].group_sep==".") {
if(get_number_format_info(get_number_format()).group_sep==".") {
v = v.replace(/\./g,'');
// sanitize decimal separator to .

14
public/js/wn/misc/number_format.js
View file

@ -12,14 +12,10 @@ wn.number_format_info = {
}
window.format_number = function(v, format, decimals){
if (!format) {
format = get_number_format();
}
var info = wn.number_format_info[format];
if(!info) {
info = {decimal_str:".", group_sep:",", precision:2};
}
info = get_number_format_info(format);
if(isNaN(+v) || v==null) {
v=0;
@ -105,4 +101,12 @@ function get_number_format() {
|| "#,###.##";
}
return global_number_format;
}
function get_number_format_info(format) {
var info = wn.number_format_info[format];
if(!info) {
info = {decimal_str:".", group_sep:",", precision:2};
}
return info;
}