commit | 44ec05f79bfa3a2d76d160ac4805d36450ea8b8e | [log] [tgz] |
---|---|---|
author | Nabin Hait <nabinhait@gmail.com> | Mon Oct 15 18:56:16 2018 +0530 |
committer | GitHub <noreply@github.com> | Mon Oct 15 18:56:16 2018 +0530 |
tree | 189e348a5ff33a363f517c39f8053e976e07dcfb | |
parent | 7844b79274b7f6cc7beb20e66383d07e03cdfaeb [diff] |
fix(bom): deadlock issue via bom replace tool (#15694)
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index 7a2aa8a..0af7a86 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -354,7 +354,8 @@ bom_list = self.traverse_tree(bom_list) for bom in bom_list: bom_obj = frappe.get_doc("BOM", bom) - bom_obj.on_update() + bom_obj.check_recursion() + bom_obj.update_exploded_items() return bom_list
diff --git a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py index 3f6cb44..59861ce 100644 --- a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +++ b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
@@ -62,7 +62,7 @@ bom_list.append(d[0]) self.get_parent_boms(d[0], bom_list) - return bom_list + return list(set(bom_list)) @frappe.whitelist() def enqueue_replace_bom(args):