Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14253 from rohitwaghchaure/financial_report_issue

Browse Source 
[Fix] Data not displaying in financial reports
This commit is contained in:
rohitwaghchaure 2018-05-28 15:03:43 +05:30 committed by GitHub
commit 65684564c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,10 +365,10 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
company_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): if not filters.get('finance_book') or (filters.get('finance_book') == company_finance_book):
additional_conditions.append("finance_book in ('%s', '')" % additional_conditions.append("ifnull(finance_book, '') in ('%s', '')" %
frappe.db.escape(company_finance_book)) frappe.db.escape(company_finance_book))
elif filters.get("finance_book"): elif filters.get("finance_book"):
additional_conditions.append("finance_book = '%s' " % additional_conditions.append("ifnull(finance_book, '') = '%s' " %
frappe.db.escape(filters.get("finance_book"))) frappe.db.escape(filters.get("finance_book")))
return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else "" return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""

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

@ -380,10 +380,10 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
company_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): if not filters.get('finance_book') or (filters.get('finance_book') == company_finance_book):
additional_conditions.append("finance_book in ('%s', '')" % additional_conditions.append("ifnull(finance_book, '') in ('%s', '')" %
frappe.db.escape(company_finance_book)) frappe.db.escape(company_finance_book))
elif filters.get("finance_book"): elif filters.get("finance_book"):
additional_conditions.append("finance_book = '%s' " % additional_conditions.append("ifnull(finance_book, '') = '%s' " %
frappe.db.escape(filters.get("finance_book"))) frappe.db.escape(filters.get("finance_book")))
return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else "" return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""