Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: incorrect item name in MR (backport #40018) (#40024)

Browse Source 
fix: incorrect item name in MR (#40018)

(cherry picked from commit 864d7ae04c3a2992f94eafb47060468f0cfb3c9c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot] 2024-02-22 09:50:45 +05:30 committed by GitHub
parent 43c218c673
commit 9f8f3db953
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/stock/doctype/material_request/material_request.js
View File

@ -199,6 +199,7 @@ frappe.ui.form.on('Material Request', {
get_item_data: function(frm, item, overwrite_warehouse=false) { get_item_data: function(frm, item, overwrite_warehouse=false) {
if (item && !item.item_code) { return; } if (item && !item.item_code) { return; }
frappe.call({ frappe.call({
method: "erpnext.stock.get_item_details.get_item_details", method: "erpnext.stock.get_item_details.get_item_details",
args: { args: {
@ -225,20 +226,22 @@ frappe.ui.form.on('Material Request', {
}, },
callback: function(r) { callback: function(r) {
const d = item; const d = item;
const qty_fields = ['actual_qty', 'projected_qty', 'min_order_qty']; const allow_to_change_fields = ['actual_qty', 'projected_qty', 'min_order_qty', 'item_name', 'description', 'stock_uom', 'uom', 'conversion_factor', 'stock_qty'];
if(!r.exc) { if(!r.exc) {
$.each(r.message, function(key, value) { $.each(r.message, function(key, value) {
if(!d[key] || qty_fields.includes(key)) { if(!d[key] || allow_to_change_fields.includes(key)) {
d[key] = value; d[key] = value;
} }
}); });
if (d.price_list_rate != r.message.price_list_rate) { if (d.price_list_rate != r.message.price_list_rate) {
d.rate = 0.0;
d.price_list_rate = r.message.price_list_rate; d.price_list_rate = r.message.price_list_rate;
frappe.model.set_value(d.doctype, d.name, "rate", d.price_list_rate); frappe.model.set_value(d.doctype, d.name, "rate", d.price_list_rate);
} }
refresh_field("items");
} }
} }
}); });
@ -435,7 +438,7 @@ frappe.ui.form.on("Material Request Item", {
frm.events.get_item_data(frm, item, false); frm.events.get_item_data(frm, item, false);
}, },
rate: function(frm, doctype, name) { rate(frm, doctype, name) {
const item = locals[doctype][name]; const item = locals[doctype][name];
item.amount = flt(item.qty) * flt(item.rate); item.amount = flt(item.qty) * flt(item.rate);
frappe.model.set_value(doctype, name, "amount", item.amount); frappe.model.set_value(doctype, name, "amount", item.amount);