nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-09-28 14:49:25 +05:30
parent 96fa14be88
commit a604eed1b9
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/page/point_of_sale/pos_item_details.js
View File

@@ -242,12 +242,8 @@ erpnext.PointOfSale.ItemDetails = class {
if (this.value) { if (this.value) {
me.events.form_updated(me.current_item, 'warehouse', this.value).then(() => { me.events.form_updated(me.current_item, 'warehouse', this.value).then(() => {
me.item_stock_map = me.events.get_item_stock_map(); 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 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]); 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) { if (available_qty === undefined) {
me.events.get_available_stock(me.item_row.item_code, this.value).then(() => { me.events.get_available_stock(me.item_row.item_code, this.value).then(() => {
// item stock map is updated now reset warehouse // item stock map is updated now reset warehouse