diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 64e8faa9d..fa49e0b22 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -959,6 +959,69 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>invoice_federal_tax_rate</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>invoice_local_tax_rate</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>invoice_state_tax_rate</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>
@@ -5074,6 +5137,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>federal_tax_rate</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>invoice_number</name>
                                         <definition_loaded>false</definition_loaded>
@@ -5116,6 +5200,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>local_tax_rate</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>ro_number</name>
                                         <definition_loaded>false</definition_loaded>
@@ -5137,6 +5242,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>state_tax_rate</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</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/invoice-detail-edit/invoice-detail-edit.container.jsx b/client/src/components/invoice-detail-edit/invoice-detail-edit.container.jsx
index 1799e23fc..32add3dc6 100644
--- a/client/src/components/invoice-detail-edit/invoice-detail-edit.container.jsx
+++ b/client/src/components/invoice-detail-edit/invoice-detail-edit.container.jsx
@@ -3,7 +3,6 @@ import { Form } from "antd";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useEffect } from "react";
-import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
@@ -19,7 +18,7 @@ const mapStateToProps = createStructuredSelector({
 
 export function InvoiceDetailEditContainer({ bodyshop }) {
   const search = queryString.parse(useLocation().search);
-  const { t } = useTranslation();
+
   const [form] = Form.useForm();
 
   const { loading, error, data } = useQuery(QUERY_INVOICE_BY_PK, {
diff --git a/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx b/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx
index bb8b7ab8c..f549702cb 100644
--- a/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx
+++ b/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx
@@ -6,17 +6,23 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_INVOICE } from "../../graphql/invoices.queries";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import { selectInvoiceEnterModal } from "../../redux/modals/modals.selectors";
 import InvoiceFormContainer from "../invoice-form/invoice-form.container";
 
 const mapStateToProps = createStructuredSelector({
   invoiceEnterModal: selectInvoiceEnterModal,
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("invoiceEnter")),
 });
 
-function InvoiceEnterModalContainer({ invoiceEnterModal, toggleModalVisible }) {
+function InvoiceEnterModalContainer({
+  invoiceEnterModal,
+  toggleModalVisible,
+  bodyshop,
+}) {
   const [form] = Form.useForm();
   const { t } = useTranslation();
   const [enterAgain, setEnterAgain] = useState(false);
@@ -113,6 +119,9 @@ function InvoiceEnterModalContainer({ invoiceEnterModal, toggleModalVisible }) {
             (invoiceEnterModal.context.job &&
               invoiceEnterModal.context.job.id) ||
             null,
+          federal_tax_rate: bodyshop.invoice_tax_rates.federal_tax_rate || 0,
+          state_tax_rate: bodyshop.invoice_tax_rates.state_tax_rate || 0,
+          local_tax_rate: bodyshop.invoice_tax_rates.local_tax_rate || 0,
         }}
       >
         <InvoiceFormContainer form={form} />
diff --git a/client/src/components/invoice-form/invoice-form.component.jsx b/client/src/components/invoice-form/invoice-form.component.jsx
index 76b171f41..9f0d3e800 100644
--- a/client/src/components/invoice-form/invoice-form.component.jsx
+++ b/client/src/components/invoice-form/invoice-form.component.jsx
@@ -6,6 +6,7 @@ import CurrencyInput from "../form-items-formatted/currency-form-item.component"
 import JobSearchSelect from "../job-search-select/job-search-select.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import InvoiceFormLines from "./invoice-form.lines.component";
+import Dinero from "dinero.js";
 
 export default function InvoiceFormComponent({
   form,
@@ -107,6 +108,42 @@ export default function InvoiceFormComponent({
         >
           <CurrencyInput />
         </Form.Item>
+        <Form.Item
+          label={t("invoices.fields.federal_tax_rate")}
+          name="federal_tax_rate"
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <CurrencyInput />
+        </Form.Item>
+        <Form.Item
+          label={t("invoices.fields.state_tax_rate")}
+          name="state_tax_rate"
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <CurrencyInput />
+        </Form.Item>
+        <Form.Item
+          label={t("invoices.fields.local_tax_rate")}
+          name="local_tax_rate"
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <CurrencyInput />
+        </Form.Item>
       </div>
       <InvoiceFormLines
         lineData={lineData}
@@ -119,6 +156,16 @@ export default function InvoiceFormComponent({
         <DocumentsUploadContainer jobId={form.getFieldValue("jobid")} />
       </Form.Item>
 
+      <Form.Item shouldUpdate>
+        {() => {
+          return (
+            <div>
+              {JSON.stringify(form.getFieldsValue(["invoicelines", "total"]))}
+            </div>
+          );
+        }}
+      </Form.Item>
+
       <button
         onClick={() => {
           console.log(form.getFieldsValue());
diff --git a/client/src/components/invoice-form/invoice-form.lines.component.jsx b/client/src/components/invoice-form/invoice-form.lines.component.jsx
index 4a1948d75..9e0ce992a 100644
--- a/client/src/components/invoice-form/invoice-form.lines.component.jsx
+++ b/client/src/components/invoice-form/invoice-form.lines.component.jsx
@@ -1,5 +1,5 @@
 import { DeleteFilled } from "@ant-design/icons";
-import { Button, Form, Input, Select } from "antd";
+import { Button, Form, Input, Select, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
@@ -59,7 +59,6 @@ export default function InvoiceEnterModalLinesComponent({
                       }}
                     />
                   </Form.Item>
-
                   <Form.Item
                     label={t("invoicelines.fields.line_desc")}
                     key={`${index}line_desc`}
@@ -73,7 +72,6 @@ export default function InvoiceEnterModalLinesComponent({
                   >
                     <Input />
                   </Form.Item>
-
                   <Form.Item
                     label={t("invoicelines.fields.actual")}
                     key={`${index}actual_price`}
@@ -135,6 +133,31 @@ export default function InvoiceEnterModalLinesComponent({
                       ))}
                     </Select>
                   </Form.Item>
+                  <Form.Item
+                    label={t("invoicelines.fields.federal_tax_applicable")}
+                    key={`${index}fedtax`}
+                    initialValue={"true"}
+                    valuePropName="checked"
+                    name={[field.name, "applicable_taxes", "federal"]}
+                  >
+                    <Switch />
+                  </Form.Item>
+                  <Form.Item
+                    label={t("invoicelines.fields.state_tax_applicable")}
+                    key={`${index}statetax`}
+                    valuePropName="checked"
+                    name={[field.name, "applicable_taxes", "state"]}
+                  >
+                    <Switch />
+                  </Form.Item>{" "}
+                  <Form.Item
+                    label={t("invoicelines.fields.local_tax_applicable")}
+                    key={`${index}localtax`}
+                    valuePropName="checked"
+                    name={[field.name, "applicable_taxes", "local"]}
+                  >
+                    <Switch />
+                  </Form.Item>
                   <DeleteFilled
                     onClick={() => {
                       remove(field.name);
diff --git a/client/src/components/invoice-line-search-select/invoice-line-search-select.component.jsx b/client/src/components/invoice-line-search-select/invoice-line-search-select.component.jsx
index f726115e7..be95d846c 100644
--- a/client/src/components/invoice-line-search-select/invoice-line-search-select.component.jsx
+++ b/client/src/components/invoice-line-search-select/invoice-line-search-select.component.jsx
@@ -27,10 +27,10 @@ const InvoiceLineSearchSelect = ({
       autoFocus
       value={option}
       style={{
-        width: 450,
+        width: 300,
       }}
       onChange={setOption}
-      optionFilterProp="children"
+      optionFilterProp="line_desc"
       onBlur={onBlur}
       onSelect={onSelect}
     >
diff --git a/client/src/components/shop-info/shop-info.component.jsx b/client/src/components/shop-info/shop-info.component.jsx
index a3d385f9b..8c39bf08d 100644
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { Form, Input, Button, Collapse } from "antd";
+import { Form, Input, Button, Collapse, InputNumber } from "antd";
 import { useTranslation } from "react-i18next";
 import ShopInfoROStatusComponent from "./shop-info.rostatus.component";
 import ShopInfoOrderStatusComponent from "./shop-info.orderstatus.component";
@@ -63,6 +63,24 @@ export default function ShopInfoComponent({ form }) {
           >
             <Input />
           </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.invoice_federal_tax_rate")}
+            name={["invoice_tax_rates", "federal_tax_rate"]}
+          >
+            <InputNumber />
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.invoice_state_tax_rate")}
+            name={["invoice_tax_rates", "state_tax_rate"]}
+          >
+            <InputNumber />
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.invoice_local_tax_rate")}
+            name={["invoice_tax_rates", "local_tax_rate"]}
+          >
+            <InputNumber />
+          </Form.Item>
         </Collapse.Panel>
         <Collapse.Panel
           key="roStatus"
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index 8702f5dfe..ac1ec745c 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -27,6 +27,7 @@ export const QUERY_BODYSHOP = gql`
       template_header
       textid
       production_config
+      invoice_tax_rates
       employees {
         id
         first_name
@@ -74,6 +75,7 @@ export const UPDATE_SHOP = gql`
         template_header
         textid
         production_config
+        invoice_tax_rates
         employees {
           id
           first_name
diff --git a/client/src/graphql/invoices.queries.js b/client/src/graphql/invoices.queries.js
index a227886a9..3f747d611 100644
--- a/client/src/graphql/invoices.queries.js
+++ b/client/src/graphql/invoices.queries.js
@@ -102,6 +102,7 @@ export const QUERY_INVOICE_BY_PK = gql`
         actual_cost
         cost_center
         joblineid
+        applicable_taxes
       }
     }
   }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 8e3958fb9..4369212fa 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -80,6 +80,9 @@
 				"email": "General Shop Email",
 				"federal_tax_id": "Federal Tax ID (GST/HST)",
 				"insurance_vendor_id": "Insurance Vendor ID",
+				"invoice_federal_tax_rate": "Invoices - Federal Tax Rate %",
+				"invoice_local_tax_rate": "Invoices - State Tax Rate %",
+				"invoice_state_tax_rate": "Invoices - State Tax Rate %",
 				"logo_img_path": "Shop Logo",
 				"responsibilitycenter": "Responsibility Center",
 				"responsibilitycenters": {
@@ -357,9 +360,12 @@
 			},
 			"fields": {
 				"date": "Invoice Date",
+				"federal_tax_rate": "Federal Tax Rate",
 				"invoice_number": "Invoice Number",
 				"is_credit_memo": "Credit Memo?",
+				"local_tax_rate": "Local Tax Rate",
 				"ro_number": "RO Number",
+				"state_tax_rate": "State Tax Rate",
 				"total": "Invoice Total",
 				"vendor": "Vendor",
 				"vendorname": "Vendor Name"
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 8ab9f1c6f..1a47653d9 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -80,6 +80,9 @@
 				"email": "",
 				"federal_tax_id": "",
 				"insurance_vendor_id": "",
+				"invoice_federal_tax_rate": "",
+				"invoice_local_tax_rate": "",
+				"invoice_state_tax_rate": "",
 				"logo_img_path": "",
 				"responsibilitycenter": "",
 				"responsibilitycenters": {
@@ -357,9 +360,12 @@
 			},
 			"fields": {
 				"date": "",
+				"federal_tax_rate": "",
 				"invoice_number": "",
 				"is_credit_memo": "",
+				"local_tax_rate": "",
 				"ro_number": "",
+				"state_tax_rate": "",
 				"total": "",
 				"vendor": "",
 				"vendorname": ""
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 993cf3b86..38fb8d442 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -80,6 +80,9 @@
 				"email": "",
 				"federal_tax_id": "",
 				"insurance_vendor_id": "",
+				"invoice_federal_tax_rate": "",
+				"invoice_local_tax_rate": "",
+				"invoice_state_tax_rate": "",
 				"logo_img_path": "",
 				"responsibilitycenter": "",
 				"responsibilitycenters": {
@@ -357,9 +360,12 @@
 			},
 			"fields": {
 				"date": "",
+				"federal_tax_rate": "",
 				"invoice_number": "",
 				"is_credit_memo": "",
+				"local_tax_rate": "",
 				"ro_number": "",
+				"state_tax_rate": "",
 				"total": "",
 				"vendor": "",
 				"vendorname": ""
diff --git a/hasura/migrations/1588704131761_alter_table_public_invoices_add_column_federal_tax_rate/down.yaml b/hasura/migrations/1588704131761_alter_table_public_invoices_add_column_federal_tax_rate/down.yaml
new file mode 100644
index 000000000..24e6ffc88
--- /dev/null
+++ b/hasura/migrations/1588704131761_alter_table_public_invoices_add_column_federal_tax_rate/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."invoices" DROP COLUMN "federal_tax_rate";
+  type: run_sql
diff --git a/hasura/migrations/1588704131761_alter_table_public_invoices_add_column_federal_tax_rate/up.yaml b/hasura/migrations/1588704131761_alter_table_public_invoices_add_column_federal_tax_rate/up.yaml
new file mode 100644
index 000000000..4c06cca2d
--- /dev/null
+++ b/hasura/migrations/1588704131761_alter_table_public_invoices_add_column_federal_tax_rate/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."invoices" ADD COLUMN "federal_tax_rate" numeric NOT
+      NULL DEFAULT 0;
+  type: run_sql
diff --git a/hasura/migrations/1588704142534_alter_table_public_invoices_add_column_state_tax_rate/down.yaml b/hasura/migrations/1588704142534_alter_table_public_invoices_add_column_state_tax_rate/down.yaml
new file mode 100644
index 000000000..19059eaab
--- /dev/null
+++ b/hasura/migrations/1588704142534_alter_table_public_invoices_add_column_state_tax_rate/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."invoices" DROP COLUMN "state_tax_rate";
+  type: run_sql
diff --git a/hasura/migrations/1588704142534_alter_table_public_invoices_add_column_state_tax_rate/up.yaml b/hasura/migrations/1588704142534_alter_table_public_invoices_add_column_state_tax_rate/up.yaml
new file mode 100644
index 000000000..b5ed8aadc
--- /dev/null
+++ b/hasura/migrations/1588704142534_alter_table_public_invoices_add_column_state_tax_rate/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."invoices" ADD COLUMN "state_tax_rate" numeric NOT NULL
+      DEFAULT 0;
+  type: run_sql
diff --git a/hasura/migrations/1588704154625_alter_table_public_invoices_add_column_local_tax_rate/down.yaml b/hasura/migrations/1588704154625_alter_table_public_invoices_add_column_local_tax_rate/down.yaml
new file mode 100644
index 000000000..295172295
--- /dev/null
+++ b/hasura/migrations/1588704154625_alter_table_public_invoices_add_column_local_tax_rate/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."invoices" DROP COLUMN "local_tax_rate";
+  type: run_sql
diff --git a/hasura/migrations/1588704154625_alter_table_public_invoices_add_column_local_tax_rate/up.yaml b/hasura/migrations/1588704154625_alter_table_public_invoices_add_column_local_tax_rate/up.yaml
new file mode 100644
index 000000000..c7fb4cfba
--- /dev/null
+++ b/hasura/migrations/1588704154625_alter_table_public_invoices_add_column_local_tax_rate/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."invoices" ADD COLUMN "local_tax_rate" numeric NOT NULL
+      DEFAULT 0;
+  type: run_sql
diff --git a/hasura/migrations/1588704166538_update_permission_user_public_table_invoices/down.yaml b/hasura/migrations/1588704166538_update_permission_user_public_table_invoices/down.yaml
new file mode 100644
index 000000000..0ec004109
--- /dev/null
+++ b/hasura/migrations/1588704166538_update_permission_user_public_table_invoices/down.yaml
@@ -0,0 +1,40 @@
+- args:
+    role: user
+    table:
+      name: invoices
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - vendorid
+      - jobid
+      - date
+      - due_date
+      - exported
+      - exported_at
+      - is_credit_memo
+      - total
+      - invoice_number
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: invoices
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1588704166538_update_permission_user_public_table_invoices/up.yaml b/hasura/migrations/1588704166538_update_permission_user_public_table_invoices/up.yaml
new file mode 100644
index 000000000..687709b1e
--- /dev/null
+++ b/hasura/migrations/1588704166538_update_permission_user_public_table_invoices/up.yaml
@@ -0,0 +1,43 @@
+- args:
+    role: user
+    table:
+      name: invoices
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - created_at
+      - date
+      - due_date
+      - exported
+      - exported_at
+      - federal_tax_rate
+      - id
+      - invoice_number
+      - is_credit_memo
+      - jobid
+      - local_tax_rate
+      - state_tax_rate
+      - total
+      - updated_at
+      - vendorid
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: invoices
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1588704173695_update_permission_user_public_table_invoices/down.yaml b/hasura/migrations/1588704173695_update_permission_user_public_table_invoices/down.yaml
new file mode 100644
index 000000000..d52d9cdc5
--- /dev/null
+++ b/hasura/migrations/1588704173695_update_permission_user_public_table_invoices/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: invoices
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - exported
+      - is_credit_memo
+      - date
+      - due_date
+      - total
+      - invoice_number
+      - created_at
+      - exported_at
+      - updated_at
+      - id
+      - jobid
+      - vendorid
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: invoices
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1588704173695_update_permission_user_public_table_invoices/up.yaml b/hasura/migrations/1588704173695_update_permission_user_public_table_invoices/up.yaml
new file mode 100644
index 000000000..d4f9086a3
--- /dev/null
+++ b/hasura/migrations/1588704173695_update_permission_user_public_table_invoices/up.yaml
@@ -0,0 +1,41 @@
+- args:
+    role: user
+    table:
+      name: invoices
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - created_at
+      - date
+      - due_date
+      - exported
+      - exported_at
+      - federal_tax_rate
+      - id
+      - invoice_number
+      - is_credit_memo
+      - jobid
+      - local_tax_rate
+      - state_tax_rate
+      - total
+      - updated_at
+      - vendorid
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: invoices
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1588704180439_update_permission_user_public_table_invoices/down.yaml b/hasura/migrations/1588704180439_update_permission_user_public_table_invoices/down.yaml
new file mode 100644
index 000000000..4d4938a0a
--- /dev/null
+++ b/hasura/migrations/1588704180439_update_permission_user_public_table_invoices/down.yaml
@@ -0,0 +1,40 @@
+- args:
+    role: user
+    table:
+      name: invoices
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - exported
+      - is_credit_memo
+      - date
+      - due_date
+      - total
+      - invoice_number
+      - created_at
+      - exported_at
+      - updated_at
+      - id
+      - jobid
+      - vendorid
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: invoices
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1588704180439_update_permission_user_public_table_invoices/up.yaml b/hasura/migrations/1588704180439_update_permission_user_public_table_invoices/up.yaml
new file mode 100644
index 000000000..c1638595a
--- /dev/null
+++ b/hasura/migrations/1588704180439_update_permission_user_public_table_invoices/up.yaml
@@ -0,0 +1,43 @@
+- args:
+    role: user
+    table:
+      name: invoices
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - created_at
+      - date
+      - due_date
+      - exported
+      - exported_at
+      - federal_tax_rate
+      - id
+      - invoice_number
+      - is_credit_memo
+      - jobid
+      - local_tax_rate
+      - state_tax_rate
+      - total
+      - updated_at
+      - vendorid
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: invoices
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1588704900361_alter_table_public_bodyshops_add_column_invoice_tax_rates/down.yaml b/hasura/migrations/1588704900361_alter_table_public_bodyshops_add_column_invoice_tax_rates/down.yaml
new file mode 100644
index 000000000..f0754b343
--- /dev/null
+++ b/hasura/migrations/1588704900361_alter_table_public_bodyshops_add_column_invoice_tax_rates/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "invoice_tax_rates";
+  type: run_sql
diff --git a/hasura/migrations/1588704900361_alter_table_public_bodyshops_add_column_invoice_tax_rates/up.yaml b/hasura/migrations/1588704900361_alter_table_public_bodyshops_add_column_invoice_tax_rates/up.yaml
new file mode 100644
index 000000000..5592d4d25
--- /dev/null
+++ b/hasura/migrations/1588704900361_alter_table_public_bodyshops_add_column_invoice_tax_rates/up.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "invoice_tax_rates" jsonb NULL;
+  type: run_sql
diff --git a/hasura/migrations/1588704928185_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1588704928185_update_permission_user_public_table_bodyshops/down.yaml
new file mode 100644
index 000000000..aac8c63cf
--- /dev/null
+++ b/hasura/migrations/1588704928185_update_permission_user_public_table_bodyshops/down.yaml
@@ -0,0 +1,47 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - address1
+      - address2
+      - city
+      - country
+      - created_at
+      - email
+      - federal_tax_id
+      - id
+      - insurance_vendor_id
+      - logo_img_path
+      - md_order_statuses
+      - md_responsibility_centers
+      - md_ro_statuses
+      - messagingservicesid
+      - production_config
+      - region_config
+      - shopname
+      - shoprates
+      - state
+      - state_tax_id
+      - template_header
+      - textid
+      - updated_at
+      - zip_post
+      computed_fields: []
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1588704928185_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1588704928185_update_permission_user_public_table_bodyshops/up.yaml
new file mode 100644
index 000000000..e047a4088
--- /dev/null
+++ b/hasura/migrations/1588704928185_update_permission_user_public_table_bodyshops/up.yaml
@@ -0,0 +1,48 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - address1
+      - address2
+      - city
+      - country
+      - created_at
+      - email
+      - federal_tax_id
+      - id
+      - insurance_vendor_id
+      - invoice_tax_rates
+      - logo_img_path
+      - md_order_statuses
+      - md_responsibility_centers
+      - md_ro_statuses
+      - messagingservicesid
+      - production_config
+      - region_config
+      - shopname
+      - shoprates
+      - state
+      - state_tax_id
+      - template_header
+      - textid
+      - updated_at
+      - zip_post
+      computed_fields: []
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1588704935620_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1588704935620_update_permission_user_public_table_bodyshops/down.yaml
new file mode 100644
index 000000000..f7578cf44
--- /dev/null
+++ b/hasura/migrations/1588704935620_update_permission_user_public_table_bodyshops/down.yaml
@@ -0,0 +1,45 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - address1
+      - address2
+      - city
+      - country
+      - created_at
+      - email
+      - federal_tax_id
+      - id
+      - insurance_vendor_id
+      - logo_img_path
+      - md_order_statuses
+      - md_responsibility_centers
+      - md_ro_statuses
+      - production_config
+      - shopname
+      - shoprates
+      - state
+      - state_tax_id
+      - updated_at
+      - zip_post
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1588704935620_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1588704935620_update_permission_user_public_table_bodyshops/up.yaml
new file mode 100644
index 000000000..345dd574c
--- /dev/null
+++ b/hasura/migrations/1588704935620_update_permission_user_public_table_bodyshops/up.yaml
@@ -0,0 +1,46 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - address1
+      - address2
+      - city
+      - country
+      - created_at
+      - email
+      - federal_tax_id
+      - id
+      - insurance_vendor_id
+      - invoice_tax_rates
+      - logo_img_path
+      - md_order_statuses
+      - md_responsibility_centers
+      - md_ro_statuses
+      - production_config
+      - shopname
+      - shoprates
+      - state
+      - state_tax_id
+      - updated_at
+      - zip_post
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1588705546595_alter_table_public_invoicelines_add_column_applicable_taxes/down.yaml b/hasura/migrations/1588705546595_alter_table_public_invoicelines_add_column_applicable_taxes/down.yaml
new file mode 100644
index 000000000..ec63d6d9f
--- /dev/null
+++ b/hasura/migrations/1588705546595_alter_table_public_invoicelines_add_column_applicable_taxes/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."invoicelines" DROP COLUMN "applicable_taxes";
+  type: run_sql
diff --git a/hasura/migrations/1588705546595_alter_table_public_invoicelines_add_column_applicable_taxes/up.yaml b/hasura/migrations/1588705546595_alter_table_public_invoicelines_add_column_applicable_taxes/up.yaml
new file mode 100644
index 000000000..8facd11e3
--- /dev/null
+++ b/hasura/migrations/1588705546595_alter_table_public_invoicelines_add_column_applicable_taxes/up.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."invoicelines" ADD COLUMN "applicable_taxes" jsonb NULL;
+  type: run_sql
diff --git a/hasura/migrations/1588705553835_update_permission_user_public_table_invoicelines/down.yaml b/hasura/migrations/1588705553835_update_permission_user_public_table_invoicelines/down.yaml
new file mode 100644
index 000000000..8e91e50c6
--- /dev/null
+++ b/hasura/migrations/1588705553835_update_permission_user_public_table_invoicelines/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: invoicelines
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        invoice:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - invoiceid
+      - line_desc
+      - actual_price
+      - actual_cost
+      - cost_center
+      - joblineid
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: invoicelines
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1588705553835_update_permission_user_public_table_invoicelines/up.yaml b/hasura/migrations/1588705553835_update_permission_user_public_table_invoicelines/up.yaml
new file mode 100644
index 000000000..c168c6100
--- /dev/null
+++ b/hasura/migrations/1588705553835_update_permission_user_public_table_invoicelines/up.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: invoicelines
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        invoice:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+      columns:
+      - actual_cost
+      - actual_price
+      - applicable_taxes
+      - cost_center
+      - created_at
+      - id
+      - invoiceid
+      - joblineid
+      - line_desc
+      - updated_at
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: invoicelines
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1588705558916_update_permission_user_public_table_invoicelines/down.yaml b/hasura/migrations/1588705558916_update_permission_user_public_table_invoicelines/down.yaml
new file mode 100644
index 000000000..871106bbf
--- /dev/null
+++ b/hasura/migrations/1588705558916_update_permission_user_public_table_invoicelines/down.yaml
@@ -0,0 +1,36 @@
+- args:
+    role: user
+    table:
+      name: invoicelines
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - actual_cost
+      - actual_price
+      - cost_center
+      - line_desc
+      - created_at
+      - updated_at
+      - joblineid
+      - id
+      - invoiceid
+      computed_fields: []
+      filter:
+        invoice:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+    role: user
+    table:
+      name: invoicelines
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1588705558916_update_permission_user_public_table_invoicelines/up.yaml b/hasura/migrations/1588705558916_update_permission_user_public_table_invoicelines/up.yaml
new file mode 100644
index 000000000..1415d9617
--- /dev/null
+++ b/hasura/migrations/1588705558916_update_permission_user_public_table_invoicelines/up.yaml
@@ -0,0 +1,37 @@
+- args:
+    role: user
+    table:
+      name: invoicelines
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - actual_cost
+      - actual_price
+      - applicable_taxes
+      - cost_center
+      - created_at
+      - id
+      - invoiceid
+      - joblineid
+      - line_desc
+      - updated_at
+      computed_fields: []
+      filter:
+        invoice:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+    role: user
+    table:
+      name: invoicelines
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1588705564365_update_permission_user_public_table_invoicelines/down.yaml b/hasura/migrations/1588705564365_update_permission_user_public_table_invoicelines/down.yaml
new file mode 100644
index 000000000..07a761b5d
--- /dev/null
+++ b/hasura/migrations/1588705564365_update_permission_user_public_table_invoicelines/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: invoicelines
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - actual_cost
+      - actual_price
+      - cost_center
+      - line_desc
+      - created_at
+      - updated_at
+      - joblineid
+      - id
+      - invoiceid
+      filter:
+        invoice:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: invoicelines
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1588705564365_update_permission_user_public_table_invoicelines/up.yaml b/hasura/migrations/1588705564365_update_permission_user_public_table_invoicelines/up.yaml
new file mode 100644
index 000000000..5dca3857f
--- /dev/null
+++ b/hasura/migrations/1588705564365_update_permission_user_public_table_invoicelines/up.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: invoicelines
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - actual_cost
+      - actual_price
+      - applicable_taxes
+      - cost_center
+      - created_at
+      - id
+      - invoiceid
+      - joblineid
+      - line_desc
+      - updated_at
+      filter:
+        invoice:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: invoicelines
+      schema: public
+  type: create_update_permission