From 8ee7c47fdf7528469e23c0aaab07160c1aca35da Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 1 Dec 2025 18:48:53 +0530 Subject: [PATCH 1/2] fix: label for warehouse based on material request type (cherry picked from commit 699e9b44520ffe2963c13dfc41fc88e45b1eec2d) # Conflicts: # erpnext/stock/doctype/material_request/material_request.js --- .../material_request/material_request.js | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index f295f33853f..cfe9d8442a9 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -96,6 +96,16 @@ frappe.ui.form.on("Material Request", { refresh: function (frm) { frm.events.make_custom_buttons(frm); frm.toggle_reqd("customer", frm.doc.material_request_type == "Customer Provided"); +<<<<<<< HEAD +======= + prevent_past_schedule_dates(frm); + frm.trigger("set_warehouse_label"); + }, + + transaction_date(frm) { + prevent_past_schedule_dates(frm); + frm.set_value("schedule_date", ""); +>>>>>>> 699e9b4452 (fix: label for warehouse based on material request type) }, set_from_warehouse: function (frm) { @@ -499,6 +509,23 @@ frappe.ui.form.on("Material Request", { if (frm.doc.material_request_type !== "Material Transfer" && frm.doc.set_from_warehouse) { frm.set_value("set_from_warehouse", ""); } + + frm.trigger("set_warehouse_label"); + }, + + set_warehouse_label(frm) { + let warehouse_label = + frm.doc.material_request_type === "Material Transfer" ? "Target Warehouse" : "Warehouse"; + if (frm.doc.material_request_type === "Material Issue") { + warehouse_label = "From Warehouse"; + } + + frm.fields_dict["items"].grid.update_docfield_property("warehouse", "label", __(warehouse_label)); + + warehouse_label = "Set " + warehouse_label; + frm.set_df_property("set_warehouse", "label", __(warehouse_label)); + + refresh_field("items"); }, }); From dba3f3d3352772609dddcaa39ce7bc4b55ed50a1 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 2 Dec 2025 11:04:27 +0530 Subject: [PATCH 2/2] chore: fix conflicts --- .../stock/doctype/material_request/material_request.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index cfe9d8442a9..978a7b41d69 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -96,18 +96,9 @@ frappe.ui.form.on("Material Request", { refresh: function (frm) { frm.events.make_custom_buttons(frm); frm.toggle_reqd("customer", frm.doc.material_request_type == "Customer Provided"); -<<<<<<< HEAD -======= - prevent_past_schedule_dates(frm); frm.trigger("set_warehouse_label"); }, - transaction_date(frm) { - prevent_past_schedule_dates(frm); - frm.set_value("schedule_date", ""); ->>>>>>> 699e9b4452 (fix: label for warehouse based on material request type) - }, - set_from_warehouse: function (frm) { if (frm.doc.material_request_type == "Material Transfer" && frm.doc.set_from_warehouse) { frm.doc.items.forEach((d) => {