nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: post account closing balance against pcv closing account (#43887)

Browse Source 
(cherry picked from commit 34295d0344)
This commit is contained in:
Nabin Hait
2024-10-29 16:53:11 +05:30
committed by Mergify
parent be6cd6adc3
commit becfd980b2
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
View File

@@ -354,7 +354,8 @@ class PeriodClosingVoucher(AccountsController):
def get_account_closing_balances(self): def get_account_closing_balances(self):
pl_closing_entries = self.get_closing_entries_for_pl_accounts() pl_closing_entries = self.get_closing_entries_for_pl_accounts()
bs_closing_entries = self.get_closing_entries_for_balance_sheet_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 return closing_entries
def get_closing_entries_for_pl_accounts(self): def get_closing_entries_for_pl_accounts(self):
@@ -404,6 +405,13 @@ class PeriodClosingVoucher(AccountsController):
self.update_default_dimensions(closing_entry, dimensions) self.update_default_dimensions(closing_entry, dimensions)
return closing_entry 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): def is_first_period_closing_voucher(self):
return not frappe.db.exists( return not frappe.db.exists(
"Period Closing Voucher", "Period Closing Voucher",
@@ -442,8 +450,7 @@ def process_gl_and_closing_entries(doc):
make_gl_entries(gl_entries, merge_entries=False) make_gl_entries(gl_entries, merge_entries=False)
closing_entries = doc.get_account_closing_balances() 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") frappe.db.set_value(doc.doctype, doc.name, "gle_processing_status", "Completed")
except Exception as e: except Exception as e:

3
erpnext/patches/v14_0/update_closing_balances.py
View File

@@ -27,8 +27,7 @@ def execute():
pcv_doc = frappe.get_doc("Period Closing Voucher", pcv.name) pcv_doc = frappe.get_doc("Period Closing Voucher", pcv.name)
pcv_doc.pl_accounts_reverse_gle = get_pcv_gl_entries(pcv, gle_fields) pcv_doc.pl_accounts_reverse_gle = get_pcv_gl_entries(pcv, gle_fields)
closing_entries = pcv_doc.get_account_closing_balances() 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) company_wise_order[pcv.company].append(pcv.period_end_date)
i += 1 i += 1