nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-12-02 11:04:27 +05:30
committed by GitHub
parent 8ee7c47fdf
commit dba3f3d335
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,18 +96,9 @@ frappe.ui.form.on("Material Request", {
refresh: function (frm) { refresh: function (frm) {
frm.events.make_custom_buttons(frm); frm.events.make_custom_buttons(frm);
frm.toggle_reqd("customer", frm.doc.material_request_type == "Customer Provided"); frm.toggle_reqd("customer", frm.doc.material_request_type == "Customer Provided");
<<<<<<< HEAD
=======
prevent_past_schedule_dates(frm);
frm.trigger("set_warehouse_label"); 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) { set_from_warehouse: function (frm) {
if (frm.doc.material_request_type == "Material Transfer" && frm.doc.set_from_warehouse) { if (frm.doc.material_request_type == "Material Transfer" && frm.doc.set_from_warehouse) {
frm.doc.items.forEach((d) => { frm.doc.items.forEach((d) => {