diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index c49f9a9da..36e0ccaaf 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -30837,6 +30837,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>oec</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>
                                 </children>
                             </folder_node>
                             <folder_node>
@@ -31330,6 +31351,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>oec</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>orderhistory</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/parts-order-modal/parts-order-modal.container.jsx b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
index 9ba18c30c..34121c2ed 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.container.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
@@ -228,7 +228,6 @@ export function PartsOrderModalContainer({
             id: insertResult.data.insert_parts_orders.returning[0].id,
           },
         });
-        console.log("🚀 ~ file: parts-order-modal.container.jsx ~ line 231 ~ handleFinish ~ partsOrder", partsOrder)
 
         const oecResponse = await axios.post(
           "http://localhost:1337/oec/",
@@ -240,11 +239,17 @@ export function PartsOrderModalContainer({
             },
           }
         );
-        console.log(
-          "🚀 ~ file: parts-order-modal.container.jsx ~ line 232 ~ handleFinish ~ oecResponse",
-          oecResponse
-        );
-        return;
+
+        if (oecResponse.data && oecResponse.data.success === false) {
+          notification.open({
+            type: "error",
+            message: t("parts_orders.errors.oec", {
+              error: oecResponse.data.error,
+            }),
+          });
+        }
+
+        
       } catch (error) {
         console.log("Error OEC.", error);
         notification["error"]({
diff --git a/client/src/graphql/parts-orders.queries.js b/client/src/graphql/parts-orders.queries.js
index 86c91b109..c85922bd9 100644
--- a/client/src/graphql/parts-orders.queries.js
+++ b/client/src/graphql/parts-orders.queries.js
@@ -16,6 +16,7 @@ export const QUERY_PARTS_ORDER_OEC = gql`
     parts_orders_by_pk(id: $id) {
       parts_order_lines {
         jobline {
+          tran_code
           act_price
           db_ref
           db_price
@@ -70,6 +71,10 @@ export const QUERY_PARTS_ORDER_OEC = gql`
         quantity
       }
       job {
+        bodyshop{
+          shopname
+          bill_tax_rates
+        }
         ro_number
         clm_no
         asgn_no
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 7d021e5f6..733955d2b 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1833,7 +1833,8 @@
 			"errors": {
 				"associatedbills": "This parts order cannot",
 				"backordering": "Error backordering part {{message}}.",
-				"creating": "Error encountered when creating parts order. "
+				"creating": "Error encountered when creating parts order. ",
+				"oec": "Error creating EMS files for OEC. {{error}}"
 			},
 			"fields": {
 				"act_price": "Price",
@@ -1861,6 +1862,7 @@
 				"email": "Send by Email",
 				"inthisorder": "Parts in this Order",
 				"newpartsorder": "New Parts Order",
+				"oec": "Order via OEC",
 				"orderhistory": "Order History",
 				"parts_orders": "Parts Orders",
 				"print": "Show Printed Form",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index f12163cea..b14770f10 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1833,7 +1833,8 @@
 			"errors": {
 				"associatedbills": "",
 				"backordering": "",
-				"creating": "Se encontró un error al crear el pedido de piezas."
+				"creating": "Se encontró un error al crear el pedido de piezas.",
+				"oec": ""
 			},
 			"fields": {
 				"act_price": "",
@@ -1861,6 +1862,7 @@
 				"email": "Enviar por correo electrónico",
 				"inthisorder": "Partes en este pedido",
 				"newpartsorder": "",
+				"oec": "",
 				"orderhistory": "Historial de pedidos",
 				"parts_orders": "",
 				"print": "Mostrar formulario impreso",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index beba794af..b6f15a38a 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1833,7 +1833,8 @@
 			"errors": {
 				"associatedbills": "",
 				"backordering": "",
-				"creating": "Erreur rencontrée lors de la création de la commande de pièces."
+				"creating": "Erreur rencontrée lors de la création de la commande de pièces.",
+				"oec": ""
 			},
 			"fields": {
 				"act_price": "",
@@ -1861,6 +1862,7 @@
 				"email": "Envoyé par email",
 				"inthisorder": "Pièces dans cette commande",
 				"newpartsorder": "",
+				"oec": "",
 				"orderhistory": "Historique des commandes",
 				"parts_orders": "",
 				"print": "Afficher le formulaire imprimé",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index b0bd5e897..237c695b7 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -2160,6 +2160,7 @@
       - sublet_completed
       - sublet_ignored
       - tax_part
+      - tran_code
       - unq_seq
       - updated_at
   select_permissions:
@@ -2221,6 +2222,7 @@
       - sublet_completed
       - sublet_ignored
       - tax_part
+      - tran_code
       - unq_seq
       - updated_at
       filter:
@@ -2293,6 +2295,7 @@
       - sublet_completed
       - sublet_ignored
       - tax_part
+      - tran_code
       - unq_seq
       - updated_at
       filter:
@@ -2305,7 +2308,16 @@
                     _eq: X-Hasura-User-Id
               - active:
                   _eq: true
-      check: null
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
   delete_permissions:
   - role: user
     permission:
diff --git a/hasura/migrations/1638223143109_alter_table_public_joblines_add_column_tran_code/down.sql b/hasura/migrations/1638223143109_alter_table_public_joblines_add_column_tran_code/down.sql
new file mode 100644
index 000000000..c71f50406
--- /dev/null
+++ b/hasura/migrations/1638223143109_alter_table_public_joblines_add_column_tran_code/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."joblines" add column "tran_code" text
+--  null;
diff --git a/hasura/migrations/1638223143109_alter_table_public_joblines_add_column_tran_code/up.sql b/hasura/migrations/1638223143109_alter_table_public_joblines_add_column_tran_code/up.sql
new file mode 100644
index 000000000..9d4cb989e
--- /dev/null
+++ b/hasura/migrations/1638223143109_alter_table_public_joblines_add_column_tran_code/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."joblines" add column "tran_code" text
+ null;