From 3ab31c8bee9358d2ae9fdba06bd3a08c84dcea49 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 14 Jun 2021 10:44:05 -0700
Subject: [PATCH] IO-1205 IO-1207 IO-1204 Minor UI Updates.

---
 bodyshop_translations.babel                               | 2 +-
 .../parts-order-list-table.component.jsx                  | 2 +-
 client/src/translations/en_us/common.json                 | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 5fcb5546a..74b57be20 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
diff --git a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
index fa7ff6247..4c904776b 100644
--- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
+++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
@@ -139,7 +139,7 @@ export function PartsOrderListTableComponent({
         </Button>
       </Popconfirm>
       <Button
-        disabled={jobRO}
+        disabled={jobRO ? !record.return : jobRO}
         onClick={() => {
           logImEXEvent("parts_order_receive_bill");
 
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 31e88c93c..7b29f0da9 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -156,7 +156,7 @@
 				"markforreexport": "Mark for Re-export",
 				"new": "New Bill",
 				"noneselected": "No bill selected.",
-				"onlycmforinvoiced": "Only credit memos can be entered for any job that has been invoiced.",
+				"onlycmforinvoiced": "Only credit memos can be entered for any job that has been invoiced,  exported,  or voided.",
 				"retailtotal": "Bills Retail Total",
 				"state_tax": "Provincial/State Tax",
 				"subtotal": "Subtotal",
@@ -165,7 +165,7 @@
 			"successes": {
 				"created": "Invoice added successfully.",
 				"deleted": "Bill deleted successfully.",
-				"exported": "Bill exported successfully."
+				"exported": "Bill(s) exported successfully."
 			},
 			"validation": {
 				"manualinhouse": "Manual posting to the in house vendor is restricted. ",
@@ -1389,7 +1389,7 @@
 				"delete": "Job deleted successfully.",
 				"deleted": "Job deleted successfully.",
 				"duplicated": "Job duplicated successfully. ",
-				"exported": "Job exported successfully. ",
+				"exported": "Job(s) exported successfully. ",
 				"invoiced": "Job closed and invoiced successfully.",
 				"partsqueue": "Job added to parts queue.",
 				"save": "Job saved successfully.",
@@ -1663,7 +1663,7 @@
 				"totalpayments": "Total Payments"
 			},
 			"successes": {
-				"exported": "Payment exported successfully.",
+				"exported": "Payment(s) exported successfully.",
 				"payment": "Payment created successfully. ",
 				"stripe": "Credit card transaction charged successfully."
 			}