CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-28 07:31:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: create job card with wip warehouse set to source warehouse if material transfer to wip warehouse is skipped in work order

Browse Source 
(cherry picked from commit 723e902470)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order/work_order.py
This commit is contained in:
Mihir Kandoi
2025-02-05 15:48:08 +05:30
committed by Mergify
parent e422ae16e5
commit 9d6f3180d4
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1623,6 +1623,20 @@ def create_job_card(work_order, row, enable_capacity_planning=False, auto_create
"wip_warehouse": work_order.wip_warehouse, "wip_warehouse": work_order.wip_warehouse,
"hour_rate": row.get("hour_rate"), "hour_rate": row.get("hour_rate"),
"serial_no": row.get("serial_no"), "serial_no": row.get("serial_no"),
<<<<<<< HEAD
=======
"time_required": row.get("time_in_mins"),
"source_warehouse": row.get("source_warehouse"),
"target_warehouse": row.get("fg_warehouse"),
"wip_warehouse": work_order.wip_warehouse or row.get("wip_warehouse")
if not work_order.skip_transfer or work_order.from_wip_warehouse
else work_order.source_warehouse or row.get("source_warehouse"),
"skip_material_transfer": row.get("skip_material_transfer"),
"backflush_from_wip_warehouse": row.get("backflush_from_wip_warehouse"),
"finished_good": row.get("finished_good"),
"semi_fg_bom": row.get("bom_no"),
"is_subcontracted": row.get("is_subcontracted"),
>>>>>>> 723e902470 (fix: create job card with wip warehouse set to source warehouse if material transfer to wip warehouse is skipped in work order)
} }
) )