diff --git a/App/components/po/po-detail.tsx b/App/components/po/po-detail.tsx index 7c74b32..21288b0 100644 --- a/App/components/po/po-detail.tsx +++ b/App/components/po/po-detail.tsx @@ -163,6 +163,9 @@ export async function PoDetail({ po, currentUserId, currentRole, readOnly = fals .reverse() .find((a) => a.actionType === "APPROVED" || a.actionType === "APPROVED_WITH_NOTE"); + // PO date: submitter-set date → approved date → creation date + const poDisplayDate = po.poDate ?? po.approvedAt ?? po.createdAt; + return (
{/* Header */} @@ -302,7 +305,7 @@ export async function PoDetail({ po, currentUserId, currentRole, readOnly = fals {approvalAction && (
Approved By
{approvalAction.actor.name}
)} - {po.poDate &&
PO Date
{formatDate(po.poDate)}
} +
PO Date
{formatDate(poDisplayDate)}
{po.projectCode &&
Project Code
{po.projectCode}
} {po.dateRequired &&
Delivery Date Required
{formatDate(po.dateRequired)}
} {po.piQuotationNo &&
PI / Quotation No.
{po.piQuotationNo}
}