From a604eed1b9a2876ee53f9c430da9a640a26ddd00 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 28 Sep 2022 14:49:25 +0530 Subject: [PATCH] chore: Resolve conflicts --- erpnext/selling/page/point_of_sale/pos_item_details.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/selling/page/point_of_sale/pos_item_details.js b/erpnext/selling/page/point_of_sale/pos_item_details.js index 5b4f22b65a8..f9b5bb2e452 100644 --- a/erpnext/selling/page/point_of_sale/pos_item_details.js +++ b/erpnext/selling/page/point_of_sale/pos_item_details.js @@ -242,12 +242,8 @@ erpnext.PointOfSale.ItemDetails = class { if (this.value) { me.events.form_updated(me.current_item, 'warehouse', this.value).then(() => { me.item_stock_map = me.events.get_item_stock_map(); -<<<<<<< HEAD - const available_qty = me.item_stock_map[me.item_row.item_code][this.value]; -======= const available_qty = me.item_stock_map[me.item_row.item_code][this.value][0]; const is_stock_item = Boolean(me.item_stock_map[me.item_row.item_code][this.value][1]); ->>>>>>> e392ea1104 (fix: POS properly validate stock for bundle products) if (available_qty === undefined) { me.events.get_available_stock(me.item_row.item_code, this.value).then(() => { // item stock map is updated now reset warehouse