schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions 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

14
erpnext/accounts/report/financial_statements.py
View File

@@ -375,13 +375,15 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
additional_conditions.append("project = '%s'" % (frappe.db.escape(filters.get("project"))))
if filters.get("cost_center"):
additional_conditions.append(get_cost_center_cond(filters.get("cost_center")))
if filters.get("finance_book"):
additional_conditions.append("finance_book in ('%s', '')" %
frappe.db.escape(filters.get("finance_book")))
else:
additional_conditions.append("finance_book in ('%s', '')" %
frappe.db.escape(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):
additional_conditions.append("finance_book in ('%s', '')" %
frappe.db.escape(company_finance_book))
elif filters.get("finance_book"):
additional_conditions.append("finance_book = '%s' " %
frappe.db.escape(filters.get("finance_book")))
return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""