Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index a378a51..a47da78 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -25,7 +25,7 @@
});
frm.set_query("party_type", function() {
return{
- "filters": {
+ filters: {
"name": ["in", Object.keys(frappe.boot.party_account_types)],
}
}
@@ -33,7 +33,7 @@
frm.set_query("party_bank_account", function() {
return {
filters: {
- "is_company_account":0,
+ is_company_account: 0,
party_type: frm.doc.party_type,
party: frm.doc.party
}
@@ -42,7 +42,7 @@
frm.set_query("bank_account", function() {
return {
filters: {
- "is_company_account":1
+ is_company_account: 1
}
}
});
@@ -341,7 +341,7 @@
() => {
frm.set_party_account_based_on_party = false;
if (r.message.bank_account) {
- frm.set_value("party_bank_account", r.message.bank_account);
+ frm.set_value("bank_account", r.message.bank_account);
}
}
]);
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 4606395..40362b1 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -97,7 +97,7 @@
{
"fieldname": "default_bank_account",
"fieldtype": "Link",
- "label": "Default Bank Account",
+ "label": "Default Company Bank Account",
"options": "Bank Account"
},
{
@@ -384,7 +384,7 @@
"idx": 370,
"image_field": "image",
"links": [],
- "modified": "2020-03-17 09:48:30.578242",
+ "modified": "2020-06-17 23:18:20",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier",