IO-2370 Work In Progress Jobs

Release/2023 07 28

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -4318,6 +4318,48 @@
                                     <folder_node>
                                         <name>dms</name>
                                         <children>
+                                            <concept_node>
+                                                <name>apcontrol</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>appostingaccount</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>cashierid</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -6622,6 +6664,27 @@
                                                             </translation>
                                                         </translations>
                                                     </concept_node>
+                                                    <concept_node>
+                                                        <name>void</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>
                                                 </children>
                                             </folder_node>
                                             <folder_node>
@@ -14004,6 +14067,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>scheduledintoday</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>scheduledouttoday</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>
                                 </children>
                             </folder_node>
                         </children>
@@ -23844,6 +23949,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>dms_unsold</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>dms_wip_acctnumber</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -37411,6 +37537,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>markexported</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>markforreexport</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>new</name>
                                         <definition_loaded>false</definition_loaded>
@@ -37542,6 +37710,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>markreexported</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>payment</name>
                                         <definition_loaded>false</definition_loaded>
@@ -39355,6 +39544,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>mpi_final_repair_acct_sheet</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>paint_grid</name>
                                         <definition_loaded>false</definition_loaded>
@@ -40433,6 +40643,27 @@
                                     <folder_node>
                                         <name>jobs</name>
                                         <children>
+                                            <concept_node>
+                                                <name>individual_job_note</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>parts_order</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -43276,6 +43507,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>jobs_scheduled_completion</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>lag_time</name>
                                         <definition_loaded>false</definition_loaded>
@@ -44378,6 +44630,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>estimators</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>ins_co_nm_filter</name>
                                         <definition_loaded>false</definition_loaded>

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/contract-cars/contract-cars.component.jsx

