diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 86f0692f8..5fa60d411 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -2049,6 +2049,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>agreementnumber</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>cc_cardholder</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/courtesy-car-contract-list/courtesy-car-contract-list.component.jsx b/client/src/components/courtesy-car-contract-list/courtesy-car-contract-list.component.jsx
index f1989c24b..5a9e6b87d 100644
--- a/client/src/components/courtesy-car-contract-list/courtesy-car-contract-list.component.jsx
+++ b/client/src/components/courtesy-car-contract-list/courtesy-car-contract-list.component.jsx
@@ -1,5 +1,98 @@
-import React from "react";
+import { Table } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Link } from "react-router-dom";
+import { alphaSort } from "../../utils/sorters";
+import { DateFormatter } from "../../utils/DateFormatter";
 
 export default function CourtesyCarContractListComponent({ contracts }) {
-  return <div>List</div>;
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: { text: "" }
+  });
+
+  const { t } = useTranslation();
+
+  const columns = [
+    {
+      title: t("contracts.fields.agreementnumber"),
+      dataIndex: "id",
+      key: "id",
+      sorter: (a, b) => alphaSort(a.id, b.id),
+      sortOrder: state.sortedInfo.columnKey === "id" && state.sortedInfo.order,
+      render: (text, record) => (
+        <Link to={`/manage/courtesycars/contracts/${record.id}`}>
+          {record.id || ""}
+        </Link>
+      )
+    },
+    {
+      title: t("jobs.fields.ro_number"),
+      dataIndex: "job.ro_number",
+      key: "job.ro_number",
+      sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
+      sortOrder:
+        state.sortedInfo.columnKey === "job.ro_number" &&
+        state.sortedInfo.order,
+      render: (text, record) => (
+        <Link to={`/manage/jobs/${record.job.id}`}>
+          {record.job.ro_number || ""}
+        </Link>
+      )
+    },
+    {
+      title: t("contracts.fields.driver"),
+      dataIndex: "driver_ln",
+      key: "driver_ln",
+      sorter: (a, b) => alphaSort(a.driver_ln, b.driver_ln),
+      sortOrder:
+        state.sortedInfo.columnKey === "driver_ln" && state.sortedInfo.order,
+      render: (text, record) =>
+        `${record.driver_fn || ""} ${record.driver_ln || ""}`
+    },
+    {
+      title: t("contracts.fields.status"),
+      dataIndex: "status",
+      key: "status",
+      sorter: (a, b) => alphaSort(a.status, b.status),
+      sortOrder:
+        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+      render: (text, record) => t(record.status)
+    },
+    {
+      title: t("contracts.fields.start"),
+      dataIndex: "start",
+      key: "start",
+      sorter: (a, b) => alphaSort(a.start, b.start),
+      sortOrder:
+        state.sortedInfo.columnKey === "start" && state.sortedInfo.order,
+      render: (text, record) => <DateFormatter>{record.start}</DateFormatter>
+    },
+    {
+      title: t("contracts.fields.scheduledreturn"),
+      dataIndex: "scheduledreturn",
+      key: "scheduledreturn",
+      sorter: (a, b) => a.scheduledreturn - b.scheduledreturn,
+      sortOrder:
+        state.sortedInfo.columnKey === "scheduledreturn" &&
+        state.sortedInfo.order,
+      render: (text, record) => (
+        <DateFormatter>{record.scheduledreturn}</DateFormatter>
+      )
+    }
+  ];
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };
+  return (
+    <Table
+      size="small"
+      pagination={{ position: "top" }}
+      columns={columns.map(item => ({ ...item }))}
+      rowKey="id"
+      dataSource={contracts}
+      onChange={handleTableChange}
+    />
+  );
 }
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index 8766e4add..cd79fd4a8 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -1,5 +1,17 @@
 import { DownCircleFilled } from "@ant-design/icons";
