From 38213b31dad108e8881aa48c9f731786a05f25ee Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 19 Mar 2025 15:47:43 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/public/js/utils.js | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js index d1cc69c6cda..c0126f2c6ee 100755 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -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(); }