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

Merge pull request #53234 from aerele/fix/support-#61532

Browse Source
This commit is contained in:
Mihir Kandoi
2026-03-09 12:33:46 +05:30
committed by GitHub
parent bf38dea95f ae9ff767fa
commit adbe856c4e
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
erpnext/manufacturing/doctype/work_order/work_order.js
View File

@@ -461,10 +461,11 @@ frappe.ui.form.on("Work Order", {
var added_min = false; var added_min = false;
// produced qty // produced qty
var title = __("{0} items produced", [frm.doc.produced_qty]); let produced_qty = frm.doc.produced_qty - frm.doc.disassembled_qty;
var title = __("{0} items produced", [produced_qty]);
bars.push({ bars.push({
title: title, title: title,
width: (frm.doc.produced_qty / frm.doc.qty) * 100 + "%", width: (flt(produced_qty) / frm.doc.qty) * 100 + "%",
progress_class: "progress-bar-success", progress_class: "progress-bar-success",
}); });
if (bars[0].width == "0%") { if (bars[0].width == "0%") {
@@ -481,14 +482,27 @@ frappe.ui.form.on("Work Order", {
if (pending_complete > 0) { if (pending_complete > 0) {
var width = (pending_complete / frm.doc.qty) * 100 - added_min; var width = (pending_complete / frm.doc.qty) * 100 - added_min;
title = __("{0} items in progress", [pending_complete]); title = __("{0} items in progress", [pending_complete]);
let progress_class = "progress-bar-warning";
if (frm.doc.status == "Closed") {
if (frm.doc.required_items.find((d) => d.returned_qty > 0)) {
title = __("{0} items returned", [pending_complete]);
progress_class = "progress-bar-warning";
} else {
title = __("{0} items to return", [pending_complete]);
progress_class = "progress-bar-info";
}
}
bars.push({ bars.push({
title: title, title: title,
width: (width > 100 ? "99.5" : width) + "%", width: (width > 100 ? "99.5" : width) + "%",
progress_class: "progress-bar-warning", progress_class: progress_class,
}); });
message = message + ". " + title; message = message + ". " + title;
} }
} }
//process loss qty
if (frm.doc.process_loss_qty) { if (frm.doc.process_loss_qty) {
var process_loss_width = (frm.doc.process_loss_qty / frm.doc.qty) * 100; var process_loss_width = (frm.doc.process_loss_qty / frm.doc.qty) * 100;
title = __("{0} items lost during process.", [frm.doc.process_loss_qty]); title = __("{0} items lost during process.", [frm.doc.process_loss_qty]);
@@ -499,6 +513,19 @@ frappe.ui.form.on("Work Order", {
}); });
message = message + ". " + title; message = message + ". " + title;
} }
// disassembled qty
if (frm.doc.disassembled_qty) {
var disassembled_width = (frm.doc.disassembled_qty / frm.doc.qty) * 100;
title = __("{0} items disassembled", [frm.doc.disassembled_qty]);
bars.push({
title: title,
width: disassembled_width + "%",
progress_class: "progress-bar-secondary",
});
message = message + ". " + title;
}
frm.dashboard.add_progress(__("Status"), bars, message); frm.dashboard.add_progress(__("Status"), bars, message);
}, },