From 1bb6cd33a3609e6e198098c425f589033c518568 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 31 Jan 2025 11:06:17 +0530 Subject: [PATCH 1/3] refactor: remove party_balance --- .../doctype/payment_entry/payment_entry.js | 14 +------------- .../doctype/payment_entry/payment_entry.json | 15 ++------------- .../doctype/payment_entry/payment_entry.py | 12 +----------- 3 files changed, 4 insertions(+), 37 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 56751ca425e..5c9c7b54d6f 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -374,7 +374,6 @@ frappe.ui.form.on("Payment Entry", { frm.set_df_property("total_allocated_amount", "options", currency_field); frm.set_df_property("unallocated_amount", "options", currency_field); frm.set_df_property("total_taxes_and_charges", "options", currency_field); - frm.set_df_property("party_balance", "options", currency_field); frm.set_currency_labels( ["total_amount", "outstanding_amount", "allocated_amount"], @@ -422,15 +421,7 @@ frappe.ui.form.on("Payment Entry", { if (frm.doc.payment_type == "Internal Transfer") { $.each( - [ - "party", - "party_type", - "party_balance", - "paid_from", - "paid_to", - "references", - "total_allocated_amount", - ], + ["party", "party_type", "paid_from", "paid_to", "references", "total_allocated_amount"], function (i, field) { frm.set_value(field, null); } @@ -478,7 +469,6 @@ frappe.ui.form.on("Payment Entry", { $.each( [ "party", - "party_balance", "paid_from", "paid_to", "paid_from_account_currency", @@ -539,7 +529,6 @@ frappe.ui.form.on("Payment Entry", { frm.set_value("paid_to_account_balance", r.message.account_balance); } }, - () => frm.set_value("party_balance", r.message.party_balance), () => frm.set_value("party_name", r.message.party_name), () => frm.clear_table("references"), () => frm.events.hide_unhide_fields(frm), @@ -1692,7 +1681,6 @@ frappe.ui.form.on("Payment Entry", { r.message.paid_from_account_balance ); frm.set_value("paid_to_account_balance", r.message.paid_to_account_balance); - frm.set_value("party_balance", r.message.party_balance); }, ]); } diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json index 294c7feef57..042cae5196c 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.json +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json @@ -28,7 +28,6 @@ "contact_person", "contact_email", "payment_accounts_section", - "party_balance", "paid_from", "paid_from_account_type", "paid_from_account_currency", @@ -223,16 +222,6 @@ "fieldtype": "Section Break", "label": "Accounts" }, - { - "allow_on_submit": 1, - "depends_on": "party", - "fieldname": "party_balance", - "fieldtype": "Currency", - "label": "Party Balance", - "no_copy": 1, - "print_hide": 1, - "read_only": 1 - }, { "bold": 1, "depends_on": "eval:(in_list([\"Internal Transfer\", \"Pay\"], doc.payment_type) || doc.party)", @@ -810,7 +799,7 @@ "table_fieldname": "payment_entries" } ], - "modified": "2025-01-31 17:27:28.555246", + "modified": "2025-01-31 11:05:51.703592", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Entry", @@ -856,4 +845,4 @@ "states": [], "title_field": "title", "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 5f56743167d..1a159102f20 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -116,7 +116,6 @@ class PaymentEntry(AccountsController): paid_to_account_currency: DF.Link paid_to_account_type: DF.Data | None party: DF.DynamicLink | None - party_balance: DF.Currency party_bank_account: DF.Link | None party_name: DF.Data | None party_type: DF.Link | None @@ -506,7 +505,6 @@ class PaymentEntry(AccountsController): if self.payment_type == "Internal Transfer": for field in ( "party", - "party_balance", "total_allocated_amount", "base_total_allocated_amount", "unallocated_amount", @@ -534,10 +532,6 @@ class PaymentEntry(AccountsController): ) else: complete_contact_details(self) - if not self.party_balance: - self.party_balance = get_balance_on( - party_type=self.party_type, party=self.party, date=self.posting_date, company=self.company - ) if not self.party_account: party_account = get_party_account(self.party_type, self.party, self.company) @@ -2721,9 +2715,7 @@ def get_party_details(company, party_type, party, date, cost_center=None): account_balance = get_balance_on(party_account, date, cost_center=cost_center) _party_name = "title" if party_type == "Shareholder" else party_type.lower() + "_name" party_name = frappe.db.get_value(party_type, party, _party_name) - party_balance = get_balance_on( - party_type=party_type, party=party, company=company, cost_center=cost_center - ) + if party_type in ["Customer", "Supplier"]: party_bank_account = get_party_bank_account(party_type, party) bank_account = get_default_company_bank_account(company, party_type, party) @@ -2732,7 +2724,6 @@ def get_party_details(company, party_type, party, date, cost_center=None): "party_account": party_account, "party_name": party_name, "party_account_currency": account_currency, - "party_balance": party_balance, "account_balance": account_balance, "party_bank_account": party_bank_account, "bank_account": bank_account, @@ -3564,7 +3555,6 @@ def get_party_and_account_balance( ): return frappe._dict( { - "party_balance": get_balance_on(party_type=ptype, party=pty, cost_center=cost_center), "paid_from_account_balance": get_balance_on(paid_from, date, cost_center=cost_center), "paid_to_account_balance": get_balance_on(paid_to, date=date, cost_center=cost_center), } From 9b5c4a0144280dcd8e4c33d91fbbcd32c404ca30 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 31 Jan 2025 11:18:44 +0530 Subject: [PATCH 2/3] refactor: remove paid_from_account_balance --- .../doctype/payment_entry/payment_entry.js | 18 +----------------- .../doctype/payment_entry/payment_entry.json | 13 +------------ .../doctype/payment_entry/payment_entry.py | 5 +---- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 5c9c7b54d6f..95852e71572 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -472,9 +472,7 @@ frappe.ui.form.on("Payment Entry", { "paid_from", "paid_to", "paid_from_account_currency", - "paid_from_account_balance", "paid_to_account_currency", - "paid_to_account_balance", "references", "total_allocated_amount", ], @@ -519,7 +517,6 @@ frappe.ui.form.on("Payment Entry", { "paid_from_account_currency", r.message.party_account_currency ); - frm.set_value("paid_from_account_balance", r.message.account_balance); } else if (frm.doc.payment_type == "Pay") { frm.set_value("paid_to", r.message.party_account); frm.set_value( @@ -580,7 +577,6 @@ frappe.ui.form.on("Payment Entry", { frm, frm.doc.paid_from, "paid_from_account_currency", - "paid_from_account_balance", function (frm) { if (frm.doc.payment_type == "Pay") { frm.events.paid_amount(frm); @@ -612,13 +608,7 @@ frappe.ui.form.on("Payment Entry", { ); }, - set_account_currency_and_balance: function ( - frm, - account, - currency_field, - balance_field, - callback_function - ) { + set_account_currency_and_balance: function (frm, account, currency_field, callback_function) { var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency; if (frm.doc.posting_date && account) { frappe.call({ @@ -633,8 +623,6 @@ frappe.ui.form.on("Payment Entry", { frappe.run_serially([ () => frm.set_value(currency_field, r.message["account_currency"]), () => { - frm.set_value(balance_field, r.message["account_balance"]); - if ( frm.doc.payment_type == "Receive" && currency_field == "paid_to_account_currency" @@ -1676,10 +1664,6 @@ frappe.ui.form.on("Payment Entry", { if (r.message) { frappe.run_serially([ () => { - frm.set_value( - "paid_from_account_balance", - r.message.paid_from_account_balance - ); frm.set_value("paid_to_account_balance", r.message.paid_to_account_balance); }, ]); diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json index 042cae5196c..50c47acb652 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.json +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json @@ -31,7 +31,6 @@ "paid_from", "paid_from_account_type", "paid_from_account_currency", - "paid_from_account_balance", "column_break_18", "paid_to", "paid_to_account_type", @@ -243,16 +242,6 @@ "read_only": 1, "reqd": 1 }, - { - "allow_on_submit": 1, - "depends_on": "paid_from", - "fieldname": "paid_from_account_balance", - "fieldtype": "Currency", - "label": "Account Balance (From)", - "options": "paid_from_account_currency", - "print_hide": 1, - "read_only": 1 - }, { "fieldname": "column_break_18", "fieldtype": "Column Break" @@ -799,7 +788,7 @@ "table_fieldname": "payment_entries" } ], - "modified": "2025-01-31 11:05:51.703592", + "modified": "2025-01-31 11:17:52.292641", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Entry", diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 1a159102f20..ffb3cc4a818 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -108,7 +108,6 @@ class PaymentEntry(AccountsController): paid_amount: DF.Currency paid_amount_after_tax: DF.Currency paid_from: DF.Link - paid_from_account_balance: DF.Currency paid_from_account_currency: DF.Link paid_from_account_type: DF.Data | None paid_to: DF.Link @@ -538,10 +537,9 @@ class PaymentEntry(AccountsController): self.set(self.party_account_field, party_account) self.party_account = party_account - if self.paid_from and not self.paid_from_account_currency and not self.paid_from_account_balance: + if self.paid_from and not self.paid_from_account_currency: acc = get_account_details(self.paid_from, self.posting_date, self.cost_center) self.paid_from_account_currency = acc.account_currency - self.paid_from_account_balance = acc.account_balance if self.paid_to and not self.paid_to_account_currency and not self.paid_to_account_balance: acc = get_account_details(self.paid_to, self.posting_date, self.cost_center) @@ -3555,7 +3553,6 @@ def get_party_and_account_balance( ): return frappe._dict( { - "paid_from_account_balance": get_balance_on(paid_from, date, cost_center=cost_center), "paid_to_account_balance": get_balance_on(paid_to, date=date, cost_center=cost_center), } ) From c636cc33b3fb86abbe073807d8b55a8f8dd3a436 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 31 Jan 2025 11:25:22 +0530 Subject: [PATCH 3/3] refactor: remove paid_to_account_balance --- .../doctype/payment_entry/payment_entry.js | 28 ------------------- .../doctype/payment_entry/payment_entry.json | 13 +-------- .../doctype/payment_entry/payment_entry.py | 15 +--------- 3 files changed, 2 insertions(+), 54 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 95852e71572..c0c41f57319 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -523,7 +523,6 @@ frappe.ui.form.on("Payment Entry", { "paid_to_account_currency", r.message.party_account_currency ); - frm.set_value("paid_to_account_balance", r.message.account_balance); } }, () => frm.set_value("party_name", r.message.party_name), @@ -592,7 +591,6 @@ frappe.ui.form.on("Payment Entry", { frm, frm.doc.paid_to, "paid_to_account_currency", - "paid_to_account_balance", function (frm) { if (frm.doc.payment_type == "Receive") { if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) { @@ -1647,32 +1645,6 @@ frappe.ui.form.on("Payment Entry", { return current_tax_amount; }, - cost_center: function (frm) { - if (frm.doc.posting_date && (frm.doc.paid_from || frm.doc.paid_to)) { - return frappe.call({ - method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_party_and_account_balance", - args: { - company: frm.doc.company, - date: frm.doc.posting_date, - paid_from: frm.doc.paid_from, - paid_to: frm.doc.paid_to, - ptype: frm.doc.party_type, - pty: frm.doc.party, - cost_center: frm.doc.cost_center, - }, - callback: function (r, rt) { - if (r.message) { - frappe.run_serially([ - () => { - frm.set_value("paid_to_account_balance", r.message.paid_to_account_balance); - }, - ]); - } - }, - }); - } - }, - after_save: function (frm) { const { matched_payment_requests } = frappe.last_response; if (!matched_payment_requests) return; diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json index 50c47acb652..c900b29f5ce 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.json +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json @@ -35,7 +35,6 @@ "paid_to", "paid_to_account_type", "paid_to_account_currency", - "paid_to_account_balance", "payment_amounts_section", "paid_amount", "paid_amount_after_tax", @@ -266,16 +265,6 @@ "read_only": 1, "reqd": 1 }, - { - "allow_on_submit": 1, - "depends_on": "paid_to", - "fieldname": "paid_to_account_balance", - "fieldtype": "Currency", - "label": "Account Balance (To)", - "options": "paid_to_account_currency", - "print_hide": 1, - "read_only": 1 - }, { "depends_on": "eval:(doc.paid_to && doc.paid_from)", "fieldname": "payment_amounts_section", @@ -788,7 +777,7 @@ "table_fieldname": "payment_entries" } ], - "modified": "2025-01-31 11:17:52.292641", + "modified": "2025-01-31 11:24:58.076393", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Entry", diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index ffb3cc4a818..2bf46ceb243 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -111,7 +111,6 @@ class PaymentEntry(AccountsController): paid_from_account_currency: DF.Link paid_from_account_type: DF.Data | None paid_to: DF.Link - paid_to_account_balance: DF.Currency paid_to_account_currency: DF.Link paid_to_account_type: DF.Data | None party: DF.DynamicLink | None @@ -541,10 +540,9 @@ class PaymentEntry(AccountsController): acc = get_account_details(self.paid_from, self.posting_date, self.cost_center) self.paid_from_account_currency = acc.account_currency - if self.paid_to and not self.paid_to_account_currency and not self.paid_to_account_balance: + if self.paid_to and not self.paid_to_account_currency: acc = get_account_details(self.paid_to, self.posting_date, self.cost_center) self.paid_to_account_currency = acc.account_currency - self.paid_to_account_balance = acc.account_balance self.party_account_currency = ( self.paid_from_account_currency @@ -3547,17 +3545,6 @@ def get_paid_amount(dt, dn, party_type, party, account, due_date): return paid_amount[0][0] if paid_amount else 0 -@frappe.whitelist() -def get_party_and_account_balance( - company, date, paid_from=None, paid_to=None, ptype=None, pty=None, cost_center=None -): - return frappe._dict( - { - "paid_to_account_balance": get_balance_on(paid_to, date=date, cost_center=cost_center), - } - ) - - @frappe.whitelist() def make_payment_order(source_name, target_doc=None): from frappe.model.mapper import get_mapped_doc