nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

label report columns:

Browse Source 
- If presentation currency is available in filters, use it or
- If company is available in filters, use it or
- use default company currency
This commit is contained in:
tundebabzy
2018-01-18 14:57:45 +01:00
parent 36e7b6303e
commit d85f339736
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@@ -3,6 +3,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from erpnext import get_company_currency, get_default_company
from frappe.utils import getdate, cstr, flt from frappe.utils import getdate, cstr, flt
from frappe import _, _dict from frappe import _, _dict
from erpnext.accounts.utils import get_account_currency from erpnext.accounts.utils import get_account_currency
@@ -77,9 +78,19 @@ def set_account_currency(filters):
return filters return filters
def get_columns(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 = [ columns = [
_("Posting Date") + ":Date:90", _("Account") + ":Link/Account:200", _("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"): if filters.get("show_in_account_currency"):