From a28dfcd44cdc6f6fe8a4cd32f2b687e0df10cc82 Mon Sep 17 00:00:00 2001
From: Imesha Sudasingha <imesha.sudasingha@gmail.com>
Date: Wed, 17 Sep 2025 17:32:13 +0530
Subject: [PATCH] fix(item): avoid inheriting item defaults from identically
 named items (#49571)

(cherry picked from commit 9e58a56b5cadeac82ba5e8e7745ba61d06793e0c)

# Conflicts:
#	erpnext/stock/doctype/item/item.py
---
 erpnext/stock/doctype/item/item.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 4b93ccae724..2fbe43b43c7 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -726,9 +726,32 @@ class Item(Document):
 		if self.item_defaults or not self.item_group:
 			return
 
+<<<<<<< HEAD
 		item_group = frappe.get_cached_doc("Item Group", self.item_group)
 		if item_group.item_group_defaults:
 			for item in item_group.item_group_defaults:
+=======
+		item_defaults = frappe.db.get_values(
+			"Item Default",
+			{
+				"parent": self.item_group,
+				"parenttype": "Item Group",
+			},
+			[
+				"company",
+				"default_warehouse",
+				"default_price_list",
+				"buying_cost_center",
+				"default_supplier",
+				"expense_account",
+				"selling_cost_center",
+				"income_account",
+			],
+			as_dict=1,
+		)
+		if item_defaults:
+			for item in item_defaults:
+>>>>>>> 9e58a56b5c (fix(item): avoid inheriting item defaults from identically named items (#49571))
 				self.append(
 					"item_defaults",
 					{