schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: add Stock UOM when adding new item in POS list (#44780)

Browse Source 
(cherry picked from commit d4b21f532a)

# Conflicts:
#	erpnext/selling/page/point_of_sale/pos_controller.js
This commit is contained in:
Abdeali Chharchhodawala
2024-12-24 10:22:32 +05:30
committed by Mergify
parent f0671d45de
commit a53307559c
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/selling/page/point_of_sale/pos_controller.js
View File

@@ -574,11 +574,23 @@ erpnext.PointOfSale.Controller = class {
} else {
if (!this.frm.doc.customer) return this.raise_customer_selection_alert();
const { item_code, batch_no, serial_no, rate, uom } = item;
const { item_code, batch_no, serial_no, rate, uom, stock_uom } = item;
if (!item_code) return;
<<<<<<< HEAD
const new_item = { item_code, batch_no, rate, uom, [field]: value };
=======
if (rate == undefined || rate == 0) {
frappe.show_alert({
message: __("Price is not set for the item."),
indicator: "orange",
});
frappe.utils.play_sound("error");
return;
}
const new_item = { item_code, batch_no, rate, uom, [field]: value, stock_uom };
>>>>>>> d4b21f532a (fix: add `Stock UOM` when adding new item in POS list (#44780))
if (serial_no) {
await this.check_serial_no_availablilty(item_code, this.frm.doc.set_warehouse, serial_no);

5
erpnext/selling/page/point_of_sale/pos_item_selector.js
View File

@@ -118,6 +118,7 @@ erpnext.PointOfSale.ItemSelector = class {
data-item-code="${escape(item.item_code)}" data-serial-no="${escape(serial_no)}"
data-batch-no="${escape(batch_no)}" data-uom="${escape(uom)}"
data-rate="${escape(price_list_rate || 0)}"
data-stock-uom="${escape(item.stock_uom)}"
title="${item.item_name}">
${get_item_image_html()}
@@ -251,17 +252,19 @@ erpnext.PointOfSale.ItemSelector = class {
let serial_no = unescape($item.attr("data-serial-no"));
let uom = unescape($item.attr("data-uom"));
let rate = unescape($item.attr("data-rate"));
let stock_uom = unescape($item.attr("data-stock-uom"));
// escape(undefined) returns "undefined" then unescape returns "undefined"
batch_no = batch_no === "undefined" ? undefined : batch_no;
serial_no = serial_no === "undefined" ? undefined : serial_no;
uom = uom === "undefined" ? undefined : uom;
rate = rate === "undefined" ? undefined : rate;
stock_uom = stock_uom === "undefined" ? undefined : stock_uom;
me.events.item_selected({
field: "qty",
value: "+1",
item: { item_code, batch_no, serial_no, uom, rate },
item: { item_code, batch_no, serial_no, uom, rate, stock_uom },
});
me.search_field.set_focus();
});