From f58a3726a796f5a43518ed8c08e2245579e1439a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 2 Dec 2015 11:13:20 +0530 Subject: [PATCH] Balance in chart of accounts in both company and account currency --- erpnext/accounts/page/accounts_browser/accounts_browser.js | 5 ++++- erpnext/accounts/page/accounts_browser/accounts_browser.py | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js index 6a2a8312f2..403c1cea02 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.js +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js @@ -166,7 +166,10 @@ erpnext.AccountsChart = Class.extend({ var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr"; if (me.ctype == 'Account' && node.data && node.data.balance!==undefined) { $('' - + format_currency(Math.abs(node.data.balance), node.data.account_currency) + + (node.data.balance_in_account_currency ? + (format_currency(Math.abs(node.data.balance_in_account_currency), + node.data.account_currency) + " / ") : "") + + format_currency(Math.abs(node.data.balance), node.data.company_currency) + " " + dr_or_cr + '').insertBefore(node.$ul); } diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.py b/erpnext/accounts/page/accounts_browser/accounts_browser.py index 210c4bf729..891a05de7b 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.py +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.py @@ -44,7 +44,12 @@ def get_children(): args['parent'], as_dict=1) if ctype == 'Account': + company_currency = frappe.db.get_value("Company", company, "default_currency") for each in acc: - each["balance"] = flt(get_balance_on(each.get("value"))) + each["company_currency"] = company_currency + each["balance"] = flt(get_balance_on(each.get("value"), in_account_currency=False)) + + if each.account_currency != company_currency: + each["balance_in_account_currency"] = flt(get_balance_on(each.get("value"))) return acc