From 6068dc959f5c0594749f8f6bb3406c77c08e131d Mon Sep 17 00:00:00 2001
From: khushi8112 <khushirawat23@navgurukul.org>
Date: Thu, 26 Mar 2026 16:23:14 +0530
Subject: [PATCH 1/2] fix: prevent selection of group type customer group in
 customer master

---
 erpnext/selling/doctype/customer/customer.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 9167da9271f..19128527400 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -174,6 +174,7 @@ class Customer(TransactionBase):
 	def validate(self):
 		self.flags.is_new_doc = self.is_new()
 		self.flags.old_lead = self.lead_name
+		self.validate_customer_group()
 		validate_party_accounts(self)
 		self.validate_credit_limit_on_change()
 		self.set_loyalty_program()
@@ -357,6 +358,17 @@ class Customer(TransactionBase):
 				frappe.NameError,
 			)
 
+	def validate_customer_group(self):
+		if not self.customer_group:
+			return
+
+		is_group = frappe.db.get_value("Customer Group", self.customer_group, "is_group")
+		if is_group:
+			frappe.throw(
+				_("Cannot select a Group type Customer Group. Please select a non-group Customer Group."),
+				title=_("Invalid Customer Group"),
+			)
+
 	def validate_credit_limit_on_change(self):
 		if self.get("__islocal") or not self.credit_limits:
 			return

From 75fa2b227711eb4e90d5c868db80cc42b25fe2f7 Mon Sep 17 00:00:00 2001
From: khushi8112 <khushirawat23@navgurukul.org>
Date: Tue, 31 Mar 2026 15:29:22 +0530
Subject: [PATCH 2/2] fix(test): do not use is_group enabled customer group in
 test

---
 .../doctype/bank_transaction/test_bank_transaction.py         | 4 ++--
 .../test_opening_invoice_creation_tool.py                     | 2 +-
 erpnext/controllers/tests/test_qty_based_taxes.py             | 2 +-
 erpnext/stock/doctype/shipment/test_shipment.py               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py b/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
index c69d255c51a..c7668a5a592 100644
--- a/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
+++ b/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
@@ -382,7 +382,7 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 		frappe.get_doc(
 			{
 				"doctype": "Customer",
-				"customer_group": "All Customer Groups",
+				"customer_group": "Individual",
 				"customer_type": "Company",
 				"customer_name": "Poore Simon's",
 			}
@@ -413,7 +413,7 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 		frappe.get_doc(
 			{
 				"doctype": "Customer",
-				"customer_group": "All Customer Groups",
+				"customer_group": "Individual",
 				"customer_type": "Company",
 				"customer_name": "Fayva",
 			}
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py b/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py
index c01ada6d317..4b64dc57306 100644
--- a/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py
@@ -180,7 +180,7 @@ def make_customer(customer=None):
 		{
 			"doctype": "Customer",
 			"customer_name": customer_name,
-			"customer_group": "All Customer Groups",
+			"customer_group": "Individual",
 			"customer_type": "Company",
 			"territory": "All Territories",
 		}
diff --git a/erpnext/controllers/tests/test_qty_based_taxes.py b/erpnext/controllers/tests/test_qty_based_taxes.py
index a22a029436b..2b2c44d2f8b 100644
--- a/erpnext/controllers/tests/test_qty_based_taxes.py
+++ b/erpnext/controllers/tests/test_qty_based_taxes.py
@@ -67,7 +67,7 @@ class TestTaxes(ERPNextTestSuite):
 			{
 				"doctype": "Customer",
 				"customer_name": uuid4(),
-				"customer_group": "All Customer Groups",
+				"customer_group": "Individual",
 			}
 		).insert()
 		self.supplier = frappe.get_doc(
diff --git a/erpnext/stock/doctype/shipment/test_shipment.py b/erpnext/stock/doctype/shipment/test_shipment.py
index 7e58f942faf..0ee89f62ee8 100644
--- a/erpnext/stock/doctype/shipment/test_shipment.py
+++ b/erpnext/stock/doctype/shipment/test_shipment.py
@@ -177,7 +177,7 @@ def create_shipment_customer(customer_name):
 	customer = frappe.new_doc("Customer")
 	customer.customer_name = customer_name
 	customer.customer_type = "Company"
-	customer.customer_group = "All Customer Groups"
+	customer.customer_group = "Individual"
 	customer.territory = "All Territories"
 	customer.insert()
 	return customer