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

fix: Stock UOM not fetched when Stock Entry create from Item Dashboard (#43457)

Browse Source
This commit is contained in:
rohitwaghchaure
2024-10-01 14:27:55 +05:30
committed by GitHub
parent 2384309b43
commit 895b072bad
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/dashboard/item_dashboard.js
View File

@@ -48,17 +48,18 @@ erpnext.stock.ItemDashboard = class ItemDashboard {
let actual_qty = unescape(element.attr("data-actual_qty"));
let disable_quick_entry = Number(unescape(element.attr("data-disable_quick_entry")));
let entry_type = action === "Move" ? "Material Transfer" : "Material Receipt";
let stock_uom = unescape(element.attr("data-stock-uom"));
if (disable_quick_entry) {
open_stock_entry(item, warehouse, entry_type);
} else {
if (action === "Add") {
let rate = unescape($(this).attr("data-rate"));
erpnext.stock.move_item(item, null, warehouse, actual_qty, rate, function () {
erpnext.stock.move_item(item, null, warehouse, actual_qty, rate, stock_uom, function () {
me.refresh();
});
} else {
erpnext.stock.move_item(item, warehouse, null, actual_qty, null, function () {
erpnext.stock.move_item(item, warehouse, null, actual_qty, null, stock_uom, function () {
me.refresh();
});
}
@@ -207,7 +208,7 @@ erpnext.stock.ItemDashboard = class ItemDashboard {
}
};
erpnext.stock.move_item = function (item, source, target, actual_qty, rate, callback) {
erpnext.stock.move_item = function (item, source, target, actual_qty, rate, stock_uom, callback) {
var dialog = new frappe.ui.Dialog({
title: target ? __("Add Item") : __("Move Item"),
fields: [
@@ -295,6 +296,8 @@ erpnext.stock.move_item = function (item, source, target, actual_qty, rate, call
let row = frappe.model.add_child(doc, "items");
row.item_code = dialog.get_value("item_code");
row.s_warehouse = dialog.get_value("source");
row.stock_uom = stock_uom;
row.uom = stock_uom;
row.t_warehouse = dialog.get_value("target");
row.qty = dialog.get_value("qty");
row.conversion_factor = 1;

1
erpnext/stock/dashboard/item_dashboard.py
View File

@@ -71,6 +71,7 @@ def get_data(
item.update(
{
"item_name": frappe.get_cached_value("Item", item.item_code, "item_name"),
"stock_uom": frappe.get_cached_value("Item", item.item_code, "stock_uom"),
"disable_quick_entry": frappe.get_cached_value("Item", item.item_code, "has_batch_no")
or frappe.get_cached_value("Item", item.item_code, "has_serial_no"),
"projected_qty": flt(item.projected_qty, precision),

2
erpnext/stock/dashboard/item_dashboard_list.html
View File

@@ -49,12 +49,14 @@
data-disable_quick_entry="{{ d.disable_quick_entry }}"
data-warehouse="{{ d.warehouse }}"
data-actual_qty="{{ d.actual_qty }}"
data-stock-uom="{{ d.stock_uom }}"
data-item="{{ escape(d.item_code) }}">{{ __("Move") }}</a>
{% endif %}
<button style="margin-left: 7px;" class="btn btn-default btn-xs btn-add"
data-disable_quick_entry="{{ d.disable_quick_entry }}"
data-warehouse="{{ d.warehouse }}"
data-actual_qty="{{ d.actual_qty }}"
data-stock-uom="{{ d.stock_uom }}"
data-item="{{ escape(d.item_code) }}"
data-rate="{{ d.valuation_rate }}">{{ __("Add") }}</a>
</div>