diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index cf3050035..0bb1588a7 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
@@ -16516,6 +16516,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>markpstexempt</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>markpstexemptconfirm</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>postbills</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
index b698a179f..cb53d15d3 100644
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -81,6 +81,7 @@ function BillEnterModalContainer({
           },
         ],
       },
+      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
     });
     console.log("adjustmentsToInsert", adjustmentsToInsert);
     const adjKeys = Object.keys(adjustmentsToInsert);
diff --git a/client/src/components/job-payments/job-payments.component.jsx b/client/src/components/job-payments/job-payments.component.jsx
index 50a12d6db..09dd9f831 100644
--- a/client/src/components/job-payments/job-payments.component.jsx
+++ b/client/src/components/job-payments/job-payments.component.jsx
@@ -1,4 +1,5 @@
 import { Button, Card, Space, Table } from "antd";
+import { EditFilled } from "@ant-design/icons";
 import Dinero from "dinero.js";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -115,16 +116,29 @@ export function JobPayments({
       dataIndex: "actions",
       key: "actions",
       render: (text, record) => (
-        <PrintWrapperComponent
-          templateObject={{
-            name: TemplateList("payment").payment_receipt.key,
-            variables: { id: record.id },
-          }}
-          messageObject={{
-            to: job.ownr_ea,
-          }}
-          id={job.id}
-        />
+        <Space wrap>
+          <Button
+            disabled={record.exportedat}
+            onClick={() => {
+              setPaymentContext({
+                actions: { refetch: refetch },
+                context: record,
+              });
+            }}
+          >
+            <EditFilled />
+          </Button>
+          <PrintWrapperComponent
+            templateObject={{
+              name: TemplateList("payment").payment_receipt.key,
+              variables: { id: record.id },
+            }}
+            messageObject={{
+              to: job.ownr_ea,
+            }}
+            id={job.id}
+          />
+        </Space>
       ),
     },
   ];
diff --git a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
index e99a109c4..190ade3ed 100644
--- a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
+++ b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
@@ -11,7 +11,8 @@ import FormItemPhone, {
   PhoneItemFormatterValidation,
 } from "../form-items-formatted/phone-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
-import { JobsDetailRatesParts } from "../jobs-detail-rates/jobs-detail-rates.parts.component";
+import JobsDetailRatesParts from "../jobs-detail-rates/jobs-detail-rates.parts.component";
+import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -187,7 +188,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
           header={t("menus.jobsdetail.financials")}
         >
           <JobsDetailRatesChangeButton form={form} />
-
+          <JobsMarkPstExempt form={form} />
           <LayoutFormRow>
             <Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
               <CurrencyInput />
