Add local media setup to shop config.

Remove documents components that do not support local media.
Merge master into feature/local-images
2022-05-10 13:05:06 -07:00 · 2022-05-09 09:56:46 -07:00 · 2022-05-09 08:26:43 -07:00 · 2022-05-06 23:46:20 +00:00 · 2022-05-06 15:50:05 -07:00 · 2022-05-06 15:35:34 -07:00
373 changed files with 56895 additions and 8269 deletions
--- a/README.MD
+++ b/README.MD
@@ -10,7 +10,7 @@ npx hasura migrate apply --endpoint https://db.imex.online/ --admin-secret 'Prod
 npx hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret 'Test-ImEXOnlineBySnaptSoftware!'

 NGROK TEsting:
-./ngrok.exe http http://localhost:5000 -host-header="localhost:5000"
+./ngrok.exe http http://localhost:4000 -host-header="localhost:4000"

 Finding deadfiles - run from client directory
 npx deadfile ./src/index.js --exclude build templates
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
--- a/client/cypress/fixtures/users.json
+++ b/client/cypress/fixtures/users.json
@@ -1,232 +1 @@
-[
-  {
-    "id": 1,
-    "name": "Leanne Graham",
-    "username": "Bret",
-    "email": "Sincere@april.biz",
-    "address": {
-      "street": "Kulas Light",
-      "suite": "Apt. 556",
-      "city": "Gwenborough",
-      "zipcode": "92998-3874",
-      "geo": {
-        "lat": "-37.3159",
-        "lng": "81.1496"
-      }
-    },
-    "phone": "1-770-736-8031 x56442",
-    "website": "hildegard.org",
-    "company": {
-      "name": "Romaguera-Crona",
-      "catchPhrase": "Multi-layered client-server neural-net",
-      "bs": "harness real-time e-markets"
-    }
-  },
-  {
-    "id": 2,
-    "name": "Ervin Howell",
-    "username": "Antonette",
-    "email": "Shanna@melissa.tv",
-    "address": {
-      "street": "Victor Plains",
-      "suite": "Suite 879",
-      "city": "Wisokyburgh",
-      "zipcode": "90566-7771",
-      "geo": {
-        "lat": "-43.9509",
-        "lng": "-34.4618"
-      }
-    },
-    "phone": "010-692-6593 x09125",
-    "website": "anastasia.net",
-    "company": {
-      "name": "Deckow-Crist",
-      "catchPhrase": "Proactive didactic contingency",
-      "bs": "synergize scalable supply-chains"
-    }
-  },
-  {
-    "id": 3,
-    "name": "Clementine Bauch",
-    "username": "Samantha",
-    "email": "Nathan@yesenia.net",
-    "address": {
-      "street": "Douglas Extension",
-      "suite": "Suite 847",
-      "city": "McKenziehaven",
-      "zipcode": "59590-4157",
-      "geo": {
-        "lat": "-68.6102",
-        "lng": "-47.0653"
-      }
-    },
-    "phone": "1-463-123-4447",
-    "website": "ramiro.info",
-    "company": {
-      "name": "Romaguera-Jacobson",
-      "catchPhrase": "Face to face bifurcated interface",
-      "bs": "e-enable strategic applications"
-    }
-  },
-  {
-    "id": 4,
-    "name": "Patricia Lebsack",
-    "username": "Karianne",
-    "email": "Julianne.OConner@kory.org",
-    "address": {
-      "street": "Hoeger Mall",
-      "suite": "Apt. 692",
-      "city": "South Elvis",
-      "zipcode": "53919-4257",
-      "geo": {
-        "lat": "29.4572",
-        "lng": "-164.2990"
-      }
-    },
-    "phone": "493-170-9623 x156",
-    "website": "kale.biz",
-    "company": {
-      "name": "Robel-Corkery",
-      "catchPhrase": "Multi-tiered zero tolerance productivity",
-      "bs": "transition cutting-edge web services"
-    }
-  },
-  {
-    "id": 5,
-    "name": "Chelsey Dietrich",
-    "username": "Kamren",
-    "email": "Lucio_Hettinger@annie.ca",
-    "address": {
-      "street": "Skiles Walks",
-      "suite": "Suite 351",
-      "city": "Roscoeview",
-      "zipcode": "33263",
-      "geo": {
-        "lat": "-31.8129",
-        "lng": "62.5342"
-      }
-    },
-    "phone": "(254)954-1289",
-    "website": "demarco.info",
-    "company": {
-      "name": "Keebler LLC",
-      "catchPhrase": "User-centric fault-tolerant solution",
-      "bs": "revolutionize end-to-end systems"
-    }
-  },
-  {
-    "id": 6,
-    "name": "Mrs. Dennis Schulist",
-    "username": "Leopoldo_Corkery",
-    "email": "Karley_Dach@jasper.info",
-    "address": {
-      "street": "Norberto Crossing",
-      "suite": "Apt. 950",
-      "city": "South Christy",
-      "zipcode": "23505-1337",
-      "geo": {
-        "lat": "-71.4197",
-        "lng": "71.7478"
-      }
-    },
-    "phone": "1-477-935-8478 x6430",
-    "website": "ola.org",
-    "company": {
-      "name": "Considine-Lockman",
-      "catchPhrase": "Synchronised bottom-line interface",
-      "bs": "e-enable innovative applications"
-    }
-  },
-  {
-    "id": 7,
-    "name": "Kurtis Weissnat",
-    "username": "Elwyn.Skiles",
-    "email": "Telly.Hoeger@billy.biz",
-    "address": {
-      "street": "Rex Trail",
-      "suite": "Suite 280",
-      "city": "Howemouth",
-      "zipcode": "58804-1099",
-      "geo": {
-        "lat": "24.8918",
-        "lng": "21.8984"
-      }
-    },
-    "phone": "210.067.6132",
-    "website": "elvis.io",
-    "company": {
-      "name": "Johns Group",
-      "catchPhrase": "Configurable multimedia task-force",
-      "bs": "generate enterprise e-tailers"
-    }
-  },
-  {
-    "id": 8,
-    "name": "Nicholas Runolfsdottir V",
-    "username": "Maxime_Nienow",
-    "email": "Sherwood@rosamond.me",
-    "address": {
-      "street": "Ellsworth Summit",
-      "suite": "Suite 729",
-      "city": "Aliyaview",
-      "zipcode": "45169",
-      "geo": {
-        "lat": "-14.3990",
-        "lng": "-120.7677"
-      }
-    },
-    "phone": "586.493.6943 x140",
-    "website": "jacynthe.com",
-    "company": {
-      "name": "Abernathy Group",
-      "catchPhrase": "Implemented secondary concept",
-      "bs": "e-enable extensible e-tailers"
-    }
-  },
-  {
-    "id": 9,
-    "name": "Glenna Reichert",
-    "username": "Delphine",
-    "email": "Chaim_McDermott@dana.io",
-    "address": {
-      "street": "Dayna Park",
-      "suite": "Suite 449",
-      "city": "Bartholomebury",
-      "zipcode": "76495-3109",
-      "geo": {
-        "lat": "24.6463",
-        "lng": "-168.8889"
-      }
-    },
-    "phone": "(775)976-6794 x41206",
-    "website": "conrad.com",
-    "company": {
-      "name": "Yost and Sons",
-      "catchPhrase": "Switchable contextually-based project",
-      "bs": "aggregate real-time technologies"
-    }
-  },
-  {
-    "id": 10,
-    "name": "Clementina DuBuque",
-    "username": "Moriah.Stanton",
-    "email": "Rey.Padberg@karina.biz",
-    "address": {
-      "street": "Kattie Turnpike",
-      "suite": "Suite 198",
-      "city": "Lebsackbury",
-      "zipcode": "31428-2261",
-      "geo": {
-        "lat": "-38.2386",
-        "lng": "57.2232"
-      }
-    },
-    "phone": "024-648-3804",
-    "website": "ambrose.net",
-    "company": {
-      "name": "Hoeger LLC",
-      "catchPhrase": "Centralized empowering task-force",
-      "bs": "target end-to-end models"
-    }
-  }
-]
+[]
--- a/client/package.json
+++ b/client/package.json
@@ -4,81 +4,85 @@
  "private": true,
  "proxy": "http://localhost:4000",
  "dependencies": {
-    "@apollo/client": "^3.5.6",
+    "@apollo/client": "^3.5.10",
    "@asseinfo/react-kanban": "^2.2.0",
    "@craco/craco": "^6.4.3",
-    "@fingerprintjs/fingerprintjs": "^3.3.1",
-    "@sentry/react": "^6.16.1",
-    "@sentry/tracing": "^6.16.1",
-    "@splitsoftware/splitio-react": "^1.3.0",
-    "@stripe/react-stripe-js": "^1.6.0",
-    "@stripe/stripe-js": "^1.22.0",
-    "@tanem/react-nprogress": "^3.0.82",
-    "antd": "^4.17.3",
+    "@fingerprintjs/fingerprintjs": "^3.3.3",
+    "@sentry/react": "^6.19.6",
+    "@sentry/tracing": "^6.19.6",
+    "@splitsoftware/splitio-react": "^1.4.0",
+    "@stripe/react-stripe-js": "^1.7.1",
+    "@stripe/stripe-js": "^1.27.0",
+    "@tanem/react-nprogress": "^4.0.12",
+    "antd": "^4.19.5",
    "apollo-link-logger": "^2.0.0",
-    "axios": "^0.24.0",
+    "axios": "^0.26.1",
    "craco-less": "^1.20.0",
    "dinero.js": "^1.9.1",
-    "dotenv": "^10.0.0",
+    "dotenv": "^16.0.0",
    "enquire-js": "^0.2.1",
    "env-cmd": "^10.1.0",
    "exifr": "^7.1.3",
-    "firebase": "^9.6.1",
-    "graphql": "^16.1.0",
-    "i18next": "^21.6.0",
-    "i18next-browser-languagedetector": "^6.1.2",
-    "jsoneditor": "^9.5.7",
+    "firebase": "^9.6.11",
+    "graphql": "^16.3.0",
+    "i18next": "^21.6.16",
+    "i18next-browser-languagedetector": "^6.1.4",
+    "jsoneditor": "^9.7.4",
    "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.9.44",
-    "logrocket": "^2.1.2",
-    "markerjs2": "^2.17.2",
+    "libphonenumber-js": "^1.9.51",
+    "logrocket": "^2.2.1",
+    "markerjs2": "^2.21.1",
    "moment-business-days": "^1.2.0",
-    "phone": "^3.1.10",
+    "moment-timezone": "^0.5.34",
+    "normalize-url": "^7.0.3",
+    "phone": "^3.1.15",
    "preval.macro": "^5.0.0",
-    "prop-types": "^15.7.2",
-    "query-string": "^7.0.1",
+    "prop-types": "^15.8.1",
+    "query-string": "^7.1.1",
    "rc-queue-anim": "^2.0.0",
    "rc-scroll-anim": "^2.7.6",
    "react": "^17.0.2",
-    "react-big-calendar": "^0.38.1",
+    "react-big-calendar": "^0.38.2",
    "react-color": "^2.19.3",
    "react-cookie": "^4.1.1",
    "react-dom": "^17.0.2",
-    "react-drag-listview": "^0.1.8",
+    "react-drag-listview": "^0.1.9",
    "react-grid-gallery": "^0.5.5",
-    "react-grid-layout": "^1.3.0",
-    "react-i18next": "^11.15.1",
+    "react-grid-layout": "^1.3.4",
+    "react-i18next": "^11.16.6",
    "react-icons": "^4.3.1",
-    "react-number-format": "^4.8.0",
-    "react-redux": "^7.2.6",
+    "react-number-format": "^4.9.1",
+    "react-redux": "^7.2.8",
    "react-resizable": "^3.0.4",
    "react-router-dom": "^5.3.0",
    "react-scripts": "^4.0.3",
+    "react-sticky": "^6.0.3",
    "react-sublime-video": "^0.2.5",
    "react-virtualized": "^9.22.3",
-    "recharts": "^2.1.8",
+    "recharts": "^2.1.9",
    "redux": "^4.1.2",
    "redux-persist": "^6.0.0",
    "redux-saga": "^1.1.3",
    "redux-state-sync": "^3.1.2",
    "reselect": "^4.1.5",
-    "sass": "^1.45.0",
-    "socket.io-client": "^4.4.0",
-    "styled-components": "^5.3.3",
+    "sass": "^1.50.0",
+    "socket.io-client": "^4.4.1",
+    "styled-components": "^5.3.5",
    "subscriptions-transport-ws": "^0.11.0",
-    "web-vitals": "^2.1.2",
-    "workbox-background-sync": "^6.4.2",
-    "workbox-broadcast-update": "^6.4.2",
-    "workbox-cacheable-response": "^6.4.2",
-    "workbox-core": "^6.4.2",
-    "workbox-expiration": "^6.4.2",
-    "workbox-google-analytics": "^6.4.2",
-    "workbox-navigation-preload": "^6.4.2",
-    "workbox-precaching": "^6.4.2",
-    "workbox-range-requests": "^6.4.2",
-    "workbox-routing": "^6.4.2",
-    "workbox-strategies": "^6.4.2",
-    "workbox-streams": "^6.4.2"
+    "web-vitals": "^2.1.4",
+    "workbox-background-sync": "^6.5.2",
+    "workbox-broadcast-update": "^6.5.2",
+    "workbox-cacheable-response": "^6.5.2",
+    "workbox-core": "^6.5.2",
+    "workbox-expiration": "^6.5.2",
+    "workbox-google-analytics": "^6.5.2",
+    "workbox-navigation-preload": "^6.5.2",
+    "workbox-precaching": "^6.5.2",
+    "workbox-range-requests": "^6.5.2",
+    "workbox-routing": "^6.5.2",
+    "workbox-strategies": "^6.5.2",
+    "workbox-streams": "^6.5.2",
+    "yauzl": "^2.10.0"
  },
  "scripts": {
    "analyze": "source-map-explorer 'build/static/js/*.js'",
@@ -110,11 +114,15 @@
      "last 1 safari version"
    ]
  },
+  "resolutions": {
+    "react-error-overlay": "6.0.9"
+  },
  "devDependencies": {
-    "@sentry/webpack-plugin": "^1.18.3",
+    "@sentry/webpack-plugin": "^1.18.8",
    "@testing-library/cypress": "^8.0.2",
-    "cypress": "^9.1.1",
+    "cypress": "^9.5.3",
    "eslint-plugin-cypress": "^2.12.1",
+    "react-error-overlay": "6.0.10",
    "redux-logger": "^3.0.6",
    "source-map-explorer": "^2.5.2"
  }
--- a/client/src/App/App.container.jsx
+++ b/client/src/App/App.container.jsx
@@ -2,7 +2,6 @@ import { ApolloProvider } from "@apollo/client";
 import { SplitFactory, SplitSdk } from "@splitsoftware/splitio-react";
 import { ConfigProvider } from "antd";
 import enLocale from "antd/es/locale/en_US";
-import LogRocket from "logrocket";
 import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -10,13 +9,8 @@ import GlobalLoadingBar from "../components/global-loading-bar/global-loading-ba
 import client from "../utils/GraphQLClient";
 import App from "./App";

-
 moment.locale("en-US");

