From e88b7fbcc4d73cd5e74b81d2c75216bf1e5398d9 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 1 Aug 2014 16:56:25 +0530 Subject: [PATCH] Journal Voucher Detail: show Account Balance as Dr or Cr. Fixes #675 --- .../doctype/journal_voucher/journal_voucher.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.js b/erpnext/accounts/doctype/journal_voucher/journal_voucher.js index ccd5acee5c3..9174873406d 100644 --- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.js +++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.js @@ -7,6 +7,7 @@ erpnext.accounts.JournalVoucher = frappe.ui.form.Controller.extend({ onload: function() { this.load_defaults(); this.setup_queries(); + this.setup_balance_formatter(); }, onload_post_render: function() { @@ -66,6 +67,18 @@ erpnext.accounts.JournalVoucher = frappe.ui.form.Controller.extend({ }); }, + setup_balance_formatter: function() { + var df = frappe.meta.get_docfield("Journal Voucher Detail", "balance", this.frm.doc.name); + df.formatter = function(value, df, options, doc) { + var currency = frappe.meta.get_field_currency(df, doc); + var dr_or_cr = value ? ('') : ""; + return "
" + + ((value==null || value==="") ? "" : format_currency(Math.abs(value), currency)) + + " " + dr_or_cr + + "
"; + } + }, + against_voucher: function(doc, cdt, cdn) { var d = frappe.get_doc(cdt, cdn); if (d.against_voucher && !flt(d.debit)) { @@ -108,7 +121,6 @@ erpnext.accounts.JournalVoucher = frappe.ui.form.Controller.extend({ } }); } - }); cur_frm.script_manager.make(erpnext.accounts.JournalVoucher);