mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-24 17:18:30 +00:00
fix: cherry pick
This commit is contained in:
@@ -107,17 +107,6 @@ frappe.ui.form.on("Material Request", {
|
|||||||
|
|
||||||
if (flt(frm.doc.per_received, precision) < 100) {
|
if (flt(frm.doc.per_received, precision) < 100) {
|
||||||
frm.add_custom_button(__("Stop"), () => frm.events.update_status(frm, "Stopped"));
|
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) {
|
if (flt(frm.doc.per_ordered, precision) < 100) {
|
||||||
|
|||||||
Reference in New Issue
Block a user