From 257802aeda0eeb4b8ad6264ab477ad8f1e38a55a Mon Sep 17 00:00:00 2001 From: Abdeali Chharchhoda Date: Thu, 20 Mar 2025 15:12:06 +0530 Subject: [PATCH 1/3] refactor: move `payment_document` query to `setup` --- .../bank_transaction/bank_transaction.js | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js index d899d429178..65d51d71c40 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,20 +28,11 @@ frappe.ui.form.on("Bank Transaction", { }); } }, + bank_account: function (frm) { set_bank_statement_filter(frm); }, - setup: function (frm) { - frm.set_query("party_type", function () { - return { - filters: { - name: ["in", Object.keys(frappe.boot.party_account_types)], - }, - }; - }); - }, - get_payment_doctypes: function () { // get payment doctypes from all the apps return ["Payment Entry", "Journal Entry", "Sales Invoice", "Purchase Invoice", "Bank Transaction"]; From 85dd1dd4c7b1ff616401823470b9c011a4eb2383 Mon Sep 17 00:00:00 2001 From: Abdeali Chharchhoda Date: Thu, 20 Mar 2025 15:19:01 +0530 Subject: [PATCH 2/3] fix: add `Not Cancelled` filter for `payment_entry` in Bank Transaction --- .../accounts/doctype/bank_transaction/bank_transaction.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js index 65d51d71c40..2c532a2a33b 100644 --- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js +++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js @@ -19,6 +19,14 @@ frappe.ui.form.on("Bank Transaction", { }, }; }); + + frm.set_query("payment_entry", "payment_entries", function () { + return { + filters: { + docstatus: ["!=", 2], + }, + }; + }); }, refresh(frm) { From 4ae11d4384e98dcdce03dea772675bb856470670 Mon Sep 17 00:00:00 2001 From: Abdeali Chharchhoda Date: Tue, 1 Apr 2025 12:12:37 +0530 Subject: [PATCH 3/3] chore: formatting --- erpnext/accounts/doctype/bank_transaction/bank_transaction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js index 3529202a801..1ca76a68fde 100644 --- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js +++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js @@ -10,7 +10,7 @@ frappe.ui.form.on("Bank Transaction", { }, }; }); - + frm.set_query("bank_account", function () { return { filters: { is_company_account: 1 },