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

fix: Patch for reposting account closing balance (backport #43905) (#43909)

Browse Source 
fix: Patch for reposting account closing balance (#43905)

(cherry picked from commit 3a0d27b393)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
This commit is contained in:
mergify[bot]
2024-10-29 23:07:58 +05:30
committed by GitHub
parent 50db0aca61
commit c2eb771c4d
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches.txt
View File

@@ -315,7 +315,7 @@ erpnext.patches.v15_0.update_asset_value_for_manual_depr_entries
erpnext.patches.v15_0.update_gpa_and_ndb_for_assdeprsch erpnext.patches.v15_0.update_gpa_and_ndb_for_assdeprsch
erpnext.patches.v14_0.create_accounting_dimensions_for_closing_balance erpnext.patches.v14_0.create_accounting_dimensions_for_closing_balance
erpnext.patches.v14_0.set_period_start_end_date_in_pcv erpnext.patches.v14_0.set_period_start_end_date_in_pcv
erpnext.patches.v14_0.update_closing_balances #14-07-2023 erpnext.patches.v14_0.update_closing_balances #29-10-2024
execute:frappe.db.set_single_value("Accounts Settings", "merge_similar_account_heads", 0) execute:frappe.db.set_single_value("Accounts Settings", "merge_similar_account_heads", 0)
erpnext.patches.v14_0.update_reference_type_in_journal_entry_accounts erpnext.patches.v14_0.update_reference_type_in_journal_entry_accounts
erpnext.patches.v14_0.update_subscription_details erpnext.patches.v14_0.update_subscription_details

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

@@ -25,7 +25,8 @@ def execute():
company_wise_order.setdefault(pcv.company, []) company_wise_order.setdefault(pcv.company, [])
if pcv.period_end_date not in company_wise_order[pcv.company]: if pcv.period_end_date not in company_wise_order[pcv.company]:
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_for_pl_accounts(pcv, gle_fields)
pcv_doc.closing_account_gle = get_pcv_gl_entries_for_closing_accounts(pcv, gle_fields)
closing_entries = pcv_doc.get_account_closing_balances() closing_entries = pcv_doc.get_account_closing_balances()
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)
@@ -38,6 +39,7 @@ def get_gle_fields():
accounting_dimension_fields = get_accounting_dimensions() accounting_dimension_fields = get_accounting_dimensions()
gle_fields = [ gle_fields = [
"name", "name",
"company",
"posting_date", "posting_date",
"account", "account",
"account_currency", "account_currency",
@@ -61,14 +63,27 @@ def get_period_closing_vouchers(company):
) )
def get_pcv_gl_entries(pcv, gle_fields): def get_pcv_gl_entries_for_pl_accounts(pcv, gle_fields):
return get_gl_entries(pcv, gle_fields, {"account": ["!=", pcv.closing_account_head]})
def get_pcv_gl_entries_for_closing_accounts(pcv, gle_fields):
return get_gl_entries(pcv, gle_fields, {"account": pcv.closing_account_head})
def get_gl_entries(pcv, gle_fields, accounts_filter=None):
filters = {"voucher_no": pcv.name, "is_cancelled": 0}
if accounts_filter:
filters.update(accounts_filter)
gl_entries = frappe.db.get_all( gl_entries = frappe.db.get_all(
"GL Entry", "GL Entry",
filters={"voucher_no": pcv.name, "account": ["!=", pcv.closing_account_head], "is_cancelled": 0}, filters=filters,
fields=gle_fields, fields=gle_fields,
) )
for entry in gl_entries: for entry in gl_entries:
entry["is_period_closing_voucher_entry"] = 1 entry["is_period_closing_voucher_entry"] = 1
entry["closing_date"] = pcv.period_end_date entry["closing_date"] = pcv.period_end_date
entry["period_closing_voucher"] = pcv.name entry["period_closing_voucher"] = pcv.name
return gl_entries return gl_entries