From 05f9df6c10bb85ab3973893e39b953ef67579015 Mon Sep 17 00:00:00 2001 From: Hendy Irawan Date: Tue, 4 May 2021 13:32:16 +0000 Subject: [PATCH] fix(accounts): Get balance for Profit and Loss accounts, only including valid transactions (not cancelled) Fixed #25572 Period Closing Voucher incorrect journal entry amount for Income/Expenses Accounts containing canceled transactions. --- .../doctype/period_closing_voucher/period_closing_voucher.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py index a74fa062b6a9..fdb4f6fc7167 100644 --- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py @@ -102,14 +102,14 @@ def make_gl_entries(self): make_gl_entries(gl_entries) def get_pl_balances(self, dimension_fields): - """Get balance for pl accounts""" + """Get balance for Profit and Loss accounts, only including valid transactions (not cancelled)""" return frappe.db.sql(""" select t1.account, t2.account_currency, {dimension_fields}, sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) as balance_in_account_currency, sum(t1.debit) - sum(t1.credit) as balance_in_company_currency from `tabGL Entry` t1, `tabAccount` t2 - where t1.account = t2.name and t2.report_type = 'Profit and Loss' + where t1.is_cancelled = 0 and t1.account = t2.name and t2.report_type = 'Profit and Loss' and t2.docstatus < 2 and t2.company = %s and t1.posting_date between %s and %s group by t1.account, {dimension_fields}