mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-19 14:55:13 +00:00
fix: allow sequence id edit in BOM if routing is not set
(cherry picked from commit 08529964b4)
# Conflicts:
# erpnext/manufacturing/doctype/bom_operation/bom_operation.json
This commit is contained in:
@@ -133,7 +133,12 @@
|
|||||||
"label": "Batch Size"
|
"label": "Batch Size"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
"depends_on": "eval:doc.parenttype == \"Routing\"",
|
"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",
|
"fieldname": "sequence_id",
|
||||||
"fieldtype": "Int",
|
"fieldtype": "Int",
|
||||||
"label": "Sequence ID"
|
"label": "Sequence ID"
|
||||||
@@ -196,7 +201,11 @@
|
|||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2025-07-31 16:17:47.287117",
|
"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",
|
"modified_by": "Administrator",
|
||||||
"module": "Manufacturing",
|
"module": "Manufacturing",
|
||||||
"name": "BOM Operation",
|
"name": "BOM Operation",
|
||||||
|
|||||||
Reference in New Issue
Block a user