mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-05 22:48:27 +00:00
fix: use work_order bom_no if no bom present in operation
(cherry picked from commit c6979ab260)
# Conflicts:
# erpnext/manufacturing/doctype/work_order/work_order.py
This commit is contained in:
@@ -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"),
|
||||
|
||||
Reference in New Issue
Block a user