diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 6409919e0..bf1239ac9 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -5446,6 +5446,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>return</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>
@@ -12218,6 +12239,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>newpartsorder</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>
@@ -12260,6 +12302,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>returnpartsorder</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>
diff --git a/client/src/components/invoices-list-table/invoices-list-table.component.jsx b/client/src/components/invoices-list-table/invoices-list-table.component.jsx
index 89b638bff..83b349288 100644
--- a/client/src/components/invoices-list-table/invoices-list-table.component.jsx
+++ b/client/src/components/invoices-list-table/invoices-list-table.component.jsx
@@ -1,21 +1,29 @@
-import { Button, Descriptions, Table, Checkbox } from "antd";
+import { SyncOutlined } from "@ant-design/icons";
+import { Button, Checkbox, Descriptions, Table } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
 import { Link } from "react-router-dom";
+import { setModalContext } from "../../redux/modals/modals.actions";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
-import { SyncOutlined } from "@ant-design/icons";
 
-export default function InvoicesListTableComponent({
+const mapDispatchToProps = (dispatch) => ({
+  setPartsOrderContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "partsOrder" })),
+});
+
+export function InvoicesListTableComponent({
+  job,
   loading,
   invoices,
   selectedInvoice,
   handleOnRowClick,
   refetch,
+  setPartsOrderContext,
 }) {
   const { t } = useTranslation();
-
   const [state, setState] = useState({
     sortedInfo: {},
   });
@@ -61,15 +69,52 @@ export default function InvoicesListTableComponent({
         <CurrencyFormatter>{record.total}</CurrencyFormatter>
       ),
     },
+    {
+      title: t("invoices.fields.is_credit_memo"),
+      dataIndex: "is_credit_memo",
+      key: "is_credit_memo",
+      sorter: (a, b) => a.is_credit_memo - b.is_credit_memo,
+      sortOrder:
+        state.sortedInfo.columnKey === "is_credit_memo" &&
+        state.sortedInfo.order,
+      render: (text, record) => <Checkbox checked={record.is_credit_memo} />,
+    },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
       render: (text, record) => (
-        <Link
-          to={`/manage/invoices?invoiceid=${record.id}&vendorid=${record.vendorid}`}>
-          <Button>{t("invoices.actions.edit")}</Button>
-        </Link>
+        <div>
+          <Link
+            to={`/manage/invoices?invoiceid=${record.id}&vendorid=${record.vendorid}`}>
+            <Button>{t("invoices.actions.edit")}</Button>
+          </Link>
+          <Button
+            disabled={record.is_credit_memo}
+            onClick={() =>
+              setPartsOrderContext({
+                actions: {},
+                context: {
+                  jobId: job.id,
+                  vendorId: record.vendorid,
+                  returnFromInvoice: record.id,
+                  invoiceNumber: record.invoice_number,
+                  linesToOrder: record.invoicelines.map((i) => {
+                    return {
+                      line_desc: i.line_desc,
+                      db_price: i.actual_price,
+                      act_price: i.actual_cost,
+                      quantity: i.quantity,
+                      joblineid: i.joblineid,
+                    };
+                  }),
+                  isReturn: true,
+                },
+              })
+            }>
+            {t("invoices.actions.return")}
+          </Button>
+        </div>
       ),
     },
   ];
@@ -208,7 +253,7 @@ export default function InvoicesListTableComponent({
       )}
       expandedRowRender={rowExpander}
       pagination={{ position: "top", defaultPageSize: 25 }}
-      columns={columns.map((item) => ({ ...item }))}
+      columns={columns}
       rowKey='id'
       dataSource={invoices}
       onChange={handleTableChange}
@@ -239,3 +284,4 @@ export default function InvoicesListTableComponent({
     />
   );
 }
