From 4cc23830f170be836ff793b517ff64c014176e42 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 4 Apr 2022 15:46:49 +0530 Subject: [PATCH 1/3] fix: maintain FIFO queue even if outgoing_rate is not found (#30563) port of #30560 --- erpnext/stock/stock_ledger.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index 0664a8352b9..b95bcab7149 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -866,16 +866,9 @@ class update_entries_after(object): index = i break - # If no entry found with outgoing rate, collapse stack + # If no entry found with outgoing rate, consume as per FIFO if index is None: # nosemgrep - new_stock_value = ( - sum((d[0] * d[1] for d in self.wh_data.stock_queue)) - qty_to_pop * outgoing_rate - ) - new_stock_qty = sum((d[0] for d in self.wh_data.stock_queue)) - qty_to_pop - self.wh_data.stock_queue = [ - [new_stock_qty, new_stock_value / new_stock_qty if new_stock_qty > 0 else outgoing_rate] - ] - break + index = 0 else: index = 0 From b524e657e21ac4a27bbbcffad4a9ddeb0afe1f99 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 16:35:46 +0530 Subject: [PATCH 2/3] fix(pos): do not reset search input on item selection (backport #30537) --- erpnext/selling/page/point_of_sale/pos_item_selector.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/page/point_of_sale/pos_item_selector.js b/erpnext/selling/page/point_of_sale/pos_item_selector.js index 1177615aee9..b62b27bc4b3 100644 --- a/erpnext/selling/page/point_of_sale/pos_item_selector.js +++ b/erpnext/selling/page/point_of_sale/pos_item_selector.js @@ -243,7 +243,7 @@ erpnext.PointOfSale.ItemSelector = class { value: "+1", item: { item_code, batch_no, serial_no, uom, rate } }); - me.set_search_value(''); + me.search_field.set_focus(); }); this.search_field.$input.on('input', (e) => { @@ -328,6 +328,7 @@ erpnext.PointOfSale.ItemSelector = class { add_filtered_item_to_cart() { this.$items_container.find(".item-wrapper").click(); + this.set_search_value(''); } resize_selector(minimize) { From 012cab80bf2ad4b2ce68dfcdd909a0176633a42d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 17:31:26 +0530 Subject: [PATCH 3/3] fix(ux): refresh update to zero val checkbox (#30567) (#30568) (cherry picked from commit de83511091189194d70b77411298fd809060063d) Co-authored-by: Ankush Menat --- erpnext/stock/doctype/stock_entry/stock_entry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 61466cff032..4ec9f1f220f 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -631,7 +631,7 @@ frappe.ui.form.on('Stock Entry Detail', { // set allow_zero_valuation_rate to 0 if s_warehouse is selected. let item = frappe.get_doc(cdt, cdn); if (item.s_warehouse) { - item.allow_zero_valuation_rate = 0; + frappe.model.set_value(cdt, cdn, "allow_zero_valuation_rate", 0); } },