From bac036ac532e5175c80bfb2950b68aa24eb266a3 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 1 Apr 2025 14:45:24 +0530 Subject: [PATCH] fix: use work_order bom_no if no bom present in operation (cherry picked from commit c6979ab260dcb6ce97bbdff6b28b8efd4ec2da41) # Conflicts: # erpnext/manufacturing/doctype/work_order/work_order.py --- erpnext/manufacturing/doctype/work_order/work_order.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py index 5bbda3a0986..521fb52ea92 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.py +++ b/erpnext/manufacturing/doctype/work_order/work_order.py @@ -2004,7 +2004,11 @@ def create_job_card(work_order, row, enable_capacity_planning=False, auto_create "posting_date": nowdate(), "for_quantity": row.job_card_qty or work_order.get("qty", 0), "operation_id": row.get("name"), +<<<<<<< HEAD "bom_no": work_order.bom_no, +======= + "bom_no": row.get("bom") or work_order.bom_no, +>>>>>>> c6979ab260 (fix: use work_order bom_no if no bom present in operation) "project": work_order.project, "company": work_order.company, "sequence_id": row.get("sequence_id"),