-import { Avatar, Badge, Button, Checkbox, Descriptions, Dropdown, Menu, notification, PageHeader, Tag } from "antd";
+import {
+  Avatar,
+  Badge,
+  Button,
+  Checkbox,
+  Descriptions,
+  Dropdown,
+  List,
+  Menu,
+  notification,
+  PageHeader,
+  Tag
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import Moment from "react-moment";
@@ -11,6 +23,7 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import BarcodePopup from "../barcode-popup/barcode-popup.component";
 import OwnerTagPopoverComponent from "../owner-tag-popover/owner-tag-popover.component";
 import VehicleTagPopoverComponent from "../vehicle-tag-popover/vehicle-tag-popover.component";
+import { Link } from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -137,7 +150,15 @@ export default connect(
         </Descriptions.Item>
 
         <Descriptions.Item key="servicecar" label={t("jobs.fields.servicecar")}>
-          {job.service_car}
+          {job.cccontracts &&
+            job.cccontracts.map(item => (
+              <Link
+                key={item.id}
+                to={`/manage/courtesycars/contracts/${item.id}`}
+              >
+                <div>{`${item.start} - ${item.scheduledreturn}`}</div>
+              </Link>
+            ))}
         </Descriptions.Item>
       </Descriptions>
     </PageHeader>
diff --git a/client/src/graphql/courtesy-car.queries.js b/client/src/graphql/courtesy-car.queries.js
index 2548873b6..2c6bb755d 100644
--- a/client/src/graphql/courtesy-car.queries.js
+++ b/client/src/graphql/courtesy-car.queries.js
@@ -86,6 +86,7 @@ export const QUERY_CC_BY_PK = gql`
       vin
       year
       cccontracts {
+        id
         status
         start
         scheduledreturn
@@ -96,6 +97,9 @@ export const QUERY_CC_BY_PK = gql`
         job {
           ro_number
           est_number
+          ownr_ln
+          ownr_fn
+          ownr_co_nm
           id
         }
       }
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 5fd7e8458..b24961d05 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -87,7 +87,6 @@ export const GET_JOB_BY_PK = gql`
   query GET_JOB_BY_PK($id: uuid!) {
     jobs_by_pk(id: $id) {
       updated_at
-      service_car
       csr
       loss_desc
       kmin
@@ -227,6 +226,12 @@ export const GET_JOB_BY_PK = gql`
         lbr_amt
         op_code_desc
       }
