Browse Source

Fix wrong precision shown in form (#3400)

version-14
Faris Ansari 8 years ago
committed by Nabin Hait
parent
commit
4f80f7633f
2 changed files with 4 additions and 2 deletions
  1. +1
    -1
      frappe/public/js/frappe/form/formatters.js
  2. +3
    -1
      frappe/public/js/frappe/misc/number_format.js

+ 1
- 1
frappe/public/js/frappe/form/formatters.js View File

@@ -54,7 +54,7 @@ frappe.form.formatters = {
var currency = frappe.meta.get_field_currency(docfield, doc); var currency = frappe.meta.get_field_currency(docfield, doc);
var precision = docfield.precision || cint(frappe.boot.sysdefaults.currency_precision) || 2; var precision = docfield.precision || cint(frappe.boot.sysdefaults.currency_precision) || 2;
return frappe.form.formatters._right((value==null || value==="") return frappe.form.formatters._right((value==null || value==="")
? "" : format_currency(value, currency, docfield.precision), options);
? "" : format_currency(value, currency, precision), options);
}, },
Check: function(value) { Check: function(value) {
if(value) { if(value) {


+ 3
- 1
frappe/public/js/frappe/misc/number_format.js View File

@@ -127,7 +127,9 @@ window.format_number = function(v, format, decimals){
function format_currency(v, currency, decimals) { function format_currency(v, currency, decimals) {
var format = get_number_format(currency); var format = get_number_format(currency);
var symbol = get_currency_symbol(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) if(symbol)
return symbol + " " + format_number(v, format, decimals); return symbol + " " + format_number(v, format, decimals);


Loading…
Cancel
Save