IO-2170 Correct for Shift clock so Job Status is only on Job Clock

Test

client/src/App/App.styles.scss

@@ -148,6 +148,10 @@
   background: #e7f3ff !important;
 }
 
+.ant-table-tbody > tr.ant-table-row-selected > td {
+  background: #e6f7ff !important;
+}
+
 .job-line-manual {
   color: tomato;
   font-style: italic;

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -1,18 +1,18 @@
 import { useApolloClient, useMutation } from "@apollo/client";
-import { Button, Checkbox, Form, Modal, notification, Space } from "antd";
+import { Button, Checkbox, Form, Modal, Space, notification } from "antd";
 import _ from "lodash";
-import React, { useEffect, useState, useMemo } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_BILL } from "../../graphql/bills.queries";
+import { UPDATE_INVENTORY_LINES } from "../../graphql/inventory.queries";
 import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
 import {
   QUERY_JOB_LBR_ADJUSTMENTS,
   UPDATE_JOB,
 } from "../../graphql/jobs.queries";
 import { MUTATION_MARK_RETURN_RECEIVED } from "../../graphql/parts-orders.queries";
-import { UPDATE_INVENTORY_LINES } from "../../graphql/inventory.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
@@ -20,15 +20,15 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import confirmDialog from "../../utils/asyncConfirm";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import BillFormContainer from "../bill-form/bill-form.container";
-import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
-import { handleUpload } from "../documents-upload/documents-upload.utility";
-import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
-import useLocalStorage from "../../utils/useLocalStorage";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
+import confirmDialog from "../../utils/asyncConfirm";
+import useLocalStorage from "../../utils/useLocalStorage";
+import BillFormContainer from "../bill-form/bill-form.container";
+import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
+import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
+import { handleUpload } from "../documents-upload/documents-upload.utility";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -126,6 +126,17 @@ function BillEnterModalContainer({
                     deductedfromlbr: deductedfromlbr,
                     lbr_adjustment,
                     joblineid: i.joblineid === "noline" ? null : i.joblineid,
+                    applicable_taxes: {
+                      federal:
+                        (i.applicable_taxes && i.applicable_taxes.federal) ||
+                        false,
+                      state:
+                        (i.applicable_taxes && i.applicable_taxes.state) ||
+                        false,
+                      local:
+                        (i.applicable_taxes && i.applicable_taxes.local) ||
+                        false,
+                    },
                   };
                 }),
             },

client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx

@@ -23,40 +23,36 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
 
   const appt = []; // Flatten Data
   data.scheduled_in_today.forEach((item) => {
-    if (item.job) {
+    var i = {
-      var i = {
+      canceled: item.canceled,
-        canceled: item.canceled,
+      id: item.id,
-        id: item.id,
+      alt_transport: item.job.alt_transport,
-        alt_transport: item.job.alt_transport,
+      clm_no: item.job.clm_no,
-        clm_no: item.job.clm_no,
+      jobid: item.job.jobid,
-        jobid: item.job.jobid,
+      ins_co_nm: item.job.ins_co_nm,
-        ins_co_nm: item.job.ins_co_nm,
+      iouparent: item.job.iouparent,
-        iouparent: item.job.iouparent,
+      ownerid: item.job.ownerid,
-        ownerid: item.job.ownerid,
+      ownr_co_nm: item.job.ownr_co_nm,
-        ownr_co_nm: item.job.ownr_co_nm,
+      ownr_ea: item.job.ownr_ea,
-        ownr_ea: item.job.ownr_ea,
+      ownr_fn: item.job.ownr_fn,
-        ownr_fn: item.job.ownr_fn,
+      ownr_ln: item.job.ownr_ln,
-        ownr_ln: item.job.ownr_ln,
+      ownr_ph1: item.job.ownr_ph1,
-        ownr_ph1: item.job.ownr_ph1,
+      ownr_ph2: item.job.ownr_ph2,
-        ownr_ph2: item.job.ownr_ph2,
+      production_vars: item.job.production_vars,
-        production_vars: item.job.production_vars,
+      ro_number: item.job.ro_number,
-        ro_number: item.job.ro_number,
+      suspended: item.job.suspended,
-        suspended: item.job.suspended,
+      v_make_desc: item.job.v_make_desc,
-        v_make_desc: item.job.v_make_desc,
+      v_model_desc: item.job.v_model_desc,
-        v_model_desc: item.job.v_model_desc,
+      v_model_yr: item.job.v_model_yr,
-        v_model_yr: item.job.v_model_yr,
+      v_vin: item.job.v_vin,
-        v_vin: item.job.v_vin,
+      vehicleid: item.job.vehicleid,
-        vehicleid: item.job.vehicleid,
+      note: item.note,
-        note: item.note,
+      start: moment(item.start).format("hh:mm a"),
-        start: moment(item.start).format("hh:mm a"),
+      title: item.title,
-        title: item.title,
+    };
-      };
+    appt.push(i);
-      appt.push(i);
-    }
-  });
-  appt.sort(function (a, b) {
-    return new moment(a.start) - new moment(b.start);
   });
