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

Merge pull request #36711 from frappe/mergify/bp/version-14-hotfix/pr-36710

Browse Source 
fix: broken consolidated report due to finance book filter (#36710)
This commit is contained in:
Deepesh Garg
2023-08-19 10:25:11 +05:30
committed by GitHub
parent 620b21fec5 5bd2a0923f
commit 933d4bfceb
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -749,13 +749,18 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters, d):
if from_date:
additional_conditions.append(gle.posting_date >= from_date)
finance_book = filters.get("finance_book")
company_fb = frappe.get_cached_value("Company", d.name, "default_finance_book")
finance_books = []
finance_books.append("")
if filter_fb := filters.get("finance_book"):
finance_books.append(filter_fb)
if filters.get("include_default_book_entries"):
additional_conditions.append((gle.finance_book.isin([finance_book, company_fb, "", None])))
if company_fb := frappe.get_cached_value("Company", d.name, "default_finance_book"):
finance_books.append(company_fb)
additional_conditions.append((gle.finance_book.isin(finance_books)) | gle.finance_book.isnull())
else:
additional_conditions.append((gle.finance_book.isin([finance_book, "", None])))
additional_conditions.append((gle.finance_book.isin(finance_books)) | gle.finance_book.isnull())
return additional_conditions