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

Merge pull request #39816 from s-aga-r/FIX-9595

Browse Source 
fix(ux): set rate as price list rate on uom change in MR
This commit is contained in:
s-aga-r 2024-02-08 17:54:19 +05:30 committed by GitHub
commit 1568af2a7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,9 +228,17 @@ frappe.ui.form.on('Material Request', {
const qty_fields = ['actual_qty', 'projected_qty', 'min_order_qty']; const qty_fields = ['actual_qty', 'projected_qty', 'min_order_qty'];
if(!r.exc) { if(!r.exc) {
$.each(r.message, function(k, v) { $.each(r.message, function(key, value) {
if(!d[k] || in_list(qty_fields, k)) d[k] = v; if(!d[key] || qty_fields.includes(key)) {
d[key] = value;
}
}); });
if (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);
}
} }
} }
}); });
@ -432,7 +440,6 @@ frappe.ui.form.on("Material Request Item", {
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);
refresh_field("amount", item.name, item.parentfield); refresh_field("amount", item.name, item.parentfield);
frm.events.get_item_data(frm, item, false);
}, },
item_code: function(frm, doctype, name) { item_code: function(frm, doctype, name) {
@ -452,7 +459,12 @@ frappe.ui.form.on("Material Request Item", {
set_schedule_date(frm); set_schedule_date(frm);
} }
} }
} },
conversion_factor: function(frm, doctype, name) {
const item = locals[doctype][name];
frm.events.get_item_data(frm, item, false);
},
}); });
erpnext.buying.MaterialRequestController = class MaterialRequestController extends erpnext.buying.BuyingController { erpnext.buying.MaterialRequestController = class MaterialRequestController extends erpnext.buying.BuyingController {

12
erpnext/stock/doctype/material_request_item/material_request_item.json
View File

@ -35,6 +35,7 @@
"received_qty", "received_qty",
"rate_and_amount_section_break", "rate_and_amount_section_break",
"rate", "rate",
"price_list_rate",
"col_break3", "col_break3",
"amount", "amount",
"accounting_details_section", "accounting_details_section",
@ -473,13 +474,22 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "WIP Composite Asset", "label": "WIP Composite Asset",
"options": "Asset" "options": "Asset"
},
{
"fieldname": "price_list_rate",
"fieldtype": "Currency",
"hidden": 1,
"label": "Price List Rate",
"options": "currency",
"print_hide": 1,
"read_only": 1
} }
], ],
"idx": 1, "idx": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2023-11-14 18:37:59.599115", "modified": "2024-02-08 16:30:56.137858",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Material Request Item", "name": "Material Request Item",

1
erpnext/stock/doctype/material_request_item/material_request_item.py
View File

@ -41,6 +41,7 @@ class MaterialRequestItem(Document):
parent: DF.Data parent: DF.Data
parentfield: DF.Data parentfield: DF.Data
parenttype: DF.Data parenttype: DF.Data
price_list_rate: DF.Currency
production_plan: DF.Link | None production_plan: DF.Link | None
project: DF.Link | None project: DF.Link | None
projected_qty: DF.Float projected_qty: DF.Float