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 4fc3a5789..c3ade9187 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
@@ -1,16 +1,17 @@
 import { DeleteFilled, DownOutlined, WarningFilled } from "@ant-design/icons";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Checkbox, Divider, Dropdown, Form, Input, InputNumber, Radio, Select, Space, Tag } from "antd";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import PartsOrderModalPriceChange from "./parts-order-modal-price-change.component";
+import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -32,7 +33,7 @@ export function PartsOrderModalComponent({ bodyshop, vendorList, sendTypeState,
   });
 
   const { t } = useTranslation();
-  const handleClick = ({ item }) => {
+  const handleClick = ({ item, key, keyPath }) => {
     form.setFieldsValue({ comments: item.props.value });
   };
 
@@ -97,18 +98,17 @@ export function PartsOrderModalComponent({ bodyshop, vendorList, sendTypeState,
             <Checkbox />
           </Form.Item>
         )}
-        {!isReturn && (
-          <Form.Item name="order_type" initialValue="parts_order" label={t("parts_orders.labels.order_type")}>
-            <Radio.Group disabled={sendType === "oec"}>
-              <Radio value={"parts_order"}>{t("parts_orders.labels.parts_order")}</Radio>
-              <Radio value={"sublet"}>{t("parts_orders.labels.sublet_order")}</Radio>
-            </Radio.Group>
-          </Form.Item>
-        )}
+
+        <Form.Item name="order_type" initialValue="parts_order" label={t("parts_orders.labels.order_type")}>
+          <Radio.Group disabled={sendType === "oec"}>
+            <Radio value={"parts_order"}>{t("parts_orders.labels.parts_order")}</Radio>
+            <Radio value={"sublet"}>{t("parts_orders.labels.sublet_order")}</Radio>
+          </Radio.Group>
+        </Form.Item>
       </LayoutFormRow>
       <Divider orientation="left">{t("parts_orders.labels.inthisorder")}</Divider>
       <Form.List name={["parts_order_lines", "data"]}>
-        {(fields, { remove, move }) => {
+        {(fields, { add, remove, move }) => {
           return (
             <div>
               {fields.map((field, index) => (