From 479ac0273f6c1734f3efd5176dc73f91ff0096ac Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 1 Mar 2013 13:21:29 +0530 Subject: [PATCH 1/2] datatype validation in voucher import tool --- core/page/data_import_tool/data_import_tool.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/page/data_import_tool/data_import_tool.py b/core/page/data_import_tool/data_import_tool.py index ee5493b4db..879f4b40c0 100644 --- a/core/page/data_import_tool/data_import_tool.py +++ b/core/page/data_import_tool/data_import_tool.py @@ -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] From 0e138090d814fa4959c73e192a7e6b561ff3455d Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 1 Mar 2013 13:42:56 +0530 Subject: [PATCH 2/2] fix in flt and number format when number format is not one of the predefined ones --- public/js/legacy/utils/datatype.js | 2 +- public/js/wn/misc/number_format.js | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/public/js/legacy/utils/datatype.js b/public/js/legacy/utils/datatype.js index 718f79efa6..7f62f59495 100644 --- a/public/js/legacy/utils/datatype.js +++ b/public/js/legacy/utils/datatype.js @@ -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 . diff --git a/public/js/wn/misc/number_format.js b/public/js/wn/misc/number_format.js index 4d9e408659..d8fa2ce7b6 100644 --- a/public/js/wn/misc/number_format.js +++ b/public/js/wn/misc/number_format.js @@ -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; } \ No newline at end of file