diff --git a/InvenTree/templates/js/translated/part.js b/InvenTree/templates/js/translated/part.js index 7171e6c7f9..18f7539957 100644 --- a/InvenTree/templates/js/translated/part.js +++ b/InvenTree/templates/js/translated/part.js @@ -1043,20 +1043,34 @@ function loadPartPurchaseOrderTable(table, part_id, options={}) { switchable: true, sortable: true, formatter: function(value, row) { - if (row.target_date) { - var html = row.target_date; - if (row.overdue) { - html += ``; + var target = row.target_date || row.order_detail.target_date; + + var today = moment(); + + var overdue = row.overdue || false; + + if (target) { + if (moment(target) < today) { + overdue = true; } + } + + var html = '-'; + + if (row.target_date) { + html = row.target_date; - return html; } else if (row.order_detail && row.order_detail.target_date) { - return `${row.order_detail.target_date}`; - } else { - return '-'; + html = `${row.order_detail.target_date}`; } + + if (overdue) { + html += ``; + } + + return html; } }, {