Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ux): set rate as price list rate on uom change in MR (backport #39816) #39818

Merged
merged 3 commits into from
Feb 10, 2024
Merged

fix(ux): set rate as price list rate on uom change in MR (backport #39816) #39818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b4b4d5
fix: add price list rate field in MR Item
s-aga-r Feb 8, 2024
653334a
fix: set rate as price list rate on uom change
s-aga-r Feb 8, 2024
8b0712b
chore: linter
s-aga-r Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions erpnext/stock/doctype/material_request/material_request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,17 @@ frappe.ui.form.on('Material Request', {
const qty_fields = ['actual_qty', 'projected_qty', 'min_order_qty'];

if(!r.exc) {
$.each(r.message, function(k, v) {
if(!d[k] || in_list(qty_fields, k)) d[k] = v;
$.each(r.message, function(key, value) {
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);
}
}
}
});
Expand Down Expand Up @@ -432,7 +440,6 @@ frappe.ui.form.on("Material Request Item", {
item.amount = flt(item.qty) * flt(item.rate);
frappe.model.set_value(doctype, name, "amount", item.amount);
refresh_field("amount", item.name, item.parentfield);
frm.events.get_item_data(frm, item, false);
},

item_code: function(frm, doctype, name) {
Expand All @@ -452,7 +459,12 @@ frappe.ui.form.on("Material Request Item", {
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 {
Expand Down
12 changes: 11 additions & 1 deletion erpnext/stock/doctype/material_request_item/material_request_item.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"received_qty",
"rate_and_amount_section_break",
"rate",
"price_list_rate",
"col_break3",
"amount",
"accounting_details_section",
Expand Down Expand Up @@ -473,13 +474,22 @@
"fieldtype": "Link",
"label": "WIP Composite 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,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2023-11-14 18:37:59.599115",
"modified": "2024-02-08 16:30:56.137858",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request Item",
Expand Down
1 change: 1 addition & 0 deletions erpnext/stock/doctype/material_request_item/material_request_item.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class MaterialRequestItem(Document):
parent: DF.Data
parentfield: DF.Data
parenttype: DF.Data
price_list_rate: DF.Currency
production_plan: DF.Link | None
project: DF.Link | None
projected_qty: DF.Float
Expand Down
Loading