mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-14 23:18:40 +00:00
chore: resolve conflicts
This commit is contained in:
@@ -486,7 +486,7 @@ class SubcontractingInwardOrder(SubcontractingController):
|
||||
"s_warehouse": secondary_item.warehouse,
|
||||
"stock_uom": secondary_item.stock_uom,
|
||||
"scio_detail": secondary_item.name,
|
||||
"secondary_item_type": secondary_item.secondary_item_type,
|
||||
"type": secondary_item.type,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user