From a19eece8818fef0f3a7c45ffa2a41fd9e12fca69 Mon Sep 17 00:00:00 2001 From: Abdeali Chharchhoda Date: Thu, 20 Mar 2025 15:12:06 +0530 Subject: [PATCH] refactor: move `payment_document` query to `setup` (cherry picked from commit 257802aeda0eeb4b8ad6264ab477ad8f1e38a55a) # Conflicts: # erpnext/accounts/doctype/bank_transaction/bank_transaction.js --- .../doctype/bank_transaction/bank_transaction.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js index 5c5d9ff3469..3ce5da72f9a 100644 --- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js +++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js @@ -2,7 +2,15 @@ // For license information, please see license.txt frappe.ui.form.on("Bank Transaction", { - onload(frm) { + setup: function (frm) { + frm.set_query("party_type", function () { + return { + filters: { + name: ["in", Object.keys(frappe.boot.party_account_types)], + }, + }; + }); + frm.set_query("payment_document", "payment_entries", function () { const payment_doctypes = frm.events.get_payment_doctypes(frm); return { @@ -12,6 +20,7 @@ frappe.ui.form.on("Bank Transaction", { }; }); }, + refresh(frm) { if (!frm.is_dirty() && frm.doc.payment_entries.length > 0) { frm.add_custom_button(__("Unreconcile Transaction"), () => { @@ -19,10 +28,12 @@ frappe.ui.form.on("Bank Transaction", { }); } }, + bank_account: function (frm) { set_bank_statement_filter(frm); }, +<<<<<<< HEAD setup: function (frm) { frm.set_query("party_type", function () { return { @@ -39,6 +50,8 @@ frappe.ui.form.on("Bank Transaction", { }); }, +======= +>>>>>>> 257802aeda (refactor: move `payment_document` query to `setup`) get_payment_doctypes: function () { // get payment doctypes from all the apps return ["Payment Entry", "Journal Entry", "Sales Invoice", "Purchase Invoice", "Bank Transaction"];