nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-05 22:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-03-19 15:47:43 +05:30
committed by GitHub
parent e5b2801830
commit 38213b31da
1 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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