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/madge-graph.svg b/client/madge-graph.svg
deleted file mode 100644
index 3f75254d9..000000000
--- a/client/madge-graph.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.44.1 (20200629.0846)
- -->
-<!-- Title: G Pages: 1 -->
-<svg width="43pt" height="43pt"
- viewBox="0.00 0.00 43.20 43.20" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(21.6 21.6)">
-<title>G</title>
-<polygon fill="#111111" stroke="transparent" points="-21.6,21.6 -21.6,-21.6 21.6,-21.6 21.6,21.6 -21.6,21.6"/>
-</g>
-</svg>
diff --git a/client/src/components/contracts-find-modal/contracts-find-modal.component.jsx b/client/src/components/contracts-find-modal/contracts-find-modal.component.jsx
index ac07f4c19..83a87b39a 100644
--- a/client/src/components/contracts-find-modal/contracts-find-modal.component.jsx
+++ b/client/src/components/contracts-find-modal/contracts-find-modal.component.jsx
@@ -17,7 +17,7 @@ export function PartsReceiveModalComponent({ bodyshop, form }) {
 
   return (
     <div>
-      <Form.Item name="fleet" label={t("courtesycars.fields.fleetnumber")}>
+      <Form.Item name="plate" label={t("courtesycars.fields.plate")}>
         <Input />
       </Form.Item>
       <Form.Item
diff --git a/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx b/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
index e211eb72f..a450d5845 100644
--- a/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
+++ b/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
@@ -44,8 +44,8 @@ export function ContractsFindModalContainer({
 
     callSearch({
       variables: {
-        fleet:
-          (values.fleet && values.fleet !== "" && values.fleet) || undefined,
+        plate:
+          (values.plate && values.plate !== "" && values.plate) || undefined,
         time: values.time,
       },
     });
diff --git a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
index 98d5b06bc..d531606e5 100644
--- a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
+++ b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
@@ -90,13 +90,12 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       // sorter: (a, b) => alphaSort(a.model, b.model),
       sortOrder:
         state.sortedInfo.columnKey === "model" && state.sortedInfo.order,
-      render: (text, record) => (
-        <div>
-          {record.cccontracts.length === 1
-            ? record.cccontracts[0].job.ro_number
-            : null}
-        </div>
-      ),
+      render: (text, record) =>
+        record.cccontracts.length === 1 ? (
+          <Link to={`/manage/jobs/${record.cccontracts[0].job.id}`}>
+            {record.cccontracts[0].job.ro_number}
+          </Link>
+        ) : null,
     },
   ];
 
diff --git a/client/src/components/documents-upload/documents-upload.utility.js b/client/src/components/documents-upload/documents-upload.utility.js
index abc0315f1..bca78f094 100644
--- a/client/src/components/documents-upload/documents-upload.utility.js
+++ b/client/src/components/documents-upload/documents-upload.utility.js
@@ -132,9 +132,13 @@ export const uploadToCloudinary = async (
   //Insert the document with the matching key.
   let takenat;
   if (fileType.includes("image")) {
-    const exif = await exifr.parse(file);
+    try {
+      const exif = await exifr.parse(file);
 
-    takenat = exif && exif.DateTimeOriginal;
+      takenat = exif && exif.DateTimeOriginal;
+    } catch (error) {
+      console.log("Unable to parse image file for EXIF Data");
+    }
   }
   const documentInsert = await client.mutate({
     mutation: INSERT_NEW_DOCUMENT,
diff --git a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.delete.component.jsx b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.delete.component.jsx
index 9d3764daf..4928c572b 100644
--- a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.delete.component.jsx
+++ b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.delete.component.jsx
@@ -37,7 +37,7 @@ export default function JobsDocumentsDeleteButton({
             }),
           });
         } else {
-          successfulDeletes.push(key);
+          successfulDeletes.push(key.replace(/\.[^/.]+$/, ""));
         }
       });
     });
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/graphql/cccontracts.queries.js b/client/src/graphql/cccontracts.queries.js
index 0c9be3cf8..b25f88adf 100644
--- a/client/src/graphql/cccontracts.queries.js
+++ b/client/src/graphql/cccontracts.queries.js
@@ -191,7 +191,7 @@ export const QUERY_ACTIVE_CONTRACTS_PAGINATED = gql`
 `;
 
 export const FIND_CONTRACT = gql`
-  query FIND_CONTRACT($fleet: String, $time: timestamptz!) {
+  query FIND_CONTRACT($plate: String, $time: timestamptz!) {
     cccontracts(
       where: {
         _or: [
@@ -199,7 +199,7 @@ export const FIND_CONTRACT = gql`
           { actualreturn: { _is_null: true } }
         ]
         start: { _lte: $time }
-        courtesycar: { fleetnumber: { _eq: $fleet } }
+        courtesycar: { plate: { _eq: $plate } }
       }
     ) {
       agreementnumber
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."
 			}
diff --git a/server/media/media.js b/server/media/media.js
index 727c040c9..e427cd069 100644
--- a/server/media/media.js
+++ b/server/media/media.js
@@ -60,7 +60,7 @@ exports.deleteFiles = async (req, res) => {
     //delete images  returns.push(
     returns.push(
       await cloudinary.api.delete_resources(
-        types.raw.map((x) => x.key),
+        types.raw.map((x) => `${x.key}.${x.extension}`),
         { resource_type: "raw" }
       )
     );