+export default connect(null, mapDispatchToProps)(InvoicesListTableComponent);
diff --git a/client/src/components/job-reconciliation-invoices-table/job-reconciliation-invoices-table.component.jsx b/client/src/components/job-reconciliation-invoices-table/job-reconciliation-invoices-table.component.jsx
index 04c644ac3..21b4085de 100644
--- a/client/src/components/job-reconciliation-invoices-table/job-reconciliation-invoices-table.component.jsx
+++ b/client/src/components/job-reconciliation-invoices-table/job-reconciliation-invoices-table.component.jsx
@@ -1,9 +1,9 @@
-import { Button, Table, Statistic, Checkbox } from "antd";
+import { Checkbox, Statistic, Table } from "antd";
+import Dinero from "dinero.js";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort } from "../../utils/sorters";
-import Dinero from "dinero.js";
 
 export default function JobReconciliationInvoiceTable({
   invoiceLineState,
diff --git a/client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx b/client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx
index 9048da9c4..10227e72d 100644
--- a/client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx
+++ b/client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx
@@ -5,10 +5,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectReconciliation } from "../../redux/modals/modals.selectors";
-import {
-  selectBodyshop,
-  selectCurrentUser,
-} from "../../redux/user/user.selectors";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import JobReconciliationModalComponent from "./job-reconciliation-modal.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -27,7 +24,7 @@ function InvoiceEnterModalContainer({
   currentUser,
 }) {
   const { t } = useTranslation();
-  const { actions, context, visible } = reconciliationModal;
+  const { context, visible } = reconciliationModal;
   const { job, invoices } = context;
 
   const handleCancel = () => {
diff --git a/client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx b/client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx
index eb88978b8..a37862440 100644
--- a/client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx
+++ b/client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx
@@ -1,9 +1,9 @@
-import { Button, Table, Statistic } from "antd";
+import { Statistic, Table } from "antd";
+import Dinero from "dinero.js";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort } from "../../utils/sorters";
-import Dinero from "dinero.js";
 
 export default function JobReconcilitionPartsTable({
   jobLineState,
diff --git a/client/src/components/jobs-detail-pli/jobs-detail-pli.component.jsx b/client/src/components/jobs-detail-pli/jobs-detail-pli.component.jsx
index cfdfb615b..6f858b65c 100644
--- a/client/src/components/jobs-detail-pli/jobs-detail-pli.component.jsx
+++ b/client/src/components/jobs-detail-pli/jobs-detail-pli.component.jsx
@@ -6,6 +6,8 @@ import AlertComponent from "../alert/alert.component";
 import InvoicesListTableComponent from "../invoices-list-table/invoices-list-table.component";
 import JobInvoicesTotalsComponent from "../job-invoices-total/job-invoices-total.component";
 import { useTranslation } from "react-i18next";
+import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
+
 const mapDispatchToProps = (dispatch) => ({
   setInvoiceEnterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "invoiceEnter" })),
@@ -24,6 +26,7 @@ export function JobsDetailPliComponent({
   const { t } = useTranslation();
   return (
     <div>
+      <PartsOrderModalContainer />
       <Button
         onClick={() => {
           setInvoiceEnterContext({
@@ -59,6 +62,7 @@ export function JobsDetailPliComponent({
       />
 
       <InvoicesListTableComponent
+        job={job}
         loading={invoicesQuery.loading}
         handleOnRowClick={handleOnRowClick}
         selectedInvoice={selectedInvoice}
diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index 446e16dd1..aab0b1f58 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -7,6 +7,7 @@ import CurrencyInput from "../form-items-formatted/currency-form-item.component"
 export default function PartsOrderModalComponent({
   vendorList,
   sendTypeState,
+  isReturn
 }) {
   const [sendType, setSendType] = sendTypeState;
 
@@ -24,7 +25,7 @@ export default function PartsOrderModalComponent({
           },
         ]}
       >
-        <VendorSearchSelect options={vendorList} />
+        <VendorSearchSelect options={vendorList} disabled={isReturn} />
       </Form.Item>
       <Form.Item
         name="deliver_by"
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 f22856602..9f953064a 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
@@ -18,7 +18,11 @@ import {
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import PartsOrderModalComponent from "./parts-order-modal.component";
-import RenderTemplate from "../../utils/RenderTemplate";
+import RenderTemplate, {
+  displayTemplateInWindow,
+} from "../../utils/RenderTemplate";
+import moment from "moment";
+import { TemplateList } from "../../utils/TemplateConstants";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -41,7 +45,15 @@ export function PartsOrderModalContainer({
   const { t } = useTranslation();
 
   const { visible, context, actions } = partsOrderModal;
-  const { jobId, linesToOrder } = context;
+  const {
+    jobId,
+    linesToOrder,
+    isReturn,
+    vendorId,
+    returnFromInvoice,
+    invoiceNumber,
+  } = context;
+
   const { refetch } = actions;
   const [form] = Form.useForm();
 
@@ -56,7 +68,7 @@ export function PartsOrderModalContainer({
   const [insertInvoice] = useMutation(INSERT_NEW_INVOICE);
 
   const handleFinish = async (values) => {
-    insertPartOrder({
+    const insertResult = await insertPartOrder({
       variables: {
         po: [
           {
@@ -67,117 +79,123 @@ export function PartsOrderModalContainer({
           },
         ],
       },
-    })
-      .then((r) => {
-        updateJobLines({
-          variables: {
-            ids: values.parts_order_lines.data.map((item) => item.job_line_id),
-            status: bodyshop.md_order_statuses.default_ordered || "Ordered*",
-          },
-        })
-          .then((response) => {
-            notification["success"]({
-              message: t("parts_orders.successes.created"),
-            });
-
-            if (values.vendorid === bodyshop.inhousevendorid) {
-              console.log("Inhouse Invoice needs to be psoted.");
-              let invoiceToPost = {
-                vendorid: bodyshop.inhousevendorid,
-                jobid: jobId,
-                total: 0,
-                invoice_number: `${jobId}`, //TODO Add INhouse invoice generation?
-                federal_tax_rate:
-                  bodyshop.invoice_tax_rates.federal_tax_rate || 0,
-                state_tax_rate: bodyshop.invoice_tax_rates.state_tax_rate || 0,
-                local_tax_rate: bodyshop.invoice_tax_rates.local_tax_rate || 0,
-                invoicelines: {
-                  data: values.parts_order_lines.data.map((p) => {
-                    return {
-                      joblineid: p.job_line_id,
-                      actual_price: 0,
-                      actual_cost: 0,
-                      line_desc: p.line_desc,
-                      quantity: p.quantity || 1,
-                      cost_center:
-                        bodyshop.md_responsibility_centers.defaults.PAO ||
-                        "Other*",
-                    };
-                  }),
-                },
-              };
-
-              insertInvoice({
-                variables: { invoice: invoiceToPost },
-              });
-            }
-
-            if (refetch) refetch();
-            toggleModalVisible();
-
-            if (sendType === "e") {
-              //TODO Remove hardcoding
-              setEmailOptions({
-                messageOptions: {
-                  to:
-                    data.vendors.filter((item) => item.id === values.id)[0] ||
-                    null,
-                  replyTo: bodyshop.email,
-                },
-                template: {
-                  name: "parts_order_confirmation",
-                  variables: {
-                    id: r.data.insert_parts_orders.returning[0].id,
-                  },
-                },
-              });
-            } else {
-              RenderTemplate(
-                {
-                  name: "parts_order_confirmation",
-                  variables: {
-                    id: r.data.insert_parts_orders.returning[0].id,
-                  },
-                },
-            
-                bodyshop
-              ).then((html) => {
-                var newWin = window.open();
-                newWin.document.write(html);
-              });
-            }
-          })
-          .catch((error) => {
-            notification["error"]({
-              message: t("parts_orders.errors.creating"),
-              description: error.message,
-            });
-          });
-
-        //end no good
-      })
-      .catch((error) => {
-        notification["error"]({
-          message: t("parts_orders.errors.creating"),
-          description: error.message,
-        });
+    });
+    if (!!insertResult.error) {
+      notification["error"]({
+        message: t("parts_orders.errors.creating"),
+        description: JSON.stringify(insertResult.error),
       });
+      return;
+    }
+
+    const jobLinesResult = await updateJobLines({
+      variables: {
+        ids: values.parts_order_lines.data.map((item) => item.job_line_id),
+        status: isReturn
+          ? bodyshop.md_order_statuses.default_returned || "Returned*"
+          : bodyshop.md_order_statuses.default_ordered || "Ordered*",
+      },
+    });
+    if (!!jobLinesResult.errors) {
+      notification["error"]({
+        message: t("parts_orders.errors.creating"),
+        description: JSON.stringify(jobLinesResult.errors),
+      });
+    }
+
+    notification["success"]({
+      message: t("parts_orders.successes.created"),
+    });
+
+    if (values.vendorid === bodyshop.inhousevendorid) {
+      console.log("Inhouse Invoice needs to be psoted.");
+      let invoiceToPost = {
+        vendorid: bodyshop.inhousevendorid,
+        jobid: jobId,
+        total: 0,
+        invoice_number: `${jobId}`, //TODO Add INhouse invoice generation?
+        federal_tax_rate: bodyshop.invoice_tax_rates.federal_tax_rate || 0,
+        state_tax_rate: bodyshop.invoice_tax_rates.state_tax_rate || 0,
+        local_tax_rate: bodyshop.invoice_tax_rates.local_tax_rate || 0,
+        invoicelines: {
+          data: values.parts_order_lines.data.map((p) => {
+            return {
+              joblineid: p.job_line_id,
+              actual_price: 0,
+              actual_cost: 0,
+              line_desc: p.line_desc,
+              quantity: p.quantity || 1,
+              cost_center:
+                bodyshop.md_responsibility_centers.defaults.PAO || "Other*",
+            };
+          }),
+        },
+      };
+
+      await insertInvoice({
+        variables: { invoice: invoiceToPost },
+      });
+    }
+
+    if (refetch) refetch();
+    toggleModalVisible();
+
+    if (sendType === "e") {
+      //TODO Remove hardcoding
+      setEmailOptions({
+        messageOptions: {
+          to: data.vendors.filter((item) => item.id === values.id)[0] || null,
+          replyTo: bodyshop.email,
+        },
+        template: {
+          name: isReturn
+            ? TemplateList.parts_return_confirmation.key
+            : TemplateList.parts_order_confirmation.key,
+          variables: {
+            id: insertResult.data.insert_parts_orders.returning[0].id,
+          },
+        },
+      });
+    } else {
+      displayTemplateInWindow(
+        await RenderTemplate(
+          {
+            name: isReturn
+              ? TemplateList.parts_return_confirmation.key
+              : TemplateList.parts_order_confirmation.key,
+            variables: {
+              id: insertResult.data.insert_parts_orders.returning[0].id,
+            },
+          },
+          bodyshop
+        )
+      );
+    }
   };
 
-  const initialValues =
-    linesToOrder &&
-    linesToOrder.reduce((acc, value) => {
-      acc.push({
-        line_desc: value.line_desc,
-        oem_partno: value.oem_partno,
-        db_price: value.db_price,
-        act_price: value.act_price,
-        quantity: value.part_qty,
-        job_line_id: value.id,
-        status: bodyshop.md_order_statuses.default_ordered || "Ordered*",
-      });
-      return acc;
-    }, []);
+  const initialValues = {
+    jobid: jobId,
+    return: isReturn,
+    deliver_by: isReturn ? moment(new Date()) : null,
+    vendorid: vendorId,
+    returnfrominvoice: returnFromInvoice,
+
+    parts_order_lines: {
+      data: linesToOrder
+        ? linesToOrder.reduce((acc, value) => {
+            acc.push({
+              line_desc: value.line_desc,
+              oem_partno: value.oem_partno,
+              db_price: value.db_price,
+              act_price: value.act_price,
+              quantity: value.part_qty,
+              job_line_id: isReturn ? value.joblineid : value.id,
+            });
+            return acc;
+          }, [])
+        : [],
+    },
+  };
 
   useEffect(() => {
     if (visible && !!linesToOrder) {
@@ -188,6 +206,11 @@ export function PartsOrderModalContainer({
   return (
     <Modal
       visible={visible}
+      title={
+        isReturn
+          ? `${t("parts_orders.labels.returnpartsorder")} ${invoiceNumber}`
+          : t("parts_orders.labels.newpartsorder")
+      }
       onCancel={() => toggleModalVisible()}
       width='90%'
       onOk={() => form.submit()}
@@ -199,10 +222,11 @@ export function PartsOrderModalContainer({
           form={form}
           autoComplete='no'
           onFinish={handleFinish}
-          initialValues={{ parts_order_lines: { data: initialValues } }}>
+          initialValues={initialValues}>
           <PartsOrderModalComponent
             vendorList={(data && data.vendors) || []}
             sendTypeState={sendTypeState}
+            isReturn={isReturn}
           />
         </Form>
       </LoadingSpinner>
diff --git a/client/src/components/shop-info/shop-info.orderstatus.component.jsx b/client/src/components/shop-info/shop-info.orderstatus.component.jsx
index 474876056..0e55aca8b 100644
--- a/client/src/components/shop-info/shop-info.orderstatus.component.jsx
+++ b/client/src/components/shop-info/shop-info.orderstatus.component.jsx
@@ -26,8 +26,7 @@ export default function ShopInfoOrderStatusComponent({ form }) {
                   {fields.map((field, index) => (
                     <Form.Item
                       key={field.key}
-                      style={{ padding: 0, margin: 2 }}
-                    >
+                      style={{ padding: 0, margin: 2 }}>
                       <div style={{ display: "flex" }}>
                         <Form.Item
                           style={{ padding: 0, margin: 2 }}
@@ -37,10 +36,9 @@ export default function ShopInfoOrderStatusComponent({ form }) {
                           rules={[
                             {
                               required: true,
-                              message: t("general.validation.required")
-                            }
-                          ]}
-                        >
+                              message: t("general.validation.required"),
+                            },
+                          ]}>
                           <Input onBlur={handleBlur} />
                         </Form.Item>
                         <DeleteFilled
@@ -53,12 +51,11 @@ export default function ShopInfoOrderStatusComponent({ form }) {
                   ))}
                   <Form.Item>
                     <Button
-                      type="dashed"
+                      type='dashed'
                       onClick={() => {
                         add();
                       }}
-                      style={{ width: "100%" }}
-                    >
+                      style={{ width: "100%" }}>
                       {t("bodyshop.actions.newstatus")}
                     </Button>
                   </Form.Item>
@@ -73,11 +70,10 @@ export default function ShopInfoOrderStatusComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required")
-              }
+                message: t("general.validation.required"),
+              },
             ]}
-            name={["md_order_statuses", "default_bo"]}
-          >
+            name={["md_order_statuses", "default_bo"]}>
             <Select>
               {options.map((item, idx) => (
                 <Select.Option key={idx}>{item}</Select.Option>
@@ -89,11 +85,10 @@ export default function ShopInfoOrderStatusComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required")
-              }
+                message: t("general.validation.required"),
+              },
             ]}
-            name={["md_order_statuses", "default_ordered"]}
-          >
+            name={["md_order_statuses", "default_ordered"]}>
             <Select>
               {options.map((item, idx) => (
                 <Select.Option key={idx}>{item}</Select.Option>
@@ -105,11 +100,10 @@ export default function ShopInfoOrderStatusComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required")
-              }
+                message: t("general.validation.required"),
+              },
             ]}
-            name={["md_order_statuses", "default_canceled"]}
-          >
+            name={["md_order_statuses", "default_canceled"]}>
             <Select>
               {options.map((item, idx) => (
                 <Select.Option key={idx}>{item}</Select.Option>
@@ -121,11 +115,25 @@ export default function ShopInfoOrderStatusComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required")
-              }
+                message: t("general.validation.required"),
+              },
             ]}
-            name={["md_order_statuses", "default_received"]}
-          >
+            name={["md_order_statuses", "default_received"]}>
+            <Select>
+              {options.map((item, idx) => (
+                <Select.Option key={idx}>{item}</Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.statuses.default_returned")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_order_statuses", "default_returned"]}>
             <Select>
               {options.map((item, idx) => (
                 <Select.Option key={idx}>{item}</Select.Option>
diff --git a/client/src/components/vendor-search-select/vendor-search-select.component.jsx b/client/src/components/vendor-search-select/vendor-search-select.component.jsx
index d87b6f7bb..bd514bfc3 100644
--- a/client/src/components/vendor-search-select/vendor-search-select.component.jsx
+++ b/client/src/components/vendor-search-select/vendor-search-select.component.jsx
@@ -4,7 +4,13 @@ const { Option } = Select;
 
 //To be used as a form element only.
 
-const VendorSearchSelect = ({ value, onChange, options, onSelect }) => {
+const VendorSearchSelect = ({
+  value,
+  onChange,
+  options,
+  onSelect,
+  disabled,
+}) => {
   const [option, setOption] = useState(value);
 
   useEffect(() => {
@@ -21,15 +27,15 @@ const VendorSearchSelect = ({ value, onChange, options, onSelect }) => {
         width: 300,
       }}
       onChange={setOption}
-      optionFilterProp="name"
+      optionFilterProp='name'
       onSelect={onSelect}
-    >
+      disabled={disabled || false}>
       {options
         ? options.map((o) => (
             <Option key={o.id} value={o.id} name={o.name} discount={o.discount}>
               <div style={{ display: "flex" }}>
                 {o.name}
-                <Tag color="green">{`${o.discount * 100}%`}</Tag>
+                <Tag color='green'>{`${o.discount * 100}%`}</Tag>
               </div>
             </Option>
           ))
diff --git a/client/src/graphql/invoices.queries.js b/client/src/graphql/invoices.queries.js
index 6bfd6146a..40bd2430f 100644
--- a/client/src/graphql/invoices.queries.js
+++ b/client/src/graphql/invoices.queries.js
@@ -59,6 +59,7 @@ export const QUERY_INVOICES_BY_JOBID = gql`
         actual_cost
         cost_center
         id
+        joblineid
         line_desc
         applicable_taxes
       }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index eafdaa5c8..4863484cc 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -379,7 +379,8 @@
 		"invoices": {
 			"actions": {
 				"edit": "Edit",
-				"receive": "Receive Part"
+				"receive": "Receive Part",
+				"return": "Return Items"
 			},
 			"errors": {
 				"creating": "Error adding invoice.",
@@ -780,8 +781,10 @@
 			"labels": {
 				"email": "Send by Email",
 				"inthisorder": "Parts in this Order",
+				"newpartsorder": "New Parts Order",
 				"orderhistory": "Order History",
-				"print": "Show Printed Form"
+				"print": "Show Printed Form",
+				"returnpartsorder": "Return Parts Order"
 			},
 			"successes": {
 				"created": "Parts order created successfully. "
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 217528d75..d89659873 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -379,7 +379,8 @@
 		"invoices": {
 			"actions": {
 				"edit": "",
-				"receive": ""
+				"receive": "",
+				"return": ""
 			},
 			"errors": {
 				"creating": "",
@@ -780,8 +781,10 @@
 			"labels": {
 				"email": "Enviar por correo electrónico",
 				"inthisorder": "Partes en este pedido",
+				"newpartsorder": "",
 				"orderhistory": "Historial de pedidos",
-				"print": "Mostrar formulario impreso"
+				"print": "Mostrar formulario impreso",
+				"returnpartsorder": ""
 			},
 			"successes": {
 				"created": "Pedido de piezas creado con éxito."
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index cc7349793..23c566deb 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -379,7 +379,8 @@
 		"invoices": {
 			"actions": {
 				"edit": "",
-				"receive": ""
+				"receive": "",
+				"return": ""
 			},
 			"errors": {
 				"creating": "",
@@ -780,8 +781,10 @@
 			"labels": {
 				"email": "Envoyé par email",
 				"inthisorder": "Pièces dans cette commande",
+				"newpartsorder": "",
 				"orderhistory": "Historique des commandes",
-				"print": "Afficher le formulaire imprimé"
+				"print": "Afficher le formulaire imprimé",
+				"returnpartsorder": ""
 			},
 			"successes": {
 				"created": "Commande de pièces créée avec succès."
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 1ed21df4d..6d4032122 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -8,15 +8,24 @@ export const TemplateList = {
     title: "Appointment Reminder",
     description: "Sent to a customer as a reminder of an upcoming appointment.",
     drivingId: "Appointment Id",
+    key: "appointment_reminder",
   },
   parts_order_confirmation: {
     title: "Parts Order Confirmation",
     description: "Parts order template including part details",
     drivingId: "Parts order Id",
+    key: "parts_order_confirmation",
   },
   estimate_detail: {
     title: "Estimate Detail Lines",
     description: "Est Detail",
     drivingId: "test does not exist.",
+    key: "estimate_detail",
+  },
+  parts_return_confirmation: {
+    title: "Parts Return Confirmation",
+    description: "Parts Return template including part details",
+    drivingId: "Parts order Id",
+    key: "parts_return_confirmation",
   },
 };
diff --git a/hasura/migrations/1589481044730_alter_table_public_parts_orders_add_column_return/down.yaml b/hasura/migrations/1589481044730_alter_table_public_parts_orders_add_column_return/down.yaml
new file mode 100644
index 000000000..3198ebcbb
--- /dev/null
+++ b/hasura/migrations/1589481044730_alter_table_public_parts_orders_add_column_return/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."parts_orders" DROP COLUMN "return";
+  type: run_sql
diff --git a/hasura/migrations/1589481044730_alter_table_public_parts_orders_add_column_return/up.yaml b/hasura/migrations/1589481044730_alter_table_public_parts_orders_add_column_return/up.yaml
new file mode 100644
index 000000000..5653ccd3b
--- /dev/null
+++ b/hasura/migrations/1589481044730_alter_table_public_parts_orders_add_column_return/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."parts_orders" ADD COLUMN "return" boolean NOT NULL
+      DEFAULT false;
+  type: run_sql
diff --git a/hasura/migrations/1589481062644_update_permission_user_public_table_parts_orders/down.yaml b/hasura/migrations/1589481062644_update_permission_user_public_table_parts_orders/down.yaml
new file mode 100644
index 000000000..8e537f4d3
--- /dev/null
+++ b/hasura/migrations/1589481062644_update_permission_user_public_table_parts_orders/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - deliver_by
+      - order_date
+      - order_number
+      - status
+      - user_email
+      - created_at
+      - updated_at
+      - id
+      - jobid
+      - vendorid
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1589481062644_update_permission_user_public_table_parts_orders/up.yaml b/hasura/migrations/1589481062644_update_permission_user_public_table_parts_orders/up.yaml
new file mode 100644
index 000000000..28ec7048c
--- /dev/null
+++ b/hasura/migrations/1589481062644_update_permission_user_public_table_parts_orders/up.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - created_at
+      - deliver_by
+      - id
+      - jobid
+      - order_date
+      - order_number
+      - return
+      - status
+      - updated_at
+      - user_email
+      - vendorid
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1589481097225_update_permission_user_public_table_parts_orders/down.yaml b/hasura/migrations/1589481097225_update_permission_user_public_table_parts_orders/down.yaml
new file mode 100644
index 000000000..9165bf42c
--- /dev/null
+++ b/hasura/migrations/1589481097225_update_permission_user_public_table_parts_orders/down.yaml
@@ -0,0 +1,36 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - deliver_by
+      - order_date
+      - order_number
+      - status
+      - user_email
+      - created_at
+      - updated_at
+      - id
+      - jobid
+      - vendorid
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1589481097225_update_permission_user_public_table_parts_orders/up.yaml b/hasura/migrations/1589481097225_update_permission_user_public_table_parts_orders/up.yaml
new file mode 100644
index 000000000..92571d4b8
--- /dev/null
+++ b/hasura/migrations/1589481097225_update_permission_user_public_table_parts_orders/up.yaml
@@ -0,0 +1,37 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - created_at
+      - deliver_by
+      - id
+      - jobid
+      - order_date
+      - order_number
+      - return
+      - status
+      - updated_at
+      - user_email
+      - vendorid
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1589491932788_alter_table_public_parts_orders_add_column_returnfrominvoice/down.yaml b/hasura/migrations/1589491932788_alter_table_public_parts_orders_add_column_returnfrominvoice/down.yaml
new file mode 100644
index 000000000..5335afc04
--- /dev/null
+++ b/hasura/migrations/1589491932788_alter_table_public_parts_orders_add_column_returnfrominvoice/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."parts_orders" DROP COLUMN "returnfrominvoice";
+  type: run_sql
diff --git a/hasura/migrations/1589491932788_alter_table_public_parts_orders_add_column_returnfrominvoice/up.yaml b/hasura/migrations/1589491932788_alter_table_public_parts_orders_add_column_returnfrominvoice/up.yaml
new file mode 100644
index 000000000..4aecfe94f
--- /dev/null
+++ b/hasura/migrations/1589491932788_alter_table_public_parts_orders_add_column_returnfrominvoice/up.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."parts_orders" ADD COLUMN "returnfrominvoice" uuid NULL;
+  type: run_sql
diff --git a/hasura/migrations/1589491953447_set_fk_public_parts_orders_returnfrominvoice/down.yaml b/hasura/migrations/1589491953447_set_fk_public_parts_orders_returnfrominvoice/down.yaml
new file mode 100644
index 000000000..e3b0136a4
--- /dev/null
+++ b/hasura/migrations/1589491953447_set_fk_public_parts_orders_returnfrominvoice/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: alter table "public"."parts_orders" drop constraint "parts_orders_returnfrominvoice_fkey";
+  type: run_sql
diff --git a/hasura/migrations/1589491953447_set_fk_public_parts_orders_returnfrominvoice/up.yaml b/hasura/migrations/1589491953447_set_fk_public_parts_orders_returnfrominvoice/up.yaml
new file mode 100644
index 000000000..6cbd7ae88
--- /dev/null
+++ b/hasura/migrations/1589491953447_set_fk_public_parts_orders_returnfrominvoice/up.yaml
@@ -0,0 +1,10 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: |-
+      alter table "public"."parts_orders"
+                 add constraint "parts_orders_returnfrominvoice_fkey"
+                 foreign key ("returnfrominvoice")
+                 references "public"."invoices"
+                 ("id") on update restrict on delete restrict;
+  type: run_sql
diff --git a/hasura/migrations/1589491967880_track_all_relationships/down.yaml b/hasura/migrations/1589491967880_track_all_relationships/down.yaml
new file mode 100644
index 000000000..b39ac7746
--- /dev/null
+++ b/hasura/migrations/1589491967880_track_all_relationships/down.yaml
@@ -0,0 +1,12 @@
+- args:
+    relationship: parts_orders
+    table:
+      name: invoices
+      schema: public
+  type: drop_relationship
+- args:
+    relationship: invoice
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_relationship
diff --git a/hasura/migrations/1589491967880_track_all_relationships/up.yaml b/hasura/migrations/1589491967880_track_all_relationships/up.yaml
new file mode 100644
index 000000000..e4de73926
--- /dev/null
+++ b/hasura/migrations/1589491967880_track_all_relationships/up.yaml
@@ -0,0 +1,20 @@
+- args:
+    name: parts_orders
+    table:
+      name: invoices
+      schema: public
+    using:
+      foreign_key_constraint_on:
+        column: returnfrominvoice
+        table:
+          name: parts_orders
+          schema: public
+  type: create_array_relationship
+- args:
+    name: invoice
+    table:
+      name: parts_orders
+      schema: public
+    using:
+      foreign_key_constraint_on: returnfrominvoice
+  type: create_object_relationship
diff --git a/hasura/migrations/1589491993267_update_permission_user_public_table_parts_orders/down.yaml b/hasura/migrations/1589491993267_update_permission_user_public_table_parts_orders/down.yaml
new file mode 100644
index 000000000..28ec7048c
--- /dev/null
+++ b/hasura/migrations/1589491993267_update_permission_user_public_table_parts_orders/down.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - created_at
+      - deliver_by
+      - id
+      - jobid
+      - order_date
+      - order_number
+      - return
+      - status
+      - updated_at
+      - user_email
+      - vendorid
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1589491993267_update_permission_user_public_table_parts_orders/up.yaml b/hasura/migrations/1589491993267_update_permission_user_public_table_parts_orders/up.yaml
new file mode 100644
index 000000000..c63d56109
--- /dev/null
+++ b/hasura/migrations/1589491993267_update_permission_user_public_table_parts_orders/up.yaml
@@ -0,0 +1,40 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - created_at
+      - deliver_by
+      - id
+      - jobid
+      - order_date
+      - order_number
+      - return
+      - returnfrominvoice
+      - status
+      - updated_at
+      - user_email
+      - vendorid
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1589492000096_update_permission_user_public_table_parts_orders/down.yaml b/hasura/migrations/1589492000096_update_permission_user_public_table_parts_orders/down.yaml
new file mode 100644
index 000000000..92571d4b8
--- /dev/null
+++ b/hasura/migrations/1589492000096_update_permission_user_public_table_parts_orders/down.yaml
@@ -0,0 +1,37 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - created_at
+      - deliver_by
+      - id
+      - jobid
+      - order_date
+      - order_number
+      - return
+      - status
+      - updated_at
+      - user_email
+      - vendorid
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1589492000096_update_permission_user_public_table_parts_orders/up.yaml b/hasura/migrations/1589492000096_update_permission_user_public_table_parts_orders/up.yaml
new file mode 100644
index 000000000..b62aca044
--- /dev/null
+++ b/hasura/migrations/1589492000096_update_permission_user_public_table_parts_orders/up.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - created_at
+      - deliver_by
+      - id
+      - jobid
+      - order_date
+      - order_number
+      - return
+      - returnfrominvoice
+      - status
+      - updated_at
+      - user_email
+      - vendorid
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1589492006320_update_permission_user_public_table_parts_orders/down.yaml b/hasura/migrations/1589492006320_update_permission_user_public_table_parts_orders/down.yaml
new file mode 100644
index 000000000..13b4f14d5
--- /dev/null
+++ b/hasura/migrations/1589492006320_update_permission_user_public_table_parts_orders/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - deliver_by
+      - order_date
+      - order_number
+      - status
+      - user_email
+      - created_at
+      - updated_at
+      - id
+      - jobid
+      - vendorid
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1589492006320_update_permission_user_public_table_parts_orders/up.yaml b/hasura/migrations/1589492006320_update_permission_user_public_table_parts_orders/up.yaml
new file mode 100644
index 000000000..e5f4bae5f
--- /dev/null
+++ b/hasura/migrations/1589492006320_update_permission_user_public_table_parts_orders/up.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - created_at
+      - deliver_by
+      - id
+      - jobid
+      - order_date
+      - order_number
+      - returnfrominvoice
+      - status
+      - updated_at
+      - user_email
+      - vendorid
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml
index 435215782..78aaed1b5 100644
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -1188,6 +1188,13 @@ tables:
         table:
           schema: public
           name: invoicelines
+  - name: parts_orders
+    using:
+      foreign_key_constraint_on:
+        column: returnfrominvoice
+        table:
+          schema: public
+          name: parts_orders
   insert_permissions:
   - role: user
     permission:
@@ -2837,6 +2844,9 @@ tables:
     schema: public
     name: parts_orders
   object_relationships:
+  - name: invoice
+    using:
+      foreign_key_constraint_on: returnfrominvoice
   - name: job
     using:
       foreign_key_constraint_on: jobid
@@ -2868,29 +2878,33 @@ tables:
               - active:
                   _eq: true
       columns:
-      - deliver_by
-      - order_date
-      - order_number
-      - status
-      - user_email
       - created_at
-      - updated_at
+      - deliver_by
       - id
       - jobid
+      - order_date
+      - order_number
+      - return
+      - returnfrominvoice
+      - status
+      - updated_at
+      - user_email
       - vendorid
   select_permissions:
   - role: user
     permission:
       columns:
-      - deliver_by
-      - order_date
-      - order_number
-      - status
-      - user_email
       - created_at
-      - updated_at
+      - deliver_by
       - id
       - jobid
+      - order_date
+      - order_number
+      - return
+      - returnfrominvoice
+      - status
+      - updated_at
+      - user_email
       - vendorid
       filter:
         job:
@@ -2906,15 +2920,16 @@ tables:
   - role: user
     permission:
       columns:
-      - deliver_by
-      - order_date
-      - order_number
-      - status
-      - user_email
       - created_at
-      - updated_at
+      - deliver_by
       - id
       - jobid
+      - order_date
+      - order_number
+      - returnfrominvoice
+      - status
+      - updated_at
+      - user_email
       - vendorid
       filter:
         job: