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

refactor: utility to consolidate results from all dates

Browse Source 
(cherry picked from commit 7406d83260)
This commit is contained in:
ruthra kumar
2025-10-17 19:55:09 +05:30
committed by Mergify
parent a624ae07f0
commit 2712310c0a
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py
View File

@@ -291,16 +291,21 @@ def make_dict_json_compliant(dimension_wise_balance) -> dict:
return converted_dict return converted_dict
def get_consolidated_gles(balances, report_type) -> list:
gl_entries = []
for x in balances:
if x.report_type == report_type:
closing_balances = [frappe._dict(gle) for gle in frappe.json.loads(x.closing_balance)]
gl_entries.extend(closing_balances)
return gl_entries
def summarize_and_post_ledger_entries(docname): def summarize_and_post_ledger_entries(docname):
# calculate balances for whole PCV period # calculate balances for whole PCV period
ppcv = frappe.get_doc("Process Period Closing Voucher", docname) ppcv = frappe.get_doc("Process Period Closing Voucher", docname)
# P&L Accounts # P&L Accounts
gl_entries = [] gl_entries = get_consolidated_gles(ppcv.normal_balances, "Profit and Loss")
for x in ppcv.normal_balances:
if x.report_type == "Profit and Loss":
closing_balances = [frappe._dict(gle) for gle in frappe.json.loads(x.closing_balance)]
gl_entries.extend(closing_balances)
# build dimension wise dictionary from all GLE's # build dimension wise dictionary from all GLE's
pl_dimension_wise_acc_balance = build_dimension_wise_balance_dict(gl_entries) pl_dimension_wise_acc_balance = build_dimension_wise_balance_dict(gl_entries)
@@ -331,11 +336,7 @@ def summarize_and_post_ledger_entries(docname):
make_gl_entries(gl_entries, merge_entries=False) make_gl_entries(gl_entries, merge_entries=False)
# Balance Sheet Accounts # Balance Sheet Accounts
gl_entries = [] gl_entries = get_consolidated_gles(ppcv.normal_balances + ppcv.z_opening_balances, "Balance Sheet")
for x in ppcv.normal_balances + ppcv.z_opening_balances:
if x.report_type == "Balance Sheet":
closing_balances = [frappe._dict(gle) for gle in frappe.json.loads(x.closing_balance)]
gl_entries.extend(closing_balances)
# build dimension wise dictionary from all GLE's # build dimension wise dictionary from all GLE's
bs_dimension_wise_acc_balance = build_dimension_wise_balance_dict(gl_entries) bs_dimension_wise_acc_balance = build_dimension_wise_balance_dict(gl_entries)