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

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

Browse Source
This commit is contained in:
rohitwaghchaure
2024-12-11 16:34:48 +05:30
committed by GitHub
parent 20186fb8fa 925eb4449e
commit 44f798c3e1
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -4,7 +4,7 @@ import inspect
import frappe import frappe
from frappe.utils.user import is_website_user from frappe.utils.user import is_website_user
__version__ = "15.39.6" __version__ = "15.45.4"
def get_default_company(user=None): def get_default_company(user=None):

9
erpnext/manufacturing/doctype/bom/bom.js
View File

@@ -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) { if (!skip_qty_field) {
fields.push({ fields.push({
fieldtype: "Float", fieldtype: "Float",