IO-2337 Spread in billLines

client/src/App/App.styles.scss

@@ -148,10 +148,6 @@
   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/dms-post-form/dms-post-form.component.jsx

@@ -11,7 +11,6 @@ import {
   Select,
   Space,
   Statistic,
-  Switch,
   Typography,
 } from "antd";
 import Dinero from "dinero.js";
@@ -184,12 +183,6 @@ 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")}
-              >
-                <Switch defaultChecked={false} />
-              </Form.Item>
             </Space>
           </div>
         )}

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,7 +1250,6 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
       }
     ) {
       id
-      ownr_co_nm
       ownr_fn
       ownr_ln
       ro_number
@@ -1267,7 +1266,6 @@ 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
@@ -1286,7 +1284,6 @@ 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 { Link, useHistory, useLocation } from "react-router-dom";
+import { useHistory, useLocation, Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import SocketIO from "socket.io-client";
 import AlertComponent from "../../components/alert/alert.component";
@@ -22,7 +22,6 @@ 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 {
@@ -30,6 +29,7 @@ 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,
@@ -45,7 +45,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
 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,
+    : window.location.origin,
   {
     path: "/ws",
     withCredentials: true,

client/src/translations/en_us/common.json

@@ -1451,7 +1451,6 @@
 					"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 #",
@@ -2568,7 +2567,6 @@
 				"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

@@ -1451,7 +1451,6 @@
 					"dms_make": "",
 					"dms_model": "",
 					"dms_wip_acctnumber": "",
-					"dms_unsold": "",
 					"id": "",
 					"inservicedate": "",
 					"journal": "",
@@ -2565,7 +2564,6 @@
 				"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

@@ -1451,7 +1451,6 @@
 					"dms_make": "",
 					"dms_model": "",
 					"dms_wip_acctnumber": "",
-					"dms_unsold": "",
 					"id": "",
 					"inservicedate": "",
 					"journal": "",
@@ -2565,7 +2564,6 @@
 				"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,18 +1897,6 @@ 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"

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/cdk/cdk-job-export.js

@@ -717,9 +717,7 @@ async function InsertDmsVehicle(socket) {
           dealer: {
             dealerNumber: socket.JobData.bodyshop.cdk_dealerid,
             ...(socket.txEnvelope.inservicedate && {
-              inServiceDate: socket.txEnvelope.dms_unsold === true
-              ? ""
-              : moment(socket.txEnvelope.inservicedate)
+              inServiceDate: moment(socket.txEnvelope.inservicedate)
                 //.tz(socket.JobData.bodyshop.timezone)
                 .startOf("day")
                 .toISOString(),
@@ -728,9 +726,7 @@ async function InsertDmsVehicle(socket) {
           },
           manufacturer: {},
           vehicle: {
-            deliveryDate: socket.txEnvelope.dms_unsold === true
-            ? ""
-            : moment()
+            deliveryDate: moment()
               // .tz(socket.JobData.bodyshop.timezone)
               .format("YYYYMMDD"),
             licensePlateNo: