From 25b169059d5da49de5e2d0c269956d5798defa7b Mon Sep 17 00:00:00 2001
From: Parameshwari Palanisamy
 <101092028+creative-paramu@users.noreply.github.com>
Date: Tue, 2 Jan 2024 14:04:56 +0530
Subject: [PATCH 1/2] fix: Variant Items, List View Enabled to Variant Status
 Change (#38468)

* feat: Purchase Register Report Supplier Group filter Adding

* fix: Variant Items, List View Enabled to Variant Status Change

* Update purchase_register.js

* Update purchase_register.py

(cherry picked from commit 9ea963bfe9cf75e140558f123350b89d806e937e)

# Conflicts:
#	erpnext/stock/doctype/item/item_list.js
---
 erpnext/stock/doctype/item/item_list.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/erpnext/stock/doctype/item/item_list.js b/erpnext/stock/doctype/item/item_list.js
index 2041d91bc8a..b87ec37e39d 100644
--- a/erpnext/stock/doctype/item/item_list.js
+++ b/erpnext/stock/doctype/item/item_list.js
@@ -1,5 +1,11 @@
+<<<<<<< HEAD
 frappe.listview_settings["Item"] = {
 	add_fields: ["item_name", "stock_uom", "item_group", "image", "has_variants", "end_of_life", "disabled"],
+=======
+frappe.listview_settings['Item'] = {
+	add_fields: ["item_name", "stock_uom", "item_group", "image",
+		"has_variants", "end_of_life", "disabled", "variant_of"],
+>>>>>>> 9ea963bfe9 (fix: Variant Items, List View Enabled to Variant Status Change (#38468))
 	filters: [["disabled", "=", "0"]],
 
 	get_indicator: function (doc) {

From 39f8d354143b14e37ff9444b95b7a84c9d538c8d Mon Sep 17 00:00:00 2001
From: diptanilsaha <diptanil@frappe.io>
Date: Thu, 26 Feb 2026 16:44:17 +0530
Subject: [PATCH 2/2] chore: resolve conflict

---
 erpnext/stock/doctype/item/item_list.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/erpnext/stock/doctype/item/item_list.js b/erpnext/stock/doctype/item/item_list.js
index b87ec37e39d..e8d886a9c24 100644
--- a/erpnext/stock/doctype/item/item_list.js
+++ b/erpnext/stock/doctype/item/item_list.js
@@ -1,11 +1,14 @@
-<<<<<<< HEAD
 frappe.listview_settings["Item"] = {
-	add_fields: ["item_name", "stock_uom", "item_group", "image", "has_variants", "end_of_life", "disabled"],
-=======
-frappe.listview_settings['Item'] = {
-	add_fields: ["item_name", "stock_uom", "item_group", "image",
-		"has_variants", "end_of_life", "disabled", "variant_of"],
->>>>>>> 9ea963bfe9 (fix: Variant Items, List View Enabled to Variant Status Change (#38468))
+	add_fields: [
+		"item_name",
+		"stock_uom",
+		"item_group",
+		"image",
+		"has_variants",
+		"end_of_life",
+		"disabled",
+		"variant_of",
+	],
 	filters: [["disabled", "=", "0"]],
 
 	get_indicator: function (doc) {