From a19eece8818fef0f3a7c45ffa2a41fd9e12fca69 Mon Sep 17 00:00:00 2001 From: Abdeali Chharchhoda Date: Thu, 20 Mar 2025 15:12:06 +0530 Subject: [PATCH 1/4] 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"]; From 5d47db78e635354cc91a4bc5b2d92e4776c818f0 Mon Sep 17 00:00:00 2001 From: Abdeali Chharchhoda Date: Thu, 20 Mar 2025 15:19:01 +0530 Subject: [PATCH 2/4] fix: add `Not Cancelled` filter for `payment_entry` in Bank Transaction (cherry picked from commit 85dd1dd4c7b1ff616401823470b9c011a4eb2383) --- .../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 3ce5da72f9a..cb7bed698a2 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 3dc29cbec8f057665f878d362cef69ad3d86a09a Mon Sep 17 00:00:00 2001 From: Abdeali Chharchhoda Date: Tue, 1 Apr 2025 12:12:37 +0530 Subject: [PATCH 3/4] chore: formatting (cherry picked from commit 4ae11d4384e98dcdce03dea772675bb856470670) # Conflicts: # erpnext/accounts/doctype/bank_transaction/bank_transaction.js --- .../doctype/bank_transaction/bank_transaction.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js index cb7bed698a2..7a89f9e75b4 100644 --- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js +++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js @@ -10,6 +10,15 @@ frappe.ui.form.on("Bank Transaction", { }, }; }); +<<<<<<< HEAD +======= + + frm.set_query("bank_account", function () { + return { + filters: { is_company_account: 1 }, + }; + }); +>>>>>>> 4ae11d4384 (chore: formatting) frm.set_query("payment_document", "payment_entries", function () { const payment_doctypes = frm.events.get_payment_doctypes(frm); From a6834f3875fdd93990b7e95cadc2487e6a120b5c Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Sat, 5 Apr 2025 07:32:15 +0530 Subject: [PATCH 4/4] chore: resolve conflict --- .../bank_transaction/bank_transaction.js | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js index 7a89f9e75b4..1ca76a68fde 100644 --- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js +++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js @@ -10,15 +10,12 @@ frappe.ui.form.on("Bank Transaction", { }, }; }); -<<<<<<< HEAD -======= frm.set_query("bank_account", function () { return { filters: { is_company_account: 1 }, }; }); ->>>>>>> 4ae11d4384 (chore: formatting) frm.set_query("payment_document", "payment_entries", function () { const payment_doctypes = frm.events.get_payment_doctypes(frm); @@ -50,25 +47,6 @@ frappe.ui.form.on("Bank Transaction", { set_bank_statement_filter(frm); }, -<<<<<<< HEAD - setup: function (frm) { - frm.set_query("party_type", function () { - return { - filters: { - name: ["in", Object.keys(frappe.boot.party_account_types)], - }, - }; - }); - - frm.set_query("bank_account", function () { - return { - filters: { is_company_account: 1 }, - }; - }); - }, - -======= ->>>>>>> 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"];