From 436cb8dbfc2dca2be6abe7021b1a7bff21b447a7 Mon Sep 17 00:00:00 2001
From: Sudharsanan11 <sudharsananashok1975@gmail.com>
Date: Fri, 6 Feb 2026 13:12:04 +0530
Subject: [PATCH 1/3] fix(buying): add supplier group link filters in field
 level

(cherry picked from commit cfdc554a19158ede2d1b7b4fff80d2cebdc166f6)

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
---
 erpnext/buying/doctype/supplier/supplier.js   | 8 --------
 erpnext/buying/doctype/supplier/supplier.json | 5 +++++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index e04ac2ce302..a27244d1528 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -139,14 +139,6 @@ frappe.ui.form.on("Supplier", {
 			// indicators
 			erpnext.utils.set_party_dashboard_indicators(frm);
 		}
-
-		frm.set_query("supplier_group", () => {
-			return {
-				filters: {
-					is_group: 0,
-				},
-			};
-		});
 	},
 	get_supplier_group_details: function (frm) {
 		frappe.call({
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index c70b3e4081a..5516f7740f5 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -165,6 +165,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Supplier Group",
+   "link_filters": "[[\"Supplier Group\",\"is_group\",\"=\",0]]",
    "oldfieldname": "supplier_type",
    "oldfieldtype": "Link",
    "options": "Supplier Group"
@@ -485,7 +486,11 @@
    "link_fieldname": "party"
   }
  ],
+<<<<<<< HEAD
  "modified": "2024-05-08 18:02:57.342931",
+=======
+ "modified": "2026-02-06 12:58:01.398824",
+>>>>>>> cfdc554a19 (fix(buying): add supplier group link filters in field level)
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier",

From 5b7ee0af661131cd4a3959b498fbe59924e568bd Mon Sep 17 00:00:00 2001
From: Sudharsanan11 <sudharsananashok1975@gmail.com>
Date: Fri, 6 Feb 2026 13:13:44 +0530
Subject: [PATCH 2/3] fix(stock): add is group filter for warehouse fields

(cherry picked from commit a9829f5f7b3f3efef57f4c96f67a09b5a3af7f4a)
---
 .../material_request/material_request.js      | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 978a7b41d69..89dba460809 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -30,7 +30,10 @@ frappe.ui.form.on("Material Request", {
 
 		frm.set_query("from_warehouse", "items", function (doc) {
 			return {
-				filters: { company: doc.company },
+				filters: {
+					company: doc.company,
+					is_group: 0,
+				},
 			};
 		});
 
@@ -62,19 +65,28 @@ frappe.ui.form.on("Material Request", {
 
 		frm.set_query("warehouse", "items", function (doc) {
 			return {
-				filters: { company: doc.company },
+				filters: {
+					company: doc.company,
+					is_group: 0,
+				},
 			};
 		});
 
 		frm.set_query("set_warehouse", function (doc) {
 			return {
-				filters: { company: doc.company },
+				filters: {
+					company: doc.company,
+					is_group: 0,
+				},
 			};
 		});
 
 		frm.set_query("set_from_warehouse", function (doc) {
 			return {
-				filters: { company: doc.company },
+				filters: {
+					company: doc.company,
+					is_group: 0,
+				},
 			};
 		});
 

From 66a48236402bb87d2b4c3a7fe60bd1776c0c30cd Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Sat, 7 Feb 2026 21:45:35 +0530
Subject: [PATCH 3/3] chore: resolve conflicts

---
 erpnext/buying/doctype/supplier/supplier.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 5516f7740f5..ee3c9c840f0 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -486,11 +486,7 @@
    "link_fieldname": "party"
   }
  ],
-<<<<<<< HEAD
- "modified": "2024-05-08 18:02:57.342931",
-=======
  "modified": "2026-02-06 12:58:01.398824",
->>>>>>> cfdc554a19 (fix(buying): add supplier group link filters in field level)
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier",
@@ -556,4 +552,4 @@
  "states": [],
  "title_field": "supplier_name",
  "track_changes": 1
-}
\ No newline at end of file
+}