From f14b665e266ab7a883530338a042130fc3c44a7f Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 8 Feb 2021 10:37:43 -0800
Subject: [PATCH] Translation cleanup for bills IO-493

---
 bodyshop_translations.babel                   | 42 +++++++++----------
 .../bill-form/bill-form.lines.component.jsx   |  2 +-
 .../bills-list-table.component.jsx            |  2 +-
 ...b-reconciliation-bills-table.component.jsx |  2 +-
 client/src/translations/en_us/common.json     |  4 +-
 client/src/translations/es/common.json        |  2 +-
 client/src/translations/fr/common.json        |  2 +-
 7 files changed, 28 insertions(+), 28 deletions(-)

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 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>actual_price</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>cost_center</name>
                                         <definition_loaded>false</definition_loaded>
@@ -1269,27 +1290,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>retail</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>state_tax_applicable</name>
                                         <definition_loaded>false</definition_loaded>
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({
                         />
                       </Form.Item>
                       <Form.Item
-                        label={t("billlines.fields.actual")}
+                        label={t("billlines.fields.actual_price")}
                         key={`${index}actual_price`}
                         name={[field.name, "actual_price"]}
                         rules={[
diff --git a/client/src/components/bills-list-table/bills-list-table.component.jsx b/client/src/components/bills-list-table/bills-list-table.component.jsx
index 4e611a4bf..23a45b3fe 100644
--- a/client/src/components/bills-list-table/bills-list-table.component.jsx
+++ b/client/src/components/bills-list-table/bills-list-table.component.jsx
@@ -146,7 +146,7 @@ export function BillsListTableComponent({
           state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
       },
       {
-        title: t("billlines.fields.retail"),
+        title: t("billlines.fields.actual_price"),
         dataIndex: "actual_price",
         key: "actual_price",
         sorter: (a, b) => 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": {