-
-//tracker.start();
-if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");
-
 export const factory = SplitSdk({
  core: {
    authorizationKey: process.env.REACT_APP_SPLIT_API,
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -1,4 +1,6 @@
+import { useTreatments } from "@splitsoftware/splitio-react";
 import { Button, Result } from "antd";
+import LogRocket from "logrocket";
 import React, { lazy, Suspense, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -9,15 +11,18 @@ import ErrorBoundary from "../components/error-boundary/error-boundary.component
 //Component Imports
 import LoadingSpinner from "../components/loading-spinner/loading-spinner.component";
 import DisclaimerPage from "../pages/disclaimer/disclaimer.page";
+import LandingPage from "../pages/landing/landing.page";
 import TechPageContainer from "../pages/tech/tech.page.container";
 import { setOnline } from "../redux/application/application.actions";
 import { selectOnline } from "../redux/application/application.selectors";
 import { checkUserSession } from "../redux/user/user.actions";
-import { selectCurrentUser } from "../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../redux/user/user.selectors";
 import PrivateRoute from "../utils/private-route";
 import "./App.styles.scss";

-import LandingPage from "../pages/landing/landing.page";
 const ResetPassword = lazy(() =>
  import("../pages/reset-password/reset-password.component")
 );
@@ -32,13 +37,26 @@ const MobilePaymentContainer = lazy(() =>
 const mapStateToProps = createStructuredSelector({
  currentUser: selectCurrentUser,
  online: selectOnline,
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
  checkUserSession: () => dispatch(checkUserSession()),
  setOnline: (isOnline) => dispatch(setOnline(isOnline)),
 });

-export function App({ checkUserSession, currentUser, online, setOnline }) {
+export function App({
+  bodyshop,
+  checkUserSession,
+  currentUser,
+  online,
+  setOnline,
+}) {
+  const { LogRocket_Tracking } = useTreatments(
+    ["LogRocket_Tracking"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
+
  useEffect(() => {
    if (!navigator.onLine) {
      setOnline(false);
@@ -59,6 +77,16 @@ export function App({ checkUserSession, currentUser, online, setOnline }) {
  window.addEventListener("online", function (e) {
    setOnline(true);
  });
+  useEffect(() => {
+    if (currentUser.authorized) {
+      if (
+        process.env.NODE_ENV === "production" &&
+        LogRocket_Tracking.treatment === "on"
+      ) {
+        LogRocket.init("gvfvfw/bodyshopapp");
+      }
+    }
+  }, [currentUser.authorized, LogRocket_Tracking.treatment]);

  if (currentUser.authorized === null) {
    return <LoadingSpinner message={t("general.labels.loggingin")} />;
--- a/client/src/App/App.styles.scss
+++ b/client/src/App/App.styles.scss
@@ -91,13 +91,13 @@
  color: blue;
 }

-.production-completion-1 {
-  animation: production-completion-1-blinker 5s linear infinite;
+.production-completion-soon {
+  color: rgba(255, 140, 0, 0.8);
+  font-weight: bold;
 }
-@keyframes production-completion-1-blinker {
-  50% {
-    background: rgba(207, 12, 12, 0.555);
-  }
+.production-completion-past {
+  color: rgba(255, 0, 0, 0.8);
+  font-weight: bold;
 }

 .react-resizable {
--- a/client/src/assets/banner4.jpg
+++ b/client/src/assets/banner4.jpg
--- a/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx
+++ b/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx
@@ -13,6 +13,7 @@ import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -27,7 +28,7 @@ export default connect(
  mapDispatchToProps
 )(AccountingPayablesTableComponent);

-export function AccountingPayablesTableComponent({ bodyshop, loading, bills }) {
+export function AccountingPayablesTableComponent({ bodyshop, loading, bills, refetch }) {
  const { t } = useTranslation();
  const [selectedBills, setSelectedBills] = useState([]);
  const [transInProgress, setTransInProgress] = useState(false);
@@ -131,11 +132,9 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills }) {
      dataIndex: "attempts",
      key: "attempts",

-      render: (text, record) => {
-        const success = record.exportlogs.filter((e) => e.successful).length;
-        const attempts = record.exportlogs.length;
-        return `${success}/${attempts}`;
-      },
+      render: (text, record) => (
+        <ExportLogsCountDisplay logs={record.exportlogs} />
+      ),
    },
    {
      title: t("general.labels.actions"),
@@ -150,6 +149,7 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills }) {
            disabled={transInProgress || !!record.exported}
            loadingCallback={setTransInProgress}
            setSelectedBills={setSelectedBills}
+            refetch={refetch}
          />
        </div>
      ),
@@ -182,6 +182,7 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills }) {
            disabled={transInProgress || selectedBills.length === 0}
            loadingCallback={setTransInProgress}
            completedCallback={setSelectedBills}
+            refetch={refetch}
          />
          {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && (
            <QboAuthorizeComponent />
--- a/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
+++ b/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
@@ -12,6 +12,8 @@ import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -30,6 +32,7 @@ export function AccountingPayablesTableComponent({
  bodyshop,
  loading,
  payments,
+  refetch,
 }) {
  const { t } = useTranslation();
  const [selectedPayments, setSelectedPayments] = useState([]);
@@ -76,14 +79,12 @@ export function AccountingPayablesTableComponent({
      render: (text, record) => {
        return record.job.owner ? (
          <Link to={"/manage/owners/" + record.job.owner.id}>
-            {`${record.job.ownr_fn || ""} ${record.job.ownr_ln || ""} ${
-              record.job.ownr_co_nm || ""
-            }`}
+            <OwnerNameDisplay ownerObject={record.job} />
          </Link>
        ) : (
-          <span>{`${record.job.ownr_fn || ""} ${record.job.ownr_ln || ""} ${
-            record.job.ownr_co_nm || ""
-          }`}</span>
+          <span>
+            <OwnerNameDisplay ownerObject={record.job} />
+          </span>
        );
      },
    },
@@ -131,11 +132,9 @@ export function AccountingPayablesTableComponent({
      dataIndex: "attempts",
      key: "attempts",

-      render: (text, record) => {
-        const success = record.exportlogs.filter((e) => e.successful).length;
-        const attempts = record.exportlogs.length;
-        return `${success}/${attempts}`;
-      },
+      render: (text, record) => (
+        <ExportLogsCountDisplay logs={record.exportlogs} />
+      ),
    },
    {
      title: t("general.labels.actions"),
@@ -149,6 +148,7 @@ export function AccountingPayablesTableComponent({
          disabled={transInProgress || !!record.exportedat}
          loadingCallback={setTransInProgress}
          setSelectedPayments={setSelectedPayments}
+          refetch={refetch}
        />
      ),
    },
@@ -162,10 +162,19 @@ export function AccountingPayablesTableComponent({
  const dataSource = state.search
    ? payments.filter(
        (v) =>
-          (v.vendor.name || "")
+          (v.paymentnum || "")
            .toLowerCase()
            .includes(state.search.toLowerCase()) ||
-          (v.invoice_number || "")
+          ((v.job && v.job.ro_number) || "")
+            .toLowerCase()
+            .includes(state.search.toLowerCase()) ||
+          ((v.job && v.job.ownr_fn) || "")
+            .toLowerCase()
+            .includes(state.search.toLowerCase()) ||
+          ((v.job && v.job.ownr_ln) || "")
+            .toLowerCase()
+            .includes(state.search.toLowerCase()) ||
+          ((v.job && v.job.ownr_co_nm) || "")
            .toLowerCase()
            .includes(state.search.toLowerCase())
      )
@@ -180,6 +189,7 @@ export function AccountingPayablesTableComponent({
            disabled={transInProgress || selectedPayments.length === 0}
            loadingCallback={setTransInProgress}
            completedCallback={setSelectedPayments}
+            refetch={refetch}
          />
          {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && (
            <QboAuthorizeComponent />
--- a/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
+++ b/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort } from "../../utils/sorters";
+import { alphaSort, dateSort } from "../../utils/sorters";
 import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
 import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component";

@@ -12,6 +12,10 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+import { DateFormatter } from "../../utils/DateFormatter";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
 });
@@ -27,6 +31,7 @@ export function AccountingReceivablesTableComponent({
  bodyshop,
  loading,
  jobs,
+  refetch,
 }) {
  const { t } = useTranslation();
  const [selectedJobs, setSelectedJobs] = useState([]);
@@ -62,6 +67,18 @@ export function AccountingReceivablesTableComponent({
      sortOrder:
        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
    },
+    {
+      title: t("jobs.fields.date_invoiced"),
+      dataIndex: "date_invoiced",
+      key: "date_invoiced",
+      sorter: (a, b) => dateSort(a.date_invoiced, b.date_invoiced),
+      sortOrder:
+        state.sortedInfo.columnKey === "date_invoiced" &&
+        state.sortedInfo.order,
+      render: (text, record) => (
+        <DateFormatter>{record.date_invoiced}</DateFormatter>
+      ),
+    },
    {
      title: t("jobs.fields.owner"),
      dataIndex: "owner",
@@ -72,14 +89,12 @@ export function AccountingReceivablesTableComponent({
      render: (text, record) => {
        return record.owner ? (
          <Link to={"/manage/owners/" + record.owner.id}>
-            {`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
-              record.ownr_co_nm || ""
-            }`}
+            <OwnerNameDisplay ownerObject={record} />
          </Link>
        ) : (
-          <span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
-            record.ownr_co_nm || ""
-          }`}</span>
+          <span>
+            <OwnerNameDisplay ownerObject={record} />
+          </span>
        );
      },
    },
@@ -126,12 +141,9 @@ export function AccountingReceivablesTableComponent({
      title: t("exportlogs.labels.attempts"),
      dataIndex: "attempts",
      key: "attempts",
-
-      render: (text, record) => {
-        const success = record.exportlogs.filter((e) => e.successful).length;
-        const attempts = record.exportlogs.length;
-        return `${success}/${attempts}`;
-      },
+      render: (text, record) => (
+        <ExportLogsCountDisplay logs={record.exportlogs} />
+      ),
    },
    {
      title: t("general.labels.actions"),
@@ -144,6 +156,7 @@ export function AccountingReceivablesTableComponent({
            jobId={record.id}
            disabled={!!record.date_exported}
            setSelectedJobs={setSelectedJobs}
+            refetch={refetch}
          />
          <Link to={`/manage/jobs/${record.id}/close`}>
            <Button>{t("jobs.labels.viewallocations")}</Button>
@@ -194,6 +207,7 @@ export function AccountingReceivablesTableComponent({
              disabled={transInProgress || selectedJobs.length === 0}
              loadingCallback={setTransInProgress}
              completedCallback={setSelectedJobs}
+              refetch={refetch}
            />
          )}
          {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && (
--- a/client/src/components/bill-cm-returns-table/bill-cm-returns-table.component.jsx
+++ b/client/src/components/bill-cm-returns-table/bill-cm-returns-table.component.jsx
@@ -0,0 +1,136 @@
+import { Checkbox, Form, Skeleton, Typography } from "antd";
+import React, { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import ReadOnlyFormItemComponent from "../form-items-formatted/read-only-form-item.component";
+import "./bill-cm-returns-table.styles.scss";
+export default function BillCmdReturnsTableComponent({
+  form,
+  loadOutstandingReturns,
+  returnLoading,
+  returnData,
+}) {
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    if (returnData) {
+      form.setFieldsValue({
+        outstanding_returns: returnData.parts_order_lines,
+      });
+    }
+  }, [returnData, form]);
+
+  return (
+    <Form.Item
+      shouldUpdate={(prev, cur) =>
+        prev.jobid !== cur.jobid ||
+        prev.is_credit_memo !== cur.is_credit_memo ||
+        prev.vendorid !== cur.vendorid
+      }
+      noStyle
+    >
+      {() => {
+        const isReturn = form.getFieldValue("is_credit_memo");
+
+        if (!isReturn) {
+          return null;
+        }
+
+        if (returnLoading) return <Skeleton />;
+
+        return (
+          <Form.List name="outstanding_returns">
+            {(fields, { add, remove, move }) => {
+              return (
+                <>
+                  <Typography.Title level={4}>
+                    {t("bills.labels.creditsnotreceived")}
+                  </Typography.Title>
+                  <table className="bill-cm-returns-table">
+                    <thead>
+                      <tr>
+                        <th>{t("parts_orders.fields.line_desc")}</th>
+                        <th>{t("parts_orders.fields.part_type")}</th>
+                        <th>{t("parts_orders.fields.quantity")}</th>
+                        <th>{t("parts_orders.fields.act_price")}</th>
+                        <th>{t("parts_orders.fields.cost")}</th>
+                        <th>{t("parts_orders.labels.mark_as_received")}</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {fields.map((field, index) => (
+                        <tr key={field.key}>
+                          <td>
+                            <Form.Item
+                              //   label={t("joblines.fields.line_desc")}
+                              key={`${index}line_desc`}
+                              name={[field.name, "line_desc"]}
+                            >
+                              <ReadOnlyFormItemComponent />
+                            </Form.Item>
+                          </td>
+
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}part_type`}
+                              name={[field.name, "part_type"]}
+                            >
+                              <ReadOnlyFormItemComponent />
+                            </Form.Item>
+                          </td>
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}quantity`}
+                              name={[field.name, "quantity"]}
+                            >
+                              <ReadOnlyFormItemComponent />
+                            </Form.Item>
+                          </td>
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}act_price`}
+                              name={[field.name, "act_price"]}
+                            >
+                              <ReadOnlyFormItemComponent type="currency" />
+                            </Form.Item>
+                          </td>
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}cost`}
+                              name={[field.name, "cost"]}
+                            >
+                              <ReadOnlyFormItemComponent type="currency" />
+                            </Form.Item>
+                          </td>
+
+                          <td>
+                            <Form.Item
+                              span={2}
+                              //label={t("joblines.fields.mod_lb_hrs")}
+                              key={`${index}cm_received`}
+                              name={[field.name, "cm_received"]}
+                              valuePropName="checked"
+                            >
+                              <Checkbox />
+                            </Form.Item>
+                          </td>
+                        </tr>
+                      ))}
+                    </tbody>
+                  </table>
+                </>
+              );
+            }}
+          </Form.List>
+        );
+      }}
+    </Form.Item>
+  );
+}
--- a/client/src/components/bill-cm-returns-table/bill-cm-returns-table.styles.scss
+++ b/client/src/components/bill-cm-returns-table/bill-cm-returns-table.styles.scss
@@ -0,0 +1,19 @@
+.bill-cm-returns-table {
+    table-layout: fixed;
+    width: 100%;
+
+    th,
+    td {
+        padding: 8px;
+        text-align: left;
+        border-bottom: 1px solid #ddd;
+
+        .ant-form-item {
+            margin-bottom: 0px !important;
+        }
+    }
+
+    tr:hover {
+        background-color: #f5f5f5;
+    }
+}
--- a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
@@ -12,25 +12,29 @@ import moment from "moment";
 import queryString from "query-string";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { useLocation, useHistory } from "react-router-dom";
+import { connect } from "react-redux";
+import { useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import {
+  DELETE_BILL_LINE,
  INSERT_NEW_BILL_LINES,
  UPDATE_BILL_LINE,
 } from "../../graphql/bill-lines.queries";
 import { QUERY_BILL_BY_PK, UPDATE_BILL } from "../../graphql/bills.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import AlertComponent from "../alert/alert.component";
 import BillFormContainer from "../bill-form/bill-form.container";
-import JobDocumentsGallery from "../jobs-documents-gallery/jobs-documents-gallery.container";
-import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
+import BillMarkExportedButton from "../bill-mark-exported-button/bill-mark-exported-button.component";
 import BillReeportButtonComponent from "../bill-reexport-button/bill-reexport-button.component";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { setModalContext } from "../../redux/modals/modals.actions";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import JobDocumentsGallery from "../jobs-documents-gallery/jobs-documents-gallery.container";
+import JobsDocumentsLocalGallery from "../jobs-documents-local-gallery/jobs-documents-local-gallery.container";
+import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";

 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
  setPartsOrderContext: (context) =>
@@ -47,6 +51,7 @@ export default connect(
 export function BillDetailEditcontainer({
  setPartsOrderContext,
  insertAuditTrail,
+  bodyshop,
 }) {
  const search = queryString.parse(useLocation().search);
  const history = useHistory();
@@ -57,6 +62,7 @@ export function BillDetailEditcontainer({
  const [update_bill] = useMutation(UPDATE_BILL);
  const [insertBillLine] = useMutation(INSERT_NEW_BILL_LINES);
  const [updateBillLine] = useMutation(UPDATE_BILL_LINE);
+  const [deleteBillLine] = useMutation(DELETE_BILL_LINE);

  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
    .filter((screen) => !!screen[1])
@@ -106,8 +112,22 @@ export function BillDetailEditcontainer({
      })
    );

+    //Find bill lines that were deleted.
+    const deletedJobLines = [];
+
+    data.bills_by_pk.billlines.forEach((a) => {
+      const matchingRecord = billlines.find((b) => b.id === a.id);
+      if (!matchingRecord) {
+        deletedJobLines.push(a);
+      }
+    });
+
+    deletedJobLines.forEach((d) => {
+      updates.push(deleteBillLine({ variables: { id: d.id } }));
+    });
+
    billlines.forEach((billline) => {
-      const { deductedfromlbr, ...il } = billline;
+      const { deductedfromlbr, jobline, ...il } = billline;
      delete il.__typename;

      if (il.id) {
@@ -141,6 +161,7 @@ export function BillDetailEditcontainer({
        );
      }
    });
+
    await Promise.all(updates);

    insertAuditTrail({
@@ -206,6 +227,8 @@ export function BillDetailEditcontainer({
                            cost: i.actual_cost,
                            quantity: i.quantity,
                            joblineid: i.joblineid,
+                            oem_partno: i.jobline && i.jobline.oem_partno,
+                            part_type: i.jobline && i.jobline.part_type,
                          };
                        }),
                        isReturn: true,
@@ -234,6 +257,7 @@ export function BillDetailEditcontainer({
                  </Button>
                </Popconfirm>
                <BillReeportButtonComponent bill={data && data.bills_by_pk} />
+                <BillMarkExportedButton bill={data && data.bills_by_pk} />
              </Space>
            }
          />
@@ -244,12 +268,21 @@ export function BillDetailEditcontainer({
            layout="vertical"
          >
            <BillFormContainer form={form} billEdit disabled={exported} />
-            <JobDocumentsGallery
-              jobId={data ? data.bills_by_pk.jobid : null}
-              billId={search.billid}
-              documentsList={data ? data.bills_by_pk.documents : []}
-              billsCallback={refetch}
-            />
+
+            {bodyshop.uselocalmediaserver ? (
+              <JobsDocumentsLocalGallery
+                job={{ id: data ? data.bills_by_pk.jobid : null }}
+                invoice_number={data ? data.bills_by_pk.invoice_number : null}
+                vendorid={data ? data.bills_by_pk.vendorid : null}
+              />
+            ) : (
+              <JobDocumentsGallery
+                jobId={data ? data.bills_by_pk.jobid : null}
+                billId={search.billid}
+                documentsList={data ? data.bills_by_pk.documents : []}
+                billsCallback={refetch}
+              />
+            )}
          </Form>
        </>
      )}
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -11,6 +11,7 @@ import {
  QUERY_JOB_LBR_ADJUSTMENTS,
  UPDATE_JOB,
 } from "../../graphql/jobs.queries";
+import { MUTATION_MARK_RETURN_RECEIVED } from "../../graphql/parts-orders.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
@@ -23,6 +24,7 @@ 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";

 const mapStateToProps = createStructuredSelector({
  billEnterModal: selectBillEnterModal,
@@ -47,6 +49,7 @@ function BillEnterModalContainer({
  const [enterAgain, setEnterAgain] = useState(false);
  const [insertBill] = useMutation(INSERT_NEW_BILL);
  const [updateJobLines] = useMutation(UPDATE_JOB_LINE);
+  const [updatePartsOrderLines] = useMutation(MUTATION_MARK_RETURN_RECEIVED);
  const [loading, setLoading] = useState(false);
  const client = useApolloClient();

@@ -76,7 +79,8 @@ function BillEnterModalContainer({
    }

    setLoading(true);
-    const { upload, location, ...remainingValues } = values;
+    const { upload, location, outstanding_returns, ...remainingValues } =
+      values;

    let adjustmentsToInsert = {};

@@ -93,6 +97,7 @@ function BillEnterModalContainer({
                    deductedfromlbr,
                    lbr_adjustment,
                    location: lineLocation,
+                    part_type,
                    ...restI
                  } = i;

@@ -155,6 +160,25 @@ function BillEnterModalContainer({
      });
    }

+    const markPolReceived =
+      outstanding_returns &&
+      outstanding_returns.filter((o) => o.cm_received === true);
+
+    if (markPolReceived && markPolReceived.length > 0) {
+      const r2 = await updatePartsOrderLines({
+        variables: { partsLineIds: markPolReceived.map((p) => p.id) },
+      });
+      if (!!r2.errors) {
+        setLoading(false);
+        setEnterAgain(false);
+        notification["error"]({
+          message: t("parts_orders.errors.updating", {
+            message: JSON.stringify(r2.errors),
+          }),
+        });
+      }
+    }
+
    if (!!r1.errors) {
      setLoading(false);
      setEnterAgain(false);
@@ -187,19 +211,33 @@ function BillEnterModalContainer({
    /////////////////////////
    if (upload && upload.length > 0) {
      //insert Each of the documents?
-      upload.forEach((u) => {
-        handleUpload(
-          { file: u.originFileObj },
-          {
-            bodyshop: bodyshop,
-            uploaded_by: currentUser.email,
-            jobId: values.jobid,
-            billId: billId,
-            tagsArray: null,
-            callback: null,
-          }
-        );
-      });
+
+      if (bodyshop.uselocalmediaserver) {
+        upload.forEach((u) => {
+          handleLocalUpload({
+            ev: { file: u.originFileObj },
+            context: {
+              jobid: values.jobid,
+              invoice_number: remainingValues.invoice_number,
+              vendorid: remainingValues.vendorid,
+            },
+          });
+        });
+      } else {
+        upload.forEach((u) => {
+          handleUpload(
+            { file: u.originFileObj },
+            {
+              bodyshop: bodyshop,
+              uploaded_by: currentUser.email,
+              jobId: values.jobid,
+              billId: billId,
+              tagsArray: null,
+              callback: null,
+            }
+          );
+        });
+      }
    }
    ///////////////////////////
    setLoading(false);
@@ -216,7 +254,11 @@ function BillEnterModalContainer({

    if (enterAgain) {
      form.resetFields();
-      form.setFieldsValue({ ...form.getFieldsValue(), billlines: [] });
+      form.resetFields();
+      form.setFieldsValue({
+        ...formValues,
+        billlines: [],
+      });
    } else {
      toggleModalVisible();
    }
@@ -245,7 +287,7 @@ function BillEnterModalContainer({
  return (
    <Modal
      title={t("bills.labels.new")}
-      width={"90%"}
+      width={"98%"}
      visible={billEnterModal.visible}
      okText={t("general.actions.save")}
      keyboard="false"
--- a/client/src/components/bill-form-lines-extended/bill-form-lines-extended.component.jsx
+++ b/client/src/components/bill-form-lines-extended/bill-form-lines-extended.component.jsx
@@ -0,0 +1,135 @@
+import { Form, Input, Table } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { alphaSort } from "../../utils/sorters";
+import BillFormItemsExtendedFormItem from "./bill-form-lines.extended.formitem.component";
+export default function BillFormLinesExtended({
+  lineData,
+  discount,
+  form,
+  responsibilityCenters,
+  disabled,
+}) {
+  const [search, setSearch] = useState("");
+  const { t } = useTranslation();
+  const columns = [
+    {
+      title: t("joblines.fields.line_desc"),
+      dataIndex: "line_desc",
+      key: "line_desc",
+      width: "10%",
+      sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
+    },
+    {
+      title: t("joblines.fields.oem_partno"),
+      dataIndex: "oem_partno",
+      key: "oem_partno",
+      width: "10%",
+      sorter: (a, b) => alphaSort(a.oem_partno, b.oem_partno),
+    },
+    {
+      title: t("joblines.fields.part_type"),
+      dataIndex: "part_type",
+      key: "part_type",
+      width: "10%",
+      filters: [
+        {
+          text: t("jobs.labels.partsfilter"),
+          value: ["PAN", "PAP", "PAL", "PAA", "PAS", "PASL"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAN"),
+          value: ["PAN", "PAP"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAL"),
+          value: ["PAL"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAA"),
+          value: ["PAA"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAS"),
+          value: ["PAS", "PASL"],
+        },
+      ],
+      onFilter: (value, record) => value.includes(record.part_type),
+      render: (text, record) =>
+        record.part_type
+          ? t(`joblines.fields.part_types.${record.part_type}`)
+          : null,
+    },
+
+    {
+      title: t("joblines.fields.act_price"),
+      dataIndex: "act_price",
+      key: "act_price",
+      width: "10%",
+      sorter: (a, b) => a.act_price - b.act_price,
+      shouldCellUpdate: false,
+      render: (text, record) => (
+        <>
+          <CurrencyFormatter>
+            {record.db_ref === "900510" || record.db_ref === "900511"
+              ? record.prt_dsmk_m
+              : record.act_price}
+          </CurrencyFormatter>
+          {record.part_qty ? `(x ${record.part_qty})` : null}
+          {record.prt_dsmk_p && record.prt_dsmk_p !== 0 ? (
+            <span
+              style={{ marginLeft: ".2rem" }}
+            >{`(${record.prt_dsmk_p}%)`}</span>
+          ) : (
+            <></>
+          )}
+        </>
+      ),
+    },
+    {
+      title: t("billlines.fields.posting"),
+      dataIndex: "posting",
+      key: "posting",
+
+      render: (text, record, index) => (
+        <Form.Item noStyle name={["billlineskeys", record.id]}>
+          <BillFormItemsExtendedFormItem
+            form={form}
+            record={record}
+            index={index}
+            responsibilityCenters={responsibilityCenters}
+            discount={discount}
+          />
+        </Form.Item>
+      ),
+    },
+  ];
+
+  const data =
+    search === ""
+      ? lineData
+      : lineData.filter(
+          (l) =>
+            (l.line_desc &&
+              l.line_desc.toLowerCase().includes(search.toLowerCase())) ||
+            (l.oem_partno &&
+              l.oem_partno.toLowerCase().includes(search.toLowerCase())) ||
+            (l.act_price &&
+              l.act_price.toString().startsWith(search.toString()))
+        );
+
+  return (
+    <Form.Item noStyle name="billlineskeys">
+      <button onClick={() => console.log(form.getFieldsValue())}>form</button>
+      <Input onChange={(e) => setSearch(e.target.value)} allowClear />
+      <Table
+        pagination={false}
+        size="small"
+        columns={columns}
+        rowKey="id"
+        dataSource={data}
+      />
+    </Form.Item>
+  );
+}
--- a/client/src/components/bill-form-lines-extended/bill-form-lines.extended.formitem.component.jsx
+++ b/client/src/components/bill-form-lines-extended/bill-form-lines.extended.formitem.component.jsx
@@ -0,0 +1,288 @@
+import React from "react";
+import {
+  PlusCircleFilled,
+  MinusCircleFilled,
+  WarningOutlined,
+} from "@ant-design/icons";
+import { Form, Button, InputNumber, Input, Select, Switch, Space } from "antd";
+import { useTranslation } from "react-i18next";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import CurrencyInput from "../form-items-formatted/currency-form-item.component";
+import CiecaSelect from "../../utils/Ciecaselect";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(BillFormItemsExtendedFormItem);
+
+export function BillFormItemsExtendedFormItem({
+  value,
+  bodyshop,
+  form,
+  record,
+  index,
+  disabled,
+  responsibilityCenters,
+  discount,
+}) {
+  // const { billlineskeys } = form.getFieldsValue("billlineskeys");
+
+  const { t } = useTranslation();
+  if (!value)
+    return (
+      <Button
+        onClick={() => {
+          const values = form.getFieldsValue("billlineskeys");
+
+          form.setFieldsValue({
+            ...values,
+            billlineskeys: {
+              ...(values.billlineskeys || {}),
+              [record.id]: {
+                joblineid: record.id,
+                line_desc: record.line_desc,
+                quantity: record.part_qty || 1,
+                actual_price: record.act_price,
+                cost_center: record.part_type
+                  ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
+                    ? record.part_type
+                    : responsibilityCenters.defaults &&
+                      (responsibilityCenters.defaults.costs[record.part_type] ||
+                        null)
+                  : null,
+              },
+            },
+          });
+        }}
+      >
+        <PlusCircleFilled />
+      </Button>
+    );
+
+  return (
+    <Space wrap>
+      <Form.Item
+        label={t("billlines.fields.line_desc")}
+        name={["billlineskeys", record.id, "line_desc"]}
+      >
+        <Input disabled={disabled} />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.quantity")}
+        name={["billlineskeys", record.id, "quantity"]}
+      >
+        <InputNumber precision={0} min={0} disabled={disabled} />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.actual_price")}
+        name={["billlineskeys", record.id, "actual_price"]}
+      >
+        <CurrencyInput
+          min={0}
+          disabled={disabled}
+          onBlur={(e) => {
+            const { billlineskeys } = form.getFieldsValue("billlineskeys");
+            form.setFieldsValue({
+              billlineskeys: {
+                ...billlineskeys,
+                [record.id]: {
+                  ...billlineskeys[billlineskeys],
+                  actual_cost: !!billlineskeys[billlineskeys].actual_cost
+                    ? billlineskeys[billlineskeys].actual_cost
+                    : Math.round(
+                        (parseFloat(e.target.value) * (1 - discount) +
+                          Number.EPSILON) *
+                          100
+                      ) / 100,
+                },
+              },
+            });
+          }}
+        />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.actual_cost")}
+        name={["billlineskeys", record.id, "actual_cost"]}
+      >
+        <CurrencyInput min={0} disabled={disabled} />
+      </Form.Item>
+      <Form.Item shouldUpdate>
+        {() => {
+          const line = value;
+          if (!!!line) return null;
+          const lineDiscount = (
+            1 -
+            Math.round((line.actual_cost / line.actual_price) * 100) / 100
+          ).toPrecision(2);
+
+          if (lineDiscount - discount === 0) return <div />;
+          return <WarningOutlined style={{ color: "red" }} />;
+        }}
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.cost_center")}
+        name={["billlineskeys", record.id, "cost_center"]}
+      >
+        <Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
+          {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+            ? CiecaSelect(true, false)
+            : responsibilityCenters.costs.map((item) => (
+                <Select.Option key={item.name}>{item.name}</Select.Option>
+              ))}
+        </Select>
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.location")}
+        name={["billlineskeys", record.id, "location"]}
+      >
+        <Select disabled={disabled}>
+          {bodyshop.md_parts_locations.map((loc, idx) => (
+            <Select.Option key={idx} value={loc}>
+              {loc}
+            </Select.Option>
+          ))}
+        </Select>
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.deductedfromlbr")}
+        name={["billlineskeys", record.id, "deductedfromlbr"]}
+        valuePropName="checked"
+      >
+        <Switch disabled={disabled} />
+      </Form.Item>
+      <Form.Item shouldUpdate style={{ display: "inline-block" }}>
+        {() => {
+          if (
+            form.getFieldsValue("billlineskeys").billlineskeys[record.id]
+              .deductedfromlbr
+          )
+            return (
+              <div>
+                <Form.Item
+                  label={t("joblines.fields.mod_lbr_ty")}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                  name={[
+                    "billlineskeys",
+                    record.id,
+                    "lbr_adjustment",
+                    "mod_lbr_ty",
+                  ]}
+                >
+                  <Select allowClear>
+                    <Select.Option value="LAA">
+                      {t("joblines.fields.lbr_types.LAA")}
+                    </Select.Option>
+                    <Select.Option value="LAB">
+                      {t("joblines.fields.lbr_types.LAB")}
+                    </Select.Option>
+                    <Select.Option value="LAD">
+                      {t("joblines.fields.lbr_types.LAD")}
+                    </Select.Option>
+                    <Select.Option value="LAE">
+                      {t("joblines.fields.lbr_types.LAE")}
+                    </Select.Option>
+                    <Select.Option value="LAF">
+                      {t("joblines.fields.lbr_types.LAF")}
+                    </Select.Option>
+                    <Select.Option value="LAG">
+                      {t("joblines.fields.lbr_types.LAG")}
+                    </Select.Option>
+                    <Select.Option value="LAM">
+                      {t("joblines.fields.lbr_types.LAM")}
+                    </Select.Option>
+                    <Select.Option value="LAR">
+                      {t("joblines.fields.lbr_types.LAR")}
+                    </Select.Option>
+                    <Select.Option value="LAS">
+                      {t("joblines.fields.lbr_types.LAS")}
+                    </Select.Option>
+                    <Select.Option value="LAU">
+                      {t("joblines.fields.lbr_types.LAU")}
+                    </Select.Option>
+                    <Select.Option value="LA1">
+                      {t("joblines.fields.lbr_types.LA1")}
+                    </Select.Option>
+                    <Select.Option value="LA2">
+                      {t("joblines.fields.lbr_types.LA2")}
+                    </Select.Option>
+                    <Select.Option value="LA3">
+                      {t("joblines.fields.lbr_types.LA3")}
+                    </Select.Option>
+                    <Select.Option value="LA4">
+                      {t("joblines.fields.lbr_types.LA4")}
+                    </Select.Option>
+                  </Select>
+                </Form.Item>
+                <Form.Item
+                  label={t("jobs.labels.adjustmentrate")}
+                  name={["billlineskeys", record.id, "lbr_adjustment", "rate"]}
+                  initialValue={bodyshop.default_adjustment_rate}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <InputNumber precision={2} min={0.01} />
+                </Form.Item>
+              </div>
+            );
+          return <></>;
+        }}
+      </Form.Item>
+
+      <Form.Item
+        label={t("billlines.fields.federal_tax_applicable")}
+        name={["billlineskeys", record.id, "applicable_taxes", "federal"]}
+        valuePropName="checked"
+      >
+        <Switch disabled={disabled} />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.state_tax_applicable")}
+        name={["billlineskeys", record.id, "applicable_taxes", "state"]}
+        valuePropName="checked"
+      >
+        <Switch disabled={disabled} />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.local_tax_applicable")}
+        name={["billlineskeys", record.id, "applicable_taxes", "local"]}
+        valuePropName="checked"
+      >
+        <Switch disabled={disabled} />
+      </Form.Item>
+
+      <Button
+        onClick={() => {
+          const values = form.getFieldsValue("billlineskeys");
+
+          form.setFieldsValue({
+            ...values,
+            billlineskeys: {
+              ...(values.billlineskeys || {}),
+              [record.id]: null,
+            },
+          });
+        }}
+      >
+        <MinusCircleFilled />
+      </Button>
+    </Space>
+  );
+}
--- a/client/src/components/bill-form/bill-form.component.jsx
+++ b/client/src/components/bill-form/bill-form.component.jsx
@@ -28,6 +28,8 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import BillFormLines from "./bill-form.lines.component";
 import { CalculateBillTotal } from "./bill-form.totals.utility";
+import { useTreatments } from "@splitsoftware/splitio-react";
+import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -45,13 +47,26 @@ export function BillFormComponent({
  billEdit,
  disableInvNumber,
  job,
+  loadOutstandingReturns,
 }) {
  const { t } = useTranslation();
  const client = useApolloClient();
  const [discount, setDiscount] = useState(0);
-
+  const { Extended_Bill_Posting } = useTreatments(
+    ["Extended_Bill_Posting"],
+    {},
+    bodyshop.imexshopid
+  );
  const handleVendorSelect = (props, opt) => {
    setDiscount(opt.discount);
+
+    opt &&
+      loadOutstandingReturns({
+        variables: {
+          jobId: form.getFieldValue("jobid"),
+          vendorId: opt.value,
+        },
+      });
  };

  useEffect(() => {
@@ -59,8 +74,8 @@ export function BillFormComponent({
  }, [job, form]);

  useEffect(() => {
-    if (form.getFieldValue("vendorid") && vendorAutoCompleteOptions) {
-      const vendorId = form.getFieldValue("vendorid");
+    const vendorId = form.getFieldValue("vendorid");
+    if (vendorId && vendorAutoCompleteOptions) {
      const matchingVendors = vendorAutoCompleteOptions.filter(
        (v) => v.id === vendorId
      );
@@ -68,10 +83,25 @@ export function BillFormComponent({
        setDiscount(matchingVendors[0].discount);
      }
    }
-    if (form.getFieldValue("jobid")) {
-      loadLines({ variables: { id: form.getFieldValue("jobid") } });
+    const jobId = form.getFieldValue("jobid");
+    if (jobId) {
+      loadLines({ variables: { id: jobId } });
+      if (form.getFieldValue("is_credit_memo") && vendorId) {
+        loadOutstandingReturns({
+          variables: {
+            jobId: jobId,
+            vendorId: vendorId,
+          },
+        });
+      }
    }
-  }, [form, setDiscount, vendorAutoCompleteOptions, loadLines]);
+  }, [
+    form,
+    loadOutstandingReturns,
+    setDiscount,
+    vendorAutoCompleteOptions,
+    loadLines,
+  ]);

  return (
    <div>
@@ -101,6 +131,13 @@ export function BillFormComponent({
            onBlur={() => {
              if (form.getFieldValue("jobid") !== null) {
                loadLines({ variables: { id: form.getFieldValue("jobid") } });
+                if (form.getFieldValue("vendorid") !== null)
+                  loadOutstandingReturns({
+                    variables: {
+                      jobId: form.getFieldValue("jobid"),
+                      vendorId: form.getFieldValue("vendorid"),
+                    },
+                  });
              }
            }}
          />
@@ -108,7 +145,7 @@ export function BillFormComponent({
        <Form.Item
          label={t("bills.fields.vendor")}
          name="vendorid"
-          style={{ display: billEdit ? "none" : null }}
+          // style={{ display: billEdit ? "none" : null }}
          rules={[
            {
              required: true,
@@ -223,6 +260,21 @@ export function BillFormComponent({
            ({ getFieldValue }) => ({
              validator(rule, value) {
                if (
+                  value === true &&
+                  getFieldValue("jobid") &&
+                  getFieldValue("vendorid")
+                ) {
+                  loadOutstandingReturns({
+                    variables: {
+                      jobId: form.getFieldValue("jobid"),
+                      vendorId: form.getFieldValue("vendorid"),
+                    },
+                  });
+                }
+
+                if (
+                  !bodyshop.bill_allow_post_to_closed &&
+                  job &&
                  (job.status === bodyshop.md_ro_statuses.default_invoiced ||
                    job.status === bodyshop.md_ro_statuses.default_exported ||
                    job.status === bodyshop.md_ro_statuses.default_void) &&
@@ -357,13 +409,24 @@ export function BillFormComponent({
        </Form.Item>
      </LayoutFormRow>
      <Divider orientation="left">{t("bills.labels.bill_lines")}</Divider>
-      <BillFormLines
-        lineData={lineData}
-        discount={discount}
-        form={form}
-        responsibilityCenters={responsibilityCenters}
-        disabled={disabled}
-      />
+
+      {Extended_Bill_Posting.treatment === "on" ? (
+        <BillFormLinesExtended
+          lineData={lineData}
+          discount={discount}
+          form={form}
+          responsibilityCenters={responsibilityCenters}
+          disabled={disabled}
+        />
+      ) : (
+        <BillFormLines
+          lineData={lineData}
+          discount={discount}
+          form={form}
+          responsibilityCenters={responsibilityCenters}
+          disabled={disabled}
+        />
+      )}

      <Form.Item
        name="upload"
--- a/client/src/components/bill-form/bill-form.container.jsx
+++ b/client/src/components/bill-form/bill-form.container.jsx
@@ -6,6 +6,8 @@ import { GET_JOB_LINES_TO_ENTER_BILL } from "../../graphql/jobs-lines.queries";
 import { SEARCH_VENDOR_AUTOCOMPLETE } from "../../graphql/vendors.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import BillFormComponent from "./bill-form.component";
+import BillCmdReturnsTableComponent from "../bill-cm-returns-table/bill-cm-returns-table.component";
+import { QUERY_UNRECEIVED_LINES } from "../../graphql/parts-orders.queries";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -27,20 +29,34 @@ export function BillFormContainer({
    GET_JOB_LINES_TO_ENTER_BILL
  );

+  const [loadOutstandingReturns, { loading: returnLoading, data: returnData }] =
+    useLazyQuery(QUERY_UNRECEIVED_LINES);
+
  return (
-    <BillFormComponent
-      disabled={disabled}
-      form={form}
-      billEdit={billEdit}
-      vendorAutoCompleteOptions={
-        VendorAutoCompleteData && VendorAutoCompleteData.vendors
-      }
-      loadLines={loadLines}
-      lineData={lineData ? lineData.joblines : []}
-      job={lineData ? lineData.jobs_by_pk : null}
-      responsibilityCenters={bodyshop.md_responsibility_centers || null}
-      disableInvNumber={disableInvNumber}
-    />
+    <>
+      <BillFormComponent
+        disabled={disabled}
+        form={form}
+        billEdit={billEdit}
+        vendorAutoCompleteOptions={
+          VendorAutoCompleteData && VendorAutoCompleteData.vendors
+        }
+        loadLines={loadLines}
+        lineData={lineData ? lineData.joblines : []}
+        job={lineData ? lineData.jobs_by_pk : null}
+        responsibilityCenters={bodyshop.md_responsibility_centers || null}
+        disableInvNumber={disableInvNumber}
+        loadOutstandingReturns={loadOutstandingReturns}
+      />
+      {!billEdit && (
+        <BillCmdReturnsTableComponent
+          form={form}
+          loadOutstandingReturns={loadOutstandingReturns}
+          returnLoading={returnLoading}
+          returnData={returnData}
+        />
+      )}
+    </>
  );
 }
 export default connect(mapStateToProps, null)(BillFormContainer);
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -1,4 +1,4 @@
-import { DeleteFilled, WarningOutlined } from "@ant-design/icons";
+import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
 import {
  Button,
  Form,
@@ -7,7 +7,8 @@ import {
  Select,
  Space,
  Switch,
-  Table
+  Table,
+  Tooltip
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -43,7 +44,7 @@ export function BillEnterModalLinesComponent({
        title: t("billlines.fields.jobline"),
        dataIndex: "joblineid",
        editable: true,
-
+        width: "20rem",
        formItemProps: (field) => {
          return {
            key: `${field.index}joblinename`,
@@ -57,11 +58,24 @@ export function BillEnterModalLinesComponent({
            ],
          };
        },
+        wrapper: (props) => (
+          <Form.Item
+            noStyle
+            shouldUpdate={(prev, cur) =>
+              prev.is_credit_memo !== cur.is_credit_memo
+            }
+          >
+            {() => {
+              return props.children;
+            }}
+          </Form.Item>
+        ),
        formInput: (record, index) => (
          <BillLineSearchSelect
            disabled={disabled}
            options={lineData}
            style={{ width: "100%", minWidth: "10rem" }}
+            allowRemoved={form.getFieldValue("is_credit_memo") || false}
            onSelect={(value, opt) => {
              setFieldsValue({
                billlines: getFieldsValue(["billlines"]).billlines.map(
@@ -74,7 +88,9 @@ export function BillEnterModalLinesComponent({
                        actual_price: opt.cost,
                        cost_center: opt.part_type
                          ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
-                            ? opt.part_type
+                            ? opt.part_type !== "PAE"
+                              ? opt.part_type
+                              : null
                            : responsibilityCenters.defaults &&
                              (responsibilityCenters.defaults.costs[
                                opt.part_type
@@ -199,23 +215,58 @@ export function BillEnterModalLinesComponent({
          };
        },
        formInput: (record, index) => (
-          <CurrencyInput min={0} disabled={disabled} />
+          <CurrencyInput
+            min={0}
+            disabled={disabled}
+            controls={false}
+            addonAfter={
+              <Form.Item shouldUpdate noStyle>
+                {() => {
+                  const line = getFieldsValue(["billlines"]).billlines[index];
+                  if (!!!line) return null;
+                  let lineDiscount = 1 - line.actual_cost / line.actual_price;
+                  if (isNaN(lineDiscount)) lineDiscount = 0;
+                  return (
+                    <Tooltip title={`${(lineDiscount * 100).toFixed(2) || 0}%`}>
+                      <DollarCircleFilled
+                        style={{
+                          color:
+                            Math.abs(lineDiscount - discount) > 0.005
+                              ? lineDiscount > discount
+                                ? "orange"
+                                : "red"
+                              : "green",
+                        }}
+                      />
+                    </Tooltip>
+                  );
+                }}
+              </Form.Item>
+            }
+          />
        ),
-        additional: (record, index) => (
-          <Form.Item shouldUpdate>
-            {() => {
-              const line = getFieldsValue(["billlines"]).billlines[index];
-              if (!!!line) return null;
-              const lineDiscount = (
-                1 -
-                Math.round((line.actual_cost / line.actual_price) * 100) / 100
-              ).toPrecision(2);
+        // additional: (record, index) => (
+        //   <Form.Item shouldUpdate>
+        //     {() => {
+        //       const line = getFieldsValue(["billlines"]).billlines[index];
+        //       if (!!!line) return null;
+        //       const lineDiscount = (
+        //         1 -
+        //         Math.round((line.actual_cost / line.actual_price) * 100) / 100
+        //       ).toPrecision(2);

-              if (lineDiscount - discount === 0) return <div />;
-              return <WarningOutlined style={{ color: "red" }} />;
-            }}
-          </Form.Item>
-        ),
+        //       return (
+        //         <Tooltip title={`${(lineDiscount * 100).toFixed(0) || 0}%`}>
+        //           <DollarCircleFilled
+        //             style={{
+        //               color: lineDiscount - discount !== 0 ? "red" : "green",
+        //             }}
+        //           />
+        //         </Tooltip>
+        //       );
+        //     }}
+        //   </Form.Item>
+        // ),
      },
      {
        title: t("billlines.fields.cost_center"),
@@ -283,6 +334,19 @@ export function BillEnterModalLinesComponent({
        additional: (record, index) => (
          <Form.Item shouldUpdate style={{ display: "inline-block" }}>
            {() => {
+              const price = getFieldValue([
+                "billlines",
+                record.name,
+                "actual_price",
+              ]);
+
+              const adjustmentRate = getFieldValue([
+                "billlines",
+                record.name,
+                "lbr_adjustment",
+                "rate",
+              ]);
+
              if (getFieldValue(["billlines", record.name, "deductedfromlbr"]))
                return (
                  <div>
@@ -355,6 +419,9 @@ export function BillEnterModalLinesComponent({
                    >
                      <InputNumber precision={2} min={0.01} />
                    </Form.Item>
+                    {price &&
+                      adjustmentRate &&
+                      `${(price / adjustmentRate).toFixed(1)} hrs`}
                  </div>
                );
              return <></>;
@@ -486,6 +553,7 @@ const EditableCell = ({
  formInput,
  formItemProps,
  additional,
+  wrapper,
  ...restProps
 }) => {
  if (additional)
@@ -503,7 +571,20 @@ const EditableCell = ({
        </Space>
      </td>
    );
-
+  if (wrapper)
+    return (
+      <wrapper>
+        <td {...restProps}>
+          <Form.Item
+            labelCol={{ span: 0 }}
+            name={dataIndex}
+            {...(formItemProps && formItemProps(record))}
+          >
+            {(formInput && formInput(record, record.name)) || children}
+          </Form.Item>
+        </td>
+      </wrapper>
+    );
  return (
    <td {...restProps}>
      <Form.Item
--- a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
+++ b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
@@ -4,7 +4,10 @@ import { useTranslation } from "react-i18next";

 //To be used as a form element only.
 const { Option } = Select;
-const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
+const BillLineSearchSelect = (
+  { options, disabled, allowRemoved, ...restProps },
+  ref
+) => {
  const { t } = useTranslation();

  return (
@@ -12,6 +15,7 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
      disabled={disabled}
      ref={ref}
      showSearch
+      dropdownMatchSelectWidth={false}
      //  optionFilterProp="line_desc"
      filterOption={(inputValue, option) => {
        return (
@@ -36,7 +40,7 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
      {options
        ? options.map((item) => (
            <Option
-              disabled={item.removed}
+              disabled={allowRemoved ? false : item.removed}
              key={item.id}
              value={item.id}
              cost={item.act_price ? item.act_price : 0}
@@ -49,9 +53,14 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
                ...(item.removed ? { textDecoration: "line-through" } : {}),
              }}
            >
-              {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
+              <span>{`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
                item.oem_partno ? ` - ${item.oem_partno}` : ""
-              }${item.act_price ? ` - $${item.act_price}` : ``}`}
+              }`}</span>
+              <span style={{ float: "right", paddingleft: "1rem" }}>
+                {item.act_price
+                  ? `$${item.act_price && item.act_price.toFixed(2)}`
+                  : ``}
+              </span>
            </Option>
          ))
        : null}
--- a/client/src/components/bill-mark-exported-button/bill-mark-exported-button.component.jsx
+++ b/client/src/components/bill-mark-exported-button/bill-mark-exported-button.component.jsx
@@ -0,0 +1,82 @@
+import { 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 { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  selectAuthLevel,
+  selectBodyshop,
+} from "../../redux/user/user.selectors";
+import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  authLevel: selectAuthLevel,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(BillMarkExportedButton);
+
+export function BillMarkExportedButton({ bodyshop, authLevel, bill }) {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+
+  const [updateBill] = useMutation(gql`
+    mutation UPDATE_BILL($billId: uuid!) {
+      update_bills(where: { id: { _eq: $billId } }, _set: { exported: true }) {
+        returning {
+          id
+          exported
+          exported_at
+        }
+      }
+    }
+  `);
+
+  const handleUpdate = async () => {
+    setLoading(true);
+    const result = await updateBill({
+      variables: { billId: bill.id },
+    });
+
+    if (!result.errors) {
+      notification["success"]({
+        message: t("bills.successes.markexported"),
+      });
+    } else {
+      notification["error"]({
+        message: t("bills.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+    //Get the owner details, populate it all back into the job.
+  };
+
+  const hasAccess = HasRbacAccess({
+    bodyshop,
+    authLevel,
+    action: "bills:reexport",
+  });
+
+  if (hasAccess)
+    return (
+      <Button
+        loading={loading}
+        disabled={bill.exported}
+        onClick={handleUpdate}
+      >
+        {t("bills.labels.markexported")}
+      </Button>
+    );
+
+  return <></>;
+}
--- a/client/src/components/bills-list-table/bills-list-table.component.jsx
+++ b/client/src/components/bills-list-table/bills-list-table.component.jsx
@@ -43,6 +43,8 @@ export function BillsListTableComponent({
  });
  // const search = queryString.parse(useLocation().search);
  // const selectedBill = search.billid;
+  const [searchText, setSearchText] = useState("");
+
  const Templates = TemplateList("bill");
  const bills = billsQuery.data ? billsQuery.data.bills : [];
  const { refetch } = billsQuery;
@@ -58,7 +60,7 @@ export function BillsListTableComponent({
        disabled={
          record.is_credit_memo || record.vendorid === bodyshop.inhousevendorid
        }
-        onClick={() =>
+        onClick={() => {
          setPartsOrderContext({
            actions: {},
            context: {
@@ -74,12 +76,14 @@ export function BillsListTableComponent({
                  cost: i.actual_cost,
                  quantity: i.quantity,
                  joblineid: i.joblineid,
+                  oem_partno: i.jobline && i.jobline.oem_partno,
+                  part_type: i.jobline && i.jobline.part_type,
                };
              }),
              isReturn: true,
            },
-          })
-        }
+          });
+        }}
      >
        {t("bills.actions.return")}
      </Button>
@@ -164,6 +168,24 @@ export function BillsListTableComponent({
    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
  };

+  const filteredBills = bills
+    ? searchText === ""
+      ? bills
+      : bills.filter(
+          (b) =>
+            (b.invoice_number || "")
+              .toLowerCase()
+              .includes(searchText.toLowerCase()) ||
+            (b.vendor.name || "")
+              .toLowerCase()
+              .includes(searchText.toLowerCase()) ||
+            (b.total || "")
+              .toString()
+              .toLowerCase()
+              .includes(searchText.toLowerCase())
+        )
+    : [];
+
  return (
    <Card
      title={t("bills.labels.bills")}
@@ -204,8 +226,10 @@ export function BillsListTableComponent({

          <Input.Search
            placeholder={t("general.labels.search")}
+            value={searchText}
            onChange={(e) => {
              e.preventDefault();
+              setSearchText(e.target.value);
            }}
          />
        </Space>
@@ -218,7 +242,7 @@ export function BillsListTableComponent({
        }}
        columns={columns}
        rowKey="id"
-        dataSource={bills}
+        dataSource={filteredBills}
        onChange={handleTableChange}
      />
    </Card>
--- a/client/src/components/breadcrumbs/breadcrumbs.component.jsx
+++ b/client/src/components/breadcrumbs/breadcrumbs.component.jsx
@@ -5,21 +5,25 @@ import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBreadcrumbs } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import GlobalSearch from "../global-search/global-search.component";
 import "./breadcrumbs.styles.scss";

 const mapStateToProps = createStructuredSelector({
  breadcrumbs: selectBreadcrumbs,
+  bodyshop: selectBodyshop,
 });

-export function BreadCrumbs({ breadcrumbs }) {
+export function BreadCrumbs({ breadcrumbs, bodyshop }) {
  return (
    <Row className="breadcrumb-container">
      <Col xs={24} sm={24} md={16}>
        <Breadcrumb separator=">">
          <Breadcrumb.Item>
            <Link to={`/manage`}>
-              <HomeFilled />
+              <HomeFilled />{" "}
+              {(bodyshop && bodyshop.shopname && `(${bodyshop.shopname})`) ||
+                ""}
            </Link>
          </Breadcrumb.Item>
          {breadcrumbs.map((item) =>
--- a/client/src/components/chat-archive-button/chat-archive-button.component.jsx
+++ b/client/src/components/chat-archive-button/chat-archive-button.component.jsx
@@ -13,6 +13,7 @@ export default function ChatArchiveButton({ conversation }) {

    await updateConversation({
      variables: { id: conversation.id, archived: !conversation.archived },
+      refetchQueries: ["CONVERSATION_LIST_QUERY"],
    });

    setLoading(false);
--- a/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx
+++ b/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx
@@ -7,6 +7,7 @@ import { selectSelectedConversation } from "../../redux/messaging/messaging.sele
 import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import "./chat-conversation-list.styles.scss";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";

 const mapStateToProps = createStructuredSelector({
  selectedConversation: selectSelectedConversation,
@@ -40,9 +41,9 @@ export function ChatConversationListComponent({
            {item.job_conversations.length > 0 ? (
              <div className="chat-name">
                {item.job_conversations.map((j, idx) => (
-                  <div key={idx}>{`${j.job.ownr_fn || ""} ${
-                    j.job.ownr_ln || ""
-                  } ${j.job.ownr_co_nm || ""} `}</div>
+                  <div key={idx}>
+                    <OwnerNameDisplay ownerObject={j.job} />
+                  </div>
                ))}
              </div>
            ) : (
--- a/client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx
+++ b/client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx
@@ -4,6 +4,7 @@ import React from "react";
 import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { REMOVE_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";

 export default function ChatConversationTitleTags({ jobConversations }) {
  const [removeJobConversation] = useMutation(REMOVE_CONVERSATION_TAG);
@@ -16,6 +17,16 @@ export default function ChatConversationTitleTags({ jobConversations }) {
          conversationId: convId,
          jobId: jobId,
        },
+        update(cache) {
+          cache.modify({
+            id: cache.identify({ id: convId, __typename: "conversations" }),
+            fields: {
+              job_conversations(ex) {
+                return ex.filter((e) => e.jobid !== jobId);
+              },
+            },
+          });
+        },
      });
      logImEXEvent("messaging_remove_job_tag", {
        conversationId: convId,
@@ -35,9 +46,8 @@ export default function ChatConversationTitleTags({ jobConversations }) {
          onClose={() => handleRemoveTag(item.job.id)}
        >
          <Link to={`/manage/jobs/${item.job.id}`}>
-            {`${item.job.ro_number || "?"} | ${item.job.ownr_fn || ""} ${
-              item.job.ownr_ln || ""
-            } ${item.job.ownr_co_nm || ""}`}
+            {`${item.job.ro_number || "?"} | `}
+            <OwnerNameDisplay ownerObject={item.job} />
          </Link>
        </Tag>
      ))}
--- a/client/src/components/chat-media-selector/chat-media-selector.component.jsx
+++ b/client/src/components/chat-media-selector/chat-media-selector.component.jsx
@@ -6,12 +6,13 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { GET_DOCUMENTS_BY_JOB } from "../../graphql/documents.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import JobDocumentsGalleryExternal from "../jobs-documents-gallery/jobs-documents-gallery.external.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";

 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -19,6 +20,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default connect(mapStateToProps, mapDispatchToProps)(ChatMediaSelector);

 export function ChatMediaSelector({
+  bodyshop,
  selectedMedia,
  setSelectedMedia,
  conversation,
@@ -27,7 +29,6 @@ export function ChatMediaSelector({
  const [visible, setVisible] = useState(false);

  const { loading, error, data } = useQuery(GET_DOCUMENTS_BY_JOB, {
-
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only",
    variables: {
@@ -66,6 +67,8 @@ export function ChatMediaSelector({
    </div>
  );

+  if (bodyshop.uselocalmediaserver) return null;
+
  return (
    <Popover
      content={
--- a/client/src/components/chat-presets/chat-presets.component.jsx
+++ b/client/src/components/chat-presets/chat-presets.component.jsx
@@ -19,7 +19,7 @@ export function ChatPresetsComponent({ bodyshop, setMessage, className }) {
  const menu = (
    <Menu>
      {bodyshop.md_messaging_presets.map((i, idx) => (
-        <Menu.Item onClick={() => setMessage(i.text)} onItemHover key={idx}>
+        <Menu.Item onClick={() => setMessage(i.text)} key={idx}>
          {i.label}
        </Menu.Item>
      ))}
--- a/client/src/components/chat-send-message/chat-send-message.component.jsx
+++ b/client/src/components/chat-send-message/chat-send-message.component.jsx
@@ -45,13 +45,14 @@ function ChatSendMessageComponent({
  const { t } = useTranslation();

  const handleEnter = () => {
-    if (message === "" || !message) return;
-    logImEXEvent("messaging_send_message");
    const selectedImages = selectedMedia.filter((i) => i.isSelected);
-    if (selectedImages < 11) {
+    if ((message === "" || !message) && selectedImages.length === 0) return;
+    logImEXEvent("messaging_send_message");
+
+    if (selectedImages.length < 11) {
      sendMessage({
        to: conversation.phone_num,
-        body: message,
+        body: message || "",
        messagingServiceSid: bodyshop.messagingservicesid,
        conversationid: conversation.id,
        selectedMedia: selectedImages,
@@ -92,7 +93,7 @@ function ChatSendMessageComponent({
      </span>
      <SendOutlined
        className="imex-flex-row__margin"
-        disabled={message === "" || !message}
+        //  disabled={message === "" || !message}
        onClick={handleEnter}
      />
      <Spin
--- a/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx
+++ b/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx
@@ -1,7 +1,8 @@
 import { CloseCircleOutlined, LoadingOutlined } from "@ant-design/icons";
-import { Select, Empty, Space } from "antd";
+import { Empty, Select, Space } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";

 export default function ChatTagRoComponent({
  roOptions,
@@ -27,9 +28,7 @@ export default function ChatTagRoComponent({
        >
          {roOptions.map((item, idx) => (
            <Select.Option key={item.id || idx}>
-              {` ${item.ro_number || ""} | ${item.ownr_fn || ""} ${
-                item.ownr_ln || ""
-              } ${item.ownr_co_nm || ""}`}
+              {` ${item.ro_number || ""} | ${OwnerNameDisplayFunction(item)}`}
            </Select.Option>
          ))}
        </Select>
--- a/client/src/components/contract-job-block/contract-job-block.component.jsx
+++ b/client/src/components/contract-job-block/contract-job-block.component.jsx
@@ -3,7 +3,7 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import DataLabel from "../data-label/data-label.component";
-
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 export default function ContractJobBlock({ job }) {
  const { t } = useTranslation();
  return (
@@ -23,9 +23,7 @@ export default function ContractJobBlock({ job }) {
            } ${(job && job.v_model_desc) || ""}`}
          </DataLabel>
          <DataLabel label={t("jobs.fields.owner")}>
-            {`${(job && job.ownr_fn) || ""} ${(job && job.ownr_ln) || ""} ${
-              (job && job.ownr_co_nm) || ""
-            }`}
+            <OwnerNameDisplay ownerObject={job} />
          </DataLabel>
        </div>
      </Card>
--- a/client/src/components/contract-jobs/contract-jobs.component.jsx
+++ b/client/src/components/contract-jobs/contract-jobs.component.jsx
@@ -3,6 +3,7 @@ import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";

 export default function ContractsJobsComponent({
  loading,
@@ -43,17 +44,7 @@ export default function ContractsJobsComponent({
      width: "25%",
      sortOrder:
        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
-      render: (text, record) => {
-        return record.owner ? (
-          <span>
-            {record.ownr_fn} {record.ownr_ln} {record.ownr_co_nm || ""}
-          </span>
-        ) : (
-          <span>{`${record.ownr_fn} ${record.ownr_ln} ${
-            record.ownr_co_nm || ""
-          }`}</span>
-        );
-      },
+      render: (text, record) => <OwnerNameDisplay ownerObject={record} />,
    },
    {
      title: t("jobs.fields.status"),
--- a/client/src/components/contracts-list/contracts-list.component.jsx
+++ b/client/src/components/contracts-list/contracts-list.component.jsx
@@ -11,17 +11,23 @@ import { setModalContext } from "../../redux/modals/modals.actions";

 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import moment from "moment";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
 });
+
 const mapDispatchToProps = (dispatch) => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
  setContractFinderContext: (context) =>
    dispatch(setModalContext({ context: context, modal: "contractFinder" })),
 });
+
 export default connect(mapStateToProps, mapDispatchToProps)(ContractsList);

 export function ContractsList({
+  bodyshop,
  loading,
  contracts,
  refetch,
@@ -71,7 +77,9 @@ export function ContractsList({
      sortOrder:
        state.sortedInfo.columnKey === "driver_ln" && state.sortedInfo.order,
      render: (text, record) =>
-        `${record.driver_fn || ""} ${record.driver_ln || ""}`,
+        bodyshop.last_name_first
+          ? `${record.driver_ln || ""}, ${record.driver_fn || ""}`
+          : `${record.driver_fn || ""} ${record.driver_ln || ""}`,
    },
    {
      title: t("contracts.labels.vehicle"),
@@ -86,7 +94,9 @@ export function ContractsList({
        } ${record.courtesycar.make} ${record.courtesycar.model}${
          record.courtesycar.plate ? ` (${record.courtesycar.plate})` : ""
        }${
-          record.courtesycar.fleetnumber ? ` (${record.courtesycar.fleetnumber})` : ""
+          record.courtesycar.fleetnumber
+            ? ` (${record.courtesycar.fleetnumber})`
+            : ""
        }`}</Link>
      ),
    },
@@ -133,6 +143,19 @@ export function ContractsList({
        <DateTimeFormatter>{record.actualreturn}</DateTimeFormatter>
      ),
    },
+    {
+      title: t("contracts.fields.length"),
+      dataIndex: "length",
+      key: "length",
+
+      render: (text, record) =>
+        (record.actualreturn &&
+          record.start &&
+          `${moment(record.actualreturn)
+            .diff(moment(record.start), "days", true)
+            .toFixed(1)} days`) ||
+        "",
+    },
  ];

  const handleTableChange = (pagination, filters, sorter) => {
--- a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
+++ b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
@@ -9,7 +9,7 @@ import { DateFormatter } from "../../utils/DateFormatter";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
 import CourtesyCarStatus from "../courtesy-car-status-select/courtesy-car-status-select.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
+//import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";

@@ -32,7 +32,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
        }
      />

-      <FormFieldsChanged form={form} />
+      {/* <FormFieldsChanged form={form} /> */}
      <LayoutFormRow header={t("courtesycars.labels.vehicle")}>
        <Form.Item
          label={t("courtesycars.fields.make")}
--- a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
+++ b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
@@ -1,9 +1,11 @@
-import { Table, Button, Input, Card, Space } from "antd";
+import { SyncOutlined } from "@ant-design/icons";
+import { Button, Card, Input, Space, Table } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { alphaSort } from "../../utils/sorters";
-import { SyncOutlined } from "@ant-design/icons";
+import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
+
 export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
  const [state, setState] = useState({
    sortedInfo: {},
@@ -97,7 +99,9 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
      render: (text, record) =>
        record.cccontracts.length === 1 ? (
          <Link to={`/manage/jobs/${record.cccontracts[0].job.id}`}>
-            {record.cccontracts[0].job.ro_number}
+            {`${
+              record.cccontracts[0].job.ro_number
+            } - ${OwnerNameDisplayFunction(record.cccontracts[0].job)}`}
          </Link>
        ) : null,
    },
--- a/client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx
+++ b/client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx
@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";

 export default function CsiResponseListPaginated({
  refetch,
@@ -48,14 +49,12 @@ export default function CsiResponseListPaginated({
      render: (text, record) => {
        return record.job.owner ? (
          <Link to={"/manage/owners/" + record.job.owner.id}>
-            {`${record.job.ownr_fn || ""} ${record.job.ownr_ln || ""} ${
-              record.job.ownr_co_nm || ""
-            }`}
+            <OwnerNameDisplay ownerObject={record.job} />
          </Link>
        ) : (
-          <span>{`${record.job.ownr_fn || ""} ${record.job.ownr_ln || ""} ${
-            record.job.ownr_co_nm || ""
-          }`}</span>
+          <span>
+            <OwnerNameDisplay ownerObject={record.job} />
+          </span>
        );
      },
    },
--- a/client/src/components/dashboard-components/monthly-employee-efficiency/monthly-employee-efficiency.component.jsx
+++ b/client/src/components/dashboard-components/monthly-employee-efficiency/monthly-employee-efficiency.component.jsx
@@ -40,7 +40,7 @@ export default function DashboardMonthlyEmployeeEfficiency({
        (dayAcc, dayVal) => {
          return {
            actual: dayAcc.actual + dayVal.actualhrs,
-            productive: dayAcc.actual + dayVal.productivehrs,
+            productive: dayAcc.productive + dayVal.productivehrs,
          };
        },
        { actual: 0, productive: 0 }
@@ -50,11 +50,13 @@ export default function DashboardMonthlyEmployeeEfficiency({
    }

    const dailyEfficiency =
-      ((dailyHrs.productive - dailyHrs.actual) / dailyHrs.productive + 1) * 100;
+      ((dailyHrs.productive - dailyHrs.actual) / dailyHrs.actual + 1) * 100;

    const theValue = {
      date: moment(val).format("DD"),
-      ...dailyHrs,
+      // ...dailyHrs,
+      actual: dailyHrs.actual.toFixed(1),
+      productive: dailyHrs.productive.toFixed(1),
      dailyEfficiency: isNaN(dailyEfficiency) ? 0 : dailyEfficiency.toFixed(1),
      accActual:
        acc.length > 0
@@ -67,12 +69,18 @@ export default function DashboardMonthlyEmployeeEfficiency({
          : dailyHrs.productive,
      accEfficiency: 0,
    };
-    theValue.accEfficiency = (
+
+    theValue.accEfficiency =
      ((theValue.accProductive - theValue.accActual) /
-        (theValue.accProductive || 1) +
+        (theValue.accActual || 0) +
        1) *
-      100
-    ).toFixed(1);
+      100;
+
+    if (isNaN(theValue.accEfficiency)) {
+      theValue.accEfficiency = 0;
+    } else {
+      theValue.accEfficiency = theValue.accEfficiency.toFixed(1);
+    }

    return [...acc, theValue];
  }, []);
@@ -131,6 +139,7 @@ export default function DashboardMonthlyEmployeeEfficiency({
              //stackId="day"
              barSize={20}
              fill="#102568"
+              format={"0.0"}
            />
            <Bar
              name="Productive Hours"
@@ -140,6 +149,7 @@ export default function DashboardMonthlyEmployeeEfficiency({
              //stackId="day"
              barSize={20}
              fill="#017664"
+              format={"0.0"}
            />
          </ComposedChart>
        </ResponsiveContainer>
--- a/client/src/components/dashboard-components/pojected-monthly-sales/projected-monthly-sales.component.jsx
+++ b/client/src/components/dashboard-components/pojected-monthly-sales/projected-monthly-sales.component.jsx
@@ -31,16 +31,51 @@ export default function DashboardProjectedMonthlySales({ data, ...cardProps }) {
 }

 export const DashboardProjectedMonthlySalesGql = `
-    projected_monthly_sales: jobs(where: {_or: [{_and: [{date_invoiced: {_gte: "${moment()
+    projected_monthly_sales: jobs(where: {
+      voided: {_eq: false},
+      _or: [
+        {_and: [
+          {date_invoiced:{_is_null: false }},
+          {date_invoiced: {_gte: "${moment()
+            .startOf("month")
+            .startOf("day")
+            .toISOString()}"}}, {date_invoiced: {_lte: "${moment()
+  .endOf("month")
+  .endOf("day")
+  .toISOString()}"}}]},
+  {
+
+_and:[
+  {date_invoiced:{_is_null: true }},
+  {actual_completion: {_gte: "${moment()
+    .startOf("month")
+    .startOf("day")
+    .toISOString()}"}}, {actual_completion: {_lte: "${moment()
+  .endOf("month")
+  .endOf("day")
+  .toISOString()}"}}
+
+]
+  },
+
+  {_and: [
+    {date_invoiced: {_is_null: true}}, 
+    {actual_completion: {_is_null: true}}
+    {scheduled_completion: {_gte: "${moment()
      .startOf("month")
-      .format("YYYY-MM-DD")}"}}, {date_invoiced: {_lte: "${moment()
+      .startOf("day")
+      .toISOString()}"}}, {scheduled_completion: {_lte: "${moment()
  .endOf("month")
-  .format("YYYY-MM-DD")}"}}]}, {_and: [{scheduled_completion: {_gte: "${moment()
-  .startOf("month")
-  .format("YYYY-MM-DD")}"}}, {scheduled_completion: {_lte: "${moment()
-  .endOf("month")
-  .format("YYYY-MM-DD")}"}}]}]}) {
+  .endOf("day")
+  .toISOString()}"}}
+
+
+]}
+
+]}) {
    id
+    ro_number
+    voided
    date_invoiced
    job_totals
  }
--- a/client/src/components/dashboard-grid/dashboard-grid.component.jsx
+++ b/client/src/components/dashboard-grid/dashboard-grid.component.jsx
@@ -280,12 +280,13 @@ const createDashboardQuery = (state) => {
  return gql`
    query QUERY_DASHBOARD_DETAILS {
         ${componentBasedAdditions || ""}
-      monthly_sales: jobs(where: {_and: [{date_invoiced: {_gte: "${moment()
-        .startOf("month")
-        .format("YYYY-MM-DD")}"}}, {date_invoiced: {_lte: "${moment()
-    .endOf("month")
-    .format("YYYY-MM-DD")}"}}]}) {
+      monthly_sales: jobs(where: {_and: [
+        { voided: {_eq: false}},
+        {date_invoiced: {_gte: "${moment()
+        .startOf("month").startOf('day').toISOString()}"}}, {date_invoiced: {_lte: "${moment()
+    .endOf("month").endOf('day').toISOString()}"}}]}) {
    id
+    ro_number
    date_invoiced
    job_totals
          rate_la1
@@ -333,14 +334,14 @@ const createDashboardQuery = (state) => {
          part_qty
          part_type
        }
-        labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" } }) {
+        labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
          aggregate {
            sum {
              mod_lb_hrs
            }
          }
        }
-        larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" } }) {
+        larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
          aggregate {
            sum {
              mod_lb_hrs
--- a/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
+++ b/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
@@ -45,7 +45,7 @@ export function DmsCustomerSelector({ bodyshop }) {
  const onUseGeneric = () => {
    setVisible(false);
    socket.emit(
-      `${dmsType}selected-customer`,
+      `${dmsType}-selected-customer`,
      bodyshop.cdk_configuration.generic_customer_number
    );
    setSelectedCustomer(null);
--- a/client/src/components/dms-post-form/dms-post-form.component.jsx
+++ b/client/src/components/dms-post-form/dms-post-form.component.jsx
@@ -14,6 +14,7 @@ import {
  Typography,
 } from "antd";
 import Dinero from "dinero.js";
+import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -22,6 +23,7 @@ import { determineDmsType } from "../../pages/dms/dms.container";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
 import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";

@@ -78,10 +80,26 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
        layout="vertical"
        onFinish={handleFinish}
        initialValues={{
-          story: t("jobs.labels.dms.defaultstory", {
+          story: `${t("jobs.labels.dms.defaultstory", {
            ro_number: job.ro_number,
-            area_of_damage: job.area_of_damage && job.area_of_damage.impact1,
-          }).substr(0, 239),
+            ownr_nm: `${job.ownr_fn || ""} ${job.ownr_ln || ""} ${
+              job.ownr_co_nm || ""
+            }`.trim(),
+            ins_co_nm: job.ins_co_nm || "N/A",
+            clm_po: `${job.clm_no ? `${job.clm_no} ` : ""}${
+              job.po_number || ""
+            }`,
+          }).trim()}.${
+            job.area_of_damage && job.area_of_damage.impact1
+              ? " " +
+                t("jobs.labels.dms.damageto", {
+                  area_of_damage:
+                    (job.area_of_damage && job.area_of_damage.impact1) ||
+                    "UNKNOWN",
+                })
+              : ""
+          }`.substr(0, 239),
+          inservicedate: moment("2019-01-01"),
        }}
      >
        <LayoutFormRow grow>
@@ -154,6 +172,12 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
              >
                <Input disabled />
              </Form.Item>
+              <Form.Item
+                name="inservicedate"
+                label={t("jobs.fields.dms.inservicedate")}
+              >
+                <FormDatePicker />
+              </Form.Item>
            </LayoutFormRow>
            <Space>
              <DmsCdkMakes form={form} socket={socket} job={job} />
@@ -174,6 +198,22 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
        </Form.Item>

        <Divider />
+        <Space size="large" wrap align="center">
+          <Statistic
+            title={t("jobs.fields.ded_amt")}
+            value={Dinero(
+              job.job_totals.totals.custPayable.deductible
+            ).toFormat()}
+          />
+          <Statistic
+            title={t("jobs.labels.total_cust_payable")}
+            value={Dinero(job.job_totals.totals.custPayable.total).toFormat()}
+          />
+          <Statistic
+            title={t("jobs.labels.net_repairs")}
+            value={Dinero(job.job_totals.totals.net_repairs).toFormat()}
+          />
+        </Space>
        <Form.List name={["payers"]}>
          {(fields, { add, remove }) => {
            return (
--- a/client/src/components/documents-local-upload/documents-local-upload.component.jsx
+++ b/client/src/components/documents-local-upload/documents-local-upload.component.jsx
@@ -0,0 +1,70 @@
+import { UploadOutlined } from "@ant-design/icons";
+import { Upload } from "antd";
+import React, { useState } from "react";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import { handleUpload } from "./documents-local-upload.utility";
+
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser,
+  bodyshop: selectBodyshop,
+});
+
+export function DocumentsLocalUploadComponent({
+  children,
+  currentUser,
+  bodyshop,
+  job,
+  vendorid,
+  invoice_number,
+  callbackAfterUpload,
+}) {
+  const [fileList, setFileList] = useState([]);
+
+  const handleDone = (uid) => {
+    setTimeout(() => {
+      setFileList((fileList) => fileList.filter((x) => x.uid !== uid));
+    }, 2000);
+  };
+
+  return (
+    <Upload.Dragger
+      multiple={true}
+      fileList={fileList}
+      onChange={(f) => {
+        if (f.event && f.event.percent === 100) handleDone(f.file.uid);
+
+        setFileList(f.fileList);
+      }}
+      customRequest={(ev) =>
+        handleUpload({
+          ev,
+          context: {
+            jobid: job.id,
+            vendorid,
+            invoice_number,
+            callback: callbackAfterUpload,
+          },
+        })
+      }
+      accept="audio/*, video/*, image/*, .pdf, .doc, .docx, .xls, .xlsx"
+    >
+      {children || (
+        <>
+          <p className="ant-upload-drag-icon">
+            <UploadOutlined />
+          </p>
+          <p className="ant-upload-text">
+            Click or drag files to this area to upload.
+          </p>
+        </>
+      )}
+    </Upload.Dragger>
+  );
+}
+export default connect(mapStateToProps, null)(DocumentsLocalUploadComponent);
--- a/client/src/components/documents-local-upload/documents-local-upload.utility.js
+++ b/client/src/components/documents-local-upload/documents-local-upload.utility.js
@@ -0,0 +1,65 @@
+import cleanAxios from "../../utils/CleanAxios";
+import { store } from "../../redux/store";
+import { addMediaForJob } from "../../redux/media/media.actions";
+import normalizeUrl from "normalize-url";
+
+export const handleUpload = async ({ ev, context }) => {
+  const { onError, onSuccess, onProgress, file } = ev;
+  const { jobid, invoice_number, vendorid, callbackAfterUpload } = context;
+
+  var options = {
+    headers: { "X-Requested-With": "XMLHttpRequest" },
+    onUploadProgress: (e) => {
+      if (!!onProgress) onProgress({ percent: (e.loaded / e.total) * 100 });
+    },
+  };
+
+  const formData = new FormData();
+
+  formData.append("jobid", jobid);
+  if (invoice_number) {
+    formData.append("invoice_number", invoice_number);
+    formData.append("vendorid", vendorid);
+  }
+  formData.append("file", file);
+  const bodyshop = store.getState().user.bodyshop;
+
+  const imexMediaServerResponse = await cleanAxios.post(
+    normalizeUrl(
+      `${bodyshop.localmediaserverhttp}/${
+        invoice_number ? "bills" : "jobs"
+      }/upload`
+    ),
+    formData,
+    {
+      ...options,
+    }
+  );
+
+  if (imexMediaServerResponse.status !== 200) {
+    if (!!onError) {
+      onError(imexMediaServerResponse.statusText);
+    }
+  } else {
+    onSuccess && onSuccess(file);
+    store.dispatch(
+      addMediaForJob({
+        jobid,
+        media: imexMediaServerResponse.data.map((d) => {
+          return {
+            ...d,
+            selected: false,
+            src: normalizeUrl(`${bodyshop.localmediaserverhttp}/${d.src}`),
+            thumbnail: normalizeUrl(
+              `${bodyshop.localmediaserverhttp}/${d.thumbnail}`
+            ),
+          };
+        }),
+      })
+    );
+  }
+
+  if (callbackAfterUpload) {
+    callbackAfterUpload();
+  }
+};
--- a/client/src/components/documents-upload/documents-upload.utility.js
+++ b/client/src/components/documents-upload/documents-upload.utility.js
@@ -6,6 +6,7 @@ import { INSERT_NEW_DOCUMENT } from "../../graphql/documents.queries";
 import { axiosAuthInterceptorId } from "../../utils/CleanAxios";
 import client from "../../utils/GraphQLClient";
 import exifr from "exifr";
+import { store } from "../../redux/store";

 //Context: currentUserEmail, bodyshop, jobid, invoiceid

@@ -21,9 +22,9 @@ export const handleUpload = (ev, context) => {

  const fileName = ev.file.name || ev.filename;

-  let key = `${bodyshop.id}/${jobId}/${fileName.replace(
-    /\.[^/.]+$/,
-    ""
+  let key = `${bodyshop.id}/${jobId}/${replaceAccents(fileName).replace(
+    /[^A-Z0-9]+/gi,
+    "_"
  )}-${new Date().getTime()}`;
  let extension = fileName.split(".").pop();
  uploadToCloudinary(
@@ -112,7 +113,19 @@ export const uploadToCloudinary = async (
  );

  if (cloudinaryUploadResponse.status !== 200) {
-    if (!!onError) onError(cloudinaryUploadResponse.statusText);
+    if (!!onError) {
+      onError(cloudinaryUploadResponse.statusText);
+    }
+
+    try {
+      axios.post("/newlog", {
+        message: "client-cloudinary-upload-error",
+        type: "error",
+        user: store.getState().user.email,
+        object: cloudinaryUploadResponse,
+      });
+    } catch (error) {}
+
    notification["error"]({
      message: i18n.t("documents.errors.insert", {
        message: cloudinaryUploadResponse.statusText,
@@ -187,3 +200,33 @@ export function DetermineFileType(filetype) {

  return "auto";
 }
+
+function replaceAccents(str) {
+  // Verifies if the String has accents and replace them
+  if (str.search(/[\xC0-\xFF]/g) > -1) {
+    str = str
+      .replace(/[\xC0-\xC5]/g, "A")
+      .replace(/[\xC6]/g, "AE")
+      .replace(/[\xC7]/g, "C")
+      .replace(/[\xC8-\xCB]/g, "E")
+      .replace(/[\xCC-\xCF]/g, "I")
+      .replace(/[\xD0]/g, "D")
+      .replace(/[\xD1]/g, "N")
+      .replace(/[\xD2-\xD6\xD8]/g, "O")
+      .replace(/[\xD9-\xDC]/g, "U")
+      .replace(/[\xDD]/g, "Y")
+      .replace(/[\xDE]/g, "P")
+      .replace(/[\xE0-\xE5]/g, "a")
+      .replace(/[\xE6]/g, "ae")
+      .replace(/[\xE7]/g, "c")
+      .replace(/[\xE8-\xEB]/g, "e")
+      .replace(/[\xEC-\xEF]/g, "i")
+      .replace(/[\xF1]/g, "n")
+      .replace(/[\xF2-\xF6\xF8]/g, "o")
+      .replace(/[\xF9-\xFC]/g, "u")
+      .replace(/[\xFE]/g, "p")
+      .replace(/[\xFD\xFF]/g, "y");
+  }
+
+  return str;
+}
--- a/client/src/components/email-overlay/email-overlay.component.jsx
+++ b/client/src/components/email-overlay/email-overlay.component.jsx
@@ -9,6 +9,7 @@ import {
  Space,
  Menu,
  Dropdown,
+  Button,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -16,9 +17,17 @@ import EmailDocumentsComponent from "../email-documents/email-documents.componen
 import _ from "lodash";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import { CreateExplorerLinkForJob } from "../../utils/localmedia";
+import { selectEmailConfig } from "../../redux/email/email.selectors";
+
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
+  emailConfig: selectEmailConfig,
 });
 const mapDispatchToProps = (dispatch) => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -28,11 +37,22 @@ export default connect(
  mapDispatchToProps
 )(EmailOverlayComponent);

-export function EmailOverlayComponent({ form, selectedMediaState, bodyshop }) {
+export function EmailOverlayComponent({
+  emailConfig,
+  form,
+  selectedMediaState,
+  bodyshop,
+  currentUser,
+}) {
  const { t } = useTranslation();
  const handleClick = ({ item, key, keyPath }) => {
    const email = item.props.value;
-    form.setFieldsValue({ to: _.uniq([...form.getFieldValue("to"), email]) });
+    form.setFieldsValue({
+      to: _.uniq([
+        ...form.getFieldValue("to"),
+        ...(typeof email === "string" ? [email] : email),
+      ]),
+    });
  };

  const menu = (
@@ -45,12 +65,38 @@ export function EmailOverlayComponent({ form, selectedMediaState, bodyshop }) {
              {`${e.first_name} ${e.last_name}`}
            </Menu.Item>
          ))}
+        {bodyshop.md_to_emails.map((e, idx) => (
+          <Menu.Item value={e.emails} key={idx + "group"}>
+            {e.label}
+          </Menu.Item>
+        ))}
      </Menu>
    </div>
  );

  return (
    <div>
+      <Form.Item
+        label={t("emails.fields.from")}
+        name="from"
+        rules={[
+          {
+            required: true,
+            //message: t("general.validation.required"),
+          },
+        ]}
+      >
+        <Select>
+          <Select.Option key={currentUser.email}>
+            {currentUser.email}
+          </Select.Option>
+          <Select.Option key={bodyshop.email}>{bodyshop.email}</Select.Option>
+          {bodyshop.md_from_emails &&
+            bodyshop.md_from_emails.map((e) => (
+              <Select.Option key={e}>{e}</Select.Option>
+            ))}
+        </Select>
+      </Form.Item>
      <Form.Item
        label={
          <Space>
@@ -112,10 +158,17 @@ export function EmailOverlayComponent({ form, selectedMediaState, bodyshop }) {
      </Form.Item>

      <Tabs>
-        <Tabs.TabPane tab={t("emails.labels.documents")} key="documents">
-          <EmailDocumentsComponent selectedMediaState={selectedMediaState} />
-        </Tabs.TabPane>
+        {!bodyshop.uselocalmediaserver && (
+          <Tabs.TabPane tab={t("emails.labels.documents")} key="documents">
+            <EmailDocumentsComponent selectedMediaState={selectedMediaState} />
+          </Tabs.TabPane>
+        )}
        <Tabs.TabPane tab={t("emails.labels.attachments")} key="attachments">
+          {bodyshop.uselocalmediaserver && emailConfig.jobid && (
+            <a href={CreateExplorerLinkForJob({ jobid: emailConfig.jobid })}>
+              <Button>{t("documents.labels.openinexplorer")}</Button>
+            </a>
+          )}
          <Form.Item
            name="fileList"
            valuePropName="fileList"
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -56,13 +56,9 @@ export function EmailOverlayContainer({
        : bodyshop.shopname,
      address: EmailSettings.fromAddress,
    },
-    ReplyTo: {
-      Email: currentUser.validemail ? currentUser.email : bodyshop.email,
-      Name: currentUser.displayName,
-    },
  };

-  const handleFinish = async (values) => {
+  const handleFinish = async (allValues) => {
    logImEXEvent("email_send_from_modal");

    //const attachments = [];
@@ -77,10 +73,15 @@ export function EmailOverlayContainer({
    //     attachments.push(t);
    //   });

+    const { from, ...values } = allValues;
    setSending(true);
    try {
      await axios.post("/sendemail", {
        ...defaultEmailFrom,
+        ReplyTo: {
+          Email: from,
+          Name: currentUser.displayName,
+        },
        ...values,
        html: rawHtml,
        attachments: [
@@ -138,6 +139,7 @@ export function EmailOverlayContainer({
    }

    form.setFieldsValue({
+      from: currentUser.validemail ? currentUser.email : bodyshop.email,
      ...emailConfig.messageOptions,
      cc:
        emailConfig.messageOptions.cc &&
--- a/client/src/components/export-logs-count-display/export-logs-count-display.component.jsx
+++ b/client/src/components/export-logs-count-display/export-logs-count-display.component.jsx
@@ -0,0 +1,25 @@
+import React from "react";
+import { WarningOutlined } from "@ant-design/icons";
+import { Space, Tooltip } from "antd";
+import { useTranslation } from "react-i18next";
+
+const style = {
+  fontWeight: "bold",
+  color: "green",
+};
+
+export default function ExportLogsCountDisplay({ logs }) {
+  const success = logs.filter((e) => e.successful).length;
+  const attempts = logs.length;
+  const { t } = useTranslation();
+  return (
+    <Space style={success > 0 ? style : {}}>
+      {`${success}/${attempts}`}
+      {success > 0 && (
+        <Tooltip title={t("exportlogs.labels.priorsuccesfulexport")}>
+          <WarningOutlined />
+        </Tooltip>
+      )}
+    </Space>
+  );
+}
--- a/client/src/components/form-date-picker/form-date-picker.component.jsx
+++ b/client/src/components/form-date-picker/form-date-picker.component.jsx
@@ -1,35 +1,83 @@
 import { DatePicker } from "antd";
 import moment from "moment";
-import React, { forwardRef } from "react";
+import React, { useRef } from "react";
 //To be used as a form element only.

+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(FormDatePicker);
+
 const dateFormat = "MM/DD/YYYY";

-const FormDatePicker = (
-  { value, onChange, onBlur, onlyFuture, ...restProps },
-  ref
-) => {
+export function FormDatePicker({
+  bodyshop,
+  value,
+  onChange,
+  onBlur,
+  onlyFuture,
+  isDateOnly = true,
+  ...restProps
+}) {
+  const ref = useRef();
+
  const handleChange = (newDate) => {
    if (value !== newDate && onChange) {
-      onChange(newDate);
+      onChange(isDateOnly ? newDate && newDate.format("YYYY-MM-DD") : newDate);
    }
  };

  const handleKeyDown = (e) => {
    if (e.key.toLowerCase() === "t") {
      if (onChange) {
-        onChange(new moment());
+        onChange(isDateOnly ? moment().format("YYYY-MM-DD") : moment());
+        // if (ref.current && ref.current.blur) ref.current.blur();
      }
+    } else if (e.key.toLowerCase() === "enter") {
+      if (ref.current && ref.current.blur) ref.current.blur();
    }
  };

+  const handleBlur = (e) => {
+    const v = e.target.value;
+    if (!v) return;
+
+    const _a = moment(
+      v,
+      ["MMDDYY", "MMDDYYYY", "MMDD", "MM/DD/YY"],
+      "en",
+      false
+    );
+
+    if (_a.isValid() && value && value.isValid && value.isValid()) {
+      _a.set({
+        hours: value.hours(),
+        minutes: value.minutes(),
+        seconds: value.seconds(),
+        milliseconds: value.milliseconds(),
+      });
+    }
+
+    if (_a.isValid() && onChange)
+      onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+  };
+
  return (
    <div onKeyDown={handleKeyDown}>
      <DatePicker
+        ref={ref}
        value={value ? moment(value) : null}
        onChange={handleChange}
        format={dateFormat}
-        onBlur={onBlur}
+        onBlur={onBlur || handleBlur}
+        showToday={false}
        disabledTime
        {...(onlyFuture && {
          disabledDate: (d) => moment().subtract(1, "day").isAfter(d),
@@ -38,6 +86,4 @@ const FormDatePicker = (
      />
    </div>
  );
-};
-
-export default forwardRef(FormDatePicker);
+}
--- a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
+++ b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
@@ -26,19 +26,20 @@ const DateTimePicker = (
        value={value}
        onBlur={onBlur}
        onChange={onChange}
+        isDateOnly={false}
      />

      <TimePicker
-        {...restProps}
-        value={value ? moment(value) : null}
-        {...(onlyFuture && {
-          disabledDate: (d) => moment().isAfter(d),
-        })}
-        onChange={onChange}
-        showSecond={false}
-        minuteStep={15}
-        onBlur={onBlur}
-        format="hh:mm a"
+      value={value ? moment(value) : null}
+      {...(onlyFuture && {
+        disabledDate: (d) => moment().isAfter(d),
+      })}
+      onChange={onChange}
+      showSecond={false}
+      minuteStep={15}
+      onBlur={onBlur}
+      format="hh:mm a"
+      {...restProps}
      />
    </div>
  );
--- a/client/src/components/global-search/global-search.component.jsx
+++ b/client/src/components/global-search/global-search.component.jsx
@@ -1,16 +1,19 @@
 import { useLazyQuery } from "@apollo/client";
-import { AutoComplete, Divider, Input, Space } from "antd";
+import { LoadingOutlined } from "@ant-design/icons";
+import { AutoComplete, Divider, Space } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
+import { Link, useHistory } from "react-router-dom";
 import { GLOBAL_SEARCH_QUERY } from "../../graphql/search.queries";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import AlertComponent from "../alert/alert.component";
-
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
 export default function GlobalSearch() {
  const { t } = useTranslation();
-
+  const history = useHistory();
  const [callSearch, { loading, error, data }] =
    useLazyQuery(GLOBAL_SEARCH_QUERY);

@@ -39,9 +42,10 @@ export default function GlobalSearch() {
                <Link to={`/manage/jobs/${job.id}`}>
                  <Space size="small" split={<Divider type="vertical" />}>
                    <strong>{job.ro_number || t("general.labels.na")}</strong>
-                    <span>{`${job.ownr_fn || ""} ${job.ownr_ln || ""} ${
-                      job.ownr_co_nm || ""
-                    }`}</span>
+                    <span>{`${job.status || ""}`}</span>
+                    <span>
+                      <OwnerNameDisplay ownerObject={job} />
+                    </span>
                    <span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${
                      job.v_model_desc || ""
                    }`}</span>
@@ -57,15 +61,13 @@ export default function GlobalSearch() {
          options: data.search_owners.map((owner) => {
            return {
              key: owner.id,
-              value: `${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${
-                owner.ownr_co_nm || ""
-              }`,
+              value: OwnerNameDisplayFunction(owner),
              label: (
                <Link to={`/manage/owners/${owner.id}`}>
                  <Space size="small" split={<Divider type="vertical" />} wrap>
-                    <span>{`${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${
-                      owner.ownr_co_nm || ""
-                    }`}</span>
+                    <span>
+                      <OwnerNameDisplay ownerObject={owner} />
+                    </span>
                    <PhoneNumberFormatter>
                      {owner.ownr_ph1}
                    </PhoneNumberFormatter>
@@ -171,9 +173,13 @@ export default function GlobalSearch() {
    <AutoComplete
      options={options}
      onSearch={handleSearch}
+      suffixIcon={loading && <LoadingOutlined spin />}
+      defaultActiveFirstOption
      placeholder={t("general.labels.globalsearch")}
-    >
-      <Input.Search loading={loading} />
-    </AutoComplete>
+      allowClear
+      onSelect={(val, opt) => {
+        history.push(opt.label.props.to);
+      }}
+    ></AutoComplete>
  );
 }
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -3,6 +3,7 @@ import Icon, {
  BarChartOutlined,
  CarFilled,
  ClockCircleFilled,
+  CheckCircleOutlined,
  DashboardFilled,
  DollarCircleFilled,
  ExportOutlined,
@@ -108,6 +109,9 @@ function Header({
          <Menu.Item key="activejobs" icon={<FileFilled />}>
            <Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
          </Menu.Item>
+          <Menu.Item key="readyjobs" icon={<CheckCircleOutlined />}>
+            <Link to="/manage/jobs/ready">{t("menus.header.readyjobs")}</Link>
+          </Menu.Item>
          <Menu.Item key="parts-queue" icon={<ToolFilled />}>
            <Link to="/manage/partsqueue">{t("menus.header.parts-queue")}</Link>
          </Menu.Item>
--- a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
+++ b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
@@ -49,11 +49,11 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) {

    GenerateDocument(
      {
-        name: TemplateList("job_special").thirdpartypayer.key,
+        name: TemplateList("job_special").special_thirdpartypayer.key,
        variables: { id: jobId },
        context: restVals,
      },
-      { subject: TemplateList("job_special").thirdpartypayer.subject },
+      { subject: TemplateList("job_special").special_thirdpartypayer.subject },
      sendtype
    );
  };
--- a/client/src/components/job-at-change/schedule-event.component.jsx
+++ b/client/src/components/job-at-change/schedule-event.component.jsx
@@ -27,9 +27,11 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
+import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -66,12 +68,15 @@ export function ScheduleEventComponent({
  const popoverContent = (
    <div style={{ maxWidth: "40vw" }}>
      {!event.isintake ? (
-        <strong>{event.title}</strong>
+        <Space>
+          <strong>{event.title}</strong>
+          <ScheduleEventColor event={event} />
+        </Space>
      ) : (
        <Space>
-          <strong>{`${(event.job && event.job.ownr_fn) || ""} ${
-            (event.job && event.job.ownr_ln) || ""
-          }`}</strong>
+          <strong>
+            <OwnerNameDisplay ownerObject={event.job} />
+          </strong>
          <span style={{ margin: 4 }}>
            {`${(event.job && event.job.v_model_yr) || ""} ${
              (event.job && event.job.v_make_desc) || ""
@@ -118,7 +123,9 @@ export function ScheduleEventComponent({
          </DataLabel>
          <ScheduleEventNote event={event} />
        </div>
-      ) : null}
+      ) : (
+        <div>{event.note || ""}</div>
+      )}
      <Divider />
      <Space wrap>
        {event.job ? (
@@ -140,84 +147,89 @@ export function ScheduleEventComponent({
            {t("appointments.actions.preview")}
          </Button>
        ) : null}
-
-        <Dropdown
-          overlay={
-            <Menu>
-              <Menu.Item
-                onClick={() => {
-                  const Template = TemplateList("job").appointment_reminder;
-                  GenerateDocument(
-                    {
-                      name: Template.key,
-                      variables: { id: event.job.id },
-                    },
-                    {
-                      to: event.job && event.job.ownr_ea,
-                      subject: Template.subject,
-                    },
-                    "e",
-                    event.job && event.job.id
-                  );
-                }}
-                disabled={event.arrived}
-              >
-                {t("general.labels.email")}
-              </Menu.Item>
-              <Menu.Item
-                onClick={() => {
-                  const p = parsePhoneNumber(event.job.ownr_ph1, "CA");
-                  if (p && p.isValid()) {
-                    openChatByPhone({
-                      phone_num: p.formatInternational(),
-                      jobid: event.job.id,
-                    });
-                    setMessage(
-                      t("appointments.labels.reminder", {
-                        shopname: bodyshop.shopname,
-                        date: moment(event.start).format("MM/DD/YYYY"),
-                        time: moment(event.start).format("HH:mm a"),
-                      })
+        {event.job ? (
+          <Dropdown
+            overlay={
+              <Menu>
+                <Menu.Item
+                  onClick={() => {
+                    const Template = TemplateList("job").appointment_reminder;
+                    GenerateDocument(
+                      {
+                        name: Template.key,
+                        variables: { id: event.job.id },
+                      },
+                      {
+                        to: event.job && event.job.ownr_ea,
+                        subject: Template.subject,
+                      },
+                      "e",
+                      event.job && event.job.id
                    );
-                    setVisible(false);
-                  } else {
-                    notification["error"]({
-                      message: t("messaging.error.invalidphone"),
-                    });
-                  }
-                }}
-                disabled={event.arrived || !bodyshop.messagingservicesid}
-              >
-                {t("general.labels.sms")}
-              </Menu.Item>
-            </Menu>
-          }
-        >
-          <Button>{t("appointments.actions.sendreminder")}</Button>
-        </Dropdown>
+                  }}
+                  disabled={event.arrived}
+                >
+                  {t("general.labels.email")}
+                </Menu.Item>
+                <Menu.Item
+                  onClick={() => {
+                    const p = parsePhoneNumber(event.job.ownr_ph1, "CA");
+                    if (p && p.isValid()) {
+                      openChatByPhone({
+                        phone_num: p.formatInternational(),
+                        jobid: event.job.id,
+                      });
+                      setMessage(
+                        t("appointments.labels.reminder", {
+                          shopname: bodyshop.shopname,
+                          date: moment(event.start).format("MM/DD/YYYY"),
+                          time: moment(event.start).format("HH:mm a"),
+                        })
+                      );
+                      setVisible(false);
+                    } else {
+                      notification["error"]({
+                        message: t("messaging.error.invalidphone"),
+                      });
+                    }
+                  }}
+                  disabled={event.arrived || !bodyshop.messagingservicesid}
+                >
+                  {t("general.labels.sms")}
+                </Menu.Item>
+              </Menu>
+            }
+          >
+            <Button>{t("appointments.actions.sendreminder")}</Button>
+          </Dropdown>
+        ) : null}

        <Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
          {t("appointments.actions.cancel")}
        </Button>
-        <Button
-          disabled={event.arrived}
-          onClick={() => {
-            setVisible(false);
-            setScheduleContext({
-              actions: { refetch: refetch },
-              context: {
-                jobId: event.job.id,
-                job: event.job,
-                previousEvent: event.id,
-                color: event.color,
-                alt_transport: event.job && event.job.alt_transport,
-                note: event.note,
-              },
-            });
-          }}
-        >
-          {t("appointments.actions.reschedule")}
-        </Button>
+        {event.isintake ? (
+          <Button
+            disabled={event.arrived}
+            onClick={() => {
+              setVisible(false);
+              setScheduleContext({
+                actions: { refetch: refetch },
+                context: {
+                  jobId: event.job.id,
+                  job: event.job,
+                  previousEvent: event.id,
+                  color: event.color,
+                  alt_transport: event.job && event.job.alt_transport,
+                  note: event.note,
+                },
+              });
+            }}
+          >
+            {t("appointments.actions.reschedule")}
+          </Button>
+        ) : (
+          <ScheduleManualEvent event={event} />
+        )}
        {event.isintake ? (
          <Link
            to={{
@@ -235,13 +247,19 @@ export function ScheduleEventComponent({
  );

  const RegularEvent = event.isintake ? (
-    <div style={{ display: "flex", flexWrap: "wrap" }}>
+    <div
+      style={{
+        display: "flex",
+        flexWrap: "wrap",
+        height: "100%",
+      }}
+    >
      <Space>
        {event.note && <AlertFilled className="production-alert" />}
        <strong>{`${event.job.ro_number || t("general.labels.na")}`}</strong>
-        <span>{`${(event.job && event.job.ownr_fn) || ""} ${
-          (event.job && event.job.ownr_ln) || ""
-        } ${(event.job && event.job.ownr_co_nm) || ""}`}</span>
+        <span>
+          <OwnerNameDisplay ownerObject={event.job} />
+        </span>
      </Space>
      <Space>
        <span>
@@ -262,7 +280,7 @@ export function ScheduleEventComponent({
      )}
    </div>
  ) : (
-    <div>
+    <div style={{ height: "100%", width: "100%" }}>
      <strong>{`${event.title || ""}`}</strong>
    </div>
  );
@@ -270,7 +288,7 @@ export function ScheduleEventComponent({
  return (
    <Popover
      visible={visible}
-      onVisibleChange={(vis) => setVisible(vis)}
+      onVisibleChange={(vis) => !event.vacation && setVisible(vis)}
      trigger="click"
      content={event.block ? blockContent : popoverContent}
      style={{ height: "100%", width: "100%" }}
--- a/client/src/components/job-at-change/schedule-event.container.jsx
+++ b/client/src/components/job-at-change/schedule-event.container.jsx
@@ -38,6 +38,7 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
          job: {
            date_scheduled: null,
            scheduled_in: null,
+            scheduled_completion:null,
            status: bodyshop.md_ro_statuses.default_imported,
          },
        },
--- a/client/src/components/job-bills-total/job-bills-total.component.jsx
+++ b/client/src/components/job-bills-total/job-bills-total.component.jsx
@@ -26,6 +26,8 @@ export default function JobBillsTotalComponent({
  let billCms = Dinero();
  let lbrAdjustments = Dinero();
  let totalReturns = Dinero();
+  let totalReturnsMarkedNotReceived = Dinero();
+  let totalReturnsMarkedReceived = Dinero();

  partsOrders.forEach((p) =>
    p.parts_order_lines.forEach((pol) => {
@@ -35,6 +37,24 @@ export default function JobBillsTotalComponent({
            amount: Math.round((pol.act_price || 0) * 100),
          }).multiply(pol.quantity)
        );
+
+        if (pol.cm_received === null) {
+          return; // Skip this calculation for bills posted prior to the CNR change.
+        } else {
+          if (pol.cm_received === false) {
+            totalReturnsMarkedNotReceived = totalReturnsMarkedNotReceived.add(
+              Dinero({
+                amount: Math.round((pol.act_price || 0) * 100),
+              }).multiply(pol.quantity)
+            );
+          } else {
+            totalReturnsMarkedReceived = totalReturnsMarkedReceived.add(
+              Dinero({
+                amount: Math.round((pol.act_price || 0) * 100),
+              }).multiply(pol.quantity)
+            );
+          }
+        }
      }
    })
  );
@@ -64,16 +84,16 @@ export default function JobBillsTotalComponent({
    })
  );

-  const totalPartsSublet = Dinero(totals.parts.parts.total).add(
-    Dinero(totals.parts.sublets.total)
-  );
+  const totalPartsSublet = Dinero(totals.parts.parts.total)
+    .add(Dinero(totals.parts.sublets.total))
+    .add(Dinero(totals.additional.towing));

  const discrepancy = totalPartsSublet.subtract(billTotals);

  const discrepWithLbrAdj = discrepancy.add(lbrAdjustments);

-  const discrepWithCms = discrepWithLbrAdj.add(billCms);
-  const creditsNotReceived = totalReturns.subtract(billCms); //billCms is tracked as a negative number.
+  const discrepWithCms = discrepWithLbrAdj.add(totalReturns);
+  const calculatedCreditsNotReceived = totalReturns.subtract(billCms); //billCms is tracked as a negative number.

  return (
    <Row gutter={16}>
@@ -171,8 +191,8 @@ export default function JobBillsTotalComponent({
              }
            >
              <Statistic
-                title={t("bills.labels.billcmtotal")}
-                value={billCms.toFormat()}
+                title={t("bills.labels.totalreturns")}
+                value={totalReturns.toFormat()}
              />
            </Tooltip>
            <Typography.Title>=</Typography.Title>
@@ -213,6 +233,32 @@ export default function JobBillsTotalComponent({
                value={totalReturns.toFormat()}
              />
            </Tooltip>
+            <Tooltip
+              title={
+                <div
+                  dangerouslySetInnerHTML={{
+                    __html: t(
+                      "jobs.labels.plitooltips.calculatedcreditsnotreceived"
+                    ),
+                  }}
+                />
+              }
+            >
+              <Statistic
+                title={t("bills.labels.calculatedcreditsnotreceived")}
+                valueStyle={{
+                  color:
+                    calculatedCreditsNotReceived.getAmount() <= 0
+                      ? "green"
+                      : "red",
+                }}
+                value={
+                  calculatedCreditsNotReceived.getAmount() >= 0
+                    ? calculatedCreditsNotReceived.toFormat()
+                    : Dinero().toFormat()
+                }
+              />
+            </Tooltip>
            <Tooltip
              title={
                <div
@@ -225,11 +271,14 @@ export default function JobBillsTotalComponent({
              <Statistic
                title={t("bills.labels.creditsnotreceived")}
                valueStyle={{
-                  color: creditsNotReceived.getAmount() <= 0 ? "green" : "red",
+                  color:
+                    totalReturnsMarkedNotReceived.getAmount() <= 0
+                      ? "green"
+                      : "red",
                }}
                value={
-                  creditsNotReceived.getAmount() >= 0
-                    ? creditsNotReceived.toFormat()
+                  totalReturnsMarkedNotReceived.getAmount() >= 0
+                    ? totalReturnsMarkedNotReceived.toFormat()
                    : Dinero().toFormat()
                }
              />
--- a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
+++ b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
@@ -79,9 +79,19 @@ export function JobChecklistForm({
          ...(type === "intake" && {
            scheduled_completion: values.scheduled_completion,
          }),
+          ...(type === "intake" &&
+            bodyshop.intakechecklist &&
+            bodyshop.intakechecklist.next_contact_hours &&
+            bodyshop.intakechecklist.next_contact_hours > 0 && {
+              date_next_contact: moment().add(
+                bodyshop.intakechecklist.next_contact_hours,
+                "hours"
+              ),
+            }),
          ...(type === "deliver" && {
            actual_completion: values.actual_completion,
          }),
+
          [(type === "intake" && "intakechecklist") ||
          (type === "deliver" && "deliverchecklist")]: {
            ...values,
@@ -95,6 +105,10 @@ export function JobChecklistForm({
            completed_at: new Date(),
          },

+          ...(type === "intake" &&
+            values.scheduled_delivery && {
+              scheduled_delivery: values.scheduled_delivery,
+            }),
          ...(type === "deliver" && {
            scheduled_delivery: values.scheduled_delivery,
            actual_delivery: values.actual_delivery,
@@ -161,7 +175,12 @@ export function JobChecklistForm({
      });
    }
  };
-
+  console.log(job, {
+    removeFromProduction: true,
+    actual_completion:
+      job && job.actual_completion && moment(job.actual_completion),
+    actual_delivery: job && job.actual_delivery && moment(job.actual_delivery),
+  });
  return (
    <Card
      title={t("checklist.labels.checklist")}
@@ -185,21 +204,27 @@ export function JobChecklistForm({
            addToProduction: true,
            allow_text_message: job.owner && job.owner.allow_text_message,
            scheduled_completion:
-              (job && job.scheduled_completion) ||
-              (job.labbrs && job.larhrs
-                ? moment().businessAdd(
-                    (job.labhrs.aggregate.sum.mod_lb_hrs +
-                      job.larhrs.aggregate.sum.mod_lb_hrs) /
-                      bodyshop.target_touchtime,
-                    "days"
-                  )
-                : null),
-            scheduled_delivery: job && job.scheduled_delivery,
+              (job &&
+                job.scheduled_completion &&
+                moment(job.scheduled_completion)) ||
+              (job &&
+                job.labhrs &&
+                job.larhrs &&
+                moment().businessAdd(
+                  (job.labhrs.aggregate.sum.mod_lb_hrs ||
+                    0 + job.larhrs.aggregate.sum.mod_lb_hrs ||
+                    0) / bodyshop.target_touchtime,
+                  "days"
+                )),
+            scheduled_delivery:
+              job.scheduled_delivery && moment(job.scheduled_delivery),
          }),
          ...(type === "deliver" && {
            removeFromProduction: true,
-            actual_completion: job && job.actual_completion,
-            actual_delivery: job && job.actual_delivery,
+            actual_completion:
+              job && job.actual_completion && moment(job.actual_completion),
+            actual_delivery:
+              job && job.actual_delivery && moment(job.actual_delivery),
          }),
          ...formItems
            .filter((fi) => fi.value)
--- a/client/src/components/job-costing-modal/job-costing-modal.container.jsx
+++ b/client/src/components/job-costing-modal/job-costing-modal.container.jsx
@@ -26,11 +26,6 @@ export function JobCostingModalContainer({
  const { visible, context } = jobCostingModal;
  const { jobId } = context;

-  // const { loading, error, data } = useQuery(QUERY_JOB_COSTING_DETAILS, {
-  //   variables: { id: jobId },
-  //   skip: !jobId,
-  // });
-
  useEffect(() => {
    async function getData() {
      if (jobId && visible) {
@@ -46,8 +41,14 @@ export function JobCostingModalContainer({
    <Modal
      visible={visible}
      title={t("jobs.labels.jobcosting")}
-      onOk={() => toggleModalVisible()}
-      onCancel={() => toggleModalVisible()}
+      onOk={() => {
+        toggleModalVisible();
+        setCostingData(null);
+      }}
+      onCancel={() => {
+        toggleModalVisible();
+        setCostingData(null);
+      }}
      cancelButtonProps={{ style: { display: "none" } }}
      width="90%"
      destroyOnClose
--- a/client/src/components/job-costing-statistics/job-costing-statistics.component.jsx
+++ b/client/src/components/job-costing-statistics/job-costing-statistics.component.jsx
@@ -16,6 +16,14 @@ export default function JobCostingStatistics({ summaryData }) {
          value={Dinero(summaryData.totalPartsSales).toFormat()}
          title={t("jobs.labels.sale_parts")}
        />
+        <Statistic
+          value={Dinero(summaryData.totalSubletSales).toFormat()}
+          title={t("jobs.labels.sale_sublet")}
+        />
+        <Statistic
+          value={Dinero(summaryData.totalAdditionalSales).toFormat()}
+          title={t("jobs.labels.sale_additional")}
+        />
        <Statistic
          value={Dinero(summaryData.totalSales).toFormat()}
          title={t("jobs.labels.total_sales")}
@@ -28,6 +36,14 @@ export default function JobCostingStatistics({ summaryData }) {
          value={Dinero(summaryData.totalPartsCost).toFormat()}
          title={t("jobs.labels.cost_parts")}
        />
+        <Statistic
+          value={Dinero(summaryData.totalSubletCost).toFormat()}
+          title={t("jobs.labels.cost_sublet")}
+        />
+        <Statistic
+          value={Dinero(summaryData.totalAdditionalCost).toFormat()}
+          title={t("jobs.labels.cost_Additional")}
+        />
        <Statistic
          value={Dinero(summaryData.totalCost).toFormat()}
          title={t("jobs.labels.total_cost")}
--- a/client/src/components/job-detail-cards/job-detail-cards.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.component.jsx
@@ -6,8 +6,10 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import { QUERY_JOB_CARD_DETAILS } from "../../graphql/jobs.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import JobSyncButton from "../job-sync-button/job-sync-button.component";
 import JobsDetailHeader from "../jobs-detail-header/jobs-detail-header.component";
@@ -20,6 +22,10 @@ import JobDetailCardsNotesComponent from "./job-detail-cards.notes.component";
 import JobDetailCardsPartsComponent from "./job-detail-cards.parts.component";
 import JobDetailCardsTotalsComponent from "./job-detail-cards.totals.component";

+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
 const mapDispatchToProps = (dispatch) => ({
  setPrintCenterContext: (context) =>
    dispatch(setModalContext({ context: context, modal: "printCenter" })),
@@ -31,7 +37,7 @@ const span = {
  lg: { span: 8 },
 };

-export function JobDetailCards({ setPrintCenterContext }) {
+export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
    .filter((screen) => !!screen[1])
    .slice(-1)[0];
@@ -143,12 +149,14 @@ export function JobDetailCards({ setPrintCenterContext }) {
                data={data ? data.jobs_by_pk : null}
              />
            </Col>
-            <Col {...span}>
-              <JobDetailCardsDocumentsComponent
-                loading={loading}
-                data={data ? data.jobs_by_pk : null}
-              />
-            </Col>
+            {!bodyshop.uselocalmediaserver && (
+              <Col {...span}>
+                <JobDetailCardsDocumentsComponent
+                  loading={loading}
+                  data={data ? data.jobs_by_pk : null}
+                />
+              </Col>
+            )}
            <Col {...span}>
              <JobDetailCardsDamageComponent
                loading={loading}
@@ -161,4 +169,4 @@ export function JobDetailCards({ setPrintCenterContext }) {
    </Drawer>
  );
 }
-export default connect(null, mapDispatchToProps)(JobDetailCards);
+export default connect(mapStateToProps, mapDispatchToProps)(JobDetailCards);
--- a/client/src/components/job-detail-lines/job-lines-expander.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines-expander.component.jsx
@@ -0,0 +1,54 @@
+import { useQuery } from "@apollo/client";
+import { Row, Col, Timeline, Typography, Space, Divider, Skeleton } from "antd";
+import React from "react";
+import { GET_JOB_LINE_ORDERS } from "../../graphql/jobs.queries";
+import { useTranslation } from "react-i18next";
+import AlertComponent from "../alert/alert.component";
+import { DateFormatter } from "../../utils/DateFormatter";
+import { Link } from "react-router-dom";
+
+export default function JobLinesExpander({ jobline, jobid }) {
+  const { t } = useTranslation();
+  const { loading, error, data } = useQuery(GET_JOB_LINE_ORDERS, {
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+    variables: {
+      joblineid: jobline.id,
+    },
+  });
+
+  if (loading) return <Skeleton />;
+  if (error) return <AlertComponent message={error.message} type="error" />;
+
+  return (
+    <Row>
+      <Col md={24} lg={12}>
+        <Typography.Title level={4}>
+          {t("parts_orders.labels.parts_orders")}
+        </Typography.Title>
+        <Timeline>
+          {data.parts_order_lines.length > 0 ? (
+            data.parts_order_lines.map((line) => (
+              <Timeline.Item key={line.id}>
+                <Space split={<Divider type="vertical" />} wrap>
+                  <Link
+                    to={`/manage/jobs/${jobid}?partsorderid=${line.parts_order.id}`}
+                  >
+                    {line.parts_order.order_number}
+                  </Link>
+                  <DateFormatter>{line.parts_order.order_date}</DateFormatter>
+                  {line.parts_order.vendor.name}
+                </Space>
+              </Timeline.Item>
+            ))
+          ) : (
+            <Timeline.Item>
+              {t("parts_orders.labels.notyetordered")}
+            </Timeline.Item>
+          )}
+        </Timeline>
+      </Col>
+      <Col md={24} lg={12}></Col>
+    </Row>
+  );
+}
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -4,6 +4,9 @@ import {
  SyncOutlined,
  WarningFilled,
  EditFilled,
+  PlusCircleTwoTone,
+  MinusCircleTwoTone,
+  HomeOutlined,
 } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
 import {
@@ -38,9 +41,12 @@ import JobLinesBillRefernece from "../job-lines-bill-reference/job-lines-bill-re
 import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
 import _ from "lodash";
 import JobCreateIOU from "../job-create-iou/job-create-iou.component";
+import JobLinesExpander from "./job-lines-expander.component";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import moment from "moment";

 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
  jobRO: selectJobReadOnly,
  technician: selectTechnician,
 });
@@ -50,9 +56,12 @@ const mapDispatchToProps = (dispatch) => ({
    dispatch(setModalContext({ context: context, modal: "jobLineEdit" })),
  setPartsOrderContext: (context) =>
    dispatch(setModalContext({ context: context, modal: "partsOrder" })),
+  setBillEnterContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "billEnter" })),
 });

 export function JobLinesComponent({
+  bodyshop,
  jobRO,
  technician,
  setPartsOrderContext,
@@ -63,6 +72,7 @@ export function JobLinesComponent({
  job,
  setJobLineEditContext,
  form,
+  setBillEnterContext,
 }) {
  const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);

@@ -72,6 +82,9 @@ export function JobLinesComponent({
    filteredInfo: {},
  });
  const { t } = useTranslation();
+  const jobIsPrivate = bodyshop.md_ins_cos.find(
+    (c) => c.name === job.ins_co_nm
+  )?.private;

  const columns = [
    {
@@ -283,7 +296,7 @@ export function JobLinesComponent({
      key: "actions",
      render: (text, record) => (
        <div>
-          {record.manual_line && (
+          {(record.manual_line || jobIsPrivate) && (
            <Space>
              <Button
                disabled={jobRO}
@@ -378,6 +391,62 @@ export function JobLinesComponent({
                </Space>
              </Tag>
            )}
+            <Button
+              disabled={
+                (job && !job.converted) ||
+                (selectedLines.length > 0 ? false : true) ||
+                jobRO ||
+                technician
+              }
+              onClick={() => {
+                // setPartsOrderContext({
+                //   actions: { refetch: refetch },
+                //   context: {
+                //     jobId: job.id,
+                //     job: job,
+                //     linesToOrder: selectedLines,
+                //   },
+                // });
+
+                setBillEnterContext({
+                  actions: { refetch: refetch },
+                  context: {
+                    disableInvNumber: true,
+                    job: { id: job.id },
+                    bill: {
+                      vendorid: bodyshop.inhousevendorid,
+                      invoice_number: "ih",
+                      isinhouse: true,
+                      date: new moment(),
+                      total: 0,
+                      billlines: selectedLines.map((p) => {
+                        return {
+                          joblineid: p.id,
+                          actual_price: p.act_price,
+                          actual_cost: 0, //p.act_price,
+                          line_desc: p.line_desc,
+                          line_remarks: p.line_remarks,
+                          part_type: p.part_type,
+                          quantity: p.quantity || 1,
+                          applicable_taxes: {
+                            local: false,
+                            state: false,
+                            federal: false,
+                          },
+                        };
+                      }),
+                    },
+                  },
+                });
+
+                //Clear out the selected lines. IO-785
+                setSelectedLines([]);
+              }}
+            >
+              <HomeOutlined />
+              {t("parts.actions.orderinhouse")}
+              {selectedLines.length > 0 && ` (${selectedLines.length})`}
+            </Button>
            <Button
              disabled={
                (job && !job.converted) ||
@@ -449,6 +518,19 @@ export function JobLinesComponent({
        scroll={{
          x: true,
        }}
+        expandable={{
+          expandedRowRender: (record) => (
+            <JobLinesExpander jobline={record} jobid={job.id} />
+          ),
+          rowExpandable: (record) => true,
+          //expandRowByClick: true,
+          expandIcon: ({ expanded, onExpand, record }) =>
+            expanded ? (
+              <MinusCircleTwoTone onClick={(e) => onExpand(record, e)} />
+            ) : (
+              <PlusCircleTwoTone onClick={(e) => onExpand(record, e)} />
+            ),
+        }}
        onRow={(record, rowIndex) => {
          return {
            onDoubleClick: (event) => {
@@ -462,7 +544,7 @@ export function JobLinesComponent({
          };
        }}
        rowSelection={{
-          selectedRowKeys: selectedLines.map((item) => item.id),
+          selectedRowKeys: selectedLines.map((item) => item && item.id),
          onSelectAll: (selected, selectedRows, changeRows) => {
            setSelectedLines(selectedRows);
          },
--- a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
+++ b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
@@ -55,15 +55,17 @@ export function JobEmployeeAssignments({
            0
          }
        >
-          {bodyshop.employees.map((emp) => (
-            <Select.Option
-              value={emp.id}
-              key={emp.id}
-              name={`${emp.first_name} ${emp.last_name}`}
-            >
-              {`${emp.first_name} ${emp.last_name}`}
-            </Select.Option>
-          ))}
+          {bodyshop.employees
+            .filter((emp) => emp.active)
+            .map((emp) => (
+              <Select.Option
+                value={emp.id}
+                key={emp.id}
+                name={`${emp.first_name} ${emp.last_name}`}
+              >
+                {`${emp.first_name} ${emp.last_name}`}
+              </Select.Option>
+            ))}
        </Select>
      </Col>
      <Col span={24}>
--- a/client/src/components/job-lines-bill-reference/job-lines-bill-reference.component.jsx
+++ b/client/src/components/job-lines-bill-reference/job-lines-bill-reference.component.jsx
@@ -10,7 +10,7 @@ export default function JobLinesBillRefernece({ jobline }) {
      {subletRequired && <WarningFilled />}
      {`${(billLine.actual_price * billLine.quantity).toFixed(2)} (${
        billLine.bill.vendor.name
-      })`}
+      } #${billLine.bill.invoice_number})`}
    </div>
  );
 }
--- a/client/src/components/job-lines-preset-button/job-lines-preset-button.component.jsx
+++ b/client/src/components/job-lines-preset-button/job-lines-preset-button.component.jsx
@@ -24,7 +24,7 @@ export function JoblinePresetButton({ bodyshop, form }) {
  const menu = (
    <Menu>
      {bodyshop.md_jobline_presets.map((i, idx) => (
-        <Menu.Item onClick={() => handleSelect(i)} onItemHover key={idx}>
+        <Menu.Item onClick={() => handleSelect(i)} key={idx}>
          {i.label}
        </Menu.Item>
      ))}
--- a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
+++ b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
@@ -141,7 +141,9 @@ export function JobLinesUpsertModalComponent({
            rules={[
              ({ getFieldValue }) => ({
                validator(rule, value) {
-                  if (!!getFieldValue("mod_lbr_ty") === !!value) {
+                  if (
+                    !!getFieldValue("mod_lbr_ty") === (!!value || value === 0)
+                  ) {
                    return Promise.resolve();
                  }
                  return Promise.reject(
@@ -216,6 +218,7 @@ export function JobLinesUpsertModalComponent({
            rules={[
              ({ getFieldValue }) => ({
                validator(rule, value) {
+                  console.log(value);
                  if (!value || getFieldValue("part_type") !== "PAE") {
                    return Promise.resolve();
                  }
@@ -226,7 +229,10 @@ export function JobLinesUpsertModalComponent({
              }),
              ({ getFieldValue }) => ({
                validator(rule, value) {
-                  if (!!getFieldValue("part_type") === !!value) {
+                  console.log(value, !!value);
+                  if (
+                    !!getFieldValue("part_type") === (!!value || value === 0)
+                  ) {
                    return Promise.resolve();
                  }
                  return Promise.reject(
--- a/client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx
+++ b/client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx
@@ -0,0 +1,80 @@
+import React, { useMemo } from "react";
+import { Row, Col, Tag, Tooltip } from "antd";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount);
+
+export function JobPartsQueueCount({ bodyshop, parts }) {
+  const partsStatus = useMemo(() => {
+    if (!parts) return null;
+    return parts.reduce(
+      (acc, val) => {
+        if (val.part_type === "PAS" || val.part_type === "PASL") return acc;
+        acc.total = acc.total + val.count;
+        acc[val.status] = acc[val.status] + val.count;
+
+        return acc;
+      },
+      {
+        total: 0,
+        null: 0,
+        [bodyshop.md_order_statuses.default_bo]: 0,
+        [bodyshop.md_order_statuses.default_ordered]: 0,
+        [bodyshop.md_order_statuses.default_received]: 0,
+        [bodyshop.md_order_statuses.default_returned]: 0,
+      }
+    );
+  }, [bodyshop, parts]);
+
+  if (!parts) return null;
+
+  return (
+    <Row>
+      <Col span={4}>
+        <Tooltip title="Total">
+          <Tag>{partsStatus.total}</Tag>
+        </Tooltip>
+      </Col>
+      <Col span={4}>
+        <Tooltip title="No Status">
+          <Tag color="gold">{partsStatus["null"]}</Tag>
+        </Tooltip>
+      </Col>
+      <Col span={4}>
+        <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
+          <Tag color="blue">
+            {partsStatus[bodyshop.md_order_statuses.default_ordered]}
+          </Tag>
+        </Tooltip>
+      </Col>
+      <Col span={4}>
+        <Tooltip title={bodyshop.md_order_statuses.default_received}>
+          <Tag color="green">
+            {partsStatus[bodyshop.md_order_statuses.default_received]}
+          </Tag>
+        </Tooltip>
+      </Col>
+      <Col span={4}>
+        <Tooltip title={bodyshop.md_order_statuses.default_returned}>
+          <Tag color="orange">
+            {partsStatus[bodyshop.md_order_statuses.default_returned]}
+          </Tag>
+        </Tooltip>
+      </Col>
+      <Col span={4}>
+        <Tooltip title={bodyshop.md_order_statuses.default_bo}>
+          <Tag color="red">
+            {partsStatus[bodyshop.md_order_statuses.default_bo]}
+          </Tag>
+        </Tooltip>
+      </Col>
+    </Row>
+  );
+}
--- a/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx
+++ b/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx
@@ -22,7 +22,7 @@ export default function JobReconciliationBillsTable({
      dataIndex: "line_desc",
      key: "line_desc",
      ellipsis: true,
-      minWidth: "65rem",
+      width: "10rem",
      sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
      sortOrder:
        state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
@@ -72,11 +72,11 @@ export default function JobReconciliationBillsTable({
        state.sortedInfo.columnKey === "quantity" && state.sortedInfo.order,
    },
    {
-      title: t("bills.fields.is_credit_memo"),
+      title: t("bills.fields.is_credit_memo_short"),
      dataIndex: "is_credit_memo",
      key: "is_credit_memo",
      sorter: (a, b) => a.bill.is_credit_memo - b.bill.is_credit_memo,
-      width: "8rem",
+      width: "3rem",
      sortOrder:
        state.sortedInfo.columnKey === "is_credit_memo" &&
        state.sortedInfo.order,
--- a/client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx
+++ b/client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx
@@ -18,7 +18,11 @@ export default function JobReconciliationModalComponent({ job, bills }) {
      .flat() || [];

  const jobLineData = job.joblines.filter(
-    (j) => j.part_type !== null && j.part_type !== "PAE"
+    (j) =>
+      (j.part_type !== null && j.part_type !== "PAE") ||
+      (j.line_desc &&
+        j.line_desc.toLowerCase().includes("towing") &&
+        j.lbr_op === "OP13")
  );

  return (
--- a/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx
+++ b/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx
@@ -1,24 +1,23 @@
-import { Button, notification } from "antd";
-import React, { useState } from "react";
 import { useMutation } from "@apollo/client";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { Checkbox, notification, Space, Spin } from "antd";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";

-export default function JobRemoveFromPartsQueue({ jobId, refetch }) {
+export default function JobRemoveFromPartsQueue({ checked, jobId }) {
  const [updateJob] = useMutation(UPDATE_JOB);
  const { t } = useTranslation();

  const [loading, setLoading] = useState(false);

-  const handleClick = async (e) => {
+  const handleChange = async (e) => {
    setLoading(true);
    const result = await updateJob({
-      variables: { jobId: jobId, job: { queued_for_parts: false } },
+      variables: { jobId: jobId, job: { queued_for_parts: e.target.checked } },
    });

    if (!!!result.errors) {
      notification["success"]({ message: t("jobs.successes.save") });
-      if (refetch) refetch();
    } else {
      notification["error"]({
        message: t("jobs.errors.saving", {
@@ -30,8 +29,9 @@ export default function JobRemoveFromPartsQueue({ jobId, refetch }) {
  };

  return (
-    <Button onClick={handleClick} loading={loading}>
-      {t("general.actions.remove")}
-    </Button>
+    <Space>
+      <Checkbox checked={checked} onChange={handleChange} />
+      {loading && <Spin size="small" />}
+    </Space>
  );
 }
--- a/client/src/components/job-search-select/job-search-select.component.jsx
+++ b/client/src/components/job-search-select/job-search-select.component.jsx
@@ -9,6 +9,7 @@ import {
  SEARCH_JOBS_FOR_AUTOCOMPLETE,
 } from "../../graphql/jobs.queries";
 import AlertComponent from "../alert/alert.component";
+import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 const { Option } = Select;

 const JobSearchSelect = (
@@ -86,11 +87,9 @@ const JobSearchSelect = (
                  <span>
                    {`${clm_no && o.clm_no ? `${o.clm_no} | ` : ""}${
                      o.ro_number || t("general.labels.na")
-                    } | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
-                      o.ownr_co_nm ? ` ${o.ownr_co_num}` : ""
-                    }| ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${
-                      o.v_model_desc || ""
-                    }`}
+                    } | ${OwnerNameDisplayFunction(o)} | ${
+                      o.v_model_yr || ""
+                    } ${o.v_make_desc || ""} ${o.v_model_desc || ""}`}
                  </span>
                  <Tag>
                    <strong>{o.status}</strong>
--- a/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
@@ -1,4 +1,4 @@
-import { Table } from "antd";
+import { Space, Table } from "antd";
 import Dinero from "dinero.js";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -119,7 +119,18 @@ export default function JobTotalsTableLabor({ job }) {
            </Table.Summary.Cell>
          </Table.Summary.Row>
          <Table.Summary.Row>
-            <Table.Summary.Cell>{t("jobs.labels.mapa")}</Table.Summary.Cell>
+            <Table.Summary.Cell>
+              <Space>
+                {t("jobs.labels.mapa")}
+                {job.materials &&
+                  job.materials.mapa &&
+                  job.materials.mapa.cal_maxdlr &&
+                  job.materials.mapa.cal_maxdlr > 0 &&
+                  t("jobs.labels.threshhold", {
+                    amount: job.materials.mapa.cal_maxdlr,
+                  })}
+              </Space>
+            </Table.Summary.Cell>
            <Table.Summary.Cell align="right">
              <CurrencyFormatter>
                {job.job_totals.rates.mapa.rate}
@@ -133,7 +144,18 @@ export default function JobTotalsTableLabor({ job }) {
            </Table.Summary.Cell>
          </Table.Summary.Row>
          <Table.Summary.Row>
-            <Table.Summary.Cell>{t("jobs.labels.mash")}</Table.Summary.Cell>
+            <Table.Summary.Cell>
+              <Space wrap>
+                {t("jobs.labels.mash")}
+                {job.materials &&
+                  job.materials.mash &&
+                  job.materials.mash.cal_maxdlr &&
+                  job.materials.mash.cal_maxdlr > 0 &&
+                  t("jobs.labels.threshhold", {
+                    amount: job.materials.mash.cal_maxdlr,
+                  })}
+              </Space>
+            </Table.Summary.Cell>
            <Table.Summary.Cell align="right">
              <CurrencyFormatter>
                {job.job_totals.rates.mash.rate}
--- a/client/src/components/job-totals-table/job-totals.table.other.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.other.component.jsx
@@ -33,10 +33,10 @@ export default function JobTotalsTableOther({ job }) {
        key: t("jobs.fields.storage_payable"),
        total: job.job_totals.additional.storage,
      },
-      {
-        key: t("jobs.fields.ca_bc_pvrt"),
-        total: job.job_totals.additional.pvrt,
-      },
+      // {
+      //   key: t("jobs.fields.ca_bc_pvrt"),
+      //   total: job.job_totals.additional.pvrt,
+      // },
    ];
  }, [job.job_totals, t]);

--- a/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
@@ -3,7 +3,22 @@ import Dinero from "dinero.js";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";

-export default function JobTotalsTableTotals({ job }) {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobTotalsTableTotals);
+
+export function JobTotalsTableTotals({ bodyshop, job }) {
  const { t } = useTranslation();

  const data = useMemo(() => {
@@ -21,6 +36,14 @@ export default function JobTotalsTableTotals({ job }) {
        key: t("jobs.labels.state_tax_amt"),
        total: job.job_totals.totals.state_tax,
      },
+      ...(bodyshop.region_config === "CA_BC"
+        ? [
+            {
+              key: t("jobs.fields.ca_bc_pvrt"),
+              total: job.job_totals.additional.pvrt,
+            },
+          ]
+        : []),
      {
        key: t("jobs.labels.federal_tax_amt"),
        total: job.job_totals.totals.federal_tax,
@@ -58,7 +81,7 @@ export default function JobTotalsTableTotals({ job }) {
        bold: true,
      },
    ];
-  }, [job.job_totals, t]);
+  }, [job.job_totals, t, bodyshop.region_config]);

  const columns = [
    {
--- a/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx
+++ b/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx
@@ -6,17 +6,20 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminStatus);

-export function JobsAdminStatus({ bodyshop, job }) {
+export function JobsAdminStatus({ insertAuditTrail, bodyshop, job }) {
  const { t } = useTranslation();

  const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
@@ -26,6 +29,10 @@ export function JobsAdminStatus({ bodyshop, job }) {
    })
      .then((r) => {
        notification["success"]({ message: t("jobs.successes.save") });
+        insertAuditTrail({
+          jobid: job.id,
+          operation: AuditTrailMapping.admin_jobstatuschange(status),
+        });
        // refetch();
      })
      .catch((error) => {
--- a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
+++ b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
@@ -1,12 +1,33 @@
 import { useMutation } from "@apollo/client";
-import { Button, Form, notification, DatePicker } from "antd";
+import { Button, Form, notification } from "antd";
 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";
-export default function JobsAdminDatesChange({ job }) {
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsAdminDatesChange);
+
+export function JobsAdminDatesChange({ insertAuditTrail, job }) {
  const { t } = useTranslation();
  const [loading, setLoading] = useState(false);
  const [form] = Form.useForm();
@@ -18,6 +39,23 @@ export default function JobsAdminDatesChange({ job }) {
      variables: { jobId: job.id, job: values },
    });

+    const changedAuditFields = form.getFieldsValue(
+      true,
+      (meta) => meta && meta.touched
+    );
+
+    Object.keys(changedAuditFields).forEach((key) => {
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.admin_jobfieldchange(
+          key,
+          changedAuditFields[key] instanceof moment
+            ? moment(changedAuditFields[key]).format("MM/DD/YYYY hh:mm a")
+            : changedAuditFields[key]
+        ),
+      });
+    });
+
    if (!!!result.errors) {
      notification["success"]({ message: t("jobs.successes.save") });
    } else {
@@ -54,7 +92,16 @@ export default function JobsAdminDatesChange({ job }) {
            label={t("jobs.fields.date_estimated")}
            name="date_estimated"
          >
-            <DatePicker format="MM/DD/YYYY" />
+            <FormDatePicker format="MM/DD/YYYY" />
+          </Form.Item>
+          <Form.Item label={t("jobs.fields.date_towin")} name="date_towin">
+            <DateTimePicker />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.date_rentalresp")}
+            name="date_rentalresp"
+          >
+            <DateTimePicker />
          </Form.Item>
          <Form.Item label={t("jobs.fields.date_open")} name="date_open">
            <DateTimePicker />
--- a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
+++ b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
@@ -8,18 +8,21 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import moment from "moment";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export default connect(
  mapStateToProps,
  mapDispatchToProps
 )(JobAdminMarkReexport);

-export function JobAdminMarkReexport({ bodyshop, job }) {
+export function JobAdminMarkReexport({ insertAuditTrail, bodyshop, job }) {
  const { t } = useTranslation();
  const [loading, setLoading] = useState(false);
  const [markJobForReexport] = useMutation(gql`
@@ -78,6 +81,10 @@ export function JobAdminMarkReexport({ bodyshop, job }) {

    if (!result.errors) {
      notification["success"]({ message: t("jobs.successes.save") });
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.admin_jobmarkforreexport(),
+      });
    } else {
      notification["error"]({
        message: t("jobs.errors.saving", {
@@ -96,6 +103,10 @@ export function JobAdminMarkReexport({ bodyshop, job }) {

    if (!result.errors) {
      notification["success"]({ message: t("jobs.successes.save") });
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.admin_jobmarkexported(),
+      });
    } else {
      notification["error"]({
        message: t("jobs.errors.saving", {
--- a/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx
+++ b/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx
@@ -4,21 +4,29 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminUnvoid);

-export function JobsAdminUnvoid({ bodyshop, job, currentUser }) {
+export function JobsAdminUnvoid({
+  insertAuditTrail,
+  bodyshop,
+  job,
+  currentUser,
+}) {
  const { t } = useTranslation();
  const [loading, setLoading] = useState(false);
  const [updateJob] = useMutation(gql`
@@ -84,6 +92,11 @@ mutation UNVOID_JOB($jobId: uuid!) {

    if (!result.errors) {
      notification["success"]({ message: t("jobs.successes.save") });
+
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.admin_unvoicejob(),
+      });
    } else {
      notification["error"]({
        message: t("jobs.errors.saving", {
--- a/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
+++ b/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
@@ -37,7 +37,6 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
  });

  //Wahtever is left in the existing lines, are lines that should be removed.
-
  const insertQueries = linesToInsert.reduce((acc, value, idx) => {
    return acc + generateInsertQuery(value, idx, jobId);
  }, "");
@@ -49,6 +48,13 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
  const removeQueries = existingLines.reduce((acc, value, idx) => {
    return acc + generateRemoveQuery(value, idx);
  }, "");
+  console.log(insertQueries, updateQueries, removeQueries);
+
+  if ((insertQueries + updateQueries + removeQueries).trim() === "") {
+    return new Promise((resolve, reject) => {
+      resolve(null);
+    });
+  }

  return new Promise((resolve, reject) => {
    resolve(gql`
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -220,12 +220,13 @@ export function JobsAvailableContainer({
      );

      delete supp.joblines;
-      await client.mutate({
-        mutation: gql`
-          ${suppDelta}
-        `,
-      });
-
+      if (suppDelta !== null) {
+        await client.mutate({
+          mutation: gql`
+            ${suppDelta}
+          `,
+        });
+      }
      const updateResult = await updateJob({
        variables: {
          jobId: selectedJob,
--- a/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
+++ b/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
@@ -15,7 +15,6 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { useHistory } from "react-router-dom";

-
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser,
@@ -27,6 +26,7 @@ export function JobsCloseExportButton({
  jobId,
  disabled,
  setSelectedJobs,
+  refetch,
 }) {
  const history = useHistory();
  const { t } = useTranslation();
@@ -46,13 +46,10 @@ export function JobsCloseExportButton({
    //Check if it's a QBO Setup.
    let PartnerResponse;
    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
-      PartnerResponse = await axios.post(
-        `/qbo/receivables`,
-        {
-          jobIds: [jobId],
-        },
-        
-      );
+      PartnerResponse = await axios.post(`/qbo/receivables`, {
+        jobIds: [jobId],
+        elgen: true,
+      });
    } else {
      //Default is QBD

@@ -117,58 +114,64 @@ export function JobsCloseExportButton({
        });
      });

-      await insertExportLog({
-        variables: {
-          logs: [
-            {
-              bodyshopid: bodyshop.id,
-              jobid: jobId,
-              successful: false,
-              message: JSON.stringify(
-                failedTransactions.map((ft) => ft.errorMessage)
-              ),
-              useremail: currentUser.email,
-            },
-          ],
-        },
-      });
+      if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
+        //QBO Logs are handled server side.
+        await insertExportLog({
+          variables: {
+            logs: [
+              {
+                bodyshopid: bodyshop.id,
+                jobid: jobId,
+                successful: false,
+                message: JSON.stringify(
+                  failedTransactions.map((ft) => ft.errorMessage)
+                ),
+                useremail: currentUser.email,
+              },
+            ],
+          },
+        });
+      }
    } else {
      //Insert success export log.
-      await insertExportLog({
-        variables: {
-          logs: [
-            {
-              bodyshopid: bodyshop.id,
-              jobid: jobId,
-              successful: true,
-              useremail: currentUser.email,
-            },
-          ],
-        },
-      });
-
-      const jobUpdateResponse = await updateJob({
-        variables: {
-          jobId: jobId,
-          job: {
-            status: bodyshop.md_ro_statuses.default_exported || "Exported*",
-            date_exported: new Date(),
+      if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
+        //QBO Logs are handled server side.
+        await insertExportLog({
+          variables: {
+            logs: [
+              {
+                bodyshopid: bodyshop.id,
+                jobid: jobId,
+                successful: true,
+                useremail: currentUser.email,
+              },
+            ],
          },
-        },
-      });
+        });

-      if (!jobUpdateResponse.errors) {
-        notification.open({
-          type: "success",
-          key: "jobsuccessexport",
-          message: t("jobs.successes.exported"),
-        });
-      } else {
-        notification["error"]({
-          message: t("jobs.errors.exporting", {
-            error: JSON.stringify(jobUpdateResponse.error),
-          }),
+        const jobUpdateResponse = await updateJob({
+          variables: {
+            jobId: jobId,
+            job: {
+              status: bodyshop.md_ro_statuses.default_exported || "Exported*",
+              date_exported: new Date(),
+            },
+          },
        });
+
+        if (!jobUpdateResponse.errors) {
+          notification.open({
+            type: "success",
+            key: "jobsuccessexport",
+            message: t("jobs.successes.exported"),
+          });
+        } else {
+          notification["error"]({
+            message: t("jobs.errors.exporting", {
+              error: JSON.stringify(jobUpdateResponse.error),
+            }),
+          });
+        }
      }
      if (setSelectedJobs) {
        setSelectedJobs((selectedJobs) => {
@@ -176,7 +179,7 @@ export function JobsCloseExportButton({
        });
      }
    }
-
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
    setLoading(false);
  };

--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -18,7 +18,7 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
-
+import axios from "axios";
 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
  bodyshop: selectBodyshop,
@@ -53,6 +53,12 @@ export function JobsConvertButton({
      variables: { jobId: job.id, ...values },
    });

+    if (values.ca_gst_registrant) {
+      await axios.post("/job/totalsssu", {
+        id: job.id,
+      });
+    }
+
    if (!res.errors) {
      refetch();
      notification["success"]({
--- a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
+++ b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
@@ -146,7 +146,11 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
            </Form.Item>
          </LayoutFormRow>
        </Collapse.Panel>
-        <Collapse.Panel forceRender key="claim" header={t("menus.jobsdetail.claimdetail")}>
+        <Collapse.Panel
+          forceRender
+          key="claim"
+          header={t("menus.jobsdetail.claimdetail")}
+        >
          <LayoutFormRow>
            <Form.Item label={t("jobs.fields.loss_desc")} name="loss_desc">
              <Input />
@@ -193,7 +197,8 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
            </Form.Item>
          </LayoutFormRow>
        </Collapse.Panel>
-        <Collapse.Panel forceRender
+        <Collapse.Panel
+          forceRender
          key="financial"
          header={t("menus.jobsdetail.financials")}
        >
@@ -204,7 +209,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
              <CurrencyInput min={0} />
            </Form.Item>
            <Form.Item label={t("jobs.fields.ded_status")} name="ded_status">
-              <Select>
+              <Select allowClear>
                <Select.Option value="W">
                  {t("jobs.labels.deductible.waived")}
                </Select.Option>
--- a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
+++ b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
@@ -1,4 +1,4 @@
-import { DatePicker, Form, Statistic, Tooltip } from "antd";
+import { Form, Statistic, Tooltip } from "antd";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -34,11 +34,17 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
          label={t("jobs.fields.date_estimated")}
          name="date_estimated"
        >
-          <DatePicker disabled={jobRO} format="MM/DD/YYYY" />
+          <FormDatePicker disabled={jobRO} />
        </Form.Item>
        <Form.Item label={t("jobs.fields.date_open")} name="date_open">
          <DateTimePicker disabled={jobRO} />
        </Form.Item>
+        <Form.Item label={t("jobs.fields.date_towin")} name="date_towin">
+          <DateTimePicker disabled={jobRO} />
+        </Form.Item>
+        <Form.Item label={t("jobs.fields.date_rentalresp")} name="date_rentalresp">
+          <DateTimePicker disabled={jobRO} />
+        </Form.Item>
      </FormRow>

      <FormRow header={t("jobs.forms.scheddates")}>
--- a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
+++ b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
@@ -1,6 +1,5 @@
 import {
  Col,
-  Divider,
  Form,
  Input,
  InputNumber,
@@ -23,8 +22,8 @@ import FormItemPhone, {
 } from "../form-items-formatted/phone-form-item.component";
 import Car from "../job-damage-visual/job-damage-visual.component";
 import JobsDetailChangeEstimator from "../jobs-detail-change-estimator/jobs-detail-change-estimator.component";
-import FormRow from "../layout-form-row/layout-form-row.component";
 import JobsDetailChangeFileHandler from "../jobs-detail-change-filehandler/jobs-detail-change-filehandler.component";
+import FormRow from "../layout-form-row/layout-form-row.component";
 const mapStateToProps = createStructuredSelector({
  jobRO: selectJobReadOnly,
  bodyshop: selectBodyshop,
@@ -220,15 +219,8 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
          )}
        </Col>
      </Row>
-      <Divider
-        orientation="left"
-        type="horizontal"
-        style={{ marginTop: ".8rem", float: "right" }}
-      >
-        {t("jobs.forms.appraiserinfo")}
-      </Divider>

-      <FormRow noDivider>
+      <FormRow header={t("jobs.forms.appraiserinfo")}>
        <Form.Item label={t("jobs.fields.est_co_nm")} name="est_co_nm">
          <Input disabled={jobRO} />
        </Form.Item>
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -7,6 +7,7 @@ import { connect } from "react-redux";
 import { Link, useHistory } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { CANCEL_APPOINTMENTS_BY_JOB_ID } from "../../graphql/appointments.queries";
 import { DELETE_JOB, UPDATE_JOB, VOID_JOB } from "../../graphql/jobs.queries";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
@@ -56,6 +57,7 @@ export function JobsDetailHeaderActions({
  const [deleteJob] = useMutation(DELETE_JOB);
  const [updateJob] = useMutation(UPDATE_JOB);
  const [voidJob] = useMutation(VOID_JOB);
+  const [cancelAllAppointments] = useMutation(CANCEL_APPOINTMENTS_BY_JOB_ID);
  const jobInProduction = useMemo(() => {
    return bodyshop.md_ro_statuses.production_statuses.includes(job.status);
  }, [job, bodyshop.md_ro_statuses.production_statuses]);
@@ -89,6 +91,19 @@ export function JobsDetailHeaderActions({
    });
  };

+  const handleSuspend = (e) => {
+    logImEXEvent("production_toggle_alert");
+    //e.stopPropagation();
+    updateJob({
+      variables: {
+        jobId: job.id,
+        job: {
+          suspended: !job.suspended,
+        },
+      },
+    });
+  };
+
  const statusmenu = (
    <Menu key="popovermenu">
      <Menu.Item
@@ -108,6 +123,39 @@ export function JobsDetailHeaderActions({
      >
        {t("jobs.actions.schedule")}
      </Menu.Item>
+      <Menu.Item
+        disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
+      >
+        <Popconfirm
+          title={t("general.labels.areyousure")}
+          okText="Yes"
+          cancelText="No"
+          onClick={(e) => e.stopPropagation()}
+          disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
+          onConfirm={async () => {
+            const jobUpdate = await cancelAllAppointments({
+              variables: {
+                jobid: job.id,
+                job: {
+                  date_scheduled: null,
+                  scheduled_in: null,
+                  scheduled_completion: null,
+                  status: bodyshop.md_ro_statuses.default_imported,
+                },
+              },
+            });
+            if (!jobUpdate.errors) {
+              notification["success"]({
+                message: t("appointments.successes.canceled"),
+              });
+              return;
+            }
+          }}
+          getPopupContainer={(trigger) => trigger.parentNode}
+        >
+          {t("menus.jobsactions.cancelallappointments")}
+        </Popconfirm>
+      </Menu.Item>
      <Menu.Item
        disabled={
          !!job.intakechecklist ||
@@ -199,7 +247,11 @@ export function JobsDetailHeaderActions({
          {t("jobs.actions.addtoproduction")}
        </Menu.Item>
      )}
-
+      <Menu.Item key="togglesuspend" onClick={handleSuspend}>
+        {job.suspended
+          ? t("production.actions.unsuspend")
+          : t("production.actions.suspend")}
+      </Menu.Item>
      <Menu.Item key="toggleAlert" onClick={handleAlertToggle}>
        {job.production_vars && job.production_vars.alert
          ? t("production.labels.alertoff")
@@ -384,6 +436,9 @@ export function JobsDetailHeaderActions({
                  job: {
                    status: bodyshop.md_ro_statuses.default_void,
                    voided: true,
+                    scheduled_in: null,
+                    scheduled_completion: null,
+                    inproduction: false,
                  },
                  note: [
                    {
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -1,5 +1,9 @@
 import { Card, Col, Row, Space, Tag } from "antd";
-import { WarningFilled, ExclamationCircleFilled } from "@ant-design/icons";
+import {
+  WarningFilled,
+  ExclamationCircleFilled,
+  PauseCircleOutlined,
+} from "@ant-design/icons";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -17,6 +21,8 @@ import ProductionListColumnProductionNote from "../production-list-columns/produ
 import "./jobs-detail-header.styles.scss";
 import JobsRelatedRos from "../jobs-related-ros/jobs-related-ros.component";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
+import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
+import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";

 const mapStateToProps = createStructuredSelector({
  jobRO: selectJobReadOnly,
@@ -55,6 +61,12 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
    );
  }, [job.status, bodyshop.md_ro_statuses.post_production_statuses]);

+  const vehicleTitle = `${job.v_model_yr || ""} ${job.v_color || ""}
+  ${job.v_make_desc || ""} 
+  ${job.v_model_desc || ""}`.trim();
+
+  const ownerTitle = OwnerNameDisplayFunction(job).trim();
+
  return (
    <Row gutter={[16, 16]} style={{ alignItems: "stretch" }}>
      <Col {...colSpan}>
@@ -68,6 +80,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                    {t("jobs.labels.inproduction")}
                  </Tag>
                )}
+                {job.suspended && (
+                  <PauseCircleOutlined style={{ color: "orangered" }} />
+                )}
                {job.production_vars && job.production_vars.alert ? (
                  <ExclamationCircleFilled className="production-alert" />
                ) : null}
@@ -79,6 +94,12 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                ) : null}
              </Space>
            </DataLabel>
+            <DataLabel
+              label={t("jobs.fields.comment")}
+              valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}
+            >
+              <ProductionListColumnComment record={job} />
+            </DataLabel>
            <DataLabel label={t("jobs.fields.ins_co_nm_short")}>
              {job.ins_co_nm}
            </DataLabel>
@@ -138,9 +159,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
          style={{ height: "100%" }}
          title={
            <Link to={disabled ? "#" : `/manage/owners/${job.owner.id}`}>
-              {`${job.ownr_fn || ""} ${job.ownr_ln || ""} ${
-                job.ownr_co_nm || ""
-              }`}
+              {ownerTitle.length > 0
+                ? ownerTitle
+                : t("owner.labels.noownerinfo")}
            </Link>
          }
        >
@@ -174,9 +195,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                    : job.vehicle && `/manage/vehicles/${job.vehicle.id}`
                }
              >
-                {`${job.v_model_yr || ""} ${job.v_color || ""}
-        ${job.v_make_desc || ""} 
-        ${job.v_model_desc || ""}`}
+                {vehicleTitle.length > 0
+                  ? vehicleTitle
+                  : t("vehicles.labels.novehinfo")}
              </Link>
            ) : (
              <span></span>
--- a/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
+++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
@@ -88,6 +88,33 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
          </Form.Item>
          <CABCpvrtCalculator form={form} disabled={jobRO} />
        </Space>
+        <Form.Item
+          label={t("jobs.fields.auto_add_ats")}
+          name="auto_add_ats"
+          valuePropName="checked"
+        >
+          <Switch disabled={jobRO} />
+        </Form.Item>
+
+        <Form.Item
+          noStyle
+          shouldUpdate={(prev, cur) => prev.auto_add_ats !== cur.auto_add_ats}
+        >
+          {() => {
+            if (form.getFieldValue("auto_add_ats"))
+              return (
+                <Form.Item
+                  label={t("jobs.fields.rate_ats")}
+                  name="rate_ats"
+                  initialValue={bodyshop.shoprates.rate_atp}
+                >
+                  <CurrencyInput disabled={jobRO} />
+                </Form.Item>
+              );
+
+            return null;
+          }}
+        </Form.Item>
      </FormRow>
      <FormRow>
        <Form.Item
@@ -100,7 +127,13 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
          label={t("jobs.fields.state_tax_rate")}
          name="state_tax_rate"
        >
-          <InputNumber min={0} max={1} precision={2} disabled={jobRO} autoComplete="new-password"/>
+          <InputNumber
+            min={0}
+            max={1}
+            precision={2}
+            disabled={jobRO}
+            autoComplete="new-password"
+          />
        </Form.Item>
        <Form.Item
          label={t("jobs.fields.local_tax_rate")}
--- a/client/src/components/jobs-documents-gallery/jobs-document-gallery.download.component.jsx
+++ b/client/src/components/jobs-documents-gallery/jobs-document-gallery.download.component.jsx
@@ -5,45 +5,125 @@ import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import cleanAxios from "../../utils/CleanAxios";
 import formatBytes from "../../utils/formatbytes";
+import yauzl from "yauzl";
+import { useTreatments } from "@splitsoftware/splitio-react";

-export default function JobsDocumentsDownloadButton({
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsDocumentsDownloadButton);
+
+export function JobsDocumentsDownloadButton({
+  bodyshop,
  galleryImages,
  identifier,
 }) {
  const { t } = useTranslation();
  const [download, setDownload] = useState(null);
+  const { Direct_Media_Download } = useTreatments(
+    ["Direct_Media_Download"],
+    {},
+    bodyshop.imexshopid
+  );
  const imagesToDownload = [
    ...galleryImages.images.filter((image) => image.isSelected),
-    // ...galleryImages.other.filter((image) => image.isSelected),
+     ...galleryImages.other.filter((image) => image.isSelected),
  ];

-  const handleDownload = () => {
-    logImEXEvent("jobs_documents_download");
-    axios
-      .post("/media/download", {
-        ids: imagesToDownload.map((_) => _.key),
-      })
-      .then((r) => {
-        //     window.open(r.data);
-        downloadAs(
-          r.data,
-          `${identifier || "documents"}.zip`,
-          (progressEvent) => {
-            setDownload((currentDownloadState) => {
-              return {
-                downloaded: progressEvent.loaded || 0,
-                speed:
-                  (progressEvent.loaded || 0) -
-                  ((currentDownloadState && currentDownloadState.downloaded) ||
-                    0),
-              };
-            });
-          },
-          () => setDownload(null)
-        );
-      });
-  };
+  function downloadProgress(progressEvent) {
+    setDownload((currentDownloadState) => {
+      return {
+        downloaded: progressEvent.loaded || 0,
+        speed:
+          (progressEvent.loaded || 0) -
+          ((currentDownloadState && currentDownloadState.downloaded) || 0),
+      };
+    });
+  }

+  const handleDownload = async () => {
+    logImEXEvent("jobs_documents_download");
+
+    const zipUrl = await axios({
+      url: "/media/download",
+      method: "POST",
+      //responseType: "arraybuffer", // Important
+      data: { ids: imagesToDownload.map((_) => _.key) },
+    });
+
+    const theDownloadedZip = await cleanAxios({
+      url: zipUrl.data,
+      method: "GET",
+      responseType: "arraybuffer",
+      onDownloadProgress: downloadProgress,
+    });
+    setDownload(null);
+    if (Direct_Media_Download.treatment === "on") {
+      try {
+        const parentDir = await window.showDirectoryPicker({
+          id: "media",
+          startIn: "downloads",
+        });
+
+        const directory = await parentDir.getDirectoryHandle(identifier, {
+          create: true,
+        });
+
+        yauzl.fromBuffer(
+          Buffer.from(theDownloadedZip.data),
+          {},
+          (err, zipFile) => {
+            if (err) throw err;
+            zipFile.on("entry", (entry) => {
+              zipFile.openReadStream(entry, async (readErr, readStream) => {
+                if (readErr) {
+                  zipFile.close();
+                  throw readErr;
+                }
+                if (err) throw err;
+                let fileSystemHandle = await directory.getFileHandle(
+                  entry.fileName,
+                  {
+                    create: true,
+                  }
+                );
+                const writable = await fileSystemHandle.createWritable();
+                readStream.on("data", async function (chunk) {
+                  await writable.write(chunk);
+                });
+                readStream.on("end", async function () {
+                  await writable.close();
+                });
+              });
+            });
+          }
+        );
+      } catch (e) {
+        console.log(e);
+        standardMediaDownload(theDownloadedZip.data);
+      }
+    } else {
+      standardMediaDownload(theDownloadedZip.data);
+    }
+
+    function standardMediaDownload(bufferData) {
+      const a = document.createElement("a");
+      const url = window.URL.createObjectURL(new Blob([bufferData]));
+      a.href = url;
+      a.download = `${identifier || "documents"}.zip`;
+      a.click();
+    }
+  };
+ 
  return (
    <>
      <Button
@@ -63,25 +143,3 @@ export default function JobsDocumentsDownloadButton({
    </>
  );
 }
-
-const downloadAs = (url, name, onDownloadProgress, onCompleted) => {
-  cleanAxios
-    .get(url, {
-      headers: {
-        "Content-Type": "application/octet-stream",
-      },
-      responseType: "blob",
-      onDownloadProgress: onDownloadProgress,
-    })
-    .then((response) => {
-      onCompleted && onCompleted();
-      const a = document.createElement("a");
-      const url = window.URL.createObjectURL(response.data);
-      a.href = url;
-      a.download = name;
-      a.click();
-    })
-    .catch((err) => {
-      console.log("error", err);
-    });
-};
--- a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
+++ b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
@@ -1,5 +1,5 @@
-import { FileExcelFilled, EditFilled, SyncOutlined } from "@ant-design/icons";
-import { Card, Col, Row, Space, Button } from "antd";
+import { EditFilled, FileExcelFilled, SyncOutlined } from "@ant-design/icons";
+import { Button, Card, Col, Row, Space } from "antd";
 import React, { useEffect, useState } from "react";
 import Gallery from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
--- a/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx
+++ b/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx
@@ -0,0 +1,105 @@
+import { SyncOutlined } from "@ant-design/icons";
+import { Button, Card, Space } from "antd";
+import React, { useEffect } from "react";
+import Gallery from "react-grid-gallery";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  getBillMedia,
+  getJobMedia,
+  toggleMediaSelected,
+} from "../../redux/media/media.actions";
+import { selectAllMedia } from "../../redux/media/media.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { CreateExplorerLinkForJob } from "../../utils/localmedia";
+import DocumentsLocalUploadComponent from "../documents-local-upload/documents-local-upload.component";
+import JobsDocumentsLocalGalleryReassign from "./jobs-documents-local-gallery.reassign.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  allMedia: selectAllMedia,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  getJobMedia: (id) => dispatch(getJobMedia(id)),
+  getBillMedia: ({ jobid, invoice_number }) => {
+    dispatch(getBillMedia({ jobid, invoice_number }));
+  },
+  toggleMediaSelected: ({ jobid, filename }) =>
+    dispatch(toggleMediaSelected({ jobid, filename })),
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsDocumentsLocalGallery);
+
+export function JobsDocumentsLocalGallery({
+  bodyshop,
+  toggleMediaSelected,
+  getJobMedia,
+  getBillMedia,
+  allMedia,
+  job,
+  invoice_number,
+  vendorid,
+}) {
+  const { t } = useTranslation();
+  useEffect(() => {
+    if (job) {
+      if (invoice_number) {
+        getBillMedia({ jobid: job.id, invoice_number });
+      } else {
+        getJobMedia(job.id);
+      }
+    }
+  }, [job, invoice_number, getJobMedia, getBillMedia]);
+
+  return (
+    <div>
+      <Space wrap>
+        <Button
+          onClick={() => {
+            if (job) {
+              if (invoice_number) {
+                getBillMedia({ jobid: job.id, invoice_number });
+              } else {
+                getJobMedia(job.id);
+              }
+            }
+          }}
+        >
+          <SyncOutlined />
+        </Button>
+        <a href={CreateExplorerLinkForJob({ jobid: job.id })}>
+          <Button>{t("documents.labels.openinexplorer")}</Button>
+        </a>
+        <JobsDocumentsLocalGalleryReassign jobid={job.id} />
+      </Space>
+      <Card>
+        <DocumentsLocalUploadComponent
+          job={job}
+          invoice_number={invoice_number}
+          vendorid={vendorid}
+        />
+      </Card>
+      <Card title={t("jobs.labels.documents-images")}>
+        <Gallery
+          images={(allMedia && allMedia[job.id]) || []}
+          backdropClosesModal={true}
+          onSelectImage={(index, image) => {
+            toggleMediaSelected({ jobid: job.id, filename: image.filename });
+          }}
+          onClickImage={(props) => {
+            window.open(
+              props.target.src,
+              "_blank",
+              "toolbar=0,location=0,menubar=0"
+            );
+          }}
+        />
+      </Card>
+    </div>
+  );
+}
--- a/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.reassign.component.jsx
+++ b/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.reassign.component.jsx
@@ -0,0 +1,92 @@
+import { Button, Form, Popover, Space } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { getJobMedia } from "../../redux/media/media.actions";
+import { selectAllMedia } from "../../redux/media/media.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import cleanAxios from "../../utils/CleanAxios";
+import JobSearchSelect from "../job-search-select/job-search-select.component";
+
+const mapStateToProps = createStructuredSelector({
+  allMedia: selectAllMedia,
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  getJobMedia: (id) => dispatch(getJobMedia(id)),
+
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsDocumentsLocalGalleryReassign);
+
+export function JobsDocumentsLocalGalleryReassign({
+  bodyshop,
+  jobid,
+  allMedia,
+  getJobMedia,
+}) {
+  const { t } = useTranslation();
+  const [form] = Form.useForm();
+
+  const [visible, setVisible] = useState(false);
+  const [loading, setLoading] = useState(false);
+
+  const handleFinish = async ({ jobid: newJobid }) => {
+    setLoading(true);
+    const selectedDocuments = allMedia[jobid].filter((m) => m.isSelected);
+
+    await cleanAxios.post(`${bodyshop.localmediaserverhttp}/jobs/move`, {
+      from_jobid: jobid,
+      jobid: newJobid,
+      files: selectedDocuments.map((f) => f.filename),
+    });
+
+    getJobMedia(jobid);
+    setVisible(false);
+    setLoading(false);
+  };
+
+  const popContent = (
+    <div>
+      <Form onFinish={handleFinish} layout="vertical" form={form}>
+        <Form.Item
+          label={t("documents.labels.newjobid")}
+          style={{ width: "20rem" }}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={"jobid"}
+        >
+          <JobSearchSelect />
+        </Form.Item>
+      </Form>
+      <Space>
+        <Button type="primary" onClick={() => form.submit()}>
+          {t("general.actions.submit")}
+        </Button>
+        <Button onClick={() => setVisible(false)}>
+          {t("general.actions.cancel")}
+        </Button>
+      </Space>
+    </div>
+  );
+
+  return (
+    <Popover content={popContent} visible={visible}>
+      <Button
+        //disabled={selectedImages.length < 1}
+        onClick={() => setVisible(true)}
+        loading={loading}
+      >
+        {t("documents.actions.reassign")}
+      </Button>
+    </Popover>
+  );
+}
--- a/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx
+++ b/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx
@@ -26,6 +26,7 @@ export function JobsExportAllButton({
  disabled,
  loadingCallback,
  completedCallback,
+  refetch,
 }) {
  const { t } = useTranslation();
  const [updateJob] = useMutation(UPDATE_JOBS);
@@ -39,6 +40,7 @@ export function JobsExportAllButton({
    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
      PartnerResponse = await axios.post(`/qbo/receivables`, {
        jobIds: jobIds,
+        elgen: true,
      });
    } else {
      let QbXmlResponse;
@@ -83,6 +85,7 @@ export function JobsExportAllButton({
        return;
      }
    }
+
    console.log("PartnerResponse", PartnerResponse);
    const groupedData = _.groupBy(
      PartnerResponse.data,
@@ -106,61 +109,70 @@ export function JobsExportAllButton({
            });
            //Call is not awaited as it is not critical to finish before proceeding.
          });
-          await insertExportLog({
-            variables: {
-              logs: [
-                {
-                  bodyshopid: bodyshop.id,
-                  jobid: key,
-                  successful: false,
-                  message: JSON.stringify(
-                    failedTransactions.map((ft) => ft.errorMessage)
-                  ),
-                  useremail: currentUser.email,
-                },
-              ],
-            },
-          });
-        } else {
-          await insertExportLog({
-            variables: {
-              logs: [
-                {
-                  bodyshopid: bodyshop.id,
-                  jobid: key,
-                  successful: true,
-                  useremail: currentUser.email,
-                },
-              ],
-            },
-          });

-          const jobUpdateResponse = await updateJob({
-            variables: {
-              jobIds: [key],
-              fields: {
-                status: bodyshop.md_ro_statuses.default_exported || "Exported*",
-                date_exported: new Date(),
+          if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
+            //QBO Logs are handled server side.
+            await insertExportLog({
+              variables: {
+                logs: [
+                  {
+                    bodyshopid: bodyshop.id,
+                    jobid: key,
+                    successful: false,
+                    message: JSON.stringify(
+                      failedTransactions.map((ft) => ft.errorMessage)
+                    ),
+                    useremail: currentUser.email,
+                  },
+                ],
              },
-            },
-          });
+            });
+          }
+        } else {
+          if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
+            //QBO Logs are handled server side.
+            await insertExportLog({
+              variables: {
+                logs: [
+                  {
+                    bodyshopid: bodyshop.id,
+                    jobid: key,
+                    successful: true,
+                    useremail: currentUser.email,
+                  },
+                ],
+              },
+            });

-          if (!jobUpdateResponse.errors) {
-            notification.open({
-              type: "success",
-              key: "jobsuccessexport",
-              message: t("jobs.successes.exported"),
-            });
-          } else {
-            notification["error"]({
-              message: t("jobs.errors.exporting", {
-                error: JSON.stringify(jobUpdateResponse.error),
-              }),
+            const jobUpdateResponse = await updateJob({
+              variables: {
+                jobIds: [key],
+                fields: {
+                  status:
+                    bodyshop.md_ro_statuses.default_exported || "Exported*",
+                  date_exported: new Date(),
+                },
+              },
            });
+
+            if (!jobUpdateResponse.errors) {
+              notification.open({
+                type: "success",
+                key: "jobsuccessexport",
+                message: t("jobs.successes.exported"),
+              });
+            } else {
+              notification["error"]({
+                message: t("jobs.errors.exporting", {
+                  error: JSON.stringify(jobUpdateResponse.error),
+                }),
+              });
+            }
          }
        }
      })
    );
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();

    if (!!completedCallback) completedCallback([]);
    if (!!loadingCallback) loadingCallback(false);
--- a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
+++ b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
@@ -4,6 +4,7 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import PhoneFormatter from "../../utils/PhoneFormatter";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";

 export default function JobsFindModalComponent({
  selectedJob,
@@ -43,15 +44,12 @@ export default function JobsFindModalComponent({
      render: (text, record) => {
        return record.owner ? (
          <Link to={"/manage/owners/" + record.owner.id}>
-            {`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
-              record.ownr_co_nm || ""
-            }`}
+            <OwnerNameDisplay ownerObject={record} />
          </Link>
        ) : (
-          // t("jobs.errors.noowner")
-          <span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
-            record.ownr_co_nm || ""
-          }`}</span>
+          <span>
+            <OwnerNameDisplay ownerObject={record} />
+          </span>
        );
      },
    },
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -10,7 +10,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
-
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
  bodyshop: selectBodyshop,
@@ -30,7 +30,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.ro_number"),
      dataIndex: "ro_number",
      key: "ro_number",
-      width: "8%",
+
      sorter: true, //(a, b) => alphaSort(a.ro_number, b.ro_number),
      sortOrder: sortcolumn === "ro_number" && sortorder,

@@ -47,19 +47,17 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      key: "ownr_ln",
      ellipsis: true,
      //sorter: true, // (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
-      width: "25%",
+
      //sortOrder: sortcolumn === "ownr_ln" && sortorder,
      render: (text, record) => {
        return record.ownerid ? (
          <Link to={"/manage/owners/" + record.ownerid}>
-            {`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
-              record.ownr_co_nm || ""
-            }`}
+            <OwnerNameDisplay ownerObject={record} />
          </Link>
        ) : (
-          <span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
-            record.ownr_co_nm || ""
-          }`}</span>
+          <span>
+            <OwnerNameDisplay ownerObject={record} />
+          </span>
        );
      },
    },
@@ -67,7 +65,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.ownr_ph1"),
      dataIndex: "ownr_ph1",
      key: "ownr_ph1",
-      width: "12%",
+
      ellipsis: true,
      render: (text, record) => (
        <StartChatButton phone={record.ownr_ph1} jobid={record.id} />
@@ -77,7 +75,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.ownr_ph2"),
      dataIndex: "ownr_ph2",
      key: "ownr_ph2",
-      width: "12%",
+
      ellipsis: true,
      render: (text, record) => (
        <StartChatButton phone={record.ownr_ph2} jobid={record.id} />
@@ -87,7 +85,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.status"),
      dataIndex: "status",
      key: "status",
-      width: "10%",
+
      ellipsis: true,
      sorter: true, // (a, b) => alphaSort(a.status, b.status),
      sortOrder: sortcolumn === "status" && sortorder,
@@ -104,7 +102,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.vehicle"),
      dataIndex: "vehicle",
      key: "vehicle",
-      width: "15%",
+
      ellipsis: true,
      render: (text, record) => {
        return record.vehicleid ? (
@@ -124,7 +122,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("vehicles.fields.plate_no"),
      dataIndex: "plate_no",
      key: "plate_no",
-      width: "8%",
+
      ellipsis: true,
      sorter: true, //(a, b) => alphaSort(a.plate_no, b.plate_no),
      sortOrder: sortcolumn === "plate_no" && sortorder,
@@ -136,7 +134,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.clm_no"),
      dataIndex: "clm_no",
      key: "clm_no",
-      width: "12%",
+
      ellipsis: true,
      sorter: true, //(a, b) => alphaSort(a.clm_no, b.clm_no),
      sortOrder: sortcolumn === "clm_no" && sortorder,
@@ -155,7 +153,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.clm_total"),
      dataIndex: "clm_total",
      key: "clm_total",
-      width: "10%",
+
      sorter: true, //(a, b) => a.clm_total - b.clm_total,
      sortOrder: sortcolumn === "clm_total" && sortorder,
      render: (text, record) => {
@@ -170,11 +168,17 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.owner_owing"),
      dataIndex: "owner_owing",
      key: "owner_owing",
-      width: "8%",
+
      render: (text, record) => (
        <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
      ),
    },
+    {
+      title: t("jobs.fields.comment"),
+      dataIndex: "comment",
+      key: "comment",
+      ellipsis: true,
+    },
  ];

  const handleTableChange = (pagination, filters, sorter) => {
@@ -224,7 +228,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
    >
      <Table
        loading={loading}
-        scroll={{ x: true }}
        pagination={{
          position: "top",
          pageSize: 25,
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -1,4 +1,8 @@
-import { SyncOutlined, ExclamationCircleFilled } from "@ant-design/icons";
+import {
+  SyncOutlined,
+  ExclamationCircleFilled,
+  PauseCircleOutlined,
+} from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
 import { Button, Card, Grid, Input, Space, Table } from "antd";
 import queryString from "query-string";
@@ -14,6 +18,7 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort } from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -56,6 +61,9 @@ export function JobsList({ bodyshop }) {
            (j.ownr_co_nm || "")
              .toLowerCase()
              .includes(searchText.toLowerCase()) ||
+            (j.comments || "")
+              .toLowerCase()
+              .includes(searchText.toLowerCase()) ||
            (j.ownr_fn || "")
              .toLowerCase()
              .includes(searchText.toLowerCase()) ||
@@ -111,6 +119,9 @@ export function JobsList({ bodyshop }) {
            {record.production_vars && record.production_vars.alert ? (
              <ExclamationCircleFilled className="production-alert" />
            ) : null}
+            {record.suspended && (
+              <PauseCircleOutlined style={{ color: "orangered" }} />
+            )}
          </Space>
        </Link>
      ),
@@ -131,14 +142,12 @@ export function JobsList({ bodyshop }) {
            to={"/manage/owners/" + record.owner.id}
            onClick={(e) => e.stopPropagation()}
          >
-            {`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
-              record.ownr_co_nm || ""
-            }`}
+            <OwnerNameDisplay ownerObject={record} />
          </Link>
        ) : (
-          <span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
-            record.ownr_co_nm || ""
-          }`}</span>
+          <span>
+            <OwnerNameDisplay ownerObject={record} />
+          </span>
        );
      },
    },
@@ -255,6 +264,13 @@ export function JobsList({ bodyshop }) {
        <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
      ),
    },
+    {
+      title: t("jobs.fields.comment"),
+      dataIndex: "comment",
+      key: "comment",
+      ellipsis: true,
+      responsive: ["md"],
+    },
    // {
    //   title: t("jobs.fields.owner_owing"),
    //   dataIndex: "owner_owing",
--- a/client/src/components/jobs-notes/jobs.notes.component.jsx
+++ b/client/src/components/jobs-notes/jobs.notes.component.jsx
@@ -5,7 +5,7 @@ import {
  EyeInvisibleFilled,
  WarningFilled,
 } from "@ant-design/icons";
-import { Button, Card, Space, Table } from "antd";
+import { Button, Card, Form, Input, Space, Table } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -14,6 +14,7 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import NoteUpsertModal from "../note-upsert-modal/note-upsert-modal.container";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";

@@ -114,7 +115,6 @@ export function JobNotesComponent({
            <EditFilled />
          </Button>
          <PrintWrapperComponent
-            emailOnly
            templateObject={{
              name: Templates.individual_job_note.key,

@@ -123,7 +123,7 @@ export function JobNotesComponent({
            messageObject={{
              subject: Templates.individual_job_note.subject,
            }}
-            id={record.id}
+            id={jobId}
          />
        </Space>
      ),
@@ -131,32 +131,42 @@ export function JobNotesComponent({
  ];

  return (
-    <Card
-      title={t("jobs.labels.notes")}
-      extra={
-        <Button
-          onClick={() => {
-            setNoteUpsertContext({
-              actions: { refetch: refetch },
-              context: {
-                jobId: jobId,
-              },
-            });
-          }}
+    <div>
+      <LayoutFormRow>
+        <Form.Item
+          label={t("jobs.fields.invoice_final_note")}
+          name="invoice_final_note"
        >
-          {t("notes.actions.new")}
-        </Button>
-      }
-    >
-      <NoteUpsertModal />
+          <Input.TextArea disabled={jobRO} />
+        </Form.Item>
+      </LayoutFormRow>
+      <Card
+        title={t("jobs.labels.notes")}
+        extra={
+          <Button
+            onClick={() => {
+              setNoteUpsertContext({
+                actions: { refetch: refetch },
+                context: {
+                  jobId: jobId,
+                },
+              });
+            }}
+          >
+            {t("notes.actions.new")}
+          </Button>
+        }
+      >
+        <NoteUpsertModal />

-      <Table
-        loading={loading}
-        columns={columns}
-        rowKey="id"
-        dataSource={data}
-      />
-    </Card>
+        <Table
+          loading={loading}
+          columns={columns}
+          rowKey="id"
+          dataSource={data}
+        />
+      </Card>
+    </div>
  );
 }
 export default connect(mapStateToProps, mapDispatchToProps)(JobNotesComponent);
--- a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
+++ b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
@@ -0,0 +1,355 @@
+import {
+  ExclamationCircleFilled,
+  PauseCircleOutlined,
+  SyncOutlined,
+} from "@ant-design/icons";
+import { useQuery } from "@apollo/client";
+import { Button, Card, Grid, Input, Space, Table } from "antd";
+import queryString from "query-string";
+import React, { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { Link, useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { onlyUnique } from "../../utils/arrayHelper";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { alphaSort } from "../../utils/sorters";
+import AlertComponent from "../alert/alert.component";
+import ChatOpenButton from "../chat-open-button/chat-open-button.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+export function JobsReadyList({ bodyshop }) {
+  const searchParams = queryString.parse(useLocation().search);
+  const { selected } = searchParams;
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
+
+  const readyStatuses = useMemo(() => {
+    if (bodyshop.md_ro_statuses.ready_statuses)
+      return bodyshop.md_ro_statuses.ready_statuses;
+
+    return bodyshop.md_ro_statuses.post_production_statuses.filter(
+      (s) =>
+        s !== bodyshop.md_ro_statuses.default_invoiced &&
+        s !== bodyshop.md_ro_statuses.default_exported
+    );
+  }, [bodyshop.md_ro_statuses]);
+
+  const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
+    variables: {
+      statuses: readyStatuses,
+    },
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+  });
+
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: { text: "" },
+  });
+
+  const { t } = useTranslation();
+  const history = useHistory();
+  const [searchText, setSearchText] = useState("");
+
+  if (error) return <AlertComponent message={error.message} type="error" />;
+
+  const jobs = data
+    ? searchText === ""
+      ? data.jobs
+      : data.jobs.filter(
+          (j) =>
+            (j.ro_number || "")
+              .toString()
+              .toLowerCase()
+              .includes(searchText.toLowerCase()) ||
+            (j.ownr_co_nm || "")
+              .toLowerCase()
+              .includes(searchText.toLowerCase()) ||
+            (j.comments || "")
+              .toLowerCase()
+              .includes(searchText.toLowerCase()) ||
+            (j.ownr_fn || "")
+              .toLowerCase()
+              .includes(searchText.toLowerCase()) ||
+            (j.ownr_ln || "")
+              .toLowerCase()
+              .includes(searchText.toLowerCase()) ||
+            (j.clm_no || "").toLowerCase().includes(searchText.toLowerCase()) ||
+            (j.plate_no || "")
+              .toLowerCase()
+              .includes(searchText.toLowerCase()) ||
+            (j.v_model_desc || "")
+              .toLowerCase()
+              .includes(searchText.toLowerCase()) ||
+            (j.v_make_desc || "")
+              .toLowerCase()
+              .includes(searchText.toLowerCase())
+        )
+    : [];
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };
+
+  const handleOnRowClick = (record) => {
+    if (record) {
+      if (record.id) {
+        history.push({
+          search: queryString.stringify({
+            ...searchParams,
+            selected: record.id,
+          }),
+        });
+      }
+    }
+  };
+
+  const columns = [
+    {
+      title: t("jobs.fields.ro_number"),
+      dataIndex: "ro_number",
+      key: "ro_number",
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+      sortOrder:
+        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+
+      render: (text, record) => (
+        <Link
+          to={"/manage/jobs/" + record.id}
+          onClick={(e) => e.stopPropagation()}
+        >
+          <Space>
+            {record.ro_number || t("general.labels.na")}
+            {record.production_vars && record.production_vars.alert ? (
+              <ExclamationCircleFilled className="production-alert" />
+            ) : null}
+            {record.suspended && (
+              <PauseCircleOutlined style={{ color: "orangered" }} />
+            )}
+          </Space>
+        </Link>
+      ),
+    },
+    {
+      title: t("jobs.fields.owner"),
+      dataIndex: "owner",
+      key: "owner",
+      ellipsis: true,
+
+      responsive: ["md"],
+      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      sortOrder:
+        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
+      render: (text, record) => {
+        return record.owner ? (
+          <Link
+            to={"/manage/owners/" + record.owner.id}
+            onClick={(e) => e.stopPropagation()}
+          >
+            <OwnerNameDisplay ownerObject={record} />
+          </Link>
+        ) : (
+          <span>
+            <OwnerNameDisplay ownerObject={record} />
+          </span>
+        );
+      },
+    },
+    {
+      title: t("jobs.fields.ownr_ph1"),
+      dataIndex: "ownr_ph1",
+      key: "ownr_ph1",
+      ellipsis: true,
+      responsive: ["md"],
+      render: (text, record) => (
+        <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
+      ),
+    },
+    {
+      title: t("jobs.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      ellipsis: true,
+      responsive: ["md"],
+      render: (text, record) => (
+        <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
+      ),
+    },
+
+    {
+      title: t("jobs.fields.status"),
+      dataIndex: "status",
+      key: "status",
+      ellipsis: true,
+
+      sorter: (a, b) => alphaSort(a.status, b.status),
+      sortOrder:
+        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+      filters:
+        (jobs &&
+          jobs
+            .map((j) => j.status)
+            .filter(onlyUnique)
+            .map((s) => {
+              return {
+                text: s || "No Status*",
+                value: [s],
+              };
+            })) ||
+        [],
+      onFilter: (value, record) => value.includes(record.status),
+    },
+
+    {
+      title: t("jobs.fields.vehicle"),
+      dataIndex: "vehicle",
+      key: "vehicle",
+      ellipsis: true,
+      render: (text, record) => {
+        return record.vehicleid ? (
+          <Link
+            to={"/manage/vehicles/" + record.vehicleid}
+            onClick={(e) => e.stopPropagation()}
+          >
+            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+              record.v_model_desc || ""
+            }`}
+          </Link>
+        ) : (
+          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+            record.v_model_desc || ""
+          }`}</span>
+        );
+      },
+    },
+    {
+      title: t("vehicles.fields.plate_no"),
+      dataIndex: "plate_no",
+      key: "plate_no",
+      ellipsis: true,
+
+      responsive: ["md"],
+      sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
+      sortOrder:
+        state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
+    },
+    {
+      title: t("jobs.fields.clm_no"),
+      dataIndex: "clm_no",
+      key: "clm_no",
+      ellipsis: true,
+      responsive: ["md"],
+      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
+      sortOrder:
+        state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
+      render: (text, record) =>
+        `${record.clm_no || ""}${
+          record.po_number ? ` (PO: ${record.po_number})` : ""
+        }`,
+    },
+    {
+      title: t("jobs.fields.ins_co_nm"),
+      dataIndex: "ins_co_nm",
+      key: "ins_co_nm",
+      ellipsis: true,
+      responsive: ["md"],
+    },
+    {
+      title: t("jobs.fields.clm_total"),
+      dataIndex: "clm_total",
+      key: "clm_total",
+      responsive: ["md"],
+      ellipsis: true,
+
+      sorter: (a, b) => a.clm_total - b.clm_total,
+      sortOrder:
+        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
+      render: (text, record) => (
+        <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
+      ),
+    },
+    {
+      title: t("jobs.fields.comment"),
+      dataIndex: "comment",
+      key: "comment",
+      ellipsis: true,
+      responsive: ["md"],
+    },
+    // {
+    //   title: t("jobs.fields.owner_owing"),
+    //   dataIndex: "owner_owing",
+    //   key: "owner_owing",
+    //   responsive: ["md"],
+    //   render: (text, record) => (
+    //     <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
+    //   ),
+    // },
+  ];
+
+  const scrollMapper = {
+    xs: true,
+    sm: true,
+    md: true,
+    lg: "100%",
+    xl: "100%",
+    xxl: "100%",
+  };
+
+  return (
+    <Card
+      title={t("titles.bc.jobs-ready")}
+      extra={
+        <Space wrap>
+          <span>({readyStatuses && readyStatuses.join(", ")})</span>
+          <Button onClick={() => refetch()}>
+            <SyncOutlined />
+          </Button>
+          <Input.Search
+            placeholder={t("general.labels.search")}
+            onChange={(e) => {
+              setSearchText(e.target.value);
+            }}
+            value={searchText}
+            enterButton
+          />
+        </Space>
+      }
+    >
+      <Table
+        loading={loading}
+        pagination={{ defaultPageSize: 50 }}
+        columns={columns}
+        rowKey="id"
+        dataSource={jobs}
+        scroll={{
+          x: selectedBreakpoint ? scrollMapper[selectedBreakpoint[0]] : "100%",
+        }}
+        rowSelection={{
+          onSelect: (record) => {
+            handleOnRowClick(record);
+          },
+          selectedRowKeys: [selected],
+          type: "radio",
+        }}
+        onChange={handleTableChange}
+        onRow={(record, rowIndex) => {
+          return {
+            onClick: (event) => {
+              handleOnRowClick(record);
+            },
+          };
+        }}
+      />
+    </Card>
+  );
+}
+
+export default connect(mapStateToProps, null)(JobsReadyList);
--- a/client/src/components/notes-preset-button/notes-preset-button.component.jsx
+++ b/client/src/components/notes-preset-button/notes-preset-button.component.jsx
@@ -24,7 +24,7 @@ export function NotesPresetButton({ bodyshop, form }) {
  const menu = (
    <Menu>
      {bodyshop.md_notes_presets.map((i, idx) => (
-        <Menu.Item onClick={() => handleSelect(i)} onItemHover key={idx}>
+        <Menu.Item onClick={() => handleSelect(i)} key={idx}>
          {i.label}
        </Menu.Item>
      ))}
--- a/client/src/components/owner-find-modal/owner-find-modal.container.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
@@ -6,6 +6,7 @@ import { QUERY_SEARCH_OWNER_BY_IDX } from "../../graphql/owners.queries";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import OwnerFindModalComponent from "./owner-find-modal.component";
+import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";

 export default function OwnerFindModalContainer({
  loading,
@@ -30,9 +31,7 @@ export default function OwnerFindModalContainer({

  useEffect(() => {
    if (modalProps.visible && owner) {
-      const s = `${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${
-        owner.ownr_co_nm || ""
-      }`;
+      const s = OwnerNameDisplayFunction(owner);

      setSearchText(s.trim());
      callSearchowners({ variables: { search: s.trim() } });
--- a/Show More
+++ b/Show More