From bd7ed3dc3dd2aaed9c7959519d486a0f83e18ded Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 9 Feb 2017 12:07:41 +0530 Subject: [PATCH 1/2] [Fix] Strip currency symbol issue for EGP currency --- frappe/public/js/frappe/misc/number_format.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/misc/number_format.js b/frappe/public/js/frappe/misc/number_format.js index dc8754b0fd..ba16a6b56e 100644 --- a/frappe/public/js/frappe/misc/number_format.js +++ b/frappe/public/js/frappe/misc/number_format.js @@ -12,7 +12,8 @@ function flt(v, decimals, number_format) { // strip currency symbol if exists if(v.indexOf(" ")!=-1) { // using slice(1).join(" ") because space could also be a group separator - v = isNaN(parseFloat(v.split(" ")[0])) ? v.split(" ").slice(1).join(" ") : v; + last_index = v.split(" ").length - 1; + v = isNaN(parseFloat(v.split(" ")[0])) ? v.split(" ").slice(last_index).join(" ") : v; } v = strip_number_groups(v, number_format); From 76a9b3665d8f840e9f2bc794a8346cf77e38933b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 9 Feb 2017 12:54:37 +0530 Subject: [PATCH 2/2] Update number_format.js --- frappe/public/js/frappe/misc/number_format.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/misc/number_format.js b/frappe/public/js/frappe/misc/number_format.js index ba16a6b56e..f9fda64320 100644 --- a/frappe/public/js/frappe/misc/number_format.js +++ b/frappe/public/js/frappe/misc/number_format.js @@ -12,8 +12,8 @@ function flt(v, decimals, number_format) { // strip currency symbol if exists if(v.indexOf(" ")!=-1) { // using slice(1).join(" ") because space could also be a group separator - last_index = v.split(" ").length - 1; - v = isNaN(parseFloat(v.split(" ")[0])) ? v.split(" ").slice(last_index).join(" ") : v; + parts = v.split(" "); + v = isNaN(parseFloat(parts[0])) ? parts.slice(parts.length - 1).join(" ") : v; } v = strip_number_groups(v, number_format);