diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 6c686d2fd..47c2e9df8 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
@@ -17053,6 +17053,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>backordered_eta</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>backordered_on</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>db_price</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx b/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx
index 375fd677b..af70564b6 100644
--- a/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx
+++ b/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx
@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Button, notification } from "antd";
+import { Button, notification, DatePicker, Popover } from "antd";
 import { useMutation } from "@apollo/react-hooks";
 import { MUTATION_BACKORDER_PART_LINE } from "../../graphql/parts-orders.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -18,6 +18,8 @@ export function PartsOrderLineBackorderButton({
   jobLineId,
   bodyshop,
 }) {
+  const [visibility, setVisibility] = useState(false);
+  const [eta, setEta] = useState(null);
   const [loading, setLoading] = useState(false);
   const [backorderLine] = useMutation(MUTATION_BACKORDER_PART_LINE);
   const { t } = useTranslation();
@@ -25,17 +27,26 @@ export function PartsOrderLineBackorderButton({
   const isAlreadyBackordered =
     bodyshop.md_order_statuses.default_bo === partsOrderStatus;
 
-  const handleOnClick = async () => {
+  const handleSave = async () => {
     setLoading(true);
     logImEXEvent("job_parts_backorder");
 
+    const partsOrder = {
+      status: isAlreadyBackordered
+        ? bodyshop.md_order_statuses.default_received || "Received*"
+        : bodyshop.md_order_statuses.default_bo || "Backordered*",
+    };
+    if (!isAlreadyBackordered) {
+      partsOrder.backordered_on = new Date();
+      partsOrder.backordered_eta = eta;
+    }
+
     const result = await backorderLine({
       variables: {
         jobLineId,
         partsLineId,
-        status: isAlreadyBackordered
-          ? bodyshop.md_order_statuses.default_received || "Received*"
-          : bodyshop.md_order_statuses.default_bo || "Backordered*",
+        partsOrder: partsOrder,
+        status: partsOrder.status,
       },
     });
 
@@ -46,16 +57,39 @@ export function PartsOrderLineBackorderButton({
         }),
       });
     }
-
+    setEta(null);
+    setVisibility(false);
     setLoading(false);
   };
 
+  const handlePopover = (e) => {
+    if (isAlreadyBackordered) {
+      handleSave();
+      //Receive the part.
+    } else {
+      //Show the date selector to back order the part.
+      setVisibility(true);
+    }
+  };
+
+  const popContent = (
+    <div>
+      <DatePicker onChange={(e) => setEta(e)} />
+      <Button type="primary" disabled={eta === null} onClick={handleSave}>
+        {t("parts_orders.actions.backordered")}
+      </Button>
+      <Button onClick={() => setVisibility(false)}>Close</Button>
+    </div>
+  );
+
   return (
-    <Button loading={loading} onClick={handleOnClick}>
-      {isAlreadyBackordered
-        ? t("parts_orders.actions.receive")
-        : t("parts_orders.actions.backordered")}
-    </Button>
+    <Popover destroyTooltipOnHide content={popContent} visible={visibility}>
+      <Button loading={loading} onClick={handlePopover}>
+        {isAlreadyBackordered
+          ? t("parts_orders.actions.receive")
+          : t("parts_orders.actions.backordered")}
+      </Button>
+    </Popover>
   );
 }
 
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 c76e7dd54..be8390ec2 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
@@ -128,6 +128,18 @@ export function PartsOrderListTableComponent({
         dataIndex: "status",
         key: "status",
       },
+      {
+        title: t("parts_orders.fields.backordered_on"),
+        dataIndex: "backordered_on",
+        key: "backordered_on",
+        render: (text, record) => <DateFormatter>{text}</DateFormatter>,
+      },
+      {
+        title: t("parts_orders.fields.backordered_eta"),
+        dataIndex: "backordered_eta",
+        key: "backordered_eta",
+        render: (text, record) => <DateFormatter>{text}</DateFormatter>,
+      },
       {
         title: t("general.labels.actions"),
         dataIndex: "actions",
@@ -147,11 +159,11 @@ export function PartsOrderListTableComponent({
     return (
       <div>
         <Table
-          size='small'
+          size="small"
           scroll={{ x: "50%", y: "40rem" }}
           pagination={{ position: "top", defaultPageSize: 25 }}
           columns={columns}
-          rowKey='id'
+          rowKey="id"
           dataSource={record.parts_order_lines}
         />
       </div>
@@ -165,14 +177,14 @@ export function PartsOrderListTableComponent({
       </Typography.Title>
       <Table
         loading={loading}
-        size='small'
+        size="small"
         title={() => (
-          <div className='imex-table-header'>
+          <div className="imex-table-header">
             <Button onClick={() => refetch()}>
               <SyncOutlined />
             </Button>
 
-            <div className='imex-table-header__search'>
+            <div className="imex-table-header__search">
               <Input.Search
                 placeholder={t("general.labels.search")}
                 onChange={(e) => {
@@ -186,7 +198,7 @@ export function PartsOrderListTableComponent({
         expandedRowRender={rowExpander}
         pagination={{ position: "top", defaultPageSize: 25 }}
         columns={columns}
-        rowKey='id'
+        rowKey="id"
         dataSource={parts_orders}
         onChange={handleTableChange}
         expandable={{
diff --git a/client/src/graphql/invoices.queries.js b/client/src/graphql/invoices.queries.js
index 9c98f5820..090c01cfd 100644
--- a/client/src/graphql/invoices.queries.js
+++ b/client/src/graphql/invoices.queries.js
@@ -79,6 +79,8 @@ export const QUERY_INVOICES_BY_JOBID = gql`
         line_remarks
         quantity
         job_line_id
+        backordered_eta
+        backordered_on
       }
       order_number
       user_email
diff --git a/client/src/graphql/parts-orders.queries.js b/client/src/graphql/parts-orders.queries.js
index af326ce5a..389c7bc62 100644
--- a/client/src/graphql/parts-orders.queries.js
+++ b/client/src/graphql/parts-orders.queries.js
@@ -15,13 +15,16 @@ export const MUTATION_BACKORDER_PART_LINE = gql`
     $jobLineId: uuid!
     $partsLineId: uuid!
     $status: String!
+    $partsOrder: parts_order_lines_set_input
   ) {
     update_parts_order_lines(
       where: { id: { _eq: $partsLineId } }
-      _set: { status: $status }
+      _set: $partsOrder
     ) {
       returning {
         status
+        backordered_on
+        backordered_eta
         id
       }
     }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 3142651c0..49342a037 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1049,6 +1049,8 @@
 			},
 			"fields": {
 				"act_price": "Price",
+				"backordered_eta": "B.O. ETA",
+				"backordered_on": "B.O. On",
 				"db_price": "DB Price",
 				"deliver_by": "Deliver By",
 				"job_line_id": "Job Line Id",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 4e788de76..2511b9587 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1049,6 +1049,8 @@
 			},
 			"fields": {
 				"act_price": "",
+				"backordered_eta": "",
+				"backordered_on": "",
 				"db_price": "",
 				"deliver_by": "Entregado por",
 				"job_line_id": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index b974656d3..c47639861 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1049,6 +1049,8 @@
 			},
 			"fields": {
 				"act_price": "",
+				"backordered_eta": "",
+				"backordered_on": "",
 				"db_price": "",
 				"deliver_by": "Livrer par",
 				"job_line_id": "",
diff --git a/hasura/migrations/1596466443672_alter_table_public_parts_order_lines_add_column_backordered_on/down.yaml b/hasura/migrations/1596466443672_alter_table_public_parts_order_lines_add_column_backordered_on/down.yaml
new file mode 100644
index 000000000..7e01e0670
--- /dev/null
+++ b/hasura/migrations/1596466443672_alter_table_public_parts_order_lines_add_column_backordered_on/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."parts_order_lines" DROP COLUMN "backordered_on";
+  type: run_sql
diff --git a/hasura/migrations/1596466443672_alter_table_public_parts_order_lines_add_column_backordered_on/up.yaml b/hasura/migrations/1596466443672_alter_table_public_parts_order_lines_add_column_backordered_on/up.yaml
new file mode 100644
index 000000000..f3226988e
--- /dev/null
+++ b/hasura/migrations/1596466443672_alter_table_public_parts_order_lines_add_column_backordered_on/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."parts_order_lines" ADD COLUMN "backordered_on" date
+      NULL;
+  type: run_sql
diff --git a/hasura/migrations/1596466458082_alter_table_public_parts_order_lines_add_column_backordered_eta/down.yaml b/hasura/migrations/1596466458082_alter_table_public_parts_order_lines_add_column_backordered_eta/down.yaml
new file mode 100644
index 000000000..6aaaae41a
--- /dev/null
+++ b/hasura/migrations/1596466458082_alter_table_public_parts_order_lines_add_column_backordered_eta/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."parts_order_lines" DROP COLUMN "backordered_eta";
+  type: run_sql
diff --git a/hasura/migrations/1596466458082_alter_table_public_parts_order_lines_add_column_backordered_eta/up.yaml b/hasura/migrations/1596466458082_alter_table_public_parts_order_lines_add_column_backordered_eta/up.yaml
new file mode 100644
index 000000000..984d4cd3e
--- /dev/null
+++ b/hasura/migrations/1596466458082_alter_table_public_parts_order_lines_add_column_backordered_eta/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."parts_order_lines" ADD COLUMN "backordered_eta" date
+      NULL;
+  type: run_sql
diff --git a/hasura/migrations/1596466475798_update_permission_user_public_table_parts_order_lines/down.yaml b/hasura/migrations/1596466475798_update_permission_user_public_table_parts_order_lines/down.yaml
new file mode 100644
index 000000000..dbac86335
--- /dev/null
+++ b/hasura/migrations/1596466475798_update_permission_user_public_table_parts_order_lines/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        parts_order:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+      columns:
+      - act_price
+      - created_at
+      - db_price
+      - id
+      - job_line_id
+      - line_desc
+      - line_remarks
+      - oem_partno
+      - orderid
+      - quantity
+      - status
+      - updated_at
+      set: {}
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1596466475798_update_permission_user_public_table_parts_order_lines/up.yaml b/hasura/migrations/1596466475798_update_permission_user_public_table_parts_order_lines/up.yaml
new file mode 100644
index 000000000..f30db5ad8
--- /dev/null
+++ b/hasura/migrations/1596466475798_update_permission_user_public_table_parts_order_lines/up.yaml
@@ -0,0 +1,40 @@
+- args:
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        parts_order:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+      columns:
+      - act_price
+      - backordered_eta
+      - backordered_on
+      - created_at
+      - db_price
+      - id
+      - job_line_id
+      - line_desc
+      - line_remarks
+      - oem_partno
+      - orderid
+      - quantity
+      - status
+      - updated_at
+      set: {}
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1596466485574_update_permission_user_public_table_parts_order_lines/down.yaml b/hasura/migrations/1596466485574_update_permission_user_public_table_parts_order_lines/down.yaml
new file mode 100644
index 000000000..e057ea23a
--- /dev/null
+++ b/hasura/migrations/1596466485574_update_permission_user_public_table_parts_order_lines/down.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - act_price
+      - created_at
+      - db_price
+      - id
+      - job_line_id
+      - line_desc
+      - line_remarks
+      - oem_partno
+      - orderid
+      - quantity
+      - status
+      - updated_at
+      computed_fields: []
+      filter:
+        parts_order:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1596466485574_update_permission_user_public_table_parts_order_lines/up.yaml b/hasura/migrations/1596466485574_update_permission_user_public_table_parts_order_lines/up.yaml
new file mode 100644
index 000000000..609697074
--- /dev/null
+++ b/hasura/migrations/1596466485574_update_permission_user_public_table_parts_order_lines/up.yaml
@@ -0,0 +1,41 @@
+- args:
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - act_price
+      - backordered_eta
+      - backordered_on
+      - created_at
+      - db_price
+      - id
+      - job_line_id
+      - line_desc
+      - line_remarks
+      - oem_partno
+      - orderid
+      - quantity
+      - status
+      - updated_at
+      computed_fields: []
+      filter:
+        parts_order:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1596466492287_update_permission_user_public_table_parts_order_lines/down.yaml b/hasura/migrations/1596466492287_update_permission_user_public_table_parts_order_lines/down.yaml
new file mode 100644
index 000000000..0e2acf52e
--- /dev/null
+++ b/hasura/migrations/1596466492287_update_permission_user_public_table_parts_order_lines/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - act_price
+      - created_at
+      - db_price
+      - id
+      - job_line_id
+      - line_desc
+      - line_remarks
+      - oem_partno
+      - orderid
+      - quantity
+      - status
+      - updated_at
+      filter:
+        parts_order:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+      set: {}
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1596466492287_update_permission_user_public_table_parts_order_lines/up.yaml b/hasura/migrations/1596466492287_update_permission_user_public_table_parts_order_lines/up.yaml
new file mode 100644
index 000000000..09f99df03
--- /dev/null
+++ b/hasura/migrations/1596466492287_update_permission_user_public_table_parts_order_lines/up.yaml
@@ -0,0 +1,40 @@
+- args:
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - act_price
+      - backordered_eta
+      - backordered_on
+      - created_at
+      - db_price
+      - id
+      - job_line_id
+      - line_desc
+      - line_remarks
+      - oem_partno
+      - orderid
+      - quantity
+      - status
+      - updated_at
+      filter:
+        parts_order:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+      set: {}
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml
index 78dd4bc75..6d3066a50 100644
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -3123,6 +3123,8 @@ tables:
                     _eq: true
       columns:
       - act_price
+      - backordered_eta
+      - backordered_on
       - created_at
       - db_price
       - id
@@ -3139,6 +3141,8 @@ tables:
     permission:
       columns:
       - act_price
+      - backordered_eta
+      - backordered_on
       - created_at
       - db_price
       - id
@@ -3166,6 +3170,8 @@ tables:
     permission:
       columns:
       - act_price
+      - backordered_eta
+      - backordered_on
       - created_at
       - db_price
       - id