diff --git a/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx b/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx
index 40c1a1e4e..b90dc0eae 100644
--- a/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx
+++ b/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx
@@ -101,6 +101,7 @@ function InvoiceEnterModalContainer({
 
           if (enterAgain) {
             form.resetFields();
+            form.setFieldsValue({ invoicelines: [] });
           } else {
             toggleModalVisible();
           }
@@ -162,7 +163,6 @@ function InvoiceEnterModalContainer({
         form={form}
         onFinishFailed={() => {
           setEnterAgain(false);
-          console.log("Finish failed");
         }}
         initialValues={{
           jobid:
@@ -172,6 +172,7 @@ function InvoiceEnterModalContainer({
           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,
+          ...invoiceEnterModal.context.invoice,
         }}
       >
         <InvoiceFormContainer form={form} />
diff --git a/client/src/components/invoice-form/invoice-form.lines.component.jsx b/client/src/components/invoice-form/invoice-form.lines.component.jsx
index 3fe86b0f5..ba9e906d0 100644
--- a/client/src/components/invoice-form/invoice-form.lines.component.jsx
+++ b/client/src/components/invoice-form/invoice-form.lines.component.jsx
@@ -41,7 +41,6 @@ export default function InvoiceEnterModalLinesComponent({
                             "invoicelines",
                           ]).invoicelines.map((item, idx) => {
                             if (idx === index) {
-                              console.log("opt", opt);
                               return {
                                 ...item,
                                 line_desc: opt.line_desc,
@@ -60,6 +59,7 @@ export default function InvoiceEnterModalLinesComponent({
                       }}
                     />
                   </Form.Item>
+
                   <Form.Item
                     label={t("invoicelines.fields.line_desc")}
                     key={`${index}line_desc`}
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 c00c08ef7..469e625a7 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
@@ -4,7 +4,7 @@ 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 PartsOrderModal from "../parts-order-modal/parts-order-modal.container";
-import { PartsOrderListTableComponent } from "../parts-order-list-table/parts-order-list-table.component";
+import PartsOrderListTableComponent from "../parts-order-list-table/parts-order-list-table.component";
 const tableCol = {
   xs: {
     span: 24,
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 be8390ec2..540cd6334 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
@@ -5,20 +5,35 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { setModalContext } from "../../redux/modals/modals.actions";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import PartsOrderLineBackorderButton from "../parts-order-line-backorder-button/parts-order-line-backorder-button.component";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 
-const mapDispatchToProps = (dispatch) => ({});
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setInvoiceEnterContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "invoiceEnter" })),
+});
 
 export function PartsOrderListTableComponent({
+  setInvoiceEnterContext,
+  bodyshop,
   job,
   loading,
   invoicesQuery,
-
   handleOnRowClick,
 }) {
+  const responsibilityCenters = bodyshop.md_responsibility_centers;
+
   const { t } = useTranslation();
   const [state, setState] = useState({
     sortedInfo: {},
@@ -71,6 +86,43 @@ export function PartsOrderListTableComponent({
         <DateFormatter>{record.deliver_by}</DateFormatter>
       ),
     },
+    {
+      title: t("general.labels.actions"),
+      dataIndex: "actions",
+      key: "actions",
+      render: (text, record) => (
+        <Button
+          onClick={() => {
+            logImEXEvent("parts_order_receive_invoice");
+
+            setInvoiceEnterContext({
+              actions: { refetch: refetch },
+              context: {
+                job: job,
+                invoice: {
+                  vendorid: record.vendor.id,
+                  invoicelines: record.parts_order_lines.map((pol) => {
+                    return {
+                      joblineid: pol.job_line_id,
+                      line_desc: pol.line_desc,
+                      quantity: pol.quantity,
+                      actual_price: pol.act_price,
+                      cost_center: pol.jobline.part_type
+                        ? responsibilityCenters.defaults.costs[
+                            pol.jobline.part_type
+                          ] || null
+                        : null,
+                    };
+                  }),
+                },
+              },
+            });
+          }}
+        >
+          {t("parts_orders.actions.receiveinvoice")}
+        </Button>
+      ),
+    },
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
@@ -229,4 +281,7 @@ export function PartsOrderListTableComponent({
     </div>
   );
 }
-export default connect(null, mapDispatchToProps)(PartsOrderListTableComponent);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(PartsOrderListTableComponent);
diff --git a/client/src/graphql/invoices.queries.js b/client/src/graphql/invoices.queries.js
index 090c01cfd..c0fe506fa 100644
--- a/client/src/graphql/invoices.queries.js
+++ b/client/src/graphql/invoices.queries.js
@@ -79,6 +79,10 @@ export const QUERY_INVOICES_BY_JOBID = gql`
         line_remarks
         quantity
         job_line_id
+        jobline {
+          id
+          part_type
+        }
         backordered_eta
         backordered_on
       }