From f42a8e4e039174f220003e07da1b7225cfa4315a Mon Sep 17 00:00:00 2001 From: Maharshi Patel Date: Wed, 28 Sep 2022 12:54:00 +0530 Subject: [PATCH 1/3] fix: fetch swift_number in payment_request There isn't direct link between payment_request and bank so swift_number wasn't fetched using Fetch form. I fixed it by fetching swift_number on_change of bank_account. --- .../accounts/doctype/payment_request/payment_request.js | 7 +++++++ .../accounts/doctype/payment_request/payment_request.json | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js index 901ef1987b..da66edc9fe 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.js +++ b/erpnext/accounts/doctype/payment_request/payment_request.js @@ -9,6 +9,13 @@ frappe.ui.form.on("Payment Request", { query: "erpnext.setup.doctype.party_type.party_type.get_party_type", }; }); + }, + "bank_account": function(frm) { + frappe.db.get_value('Bank', frm.doc.bank, ['swift_number']) + .then(r => { + let values = r.message; + frm.set_value('swift_number', values.swift_number) + }) } }) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index 2ee356aaf4..33edb63fbf 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -219,7 +219,6 @@ "label": "Branch Code" }, { - "fetch_from": "bank.swift_number", "fieldname": "swift_number", "fieldtype": "Read Only", "label": "SWIFT Number" @@ -366,7 +365,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2020-09-18 12:24:14.178853", + "modified": "2022-09-28 12:39:30.160837", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Request", From 9245d3b5cdd9ec7d2e4c63afd5797c6882e8ecfb Mon Sep 17 00:00:00 2001 From: Maharshi Patel Date: Fri, 30 Sep 2022 15:35:12 +0530 Subject: [PATCH 2/3] Revert "fix: fetch swift_number in payment_request" This reverts commit f42a8e4e039174f220003e07da1b7225cfa4315a. --- .../accounts/doctype/payment_request/payment_request.js | 7 ------- .../accounts/doctype/payment_request/payment_request.json | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js index da66edc9fe..901ef1987b 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.js +++ b/erpnext/accounts/doctype/payment_request/payment_request.js @@ -9,13 +9,6 @@ frappe.ui.form.on("Payment Request", { query: "erpnext.setup.doctype.party_type.party_type.get_party_type", }; }); - }, - "bank_account": function(frm) { - frappe.db.get_value('Bank', frm.doc.bank, ['swift_number']) - .then(r => { - let values = r.message; - frm.set_value('swift_number', values.swift_number) - }) } }) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index 33edb63fbf..2ee356aaf4 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -219,6 +219,7 @@ "label": "Branch Code" }, { + "fetch_from": "bank.swift_number", "fieldname": "swift_number", "fieldtype": "Read Only", "label": "SWIFT Number" @@ -365,7 +366,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2022-09-28 12:39:30.160837", + "modified": "2020-09-18 12:24:14.178853", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Request", From dc8d49260c626e8cee0b22a595b90d078509d1a5 Mon Sep 17 00:00:00 2001 From: Maharshi Patel Date: Fri, 30 Sep 2022 16:22:57 +0530 Subject: [PATCH 3/3] fix: payment request make bank field Link instead of Read Only --- .../doctype/payment_request/payment_request.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index 2ee356aaf4..2f3516e135 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -186,8 +186,10 @@ { "fetch_from": "bank_account.bank", "fieldname": "bank", - "fieldtype": "Read Only", - "label": "Bank" + "fieldtype": "Link", + "label": "Bank", + "options": "Bank", + "read_only": 1 }, { "fetch_from": "bank_account.bank_account_no", @@ -366,10 +368,11 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2020-09-18 12:24:14.178853", + "modified": "2022-09-30 16:19:43.680025", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Request", + "naming_rule": "By \"Naming Series\" field", "owner": "Administrator", "permissions": [ { @@ -401,5 +404,6 @@ } ], "sort_field": "modified", - "sort_order": "DESC" + "sort_order": "DESC", + "states": [] } \ No newline at end of file