chore: resolve conflicts

This commit is contained in:
ljain112
2026-08-05 17:01:39 +05:30
parent 3141387949
commit b412266e18

View File

@@ -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,
},
)