CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-03 04:11:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: check root type only when not none

Browse Source 
(cherry picked from commit cd98be6088)
This commit is contained in:
Gursheen Anand
2023-08-01 23:22:49 +05:30
committed by Mergify
parent dfd356a174
commit 46bb309b8a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -659,11 +659,12 @@ def set_gl_entries_by_account(
& (gle.posting_date <= to_date) & (gle.posting_date <= to_date)
& (account.lft >= root_lft) & (account.lft >= root_lft)
& (account.rgt <= root_rgt) & (account.rgt <= root_rgt)
& (account.root_type == root_type)
) )
.orderby(gle.account, gle.posting_date) .orderby(gle.account, gle.posting_date)
) )
if root_type:
query = query.where(account.root_type == root_type)
additional_conditions = get_additional_conditions(from_date, ignore_closing_entries, filters, d) additional_conditions = get_additional_conditions(from_date, ignore_closing_entries, filters, d)
if additional_conditions: if additional_conditions:
query = query.where(Criterion.all(additional_conditions)) query = query.where(Criterion.all(additional_conditions))