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

fix: Trial Balance failing to ignore Finance Book

Browse Source
This commit is contained in:
Sun Howwrongbum 2022-06-01 20:20:16 +05:30 committed by GitHub
parent 3974fbbb6e
commit 48bde2de2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/report/trial_balance/trial_balance.py
View File

@ -160,14 +160,10 @@ def get_rootwise_opening_balances(filters, report_type):
if filters.project: if filters.project:
additional_conditions += " and project = %(project)s" additional_conditions += " and project = %(project)s"
if filters.finance_book: if filters.get("include_default_book_entries"):
fb_conditions = " AND finance_book = %(finance_book)s" additional_conditions += "AND (finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)"
if filters.include_default_book_entries: else:
fb_conditions = ( additional_conditions += "AND (finance_book in (%(finance_book)s, '') OR finance_book IS NULL)"
" AND (finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)"
)
additional_conditions += fb_conditions
accounting_dimensions = get_accounting_dimensions(as_list=False) accounting_dimensions = get_accounting_dimensions(as_list=False)