diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 083b05eda..78eaf286a 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -1143,6 +1143,27 @@ + + actual_price + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + cost_center false @@ -1269,27 +1290,6 @@ - - retail - false - - - - - - en-US - false - - - es-MX - false - - - fr-CA - false - - - state_tax_applicable false diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx index 3ffdbb689..365e43efb 100644 --- a/client/src/components/bill-form/bill-form.lines.component.jsx +++ b/client/src/components/bill-form/bill-form.lines.component.jsx @@ -117,7 +117,7 @@ export function BillEnterModalLinesComponent({ /> a.actual_price - b.actual_price, 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 f028cb87b..bf25b4204 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 @@ -35,7 +35,7 @@ export default function JobReconciliationBillsTable({ }`, }, { - title: t("billlines.fields.retail"), + title: t("billlines.fields.actua_price"), dataIndex: "actual_price", key: "actual_price", sorter: (a, b) => a.actual_price - b.actual_price, diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index aaf448242..1e1e9e941 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -85,15 +85,15 @@ "newline": "New Line" }, "fields": { - "actual": "List Price", + "actual": "Retail Price", "actual_cost": "Actual Cost", + "actual_price": "Retail", "cost_center": "Cost Center", "federal_tax_applicable": "Fed. Tax?", "jobline": "Job Line", "line_desc": "Line Description", "local_tax_applicable": "Loc. Tax?", "quantity": "Quantity", - "retail": "Retail", "state_tax_applicable": "St. Tax?" }, "labels": { diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index a1a460401..b1ab61528 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -87,13 +87,13 @@ "fields": { "actual": "", "actual_cost": "", + "actual_price": "", "cost_center": "", "federal_tax_applicable": "", "jobline": "", "line_desc": "", "local_tax_applicable": "", "quantity": "", - "retail": "", "state_tax_applicable": "" }, "labels": { diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index d61449fb4..9101a6c4b 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -87,13 +87,13 @@ "fields": { "actual": "", "actual_cost": "", + "actual_price": "", "cost_center": "", "federal_tax_applicable": "", "jobline": "", "line_desc": "", "local_tax_applicable": "", "quantity": "", - "retail": "", "state_tax_applicable": "" }, "labels": {