mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-12 03:15:07 +00:00
fix(manufacturing): apply work order status filter in job card (#53776)
This commit is contained in:
@@ -31,8 +31,6 @@ frappe.ui.form.on("Job Card", {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
frm.set_query("operation", "time_logs", () => {
|
frm.set_query("operation", "time_logs", () => {
|
||||||
let operations = (frm.doc.sub_operations || []).map((d) => d.sub_operation);
|
let operations = (frm.doc.sub_operations || []).map((d) => d.sub_operation);
|
||||||
return {
|
return {
|
||||||
@@ -61,7 +59,6 @@ frappe.ui.form.on("Job Card", {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
>>>>>>> d43d308e2f (fix(manufacturing): apply work order status filter in job card (#53766))
|
|
||||||
frm.set_indicator_formatter("sub_operation", function (doc) {
|
frm.set_indicator_formatter("sub_operation", function (doc) {
|
||||||
if (doc.status == "Pending") {
|
if (doc.status == "Pending") {
|
||||||
return "red";
|
return "red";
|
||||||
|
|||||||
Reference in New Issue
Block a user