From d85f339736ba4c3301cd889ed06e5392561823d5 Mon Sep 17 00:00:00 2001 From: tundebabzy Date: Thu, 18 Jan 2018 14:57:45 +0100 Subject: [PATCH] label report columns: - If presentation currency is available in filters, use it or - If company is available in filters, use it or - use default company currency --- .../report/general_ledger/general_ledger.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index eefb3d159f0..aed9f38b319 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import frappe +from erpnext import get_company_currency, get_default_company from frappe.utils import getdate, cstr, flt from frappe import _, _dict from erpnext.accounts.utils import get_account_currency @@ -77,9 +78,19 @@ def set_account_currency(filters): return filters def get_columns(filters): + if filters.get("presentation_currency"): + currency = filters["presentation_currency"] + else: + if filters.get("company"): + currency = get_company_currency(filters["company"]) + else: + company = get_default_company() + currency = get_company_currency(company) + columns = [ _("Posting Date") + ":Date:90", _("Account") + ":Link/Account:200", - _("Debit") + ":Float:100", _("Credit") + ":Float:100" + _("Debit ({0})".format(currency)) + ":Float:100", + _("Credit ({0})".format(currency)) + ":Float:100" ] if filters.get("show_in_account_currency"):