nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-01 20:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: always exclude pcv entries except for closing account head

Browse Source 
(cherry picked from commit 0349e7a0b8)
This commit is contained in:
Smit Vora
2026-04-22 16:09:42 +05:30
committed by Mergify
parent 9f04fcc190
commit 446c111653
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/doctype/financial_report_template/financial_report_engine.py
View File

@@ -684,11 +684,18 @@ class FinancialQueryBuilder:
account_data.unaccumulate_values() account_data.unaccumulate_values()
def _apply_standard_filters(self, query, table, doctype: str = "GL Entry"): def _apply_standard_filters(self, query, table, doctype: str = "GL Entry"):
if self.filters.get("ignore_closing_entries"): # Exclude PCV-generated entries except those posted to a closing-account-head
if doctype == "GL Entry": # so BS retained earnings survive while P&L reversal entries are filtered out
query = query.where(table.voucher_type != "Period Closing Voucher") pcv = frappe.qb.DocType("Period Closing Voucher")
else: closing_heads = frappe.qb.from_(pcv).select(pcv.closing_account_head).where(pcv.docstatus == 1)
query = query.where(table.is_period_closing_voucher_entry == 0)
if doctype == "GL Entry":
is_pcv = table.voucher_type == "Period Closing Voucher"
else:
# Account Closing Balance
is_pcv = table.is_period_closing_voucher_entry == 1
query = query.where(~is_pcv | table.account.isin(closing_heads))
if self.filters.get("project"): if self.filters.get("project"):
projects = self.filters.get("project") projects = self.filters.get("project")