From 57bac6fff88c07f70303bf00a49596acb653ce21 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 17 Mar 2020 19:24:03 +0530 Subject: [PATCH] fix: Avoid unnecessary cint calls --- frappe/model/meta.py | 2 +- frappe/public/js/frappe/form/formatters.js | 4 ++-- frappe/public/js/frappe/model/meta.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/model/meta.py b/frappe/model/meta.py index d208797644..424856b5cf 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -549,7 +549,7 @@ def get_field_precision(df, doc=None, currency=None): elif df.fieldtype == "Currency": if df.precision and cint(df.precision) == 0: - precision = cint(df.precision) + precision = 0 else: precision = cint(frappe.db.get_default("currency_precision")) if not precision: diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index 5db4bbaced..ef6976e896 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -63,8 +63,8 @@ frappe.form.formatters = { var currency = frappe.meta.get_field_currency(docfield, doc); var precision; - if (docfield.precision === 0) { - precision = docfield.precision; + if (docfield.precision && cint(docfield.precision) === 0) { + precision = 0; } else { precision = docfield.precision || cint(frappe.boot.sysdefaults.currency_precision) || 2; } diff --git a/frappe/public/js/frappe/model/meta.js b/frappe/public/js/frappe/model/meta.js index c252e6821b..fc815c1d92 100644 --- a/frappe/public/js/frappe/model/meta.js +++ b/frappe/public/js/frappe/model/meta.js @@ -257,7 +257,7 @@ $.extend(frappe.meta, { precision = cint(df.precision); } else if(df && df.fieldtype === "Currency") { if (df.precision && cint(df.precision) === 0) { - precision = cint(df.precision); + precision = 0; } else { precision = cint(frappe.defaults.get_default("currency_precision")); if(!precision) {