refactor: cleanup and for better readability

(cherry picked from commit 653ae84b3e)

erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py

@@ -157,6 +157,11 @@ def resume_pcv_processing(docname: str):
 		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):
 	balance_in_account_currency = flt(balances.debit_in_account_currency) - flt(
 		balances.credit_in_account_currency
@@ -185,8 +190,7 @@ def get_gle_for_pl_account(pcv, acc, balances, 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
 
 
@@ -214,8 +218,7 @@ def get_gle_for_closing_account(pcv, dimension_balance, 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
 
 
@@ -259,129 +262,117 @@ def schedule_next_date(docname: str):
 					to_process[0].parentfield,
 				)
 	else:
-		# summarize, build and post GL
 		ppcvd = qb.DocType("Process Period Closing Voucher Detail")
 		total_no_of_dates = (
 			qb.from_(ppcvd).select(Count(ppcvd.star)).where(ppcvd.parent.eq(docname)).run()[0][0]
 		)
-		# consider both normal and opening balance
 		completed = (
 			qb.from_(ppcvd)
 			.select(Count(ppcvd.star))
 			.where(ppcvd.parent.eq(docname) & ppcvd.status.eq("Completed"))
 			.run()[0][0]
 		)
+		# Ensure both normal and opening balances are processed for all dates
 		if total_no_of_dates == completed:
 			summarize_and_post_ledger_entries(docname)
 
 
 def summarize_and_post_ledger_entries(docname):
-	# TODO: ensure all dates are processed
+	# calculate balances for whole PCV period
-	running = frappe.db.get_all(
+	ppcv = frappe.get_doc("Process Period Closing Voucher", docname)
-		"Process Period Closing Voucher Detail",
+
-		filters={"parent": docname, "status": "Running"},
+	# P&L Accounts
-		fields=["processing_date"],
+	gl_entries = []
-		order_by="processing_date",
+	for x in ppcv.normal_balances:
-		limit=1,
+		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
+	pl_dimension_wise_acc_balance = build_dimension_wise_balance_dict(gl_entries)
+
+	# convert tuple key to str to make it json compliant
+	json_dict = {}
+	for k, v in pl_dimension_wise_acc_balance.items():
+		str_key = [str(x) for x in k]
+		str_key = ",".join(str_key)
+		json_dict[str_key] = v
+
+	# save
+	frappe.db.set_value(
+		"Process Period Closing Voucher", docname, "p_l_closing_balance", frappe.json.dumps(json_dict)
 	)
-	if not running:
-		# calculate balances for whole PCV period
-		ppcv = frappe.get_doc("Process Period Closing Voucher", docname)
 
-		# P&L Accounts
+	# build gl map
-		gl_entries = []
+	pcv = frappe.get_doc("Period Closing Voucher", ppcv.parent_pcv)
-		for x in ppcv.normal_balances:
+	pl_accounts_reverse_gle = []
-			if x.report_type == "Profit and Loss":
+	closing_account_gle = []
-				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
+	for dimensions, account_balances in pl_dimension_wise_acc_balance.items():
-		pl_dimension_wise_acc_balance = build_dimension_wise_balance_dict(gl_entries)
+		for acc, balances in account_balances.items():
+			balance_in_company_currency = flt(balances.debit) - flt(balances.credit)
+			if balance_in_company_currency:
+				pl_accounts_reverse_gle.append(get_gle_for_pl_account(pcv, acc, balances, dimensions))
 
-		# convert tuple key to str to make it json compliant
+		closing_account_gle.append(get_gle_for_closing_account(pcv, account_balances["balances"], dimensions))
-		json_dict = {}
-		for k, v in pl_dimension_wise_acc_balance.items():
-			str_key = [str(x) for x in k]
-			str_key = ",".join(str_key)
-			json_dict[str_key] = v
 
-		# save
+	gl_entries = pl_accounts_reverse_gle + closing_account_gle
-		frappe.db.set_value(
+	from erpnext.accounts.general_ledger import make_gl_entries
-			"Process Period Closing Voucher", docname, "p_l_closing_balance", frappe.json.dumps(json_dict)
-		)
 
-		# build gl map
+	if gl_entries:
-		pcv = frappe.get_doc("Period Closing Voucher", ppcv.parent_pcv)
+		make_gl_entries(gl_entries, merge_entries=False)
-		pl_accounts_reverse_gle = []
-		closing_account_gle = []
 
-		for dimensions, account_balances in pl_dimension_wise_acc_balance.items():
+	# Balance Sheet Accounts
-			for acc, balances in account_balances.items():
+	gl_entries = []
-				balance_in_company_currency = flt(balances.debit) - flt(balances.credit)
+	for x in ppcv.normal_balances + ppcv.z_opening_balances:
-				if balance_in_company_currency:
+		if x.report_type == "Balance Sheet":
-					pl_accounts_reverse_gle.append(get_gle_for_pl_account(pcv, acc, balances, dimensions))
+			closing_balances = [frappe._dict(gle) for gle in frappe.json.loads(x.closing_balance)]
+			gl_entries.extend(closing_balances)
 
-			closing_account_gle.append(
+	# build dimension wise dictionary from all GLE's
-				get_gle_for_closing_account(pcv, account_balances["balances"], dimensions)
+	bs_dimension_wise_acc_balance = build_dimension_wise_balance_dict(gl_entries)
-			)
 
-		gl_entries = pl_accounts_reverse_gle + closing_account_gle
+	# convert tuple key to str to make it json compliant
-		from erpnext.accounts.general_ledger import make_gl_entries
+	json_dict = {}
+	for k, v in bs_dimension_wise_acc_balance.items():
+		str_key = [str(x) for x in k]
+		str_key = ",".join(str_key)
+		json_dict[str_key] = v
 
-		if gl_entries:
+	# save
-			make_gl_entries(gl_entries, merge_entries=False)
+	frappe.db.set_value(
+		"Process Period Closing Voucher", docname, "bs_closing_balance", frappe.json.dumps(json_dict)
+	)
 
-		# Balance Sheet Accounts
+	# make closing entries
-		gl_entries = []
+	pl_closing_entries = copy.deepcopy(pl_accounts_reverse_gle)
-		for x in ppcv.normal_balances + ppcv.z_opening_balances:
+	for d in pl_accounts_reverse_gle:
-			if x.report_type == "Balance Sheet":
+		# reverse debit and credit
-				closing_balances = [frappe._dict(gle) for gle in frappe.json.loads(x.closing_balance)]
+		gle_copy = copy.deepcopy(d)
-				gl_entries.extend(closing_balances)
+		gle_copy.debit = d.credit
+		gle_copy.credit = d.debit
+		gle_copy.debit_in_account_currency = d.credit_in_account_currency
+		gle_copy.credit_in_account_currency = d.debit_in_account_currency
+		gle_copy.is_period_closing_voucher_entry = 0
+		gle_copy.period_closing_voucher = pcv.name
+		pl_closing_entries.append(gle_copy)
 
-		# build dimension wise dictionary from all GLE's
+	bs_closing_entries = []
-		bs_dimension_wise_acc_balance = build_dimension_wise_balance_dict(gl_entries)
+	for dimensions, account_balances in bs_dimension_wise_acc_balance.items():
+		for acc, balances in account_balances.items():
+			balance_in_company_currency = flt(balances.debit) - flt(balances.credit)
+			if acc != "balances" and balance_in_company_currency:
+				bs_closing_entries.append(get_closing_entry(pcv, acc, balances, dimensions))
 
-		# convert tuple key to str to make it json compliant
+	closing_entries_for_closing_account = copy.deepcopy(closing_account_gle)
-		json_dict = {}
+	for d in closing_entries_for_closing_account:
-		for k, v in bs_dimension_wise_acc_balance.items():
+		d.period_closing_voucher = pcv.name
-			str_key = [str(x) for x in k]
-			str_key = ",".join(str_key)
-			json_dict[str_key] = v
 
-		# save
+	closing_entries = pl_closing_entries + bs_closing_entries + closing_entries_for_closing_account
-		frappe.db.set_value(
+	make_closing_entries(closing_entries, pcv.name, pcv.company, pcv.period_end_date)
-			"Process Period Closing Voucher", docname, "bs_closing_balance", frappe.json.dumps(json_dict)
-		)
 
-		# make closing entries
+	# TODO: Update processing status on PCV and Process document
-		pl_closing_entries = copy.deepcopy(pl_accounts_reverse_gle)
+	frappe.db.set_value("Process Period Closing Voucher", docname, "status", "Completed")
-		for d in pl_accounts_reverse_gle:
-			# reverse debit and credit
-			gle_copy = copy.deepcopy(d)
-			gle_copy.debit = d.credit
-			gle_copy.credit = d.debit
-			gle_copy.debit_in_account_currency = d.credit_in_account_currency
-			gle_copy.credit_in_account_currency = d.debit_in_account_currency
-			gle_copy.is_period_closing_voucher_entry = 0
-			gle_copy.period_closing_voucher = pcv.name
-			pl_closing_entries.append(gle_copy)
-
-		bs_closing_entries = []
-		for dimensions, account_balances in bs_dimension_wise_acc_balance.items():
-			for acc, balances in account_balances.items():
-				balance_in_company_currency = flt(balances.debit) - flt(balances.credit)
-				if acc != "balances" and balance_in_company_currency:
-					bs_closing_entries.append(get_closing_entry(pcv, acc, balances, dimensions))
-
-		closing_entries_for_closing_account = copy.deepcopy(closing_account_gle)
-		for d in closing_entries_for_closing_account:
-			d.period_closing_voucher = pcv.name
-
-		closing_entries = pl_closing_entries + bs_closing_entries + closing_entries_for_closing_account
-		make_closing_entries(closing_entries, pcv.name, pcv.company, pcv.period_end_date)
-
-		# TODO: Update processing status on PCV and Process document
-		frappe.db.set_value("Process Period Closing Voucher", docname, "status", "Completed")
 
 
 def get_closing_entry(pcv, account, balances, dimensions):
@@ -400,8 +391,7 @@ def get_closing_entry(pcv, account, balances, 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