From 00b9c2326cfbabb6dd58c40f9af94043bbbaf788 Mon Sep 17 00:00:00 2001
From: PatrickDenis-stack
 <77415730+PatrickDenis-stack@users.noreply.github.com>
Date: Sat, 18 Nov 2023 11:16:06 +0100
Subject: [PATCH 1/2] fix: attributes were mandatory for manufacturers

(cherry picked from commit 434c2a1815f27c59de5cd94528bc371593bdd402)
---
 erpnext/stock/doctype/item/item.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 54491bbee362..a2e173c683c8 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -504,7 +504,7 @@
    "fieldtype": "Table",
    "hidden": 1,
    "label": "Variant Attributes",
-   "mandatory_depends_on": "has_variants",
+   "mandatory_depends_on": "eval:(doc.has_variants || doc.variant_of) && doc.variant_based_on==='Item Attribute'",
    "options": "Item Variant Attribute"
   },
   {

From a492e574def2661edb2a54cfbde8b231781a231e Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Sat, 18 Nov 2023 15:43:23 +0100
Subject: [PATCH 2/2] fix: update modified timestamp

Was missing in 434c2a1815f27c59de5cd94528bc371593bdd402
---
 erpnext/stock/doctype/item/item.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index a2e173c683c8..d0b90c4565e5 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -888,7 +888,7 @@
  "index_web_pages_for_search": 1,
  "links": [],
  "make_attachments_public": 1,
- "modified": "2023-09-11 13:46:32.688051",
+ "modified": "2023-09-18 15:41:32.688051",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item",