From 713fa67b96a98e1bee905fa7755f634819703533 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 5 May 2023 17:54:34 +0530 Subject: [PATCH 1/2] fix: account closing balance patch --- erpnext/patches.txt | 2 +- .../patches/v14_0/update_closing_balances.py | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 03c7b01856..129506d941 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -326,7 +326,7 @@ erpnext.patches.v13_0.update_docs_link erpnext.patches.v15_0.update_asset_value_for_manual_depr_entries erpnext.patches.v15_0.update_gpa_and_ndb_for_assdeprsch erpnext.patches.v14_0.create_accounting_dimensions_for_closing_balance -erpnext.patches.v14_0.update_closing_balances +erpnext.patches.v14_0.update_closing_balances #05-05-2023 execute:frappe.db.set_single_value("Accounts Settings", "merge_similar_account_heads", 0) # below migration patches should always run last erpnext.patches.v14_0.migrate_gl_to_payment_ledger diff --git a/erpnext/patches/v14_0/update_closing_balances.py b/erpnext/patches/v14_0/update_closing_balances.py index f47e730fd2..b4cdc9faf4 100644 --- a/erpnext/patches/v14_0/update_closing_balances.py +++ b/erpnext/patches/v14_0/update_closing_balances.py @@ -11,6 +11,8 @@ from erpnext.accounts.utils import get_fiscal_year def execute(): + frappe.db.truncate("Account Closing Balance") + company_wise_order = {} get_opening_entries = True for pcv in frappe.db.get_all( @@ -35,7 +37,20 @@ def execute(): entry["closing_date"] = pcv_doc.posting_date entry["period_closing_voucher"] = pcv_doc.name - closing_entries = pcv_doc.get_grouped_gl_entries(get_opening_entries=get_opening_entries) + closing_entries = frappe.db.get_all( + "GL Entry", + filters={ + "is_cancelled": 0, + "voucher_type": ["!=", "Period Closing Voucher"], + "posting_date": ["<=", pcv.posting_date], + }, + fields=["*"], + ) + + for entry in closing_entries: + entry["closing_date"] = pcv_doc.posting_date + entry["period_closing_voucher"] = pcv_doc.name + make_closing_entries(gl_entries + closing_entries, voucher_name=pcv.name) company_wise_order[pcv.company].append(pcv.posting_date) get_opening_entries = False From f5cc41e1824d86996a35d45fe4ac61abbaf45347 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 10 May 2023 16:41:47 +0530 Subject: [PATCH 2/2] fix: account closing balance patch --- erpnext/patches.txt | 2 +- erpnext/patches/v14_0/update_closing_balances.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 129506d941..e158df63ff 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -326,7 +326,7 @@ erpnext.patches.v13_0.update_docs_link erpnext.patches.v15_0.update_asset_value_for_manual_depr_entries erpnext.patches.v15_0.update_gpa_and_ndb_for_assdeprsch erpnext.patches.v14_0.create_accounting_dimensions_for_closing_balance -erpnext.patches.v14_0.update_closing_balances #05-05-2023 +erpnext.patches.v14_0.update_closing_balances #10-05-2023 execute:frappe.db.set_single_value("Accounts Settings", "merge_similar_account_heads", 0) # below migration patches should always run last erpnext.patches.v14_0.migrate_gl_to_payment_ledger diff --git a/erpnext/patches/v14_0/update_closing_balances.py b/erpnext/patches/v14_0/update_closing_balances.py index b4cdc9faf4..bb108ab827 100644 --- a/erpnext/patches/v14_0/update_closing_balances.py +++ b/erpnext/patches/v14_0/update_closing_balances.py @@ -41,7 +41,7 @@ def execute(): "GL Entry", filters={ "is_cancelled": 0, - "voucher_type": ["!=", "Period Closing Voucher"], + "voucher_no": ["!=", pcv.name], "posting_date": ["<=", pcv.posting_date], }, fields=["*"],