diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 1193d038a..67e97ec5a 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
@@ -8138,6 +8138,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>default_quote</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>default_received</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -33967,6 +33988,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>is_quote</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>mark_as_received</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index 4c1e01599..c2e2f7ce8 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -290,18 +290,42 @@ export function PartsOrderModalComponent({
       >
         <Input.TextArea rows={3} />
       </Form.Item>
+      {OEConnection.treatment === "on" && !isReturn && (
+        <Form.Item
+          name="is_quote"
+          label={t("parts_orders.labels.is_quote")}
+          valuePropName="checked"
+        >
+          <Checkbox />
+        </Form.Item>
+      )}
 
-      <Radio.Group
-        defaultValue={sendType}
-        onChange={(e) => setSendType(e.target.value)}
-      >
-        <Radio value={"none"}>{t("general.labels.none")}</Radio>
-        <Radio value={"e"}>{t("parts_orders.labels.email")}</Radio>
-        <Radio value={"p"}>{t("parts_orders.labels.print")}</Radio>
-        {OEConnection.treatment === "on" && !isReturn && (
-          <Radio value={"oec"}>{t("parts_orders.labels.oec")}</Radio>
-        )}
-      </Radio.Group>
+      <Form.Item noStyle shouldUpdate>
+        {() => {
+          const is_quote = form.getFieldValue("is_quote");
+          if (is_quote) setSendType("oec");
+          return (
+            <Radio.Group
+              defaultValue={sendType}
+              value={sendType}
+              onChange={(e) => setSendType(e.target.value)}
+            >
+              <Radio disabled={is_quote} value={"none"}>
+                {t("general.labels.none")}
+              </Radio>
+              <Radio disabled={is_quote} value={"e"}>
+                {t("parts_orders.labels.email")}
+              </Radio>
+              <Radio disabled={is_quote} value={"p"}>
+                {t("parts_orders.labels.print")}
+              </Radio>
+              {OEConnection.treatment === "on" && !isReturn && (
+                <Radio value={"oec"}>{t("parts_orders.labels.oec")}</Radio>
+              )}
+            </Radio.Group>
+          );
+        }}
+      </Form.Item>
     </div>
   );
 }