diff --git a/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx b/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
index 4c8704d96..0369a08fc 100644
--- a/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
+++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
@@ -1,4 +1,13 @@
-import { Form, Input, InputNumber, Select, Space, Switch, Tooltip } from "antd";
+import {
+  Divider,
+  Form,
+  Input,
+  InputNumber,
+  Select,
+  Space,
+  Switch,
+  Tooltip,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -7,6 +16,7 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
 import CABCpvrtCalculator from "../ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
+import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
 import FormRow from "../layout-form-row/layout-form-row.component";
 import JobsDetailRatesParts from "./jobs-detail-rates.parts.component";
 
@@ -103,8 +113,19 @@ export function JobsDetailRates({ jobRO, form, job }) {
           <Switch disabled={jobRO} />
         </Form.Item>
       </FormRow>
-      <JobsDetailRatesChangeButton form={form} disabled={jobRO} />
-      <FormRow header={t("jobs.forms.laborrates")}>
+      <Divider
+        orientation="left"
+        type="horizontal"
+        style={{ marginTop: ".8rem", float: "right" }}
+      >
+        {t("jobs.forms.laborrates")}
+      </Divider>
+      <Space>
+        <div></div>
+        <JobsDetailRatesChangeButton form={form} disabled={jobRO} />
+        <JobsMarkPstExempt form={form} />
+      </Space>
+      <FormRow noDivider>
         <Form.Item
           label={t("jobs.fields.labor_rate_desc")}
           name="labor_rate_desc"
@@ -180,7 +201,6 @@ export function JobsDetailRates({ jobRO, form, job }) {
           <CurrencyInput disabled={jobRO} />
         </Form.Item>
       </FormRow>
-
       <JobsDetailRatesParts form={form} />
     </div>
   );
diff --git a/client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx b/client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx
index 7fdcf1322..3d30b5b51 100644
--- a/client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx
+++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx
@@ -19,7 +19,11 @@ export function JobsDetailRatesParts({
 
   return (
     <Collapse defaultActiveKey={expanded && "rates"}>
-      <Collapse.Panel header={t("jobs.labels.parts_tax_rates")} key="rates">
+      <Collapse.Panel
+        forceRender
+        header={t("jobs.labels.parts_tax_rates")}
+        key="rates"
+      >
         <LayoutFormRow header={t("joblines.fields.part_types.PAA")}>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
diff --git a/client/src/components/jobs-mark-pst-exempt/jobs-mark-pst-exempt.component.jsx b/client/src/components/jobs-mark-pst-exempt/jobs-mark-pst-exempt.component.jsx
new file mode 100644
index 000000000..21ce9ef93
--- /dev/null
+++ b/client/src/components/jobs-mark-pst-exempt/jobs-mark-pst-exempt.component.jsx
@@ -0,0 +1,55 @@
+import { Popconfirm, Button } from "antd";
+import React from "react";
+import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import _ from "lodash";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+});
+
+export function JobsMarkPstExempt({ jobRO, form }) {
+  const { t } = useTranslation();
+
+  const handleConfirm = () => {
+    const newPartRates = _.cloneDeep(form.getFieldValue("parts_tax_rates"));
+
+    Object.keys(newPartRates).forEach((key) => {
+      newPartRates[key] = {
+        ...newPartRates[key],
+        prt_tax_in: false,
+        prt_tax_rt: 0,
+      };
+    });
+
+    form.setFieldsValue({
+      state_tax_rate: 0,
+      tax_lbr_rt: 0,
+      tax_levies_rt: 0,
+      tax_sub_rt: 0,
+      tax_shop_mat_rt: 0,
+      tax_paint_mat_rt: 0,
+      tax_str_rt: 0,
+      tax_tow_rt: 0,
+      parts_tax_rates: newPartRates,
+    });
+  };
+
+  return (
+    <Popconfirm
+      onConfirm={handleConfirm}
+      disabled={jobRO}
+      okText={t("general.labels.yes")}
+      cancelText={t("general.labels.no")}
+      title={t("jobs.actions.markpstexemptconfirm")}
+    >
+      <Button type="link" disabled={jobRO}>
+        {t("jobs.actions.markpstexempt")}
+      </Button>
+    </Popconfirm>
+  );
+}
+export default connect(mapStateToProps, null)(JobsMarkPstExempt);
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 4c904776b..e47221051 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
@@ -90,7 +90,11 @@ export function PartsOrderListTableComponent({
         </Button>
       )}
       <Button
-        disabled={jobRO || record.return}
+        disabled={
+          jobRO ||
+          record.return ||
+          record.vendor.id === bodyshop.inhousevendorid
+        }
         onClick={() => {
           logImEXEvent("parts_order_receive_bill");
           setPartsReceiveContext({
@@ -139,7 +143,10 @@ export function PartsOrderListTableComponent({
         </Button>
       </Popconfirm>
       <Button
-        disabled={jobRO ? !record.return : jobRO}
+        disabled={
+          (jobRO ? !record.return : jobRO) ||
+          record.vendor.id === bodyshop.inhousevendorid
+        }
         onClick={() => {
           logImEXEvent("parts_order_receive_bill");
 
@@ -157,7 +164,7 @@ export function PartsOrderListTableComponent({
                     quantity: pol.quantity,
 
                     actual_price: pol.act_price,
-                    cost_center: pol.jobline.part_type
+                    cost_center: pol.jobline?.part_type
                       ? responsibilityCenters.defaults.costs[
                           pol.jobline.part_type
                         ] || null
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 6bb66bc62..3fbba36c3 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
@@ -101,7 +101,9 @@ export function PartsOrderModalContainer({
 
     const jobLinesResult = await updateJobLines({
       variables: {
-        ids: values.parts_order_lines.data.map((item) => item.job_line_id),
+        ids: values.parts_order_lines.data
+          .filter((item) => item.job_line_id)
+          .map((item) => item.job_line_id),
         status: isReturn
           ? bodyshop.md_order_statuses.default_returned || "Returned*"
           : bodyshop.md_order_statuses.default_ordered || "Ordered*",
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index eb89e38fd..1546da001 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -559,6 +559,7 @@ export const GET_JOB_BY_PK = gql`
       }
       payments {
         id
+        jobid
         amount
         payer
         created_at
@@ -566,6 +567,8 @@ export const GET_JOB_BY_PK = gql`
         transactionid
         memo
         date
+        type
+        exportedat
       }
       cccontracts {
         id
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index a240aa57f..b645b0d0e 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1034,6 +1034,8 @@
 				"intake": "Intake",
 				"manualnew": "Create New Job Manually",
 				"mark": "Mark",
+				"markpstexempt": "Mark Job PST Exempt",
+				"markpstexemptconfirm": "Are you sure you want to do this? To undo this,  you must manually update all PST rates.",
 				"postbills": "Post Bills",
 				"printCenter": "Print Center",
 				"recalculate": "Recalculate",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 485b97639..951a34d18 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1034,6 +1034,8 @@
 				"intake": "",
 				"manualnew": "",
 				"mark": "",
+				"markpstexempt": "",
+				"markpstexemptconfirm": "",
 				"postbills": "Contabilizar facturas",
 				"printCenter": "Centro de impresión",
 				"recalculate": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 0e596494d..476f4280f 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1034,6 +1034,8 @@
 				"intake": "",
 				"manualnew": "",
 				"mark": "",
+				"markpstexempt": "",
+				"markpstexemptconfirm": "",
 				"postbills": "Poster des factures",
 				"printCenter": "Centre d'impression",
 				"recalculate": "",