From c425944bdff1e207f7fe8991ee347a923d46ab0b Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 17 Feb 2026 15:39:52 +0530 Subject: [PATCH] fix: allow sequence id edit in BOM if routing is not set (cherry picked from commit 08529964b4407faee3ab3f6d6890fccc17ab038d) # Conflicts: # erpnext/manufacturing/doctype/bom_operation/bom_operation.json --- .../doctype/bom_operation/bom_operation.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json index 3bcc4e896bd..e79746dcc7c 100644 --- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json +++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json @@ -133,7 +133,12 @@ "label": "Batch Size" }, { +<<<<<<< HEAD "depends_on": "eval:doc.parenttype == \"Routing\"", +======= + "depends_on": "eval:doc.parenttype == \"Routing\" || !parent.routing", + "description": "If you want to run operations in parallel, keep the same sequence ID for them.", +>>>>>>> 08529964b4 (fix: allow sequence id edit in BOM if routing is not set) "fieldname": "sequence_id", "fieldtype": "Int", "label": "Sequence ID" @@ -196,7 +201,11 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], +<<<<<<< HEAD "modified": "2025-07-31 16:17:47.287117", +======= + "modified": "2026-02-17 15:33:28.495850", +>>>>>>> 08529964b4 (fix: allow sequence id edit in BOM if routing is not set) "modified_by": "Administrator", "module": "Manufacturing", "name": "BOM Operation",