+      cccontracts {
+        id
+        status
+        start
+        scheduledreturn
+      }
       appointments_aggregate {
         aggregate {
           count
@@ -294,6 +299,12 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       updated_at
       clm_total
       ded_amt
+      cccontracts {
+        id
+        status
+        start
+        scheduledreturn
+      }
       documents(limit: 3, order_by: { created_at: desc }) {
         id
         thumb_url
diff --git a/client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx b/client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx
index e270cc192..8fd114dde 100644
--- a/client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx
+++ b/client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx
@@ -81,7 +81,9 @@ export default function CourtesyCarDetailPageContainer() {
           : {}
       }
     >
-      <CourtesyCarDetailPageComponent />
+      <CourtesyCarDetailPageComponent
+        contracts={data ? data.courtesycars_by_pk.cccontracts : []}
+      />
     </Form>
   );
 }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 4b66a166e..332555992 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -146,6 +146,7 @@
 			},
 			"fields": {
 				"actualreturn": "Actual Return Date",
+				"agreementnumber": "Agreement Number",
 				"cc_cardholder": "Cardholder Name",
 				"cc_expiry": "Credit Card Expiry Date",
 				"cc_num": "Credit Card Number",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 23d7ff0cd..ecbc8a66a 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -146,6 +146,7 @@
 			},
 			"fields": {
 				"actualreturn": "",
+				"agreementnumber": "",
 				"cc_cardholder": "",
 				"cc_expiry": "",
 				"cc_num": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index b45967ffe..4ed419929 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -146,6 +146,7 @@
 			},
 			"fields": {
 				"actualreturn": "",
+				"agreementnumber": "",
 				"cc_cardholder": "",
 				"cc_expiry": "",
 				"cc_num": "",
diff --git a/hasura/migrations/1585703170344_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1585703170344_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..8cc98c238
--- /dev/null
+++ b/hasura/migrations/1585703170344_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,253 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - shopid
+      - ro_number
+      - ownerid
+      - vehicleid
+      - labor_rate_id
+      - labor_rate_desc
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_lar
+      - rate_las
+      - rate_laf
+      - rate_lam
+      - rate_lag
+      - rate_atp
+      - rate_lau
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_mapa
+      - rate_mash
+      - rate_mahw
+      - rate_ma2s
+      - rate_ma3s
+      - rate_ma2t
+      - rate_mabl
+      - rate_macs
+      - rate_matd
+      - federal_tax_rate
+      - state_tax_rate
+      - local_tax_rate
+      - est_co_nm
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_st
+      - est_zip
+      - est_ctry
+      - est_ph1
+      - est_ea
+      - est_ct_ln
+      - est_ct_fn
+      - scheduled_in
+      - actual_in
+      - scheduled_completion
+      - actual_completion
+      - scheduled_delivery
+      - actual_delivery
+      - regie_number
+      - invoice_date
+      - inproduction
+      - statusid
+      - ins_co_id
+      - ins_co_nm
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_st
+      - ins_zip
+      - ins_ctry
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_fax
+      - ins_faxx
+      - ins_ct_ln
+      - ins_ct_fn
+      - ins_title
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ea
+      - ins_memo
+      - policy_no
+      - ded_amt
+      - ded_status
+      - asgn_no
+      - asgn_date
+      - asgn_type
+      - clm_no
+      - clm_ofc_id
+      - date_estimated
+      - date_open
+      - date_scheduled
+      - date_invoiced
+      - date_closed
+      - date_exported
+      - clm_total
+      - owner_owing
+      - converted
+      - ciecaid
+      - loss_date
+      - clm_ofc_nm
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_st
+      - clm_zip
+      - clm_ctry
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_fax
+      - clm_faxx
+      - clm_ct_ln
+      - clm_ct_fn
+      - clm_title
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ea
+      - payee_nms
+      - pay_type
+      - pay_date
+      - pay_chknm
+      - pay_amt
+      - agt_co_id
+      - agt_co_nm
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_st
+      - agt_zip
+      - agt_ctry
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_fax
+      - agt_faxx
+      - agt_ct_ln
+      - agt_ct_fn
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ea
+      - agt_lic_no
+      - loss_type
+      - loss_desc
+      - theft_ind
+      - cat_no
+      - tlos_ind
+      - cust_pr
+      - insd_ln
+      - insd_fn
+      - insd_title
+      - insd_co_nm
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_st
+      - insd_zip
+      - insd_ctry
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_fax
+      - insd_faxx
+      - insd_ea
+      - ownr_ln
+      - ownr_fn
+      - ownr_title
+      - ownr_co_nm
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_st
+      - ownr_zip
+      - ownr_ctry
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_fax
+      - ownr_faxx
+      - ownr_ea
+      - area_of_damage
+      - loss_cat
+      - est_number
+      - service_car
+      - special_coverage_policy
+      - csr
+      - po_number
+      - unit_number
+      - kmin
+      - kmout
+      - referral_source
+      - selling_dealer
+      - servicing_dealer
+      - servicing_dealer_contact
+      - selling_dealer_contact
+      - depreciation_taxes
+      - federal_tax_payable
+      - other_amount_payable
+      - towing_payable
+      - storage_payable
+      - adjustment_bottom_line
+      - tax_pstthr
+      - tax_tow_rt
+      - tax_sub_rt
+      - tax_paint_mat_rt
+      - tax_levies_rt
+      - tax_prethr
+      - tax_thramt
+      - tax_str_rt
+      - tax_lbr_rt
+      - adj_g_disc
+      - adj_towdis
+      - adj_strdis
+      - tax_predis
+      - rate_laa
+      - status
+      - cieca_stl
+      - g_bett_amt
+      - cieca_ttl
+      - plate_no
+      - plate_st
+      - v_vin
+      - v_model_yr
+      - v_model_desc
+      - v_make_desc
+      - v_color
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1585703170344_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1585703170344_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..4715fb662
--- /dev/null
+++ b/hasura/migrations/1585703170344_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,252 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - cieca_stl
+      - cieca_ttl
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - depreciation_taxes
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_number
+      - est_ph1
+      - est_st
+      - est_zip
+      - federal_tax_payable
+      - federal_tax_rate
+      - g_bett_amt
+      - id
+      - inproduction
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - invoice_date
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - local_tax_rate
+      - loss_cat
+      - loss_date
+      - loss_desc
+      - loss_type
+      - other_amount_payable
+      - owner_owing
+      - ownerid
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_amt
+      - pay_chknm
+      - pay_date
+      - pay_type
+      - payee_nms
+      - plate_no
+      - plate_st
+      - po_number
+      - policy_no
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_laa
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - referral_source
+      - regie_number
+      - ro_number
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - selling_dealer
+      - selling_dealer_contact
+      - servicing_dealer
+      - servicing_dealer_contact
+      - shopid
+      - special_coverage_policy
+      - state_tax_rate
+      - status
+      - statusid
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - tax_str_rt
+      - tax_sub_rt
+      - tax_thramt
+      - tax_tow_rt
+      - theft_ind
+      - tlos_ind
+      - towing_payable
+      - unit_number
+      - updated_at
+      - v_color
+      - v_make_desc
+      - v_model_desc
+      - v_model_yr
+      - v_vin
+      - vehicleid
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1585703177515_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1585703177515_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..4973998e3
--- /dev/null
+++ b/hasura/migrations/1585703177515_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,251 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - cieca_stl
+      - cieca_ttl
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - clm_total
+      - ded_amt
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - g_bett_amt
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_laa
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - plate_no
+      - plate_st
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - status
+      - unit_number
+      - v_color
+      - v_make_desc
+      - v_model_desc
+      - v_model_yr
+      - v_vin
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1585703177515_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1585703177515_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..cf9388142
--- /dev/null
+++ b/hasura/migrations/1585703177515_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,250 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - cieca_stl
+      - cieca_ttl
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - depreciation_taxes
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_number
+      - est_ph1
+      - est_st
+      - est_zip
+      - federal_tax_payable
+      - federal_tax_rate
+      - g_bett_amt
+      - id
+      - inproduction
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - invoice_date
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - local_tax_rate
+      - loss_cat
+      - loss_date
+      - loss_desc
+      - loss_type
+      - other_amount_payable
+      - owner_owing
+      - ownerid
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_amt
+      - pay_chknm
+      - pay_date
+      - pay_type
+      - payee_nms
+      - plate_no
+      - plate_st
+      - po_number
+      - policy_no
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_laa
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - referral_source
+      - regie_number
+      - ro_number
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - selling_dealer
+      - selling_dealer_contact
+      - servicing_dealer
+      - servicing_dealer_contact
+      - shopid
+      - special_coverage_policy
+      - state_tax_rate
+      - status
+      - statusid
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - tax_str_rt
+      - tax_sub_rt
+      - tax_thramt
+      - tax_tow_rt
+      - theft_ind
+      - tlos_ind
+      - towing_payable
+      - unit_number
+      - updated_at
+      - v_color
+      - v_make_desc
+      - v_model_desc
+      - v_model_yr
+      - v_vin
+      - vehicleid
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1585703194595_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1585703194595_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..6d9512c50
--- /dev/null
+++ b/hasura/migrations/1585703194595_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,253 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - cieca_stl
+      - cieca_ttl
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - clm_total
+      - ded_amt
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - g_bett_amt
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_laa
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - plate_no
+      - plate_st
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - status
+      - unit_number
+      - v_color
+      - v_make_desc
+      - v_model_desc
+      - v_model_yr
+      - v_vin
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1585703194595_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1585703194595_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..87f60eed1
--- /dev/null
+++ b/hasura/migrations/1585703194595_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,252 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - cieca_stl
+      - cieca_ttl
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - depreciation_taxes
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_number
+      - est_ph1
+      - est_st
+      - est_zip
+      - federal_tax_payable
+      - federal_tax_rate
+      - g_bett_amt
+      - id
+      - inproduction
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - invoice_date
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - local_tax_rate
+      - loss_cat
+      - loss_date
+      - loss_desc
+      - loss_type
+      - other_amount_payable
+      - owner_owing
+      - ownerid
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_amt
+      - pay_chknm
+      - pay_date
+      - pay_type
+      - payee_nms
+      - plate_no
+      - plate_st
+      - po_number
+      - policy_no
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_laa
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - referral_source
+      - regie_number
+      - ro_number
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - selling_dealer
+      - selling_dealer_contact
+      - servicing_dealer
+      - servicing_dealer_contact
+      - shopid
+      - special_coverage_policy
+      - state_tax_rate
+      - status
+      - statusid
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - tax_str_rt
+      - tax_sub_rt
+      - tax_thramt
+      - tax_tow_rt
+      - theft_ind
+      - tlos_ind
+      - towing_payable
+      - unit_number
+      - updated_at
+      - v_color
+      - v_make_desc
+      - v_model_desc
+      - v_model_yr
+      - v_vin
+      - vehicleid
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1585703205875_alter_table_public_jobs_drop_column_service_car/down.yaml b/hasura/migrations/1585703205875_alter_table_public_jobs_drop_column_service_car/down.yaml
new file mode 100644
index 000000000..f2b80c903
--- /dev/null
+++ b/hasura/migrations/1585703205875_alter_table_public_jobs_drop_column_service_car/down.yaml
@@ -0,0 +1,10 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."jobs" ADD COLUMN "service_car" text;
+  type: run_sql
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."jobs" ALTER COLUMN "service_car" DROP NOT NULL;
+  type: run_sql
diff --git a/hasura/migrations/1585703205875_alter_table_public_jobs_drop_column_service_car/up.yaml b/hasura/migrations/1585703205875_alter_table_public_jobs_drop_column_service_car/up.yaml
new file mode 100644
index 000000000..52fc30855
--- /dev/null
+++ b/hasura/migrations/1585703205875_alter_table_public_jobs_drop_column_service_car/up.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."jobs" DROP COLUMN "service_car" CASCADE;
+  type: run_sql