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

refactor: cleanup and for better readability

Browse Source 
(cherry picked from commit 653ae84b3e)
This commit is contained in:
ruthra kumar
2025-10-17 15:40:53 +05:30
committed by Mergify
parent df4347a6cb
commit 347a7e3b1f
1 changed files with 89 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,6 +157,11 @@ def resume_pcv_processing(docname: str):
start_pcv_processing(docname) start_pcv_processing(docname)
def update_default_dimensions(dimension_fields, gl_entry, dimension_values):
for i, dimension in enumerate(dimension_fields):
gl_entry[dimension] = dimension_values[i]
def get_gle_for_pl_account(pcv, acc, balances, dimensions): def get_gle_for_pl_account(pcv, acc, balances, dimensions):
balance_in_account_currency = flt(balances.debit_in_account_currency) - flt( balance_in_account_currency = flt(balances.debit_in_account_currency) - flt(
balances.credit_in_account_currency balances.credit_in_account_currency
@@ -185,8 +190,7 @@ def get_gle_for_pl_account(pcv, acc, balances, dimensions):
} }
) )
# update dimensions # update dimensions
for i, dimension in enumerate(dimensions): update_default_dimensions(get_dimensions(), gl_entry, dimensions)
gl_entry[dimension] = dimensions[i]
return gl_entry return gl_entry
@@ -214,8 +218,7 @@ def get_gle_for_closing_account(pcv, dimension_balance, dimensions):
} }
) )
# update dimensions # update dimensions
for i, dimension in enumerate(dimensions): update_default_dimensions(get_dimensions(), gl_entry, dimensions)
gl_entry[dimension] = dimensions[i]
return gl_entry return gl_entry
@@ -259,32 +262,22 @@ def schedule_next_date(docname: str):
to_process[0].parentfield, to_process[0].parentfield,
) )
else: else:
# summarize, build and post GL
ppcvd = qb.DocType("Process Period Closing Voucher Detail") ppcvd = qb.DocType("Process Period Closing Voucher Detail")
total_no_of_dates = ( total_no_of_dates = (
qb.from_(ppcvd).select(Count(ppcvd.star)).where(ppcvd.parent.eq(docname)).run()[0][0] qb.from_(ppcvd).select(Count(ppcvd.star)).where(ppcvd.parent.eq(docname)).run()[0][0]
) )
# consider both normal and opening balance
completed = ( completed = (
qb.from_(ppcvd) qb.from_(ppcvd)
.select(Count(ppcvd.star)) .select(Count(ppcvd.star))
.where(ppcvd.parent.eq(docname) & ppcvd.status.eq("Completed")) .where(ppcvd.parent.eq(docname) & ppcvd.status.eq("Completed"))
.run()[0][0] .run()[0][0]
) )
# Ensure both normal and opening balances are processed for all dates
if total_no_of_dates == completed: if total_no_of_dates == completed:
summarize_and_post_ledger_entries(docname) summarize_and_post_ledger_entries(docname)
def summarize_and_post_ledger_entries(docname): def summarize_and_post_ledger_entries(docname):
# TODO: ensure all dates are processed
running = frappe.db.get_all(
"Process Period Closing Voucher Detail",
filters={"parent": docname, "status": "Running"},
fields=["processing_date"],
order_by="processing_date",
limit=1,
)
if not running:
# 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)
@@ -321,9 +314,7 @@ def summarize_and_post_ledger_entries(docname):
if balance_in_company_currency: if balance_in_company_currency:
pl_accounts_reverse_gle.append(get_gle_for_pl_account(pcv, acc, balances, dimensions)) pl_accounts_reverse_gle.append(get_gle_for_pl_account(pcv, acc, balances, dimensions))
closing_account_gle.append( closing_account_gle.append(get_gle_for_closing_account(pcv, account_balances["balances"], dimensions))
get_gle_for_closing_account(pcv, account_balances["balances"], dimensions)
)
gl_entries = pl_accounts_reverse_gle + closing_account_gle gl_entries = pl_accounts_reverse_gle + closing_account_gle
from erpnext.accounts.general_ledger import make_gl_entries from erpnext.accounts.general_ledger import make_gl_entries
@@ -400,8 +391,7 @@ def get_closing_entry(pcv, account, balances, dimensions):
} }
) )
# update dimensions # update dimensions
for i, dimension in enumerate(dimensions): update_default_dimensions(get_dimensions(), closing_entry, dimensions)
closing_entry[dimension] = dimensions[i]
return closing_entry return closing_entry