nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-20 23:35:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fetch bom_no when updating items in sales order

Browse Source 
(cherry picked from commit 508727a57a)

# Conflicts:
#	erpnext/public/js/utils.js
This commit is contained in:
Mihir Kandoi
2025-03-19 12:52:34 +05:30
committed by Mergify
parent 1b8e8e92ae
commit 41d8b26dd2
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/accounts_controller.py
View File

@@ -3706,6 +3706,9 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
if d.get("schedule_date") and parent_doctype == "Purchase Order": if d.get("schedule_date") and parent_doctype == "Purchase Order":
child_item.schedule_date = d.get("schedule_date") child_item.schedule_date = d.get("schedule_date")
if d.get("bom_no") and parent_doctype == "Sales Order":
child_item.bom_no = d.get("bom_no")
if flt(child_item.price_list_rate): if flt(child_item.price_list_rate):
if flt(child_item.rate) > flt(child_item.price_list_rate): if flt(child_item.rate) > flt(child_item.price_list_rate):
# if rate is greater than price_list_rate, set margin # if rate is greater than price_list_rate, set margin

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

@@ -692,7 +692,18 @@ erpnext.utils.update_child_items = function (opts) {
}, },
callback: function (r) { callback: function (r) {
if (r.message) { if (r.message) {
<<<<<<< HEAD
const { qty, price_list_rate: rate, uom, conversion_factor } = r.message; const { qty, price_list_rate: rate, uom, conversion_factor } = r.message;
=======
const {
qty,
price_list_rate: rate,
uom,
conversion_factor,
item_name,
default_bom,
} = r.message;
>>>>>>> 508727a57a (fix: fetch bom_no when updating items in sales order)
const row = dialog.fields_dict.trans_items.df.data.find( const row = dialog.fields_dict.trans_items.df.data.find(
(doc) => doc.idx == me.doc.idx (doc) => doc.idx == me.doc.idx
@@ -703,6 +714,11 @@ erpnext.utils.update_child_items = function (opts) {
uom: me.doc.uom || uom, uom: me.doc.uom || uom,
qty: me.doc.qty || qty, qty: me.doc.qty || qty,
rate: me.doc.rate || rate, rate: me.doc.rate || rate,
<<<<<<< HEAD
=======
item_name: item_name,
bom_no: default_bom,
>>>>>>> 508727a57a (fix: fetch bom_no when updating items in sales order)
}); });
dialog.fields_dict.trans_items.grid.refresh(); dialog.fields_dict.trans_items.grid.refresh();
} }

1
erpnext/stock/get_item_details.py
View File

@@ -472,6 +472,7 @@ 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,
} }
) )