diff --git a/.vscode/settings.json b/.vscode/settings.json
index e499a11be..dd6a1330b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,4 @@
 {
-  "eslint.workingDirectories": ["./client", "./"],
   "xml.fileAssociations": [
     {
       "pattern": "**/Test.xml",
diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 7d1d27464..23707d6e7 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -4593,6 +4593,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>enforce_conversion_category</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>enforce_conversion_csr</name>
                                         <definition_loaded>false</definition_loaded>
@@ -20868,6 +20889,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>sendpartspricechange</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>sendtodms</name>
                                         <definition_loaded>false</definition_loaded>
@@ -21314,6 +21356,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>partspricechange</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>saving</name>
                                         <definition_loaded>false</definition_loaded>
@@ -40906,6 +40969,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>customer_list</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>cycle_time_analysis</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
index 71069e3b2..d588d50e4 100644
--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -43,7 +43,7 @@ export function JobsConvertButton({
   const { t } = useTranslation();
   const [form] = Form.useForm();
 
-  const handleConvert = async ({ employee_csr, ...values }) => {
+  const handleConvert = async ({ employee_csr, category, ...values }) => {
     if (parentFormIsFieldsTouched()) {
       alert(t("jobs.labels.savebeforeconversion"));
       return;
@@ -55,6 +55,7 @@ export function JobsConvertButton({
         job: {
           converted: true,
           ...(bodyshop.enforce_conversion_csr ? { employee_csr } : {}),
+          ...(bodyshop.enforce_conversion_category ? { category } : {}),
           ...values,
         },
       },
@@ -94,6 +95,7 @@ export function JobsConvertButton({
           driveable: true,
           towin: false,
           employee_csr: job.employee_csr,
+          category: job.category,
         }}
       >
         <Form.Item
@@ -197,6 +199,26 @@ export function JobsConvertButton({
             </Select>
           </Form.Item>
         )}
+        {bodyshop.enforce_conversion_category && (
+          <Form.Item
+            name={"category"}
+            label={t("jobs.fields.category")}
+            rules={[
+              {
+                required: bodyshop.enforce_conversion_category,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <Select allowClear>
+              {bodyshop.md_categories.map((s) => (
+                <Select.Option key={s} value={s}>
+                  {s}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+        )}
         <Form.Item
           label={t("jobs.fields.ca_gst_registrant")}
           name="ca_gst_registrant"
diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
index f01e10aba..3e9b1ed2c 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -473,6 +473,13 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          name={["enforce_conversion_category"]}
+          label={t("bodyshop.fields.enforce_conversion_category")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
         <Form.Item
           name={["target_touchtime"]}
           label={t("bodyshop.fields.target_touchtime")}
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index 5c718420a..bd52f4721 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -115,6 +115,7 @@ export const QUERY_BODYSHOP = gql`
       enforce_conversion_csr
       md_lost_sale_reasons
       md_parts_scan
+      enforce_conversion_category
       employees {
         user_email
         id
@@ -227,6 +228,7 @@ export const UPDATE_SHOP = gql`
         enforce_conversion_csr
         md_lost_sale_reasons
         md_parts_scan
+        enforce_conversion_category
         employees {
           id
           first_name
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 60ad940b6..960730798 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -283,6 +283,7 @@
 				},
 				"email": "General Shop Email",
 				"enforce_class": "Enforce Class on Conversion?",
+				"enforce_conversion_category": "Enforce Conversion Category",
 				"enforce_conversion_csr": "Enforce CSR on Conversion?",
 				"enforce_referral": "Enforce Referrals",
 				"federal_tax_id": "Federal Tax ID (GST/HST)",
@@ -1280,6 +1281,7 @@
 				"removefromproduction": "Remove from Production",
 				"schedule": "Schedule",
 				"sendcsi": "Send CSI",
+				"sendpartspricechange": "",
 				"sendtodms": "Send to DMS",
 				"sync": "Sync",
 				"uninvoice": "Uninvoice",
@@ -1303,6 +1305,7 @@
 				"nojobselected": "No job is selected.",
 				"noowner": "No owner associated.",
 				"novehicle": "No vehicle associated.",
+				"partspricechange": "",
 				"saving": "Error encountered while saving record.",
 				"scanimport": "Error importing job. {{message}}",
 				"totalscalc": "Error while calculating new job totals.",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 2676a7613..f926c0817 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -283,6 +283,7 @@
 				},
 				"email": "",
 				"enforce_class": "",
+				"enforce_conversion_category": "",
 				"enforce_conversion_csr": "",
 				"enforce_referral": "",
 				"federal_tax_id": "",
@@ -1280,6 +1281,7 @@
 				"removefromproduction": "",
 				"schedule": "Programar",
 				"sendcsi": "",
+				"sendpartspricechange": "",
 				"sendtodms": "",
 				"sync": "",
 				"uninvoice": "",
@@ -1303,6 +1305,7 @@
 				"nojobselected": "No hay trabajo seleccionado.",
 				"noowner": "Ningún propietario asociado.",
 				"novehicle": "No hay vehículo asociado.",
+				"partspricechange": "",
 				"saving": "Se encontró un error al guardar el registro.",
 				"scanimport": "",
 				"totalscalc": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 3c4ceb341..3f54c740a 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -283,6 +283,7 @@
 				},
 				"email": "",
 				"enforce_class": "",
+				"enforce_conversion_category": "",
 				"enforce_conversion_csr": "",
 				"enforce_referral": "",
 				"federal_tax_id": "",
@@ -1280,6 +1281,7 @@
 				"removefromproduction": "",
 				"schedule": "Programme",
 				"sendcsi": "",
+				"sendpartspricechange": "",
 				"sendtodms": "",
 				"sync": "",
 				"uninvoice": "",
@@ -1303,6 +1305,7 @@
 				"nojobselected": "Aucun travail n'est sélectionné.",
 				"noowner": "Aucun propriétaire associé.",
 				"novehicle": "Aucun véhicule associé.",
+				"partspricechange": "",
 				"saving": "Erreur rencontrée lors de la sauvegarde de l'enregistrement.",
 				"scanimport": "",
 				"totalscalc": "",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 4e434580d..a576c160e 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -860,6 +860,7 @@
           - deliverchecklist
           - email
           - enforce_class
+          - enforce_conversion_category
           - enforce_conversion_csr
           - enforce_referral
           - entegral_configuration
@@ -959,6 +960,7 @@
           - deliverchecklist
           - email
           - enforce_class
+          - enforce_conversion_category
           - enforce_conversion_csr
           - enforce_referral
           - federal_tax_id
diff --git a/hasura/migrations/1679000353261_alter_table_public_bodyshops_add_column_enforce_conversion_category/down.sql b/hasura/migrations/1679000353261_alter_table_public_bodyshops_add_column_enforce_conversion_category/down.sql
new file mode 100644
index 000000000..ea70e4ef9
--- /dev/null
+++ b/hasura/migrations/1679000353261_alter_table_public_bodyshops_add_column_enforce_conversion_category/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "enforce_conversion_category" boolean
+--  not null default 'false';
diff --git a/hasura/migrations/1679000353261_alter_table_public_bodyshops_add_column_enforce_conversion_category/up.sql b/hasura/migrations/1679000353261_alter_table_public_bodyshops_add_column_enforce_conversion_category/up.sql
new file mode 100644
index 000000000..e6b5fb6b5
--- /dev/null
+++ b/hasura/migrations/1679000353261_alter_table_public_bodyshops_add_column_enforce_conversion_category/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "enforce_conversion_category" boolean
+ not null default 'false';