nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-23 08:38:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-12-12 11:53:18 +05:30
committed by GitHub
parent 279cf6fe00
commit 1693e3ef3f
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/manufacturing/doctype/work_order/work_order.py
View File

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