diff --git a/client/src/components/parts-order-modal/parts-order-modal.container.jsx b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
index 4974168e9..5a106a00c 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.container.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
@@ -93,31 +93,48 @@ export function PartsOrderModalContainer({
   const [updateJobLines] = useMutation(UPDATE_JOB_LINE_STATUS);
   const [updateJob] = useMutation(UPDATE_JOB);
 
-  const handleFinish = async ({ removefrompartsqueue, ...values }) => {
+  const handleFinish = async ({
+    removefrompartsqueue,
+    is_quote,
+    ...values
+  }) => {
     logImEXEvent("parts_order_insert");
     setSaving(true);
-    const insertResult = await insertPartOrder({
-      variables: {
-        po: [
-          {
-            ...values,
-            order_date: moment().format("YYYY-MM-DD"),
-            orderedby: currentUser.email,
-            jobid: jobId,
-            user_email: currentUser.email,
-            return: isReturn,
-            status: bodyshop.md_order_statuses.default_ordered || "Ordered*",
-          },
-        ],
-      },
-      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
-    });
-    if (!!insertResult.error) {
-      notification["error"]({
-        message: t("parts_orders.errors.creating"),
-        description: JSON.stringify(insertResult.error),
+    let insertResult;
+    if (!is_quote) {
+      await insertPartOrder({
+        variables: {
+          po: [
+            {
+              ...values,
+              order_date: moment().format("YYYY-MM-DD"),
+              orderedby: currentUser.email,
+              jobid: jobId,
+              user_email: currentUser.email,
+              return: isReturn,
+              status: bodyshop.md_order_statuses.default_ordered || "Ordered*",
+            },
+          ],
+        },
+        refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
+      });
+      if (!!insertResult.error) {
+        notification["error"]({
+          message: t("parts_orders.errors.creating"),
+          description: JSON.stringify(insertResult.error),
+        });
+        return;
+      }
+      insertAuditTrail({
+        jobid: jobId,
+        operation: isReturn
+          ? AuditTrailMapping.jobspartsreturn(
+              insertResult.data.insert_parts_orders.returning[0].order_number
+            )
+          : AuditTrailMapping.jobspartsorder(
+              insertResult.data.insert_parts_orders.returning[0].order_number
+            ),
       });
-      return;
     }
 
     const jobLinesResult = await updateJobLines({
@@ -127,6 +144,8 @@ export function PartsOrderModalContainer({
           .map((item) => item.job_line_id),
         status: isReturn
           ? bodyshop.md_order_statuses.default_returned || "Returned*"
+          : is_quote
+          ? bodyshop.md_order_statuses.default_quote || "Quote"
           : bodyshop.md_order_statuses.default_ordered || "Ordered*",
       },
     });
@@ -142,17 +161,6 @@ export function PartsOrderModalContainer({
       });
     }
 
-    insertAuditTrail({
-      jobid: jobId,
-      operation: isReturn
-        ? AuditTrailMapping.jobspartsreturn(
-            insertResult.data.insert_parts_orders.returning[0].order_number
-          )
-        : AuditTrailMapping.jobspartsorder(
-            insertResult.data.insert_parts_orders.returning[0].order_number
-          ),
-    });
-
     if (!!jobLinesResult.errors) {
       notification["error"]({
         message: t("parts_orders.errors.creating"),
diff --git a/client/src/components/shop-info/shop-info.orderstatus.component.jsx b/client/src/components/shop-info/shop-info.orderstatus.component.jsx
index e489367f8..0e6fff22b 100644
--- a/client/src/components/shop-info/shop-info.orderstatus.component.jsx
+++ b/client/src/components/shop-info/shop-info.orderstatus.component.jsx
@@ -2,9 +2,28 @@ import { Form, Input } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-export default function ShopInfoOrderStatusComponent({ form }) {
-  const { t } = useTranslation();
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTreatments } from "@splitsoftware/splitio-react";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ShopInfoOrderStatusComponent);
 
+export function ShopInfoOrderStatusComponent({ bodyshop, form }) {
+  const { t } = useTranslation();
+  const { OEConnection } = useTreatments(
+    ["OEConnection"],
+    {},
+    bodyshop.imexshopid
+  );
   return (
     <LayoutFormRow header={t("bodyshop.labels.orderstatuses")}>
       <Form.Item
@@ -56,6 +75,20 @@ export default function ShopInfoOrderStatusComponent({ form }) {
       >
         <Input />
       </Form.Item>
+      {OEConnection.treatment === "on" && (
+        <Form.Item
+          label={t("bodyshop.fields.statuses.default_quote")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_order_statuses", "default_quote"]}
+        >
+          <Input />
+        </Form.Item>
+      )}
     </LayoutFormRow>
   );
 }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 28ea88dc1..1ca15c9bd 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -502,6 +502,7 @@
 					"default_imported": "Default Imported Status",
 					"default_invoiced": "Default Invoiced Status",
 					"default_ordered": "Default Ordered Status",
+					"default_quote": "Default Quote Status",
 					"default_received": "Default Received Status",
 					"default_returned": "Default Returned",
 					"default_scheduled": "Default Scheduled Status",
@@ -2013,6 +2014,7 @@
 				"confirmdelete": "Are you sure you want to delete this item? It cannot be recovered.  Job line statuses will not be updated and may require manual review. ",
 				"email": "Send by Email",
 				"inthisorder": "Parts in this Order",
+				"is_quote": "Parts Quote?",
 				"mark_as_received": "Mark as Received?",
 				"newpartsorder": "New Parts Order",
 				"notyetordered": "This part has not yet been ordered.",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 734017914..b0f04fef8 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -502,6 +502,7 @@
 					"default_imported": "",
 					"default_invoiced": "",
 					"default_ordered": "",
+					"default_quote": "",
 					"default_received": "",
 					"default_returned": "",
 					"default_scheduled": "",
@@ -2013,6 +2014,7 @@
 				"confirmdelete": "",
 				"email": "Enviar por correo electrónico",
 				"inthisorder": "Partes en este pedido",
+				"is_quote": "",
 				"mark_as_received": "",
 				"newpartsorder": "",
 				"notyetordered": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 21d62a24d..ddb84ae53 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -502,6 +502,7 @@
 					"default_imported": "",
 					"default_invoiced": "",
 					"default_ordered": "",
+					"default_quote": "",
 					"default_received": "",
 					"default_returned": "",
 					"default_scheduled": "",
@@ -2013,6 +2014,7 @@
 				"confirmdelete": "",
 				"email": "Envoyé par email",
 				"inthisorder": "Pièces dans cette commande",
+				"is_quote": "",
 				"mark_as_received": "",
 				"newpartsorder": "",
 				"notyetordered": "",