diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index e3e62a467..d11e1ed2d 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
@@ -4388,6 +4388,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>logo_img_footer_margin</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>logo_img_header_margin</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>logo_img_path</name>
                                         <definition_loaded>false</definition_loaded>
@@ -20581,6 +20623,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>date_rentalresp</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>date_scheduled</name>
                                         <definition_loaded>false</definition_loaded>
@@ -20602,6 +20665,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>date_towin</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>ded_amt</name>
                                         <definition_loaded>false</definition_loaded>
@@ -27371,6 +27455,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>threshhold</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>total_cost</name>
                                         <definition_loaded>false</definition_loaded>
@@ -38448,6 +38553,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>production_by_repair_status_one</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>production_by_ro</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/job-totals-table/job-totals.table.labor.component.jsx b/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
index 76c897ea7..bbd8d7629 100644
--- a/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
@@ -1,4 +1,4 @@
-import { Table } from "antd";
+import { Space, Table } from "antd";
 import Dinero from "dinero.js";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -119,7 +119,18 @@ export default function JobTotalsTableLabor({ job }) {
             </Table.Summary.Cell>
           </Table.Summary.Row>
           <Table.Summary.Row>
-            <Table.Summary.Cell>{t("jobs.labels.mapa")}</Table.Summary.Cell>
+            <Table.Summary.Cell>
+              <Space>
+                {t("jobs.labels.mapa")}
+                {job.materials &&
+                  job.materials.mapa &&
+                  job.materials.mapa.cal_maxdlr &&
+                  job.materials.mapa.cal_maxdlr > 0 &&
+                  t("jobs.labels.threshhold", {
+                    amount: job.materials.mapa.cal_maxdlr,
+                  })}
+              </Space>
+            </Table.Summary.Cell>
             <Table.Summary.Cell align="right">
               <CurrencyFormatter>
                 {job.job_totals.rates.mapa.rate}
@@ -133,7 +144,18 @@ export default function JobTotalsTableLabor({ job }) {
             </Table.Summary.Cell>
           </Table.Summary.Row>
           <Table.Summary.Row>
-            <Table.Summary.Cell>{t("jobs.labels.mash")}</Table.Summary.Cell>
+            <Table.Summary.Cell>
+              <Space wrap>
+                {t("jobs.labels.mash")}
+                {job.materials &&
+                  job.materials.mash &&
+                  job.materials.mash.cal_maxdlr &&
+                  job.materials.mash.cal_maxdlr > 0 &&
+                  t("jobs.labels.threshhold", {
+                    amount: job.materials.mash.cal_maxdlr,
+                  })}
+              </Space>
+            </Table.Summary.Cell>
             <Table.Summary.Cell align="right">
               <CurrencyFormatter>
                 {job.job_totals.rates.mash.rate}
diff --git a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
index e708cb268..28cc4595e 100644
--- a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
+++ b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
@@ -58,6 +58,15 @@ export default function JobsAdminDatesChange({ job }) {
           >
             <FormDatePicker format="MM/DD/YYYY" />
           </Form.Item>
+          <Form.Item label={t("jobs.fields.date_towin")} name="date_towin">
+            <DateTimePicker />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.date_rentalresp")}
+            name="date_rentalresp"
+          >
+            <DateTimePicker />
+          </Form.Item>
           <Form.Item label={t("jobs.fields.date_open")} name="date_open">
             <DateTimePicker />
           </Form.Item>
diff --git a/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js b/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
index c3cd83c54..fea46d8d9 100644
--- a/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
+++ b/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
@@ -37,7 +37,6 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
   });
 
   //Wahtever is left in the existing lines, are lines that should be removed.
-
   const insertQueries = linesToInsert.reduce((acc, value, idx) => {
     return acc + generateInsertQuery(value, idx, jobId);
   }, "");
@@ -49,6 +48,13 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
   const removeQueries = existingLines.reduce((acc, value, idx) => {
     return acc + generateRemoveQuery(value, idx);
   }, "");
+  console.log(insertQueries, updateQueries, removeQueries);
+
+  if ((insertQueries + updateQueries + removeQueries).trim() === "") {
+    return new Promise((resolve, reject) => {
+      resolve(null);
+    });
+  }
 
   return new Promise((resolve, reject) => {
     resolve(gql`
diff --git a/client/src/components/jobs-available-table/jobs-available-table.container.jsx b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
index 9f2b3fd08..1287e288c 100644
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -220,12 +220,13 @@ export function JobsAvailableContainer({
       );
 
       delete supp.joblines;
-      await client.mutate({
-        mutation: gql`
-          ${suppDelta}
-        `,
-      });
-
+      if (suppDelta !== null) {
+        await client.mutate({
+          mutation: gql`
+            ${suppDelta}
+          `,
+        });
+      }
       const updateResult = await updateJob({
         variables: {
           jobId: selectedJob,
diff --git a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
index ec2c9bcef..d4b4848c3 100644
--- a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
+++ b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
@@ -39,6 +39,12 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         <Form.Item label={t("jobs.fields.date_open")} name="date_open">
           <DateTimePicker disabled={jobRO} />
         </Form.Item>
+        <Form.Item label={t("jobs.fields.date_towin")} name="date_towin">
+          <DateTimePicker disabled={jobRO} />
+        </Form.Item>
+        <Form.Item label={t("jobs.fields.date_rentalresp")} name="date_rentalresp">
+          <DateTimePicker disabled={jobRO} />
+        </Form.Item>
       </FormRow>
 
       <FormRow header={t("jobs.forms.scheddates")}>
diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
index 015e0113c..4222addc2 100644
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -401,6 +401,9 @@ export function JobsDetailHeaderActions({
                   job: {
                     status: bodyshop.md_ro_statuses.default_void,
                     voided: true,
+                    scheduled_in: null,
+                    scheduled_completion: null,
+                    inproduction: false,
                   },
                   note: [
                     {
diff --git a/client/src/components/jobs-notes/jobs.notes.component.jsx b/client/src/components/jobs-notes/jobs.notes.component.jsx
index 928eec29c..ff029149f 100644
--- a/client/src/components/jobs-notes/jobs.notes.component.jsx
+++ b/client/src/components/jobs-notes/jobs.notes.component.jsx
@@ -115,7 +115,6 @@ export function JobNotesComponent({
             <EditFilled />
           </Button>
           <PrintWrapperComponent
-            emailOnly
             templateObject={{
               name: Templates.individual_job_note.key,
 
diff --git a/client/src/components/production-list-table/production-list-print.component.jsx b/client/src/components/production-list-table/production-list-print.component.jsx
index 4f64491c2..4e31b33d0 100644
--- a/client/src/components/production-list-table/production-list-print.component.jsx
+++ b/client/src/components/production-list-table/production-list-print.component.jsx
@@ -8,8 +8,11 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 const ProdTemplates = TemplateList("production");
-const { production_by_technician_one, production_by_category_one } =
-  TemplateList("special");
+const {
+  production_by_technician_one,
+  production_by_category_one,
+  production_by_repair_status_one,
+} = TemplateList("special");
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -95,6 +98,29 @@ export function ProductionListPrint({ bodyshop }) {
               </Menu.Item>
             ))}
           </Menu.SubMenu>
+          <Menu.SubMenu
+            title={t("reportcenter.templates.production_by_repair_status_one")}
+          >
+            {bodyshop.md_ro_statuses.production_statuses.map((e) => (
+              <Menu.Item
+                key={e}
+                onClick={async () => {
+                  setLoading(true);
+                  await GenerateDocument(
+                    {
+                      name: production_by_repair_status_one.key,
+                      variables: { status: e },
+                    },
+                    {},
+                    "p"
+                  );
+                  setLoading(false);
+                }}
+              >
+                {e}
+              </Menu.Item>
+            ))}
+          </Menu.SubMenu>
         </Menu>
       }
     >
diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
index 603ef790f..29288b9ee 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -142,6 +142,18 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Input />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.logo_img_header_margin")}
+          name={["logo_img_path", "headerMargin"]}
+        >
+          <InputNumber min={0} />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.logo_img_footer_margin")}
+          name={["logo_img_path", "footerMargin"]}
+        >
+          <InputNumber min={0} />
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow header={t("bodyshop.labels.accountingsetup")}>
         <Form.Item
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index c2b60a88c..9f4c1664c 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -595,6 +595,7 @@ export const GET_JOB_BY_PK = gql`
       ca_gst_registrant
       ownerid
       ded_note
+      materials
       owner {
         id
         ownr_fn
@@ -649,6 +650,8 @@ export const GET_JOB_BY_PK = gql`
       date_invoiced
       date_last_contacted
       date_next_contact
+      date_towin
+      date_rentalresp
       date_exported
       status
       owner_owing
@@ -1097,6 +1100,15 @@ export const VOID_JOB = gql`
     insert_notes(objects: $note) {
       affected_rows
     }
+    update_appointments(
+      where: { jobid: { _eq: $jobId } }
+      _set: { canceled: true }
+    ) {
+      returning {
+        id
+        canceled
+      }
+    }
   }
 `;
 
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 9cee773e8..255a81a03 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -275,6 +275,8 @@
 					"mash": "Job Costing - Shop Materials Hourly Cost Rate"
 				},
 				"lastnumberworkingdays": "Scoreboard - Last Number of Working Days",
+				"logo_img_footer_margin": "Footer Margin (px)",
+				"logo_img_header_margin": "Header Margin (px)",
 				"logo_img_path": "Shop Logo",
 				"logo_img_path_height": "Logo Image Height",
 				"logo_img_path_width": "Logo Image Width",
@@ -1254,7 +1256,9 @@
 				"date_last_contacted": "Last Contacted Date",
 				"date_next_contact": "Next Contact Date",
 				"date_open": "Open",
+				"date_rentalresp": "Shop Rental Responsibility Start",
 				"date_scheduled": "Scheduled",
+				"date_towin": "Towed In",
 				"ded_amt": "Deductible",
 				"ded_note": "Deductible Note",
 				"ded_status": "Deductible Status",
@@ -1602,6 +1606,7 @@
 				"supplementnote": "The job had a supplement imported.",
 				"suspended": "SUSPENDED",
 				"suspense": "Suspense",
+				"threshhold": "Max Threshold: ${{amount}}",
 				"total_cost": "Total Cost",
 				"total_cust_payable": "Total Customer Amount Payable",
 				"total_repairs": "Total Repairs",
@@ -2281,6 +2286,7 @@
 				"production_by_csr": "Production by CSR",
 				"production_by_last_name": "Production by Last Name",
 				"production_by_repair_status": "Production by Status",
+				"production_by_repair_status_one": "Production filtered by Status",
 				"production_by_ro": "Production by RO",
 				"production_by_target_date": "Production by Target Date",
 				"production_by_technician": "Production by Technician",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index fffc38b2b..336ba07d4 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -275,6 +275,8 @@
 					"mash": ""
 				},
 				"lastnumberworkingdays": "",
+				"logo_img_footer_margin": "",
+				"logo_img_header_margin": "",
 				"logo_img_path": "",
 				"logo_img_path_height": "",
 				"logo_img_path_width": "",
@@ -1254,7 +1256,9 @@
 				"date_last_contacted": "",
 				"date_next_contact": "",
 				"date_open": "Abierto",
+				"date_rentalresp": "",
 				"date_scheduled": "Programado",
+				"date_towin": "",
 				"ded_amt": "Deducible",
 				"ded_note": "",
 				"ded_status": "Estado deducible",
@@ -1602,6 +1606,7 @@
 				"supplementnote": "",
 				"suspended": "",
 				"suspense": "",
+				"threshhold": "",
 				"total_cost": "",
 				"total_cust_payable": "",
 				"total_repairs": "",
@@ -2281,6 +2286,7 @@
 				"production_by_csr": "",
 				"production_by_last_name": "",
 				"production_by_repair_status": "",
+				"production_by_repair_status_one": "",
 				"production_by_ro": "",
 				"production_by_target_date": "",
 				"production_by_technician": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index faf9dfd0b..67435a1fc 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -275,6 +275,8 @@
 					"mash": ""
 				},
 				"lastnumberworkingdays": "",
+				"logo_img_footer_margin": "",
+				"logo_img_header_margin": "",
 				"logo_img_path": "",
 				"logo_img_path_height": "",
 				"logo_img_path_width": "",
@@ -1254,7 +1256,9 @@
 				"date_last_contacted": "",
 				"date_next_contact": "",
 				"date_open": "Ouvrir",
+				"date_rentalresp": "",
 				"date_scheduled": "Prévu",
+				"date_towin": "",
 				"ded_amt": "Déductible",
 				"ded_note": "",
 				"ded_status": "Statut de franchise",
@@ -1602,6 +1606,7 @@
 				"supplementnote": "",
 				"suspended": "",
 				"suspense": "",
+				"threshhold": "",
 				"total_cost": "",
 				"total_cust_payable": "",
 				"total_repairs": "",
@@ -2281,6 +2286,7 @@
 				"production_by_csr": "",
 				"production_by_last_name": "",
 				"production_by_repair_status": "",
+				"production_by_repair_status_one": "",
 				"production_by_ro": "",
 				"production_by_target_date": "",
 				"production_by_technician": "",
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 8f7db6bad..6201afada 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -1672,6 +1672,18 @@ export const TemplateList = (type, context) => {
             //idtype: "vendor",
             disabled: false,
           },
+          production_by_repair_status_one: {
+            title: i18n.t(
+              "reportcenter.templates.production_by_repair_status_one"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.production_by_repair_status_one"
+            ),
+            key: "production_by_repair_status_one",
+            //idtype: "vendor",
+            disabled: false,
+          },
         }
       : {}),
   };
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index fbcd2db79..c91b048fc 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -2721,7 +2721,9 @@
       - date_last_contacted
       - date_next_contact
       - date_open
+      - date_rentalresp
       - date_scheduled
+      - date_towin
       - ded_amt
       - ded_note
       - ded_status
@@ -2804,6 +2806,7 @@
       - loss_desc
       - loss_of_use
       - loss_type
+      - materials
       - other_amount_payable
       - owner_owing
       - ownerid
@@ -2978,7 +2981,9 @@
       - date_last_contacted
       - date_next_contact
       - date_open
+      - date_rentalresp
       - date_scheduled
+      - date_towin
       - ded_amt
       - ded_note
       - ded_status
@@ -3061,6 +3066,7 @@
       - loss_desc
       - loss_of_use
       - loss_type
+      - materials
       - other_amount_payable
       - owner_owing
       - ownerid
@@ -3245,7 +3251,9 @@
       - date_last_contacted
       - date_next_contact
       - date_open
+      - date_rentalresp
       - date_scheduled
+      - date_towin
       - ded_amt
       - ded_note
       - ded_status
@@ -3328,6 +3336,7 @@
       - loss_desc
       - loss_of_use
       - loss_type
+      - materials
       - other_amount_payable
       - owner_owing
       - ownerid
diff --git a/hasura/migrations/1647275416695_alter_table_public_jobs_add_column_materials/down.sql b/hasura/migrations/1647275416695_alter_table_public_jobs_add_column_materials/down.sql
new file mode 100644
index 000000000..11bd7aff7
--- /dev/null
+++ b/hasura/migrations/1647275416695_alter_table_public_jobs_add_column_materials/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "materials" jsonb
+--  not null default jsonb_build_object();
diff --git a/hasura/migrations/1647275416695_alter_table_public_jobs_add_column_materials/up.sql b/hasura/migrations/1647275416695_alter_table_public_jobs_add_column_materials/up.sql
new file mode 100644
index 000000000..f3c72141b
--- /dev/null
+++ b/hasura/migrations/1647275416695_alter_table_public_jobs_add_column_materials/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "materials" jsonb
+ not null default jsonb_build_object();
diff --git a/hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/down.sql b/hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/down.sql
new file mode 100644
index 000000000..7c44f678f
--- /dev/null
+++ b/hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "towin_date" timestamptz
+--  null;
diff --git a/hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/up.sql b/hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/up.sql
new file mode 100644
index 000000000..12268c70f
--- /dev/null
+++ b/hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "towin_date" timestamptz
+ null;
diff --git a/hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/down.sql b/hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/down.sql
new file mode 100644
index 000000000..fa9e05495
--- /dev/null
+++ b/hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/down.sql
@@ -0,0 +1 @@
+alter table "public"."jobs" rename column "date_towin" to "towin_date";
diff --git a/hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/up.sql b/hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/up.sql
new file mode 100644
index 000000000..74de863b3
--- /dev/null
+++ b/hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/up.sql
@@ -0,0 +1 @@
+alter table "public"."jobs" rename column "towin_date" to "date_towin";
diff --git a/hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/down.sql b/hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/down.sql
new file mode 100644
index 000000000..09117d3d4
--- /dev/null
+++ b/hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "date_rentalresp" timestamptz
+--  null;
diff --git a/hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/up.sql b/hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/up.sql
new file mode 100644
index 000000000..0d6edf459
--- /dev/null
+++ b/hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "date_rentalresp" timestamptz
+ null;
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index 74f4f3a15..306cb06cb 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -960,6 +960,7 @@ exports.GET_JOB_BY_PK = ` query GET_JOB_BY_PK($id: uuid!) {
       voided
       ca_bc_pvrt
       ca_customer_gst
+      materials
       joblines(where: { removed: { _eq: false } }){
         id
         line_no
diff --git a/server/job/job-totals.js b/server/job/job-totals.js
index f6ef1fda6..35f6d7849 100644
--- a/server/job/job-totals.js
+++ b/server/job/job-totals.js
@@ -234,11 +234,30 @@ function CalculateRatesTotals(ratesList) {
       if (!ret[property].total) {
         ret[property].total = Dinero();
       }
-      ret[property].total = ret[property].total.add(
-        Dinero({
-          amount: Math.round((ret[property].rate || 0) * 100),
-        }).multiply(ret[property].hours)
-      );
+      let threshold;
+      //Check if there is a max for this type.
+      if (ratesList.materials[property]) {
+        //
+        if (
+          ratesList.materials[property].cal_maxdlr &&
+          ratesList.materials[property].cal_maxdlr > 0
+        ) {
+          //It has an upper threshhold.
+          threshold = Dinero({
+            amount: Math.round(ratesList.materials[property].cal_maxdlr * 100),
+          });
+        }
+      }
+
+      const total = Dinero({
+        amount: Math.round((ret[property].rate || 0) * 100),
+      }).multiply(ret[property].hours);
+
+      if (threshold && total.greaterThanOrEqual(threshold)) {
+        ret[property].total = ret[property].total.add(threshold);
+      } else {
+        ret[property].total = ret[property].total.add(total);
+      }
     }
 
     subtotal = subtotal.add(ret[property].total);
@@ -252,6 +271,7 @@ function CalculateRatesTotals(ratesList) {
 
   return ret;
 }
+
 function CalculatePartsTotals(jobLines) {
   const ret = jobLines
     .filter((jl) => !jl.removed)