diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 5a015dc6e9..d25faa21e7 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -54,7 +54,7 @@ frappe.form.formatters = {
 		var currency = frappe.meta.get_field_currency(docfield, doc);
 		var precision = docfield.precision || cint(frappe.boot.sysdefaults.currency_precision) || 2;
 		return frappe.form.formatters._right((value==null || value==="")
-			? "" : format_currency(value, currency, docfield.precision), options);
+			? "" : format_currency(value, currency, precision), options);
 	},
 	Check: function(value) {
 		if(value) {
diff --git a/frappe/public/js/frappe/misc/number_format.js b/frappe/public/js/frappe/misc/number_format.js
index 873a78f82d..fa77b3bbfc 100644
--- a/frappe/public/js/frappe/misc/number_format.js
+++ b/frappe/public/js/frappe/misc/number_format.js
@@ -127,7 +127,9 @@ window.format_number = function(v, format, decimals){
 function format_currency(v, currency, decimals) {
 	var format = get_number_format(currency);
 	var symbol = get_currency_symbol(currency);
-	var decimals = frappe.boot.sysdefaults.currency_precision || null;
+	if(decimals === undefined) {
+		decimals = frappe.boot.sysdefaults.currency_precision || null;
+	}
 
 	if(symbol)
 		return symbol + " " + format_number(v, format, decimals);