From 1693e3ef3fdd03d51454791915c0601d3a7a13e6 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 12 Dec 2025 11:53:18 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/manufacturing/doctype/work_order/work_order.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py index 0fc7473b7e6..20f8a4ab553 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.py +++ b/erpnext/manufacturing/doctype/work_order/work_order.py @@ -1509,12 +1509,7 @@ def make_stock_entry(work_order_id, purpose, qty=None, target_warehouse=None): stock_entry.to_warehouse = target_warehouse or work_order.source_warehouse stock_entry.set_stock_entry_type() -<<<<<<< HEAD - stock_entry.get_items(qty, work_order.production_item) -======= - stock_entry.is_additional_transfer_entry = is_additional_transfer_entry stock_entry.get_items() ->>>>>>> 99148a2aba (fix(manufacturing): get items for disassembly order) if purpose != "Disassemble": stock_entry.set_serial_no_batch_for_finished_good()