nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-13 20:18:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove duplicate

Browse Source 
(cherry picked from commit 386df968c2)

# Conflicts:
#	erpnext/public/js/utils.js
This commit is contained in:
Mihir Kandoi
2025-03-19 15:25:50 +05:30
committed by Mergify
parent 41d8b26dd2
commit e5b2801830
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/public/js/utils.js
View File

@@ -701,7 +701,7 @@ erpnext.utils.update_child_items = function (opts) {
uom, uom,
conversion_factor, conversion_factor,
item_name, item_name,
default_bom, bom_no,
} = r.message; } = r.message;
>>>>>>> 508727a57a (fix: fetch bom_no when updating items in sales order) >>>>>>> 508727a57a (fix: fetch bom_no when updating items in sales order)
@@ -717,8 +717,12 @@ erpnext.utils.update_child_items = function (opts) {
<<<<<<< HEAD <<<<<<< HEAD
======= =======
item_name: item_name, item_name: item_name,
<<<<<<< HEAD
bom_no: default_bom, bom_no: default_bom,
>>>>>>> 508727a57a (fix: fetch bom_no when updating items in sales order) >>>>>>> 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(); dialog.fields_dict.trans_items.grid.refresh();
} }

1
erpnext/stock/get_item_details.py
View File

@@ -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_per_unit": args.get("weight_per_unit") or item.get("weight_per_unit"),
"weight_uom": args.get("weight_uom") or item.get("weight_uom"), "weight_uom": args.get("weight_uom") or item.get("weight_uom"),
"grant_commission": item.get("grant_commission"), "grant_commission": item.get("grant_commission"),
"default_bom": item.default_bom,
} }
) )