diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 277d3e368..5e77d1534 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -18940,6 +18940,27 @@ + + discrepancy + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + joblinestotal false diff --git a/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx b/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx index a101c9fb9..4f3474750 100644 --- a/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx +++ b/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx @@ -46,51 +46,63 @@ export default function JobReconciliationTotals({ }, [billLines, jobLines, selectedBillLines, selectedJobLines]); return ( -
- - - - - - - +
+
+ + + + + +
+
+ + + + + +
{errors.length > 0 && (
{t("general.labels.errors")} diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx index bc14e9556..89ae8a7cd 100644 --- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx +++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx @@ -98,6 +98,14 @@ export default function TimeTicketList({ sortOrder: state.sortedInfo.columnKey === "actualhrs" && state.sortedInfo.order, }, + { + title: t("timetickets.fields.memo"), + dataIndex: "memo", + key: "memo", + sorter: (a, b) => a.memo - b.memo, + sortOrder: + state.sortedInfo.columnKey === "memo" && state.sortedInfo.order, + }, { title: t("timetickets.fields.clockon"), dataIndex: "clockon", diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx index b37611336..76917a858 100644 --- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx +++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx @@ -124,6 +124,10 @@ export default function TimeTicketModalComponent({ + + + +