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