From 711e06b537f2bf92963711e22f8e8951424bb041 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Thu, 3 Jul 2025 22:47:28 +0530 Subject: [PATCH] feat: Period-wise closing entries for TB (backport #39712) (#48386) feat: Period-wise closing entries for TB Co-authored-by: Deepesh Garg --- erpnext/accounts/report/trial_balance/trial_balance.js | 10 ++++++++-- erpnext/accounts/report/trial_balance/trial_balance.py | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/report/trial_balance/trial_balance.js b/erpnext/accounts/report/trial_balance/trial_balance.js index 7337fd477e7..6d131d089cc 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.js +++ b/erpnext/accounts/report/trial_balance/trial_balance.js @@ -79,8 +79,14 @@ frappe.require("assets/erpnext/js/financial_statements.js", function () { options: erpnext.get_presentation_currency_list(), }, { - fieldname: "with_period_closing_entry", - label: __("Period Closing Entry"), + fieldname: "with_period_closing_entry_for_opening", + label: __("With Period Closing Entry For Opening Balances"), + fieldtype: "Check", + default: 1, + }, + { + fieldname: "with_period_closing_entry_for_current_period", + label: __("Period Closing Entry For Current Period"), fieldtype: "Check", default: 1, }, diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py index 4ae314bdff7..f0075332256 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.py +++ b/erpnext/accounts/report/trial_balance/trial_balance.py @@ -120,7 +120,7 @@ def get_data(filters): max_rgt, filters, gl_entries_by_account, - ignore_closing_entries=not flt(filters.with_period_closing_entry), + ignore_closing_entries=not flt(filters.with_period_closing_entry_for_current_period), ignore_opening_entries=True, ) @@ -274,7 +274,7 @@ def get_opening_balance( ): opening_balance = opening_balance.where(closing_balance.posting_date >= filters.year_start_date) - if not flt(filters.with_period_closing_entry): + if not flt(filters.with_period_closing_entry_for_opening): if doctype == "Account Closing Balance": opening_balance = opening_balance.where(closing_balance.is_period_closing_voucher_entry == 0) else: