Merge branch 'version-15' into version-15-hotfix

frappe · Dec 11, 2024 · 44f798c · 44f798c
2 parents 20186fb + 925eb44
commit 44f798c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
@@ -4,7 +4,7 @@
 import frappe
 from frappe.utils.user import is_website_user
 
-__version__ = "15.39.6"
+__version__ = "15.45.4"
 
 
 def get_default_company(user=None):

diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
@@ -255,6 +255,15 @@ frappe.ui.form.on("BOM", {
 			});
 		}
 
+		if (!skip_qty_field) {
+			fields.push({
+				fieldtype: "Check",
+				label: __("Use Multi-Level BOM"),
+				fieldname: "use_multi_level_bom",
+				default: 1,
+			});
+		}
+
 		if (!skip_qty_field) {
 			fields.push({
 				fieldtype: "Float",