nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 13:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Ameya Shenoy
2018-05-22 09:18:38 +00:00
parent b44ea4c8dc 92640cc899
commit 1cc7500be9
15 changed files with 151 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,8 +87,8 @@ def set_account_currency(filters):
if gle_currency:
account_currency = gle_currency
else:
account_currency = None if filters.party_type in ["Employee", "Student", "Shareholder"] else \
frappe.db.get_value(filters.party_type, filters.party[0], "default_currency")
account_currency = (None if filters.party_type in ["Employee", "Student", "Shareholder", "Member"] else
frappe.db.get_value(filters.party_type, filters.party, "default_currency"))
filters["account_currency"] = account_currency or filters.company_currency