From 20aba541c4218fd4847ec4feb9983aba6ec73d0f Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 16 Apr 2025 20:32:05 +0530 Subject: [PATCH] fix: cherry pick --- .../doctype/material_request/material_request.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index 86a4333eb65..5f46ef968b0 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -107,17 +107,6 @@ frappe.ui.form.on("Material Request", { if (flt(frm.doc.per_received, precision) < 100) { frm.add_custom_button(__("Stop"), () => frm.events.update_status(frm, "Stopped")); -<<<<<<< HEAD - - if (frm.doc.material_request_type === "Purchase") { - frm.add_custom_button( - __("Purchase Order"), - () => frm.events.make_purchase_order(frm), - __("Create") - ); - } -======= ->>>>>>> 5a524854de (fix: consider per_ordered instead of per_billed when creating PO from MR) } if (flt(frm.doc.per_ordered, precision) < 100) {