nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-06 06:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-02-17 16:07:49 +05:30
committed by GitHub
parent c425944bdf
commit c6682f130c
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/manufacturing/doctype/bom_operation/bom_operation.json
View File

@@ -133,12 +133,7 @@
"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"
@@ -201,11 +196,7 @@
"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",