schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

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

# 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>
This commit is contained in:
mergify[bot]
2024-11-21 14:52:37 +05:30
committed by GitHub
parent 8b15a965dd
commit d4f0512a10
4 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/manufacturing/doctype/work_order_item/work_order_item.json
View File

@@ -15,6 +15,7 @@
"include_item_in_manufacturing", "include_item_in_manufacturing",
"qty_section", "qty_section",
"required_qty", "required_qty",
"stock_uom",
"rate", "rate",
"amount", "amount",
"column_break_11", "column_break_11",
@@ -138,11 +139,19 @@
"in_list_view": 1, "in_list_view": 1,
"label": "Returned Qty ", "label": "Returned Qty ",
"read_only": 1 "read_only": 1
},
{
"fetch_from": "item_code.stock_uom",
"fieldname": "stock_uom",
"fieldtype": "Link",
"label": "Stock UOM",
"options": "UOM",
"read_only": 1
} }
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2024-02-11 15:45:32.318374", "modified": "2024-11-19 15:48:16.823384",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Work Order Item", "name": "Work Order Item",

2
erpnext/manufacturing/doctype/work_order_item/work_order_item.py
View File

@@ -25,6 +25,7 @@ class WorkOrderItem(Document):
item_code: DF.Link | None item_code: DF.Link | None
item_name: DF.Data | None item_name: DF.Data | None
operation: DF.Link | None operation: DF.Link | None
operation_row_id: DF.Int
parent: DF.Data parent: DF.Data
parentfield: DF.Data parentfield: DF.Data
parenttype: DF.Data parenttype: DF.Data
@@ -32,6 +33,7 @@ class WorkOrderItem(Document):
required_qty: DF.Float required_qty: DF.Float
returned_qty: DF.Float returned_qty: DF.Float
source_warehouse: DF.Link | None source_warehouse: DF.Link | None
stock_uom: DF.Link | None
transferred_qty: DF.Float transferred_qty: DF.Float
# end: auto-generated types # end: auto-generated types

1
erpnext/patches.txt
View File

@@ -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.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_task_assignee_email_field_in_asset_maintenance_log
erpnext.patches.v15_0.update_sub_voucher_type_in_gl_entries erpnext.patches.v15_0.update_sub_voucher_type_in_gl_entries
erpnext.patches.v14_0.update_stock_uom_in_work_order_item

15
erpnext/patches/v14_0/update_stock_uom_in_work_order_item.py Normal file
View File

@@ -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
"""
)