CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-23 13:12:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't throw if item does not have default BOM (backport #36709) (#36734)

Browse Source 
* fix: don't throw if item does not have default BOM

(cherry picked from commit 268c19e745)

* fix: throw if `BOM No` is not set

(cherry picked from commit 2e22b019a0)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
This commit is contained in:
mergify[bot]
2023-08-21 15:21:11 +05:30
committed by GitHub
parent 9ec11d9502
commit e1bd9a7e8d
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/manufacturing/doctype/production_plan/production_plan.py
View File

@@ -347,7 +347,7 @@ class ProductionPlan(Document):
if not data.pending_qty: if not data.pending_qty:
continue continue
item_details = get_item_details(data.item_code) item_details = get_item_details(data.item_code, throw=False)
if self.combine_items: if self.combine_items:
if item_details.bom_no in refs: if item_details.bom_no in refs:
refs[item_details.bom_no]["so_details"].append( refs[item_details.bom_no]["so_details"].append(
@@ -795,6 +795,9 @@ class ProductionPlan(Document):
if not row.item_code: if not row.item_code:
frappe.throw(_("Row #{0}: Please select Item Code in Assembly Items").format(row.idx)) frappe.throw(_("Row #{0}: Please select Item Code in Assembly Items").format(row.idx))
if not row.bom_no:
frappe.throw(_("Row #{0}: Please select the BOM No in Assembly Items").format(row.idx))
bom_data = [] bom_data = []
warehouse = row.warehouse if self.skip_available_sub_assembly_item else None warehouse = row.warehouse if self.skip_available_sub_assembly_item else None

9
erpnext/manufacturing/doctype/work_order/work_order.py
View File

@@ -1075,7 +1075,7 @@ def get_bom_operations(doctype, txt, searchfield, start, page_len, filters):
@frappe.whitelist() @frappe.whitelist()
def get_item_details(item, project=None, skip_bom_info=False): def get_item_details(item, project=None, skip_bom_info=False, throw=True):
res = frappe.db.sql( res = frappe.db.sql(
""" """
select stock_uom, description, item_name, allow_alternative_item, select stock_uom, description, item_name, allow_alternative_item,
@@ -1111,12 +1111,15 @@ def get_item_details(item, project=None, skip_bom_info=False):
if not res["bom_no"]: if not res["bom_no"]:
if project: if project:
res = get_item_details(item) res = get_item_details(item, throw=throw)
frappe.msgprint( frappe.msgprint(
_("Default BOM not found for Item {0} and Project {1}").format(item, project), alert=1 _("Default BOM not found for Item {0} and Project {1}").format(item, project), alert=1
) )
else: else:
frappe.throw(_("Default BOM for {0} not found").format(item)) msg = _("Default BOM for {0} not found").format(item)
frappe.msgprint(msg, raise_exception=throw, indicator="yellow", alert=(not throw))
return res
bom_data = frappe.db.get_value( bom_data = frappe.db.get_value(
"BOM", "BOM",