schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BOM name issue (backport #44586) (#44589)

Browse Source 
fix: BOM name issue (#44586)

(cherry picked from commit d871e21a40)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit a5cc307417)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.py
This commit is contained in:
mergify[bot]
2024-12-07 12:58:34 +05:30
committed by Mergify
parent 1d158d58f6
commit 408a09233b
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,6 +250,13 @@ frappe.ui.form.on("BOM", {
}); });
} }
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",

28
erpnext/manufacturing/doctype/bom/bom.py
View File

@@ -179,10 +179,14 @@ class BOM(WebsiteGenerator):
"BOM", filters={"name": ("like", search_key), "amended_from": ["is", "not set"]}, pluck="name" "BOM", filters={"name": ("like", search_key), "amended_from": ["is", "not set"]}, pluck="name"
) )
<<<<<<< HEAD
if existing_boms: if existing_boms:
index = self.get_next_version_index(existing_boms) index = self.get_next_version_index(existing_boms)
else: else:
index = 1 index = 1
=======
index = self.get_index_for_bom(existing_boms)
>>>>>>> a5cc307417 (fix: BOM name issue (backport #44586) (#44589))
prefix = self.doctype prefix = self.doctype
suffix = "%.3i" % index # convert index to string (1 -> "001") suffix = "%.3i" % index # convert index to string (1 -> "001")
@@ -200,21 +204,23 @@ class BOM(WebsiteGenerator):
name = f"{prefix}-{truncated_item_name}-{suffix}" name = f"{prefix}-{truncated_item_name}-{suffix}"
if frappe.db.exists("BOM", name): if frappe.db.exists("BOM", name):
conflicting_bom = frappe.get_doc("BOM", name) existing_boms = frappe.get_all(
"BOM", filters={"name": ("like", search_key), "amended_from": ["is", "not set"]}, pluck="name"
)
if conflicting_bom.item != self.item: index = self.get_index_for_bom(existing_boms)
msg = _("A BOM with name {0} already exists for item {1}.").format( suffix = "%.3i" % index
frappe.bold(name), frappe.bold(conflicting_bom.item) name = f"{prefix}-{self.item}-{suffix}"
)
frappe.throw(
_("{0}{1} Did you rename the item? Please contact Administrator / Tech support").format(
msg, "<br>"
)
)
self.name = name self.name = name
def get_index_for_bom(self, existing_boms):
index = 1
if existing_boms:
index = self.get_next_version_index(existing_boms)
return index
@staticmethod @staticmethod
def get_next_version_index(existing_boms: list[str]) -> int: def get_next_version_index(existing_boms: list[str]) -> int:
# split by "/" and "-" # split by "/" and "-"