chore: rename Closing Balance to Account Closing Balance

This commit is contained in:
Deepesh Garg 2023-03-08 15:15:33 +05:30
parent 5dabc98ba5
commit 3249a79f07
8 changed files with 28 additions and 26 deletions

View File

@ -1,7 +1,7 @@
// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors // Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt // For license information, please see license.txt
// frappe.ui.form.on("Closing Balance", { // frappe.ui.form.on("Account Closing Balance", {
// refresh(frm) { // refresh(frm) {
// }, // },

View File

@ -132,7 +132,7 @@
"modified": "2023-03-06 08:56:36.393237", "modified": "2023-03-06 08:56:36.393237",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Closing Balance", "name": "Account Closing Balance",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {

View File

@ -9,7 +9,7 @@ from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
) )
class ClosingBalance(Document): class AccountClosingBalance(Document):
pass pass
@ -23,10 +23,12 @@ def make_closing_entries(closing_entries, voucher_name):
) )
combined_entries = closing_entries + previous_closing_entries combined_entries = closing_entries + previous_closing_entries
merged_entries = aggregate_with_last_closing_balance(combined_entries, accounting_dimensions) merged_entries = aggregate_with_last_account_closing_balance(
combined_entries, accounting_dimensions
)
for key, value in merged_entries.items(): for key, value in merged_entries.items():
cle = frappe.new_doc("Closing Balance") cle = frappe.new_doc("Account Closing Balance")
cle.update(value) cle.update(value)
cle.update(value["dimensions"]) cle.update(value["dimensions"])
cle.update( cle.update(
@ -38,7 +40,7 @@ def make_closing_entries(closing_entries, voucher_name):
cle.submit() cle.submit()
def aggregate_with_last_closing_balance(entries, accounting_dimensions): def aggregate_with_last_account_closing_balance(entries, accounting_dimensions):
merged_entries = {} merged_entries = {}
for entry in entries: for entry in entries:
key, key_values = generate_key(entry, accounting_dimensions) key, key_values = generate_key(entry, accounting_dimensions)
@ -97,25 +99,25 @@ def get_previous_closing_entries(company, closing_date, accounting_dimensions):
) )
if last_period_closing_voucher: if last_period_closing_voucher:
closing_balance = frappe.qb.DocType("Closing Balance") account_closing_balance = frappe.qb.DocType("Account Closing Balance")
query = frappe.qb.from_(closing_balance).select( query = frappe.qb.from_(account_closing_balance).select(
closing_balance.account, account_closing_balance.account,
closing_balance.account_currency, account_closing_balance.account_currency,
closing_balance.debit, account_closing_balance.debit,
closing_balance.credit, account_closing_balance.credit,
closing_balance.debit_in_account_currency, account_closing_balance.debit_in_account_currency,
closing_balance.credit_in_account_currency, account_closing_balance.credit_in_account_currency,
closing_balance.cost_center, account_closing_balance.cost_center,
closing_balance.project, account_closing_balance.project,
closing_balance.finance_book, account_closing_balance.finance_book,
closing_balance.is_period_closing_voucher_entry, account_closing_balance.is_period_closing_voucher_entry,
) )
for dimension in accounting_dimensions: for dimension in accounting_dimensions:
query = query.select(closing_balance[dimension]) query = query.select(account_closing_balance[dimension])
query = query.where( query = query.where(
closing_balance.period_closing_voucher == last_period_closing_voucher[0].name account_closing_balance.period_closing_voucher == last_period_closing_voucher[0].name
) )
entries = query.run(as_dict=1) entries = query.run(as_dict=1)

View File

@ -5,5 +5,5 @@
from frappe.tests.utils import FrappeTestCase from frappe.tests.utils import FrappeTestCase
class TestClosingBalance(FrappeTestCase): class TestAccountClosingBalance(FrappeTestCase):
pass pass

View File

@ -53,7 +53,7 @@ class PeriodClosingVoucher(AccountsController):
self.delete_closing_entries() self.delete_closing_entries()
def delete_closing_entries(self): def delete_closing_entries(self):
closing_balance = frappe.qb.DocType("Closing Balance") closing_balance = frappe.qb.DocType("Account Closing Balance")
frappe.qb.from_(closing_balance).delete().where( frappe.qb.from_(closing_balance).delete().where(
closing_balance.period_closing_voucher == self.name closing_balance.period_closing_voucher == self.name
).run() ).run()

View File

@ -155,7 +155,7 @@ def get_rootwise_opening_balances(filters, report_type):
if last_period_closing_voucher: if last_period_closing_voucher:
gle = get_opening_balance( gle = get_opening_balance(
"Closing Balance", "Account Closing Balance",
filters, filters,
report_type, report_type,
accounting_dimensions, accounting_dimensions,
@ -200,7 +200,7 @@ def get_opening_balance(
.groupby(closing_balance.account) .groupby(closing_balance.account)
) )
if doctype == "Closing Balance": if doctype == "Account Closing Balance":
if period_closing_voucher: if period_closing_voucher:
opening_balance = opening_balance.where( opening_balance = opening_balance.where(
closing_balance.period_closing_voucher == period_closing_voucher closing_balance.period_closing_voucher == period_closing_voucher
@ -214,7 +214,7 @@ def get_opening_balance(
opening_balance = opening_balance.where(closing_balance.closing_date >= filters.year_start_date) opening_balance = opening_balance.where(closing_balance.closing_date >= filters.year_start_date)
if not flt(filters.with_period_closing_entry): if not flt(filters.with_period_closing_entry):
if doctype == "Closing Balance": if doctype == "Account Closing Balance":
opening_balance = opening_balance.where(closing_balance.is_period_closing_voucher_entry == 0) opening_balance = opening_balance.where(closing_balance.is_period_closing_voucher_entry == 0)
else: else:
opening_balance = opening_balance.where( opening_balance = opening_balance.where(

View File

@ -10,7 +10,7 @@ def execute():
if not accounting_dimensions: if not accounting_dimensions:
return return
doctype = "Closing Balance" doctype = "Account Closing Balance"
for d in accounting_dimensions: for d in accounting_dimensions:
field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": d.fieldname}) field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": d.fieldname})