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

Merge pull request #36710 from ruthra-kumar/fix_broken_consolidated_financial_report

Browse Source 
fix: broken consolidated report due to finance book filter
This commit is contained in:
ruthra kumar 2023-08-18 14:54:03 +05:30 committed by GitHub
commit a34cb8a8dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats 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

@ -744,13 +744,18 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters, d):
if from_date: if from_date:
additional_conditions.append(gle.posting_date >= from_date) additional_conditions.append(gle.posting_date >= from_date)
finance_book = filters.get("finance_book") finance_books = []
company_fb = frappe.get_cached_value("Company", d.name, "default_finance_book") finance_books.append("")
if filter_fb := filters.get("finance_book"):
finance_books.append(filter_fb)
if filters.get("include_default_book_entries"): 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: 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 return additional_conditions