+  appt.sort ( function (a, b) { return new Date(a.start) - new Date(b.start); });
 
   const columns = [
     {
@@ -186,12 +182,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
   };
 
   return (
-    <Card
+    <Card title={t("dashboard.titles.scheduledintoday", {date: moment().startOf("day").format("MM/DD/YYYY")})} {...cardProps}>
-      title={t("dashboard.titles.scheduledintoday", {
-        date: moment().startOf("day").format("MM/DD/YYYY"),
-      })}
-      {...cardProps}
-    >
       <div style={{ height: "100%" }}>
         <Table
           onChange={handleTableChange}

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

@@ -11,6 +11,7 @@ import {
   Select,
   Space,
   Statistic,
+  Switch,
   Typography,
 } from "antd";
 import Dinero from "dinero.js";
@@ -183,6 +184,13 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
             <Space>
               <DmsCdkMakes form={form} socket={socket} job={job} />
               <DmsCdkMakesRefetch />
+              <Form.Item
+                name="dms_unsold"
+                label={t("jobs.fields.dms.dms_unsold")}
+                initialValue={false}
+              >
+                <Switch />
+              </Form.Item>
             </Space>
           </div>
         )}

client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx

@@ -5,10 +5,10 @@ import {
   Col,
   Form,
   InputNumber,
-  notification,
   Popover,
   Row,
   Select,
+  notification,
 } from "antd";
 import axios from "axios";
 import React, { useState } from "react";
@@ -16,13 +16,14 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries";
+import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
 import { UPDATE_TIME_TICKET } from "../../graphql/timetickets.queries";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
 import TechJobClockoutDelete from "../tech-job-clock-out-delete/tech-job-clock-out-delete.component";
 import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component";
