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

Changed condition of finance book in reports

Browse Source
This commit is contained in:
Rohit Waghchaure
2018-05-18 09:10:07 +05:30
parent 7d6cad2c67
commit f61e94e162
7 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,11 +167,12 @@ def get_conditions(filters):
if filters.get("project"):
conditions.append("project=%(project)s")
if filters.get("finance_book"):
conditions.append("ifnull(finance_book, '') in (%(finance_book)s, '')")
else:
filters['finance_book'] = erpnext.get_default_finance_book(filters.get("company"))
company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
if not filters.get("finance_book") or (filters.get("finance_book") == company_finance_book):
filters['finance_book'] = company_finance_book
conditions.append("ifnull(finance_book, '') in (%(finance_book)s, '')")
elif filters.get("finance_book"):
conditions.append("ifnull(finance_book, '') = %(finance_book)s")
from frappe.desk.reportview import build_match_conditions
match_conditions = build_match_conditions("GL Entry")