diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 8c6af0eb4..4e0624829 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -2354,6 +2354,27 @@ + + is_credit_memo_short + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + local_tax_rate false diff --git a/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx b/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx index ea91a4b91..5cbe83620 100644 --- a/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx +++ b/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx @@ -22,7 +22,7 @@ export default function JobReconciliationBillsTable({ dataIndex: "line_desc", key: "line_desc", ellipsis: true, - minWidth: "65rem", + width: "10rem", sorter: (a, b) => alphaSort(a.line_desc, b.line_desc), sortOrder: state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order, @@ -72,11 +72,11 @@ export default function JobReconciliationBillsTable({ state.sortedInfo.columnKey === "quantity" && state.sortedInfo.order, }, { - title: t("bills.fields.is_credit_memo"), + title: t("bills.fields.is_credit_memo_short"), dataIndex: "is_credit_memo", key: "is_credit_memo", sorter: (a, b) => a.bill.is_credit_memo - b.bill.is_credit_memo, - width: "8rem", + width: "3rem", sortOrder: state.sortedInfo.columnKey === "is_credit_memo" && state.sortedInfo.order, diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 8ed44e230..8cbcfc8de 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -157,6 +157,7 @@ "federal_tax_rate": "Federal Tax Rate", "invoice_number": "Invoice Number", "is_credit_memo": "Credit Memo?", + "is_credit_memo_short": "CM", "local_tax_rate": "Local Tax Rate", "ro_number": "RO Number", "state_tax_rate": "Provincial/State Tax Rate", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index d99f0b7c7..f014e4130 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -157,6 +157,7 @@ "federal_tax_rate": "", "invoice_number": "", "is_credit_memo": "", + "is_credit_memo_short": "", "local_tax_rate": "", "ro_number": "", "state_tax_rate": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index b32145edc..a4a8e81e3 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -157,6 +157,7 @@ "federal_tax_rate": "", "invoice_number": "", "is_credit_memo": "", + "is_credit_memo_short": "", "local_tax_rate": "", "ro_number": "", "state_tax_rate": "",