nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-28 09:24:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52524 from frappe/mergify/bp/version-16-hotfix/pr-52497

Browse Source 
fix: add is_group filter for supplier_group and warehouse fields (backport #52497)
This commit is contained in:
Mihir Kandoi
2026-02-07 21:58:58 +05:30
committed by GitHub
parent 32d5cedafc dd45bb5664
commit 6bcd311214
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/buying/doctype/supplier/supplier.js
View File

@@ -135,14 +135,6 @@ frappe.ui.form.on("Supplier", {
// indicators // indicators
erpnext.utils.set_party_dashboard_indicators(frm); erpnext.utils.set_party_dashboard_indicators(frm);
} }
frm.set_query("supplier_group", () => {
return {
filters: {
is_group: 0,
},
};
});
}, },
get_supplier_group_details: function (frm) { get_supplier_group_details: function (frm) {
frappe.call({ frappe.call({

3
erpnext/buying/doctype/supplier/supplier.json
View File

@@ -167,6 +167,7 @@
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "Supplier Group", "label": "Supplier Group",
"link_filters": "[[\"Supplier Group\",\"is_group\",\"=\",0]]",
"oldfieldname": "supplier_type", "oldfieldname": "supplier_type",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Supplier Group" "options": "Supplier Group"
@@ -500,7 +501,7 @@
"link_fieldname": "party" "link_fieldname": "party"
} }
], ],
"modified": "2026-01-16 15:56:31.139206", "modified": "2026-02-06 12:58:01.398824",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier", "name": "Supplier",

20
erpnext/stock/doctype/material_request/material_request.js
View File

@@ -30,7 +30,10 @@ frappe.ui.form.on("Material Request", {
frm.set_query("from_warehouse", "items", function (doc) { frm.set_query("from_warehouse", "items", function (doc) {
return { return {
filters: { company: doc.company }, filters: {
company: doc.company,
is_group: 0,
},
}; };
}); });
@@ -70,19 +73,28 @@ frappe.ui.form.on("Material Request", {
frm.set_query("warehouse", "items", function (doc) { frm.set_query("warehouse", "items", function (doc) {
return { return {
filters: { company: doc.company }, filters: {
company: doc.company,
is_group: 0,
},
}; };
}); });
frm.set_query("set_warehouse", function (doc) { frm.set_query("set_warehouse", function (doc) {
return { return {
filters: { company: doc.company }, filters: {
company: doc.company,
is_group: 0,
},
}; };
}); });
frm.set_query("set_from_warehouse", function (doc) { frm.set_query("set_from_warehouse", function (doc) {
return { return {
filters: { company: doc.company }, filters: {
company: doc.company,
is_group: 0,
},
}; };
}); });