Merge branch 'hotfix/2021-12-29' into release/2021-12/31

client/src/components/dms-post-form/dms-post-form.component.jsx

@@ -2,6 +2,7 @@ import { DeleteFilled, DownOutlined } from "@ant-design/icons";
 import {
   Button,
   Card,
+  DatePicker,
   Divider,
   Dropdown,
   Form,
@@ -24,6 +25,7 @@ import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
 import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import moment from "moment";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -83,6 +85,7 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
             area_of_damage:
               (job.area_of_damage && job.area_of_damage.impact1) || "UNKNOWN",
           }).substr(0, 239),
+          inservicedate: moment("2019-01-01"),
         }}
       >
         <LayoutFormRow grow>
@@ -155,6 +158,12 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
               >
                 <Input disabled />
               </Form.Item>
+              <Form.Item
+                name="inservicedate"
+                label={t("jobs.fields.dms.inservicedate")}
+              >
+                <DatePicker format="MM/DD/YYYY" />
+              </Form.Item>
             </LayoutFormRow>
             <Space>
               <DmsCdkMakes form={form} socket={socket} job={job} />