-import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries";
-import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -40,6 +41,7 @@ export function TechClockOffButton({
 }) {
   const [loading, setLoading] = useState(false);
   const [updateTimeticket] = useMutation(UPDATE_TIME_TICKET);
+  const [updateJobStatus] = useMutation(UPDATE_JOB_STATUS);
   const [form] = Form.useForm();
   const { queryLoading, data: lineTicketData } = useQuery(
     GET_LINE_TICKET_BY_PK,
@@ -59,7 +61,8 @@ export function TechClockOffButton({
 
   const handleFinish = async (values) => {
     logImEXEvent("tech_clock_out_job");
-
+    const status = values.status;
+    delete values.status;
     setLoading(true);
     const result = await updateTimeticket({
       variables: {
@@ -98,6 +101,26 @@ export function TechClockOffButton({
         message: t("timetickets.successes.clockedout"),
       });
     }
+    if (!isShiftTicket) {
+      const job_update_result = await updateJobStatus({
+        variables: {
+          jobId: jobId,
+          status: status,
+        },
+      });
+
+      if (!!job_update_result.errors) {
+        notification["error"]({
+          message: t("jobs.errors.updating", {
+            message: JSON.stringify(result.errors),
+          }),
+        });
+      } else {
+        notification["success"]({
+          message: t("jobs.successes.updated"),
+        });
+      }
+    }
     setLoading(false);
     if (completedCallback) completedCallback();
   };
@@ -195,7 +218,6 @@ export function TechClockOffButton({
                   </Form.Item>
                 </div>
               ) : null}
-
               <Form.Item
                 name="cost_center"
                 label={t("timetickets.fields.cost_center")}
@@ -228,6 +250,29 @@ export function TechClockOffButton({
                 </Select>
               </Form.Item>
 
+              {isShiftTicket ? (
+                <div></div>
+              ) : (
+                <Form.Item
+                  name="status"
+                  label={t("jobs.fields.status")}
+                  initialValue={
+                    lineTicketData && lineTicketData.jobs_by_pk.status
+                  }
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <Select>
+                    {bodyshop.md_ro_statuses.production_statuses.map((item) => (
+                      <Select.Option key={item}></Select.Option>
+                    ))}
+                  </Select>
+                </Form.Item>
+              )}
               <Button type="primary" htmlType="submit" loading={loading}>
                 {t("general.actions.save")}
               </Button>

client/src/graphql/jobs-lines.queries.js

@@ -34,6 +34,7 @@ export const GET_LINE_TICKET_BY_PK = gql`
       id
       lbr_adjustments
       converted
+      status
     }
     joblines(where: { jobid: { _eq: $id }, removed: { _eq: false } }) {
       id

client/src/graphql/jobs.queries.js

@@ -1219,10 +1219,10 @@ export const ACTIVE_JOBS_FOR_AUTOCOMPLETE = gql`
   query ACTIVE_JOBS_FOR_AUTOCOMPLETE($statuses: [String!]!) {
     jobs(where: { status: { _in: $statuses } }) {
       id
+      ownr_co_nm
       ownr_fn
       ownr_ln
       ro_number
-
       vehicleid
       v_make_desc
       v_model_desc
@@ -1250,6 +1250,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
       }
     ) {
       id
+      ownr_co_nm
       ownr_fn
       ownr_ln
       ro_number
@@ -1266,6 +1267,7 @@ export const SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE = gql`
   query SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE($id: uuid!) {
     jobs_by_pk(id: $id) {
       id
+      ownr_co_nm
       ownr_fn
       ownr_ln
       ro_number
@@ -1284,6 +1286,7 @@ export const SEARCH_FOR_JOBS = gql`
     search_jobs(args: { search: $search }, limit: 25) {
       id
       ro_number
+      ownr_co_nm
       ownr_fn
       ownr_ln
     }

client/src/pages/dms/dms.container.jsx

@@ -13,7 +13,7 @@ import queryString from "query-string";
 import React, { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useHistory, useLocation, Link } from "react-router-dom";
+import { Link, useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import SocketIO from "socket.io-client";
 import AlertComponent from "../../components/alert/alert.component";
@@ -22,6 +22,7 @@ import DmsCustomerSelector from "../../components/dms-customer-selector/dms-cust
 import DmsLogEvents from "../../components/dms-log-events/dms-log-events.component";
 import DmsPostForm from "../../components/dms-post-form/dms-post-form.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
+import { OwnerNameDisplayFunction } from "../../components/owner-name-display/owner-name-display.component";
 import { auth } from "../../firebase/firebase.utils";
 import { QUERY_JOB_EXPORT_DMS } from "../../graphql/jobs.queries";
 import {
@@ -29,7 +30,6 @@ import {
   setSelectedHeader,
 } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { OwnerNameDisplayFunction } from "../../components/owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -46,6 +46,7 @@ export const socket = SocketIO(
   process.env.NODE_ENV === "production"
     ? process.env.REACT_APP_AXIOS_BASE_API_URL
     : window.location.origin,
+    // "http://localhost:4000",  // for dev testing,
   {
     path: "/ws",
     withCredentials: true,

client/src/translations/en_us/common.json

@@ -1453,6 +1453,7 @@
 					"dms_make": "DMS Make",
 					"dms_model": "DMS Model",
 					"dms_wip_acctnumber": "Cost WIP DMS Acct #",
+					"dms_unsold": "New, Unsold Vehicle",
 					"id": "DMS ID",
 					"inservicedate": "In Service Date",
 					"journal": "Journal #",
@@ -2569,6 +2570,7 @@
 				"job_costing_ro_ins_co": "Job Costing by RO Source",
 				"jobs_completed_not_invoiced": "Jobs Completed not Invoiced",
 				"jobs_invoiced_not_exported": "Jobs Invoiced not Exported",
+				"jobs_scheduled_completion": "Jobs Scheduled Completion",
 				"jobs_reconcile": "Parts/Sublet/Labor Reconciliation",
 				"lag_time": "Lag Time",
 				"open_orders": "Open Orders by Date",

client/src/translations/es/common.json

@@ -1453,6 +1453,7 @@
 					"dms_make": "",
 					"dms_model": "",
 					"dms_wip_acctnumber": "",
+					"dms_unsold": "",
 					"id": "",
 					"inservicedate": "",
 					"journal": "",
@@ -2566,6 +2567,7 @@
 				"job_costing_ro_ins_co": "",
 				"jobs_completed_not_invoiced": "",
 				"jobs_invoiced_not_exported": "",
+				"jobs_scheduled_completion": "",
 				"jobs_reconcile": "",
 				"lag_time": "",
 				"open_orders": "",

client/src/translations/fr/common.json

@@ -1453,6 +1453,7 @@
 					"dms_make": "",
 					"dms_model": "",
 					"dms_wip_acctnumber": "",
+					"dms_unsold": "",
 					"id": "",
 					"inservicedate": "",
 					"journal": "",
@@ -2566,6 +2567,7 @@
 				"job_costing_ro_ins_co": "",
 				"jobs_completed_not_invoiced": "",
 				"jobs_invoiced_not_exported": "",
+				"jobs_scheduled_completion": "",
 				"jobs_reconcile": "",
 				"lag_time": "",
 				"open_orders": "",

client/src/utils/TemplateConstants.js

@@ -1897,6 +1897,18 @@ export const TemplateList = (type, context) => {
             },
             group: "sales",
           },
+          jobs_scheduled_completion: {
+            title: i18n.t("reportcenter.templates.jobs_scheduled_completion"),
+            subject: i18n.t("reportcenter.templates.jobs_scheduled_completion"),
+            key: "jobs_scheduled_completion",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.scheduled_completion"),
+            },
+            group: "jobs",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

hasura/metadata/tables.yaml

@@ -2092,6 +2092,13 @@
           table:
             name: employee_team_members
             schema: public
+    - name: joblines
+      using:
+        foreign_key_constraint_on:
+          column: assigned_team
+          table:
+            name: joblines
+            schema: public
   insert_permissions:
     - role: user
       permission:
@@ -2665,6 +2672,9 @@
     name: joblines
     schema: public
   object_relationships:
+    - name: employee_team
+      using:
+        foreign_key_constraint_on: assigned_team
     - name: job
       using:
         foreign_key_constraint_on: jobid
@@ -2726,6 +2736,7 @@
           - alt_part_i
           - alt_partm
           - alt_partno
+          - assigned_team
           - bett_amt
           - bett_pctg
           - bett_tax
@@ -2734,6 +2745,7 @@
           - convertedtolbr
           - convertedtolbr_data
           - created_at
+          - critical
           - db_hrs
           - db_price
           - db_ref
@@ -2793,6 +2805,7 @@
           - alt_part_i
           - alt_partm
           - alt_partno
+          - assigned_team
           - bett_amt
           - bett_pctg
           - bett_tax
@@ -2872,6 +2885,7 @@
           - alt_part_i
           - alt_partm
           - alt_partno
+          - assigned_team
           - bett_amt
           - bett_pctg
           - bett_tax

hasura/migrations/1688674667178_alter_table_public_joblines_add_column_assigned_team/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"."joblines" add column "assigned_team" uuid
+--  null;

hasura/migrations/1688674667178_alter_table_public_joblines_add_column_assigned_team/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."joblines" add column "assigned_team" uuid
+ null;

hasura/migrations/1688674763806_set_fk_public_joblines_assigned_team/down.sql

@@ -0,0 +1 @@
+alter table "public"."joblines" drop constraint "joblines_assigned_team_fkey";

hasura/migrations/1688674763806_set_fk_public_joblines_assigned_team/up.sql

@@ -0,0 +1,5 @@
+alter table "public"."joblines"
+  add constraint "joblines_assigned_team_fkey"
+  foreign key ("assigned_team")
+  references "public"."employee_teams"
+  ("id") on update restrict on delete restrict;

server/accounting/qbxml/qbxml-payables.js

@@ -133,7 +133,13 @@ const generateBillLine = (billLine, responsibilityCenters, jobClass) => {
 const findTaxCode = (billLine, taxcode) => {
   const {
     applicable_taxes: { local, state, federal },
-  } = billLine;
+  } =
+    billLine.applicable_taxes === null
+      ? {
+          ...billLine,
+          applicable_taxes: { local: false, state: false, federal: false },
+        }
+      : billLine;
   const t = taxcode.filter(
     (t) =>
       !!t.local === !!local &&

server/accounting/qbxml/qbxml-receivables.js

@@ -262,10 +262,10 @@ const generateInvoiceQbxml = (
             RefNumber: jobs_by_pk.ro_number,
             BillAddress: {
               Addr1: jobs_by_pk.ownr_co_nm
-                ? jobs_by_pk.ownr_co_nm.substring(0, 30)
+                ? jobs_by_pk.ownr_co_nm.substring(0, 30).trim()
-                : `${`${jobs_by_pk.ownr_ln || ""} ${
+                : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}`
-                    jobs_by_pk.ownr_fn || ""
+                    .substring(0, 30)
-                  }`.substring(0, 30)}`,
+                    .trim()}`,
               Addr2: jobs_by_pk.ownr_addr1,
               Addr3: jobs_by_pk.ownr_addr2,
               City: jobs_by_pk.ownr_city,
@@ -274,10 +274,10 @@ const generateInvoiceQbxml = (
             },
             ShipAddress: {
               Addr1: jobs_by_pk.ownr_co_nm
-                ? jobs_by_pk.ownr_co_nm.substring(0, 30)
+                ? jobs_by_pk.ownr_co_nm.substring(0, 30).trim()
-                : `${`${jobs_by_pk.ownr_ln || ""} ${
+                : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}`
-                    jobs_by_pk.ownr_fn || ""
+                    .substring(0, 30)
-                  }`.substring(0, 30)}`,
+                    .trim()}`,
               Addr2: jobs_by_pk.ownr_addr1,
               Addr3: jobs_by_pk.ownr_addr2,
               City: jobs_by_pk.ownr_city,

server/accounting/qbxml/qbxml-utils.js

@@ -21,9 +21,9 @@ exports.generateOwnerTier = (jobs_by_pk, isThreeTier, twotierpref) => {
         ? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${
             jobs_by_pk.owner.accountingid || ""
           }`
-        : `${`${jobs_by_pk.ownr_ln || ""} ${
+        : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}`
-            jobs_by_pk.ownr_fn || ""
+            .substring(0, 30)
-          }`.substring(0, 30)} #${jobs_by_pk.owner.accountingid || ""}`
+            .trim()} #${jobs_by_pk.owner.accountingid || ""}`
     )
       .trim()
       .replace(":", " ");
@@ -39,9 +39,9 @@ exports.generateOwnerTier = (jobs_by_pk, isThreeTier, twotierpref) => {
           ? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${
               jobs_by_pk.owner.accountingid || ""
             }`
-          : `${`${jobs_by_pk.ownr_ln || ""} ${
+          : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}`
-              jobs_by_pk.ownr_fn || ""
+              .substring(0, 30)
-            }`.substring(0, 30)} #${jobs_by_pk.owner.accountingid || ""}`
+              .trim()} #${jobs_by_pk.owner.accountingid || ""}`
       )
         .trim()
         .replace(":", " ");

server/cdk/cdk-job-export.js

@@ -717,18 +717,24 @@ async function InsertDmsVehicle(socket) {
           dealer: {
             dealerNumber: socket.JobData.bodyshop.cdk_dealerid,
             ...(socket.txEnvelope.inservicedate && {
-              inServiceDate: moment(socket.txEnvelope.inservicedate)
+              inServiceDate:
-                //.tz(socket.JobData.bodyshop.timezone)
+                socket.txEnvelope.dms_unsold === true
-                .startOf("day")
+                  ? ""
-                .toISOString(),
+                  : moment(socket.txEnvelope.inservicedate)
+                      //.tz(socket.JobData.bodyshop.timezone)
+                      .startOf("day")
+                      .toISOString(),
             }),
             vehicleId: socket.DMSVid.vehiclesVehId,
           },
           manufacturer: {},
           vehicle: {
-            deliveryDate: moment()
+            deliveryDate:
-              // .tz(socket.JobData.bodyshop.timezone)
+              socket.txEnvelope.dms_unsold === true
-              .format("YYYYMMDD"),
+                ? ""
+                : moment()
+                    // .tz(socket.JobData.bodyshop.timezone)
+                    .format("YYYYMMDD"),
             licensePlateNo:
               socket.JobData.plate_no === null
                 ? null
@@ -860,19 +866,25 @@ async function UpdateDmsVehicle(socket) {
             ...socket.DMSVeh.dealer,
             ...((socket.txEnvelope.inservicedate ||
               socket.DMSVeh.dealer.inServiceDate) && {
-              inServiceDate: moment(
+              inServiceDate:
-                socket.DMSVeh.dealer.inServiceDate ||
+                socket.txEnvelope.dms_unsold === true
-                  socket.txEnvelope.inservicedate
+                  ? ""
-              )
+                  : moment(
-                // .tz(socket.JobData.bodyshop.timezone)
+                      socket.DMSVeh.dealer.inServiceDate ||
-                .toISOString(),
+                        socket.txEnvelope.inservicedate
+                    )
+                      // .tz(socket.JobData.bodyshop.timezone)
+                      .toISOString(),
             }),
           },
           vehicle: {
             ...socket.DMSVeh.vehicle,
-            deliveryDate: moment(socket.DMSVeh.vehicle.deliveryDate)
+            deliveryDate:
-              //.tz(socket.JobData.bodyshop.timezone)
+              socket.txEnvelope.dms_unsold === true
-              .toISOString(),
+                ? ""
+                : moment(socket.DMSVeh.vehicle.deliveryDate)
+                    //.tz(socket.JobData.bodyshop.timezone)
+                    .toISOString(),
           },
           owners: ids,
         },