From 6b918c240899ac0c561dc0a0671b635a9c3b1840 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 11 Sep 2018 18:53:11 +0530 Subject: [PATCH] fix(Int control): Skip evaluating numbers with commans --- frappe/public/js/frappe/form/controls/int.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/int.js b/frappe/public/js/frappe/form/controls/int.js index c887afe6e0..ead48a996c 100644 --- a/frappe/public/js/frappe/form/controls/int.js +++ b/frappe/public/js/frappe/form/controls/int.js @@ -20,7 +20,11 @@ frappe.ui.form.ControlInt = frappe.ui.form.ControlData.extend({ }); }, eval_expression: function(value) { - if (typeof value==='string' && value.match(/^[0-9+-/* ]+$/)) { + if (typeof value==='string' + && value.match(/^[0-9+-/* ]+$/) + // strings with commas are evaluated incorrectly + // for e.g 47,186.00 -> 186 + && !value.includes(',')) { try { return eval(value); } catch (e) {