From b412266e182e0c53c8700828a4bed7dc375c6d5f Mon Sep 17 00:00:00 2001 From: ljain112 Date: Wed, 5 Aug 2026 17:01:39 +0530 Subject: [PATCH] chore: resolve conflicts --- .../subcontracting_inward_order/subcontracting_inward_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py index d6ec3219684..69539f7b091 100644 --- a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py +++ b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py @@ -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, }, )