From cd3ca1ee253c2124a2f4fe234248348f4dadbb17 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 20:51:11 +0200
Subject: [PATCH] fix(Item): allow UOM conversion for non-stock items (backport
 #41267) (#41346)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(Item): allow UOM conversion for non-stock items (#41267)
---
 erpnext/stock/doctype/item/item.json | 8 ++++----
 erpnext/stock/doctype/item/item.py   | 6 ++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index ec03be52ae1..2c56b6a80bc 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -36,6 +36,8 @@
   "section_break_11",
   "description",
   "brand",
+  "unit_of_measure_conversion",
+  "uoms",
   "dashboard_tab",
   "inventory_section",
   "inventory_settings_section",
@@ -52,8 +54,6 @@
   "barcodes",
   "reorder_section",
   "reorder_levels",
-  "unit_of_measure_conversion",
-  "uoms",
   "serial_nos_and_batches",
   "has_batch_no",
   "create_new_batch",
@@ -891,7 +891,7 @@
  "index_web_pages_for_search": 1,
  "links": [],
  "make_attachments_public": 1,
- "modified": "2024-01-08 18:09:30.225085",
+ "modified": "2024-04-30 13:46:39.098753",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item",
@@ -964,4 +964,4 @@
  "states": [],
  "title_field": "item_name",
  "track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 132e70f2aed..1c43233d7c2 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -65,15 +65,13 @@ class Item(Document):
 		from erpnext.stock.doctype.item_reorder.item_reorder import ItemReorder
 		from erpnext.stock.doctype.item_supplier.item_supplier import ItemSupplier
 		from erpnext.stock.doctype.item_tax.item_tax import ItemTax
-		from erpnext.stock.doctype.item_variant_attribute.item_variant_attribute import (
-			ItemVariantAttribute,
-		)
+		from erpnext.stock.doctype.item_variant_attribute.item_variant_attribute import ItemVariantAttribute
 		from erpnext.stock.doctype.uom_conversion_detail.uom_conversion_detail import UOMConversionDetail
 
 		allow_alternative_item: DF.Check
 		allow_negative_stock: DF.Check
 		asset_category: DF.Link | None
-		asset_naming_series: DF.Literal
+		asset_naming_series: DF.Literal[None]
 		attributes: DF.Table[ItemVariantAttribute]
 		auto_create_assets: DF.Check
 		barcodes: DF.Table[ItemBarcode]