From a7cf1df5a975054e482d5af99c21e60cffd06bed Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 12 Aug 2013 11:58:01 +0530 Subject: [PATCH] [minor] [fix] precision for float fields on server-side --- core/doctype/customize_form/customize_form.js | 2 +- public/js/wn/misc/number_format.js | 6 +++--- webnotes/model/controller.py | 7 +++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/doctype/customize_form/customize_form.js b/core/doctype/customize_form/customize_form.js index c899630206..7ef6d44c13 100644 --- a/core/doctype/customize_form/customize_form.js +++ b/core/doctype/customize_form/customize_form.js @@ -26,7 +26,7 @@ $(cur_frm.wrapper).on("grid-row-render", function(e, grid_row) { } }) -cur_frm.cscript.doc_type = function(doc, dt, dn) { +cur_frm.cscript.doc_type = function() { return cur_frm.call({ method: "get", doc: cur_frm.doc, diff --git a/public/js/wn/misc/number_format.js b/public/js/wn/misc/number_format.js index 68ba44e42b..cd22111dd0 100644 --- a/public/js/wn/misc/number_format.js +++ b/public/js/wn/misc/number_format.js @@ -116,14 +116,14 @@ window.format_number = function(v, format, decimals){ return (is_negative ? "-" : "") + part[0] + part[1]; }; -function format_currency(v, currency) { +function format_currency(v, currency, decimals) { var format = get_number_format(currency); var symbol = get_currency_symbol(currency); if(symbol) - return symbol + " " + format_number(v, format); + return symbol + " " + format_number(v, format, decimals); else - return format_number(v, format); + return format_number(v, format, decimals); } function get_currency_symbol(currency) { diff --git a/webnotes/model/controller.py b/webnotes/model/controller.py index 45ccf83482..7e8bd4799b 100644 --- a/webnotes/model/controller.py +++ b/webnotes/model/controller.py @@ -101,7 +101,10 @@ class DocListController(object): if df.fieldtype == "Currency" and df.options and not self._precision.options.get(df.options): self._precision.options[df.options] = get_field_precision(df, self.doc) - self._precision[parentfield or "main"][fieldname] = cint(self._precision.options.get(df.options)) or \ - self._precision.default + if df.fieldtype == "Currency": + self._precision[parentfield or "main"][fieldname] = cint(self._precision.options.get(df.options)) or \ + self._precision.default + elif df.fieldtype == "Float": + self._precision[parentfield or "main"][fieldname] = self._precision.default return self._precision[parentfield or "main"][fieldname] \ No newline at end of file