feat: filter bank from company account
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 5707d15..ffba8c8 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -30,6 +30,13 @@
}
}
});
+ frm.set_query("bank_account", function() {
+ return {
+ filters: {
+ "is_company_account":0
+ }
+ }
+ });
frm.set_query("contact_person", function() {
if (frm.doc.party) {
return {
diff --git a/erpnext/accounts/doctype/payment_order/payment_order.js b/erpnext/accounts/doctype/payment_order/payment_order.js
index f0071b8..61ead01 100644
--- a/erpnext/accounts/doctype/payment_order/payment_order.js
+++ b/erpnext/accounts/doctype/payment_order/payment_order.js
@@ -2,6 +2,15 @@
// For license information, please see license.txt
frappe.ui.form.on('Payment Order', {
+ setup: function(frm) {
+ frm.set_query("company_bank_account", function() {
+ return {
+ filters: {
+ "is_company_account":1
+ }
+ }
+ });
+ },
refresh: function(frm) {
if (frm.doc.docstatus == 0) {
frm.add_custom_button(__('Payment Request'), function() {
diff --git a/erpnext/accounts/doctype/payment_order/payment_order.json b/erpnext/accounts/doctype/payment_order/payment_order.json
index 0069741..0018359 100644
--- a/erpnext/accounts/doctype/payment_order/payment_order.json
+++ b/erpnext/accounts/doctype/payment_order/payment_order.json
@@ -12,7 +12,7 @@
"column_break_2",
"posting_date",
"bank",
- "bank_account",
+ "company_bank_account",
"section_break_5",
"references",
"amended_from"
@@ -81,20 +81,20 @@
"read_only": 1
},
{
- "fieldname": "bank_account",
- "fieldtype": "Link",
- "label": "Bank Account",
- "options": "Bank Account"
- },
- {
"fieldname": "payment_order_type",
"fieldtype": "Select",
"label": "Payment Order Type",
"options": "\nPayment Request\nPayment Entry"
+ },
+ {
+ "fieldname": "company_bank_account",
+ "fieldtype": "Link",
+ "label": "Company Bank Account",
+ "options": "Bank Account"
}
],
"is_submittable": 1,
- "modified": "2019-05-06 16:40:11.397341",
+ "modified": "2019-05-06 19:57:03.661653",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Order",