From 4e3c659b6d4d4ca56f964c202872f9199aced455 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 9 Nov 2021 16:31:57 -0800
Subject: [PATCH] IO-1497 Ability to delete parts orders.

---
 bodyshop_translations.babel                   | 21 +++++++++++++++++++
 .../parts-order-list-table.component.jsx      |  5 +++--
 client/src/graphql/employees.queries.js       |  2 +-
 client/src/translations/en_us/common.json     |  3 ++-
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 6 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 359656c4e..6c2f73764 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -30627,6 +30627,27 @@
                             <folder_node>
                                 <name>errors</name>
                                 <children>
+                                    <concept_node>
+                                        <name>associatedbills</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>backordering</name>
                                         <definition_loaded>false</definition_loaded>
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 c9ce0c9a9..94382bf8f 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
@@ -7,6 +7,7 @@ import {
   Drawer,
   Grid,
   Input,
+  notification,
   PageHeader,
   Popconfirm,
   Space,
@@ -119,7 +120,7 @@ export function PartsOrderListTableComponent({
       </Button>
       <Popconfirm
         title={t("parts_orders.labels.confirmdelete")}
-        disabled={jobRO || !record.return}
+        disabled={jobRO}
         onConfirm={async () => {
           //Delete the parts return.!
 
@@ -139,7 +140,7 @@ export function PartsOrderListTableComponent({
           });
         }}
       >
-        <Button disabled={jobRO || !record.return}>
+        <Button disabled={jobRO}>
           <DeleteFilled />
         </Button>
       </Popconfirm>
diff --git a/client/src/graphql/employees.queries.js b/client/src/graphql/employees.queries.js
index 4efb5657d..0b791c6b1 100644
--- a/client/src/graphql/employees.queries.js
+++ b/client/src/graphql/employees.queries.js
@@ -2,7 +2,7 @@ import { gql } from "@apollo/client";
 
 export const QUERY_EMPLOYEES = gql`
   query QUERY_EMPLOYEES {
-    employees {
+    employees(order_by: { employee_number: asc }) {
       last_name
       id
       first_name
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 0c823c2a0..43ff1b9d8 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1824,6 +1824,7 @@
 				"receivebill": "Receive Bill"
 			},
 			"errors": {
+				"associatedbills": "This parts order cannot",
 				"backordering": "Error backordering part {{message}}.",
 				"creating": "Error encountered when creating parts order. "
 			},
@@ -1849,7 +1850,7 @@
 			},
 			"labels": {
 				"allpartsto": "All Parts Location",
-				"confirmdelete": "Are you sure you want to delete this item? It cannot be recovered. ",
+				"confirmdelete": "Are you sure you want to delete this item? It cannot be recovered.  Job line statuses will not be updated and may require manual review. ",
 				"email": "Send by Email",
 				"inthisorder": "Parts in this Order",
 				"newpartsorder": "New Parts Order",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 145e23616..91095e3fb 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1824,6 +1824,7 @@
 				"receivebill": ""
 			},
 			"errors": {
+				"associatedbills": "",
 				"backordering": "",
 				"creating": "Se encontró un error al crear el pedido de piezas."
 			},
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 0bcc48249..2b62d1277 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1824,6 +1824,7 @@
 				"receivebill": ""
 			},
 			"errors": {
+				"associatedbills": "",
 				"backordering": "",
 				"creating": "Erreur rencontrée lors de la création de la commande de pièces."
 			},