From d4f0512a10550914b2aad1795fe8692658aab67a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2024 14:52:37 +0530
Subject: [PATCH] fix: added Stock UOM field for RM in work order (backport
 #44185) (#44237)

* fix: added Stock UOM field for RM in work order (#44185)

fix: added UOM field for RM in work order
(cherry picked from commit cc571aca8f56310b7f87244ebdbdb91fd6b57222)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order_item/work_order_item.json
#	erpnext/patches.txt

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
---
 .../doctype/work_order_item/work_order_item.json  | 13 +++++++++++--
 .../doctype/work_order_item/work_order_item.py    |  2 ++
 erpnext/patches.txt                               |  1 +
 .../v14_0/update_stock_uom_in_work_order_item.py  | 15 +++++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 erpnext/patches/v14_0/update_stock_uom_in_work_order_item.py

diff --git a/erpnext/manufacturing/doctype/work_order_item/work_order_item.json b/erpnext/manufacturing/doctype/work_order_item/work_order_item.json
index 0f4d693544e..580168180a7 100644
--- a/erpnext/manufacturing/doctype/work_order_item/work_order_item.json
+++ b/erpnext/manufacturing/doctype/work_order_item/work_order_item.json
@@ -15,6 +15,7 @@
   "include_item_in_manufacturing",
   "qty_section",
   "required_qty",
+  "stock_uom",
   "rate",
   "amount",
   "column_break_11",
@@ -138,11 +139,19 @@
    "in_list_view": 1,
    "label": "Returned Qty ",
    "read_only": 1
+  },
+  {
+   "fetch_from": "item_code.stock_uom",
+   "fieldname": "stock_uom",
+   "fieldtype": "Link",
+   "label": "Stock UOM",
+   "options": "UOM",
+   "read_only": 1
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-02-11 15:45:32.318374",
+ "modified": "2024-11-19 15:48:16.823384",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Work Order Item",
@@ -153,4 +162,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/manufacturing/doctype/work_order_item/work_order_item.py b/erpnext/manufacturing/doctype/work_order_item/work_order_item.py
index 267ca5d21de..04f78eb1c3b 100644
--- a/erpnext/manufacturing/doctype/work_order_item/work_order_item.py
+++ b/erpnext/manufacturing/doctype/work_order_item/work_order_item.py
@@ -25,6 +25,7 @@ class WorkOrderItem(Document):
 		item_code: DF.Link | None
 		item_name: DF.Data | None
 		operation: DF.Link | None
+		operation_row_id: DF.Int
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data
@@ -32,6 +33,7 @@ class WorkOrderItem(Document):
 		required_qty: DF.Float
 		returned_qty: DF.Float
 		source_warehouse: DF.Link | None
+		stock_uom: DF.Link | None
 		transferred_qty: DF.Float
 	# end: auto-generated types
 
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index ab416d9d6c3..2716aa9883b 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -382,3 +382,4 @@ erpnext.patches.v15_0.link_purchase_item_to_asset_doc
 erpnext.patches.v14_0.update_currency_exchange_settings_for_frankfurter
 erpnext.patches.v15_0.update_task_assignee_email_field_in_asset_maintenance_log
 erpnext.patches.v15_0.update_sub_voucher_type_in_gl_entries
+erpnext.patches.v14_0.update_stock_uom_in_work_order_item
diff --git a/erpnext/patches/v14_0/update_stock_uom_in_work_order_item.py b/erpnext/patches/v14_0/update_stock_uom_in_work_order_item.py
new file mode 100644
index 00000000000..d611065d8f1
--- /dev/null
+++ b/erpnext/patches/v14_0/update_stock_uom_in_work_order_item.py
@@ -0,0 +1,15 @@
+import frappe
+
+
+def execute():
+	frappe.db.sql(
+		"""
+		UPDATE
+			`tabWork Order Item`, `tabItem`
+		SET
+			`tabWork Order Item`.stock_uom = `tabItem`.stock_uom
+		WHERE
+			`tabWork Order Item`.item_code = `tabItem`.name
+			AND `tabWork Order Item`.docstatus = 1
+	"""
+	)