From b8d507e4961eed892e54c3ad1b082af1d99bd15e Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 11 Jun 2026 20:28:31 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/manufacturing/doctype/bom/bom.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js index b72fca2676b..52056c4bc5c 100644 --- a/erpnext/manufacturing/doctype/bom/bom.js +++ b/erpnext/manufacturing/doctype/bom/bom.js @@ -75,13 +75,10 @@ frappe.ui.form.on("BOM", { with_operations: function (frm) { frm.set_df_property("fg_based_operating_cost", "hidden", frm.doc.with_operations ? 1 : 0); -<<<<<<< HEAD -======= frm.trigger("toggle_fields_for_semi_finished_goods"); if (frm.doc.routing && frm.doc.with_operations && !frm.doc.operations.length) { frm.trigger("routing"); } ->>>>>>> 9249fa89aa (fix(bom): fetch routing operations when Routing is selected (#55813)) }, fg_based_operating_cost: function (frm) {