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 99b42089501..6ffa6346702 100644 --- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py @@ -354,7 +354,8 @@ class PeriodClosingVoucher(AccountsController): def get_account_closing_balances(self): pl_closing_entries = self.get_closing_entries_for_pl_accounts() bs_closing_entries = self.get_closing_entries_for_balance_sheet_accounts() - closing_entries = pl_closing_entries + bs_closing_entries + closing_entries_for_closing_account = self.get_closing_entries_for_closing_account() + closing_entries = pl_closing_entries + bs_closing_entries + closing_entries_for_closing_account return closing_entries def get_closing_entries_for_pl_accounts(self): @@ -404,6 +405,13 @@ class PeriodClosingVoucher(AccountsController): self.update_default_dimensions(closing_entry, dimensions) return closing_entry + def get_closing_entries_for_closing_account(self): + closing_entries = copy.deepcopy(self.closing_account_gle) + for d in closing_entries: + d.period_closing_voucher = self.name + + return closing_entries + def is_first_period_closing_voucher(self): return not frappe.db.exists( "Period Closing Voucher", @@ -442,8 +450,7 @@ def process_gl_and_closing_entries(doc): make_gl_entries(gl_entries, merge_entries=False) closing_entries = doc.get_account_closing_balances() - if closing_entries: - make_closing_entries(closing_entries, doc.name, doc.company, doc.period_end_date) + make_closing_entries(closing_entries, doc.name, doc.company, doc.period_end_date) frappe.db.set_value(doc.doctype, doc.name, "gle_processing_status", "Completed") except Exception as e: diff --git a/erpnext/patches/v14_0/update_closing_balances.py b/erpnext/patches/v14_0/update_closing_balances.py index 73204b0d6c4..f216f209d4f 100644 --- a/erpnext/patches/v14_0/update_closing_balances.py +++ b/erpnext/patches/v14_0/update_closing_balances.py @@ -27,8 +27,7 @@ def execute(): pcv_doc = frappe.get_doc("Period Closing Voucher", pcv.name) pcv_doc.pl_accounts_reverse_gle = get_pcv_gl_entries(pcv, gle_fields) closing_entries = pcv_doc.get_account_closing_balances() - if closing_entries: - make_closing_entries(closing_entries, pcv.name, pcv.company, pcv.period_end_date) + make_closing_entries(closing_entries, pcv.name, pcv.company, pcv.period_end_date) company_wise_order[pcv.company].append(pcv.period_end_date) i += 1