diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js index 36320c787b6..d1cc69c6cda 100755 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -701,7 +701,7 @@ erpnext.utils.update_child_items = function (opts) { uom, conversion_factor, item_name, - default_bom, + bom_no, } = r.message; >>>>>>> 508727a57a (fix: fetch bom_no when updating items in sales order) @@ -717,8 +717,12 @@ erpnext.utils.update_child_items = function (opts) { <<<<<<< HEAD ======= item_name: item_name, +<<<<<<< HEAD bom_no: default_bom, >>>>>>> 508727a57a (fix: fetch bom_no when updating items in sales order) +======= + bom_no: bom_no, +>>>>>>> 386df968c2 (fix: remove duplicate) }); dialog.fields_dict.trans_items.grid.refresh(); } diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 2bed71a3e96..ff87d159e36 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -472,7 +472,6 @@ def get_basic_details(args, item, overwrite_warehouse=True): "weight_per_unit": args.get("weight_per_unit") or item.get("weight_per_unit"), "weight_uom": args.get("weight_uom") or item.get("weight_uom"), "grant_commission": item.get("grant_commission"), - "default_bom": item.default_bom, } )