From 9d6f3180d4313b4363ff83312c06091782bedc1c Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 5 Feb 2025 15:48:08 +0530 Subject: [PATCH 1/2] fix: create job card with wip warehouse set to source warehouse if material transfer to wip warehouse is skipped in work order (cherry picked from commit 723e902470c772469f1fd3ecc04d2923acf96d0b) # Conflicts: # erpnext/manufacturing/doctype/work_order/work_order.py --- .../manufacturing/doctype/work_order/work_order.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py index e6e7d7612c5..d34d6bed57a 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.py +++ b/erpnext/manufacturing/doctype/work_order/work_order.py @@ -1623,6 +1623,20 @@ def create_job_card(work_order, row, enable_capacity_planning=False, auto_create "wip_warehouse": work_order.wip_warehouse, "hour_rate": row.get("hour_rate"), "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) } ) From 419698627388efbe131cd14f20eef0fc677b93d6 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 5 Feb 2025 17:59:34 +0530 Subject: [PATCH 2/2] chore: resolve conflicts --- .../doctype/work_order/work_order.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py index d34d6bed57a..721af21be99 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.py +++ b/erpnext/manufacturing/doctype/work_order/work_order.py @@ -1620,23 +1620,11 @@ def create_job_card(work_order, row, enable_capacity_planning=False, auto_create "project": work_order.project, "company": work_order.company, "sequence_id": row.get("sequence_id"), - "wip_warehouse": work_order.wip_warehouse, - "hour_rate": row.get("hour_rate"), - "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) + "hour_rate": row.get("hour_rate"), + "serial_no": row.get("serial_no"), } )