@@ -59,6 +59,14 @@ export default function ContractsCarsComponent({
       sortOrder:
         state.sortedInfo.columnKey === "model" && state.sortedInfo.order,
     },
+    {
+      title: t("courtesycars.fields.color"),
+      dataIndex: "color",
+      key: "color",
+      sorter: (a, b) => alphaSort(a.color, b.color),
+      sortOrder:
+        state.sortedInfo.columnKey === "color" && state.sortedInfo.order,
+    },
     {
       title: t("courtesycars.fields.plate"),
       dataIndex: "plate",
@@ -93,6 +101,9 @@ export default function ContractsCarsComponent({
             (cc.model || "")
               .toLowerCase()
               .includes(state.search.toLowerCase()) ||
+            (cc.color || "")
+              .toLowerCase()
+              .includes(state.search.toLowerCase()) ||
             (cc.plate || "").toLowerCase().includes(state.search.toLowerCase())
         );
 

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/jobs-admin-dates/jobs-admin-dates.component.jsx

@@ -1,14 +1,14 @@
-import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import { useMutation } from "@apollo/client";
 import { Button, Form, notification } from "antd";
+import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
-import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-import moment from "moment";
-import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
+import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
+import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -38,8 +38,8 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
     setLoading(true);
     const result = await updateJob({
       variables: { jobId: job.id, job: values },
-      refetchQueries: ['GET_JOB_BY_PK'],
+      refetchQueries: ["GET_JOB_BY_PK"],
-      awaitRefetchQueries:true
+      awaitRefetchQueries: true,
     });
 
     const changedAuditFields = form.getFieldsValue(
@@ -126,7 +126,10 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
           <Form.Item label={t("jobs.fields.actual_in")} name="actual_in">
             <DateTimePicker />
           </Form.Item>
-          <Form.Item label={t("jobs.fields.date_repairstarted")} name="date_repairstarted">
+          <Form.Item
+            label={t("jobs.fields.date_repairstarted")}
+            name="date_repairstarted"
+          >
             <DateTimePicker />
           </Form.Item>
           <Form.Item
@@ -173,6 +176,9 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
           >
             <DateTimePicker />
           </Form.Item>
+          <Form.Item label={t("jobs.fields.date_void")} name="date_void">
+            <DateTimePicker />
+          </Form.Item>
         </LayoutFormRow>
       </Form>
 

client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx

@@ -1,19 +1,18 @@
-import { useMutation } from "@apollo/client";
+import { gql, useMutation } from "@apollo/client";
 import { Button, notification } from "antd";
-import { gql } from "@apollo/client";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 
+import moment from "moment";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import moment from "moment";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
@@ -150,6 +149,10 @@ export function JobAdminMarkReexport({
 
     if (!result.errors) {
       notification["success"]({ message: t("jobs.successes.save") });
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.admin_jobuninvoice(),
+      });
     } else {
       notification["error"]({
         message: t("jobs.errors.saving", {

client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx

@@ -33,8 +33,9 @@ export function JobsAdminUnvoid({
 mutation UNVOID_JOB($jobId: uuid!) {
   update_jobs_by_pk(pk_columns: {id: $jobId}, _set: {voided: false, status: "${
     bodyshop.md_ro_statuses.default_imported
-  }"}) {
+  }", date_void: null}) {
     id
+    date_void
     voided
     status
   }

client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx

@@ -141,6 +141,10 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         <Form.Item label={t("jobs.fields.date_exported")} name="date_exported">
           <DateTimePicker disabled={true || jobRO} />
         </Form.Item>
+
+        <Form.Item label={t("jobs.fields.date_void")} name="date_void">
+          <DateTimePicker disabled={true || jobRO} />
+        </Form.Item>
       </FormRow>
     </div>
   );

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -5,10 +5,10 @@ import {
   Dropdown,
   Form,
   Menu,
-  notification,
   Popconfirm,
   Popover,
   Select,
+  notification,
 } from "antd";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
@@ -24,12 +24,12 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import JobsDetailHeaderActionsAddevent from "./jobs-detail-header-actions.addevent";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import JobsDetaiLheaderCsi from "./jobs-detail-header-actions.csi.component";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
 import JobsDetailHeaderActionsExportcustdataComponent from "./jobs-detail-header-actions.exportcustdata.component";
-import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -480,6 +480,7 @@ export function JobsDetailHeaderActions({
                       scheduled_in: null,
                       scheduled_completion: null,
                       inproduction: false,
+                      date_void: new Date(),
                     },
                     note: [
                       {

client/src/components/scoreboard-chart/scoreboard-chart.component.jsx

@@ -47,9 +47,7 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) {
             bodyhrs: dayAcc.bodyhrs + dayVal.bodyhrs,
             painthrs: dayAcc.painthrs + dayVal.painthrs,
             sales:
-              dayAcc.painthrs +
+              dayAcc.sales + dayVal.job.job_totals.totals.subtotal.amount / 100,
-              dayVal.job.job_totals.totals.subtotal.amount / 100 +
-              2500,
           };
         },
         { bodyhrs: 0, painthrs: 0, sales: 0 }

client/src/components/shop-info/shop-info.general.component.jsx

@@ -602,6 +602,18 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Select mode="tags" />
         </Form.Item>
+        <Form.Item
+          name={["md_email_cc", "parts_return_slip"]}
+          label={t("bodyshop.fields.md_email_cc", { template: "parts_return_slip" })}
+          rules={[
+            {
+              //message: t("general.validation.required"),
+              type: "array",
+            },
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
         <Form.Item
           name={["tt_allow_post_to_invoiced"]}
           label={t("bodyshop.fields.tt_allow_post_to_invoiced")}

client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx

@@ -162,6 +162,32 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                 <Switch />
               </Form.Item>
             )}
+            {bodyshop.pbs_serialnumber && (
+              <Form.Item
+                label={t("bodyshop.fields.dms.appostingaccount")}
+                name={["pbs_configuration", "appostingaccount"]}
+              >
+                <Select
+                  options={[
+                    { value: "wip", label: "WIP" },
+                    { value: "cogs", label: "COGS" },
+                  ]}
+                />
+              </Form.Item>
+            )}
+            {bodyshop.pbs_serialnumber && (
+              <Form.Item
+                label={t("bodyshop.fields.dms.apcontrol")}
+                name={["pbs_configuration", "apcontrol"]}
+              >
+                <Select
+                  options={[
+                    { value: "ro", label: "RO Number" },
+                    { value: "vendordmsid", label: "Vendor DMS ID" },
+                  ]}
+                />
+              </Form.Item>
+            )}
           </LayoutFormRow>
           <LayoutFormRow header={t("bodyshop.labels.dms.cdk.payers")}>
             <Form.List name={["cdk_configuration", "payers"]}>

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

@@ -682,6 +682,7 @@ export const GET_JOB_BY_PK = gql`
       date_rentalresp
       date_exported
       date_repairstarted
+      date_void
       status
       owner_owing
       tax_registration_number
@@ -1078,6 +1079,7 @@ export const UPDATE_JOB = gql`
         scheduled_completion
         actual_in
         date_repairstarted
+        date_void
       }
     }
   }
@@ -1125,6 +1127,7 @@ export const VOID_JOB = gql`
     update_jobs_by_pk(_set: $job, pk_columns: { id: $jobId }) {
       id
       date_exported
+      date_void
       status
       alt_transport
       ro_number
@@ -1219,10 +1222,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 +1253,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
       }
     ) {
       id
+      ownr_co_nm
       ownr_fn
       ownr_ln
       ro_number
@@ -1266,6 +1270,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 +1289,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

@@ -101,6 +101,7 @@
 			"messages": {
 				"admin_jobmarkexported": "ADMIN: Job marked as exported.",
 				"admin_jobmarkforreexport": "ADMIN: Job marked for re-export.",
+				"admin_jobuninvoice": "ADMIN: Job has been uninvoiced.",
 				"admin_jobunvoid": "ADMIN: Job has been unvoided.",
 				"billposted": "Bill with invoice number {{invoice_number}} posted.",
 				"billupdated": "Bill with invoice number {{invoice_number}} updated.",
@@ -269,6 +270,8 @@
 					"templates": "Delivery Templates"
 				},
 				"dms": {
+					"apcontrol": "AP Control Number",
+					"appostingaccount": "AP Posting Account",
 					"cashierid": "Cashier ID",
 					"default_journal": "Default Journal",
 					"disablebillwip": "Disable bill WIP for A/P Posting",
@@ -1437,6 +1440,7 @@
 				"date_repairstarted": "Repairs Started",
 				"date_scheduled": "Scheduled",
 				"date_towin": "Towed In",
+				"date_void": "Void",
 				"ded_amt": "Deductible",
 				"ded_note": "Deductible Note",
 				"ded_status": "Deductible Status",
@@ -1452,6 +1456,7 @@
 					"cost_dms_acctnumber": "Cost DMS Acct #",
 					"dms_make": "DMS Make",
 					"dms_model": "DMS Model",
+					"dms_unsold": "New, Unsold Vehicle",
 					"dms_wip_acctnumber": "Cost WIP DMS Acct #",
 					"id": "DMS ID",
 					"inservicedate": "In Service Date",
@@ -2217,17 +2222,17 @@
 				"external": "External",
 				"findermodal": "ICBC Payment Finder",
 				"insurance": "Insurance",
+				"markexported": "Mark Exported",
+				"markforreexport": "Mark for Re-export",
 				"new": "New Payment",
 				"signup": "Please contact support to sign up for electronic payments.",
 				"title": "Payments",
-				"totalpayments": "Total Payments",
+				"totalpayments": "Total Payments"
-				"markexported": "Mark Exported",
-				"markforreexport": "Mark for Re-export"
 			},
 			"successes": {
 				"exported": "Payment(s) exported successfully.",
-				"markreexported": "Payment marked for re-export successfully",
 				"markexported": "Payment(s) marked exported.",
+				"markreexported": "Payment marked for re-export successfully",
 				"payment": "Payment created successfully. ",
 				"stripe": "Credit card transaction charged successfully."
 			}
@@ -2403,6 +2408,7 @@
 				"jobs": {
 					"individual_job_note": "Job Note RO: {{ro_number}}",
 					"parts_order": "Parts Order PO: {{ro_number}} - {{name}}",
+					"parts_return_slip":"Parts Return PO: {{ro_number}} - {{name}}",
 					"sublet_order": "Sublet Order PO: {{ro_number}} - {{name}}"
 				}
 			},
@@ -2570,6 +2576,7 @@
 				"jobs_completed_not_invoiced": "Jobs Completed not Invoiced",
 				"jobs_invoiced_not_exported": "Jobs Invoiced not Exported",
 				"jobs_reconcile": "Parts/Sublet/Labor Reconciliation",
+				"jobs_scheduled_completion": "Jobs Scheduled Completion",
 				"lag_time": "Lag Time",
 				"open_orders": "Open Orders by Date",
 				"open_orders_csr": "Open Orders by CSR",
@@ -2618,6 +2625,7 @@
 				"timetickets_summary": "Time Tickets Summary",
 				"unclaimed_hrs": "Unclaimed Hours",
 				"void_ros": "Void ROs",
+				"work_in_progress_jobs": "Work in Progress - Jobs",
 				"work_in_progress_labour": "Work in Progress - Labor",
 				"work_in_progress_payables": "Work in Progress - Payables"
 			}
@@ -2626,8 +2634,8 @@
 			"labels": {
 				"atssummary": "ATS Summary",
 				"employeevacation": "Employee Vacations",
-				"ins_co_nm_filter": "Filter by Insurance Company",
 				"estimators": "Filter by Writer/Customer Rep.",
+				"ins_co_nm_filter": "Filter by Insurance Company",
 				"intake": "Intake Events",
 				"manual": "Manual Events",
 				"manualevent": "Add Manual Event"

client/src/translations/es/common.json

@@ -101,6 +101,7 @@
 			"messages": {
 				"admin_jobmarkexported": "",
 				"admin_jobmarkforreexport": "",
+				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
 				"billposted": "",
 				"billupdated": "",
@@ -269,6 +270,8 @@
 					"templates": ""
 				},
 				"dms": {
+					"apcontrol": "",
+					"appostingaccount": "",
 					"cashierid": "",
 					"default_journal": "",
 					"disablebillwip": "",
@@ -1437,6 +1440,7 @@
 				"date_repairstarted": "",
 				"date_scheduled": "Programado",
 				"date_towin": "",
+				"date_void": "",
 				"ded_amt": "Deducible",
 				"ded_note": "",
 				"ded_status": "Estado deducible",
@@ -1452,6 +1456,7 @@
 					"cost_dms_acctnumber": "",
 					"dms_make": "",
 					"dms_model": "",
+					"dms_unsold": "",
 					"dms_wip_acctnumber": "",
 					"id": "",
 					"inservicedate": "",
@@ -2217,6 +2222,8 @@
 				"external": "",
 				"findermodal": "",
 				"insurance": "",
+				"markexported": "",
+				"markforreexport": "",
 				"new": "",
 				"signup": "",
 				"title": "",
@@ -2225,6 +2232,7 @@
 			"successes": {
 				"exported": "",
 				"markexported": "",
+				"markreexported": "",
 				"payment": "",
 				"stripe": ""
 			}
@@ -2400,6 +2408,7 @@
 				"jobs": {
 					"individual_job_note": "",
 					"parts_order": "",
+					"parts_return_slip": "",
 					"sublet_order": ""
 				}
 			},
@@ -2567,6 +2576,7 @@
 				"jobs_completed_not_invoiced": "",
 				"jobs_invoiced_not_exported": "",
 				"jobs_reconcile": "",
+				"jobs_scheduled_completion": "",
 				"lag_time": "",
 				"open_orders": "",
 				"open_orders_csr": "",
@@ -2615,6 +2625,7 @@
 				"timetickets_summary": "",
 				"unclaimed_hrs": "",
 				"void_ros": "",
+				"work_in_progress_jobs": "",
 				"work_in_progress_labour": "",
 				"work_in_progress_payables": ""
 			}
@@ -2623,6 +2634,7 @@
 			"labels": {
 				"atssummary": "",
 				"employeevacation": "",
+				"estimators": "",
 				"ins_co_nm_filter": "",
 				"intake": "",
 				"manual": "",

client/src/translations/fr/common.json

@@ -101,6 +101,7 @@
 			"messages": {
 				"admin_jobmarkexported": "",
 				"admin_jobmarkforreexport": "",
+				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
 				"billposted": "",
 				"billupdated": "",
@@ -269,6 +270,8 @@
 					"templates": ""
 				},
 				"dms": {
+					"apcontrol": "",
+					"appostingaccount": "",
 					"cashierid": "",
 					"default_journal": "",
 					"disablebillwip": "",
@@ -1437,6 +1440,7 @@
 				"date_repairstarted": "",
 				"date_scheduled": "Prévu",
 				"date_towin": "",
+				"date_void": "",
 				"ded_amt": "Déductible",
 				"ded_note": "",
 				"ded_status": "Statut de franchise",
@@ -1452,6 +1456,7 @@
 					"cost_dms_acctnumber": "",
 					"dms_make": "",
 					"dms_model": "",
+					"dms_unsold": "",
 					"dms_wip_acctnumber": "",
 					"id": "",
 					"inservicedate": "",
@@ -2217,6 +2222,8 @@
 				"external": "",
 				"findermodal": "",
 				"insurance": "",
+				"markexported": "",
+				"markforreexport": "",
 				"new": "",
 				"signup": "",
 				"title": "",
@@ -2225,6 +2232,7 @@
 			"successes": {
 				"exported": "",
 				"markexported": "",
+				"markreexported": "",
 				"payment": "",
 				"stripe": ""
 			}
@@ -2400,6 +2408,7 @@
 				"jobs": {
 					"individual_job_note": "",
 					"parts_order": "",
+					"parts_return_slip": "",
 					"sublet_order": ""
 				}
 			},
@@ -2567,6 +2576,7 @@
 				"jobs_completed_not_invoiced": "",
 				"jobs_invoiced_not_exported": "",
 				"jobs_reconcile": "",
+				"jobs_scheduled_completion": "",
 				"lag_time": "",
 				"open_orders": "",
 				"open_orders_csr": "",
@@ -2615,6 +2625,7 @@
 				"timetickets_summary": "",
 				"unclaimed_hrs": "",
 				"void_ros": "",
+				"work_in_progress_jobs": "",
 				"work_in_progress_labour": "",
 				"work_in_progress_payables": ""
 			}
@@ -2623,6 +2634,7 @@
 			"labels": {
 				"atssummary": "",
 				"employeevacation": "",
+				"estimators": "",
 				"ins_co_nm_filter": "",
 				"intake": "",
 				"manual": "",

client/src/utils/AuditTrailMappings.js

@@ -36,6 +36,7 @@ const AuditTrailMapping = {
   jobnoteupdated: () => i18n.t("audit_trail.messages.jobnoteupdated"),
   jobnotedeleted: () => i18n.t("audit_trail.messages.jobnotedeleted"),
   admin_jobunvoid: () => i18n.t("audit_trail.messages.admin_jobunvoid"),
+  admin_jobuninvoice: () => i18n.t("audit_trail.messages.admin_jobuninvoice"),
   admin_jobmarkforreexport: () =>
     i18n.t("audit_trail.messages.admin_jobmarkforreexport"),
   admin_jobmarkexported: () =>

client/src/utils/TemplateConstants.js

@@ -606,7 +606,14 @@ export const TemplateList = (type, context) => {
           },
           parts_return_slip: {
             title: i18n.t("printcenter.jobs.parts_return_slip"),
-            subject: i18n.t("printcenter.jobs.parts_return_slip"),
+            subject: i18n.t("printcenter.subjects.jobs.parts_return_slip", {
+              ro_number: context && context.job && context.job.ro_number,
+              name: (
+                (context && context.job && context.job.ownr_ln) ||
+                (context && context.job && context.job.ownr_co_nm) ||
+                ""
+              ).trim(),
+            }),
             description: "",
             key: "parts_return_slip",
             disabled: false,
@@ -1237,7 +1244,7 @@ export const TemplateList = (type, context) => {
             disabled: false,
             rangeFilter: {
               object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_open"),
+              field: i18n.t("jobs.fields.date_void"),
             },
             group: "sales",
           },
@@ -1540,6 +1547,19 @@ export const TemplateList = (type, context) => {
             },
             group: "payroll",
           },
+          work_in_progress_jobs_excel: {
+            title: i18n.t("reportcenter.templates.work_in_progress_jobs"),
+            subject: i18n.t("reportcenter.templates.work_in_progress_jobs"),
+            key: "work_in_progress_jobs_excel",
+            //idtype: "vendor",
+            reporttype: "excel",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "jobs",
+          },
           work_in_progress_labour: {
             title: i18n.t("reportcenter.templates.work_in_progress_labour"),
             description: "",
@@ -1897,6 +1917,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
@@ -3286,6 +3300,7 @@
           - clm_total
           - clm_zip
           - comment
+          - completed_tasks
           - converted
           - created_at
           - cust_pr
@@ -3480,6 +3495,7 @@
           - v_model_yr
           - v_vin
           - vehicleid
+          - date_void
           - voided
   select_permissions:
     - role: user
@@ -3550,6 +3566,7 @@
           - clm_total
           - clm_zip
           - comment
+          - completed_tasks
           - converted
           - created_at
           - cust_pr
@@ -3745,6 +3762,7 @@
           - v_model_yr
           - v_vin
           - vehicleid
+          - date_void
           - voided
         filter:
           bodyshop:
@@ -3825,6 +3843,7 @@
           - clm_total
           - clm_zip
           - comment
+          - completed_tasks
           - converted
           - created_at
           - cust_pr
@@ -4020,6 +4039,7 @@
           - v_model_yr
           - v_vin
           - vehicleid
+          - date_void
           - voided
         filter:
           bodyshop:
@@ -5542,6 +5562,7 @@
           - memo
           - productivehrs
           - rate
+          - task_name
           - ttapprovalqueueid
           - updated_at
   select_permissions:
@@ -5565,6 +5586,7 @@
           - memo
           - productivehrs
           - rate
+          - task_name
           - ttapprovalqueueid
           - updated_at
         filter:
@@ -5597,6 +5619,7 @@
           - memo
           - productivehrs
           - rate
+          - task_name
           - ttapprovalqueueid
           - updated_at
         filter:

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;

hasura/migrations/1689808180226_alter_table_public_jobs_add_column_completed_tasks/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"."jobs" add column "completed_tasks" jsonb
+--  null default jsonb_build_array();

hasura/migrations/1689808180226_alter_table_public_jobs_add_column_completed_tasks/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "completed_tasks" jsonb
+ null default jsonb_build_array();

hasura/migrations/1689973479186_alter_table_public_jobs_add_column_void_date/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"."jobs" add column "void_date" Timestamp
+--  null;

hasura/migrations/1689973479186_alter_table_public_jobs_add_column_void_date/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "void_date" Timestamp
+ null;

hasura/migrations/1689973508700_alter_table_public_jobs_alter_column_void_date/down.sql

@@ -0,0 +1 @@
+ALTER TABLE "public"."jobs" ALTER COLUMN "void_date" TYPE timestamp without time zone;

hasura/migrations/1689973508700_alter_table_public_jobs_alter_column_void_date/up.sql

@@ -0,0 +1 @@
+ALTER TABLE "public"."jobs" ALTER COLUMN "void_date" TYPE timestamptz;

hasura/migrations/1689978551428_alter_table_public_jobs_alter_column_void_date/down.sql

@@ -0,0 +1 @@
+alter table "public"."jobs" rename column "date_void" to "void_date";

hasura/migrations/1689978551428_alter_table_public_jobs_alter_column_void_date/up.sql

@@ -0,0 +1 @@
+alter table "public"."jobs" rename column "void_date" to "date_void";

hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/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"."timetickets" add column "task_name" text
+--  null;

hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."timetickets" add column "task_name" text
+ null;

server/accounting/pbs/pbs-ap-allocations.js

@@ -123,8 +123,14 @@ async function PbsCalculateAllocationsAp(socket, billids) {
 
         if (!billHash[cc.name]) {
           billHash[cc.name] = {
-            Account: cc.dms_acctnumber,
+            Account:
-            ControlNumber: bill.vendor.dmsid,
+              bodyshop.pbs_configuration.appostingaccount === "wip"
+                ? cc.dms_wip_acctnumber
+                : cc.dms_acctnumber,
+            ControlNumber:
+              bodyshop.pbs_configuration.apcontrol === "ro"
+                ? bill.job.ro_number
+                : bill.vendor.dmsid,
             Amount: Dinero(),
             // Comment: "String",
             AdditionalInfo: bill.vendor.name,

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,
         },

server/graphql-client/queries.js

@@ -1697,6 +1697,7 @@ query GET_PBS_AP_ALLOCATIONS($billids: [uuid!]) {
     md_responsibility_centers
     timezone
     pbs_serialnumber
+    pbs_configuration
     id
   }
   bills(where: {id: {_in: $billids}, exported:{_eq: false}}) {