From fde7cd534503255ac228641d56ff411eb8508d15 Mon Sep 17 00:00:00 2001
From: Mohsin Akhtar <167299936+akhtarmohsin@users.noreply.github.com>
Date: Sun, 21 Jun 2026 16:10:43 +0530
Subject: [PATCH 1/3] fix: show only template items in Variant Of filter

(cherry picked from commit 243312985030dc515e6fedf7b253af08f3c55b06)
---
 erpnext/stock/doctype/item/item.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 10c771d1415..cb5a5ac829f 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -145,6 +145,7 @@
    "ignore_user_permissions": 1,
    "in_standard_filter": 1,
    "label": "Variant Of",
+   "link_filters": "[[\"Item\",\"has_variants\",\"=\",1]]",
    "options": "Item",
    "read_only": 1,
    "search_index": 1,

From 902a3c5c551c4dd55d23bba687fb4c700c53ab3e Mon Sep 17 00:00:00 2001
From: Mohsin Akhtar <167299936+akhtarmohsin@users.noreply.github.com>
Date: Sun, 5 Jul 2026 23:26:06 +0530
Subject: [PATCH 2/3] fix: update modified timestamp in item.json

(cherry picked from commit 54da9fc27a4df6a0511fa52cc908cd818a4a4958)

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

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index cb5a5ac829f..fbaa17a76df 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -898,7 +898,11 @@
  "image_field": "image",
  "links": [],
  "make_attachments_public": 1,
+<<<<<<< HEAD
  "modified": "2026-03-17 20:39:05.218344",
+=======
+ "modified": "2026-07-05 23:24:45.734144",
+>>>>>>> 54da9fc27a (fix: update modified timestamp in item.json)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item",

From cef69b05a9c54bc5c90bab7c76aa96ca88bb90e8 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Thu, 9 Jul 2026 20:44:57 +0530
Subject: [PATCH 3/3] chore: resolve conflicts

---
 erpnext/stock/doctype/item/item.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index fbaa17a76df..e8280bacf4a 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -898,11 +898,7 @@
  "image_field": "image",
  "links": [],
  "make_attachments_public": 1,
-<<<<<<< HEAD
- "modified": "2026-03-17 20:39:05.218344",
-=======
  "modified": "2026-07-05 23:24:45.734144",
->>>>>>> 54da9fc27a (fix: update modified timestamp in item.json)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item",