Skip to content

Commit

Permalink
fix: Trial Balance failing to ignore Finance Book
Browse files Browse the repository at this point in the history
(cherry picked from commit 48bde2d)
  • Loading branch information
sunhoww authored and mergify[bot] committed Jun 9, 2022
1 parent fb9b302 commit 00371f4
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions erpnext/accounts/report/trial_balance/trial_balance.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,10 @@ def get_rootwise_opening_balances(filters, report_type):
if filters.project:
additional_conditions += " and project = %(project)s"

if filters.finance_book:
fb_conditions = " AND finance_book = %(finance_book)s"
if filters.include_default_book_entries:
fb_conditions = (
" AND (finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)"
)

additional_conditions += fb_conditions
if filters.get("include_default_book_entries"):
additional_conditions += "AND (finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)"
else:
additional_conditions += "AND (finance_book in (%(finance_book)s, '') OR finance_book IS NULL)"

accounting_dimensions = get_accounting_dimensions(as_list=False)

Expand Down

0 comments on commit 00371f4

Please sign in to comment.