Skip to content

Commit

Permalink
fix: broken consolidated report due to finance book filter
Browse files Browse the repository at this point in the history
(cherry picked from commit 96847db)
  • Loading branch information
ruthra-kumar authored and mergify[bot] committed Aug 18, 2023
1 parent a623469 commit 5bd2a09
Showing 1 changed file with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 5bd2a09

Please sign in to comment.