IO-2874 InsertBill Full Error Log

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
Merged in hotfix/2024-08-06 (pull request #1579 )
2024-08-13 11:03:15 -07:00 · 2024-08-06 19:32:32 +00:00 · 2024-08-06 19:31:53 +00:00 · 2024-08-06 12:22:55 -07:00 · 2024-08-02 23:55:03 +00:00 · 2024-08-02 23:54:16 +00:00
57 changed files with 11766 additions and 9669 deletions
--- a/_reference/productionBoardNotes.md
+++ b/_reference/productionBoardNotes.md
@@ -0,0 +1,33 @@
+# Production Board Notes:
+
+## General Notes
+
+- You can single click the lane footer to collapse/un-collapse the lane
+- You can double click the lane header to collapse/un-collapse the lane
+- If you need to scroll horizontally, you can hold shift and use the mouse scroll wheel, or press the mouse scroll wheel while scrolling
+
+## Board Settings
+
+#### Layout
+
+- Board Orientation (Vertical or Horizontal) 
+  - This determines the orientation of the card layout on the board.
+  - Horizontal is the default setting, and how the prior board was set up.
+  - Vertical is the new setting and allows lanes to be displayed vertically, with a grid of cards
+- Card Size (Small, Medium, Large)
+  - This determines the size of the cards on the board.
+  - Small is the default setting, and how the prior board was set up.
+  - Medium and Large are new settings and allow for larger cards to be displayed on the board.
+- Compact Cards (Tall or Wide)
+   - Formally called 'Compact'
+   - When on, data is displayed on the card vertically
+   - when turned off, some fields may share horizontal space, tightening the card layout
+- Colored Cards (On or Off)
+  - When on, cards are colored based on the Status color
+- Kiosk Mode (On or Off)
+   - This should be turned on if the shop is using it on a tablet (Ipad)
+
+#### Information
+
+These allow users to turn fields on or off, turning them all off will show the card in the most minimal form
+
--- a/client/.env.development.promanager
+++ b/client/.env.development.promanager
@@ -1,7 +1,7 @@
 VITE_APP_GRAPHQL_ENDPOINT=https://db.dev.bodyshop.app/v1/graphql
 VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.bodyshop.app/v1/graphql
 VITE_APP_GA_CODE=231099835
-VITE_APP_FIREBASE_CONFIG={  "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",  "authDomain": "rome-prod-1.firebaseapp.com",  "projectId": "rome-prod-1",  "storageBucket": "rome-prod-1.appspot.com",  "messagingSenderId": "147786367145",  "appId": "1:147786367145:web:9d4cba68071c3f29a8a9b8",  "measurementId": "G-G8Z9DRHTZS"}
+VITE_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc","authDomain":"imex-dev.firebaseapp.com","databaseURL":"https://imex-dev.firebaseio.com","projectId":"imex-dev","storageBucket":"imex-dev.appspot.com","messagingSenderId":"759548147434","appId":"1:759548147434:web:e8239868a48ceb36700993","measurementId":"G-K5XRBVVB4S"}
 VITE_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/io-test
 VITE_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/io-test
 VITE_APP_CLOUDINARY_API_KEY=957865933348715
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -8,9 +8,9 @@
      "name": "bodyshop",
      "version": "0.2.1",
      "dependencies": {
-        "@ant-design/pro-layout": "^7.19.10",
+        "@ant-design/pro-layout": "^7.19.11",
        "@apollo/client": "^3.10.8",
-        "@emotion/is-prop-valid": "^1.2.2",
+        "@emotion/is-prop-valid": "^1.3.0",
        "@fingerprintjs/fingerprintjs": "^4.4.3",
        "@jsreport/browser-client": "^3.1.0",
        "@reduxjs/toolkit": "^2.2.6",
@@ -19,26 +19,26 @@
        "@splitsoftware/splitio-react": "^1.12.0",
        "@tanem/react-nprogress": "^5.0.51",
        "@vitejs/plugin-react": "^4.3.1",
-        "antd": "^5.19.2",
+        "antd": "^5.19.3",
        "apollo-link-logger": "^2.0.1",
        "apollo-link-sentry": "^3.3.0",
        "autosize": "^6.0.1",
        "axios": "^1.6.8",
        "classnames": "^2.5.1",
        "css-box-model": "^1.2.1",
-        "dayjs": "^1.11.11",
+        "dayjs": "^1.11.12",
        "dayjs-business-days2": "^1.2.2",
        "dinero.js": "^1.9.1",
        "dotenv": "^16.4.5",
        "env-cmd": "^10.1.0",
        "exifr": "^7.1.3",
-        "firebase": "^10.12.3",
+        "firebase": "^10.12.4",
        "graphql": "^16.9.0",
-        "i18next": "^23.12.1",
+        "i18next": "^23.12.2",
        "i18next-browser-languagedetector": "^8.0.0",
        "immutability-helper": "^3.1.1",
        "libphonenumber-js": "^1.11.4",
-        "logrocket": "^8.1.0",
+        "logrocket": "^8.1.1",
        "markerjs2": "^2.32.1",
        "memoize-one": "^6.0.0",
        "normalize-url": "^8.0.1",
@@ -64,7 +64,7 @@
        "react-product-fruits": "^2.2.6",
        "react-redux": "^9.1.2",
        "react-resizable": "^3.0.5",
-        "react-router-dom": "^6.24.1",
+        "react-router-dom": "^6.25.1",
        "react-sticky": "^6.0.3",
        "react-virtualized": "^9.22.5",
        "react-virtuoso": "^4.7.12",
@@ -77,7 +77,7 @@
        "reselect": "^5.1.1",
        "sass": "^1.77.8",
        "socket.io-client": "^4.7.5",
-        "styled-components": "^6.1.11",
+        "styled-components": "^6.1.12",
        "subscriptions-transport-ws": "^0.11.0",
        "use-memo-one": "^1.1.3",
        "userpilot": "^1.3.2",
@@ -88,14 +88,14 @@
        "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
        "@babel/preset-react": "^7.24.7",
        "@dotenvx/dotenvx": "^1.6.4",
-        "@emotion/babel-plugin": "^11.11.0",
-        "@emotion/react": "^11.11.4",
+        "@emotion/babel-plugin": "^11.12.0",
+        "@emotion/react": "^11.12.0",
        "@sentry/webpack-plugin": "^2.21.1",
        "@testing-library/cypress": "^10.0.2",
        "browserslist": "^4.23.2",
        "browserslist-to-esbuild": "^2.1.1",
        "cross-env": "^7.0.3",
-        "cypress": "^13.13.0",
+        "cypress": "^13.13.1",
        "eslint": "^8.57.0",
        "eslint-config-react-app": "^7.0.1",
        "eslint-plugin-cypress": "^2.15.1",
@@ -182,9 +182,9 @@
      "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA=="
    },
    "node_modules/@ant-design/pro-layout": {
-      "version": "7.19.10",
-      "resolved": "https://registry.npmjs.org/@ant-design/pro-layout/-/pro-layout-7.19.10.tgz",
-      "integrity": "sha512-w2Cbh3Ari1h5e7WBbrZSZi2f3pokpf0Pn+7GQ/PN+cimKBC+BIBgNh6mtpheLlNTdTM3jsgpEpIO+BtiLbjkkg==",
+      "version": "7.19.11",
+      "resolved": "https://registry.npmjs.org/@ant-design/pro-layout/-/pro-layout-7.19.11.tgz",
+      "integrity": "sha512-KTnHYO/J5cF3MvMr9Skgg/G07GgzLw3Zj0vkKBFHS5ByjSh2eX1dBu5f3g9aDOB3e9XFrkfiVwkGLHvcgiAxpg==",
      "dependencies": {
        "@ant-design/icons": "^5.0.0",
        "@ant-design/pro-provider": "2.14.9",
@@ -2457,9 +2457,9 @@
      "dev": true
    },
    "node_modules/@babel/runtime": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz",
-      "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.8.tgz",
+      "integrity": "sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==",
      "dependencies": {
        "regenerator-runtime": "^0.14.0"
      },
@@ -2746,16 +2746,16 @@
      }
    },
    "node_modules/@emotion/babel-plugin": {
-      "version": "11.11.0",
-      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz",
-      "integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==",
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.12.0.tgz",
+      "integrity": "sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw==",
      "dev": true,
      "dependencies": {
        "@babel/helper-module-imports": "^7.16.7",
        "@babel/runtime": "^7.18.3",
-        "@emotion/hash": "^0.9.1",
-        "@emotion/memoize": "^0.8.1",
-        "@emotion/serialize": "^1.1.2",
+        "@emotion/hash": "^0.9.2",
+        "@emotion/memoize": "^0.9.0",
+        "@emotion/serialize": "^1.2.0",
        "babel-plugin-macros": "^3.1.0",
        "convert-source-map": "^1.5.0",
        "escape-string-regexp": "^4.0.0",
@@ -2765,9 +2765,15 @@
      }
    },
    "node_modules/@emotion/babel-plugin/node_modules/@emotion/hash": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz",
-      "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==",
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz",
+      "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==",
+      "dev": true
+    },
+    "node_modules/@emotion/babel-plugin/node_modules/@emotion/memoize": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz",
+      "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==",
      "dev": true
    },
    "node_modules/@emotion/babel-plugin/node_modules/source-map": {
@@ -2786,18 +2792,24 @@
      "dev": true
    },
    "node_modules/@emotion/cache": {
-      "version": "11.11.0",
-      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz",
-      "integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==",
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.12.0.tgz",
+      "integrity": "sha512-VFo/F1PthkxHwWDCcXkidyXw70eAkdiNiCzthMI2rRQjFiTvmXt8UDlv/VE1DTsd4CIEY2wQf5AnL2QiPgphlw==",
      "dev": true,
      "dependencies": {
-        "@emotion/memoize": "^0.8.1",
-        "@emotion/sheet": "^1.2.2",
-        "@emotion/utils": "^1.2.1",
-        "@emotion/weak-memoize": "^0.3.1",
+        "@emotion/memoize": "^0.9.0",
+        "@emotion/sheet": "^1.3.0",
+        "@emotion/utils": "^1.3.0",
+        "@emotion/weak-memoize": "^0.4.0",
        "stylis": "4.2.0"
      }
    },
+    "node_modules/@emotion/cache/node_modules/@emotion/memoize": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz",
+      "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==",
+      "dev": true
+    },
    "node_modules/@emotion/cache/node_modules/stylis": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
@@ -2810,31 +2822,36 @@
      "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
    },
    "node_modules/@emotion/is-prop-valid": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz",
-      "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.3.0.tgz",
+      "integrity": "sha512-SHetuSLvJDzuNbOdtPVbq6yMMMlLoW5Q94uDqJZqy50gcmAjxFkVqmzqSGEFq9gT2iMuIeKV1PXVWmvUhuZLlQ==",
      "dependencies": {
-        "@emotion/memoize": "^0.8.1"
+        "@emotion/memoize": "^0.9.0"
      }
    },
+    "node_modules/@emotion/is-prop-valid/node_modules/@emotion/memoize": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz",
+      "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ=="
+    },
    "node_modules/@emotion/memoize": {
      "version": "0.8.1",
      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
      "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
    },
    "node_modules/@emotion/react": {
-      "version": "11.11.4",
-      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.4.tgz",
-      "integrity": "sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==",
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.12.0.tgz",
+      "integrity": "sha512-kTktYMpG8mHjLi8u6XOTMfDmQvUve/un2ZVj4khcU2KTn17ElMV8BK6QFzT8V/v2QW8013rf07Yc0ayQL3tp3w==",
      "dev": true,
      "dependencies": {
        "@babel/runtime": "^7.18.3",
-        "@emotion/babel-plugin": "^11.11.0",
-        "@emotion/cache": "^11.11.0",
-        "@emotion/serialize": "^1.1.3",
+        "@emotion/babel-plugin": "^11.12.0",
+        "@emotion/cache": "^11.12.0",
+        "@emotion/serialize": "^1.2.0",
        "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1",
-        "@emotion/utils": "^1.2.1",
-        "@emotion/weak-memoize": "^0.3.1",
+        "@emotion/utils": "^1.3.0",
+        "@emotion/weak-memoize": "^0.4.0",
        "hoist-non-react-statics": "^3.3.1"
      },
      "peerDependencies": {
@@ -2847,34 +2864,40 @@
      }
    },
    "node_modules/@emotion/serialize": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.4.tgz",
-      "integrity": "sha512-RIN04MBT8g+FnDwgvIUi8czvr1LU1alUMI05LekWB5DGyTm8cCBMCRpq3GqaiyEDRptEXOyXnvZ58GZYu4kBxQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.2.0.tgz",
+      "integrity": "sha512-X5UWpZAhGGp5LOn7OAI9k9JjRtz7nSFhZypatADcuEd/0bECZ0DzVjPdL8hljTrAku8+TjFvWIYHMOCO/0v/Ng==",
      "dev": true,
      "dependencies": {
-        "@emotion/hash": "^0.9.1",
-        "@emotion/memoize": "^0.8.1",
-        "@emotion/unitless": "^0.8.1",
-        "@emotion/utils": "^1.2.1",
+        "@emotion/hash": "^0.9.2",
+        "@emotion/memoize": "^0.9.0",
+        "@emotion/unitless": "^0.9.0",
+        "@emotion/utils": "^1.3.0",
        "csstype": "^3.0.2"
      }
    },
    "node_modules/@emotion/serialize/node_modules/@emotion/hash": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz",
-      "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==",
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz",
+      "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==",
+      "dev": true
+    },
+    "node_modules/@emotion/serialize/node_modules/@emotion/memoize": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz",
+      "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==",
      "dev": true
    },
    "node_modules/@emotion/serialize/node_modules/@emotion/unitless": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
-      "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.9.0.tgz",
+      "integrity": "sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ==",
      "dev": true
    },
    "node_modules/@emotion/sheet": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz",
-      "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.3.0.tgz",
+      "integrity": "sha512-vOPwbKw8fj/oSEa7CWqiKCvLZ1AeLIAApmboGP34xUyUjXalFyf+tMtgMDqP7VMevLPhUa+YWJS46cQUA+tr9A==",
      "dev": true
    },
    "node_modules/@emotion/unitless": {
@@ -2892,15 +2915,15 @@
      }
    },
    "node_modules/@emotion/utils": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz",
-      "integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.3.0.tgz",
+      "integrity": "sha512-+M7u4EaX5t4bCunKTltAdGis3NFHQniikLVEQ+rPQccsX/xV4v5Etwg12paioZ9DsO+CTvimtmnjZbW85kbF8Q==",
      "dev": true
    },
    "node_modules/@emotion/weak-memoize": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz",
-      "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz",
+      "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==",
      "dev": true
    },
    "node_modules/@esbuild/aix-ppc64": {
@@ -3397,14 +3420,15 @@
      }
    },
    "node_modules/@firebase/analytics": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.5.tgz",
-      "integrity": "sha512-d0X2ksTOKHMf5zFAMKFZWXa8hSbgohsG507xFsGhF4Uet2b8uEUL/YLrEth67jXEbGEi1UQZX4AaGBxKNiDzjw==",
+      "version": "0.10.6",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.6.tgz",
+      "integrity": "sha512-sB59EwcAvLt0fINGfMWmcRKcdUiYhE4AJNdDXSCSDo4D/ZXFRmb6qwX9YesKHXFB59XTLT03mAjqQcDrdym9qA==",
      "dependencies": {
        "@firebase/component": "0.6.8",
        "@firebase/installations": "0.6.8",
        "@firebase/logger": "0.4.2",
        "@firebase/util": "1.9.7",
+        "safevalues": "0.6.0",
        "tslib": "^2.1.0"
      },
      "peerDependencies": {
@@ -3412,11 +3436,11 @@
      }
    },
    "node_modules/@firebase/analytics-compat": {
-      "version": "0.2.11",
-      "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.2.11.tgz",
-      "integrity": "sha512-wmXxJ49pEY7H549Pa4CDPOTzkPJnfG2Yolptg72ntTgSrbKVq+Eg9cAQY6Z5Kn9ATSQRX5oGXKlNfEk5DJBvvA==",
+      "version": "0.2.12",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.2.12.tgz",
+      "integrity": "sha512-rXWnOAdEHbvBPLNjFLu3U0yDZVIAi+C0DL+RkUEOirfSqAeQaKzBCATeBw6+K7FVpEnknhm4tZrvVUVtJjShMw==",
      "dependencies": {
-        "@firebase/analytics": "0.10.5",
+        "@firebase/analytics": "0.10.6",
        "@firebase/analytics-types": "0.8.2",
        "@firebase/component": "0.6.8",
        "@firebase/util": "1.9.7",
@@ -3432,9 +3456,9 @@
      "integrity": "sha512-EnzNNLh+9/sJsimsA/FGqzakmrAUKLeJvjRHlg8df1f97NLUlFidk9600y0ZgWOp3CAxn6Hjtk+08tixlUOWyw=="
    },
    "node_modules/@firebase/app": {
-      "version": "0.10.6",
-      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.10.6.tgz",
-      "integrity": "sha512-/r8Ikp7TOrIIdp7v2adD2kg9SqIXMGOoJXJB1HsX7LjpjWdsoy1fMkP0HlI7GQqqRxDueHNhETx5Zn5E8HyVAQ==",
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.10.7.tgz",
+      "integrity": "sha512-7OCd53B+wnk/onbMLn/vM10pDjw97zzWUD8m3swtLYKJIrL+gDZ7HZ4xcbBLw7OB8ikzu8k1ORNjRe2itgAy4g==",
      "dependencies": {
        "@firebase/component": "0.6.8",
        "@firebase/logger": "0.4.2",
@@ -3444,13 +3468,14 @@
      }
    },
    "node_modules/@firebase/app-check": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.8.5.tgz",
-      "integrity": "sha512-WyIckkVYAfnzsPIw6EAt/qBUANkUAVl6irF0xuJ1R9ISNyUT1h7dPAwvs/g3rsx0fpBWaHRAH0IFiN6zO6yLqQ==",
+      "version": "0.8.6",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.8.6.tgz",
+      "integrity": "sha512-uSzl0/SDw54hwuORWHDtldb9kK/QEVZOcoPn2mlIjMrJOLDug/6kcqnIN3IHzwmPyf23Epg0AGBktvG2FugW4w==",
      "dependencies": {
        "@firebase/component": "0.6.8",
        "@firebase/logger": "0.4.2",
        "@firebase/util": "1.9.7",
+        "safevalues": "0.6.0",
        "tslib": "^2.1.0"
      },
      "peerDependencies": {
@@ -3458,11 +3483,11 @@
      }
    },
    "node_modules/@firebase/app-check-compat": {
-      "version": "0.3.12",
-      "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.3.12.tgz",
-      "integrity": "sha512-p/5w3pMih3JVT6u7g04KXgSZr6HDsQXyeWZkIe0+r71dPOlcKyUooe9/feTc8BWpjha3rUOkqQ7+JXZObwvYoQ==",
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.3.13.tgz",
+      "integrity": "sha512-1sbS5Apq7dLys1KYdNQsmZLFIjJoFP9Mv4bzIcdXuTkWQjr3X2qAvwiTslC6prVAUMiTV0eM9eicdQIXVsiSRw==",
      "dependencies": {
-        "@firebase/app-check": "0.8.5",
+        "@firebase/app-check": "0.8.6",
        "@firebase/app-check-types": "0.5.2",
        "@firebase/component": "0.6.8",
        "@firebase/logger": "0.4.2",
@@ -3484,11 +3509,11 @@
      "integrity": "sha512-FSOEzTzL5bLUbD2co3Zut46iyPWML6xc4x+78TeaXMSuJap5QObfb+rVvZJtla3asN4RwU7elaQaduP+HFizDA=="
    },
    "node_modules/@firebase/app-compat": {
-      "version": "0.2.36",
-      "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.36.tgz",
-      "integrity": "sha512-qsf+pllpgy1IGe2f5vfenOHSX8Cs58sVR5L6h/zBlNy9Yo54B2jy61KxLpSOgyRZb18IlnLLGjo7VtGU1CHvHA==",
+      "version": "0.2.37",
+      "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.37.tgz",
+      "integrity": "sha512-yiQLYT9LYQHuJGu/msuBLFtdWWTJ3Pz04E9gSeWykSB+8s0XXJJqfqQlghH7CcQ3KnJZR+Wuc3zSMcY3a+dn6Q==",
      "dependencies": {
-        "@firebase/app": "0.10.6",
+        "@firebase/app": "0.10.7",
        "@firebase/component": "0.6.8",
        "@firebase/logger": "0.4.2",
        "@firebase/util": "1.9.7",
@@ -4519,9 +4544,9 @@
      }
    },
    "node_modules/@remix-run/router": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.17.1.tgz",
-      "integrity": "sha512-mCOMec4BKd6BRGBZeSnGiIgwsbLGp3yhVqAD8H+PxiRNEHgDpZb8J1TnrSDlg97t0ySKMQJTHCWBCmBpSmkF6Q==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.18.0.tgz",
+      "integrity": "sha512-L3jkqmqoSVBVKHfpGZmLrex0lxR5SucGA0sUfFzGctehw+S/ggL9L/0NnC5mw6P8HUWpFZ3nQw3cRApjjWx9Sw==",
      "engines": {
        "node": ">=14.0.0"
      }
@@ -6263,15 +6288,15 @@
      }
    },
    "node_modules/antd": {
-      "version": "5.19.2",
-      "resolved": "https://registry.npmjs.org/antd/-/antd-5.19.2.tgz",
-      "integrity": "sha512-377Sqqbr5PQj1rwLXqjSSAB23sNO6KCsFm0LKjU6OdpHktdDk7MYcqep3q/Azo7tHrqgE+EntxaTk4lY0dx8eA==",
+      "version": "5.19.3",
+      "resolved": "https://registry.npmjs.org/antd/-/antd-5.19.3.tgz",
+      "integrity": "sha512-rhGI6yyZ4dA2MWl9bfO0MZjtNwWdzITpp3u7pKLiQpTjJYFlpF5wDFgGaG1or3sqyBihvqcO/OF1hSggmWczbQ==",
      "dependencies": {
        "@ant-design/colors": "^7.1.0",
        "@ant-design/cssinjs": "^1.21.0",
        "@ant-design/icons": "^5.3.7",
        "@ant-design/react-slick": "~1.1.2",
-        "@babel/runtime": "^7.24.7",
+        "@babel/runtime": "^7.24.8",
        "@ctrl/tinycolor": "^3.6.1",
        "@rc-component/color-picker": "~1.5.3",
        "@rc-component/mutate-observer": "^1.1.0",
@@ -6301,7 +6326,7 @@
        "rc-rate": "~2.13.0",
        "rc-resize-observer": "^1.4.0",
        "rc-segmented": "~2.3.0",
-        "rc-select": "~14.15.0",
+        "rc-select": "~14.15.1",
        "rc-slider": "~10.6.2",
        "rc-steps": "~6.0.1",
        "rc-switch": "~4.1.0",
@@ -6314,7 +6339,7 @@
        "rc-upload": "~4.6.0",
        "rc-util": "^5.43.0",
        "scroll-into-view-if-needed": "^3.1.0",
-        "throttle-debounce": "^5.0.0"
+        "throttle-debounce": "^5.0.2"
      },
      "funding": {
        "type": "opencollective",
@@ -8082,9 +8107,9 @@
      "integrity": "sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw=="
    },
    "node_modules/cypress": {
-      "version": "13.13.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.13.0.tgz",
-      "integrity": "sha512-ou/MQUDq4tcDJI2FsPaod2FZpex4kpIK43JJlcBgWrX8WX7R/05ZxGTuxedOuZBfxjZxja+fbijZGyxiLP6CFA==",
+      "version": "13.13.1",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.13.1.tgz",
+      "integrity": "sha512-8F9UjL5MDUdgC/S5hr8CGLHbS5gGht5UOV184qc2pFny43fnkoaKxlzH/U6//zmGu/xRTaKimNfjknLT8+UDFg==",
      "dev": true,
      "hasInstallScript": true,
      "dependencies": {
@@ -8427,9 +8452,9 @@
      "integrity": "sha512-QWxYLR5P/6GStZcdem+V1xoto6DMadYWpMXU82ES3/RfR3Wdwr3D0+be7mgOJ+Ov0G9D5Dmb9T17sNLQYj9XOg=="
    },
    "node_modules/dayjs": {
-      "version": "1.11.11",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz",
-      "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="
+      "version": "1.11.12",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.12.tgz",
+      "integrity": "sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg=="
    },
    "node_modules/dayjs-business-days2": {
      "version": "1.2.2",
@@ -10156,16 +10181,16 @@
      }
    },
    "node_modules/firebase": {
-      "version": "10.12.3",
-      "resolved": "https://registry.npmjs.org/firebase/-/firebase-10.12.3.tgz",
-      "integrity": "sha512-dO2cQ8eP6RnM2wcGzbxnoljjjMBf1suUrHYFftjSpbPn/8bEx959cwTRDHqBx3MwSzNsg6zZV/wiWydJPhUKgw==",
+      "version": "10.12.4",
+      "resolved": "https://registry.npmjs.org/firebase/-/firebase-10.12.4.tgz",
+      "integrity": "sha512-SQz49NMpwG4MLTPZ9C8jBp7IyS2haTvsIvjclgu+v/jvzNtjZoxIcoF6A13EIfBHmJ5eiuVlvttxElOf7LnJew==",
      "dependencies": {
-        "@firebase/analytics": "0.10.5",
-        "@firebase/analytics-compat": "0.2.11",
-        "@firebase/app": "0.10.6",
-        "@firebase/app-check": "0.8.5",
-        "@firebase/app-check-compat": "0.3.12",
-        "@firebase/app-compat": "0.2.36",
+        "@firebase/analytics": "0.10.6",
+        "@firebase/analytics-compat": "0.2.12",
+        "@firebase/app": "0.10.7",
+        "@firebase/app-check": "0.8.6",
+        "@firebase/app-check-compat": "0.3.13",
+        "@firebase/app-compat": "0.2.37",
        "@firebase/app-types": "0.9.2",
        "@firebase/auth": "1.7.5",
        "@firebase/auth-compat": "0.5.10",
@@ -10865,9 +10890,9 @@
      }
    },
    "node_modules/i18next": {
-      "version": "23.12.1",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.1.tgz",
-      "integrity": "sha512-l4y291ZGRgUhKuqVSiqyuU2DDzxKStlIWSaoNBR4grYmh0X+pRYbFpTMs3CnJ5ECKbOI8sQcJ3PbTUfLgPRaMA==",
+      "version": "23.12.2",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.2.tgz",
+      "integrity": "sha512-XIeh5V+bi8SJSWGL3jqbTEBW5oD6rbP5L+E7dVQh1MNTxxYef0x15rhJVcRb7oiuq4jLtgy2SD8eFlf6P2cmqg==",
      "funding": [
        {
          "type": "individual",
@@ -12191,9 +12216,9 @@
      }
    },
    "node_modules/logrocket": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/logrocket/-/logrocket-8.1.0.tgz",
-      "integrity": "sha512-0PRv9lnS90KBrL3mfiQzcKEPvNT3N55pRN0PRe/q3DqWFQbIW1p72MmMp9a3Qi9la6o+TXri7r68ZE0AM7vsDA=="
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/logrocket/-/logrocket-8.1.1.tgz",
+      "integrity": "sha512-7k2ZZPe35GwdJssk2+xWYfFOi7/EpIwvGHxZHvilWfqkRfEoe/Ntx0DUVfkzn0V+/l7rg1VPQwAlystLMeqCwA=="
    },
    "node_modules/long": {
      "version": "5.2.3",
@@ -14518,9 +14543,9 @@
      }
    },
    "node_modules/rc-select": {
-      "version": "14.15.0",
-      "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.15.0.tgz",
-      "integrity": "sha512-BDqnDLhhm/8VyyyDlX7ju06S75k6ObJvbsN86zqZ4SY1Fu2ANQxeSWPo7pnwx5nwA5JgG+HcQevtddAgsdeBVQ==",
+      "version": "14.15.1",
+      "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.15.1.tgz",
+      "integrity": "sha512-mGvuwW1RMm1NCSI8ZUoRoLRK51R2Nb+QJnmiAvbDRcjh2//ulCkxeV6ZRFTECPpE1t2DPfyqZMPw90SVJzQ7wQ==",
      "dependencies": {
        "@babel/runtime": "^7.10.1",
        "@rc-component/trigger": "^2.1.1",
@@ -15150,11 +15175,11 @@
      }
    },
    "node_modules/react-router": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.24.1.tgz",
-      "integrity": "sha512-PTXFXGK2pyXpHzVo3rR9H7ip4lSPZZc0bHG5CARmj65fTT6qG7sTngmb6lcYu1gf3y/8KxORoy9yn59pGpCnpg==",
+      "version": "6.25.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.25.1.tgz",
+      "integrity": "sha512-u8ELFr5Z6g02nUtpPAggP73Jigj1mRePSwhS/2nkTrlPU5yEkH1vYzWNyvSnSzeeE2DNqWdH+P8OhIh9wuXhTw==",
      "dependencies": {
-        "@remix-run/router": "1.17.1"
+        "@remix-run/router": "1.18.0"
      },
      "engines": {
        "node": ">=14.0.0"
@@ -15164,12 +15189,12 @@
      }
    },
    "node_modules/react-router-dom": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.24.1.tgz",
-      "integrity": "sha512-U19KtXqooqw967Vw0Qcn5cOvrX5Ejo9ORmOtJMzYWtCT4/WOfFLIZGGsVLxcd9UkBO0mSTZtXqhZBsWlHr7+Sg==",
+      "version": "6.25.1",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.25.1.tgz",
+      "integrity": "sha512-0tUDpbFvk35iv+N89dWNrJp+afLgd+y4VtorJZuOCXK0kkCWjEvb3vTJM++SYvMEpbVwXKf3FjeVveVEb6JpDQ==",
      "dependencies": {
-        "@remix-run/router": "1.17.1",
-        "react-router": "6.24.1"
+        "@remix-run/router": "1.18.0",
+        "react-router": "6.25.1"
      },
      "engines": {
        "node": ">=14.0.0"
@@ -15885,6 +15910,11 @@
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
      "dev": true
    },
+    "node_modules/safevalues": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/safevalues/-/safevalues-0.6.0.tgz",
+      "integrity": "sha512-MZ7DcTOcIoPXN36/UONVE9BT0pmwlCr9WcS7Pj/q4FxOwr33FkWC0CUWj/THQXYWxf/F7urbhaHaOeFPSqGqHA=="
+    },
    "node_modules/sass": {
      "version": "1.77.8",
      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz",
@@ -16593,9 +16623,9 @@
      }
    },
    "node_modules/styled-components": {
-      "version": "6.1.11",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.11.tgz",
-      "integrity": "sha512-Ui0jXPzbp1phYij90h12ksljKGqF8ncGx+pjrNPsSPhbUUjWT2tD1FwGo2LF6USCnbrsIhNngDfodhxbegfEOA==",
+      "version": "6.1.12",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.12.tgz",
+      "integrity": "sha512-n/O4PzRPhbYI0k1vKKayfti3C/IGcPf+DqcrOB7O/ab9x4u/zjqraneT5N45+sIe87cxrCApXM8Bna7NYxwoTA==",
      "dependencies": {
        "@emotion/is-prop-valid": "1.2.2",
        "@emotion/unitless": "0.8.1",
@@ -16619,6 +16649,14 @@
        "react-dom": ">= 16.8.0"
      }
    },
+    "node_modules/styled-components/node_modules/@emotion/is-prop-valid": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz",
+      "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==",
+      "dependencies": {
+        "@emotion/memoize": "^0.8.1"
+      }
+    },
    "node_modules/styled-components/node_modules/@emotion/unitless": {
      "version": "0.8.1",
      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
@@ -16880,9 +16918,9 @@
      }
    },
    "node_modules/throttle-debounce": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-5.0.0.tgz",
-      "integrity": "sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-5.0.2.tgz",
+      "integrity": "sha512-B71/4oyj61iNH0KeCamLuE2rmKuTO5byTOSVwECM5FA7TiAiAW+UqTKZ9ERueC4qvgSttUhdmq1mXC3kJqGX7A==",
      "engines": {
        "node": ">=12.22"
      }
--- a/client/package.json
+++ b/client/package.json
@@ -8,9 +8,9 @@
  "private": true,
  "proxy": "http://localhost:4000",
  "dependencies": {
-    "@ant-design/pro-layout": "^7.19.10",
+    "@ant-design/pro-layout": "^7.19.11",
    "@apollo/client": "^3.10.8",
-    "@emotion/is-prop-valid": "^1.2.2",
+    "@emotion/is-prop-valid": "^1.3.0",
    "@fingerprintjs/fingerprintjs": "^4.4.3",
    "@jsreport/browser-client": "^3.1.0",
    "@reduxjs/toolkit": "^2.2.6",
@@ -19,26 +19,26 @@
    "@splitsoftware/splitio-react": "^1.12.0",
    "@tanem/react-nprogress": "^5.0.51",
    "@vitejs/plugin-react": "^4.3.1",
-    "antd": "^5.19.2",
+    "antd": "^5.19.3",
    "apollo-link-logger": "^2.0.1",
    "apollo-link-sentry": "^3.3.0",
    "autosize": "^6.0.1",
    "axios": "^1.6.8",
    "classnames": "^2.5.1",
    "css-box-model": "^1.2.1",
-    "dayjs": "^1.11.11",
+    "dayjs": "^1.11.12",
    "dayjs-business-days2": "^1.2.2",
    "dinero.js": "^1.9.1",
    "dotenv": "^16.4.5",
    "env-cmd": "^10.1.0",
    "exifr": "^7.1.3",
-    "firebase": "^10.12.3",
+    "firebase": "^10.12.4",
    "graphql": "^16.9.0",
-    "i18next": "^23.12.1",
+    "i18next": "^23.12.2",
    "i18next-browser-languagedetector": "^8.0.0",
    "immutability-helper": "^3.1.1",
    "libphonenumber-js": "^1.11.4",
-    "logrocket": "^8.1.0",
+    "logrocket": "^8.1.1",
    "markerjs2": "^2.32.1",
    "memoize-one": "^6.0.0",
    "normalize-url": "^8.0.1",
@@ -64,7 +64,7 @@
    "react-product-fruits": "^2.2.6",
    "react-redux": "^9.1.2",
    "react-resizable": "^3.0.5",
-    "react-router-dom": "^6.24.1",
+    "react-router-dom": "^6.25.1",
    "react-sticky": "^6.0.3",
    "react-virtualized": "^9.22.5",
    "react-virtuoso": "^4.7.12",
@@ -77,7 +77,7 @@
    "reselect": "^5.1.1",
    "sass": "^1.77.8",
    "socket.io-client": "^4.7.5",
-    "styled-components": "^6.1.11",
+    "styled-components": "^6.1.12",
    "subscriptions-transport-ws": "^0.11.0",
    "use-memo-one": "^1.1.3",
    "userpilot": "^1.3.2",
@@ -132,14 +132,14 @@
    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
    "@babel/preset-react": "^7.24.7",
    "@dotenvx/dotenvx": "^1.6.4",
-    "@emotion/babel-plugin": "^11.11.0",
-    "@emotion/react": "^11.11.4",
+    "@emotion/babel-plugin": "^11.12.0",
+    "@emotion/react": "^11.12.0",
    "@sentry/webpack-plugin": "^2.21.1",
    "@testing-library/cypress": "^10.0.2",
    "browserslist": "^4.23.2",
    "browserslist-to-esbuild": "^2.1.1",
    "cross-env": "^7.0.3",
-    "cypress": "^13.13.0",
+    "cypress": "^13.13.1",
    "eslint": "^8.57.0",
    "eslint-config-react-app": "^7.0.1",
    "eslint-plugin-cypress": "^2.15.1",
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -1,15 +1,13 @@
 import { useSplitClient } from "@splitsoftware/splitio-react";
 import { Button, Result } from "antd";
 import LogRocket from "logrocket";
-import React, { lazy, Suspense, useEffect, useMemo, useState } from "react";
+import React, { lazy, Suspense, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Route, Routes } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import DocumentEditorContainer from "../components/document-editor/document-editor.container";
-import ErrorBoundary from "../components/error-boundary/error-boundary.component";
-
-// Component Imports
+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";
@@ -23,7 +21,7 @@ import "./App.styles.scss";
 import handleBeta from "../utils/betaHandler";
 import Eula from "../components/eula/eula.component";
 import InstanceRenderMgr from "../utils/instanceRenderMgr";
-import { ProductFruits } from "react-product-fruits";
+import ProductFruitsWrapper from "./ProductFruitsWrapper.jsx";

 const ResetPassword = lazy(() => import("../pages/reset-password/reset-password.component"));
 const ManagePage = lazy(() => import("../pages/manage/manage.page.container"));
@@ -48,23 +46,6 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
  const [listenersAdded, setListenersAdded] = useState(false);
  const { t } = useTranslation();

-  const workspaceCode = useMemo(
-    () =>
-      InstanceRenderMgr({
-        imex: null,
-        rome: "9BkbEseqNqxw8jUH",
-        promanager: "aoJoEifvezYI0Z0P"
-      }),
-    []
-  );
-
-  const workspaceLogin = useMemo(
-    () => ({
-      email: currentUser.email,
-      username: currentUser.email
-    }),
-    [currentUser.email]
-  );
  useEffect(() => {
    if (!navigator.onLine) {
      setOnline(false);
@@ -73,6 +54,10 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
    checkUserSession();
  }, [checkUserSession, setOnline]);

+  //const b = Grid.useBreakpoint();
+  // console.log("Breakpoints:", b);
+
+  // Associate event listeners, memoize to prevent multiple listeners being added
  useEffect(() => {
    const offlineListener = () => {
      setOnline(false);
@@ -144,6 +129,7 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
    return <Eula />;
  }

+  // Any route that is not assigned and matched will default to the Landing Page component
  return (
    <Suspense
      fallback={
@@ -156,9 +142,14 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
        />
      }
    >
-      {currentUser && currentUser.email && (
-        <ProductFruits workspaceCode={workspaceCode} debug language="en" user={workspaceLogin} />
-      )}
+      <ProductFruitsWrapper
+        currentUser={currentUser}
+        workspaceCode={InstanceRenderMgr({
+          imex: null,
+          rome: "9BkbEseqNqxw8jUH",
+          promanager: "aoJoEifvezYI0Z0P"
+        })}
+      />

      <Routes>
        <Route
--- a/client/src/App/ProductFruitsWrapper.jsx
+++ b/client/src/App/ProductFruitsWrapper.jsx
@@ -0,0 +1,32 @@
+import React from "react";
+import { ProductFruits } from "react-product-fruits";
+import PropTypes from "prop-types";
+
+const ProductFruitsWrapper = React.memo(({ currentUser, workspaceCode }) => {
+  return (
+    workspaceCode &&
+    currentUser?.authorized === true &&
+    currentUser?.email && (
+      <ProductFruits
+        lifeCycle="unmount"
+        workspaceCode={workspaceCode}
+        debug
+        language="en"
+        user={{
+          email: currentUser.email,
+          username: currentUser.email
+        }}
+      />
+    )
+  );
+});
+
+export default ProductFruitsWrapper;
+
+ProductFruitsWrapper.propTypes = {
+  currentUser: PropTypes.shape({
+    authorized: PropTypes.bool,
+    email: PropTypes.string
+  }),
+  workspaceCode: PropTypes.string
+};
--- a/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx
@@ -3,7 +3,7 @@ import React from "react";
 import { useQuery } from "@apollo/client";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { QUERY_BILLS_BY_JOBID } from "../../graphql/bills.queries";
+import { QUERY_PARTS_BILLS_BY_JOBID } from "../../graphql/bills.queries";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
@@ -19,7 +19,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardBills);

 export function JobCloseRoGuardBills({ job, jobRO, bodyshop, form, warningCallback }) {
-  const { loading, error, data } = useQuery(QUERY_BILLS_BY_JOBID, {
+  const { loading, error, data } = useQuery(QUERY_PARTS_BILLS_BY_JOBID, {
    variables: { jobid: job.id },
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only"
--- a/client/src/components/job-detail-lines/job-lines-expander.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines-expander.component.jsx
@@ -2,27 +2,30 @@ import { useQuery } from "@apollo/client";
 import { Col, Row, Skeleton, Space, Timeline, Typography } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
 import { Link } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import { GET_JOB_LINE_ORDERS } from "../../graphql/jobs.queries";
+import { QUERY_JOBLINE_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
+import { selectTechnician } from "../../redux/tech/tech.selectors.js";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { QUERY_JOBLINE_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
-import TaskListContainer from "../task-list/task-list.container.jsx";
+import BillDetailEditcontainer from "../bill-detail-edit/bill-detail-edit.container.jsx";
 import FeatureWrapper from "../feature-wrapper/feature-wrapper.component.jsx";
+import TaskListContainer from "../task-list/task-list.container.jsx";

 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
+  technician: selectTechnician
 });

 const mapDispatchToProps = (dispatch) => ({});

 export default connect(mapStateToProps, mapDispatchToProps)(JobLinesExpander);

-export function JobLinesExpander({ jobline, jobid, bodyshop }) {
+export function JobLinesExpander({ jobline, jobid, bodyshop, technician }) {
  const { t } = useTranslation();
  const { loading, error, data } = useQuery(GET_JOB_LINE_ORDERS, {
    fetchPolicy: "network-only",
@@ -47,9 +50,15 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
                  children: (
                    <Row wrap>
                      <Col span={4}>
-                        <Link to={`/manage/jobs/${jobid}?partsorderid=${line.parts_order.id}`}>
-                          {line.parts_order.order_number}
-                        </Link>
+                        {!technician ? (
+                          <>
+                            <Link to={`/manage/jobs/${jobid}?partsorderid=${line.parts_order.id}`}>
+                              {line.parts_order.order_number}
+                            </Link>
+                          </>
+                        ) : (
+                          `${line.parts_order.order_number}`
+                        )}
                      </Col>
                      <Col span={4}>
                        <DateFormatter>{line.parts_order.order_date}</DateFormatter>
@@ -84,17 +93,17 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
                  key: line.id,
                  children: (
                    <Row>
-                      <Col span={8}>
-                        <Link to={`/manage/jobs/${jobid}?partsorderid=${line.id}`}>{line.parts_dispatch.number}</Link>
-                      </Col>
+                      <Col span={8}>{line.parts_dispatch.number}</Col>
                      <Col span={8}>
                        {bodyshop.employees.find((e) => e.id === line.parts_dispatch.employeeid)?.first_name}
                      </Col>
                      <Col span={8}>
-                        <Space>
-                          {t("parts_dispatch_lines.fields.accepted_at")}
-                          <DateFormatter>{line.accepted_at}</DateFormatter>
-                        </Space>
+                        {line.accepted_at ? (
+                          <Space>
+                            {t("parts_dispatch_lines.fields.accepted_at")}
+                            <DateFormatter>{line.accepted_at}</DateFormatter>
+                          </Space>
+                        ) : null}
                      </Col>
                    </Row>
                  )
@@ -111,6 +120,7 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
      <FeatureWrapper featureName="bills" noauth={() => null}>
        <Col md={24} lg={8}>
          <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
+          <BillDetailEditcontainer />
          <Timeline
            items={
              data.billlines.length > 0
@@ -119,9 +129,15 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
                    children: (
                      <Row wrap>
                        <Col span={4}>
-                          <Link to={`/manage/jobs/${jobid}?tab=partssublet&billid=${line.bill.id}`}>
-                            {line.bill.invoice_number}
-                          </Link>
+                          {!technician ? (
+                            <>
+                              <Link to={`/manage/jobs/${jobid}?tab=partssublet&billid=${line.bill.id}`}>
+                                {line.bill.invoice_number}
+                              </Link>
+                            </>
+                          ) : (
+                            `${line.bill.invoice_number}`
+                          )}
                        </Col>
                        <Col span={4}>
                          <span>
--- a/client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx
@@ -3,13 +3,21 @@ import { Button, Form, notification, Popover, Tooltip } from "antd";
 import axios from "axios";
 import { t } from "i18next";
 import React, { useState } from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import { UPDATE_LINE_PPC } from "../../graphql/jobs-lines.queries";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
 import JobLineConvertToLabor from "../job-line-convert-to-labor/job-line-convert-to-labor.component";

-export default function JobLinesPartPriceChange({ job, line, refetch }) {
+const mapStateToProps = createStructuredSelector({
+  technician: selectTechnician
+});
+const mapDispatchToProps = (dispatch) => ({});
+
+export function JobLinesPartPriceChange({ job, line, refetch, technician }) {
  const [loading, setLoading] = useState(false);
  const [updatePartPrice] = useMutation(UPDATE_LINE_PPC);

@@ -52,7 +60,7 @@ export default function JobLinesPartPriceChange({ job, line, refetch }) {
    }
  };

-  const popcontent = InstanceRenderManager({
+  const popcontent = !technician && InstanceRenderManager({
    imex: null,
    rome: (
      <Form layout="vertical" onFinish={handleFinish} initialValues={{ act_price: line.act_price }}>
@@ -95,3 +103,4 @@ export default function JobLinesPartPriceChange({ job, line, refetch }) {
    </JobLineConvertToLabor>
  );
 }
+export default connect(mapStateToProps, mapDispatchToProps)(JobLinesPartPriceChange);
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -31,19 +31,20 @@ import JobLinesBillRefernece from "../job-lines-bill-reference/job-lines-bill-re
 // import AllocationsEmployeeLabelContainer from "../allocations-employee-label/allocations-employee-label.container";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import _ from "lodash";
+import { FaTasks } from "react-icons/fa";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import dayjs from "../../utils/day";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import JobCreateIOU from "../job-create-iou/job-create-iou.component";
 import JobLineBulkAssignComponent from "../job-line-bulk-assign/job-line-bulk-assign.component";
 import JobLineDispatchButton from "../job-line-dispatch-button/job-line-dispatch-button.component";
 import JoblineTeamAssignment from "../job-line-team-assignment/job-line-team-assignmnent.component";
 import JobSendPartPriceChangeComponent from "../job-send-parts-price-change/job-send-parts-price-change.component";
+import PartsOrderDrawer from "../parts-order-list-table/parts-order-list-table-drawer.component";
 import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
 import JobLinesExpander from "./job-lines-expander.component";
 import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
-import { FaTasks } from "react-icons/fa";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -54,6 +55,7 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
  setJobLineEditContext: (context) => dispatch(setModalContext({ context: context, modal: "jobLineEdit" })),
  setPartsOrderContext: (context) => dispatch(setModalContext({ context: context, modal: "partsOrder" })),
+  setPartsReceiveContext: (context) => dispatch(setModalContext({ context: context, modal: "partsReceive" })),
  setBillEnterContext: (context) => dispatch(setModalContext({ context: context, modal: "billEnter" })),
  setTaskUpsertContext: (context) => dispatch(setModalContext({ context, modal: "taskUpsert" }))
 });
@@ -63,6 +65,7 @@ export function JobLinesComponent({
  jobRO,
  technician,
  setPartsOrderContext,
+  setPartsReceiveContext,
  loading,
  refetch,
  jobLines,
@@ -71,7 +74,11 @@ export function JobLinesComponent({
  setJobLineEditContext,
  form,
  setBillEnterContext,
-  setTaskUpsertContext
+  setTaskUpsertContext,
+  billsQuery,
+  handleBillOnRowClick,
+  handlePartsOrderOnRowClick,
+  handlePartsDispatchOnRowClick
 }) {
  const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);
  const {
@@ -198,7 +205,6 @@ export function JobLinesComponent({
      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",
@@ -213,7 +219,6 @@ export function JobLinesComponent({
      dataIndex: "part_qty",
      key: "part_qty"
    },
-
    // {
    //   title: t('joblines.fields.tax_part'),
    //   dataIndex: 'tax_part',
@@ -322,7 +327,7 @@ export function JobLinesComponent({
      key: "actions",
      render: (text, record) => (
        <Space>
-          {(record.manual_line || jobIsPrivate) && (
+          {(record.manual_line || jobIsPrivate) && !technician && (
            <>
              <Button
                disabled={jobRO}
@@ -337,7 +342,6 @@ export function JobLinesComponent({
              </Button>
            </>
          )}
-
          <Button
            title={t("tasks.buttons.create")}
            onClick={() => {
@@ -351,7 +355,7 @@ export function JobLinesComponent({
          >
            <FaTasks />
          </Button>
-          {(record.manual_line || jobIsPrivate) && (
+          {(record.manual_line || jobIsPrivate) && !technician && (
            <>
              <Button
                disabled={jobRO}
@@ -437,6 +441,15 @@ export function JobLinesComponent({
  return (
    <div>
      <PartsOrderModalContainer />
+      {!technician && (
+        <PartsOrderDrawer
+          job={job}
+          billsQuery={billsQuery}
+          handleOnRowClick={handlePartsOrderOnRowClick}
+          setPartsReceiveContext={setPartsReceiveContext}
+          setTaskUpsertContext={setTaskUpsertContext}
+        />
+      )}
      <PageHeader
        title={t("jobs.labels.estimatelines")}
        extra={
@@ -553,7 +566,7 @@ export function JobLinesComponent({
            >
              {t("joblines.actions.new")}
            </Button>
-            {InstanceRenderManager({ rome: <JobSendPartPriceChangeComponent job={job} /> })}
+            {InstanceRenderManager({ rome: <JobSendPartPriceChangeComponent job={job} disabled={technician} /> })}
            <JobCreateIOU job={job} selectedJobLines={selectedLines} />
            <Input.Search
              placeholder={t("general.labels.search")}
--- a/client/src/components/job-detail-lines/job-lines.container.jsx
+++ b/client/src/components/job-detail-lines/job-lines.container.jsx
@@ -1,7 +1,17 @@
 import React, { useMemo, useState } from "react";
 import JobLinesComponent from "./job-lines.component";

-function JobLinesContainer({ job, joblines, refetch, form, ...rest }) {
+function JobLinesContainer({
+  job,
+  joblines,
+  billsQuery,
+  handleBillOnRowClick,
+  handlePartsOrderOnRowClick,
+  handlePartsDispatchOnRowClick,
+  refetch,
+  form,
+  ...rest
+}) {
  const [searchText, setSearchText] = useState("");

  const jobLines = useMemo(() => {
@@ -22,7 +32,19 @@ function JobLinesContainer({ job, joblines, refetch, form, ...rest }) {
  }, [joblines, searchText]);

  return (
-    <JobLinesComponent refetch={refetch} jobLines={jobLines} setSearchText={setSearchText} job={job} form={form} />
+    <div>
+      <JobLinesComponent
+        refetch={refetch}
+        jobLines={jobLines}
+        billsQuery={billsQuery}
+        handleBillOnRowClick={handleBillOnRowClick}
+        handlePartsOrderOnRowClick={handlePartsOrderOnRowClick}
+        handlePartsDispatchOnRowClick={handlePartsDispatchOnRowClick}
+        setSearchText={setSearchText}
+        job={job}
+        form={form}
+      />
+    </div>
  );
 }

--- a/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
+++ b/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
@@ -11,17 +11,18 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";

 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
+  technician: selectTechnician
 });
 const mapDispatchToProps = (dispatch) => ({
  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobLineConvertToLabor);

-export function JobLineConvertToLabor({ children, jobline, job, insertAuditTrail, ...otherBtnProps }) {
+export function JobLineConvertToLabor({ children, jobline, job, insertAuditTrail, technician, ...otherBtnProps }) {
  const { t } = useTranslation();

  const [loading, setLoading] = useState(false);
@@ -165,7 +166,7 @@ export function JobLineConvertToLabor({ children, jobline, job, insertAuditTrail
  return (
    <>
      {children}
-      {jobline.act_price !== 0 && (
+      {jobline.act_price !== 0 && !technician && (
        <Popover disabled={jobline.convertedtolbr} content={overlay} open={visibility} placement="bottom">
          <Tooltip title={t("joblines.actions.converttolabor")}>
            <Button
--- a/client/src/components/job-send-parts-price-change/job-send-parts-price-change.component.jsx
+++ b/client/src/components/job-send-parts-price-change/job-send-parts-price-change.component.jsx
@@ -3,7 +3,7 @@ import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";

-export default function JobSendPartPriceChangeComponent({ job }) {
+export default function JobSendPartPriceChangeComponent({ job, disabled }) {
  const { t } = useTranslation();
  const [loading, setLoading] = useState(false);
  const handleClick = async () => {
@@ -24,7 +24,7 @@ export default function JobSendPartPriceChangeComponent({ job }) {
  };

  return (
-    <Button onClick={handleClick} loading={loading}>
+    <Button onClick={handleClick} loading={loading} disabled={disabled}>
      {t("jobs.actions.sendpartspricechange")}
    </Button>
  );
--- 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
@@ -3,8 +3,8 @@ import Dinero from "dinero.js";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort } from "../../utils/sorters";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import { alphaSort } from "../../utils/sorters";

 export default function JobTotalsTableLabor({ job }) {
  const { t } = useTranslation();
@@ -56,16 +56,49 @@ export default function JobTotalsTableLabor({ job }) {
      sortOrder: state.sortedInfo.columnKey === "mod_lb_hrs" && state.sortedInfo.order,
      render: (text, record) => record.hours.toFixed(1)
    },
-    {
-      title: t("joblines.fields.total"),
-      dataIndex: "total",
-      key: "total",
-      align: "right",
-      sorter: (a, b) => a.total.amount - b.total.amount,
-      sortOrder: state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
-
-      render: (text, record) => Dinero(record.total).toFormat()
-    }
+    ...InstanceRenderManager({
+      imex: [
+        {
+          title: t("joblines.fields.total"),
+          dataIndex: "total",
+          key: "total",
+          align: "right",
+          sorter: (a, b) => a.total.amount - b.total.amount,
+          sortOrder: state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
+          render: (text, record) => Dinero(record.total).toFormat()
+        }
+      ],
+      rome: [
+        {
+          title: t("joblines.fields.amount"),
+          dataIndex: "base",
+          key: "base",
+          align: "right",
+          sorter: (a, b) => a.base.amount - b.base.amount,
+          sortOrder: state.sortedInfo.columnKey === "base" && state.sortedInfo.order,
+          render: (text, record) => Dinero(record.base).toFormat()
+        },
+        {
+          title: t("joblines.fields.adjustment"),
+          dataIndex: "adjustment",
+          key: "adjustment",
+          align: "right",
+          sorter: (a, b) => a.adjustment.amount - b.adjustment.amount,
+          sortOrder: state.sortedInfo.columnKey === "adjustment" && state.sortedInfo.order,
+          render: (text, record) => Dinero(record.adjustment).toFormat()
+        },
+        {
+          title: t("joblines.fields.total"),
+          dataIndex: "total",
+          key: "total",
+          align: "right",
+          sorter: (a, b) => a.total.amount - b.total.amount,
+          sortOrder: state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
+          render: (text, record) => Dinero(record.total).toFormat()
+        }
+      ],
+      promanager: "USE_ROME"
+    })
  ];

  const handleTableChange = (pagination, filters, sorter) => {
@@ -91,6 +124,16 @@ export default function JobTotalsTableLabor({ job }) {
            <Table.Summary.Cell>
              {(job.job_totals.rates.mapa.hours + job.job_totals.rates.mash.hours).toFixed(1)}
            </Table.Summary.Cell>
+            {InstanceRenderManager({
+              imex: null,
+              rome: (
+                <>
+                  <Table.Summary.Cell />
+                  <Table.Summary.Cell />
+                </>
+              ),
+              promanager: "USE_ROME"
+            })}
            <Table.Summary.Cell align="right">
              <strong>{Dinero(job.job_totals.rates.rates_subtotal).toFormat()}</strong>
            </Table.Summary.Cell>
@@ -122,7 +165,29 @@ export default function JobTotalsTableLabor({ job }) {
              <CurrencyFormatter>{job.job_totals.rates.mapa.rate}</CurrencyFormatter>
            </Table.Summary.Cell>
            <Table.Summary.Cell>{job.job_totals.rates.mapa.hours.toFixed(1)}</Table.Summary.Cell>
-            <Table.Summary.Cell align="right">{Dinero(job.job_totals.rates.mapa.total).toFormat()}</Table.Summary.Cell>
+            {InstanceRenderManager({
+              imex: (
+                <>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mapa.total).toFormat()}
+                  </Table.Summary.Cell>
+                </>
+              ),
+              rome: (
+                <>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mapa.base).toFormat()}
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mapa.adjustment).toFormat()}
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mapa.total).toFormat()}
+                  </Table.Summary.Cell>
+                </>
+              ),
+              promanager: "USE_ROME"
+            })}
          </Table.Summary.Row>
          <Table.Summary.Row>
            <Table.Summary.Cell>
@@ -151,7 +216,29 @@ export default function JobTotalsTableLabor({ job }) {
              <CurrencyFormatter>{job.job_totals.rates.mash.rate}</CurrencyFormatter>
            </Table.Summary.Cell>
            <Table.Summary.Cell>{job.job_totals.rates.mash.hours.toFixed(1)}</Table.Summary.Cell>
-            <Table.Summary.Cell align="right">{Dinero(job.job_totals.rates.mash.total).toFormat()}</Table.Summary.Cell>
+            {InstanceRenderManager({
+              imex: (
+                <>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mash.total).toFormat()}
+                  </Table.Summary.Cell>
+                </>
+              ),
+              rome: (
+                <>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mash.base).toFormat()}
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mash.adjustment).toFormat()}
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mash.total).toFormat()}
+                  </Table.Summary.Cell>
+                </>
+              ),
+              promanager: "USE_ROME"
+            })}
          </Table.Summary.Row>
          <Table.Summary.Row>
            <Table.Summary.Cell>
@@ -159,6 +246,16 @@ export default function JobTotalsTableLabor({ job }) {
            </Table.Summary.Cell>
            <Table.Summary.Cell />
            <Table.Summary.Cell />
+            {InstanceRenderManager({
+              imex: null,
+              rome: (
+                <>
+                  <Table.Summary.Cell />
+                  <Table.Summary.Cell />
+                </>
+              ),
+              promanager: "USE_ROME"
+            })}
            <Table.Summary.Cell align="right">
              <strong>{Dinero(job.job_totals.rates.subtotal).toFormat()}</strong>
            </Table.Summary.Cell>
--- a/client/src/components/jobs-detail-pli/jobs-detail-pli.container.jsx
+++ b/client/src/components/jobs-detail-pli/jobs-detail-pli.container.jsx
@@ -1,55 +1,13 @@
-import { useQuery } from "@apollo/client";
-import queryString from "query-string";
 import React from "react";
-import { useLocation, useNavigate } from "react-router-dom";
-import { QUERY_BILLS_BY_JOBID } from "../../graphql/bills.queries";
 import JobsDetailPliComponent from "./jobs-detail-pli.component";

-export default function JobsDetailPliContainer({ job }) {
-  const billsQuery = useQuery(QUERY_BILLS_BY_JOBID, {
-    variables: { jobid: job.id },
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only"
-  });
-
-  const search = queryString.parse(useLocation().search);
-  const history = useNavigate();
-
-  const handleBillOnRowClick = (record) => {
-    if (record) {
-      if (record.id) {
-        search.billid = record.id;
-        history({ search: queryString.stringify(search) });
-      }
-    } else {
-      delete search.billid;
-      history({ search: queryString.stringify(search) });
-    }
-  };
-
-  const handlePartsOrderOnRowClick = (record) => {
-    if (record) {
-      if (record.id) {
-        search.partsorderid = record.id;
-        history({ search: queryString.stringify(search) });
-      }
-    } else {
-      delete search.partsorderid;
-      history({ search: queryString.stringify(search) });
-    }
-  };
-
-  const handlePartsDispatchOnRowClick = (record) => {
-    if (record) {
-      if (record.id) {
-        search.partsdispatchid = record.id;
-        history.push({ search: queryString.stringify(search) });
-      }
-    } else {
-      delete search.partsdispatchid;
-      history.push({ search: queryString.stringify(search) });
-    }
-  };
+export default function JobsDetailPliContainer({
+  job,
+  billsQuery,
+  handleBillOnRowClick,
+  handlePartsOrderOnRowClick,
+  handlePartsDispatchOnRowClick
+}) {
  return (
    <JobsDetailPliComponent
      job={job}
--- a/client/src/components/jobs-detail-rates/jobs-detail-rates.labor.component.jsx
+++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.labor.component.jsx
@@ -1,4 +1,4 @@
-import { Collapse, Form, Switch } from "antd";
+import { Collapse, Form, InputNumber, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -17,6 +17,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
    <Collapse defaultActiveKey={expanded && "rates"}>
      <Collapse.Panel forceRender header={t("jobs.labels.cieca_pfl")} key="cieca_pfl">
        <LayoutFormRow header={t("joblines.fields.lbr_types.LAB")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAB", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
            name={["cieca_pfl", "LAB", "lbr_tax_in"]}
@@ -24,6 +27,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          >
            <Switch disabled={jobRO} />
          </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAB", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAB", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
            name={["cieca_pfl", "LAB", "lbr_tx_in1"]}
@@ -61,6 +82,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          </Form.Item>
        </LayoutFormRow>
        <LayoutFormRow header={t("joblines.fields.lbr_types.LAD")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAD", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
            name={["cieca_pfl", "LAD", "lbr_tax_in"]}
@@ -68,6 +92,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          >
            <Switch disabled={jobRO} />
          </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAD", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAD", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
            name={["cieca_pfl", "LAD", "lbr_tx_in1"]}
@@ -105,6 +147,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          </Form.Item>
        </LayoutFormRow>
        <LayoutFormRow header={t("joblines.fields.lbr_types.LAE")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAE", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
            name={["cieca_pfl", "LAE", "lbr_tax_in"]}
@@ -112,6 +157,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          >
            <Switch disabled={jobRO} />
          </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAE", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAE", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
            name={["cieca_pfl", "LAE", "lbr_tx_in1"]}
@@ -149,6 +212,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          </Form.Item>
        </LayoutFormRow>
        <LayoutFormRow header={t("joblines.fields.lbr_types.LAF")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAF", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
            name={["cieca_pfl", "LAF", "lbr_tax_in"]}
@@ -156,6 +222,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          >
            <Switch disabled={jobRO} />
          </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAF", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAF", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
            name={["cieca_pfl", "LAF", "lbr_tx_in1"]}
@@ -193,6 +277,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          </Form.Item>
        </LayoutFormRow>
        <LayoutFormRow header={t("joblines.fields.lbr_types.LAG")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAG", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
            name={["cieca_pfl", "LAG", "lbr_tax_in"]}
@@ -200,6 +287,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          >
            <Switch disabled={jobRO} />
          </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAG", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAG", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
            name={["cieca_pfl", "LAG", "lbr_tx_in1"]}
@@ -237,6 +342,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          </Form.Item>
        </LayoutFormRow>
        <LayoutFormRow header={t("joblines.fields.lbr_types.LAM")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAM", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
            name={["cieca_pfl", "LAM", "lbr_tax_in"]}
@@ -244,6 +352,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          >
            <Switch disabled={jobRO} />
          </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAM", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAM", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
            name={["cieca_pfl", "LAM", "lbr_tx_in1"]}
@@ -281,6 +407,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          </Form.Item>
        </LayoutFormRow>
        <LayoutFormRow header={t("joblines.fields.lbr_types.LAR")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAR", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
            name={["cieca_pfl", "LAR", "lbr_tax_in"]}
@@ -288,6 +417,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          >
            <Switch disabled={jobRO} />
          </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAR", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAR", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
            name={["cieca_pfl", "LAR", "lbr_tx_in1"]}
@@ -325,6 +472,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          </Form.Item>
        </LayoutFormRow>
        <LayoutFormRow header={t("joblines.fields.lbr_types.LAS")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAS", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
            name={["cieca_pfl", "LAS", "lbr_tax_in"]}
@@ -332,6 +482,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          >
            <Switch disabled={jobRO} />
          </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAS", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAS", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
            name={["cieca_pfl", "LAS", "lbr_tx_in1"]}
@@ -369,6 +537,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          </Form.Item>
        </LayoutFormRow>
        <LayoutFormRow header={t("joblines.fields.lbr_types.LAU")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAU", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
            name={["cieca_pfl", "LAU", "lbr_tax_in"]}
@@ -376,6 +547,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
          >
            <Switch disabled={jobRO} />
          </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAU", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAU", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
            name={["cieca_pfl", "LAU", "lbr_tx_in1"]}
--- a/client/src/components/jobs-detail-rates/jobs-detail-rates.materials.component.jsx
+++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.materials.component.jsx
@@ -23,7 +23,9 @@ export function JobsDetailRatesMaterials({ jobRO, expanded, required = true, for
          <Form.Item label={t("jobs.fields.materials.cal_opcode")} name={["materials", "MAPA", "cal_opcode"]}>
            <Input disabled={jobRO} />
          </Form.Item>
-
+          <Form.Item label={t("jobs.fields.materials.mat_adjp")} name={["materials", "MAPA", "mat_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.materials.tax_ind")}
            name={["materials", "MAPA", "tax_ind"]}
@@ -31,6 +33,24 @@ export function JobsDetailRatesMaterials({ jobRO, expanded, required = true, for
          >
            <Switch />
          </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.materials.mat_taxp")}
+                  name={["materials", "MAPA", "mat_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["materials", "MAPA", "tax_ind"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.materials.mat_tx_in1")}
            name={["materials", "MAPA", "mat_tx_in1"]}
@@ -74,7 +94,9 @@ export function JobsDetailRatesMaterials({ jobRO, expanded, required = true, for
          <Form.Item label={t("jobs.fields.materials.cal_opcode")} name={["materials", "MASH", "cal_opcode"]}>
            <Input disabled={jobRO} />
          </Form.Item>
-
+          <Form.Item label={t("jobs.fields.materials.mat_adjp")} name={["materials", "MAPA", "mat_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.materials.tax_ind")}
            name={["materials", "MASH", "tax_ind"]}
@@ -82,6 +104,24 @@ export function JobsDetailRatesMaterials({ jobRO, expanded, required = true, for
          >
            <Switch />
          </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.materials.mat_taxp")}
+                  name={["materials", "MASH", "mat_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["materials", "MASH", "tax_ind"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
          <Form.Item
            label={t("jobs.fields.materials.mat_tx_in1")}
            name={["materials", "MASH", "mat_tx_in1"]}
--- a/client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx
+++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx
@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";

 const mapStateToProps = createStructuredSelector({
@@ -988,18 +989,24 @@ export function JobsDetailRatesParts({ jobRO, expanded, required = true, form })
          <Form.Item label={t("jobs.fields.tax_str_rt")} name="tax_str_rt">
            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
          </Form.Item>
-          <Form.Item label={t("jobs.fields.tax_paint_mat_rt")} name="tax_paint_mat_rt">
-            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
-          </Form.Item>
-          <Form.Item label={t("jobs.fields.tax_shop_mat_rt")} name="tax_shop_mat_rt">
-            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
-          </Form.Item>
+          {InstanceRenderManager({ imex: true, rome: false, promanager: "USE_ROME" }) ? (
+            <>
+              <Form.Item label={t("jobs.fields.tax_paint_mat_rt")} name="tax_paint_mat_rt">
+                <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+              </Form.Item>
+              <Form.Item label={t("jobs.fields.tax_shop_mat_rt")} name="tax_shop_mat_rt">
+                <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+              </Form.Item>{" "}
+            </>
+          ) : null}
          <Form.Item label={t("jobs.fields.tax_sub_rt")} name="tax_sub_rt">
            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
          </Form.Item>
-          <Form.Item label={t("jobs.fields.tax_lbr_rt")} name="tax_lbr_rt">
-            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
-          </Form.Item>
+          {InstanceRenderManager({ imex: true, rome: false, promanager: "USE_ROME" }) ? (
+            <Form.Item label={t("jobs.fields.tax_lbr_rt")} name="tax_lbr_rt">
+              <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+            </Form.Item>
+          ) : null}
          <Form.Item label={t("jobs.fields.tax_levies_rt")} name="tax_levies_rt">
            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
          </Form.Item>
--- a/client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx
+++ b/client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx
@@ -0,0 +1,411 @@
+import { DeleteFilled, EyeFilled } from "@ant-design/icons";
+import { PageHeader } from "@ant-design/pro-layout";
+import { useLazyQuery, useMutation } from "@apollo/client";
+import { Button, Drawer, Grid, Popconfirm, Space, Table } from "antd";
+
+import queryString from "query-string";
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { FaTasks } from "react-icons/fa";
+import { connect } from "react-redux";
+import { useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { QUERY_BILL_BY_PK } from "../../graphql/bills.queries";
+import { DELETE_PARTS_ORDER } from "../../graphql/parts-orders.queries";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { DateFormatter } from "../../utils/DateFormatter";
+import { TemplateList } from "../../utils/TemplateConstants";
+import { alphaSort } from "../../utils/sorters";
+import DataLabel from "../data-label/data-label.component";
+import FeatureWrapperComponent from "../feature-wrapper/feature-wrapper.component";
+import PartsOrderBackorderEta from "../parts-order-backorder-eta/parts-order-backorder-eta.component";
+import PartsOrderCmReceived from "../parts-order-cm-received/parts-order-cm-received.component";
+import PartsOrderDeleteLine from "../parts-order-delete-line/parts-order-delete-line.component";
+import PartsOrderLineBackorderButton from "../parts-order-line-backorder-button/parts-order-line-backorder-button.component";
+import PartsReceiveModalContainer from "../parts-receive-modal/parts-receive-modal.container";
+import PrintWrapper from "../print-wrapper/print-wrapper.component";
+
+const mapStateToProps = createStructuredSelector({
+  jobRO: selectJobReadOnly,
+  bodyshop: selectBodyshop
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setBillEnterContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "billEnter"
+      })
+    ),
+  setPartsReceiveContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "partsReceive"
+      })
+    ),
+  setTaskUpsertContext: (context) => dispatch(setModalContext({ context, modal: "taskUpsert" }))
+});
+
+export function PartsOrderListTableDrawerComponent({
+  setBillEnterContext,
+  bodyshop,
+  jobRO,
+  job,
+  billsQuery,
+  handleOnRowClick,
+  setPartsReceiveContext,
+  setTaskUpsertContext
+}) {
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
+
+  const bpoints = {
+    xs: "100%",
+    sm: "100%",
+    md: "100%",
+    lg: "75%",
+    xl: "75%",
+    xxl: "65%"
+  };
+  const drawerPercentage = selectedBreakpoint ? bpoints[selectedBreakpoint[0]] : "100%";
+  const responsibilityCenters = bodyshop.md_responsibility_centers;
+  const Templates = TemplateList("partsorder", { job });
+
+  const { t } = useTranslation();
+  const [state, setState] = useState({
+    sortedInfo: {}
+  });
+
+  const [returnfrombill, setReturnFromBill] = useState();
+  const [billData, setBillData] = useState();
+  const search = queryString.parse(useLocation().search);
+  const selectedpartsorder = search.partsorderid;
+
+  const [billQuery] = useLazyQuery(QUERY_BILL_BY_PK);
+  const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
+  const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
+  const { refetch } = billsQuery;
+
+  useEffect(() => {
+    if (returnfrombill === null) {
+      setBillData(null);
+    } else {
+      const fetchData = async () => {
+        const result = await billQuery({
+          variables: { billid: returnfrombill }
+        });
+        setBillData(result.data);
+      };
+      fetchData();
+    }
+  }, [returnfrombill, billQuery]);
+
+  const recordActions = (record, showView = false) => (
+    <Space direction="horizontal" wrap>
+      {showView && (
+        <Button
+          onClick={() => {
+            if (record.returnfrombill) {
+              setReturnFromBill(record.returnfrombill);
+            } else {
+              setReturnFromBill(null);
+            }
+            handleOnRowClick(record);
+          }}
+        >
+          <EyeFilled />
+        </Button>
+      )}
+
+      <Button
+        disabled={jobRO || record.return || record.vendor.id === bodyshop.inhousevendorid}
+        onClick={() => {
+          logImEXEvent("parts_order_receive_bill");
+          setPartsReceiveContext({
+            actions: { refetch: refetch },
+            context: {
+              jobId: job.id,
+              job: job,
+              partsorderlines: record.parts_order_lines.map((pol) => {
+                return {
+                  joblineid: pol.job_line_id,
+                  id: pol.id,
+                  line_desc: pol.line_desc,
+                  quantity: pol.quantity,
+                  act_price: pol.act_price,
+                  oem_partno: pol.oem_partno
+                };
+              })
+            }
+          });
+        }}
+      >
+        {t("parts_orders.actions.receive")}
+      </Button>
+      <Button
+        title={t("tasks.buttons.create")}
+        onClick={() => {
+          setTaskUpsertContext({
+            context: {
+              jobid: job.id,
+              partsorderid: record.id
+            }
+          });
+        }}
+      >
+        <FaTasks />
+      </Button>
+      <Popconfirm
+        title={t("parts_orders.labels.confirmdelete")}
+        disabled={jobRO}
+        onConfirm={async () => {
+          //Delete the parts return.!
+
+          await deletePartsOrder({
+            variables: { partsOrderId: record.id },
+            update(cache) {
+              cache.modify({
+                fields: {
+                  parts_orders(existingPartsOrders, { readField }) {
+                    return existingPartsOrders.filter((billref) => record.id !== readField("id", billref));
+                  }
+                }
+              });
+            }
+          });
+        }}
+      >
+        <Button disabled={jobRO}>
+          <DeleteFilled />
+        </Button>
+      </Popconfirm>
+      <FeatureWrapperComponent featureName="bills" noauth={() => null}>
+        <Button
+          disabled={(jobRO ? !record.return : jobRO) || record.vendor.id === bodyshop.inhousevendorid}
+          onClick={() => {
+            logImEXEvent("parts_order_receive_bill");
+
+            setBillEnterContext({
+              actions: { refetch: refetch },
+              context: {
+                job: job,
+                bill: {
+                  vendorid: record.vendor.id,
+                  is_credit_memo: record.return,
+                  billlines: record.parts_order_lines.map((pol) => {
+                    return {
+                      joblineid: pol.job_line_id || "noline",
+                      line_desc: pol.line_desc,
+                      quantity: pol.quantity,
+
+                      actual_price: pol.act_price,
+
+                      cost_center: pol.jobline?.part_type
+                        ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
+                          ? pol.jobline.part_type !== "PAE"
+                            ? pol.jobline.part_type
+                            : null
+                          : responsibilityCenters.defaults &&
+                            (responsibilityCenters.defaults.costs[pol.jobline.part_type] || null)
+                        : null
+                    };
+                  })
+                }
+              }
+            });
+          }}
+        >
+          {t("parts_orders.actions.receivebill")}
+        </Button>
+      </FeatureWrapperComponent>
+      <PrintWrapper
+        templateObject={{
+          name: record.return ? Templates.parts_return_slip.key : Templates.parts_order.key,
+          variables: { id: record.id }
+        }}
+        messageObject={{
+          subject: record.return ? Templates.parts_return_slip.subject : Templates.parts_order.subject,
+          to: record.vendor.email
+        }}
+        id={job.id}
+      />
+    </Space>
+  );
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };
+
+  const selectedPartsOrderRecord = parts_orders.find((r) => r.id === selectedpartsorder);
+
+  const rowExpander = (record) => {
+    const columns = [
+      {
+        title: t("parts_orders.fields.line_desc"),
+        dataIndex: "line_desc",
+        key: "line_desc",
+        sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
+        sortOrder: state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order
+      },
+      {
+        title: t("parts_orders.fields.quantity"),
+        dataIndex: "quantity",
+        key: "quantity",
+        sorter: (a, b) => a.quantity - b.quantity,
+        sortOrder: state.sortedInfo.columnKey === "quantity" && state.sortedInfo.order
+      },
+      {
+        title: t("parts_orders.fields.act_price"),
+        dataIndex: "act_price",
+        key: "act_price",
+        sorter: (a, b) => a.act_price - b.act_price,
+        sortOrder: state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
+        render: (text, record) => <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
+      },
+      ...(selectedPartsOrderRecord && selectedPartsOrderRecord.return
+        ? [
+            {
+              title: t("parts_orders.fields.cost"),
+              dataIndex: "cost",
+              key: "cost",
+              sorter: (a, b) => a.cost - b.cost,
+              sortOrder: state.sortedInfo.columnKey === "cost" && state.sortedInfo.order,
+              render: (text, record) => <CurrencyFormatter>{record.cost}</CurrencyFormatter>
+            }
+          ]
+        : []),
+      {
+        title: t("parts_orders.fields.part_type"),
+        dataIndex: "part_type",
+        key: "part_type",
+        render: (text, record) => (record.part_type ? t(`joblines.fields.part_types.${record.part_type}`) : null)
+      },
+      {
+        title: t("parts_orders.fields.oem_partno"),
+        dataIndex: "oem_partno",
+        key: "oem_partno",
+        sorter: (a, b) => alphaSort(a.oem_partno, b.oem_partno),
+        sortOrder: state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order
+      },
+      {
+        title: t("parts_orders.fields.line_remarks"),
+        dataIndex: "line_remarks",
+        key: "line_remarks"
+      },
+      {
+        title: t("parts_orders.fields.status"),
+        dataIndex: "status",
+        key: "status"
+      },
+
+      ...(selectedPartsOrderRecord && selectedPartsOrderRecord.return
+        ? [
+            {
+              title: t("parts_orders.fields.cm_received"),
+              dataIndex: "cm_received",
+              key: "cm_received",
+              render: (text, record) => (
+                <PartsOrderCmReceived
+                  orderLineId={record.id}
+                  checked={record.cm_received}
+                  partsorderid={selectedPartsOrderRecord.id}
+                />
+              )
+            }
+          ]
+        : []),
+      {
+        title: t("parts_orders.fields.backordered_on"),
+        dataIndex: "backordered_on",
+        key: "backordered_on",
+        render: (text, record) => <DateFormatter>{text}</DateFormatter>
+      },
+      {
+        title: t("parts_orders.fields.backordered_eta"),
+        dataIndex: "backordered_eta",
+        key: "backordered_eta",
+        render: (text, record) => (
+          <PartsOrderBackorderEta
+            backordered_eta={record.backordered_eta}
+            disabled={jobRO}
+            partsOrderStatus={record.status}
+            partsLineId={record.id}
+            jobLineId={record.job_line_id}
+          />
+        )
+      },
+
+      {
+        title: t("general.labels.actions"),
+        dataIndex: "actions",
+        key: "actions",
+        render: (text, record) => (
+          <Space wrap>
+            <PartsOrderDeleteLine
+              disabled={jobRO}
+              partsOrderStatus={record.status}
+              partsLineId={record.id}
+              partsOrderId={selectedpartsorder}
+              jobLineId={record.job_line_id}
+            />
+            <PartsOrderLineBackorderButton
+              disabled={jobRO}
+              partsOrderStatus={record.status}
+              partsLineId={record.id}
+              jobLineId={record.job_line_id}
+            />
+          </Space>
+        )
+      }
+    ];
+
+    return (
+      <div>
+        <PageHeader
+          title={
+            billData
+              ? `${record.vendor.name} - ${record.order_number} - ${t("bills.labels.returnfrombill")}: ${billData.bills_by_pk.invoice_number}`
+              : `${record.vendor.name} - ${record.order_number}`
+          }
+          extra={recordActions(record)}
+        />
+        <Table
+          scroll={{
+            x: true //y: "50rem"
+          }}
+          columns={columns}
+          rowKey="id"
+          dataSource={record.parts_order_lines}
+          onChange={handleTableChange}
+        />
+        <DataLabel label={t("parts_orders.fields.comments")}>
+          <div style={{ whiteSpace: "pre" }}>{record.comments}</div>
+        </DataLabel>
+      </div>
+    );
+  };
+
+  return (
+    <div>
+      <PartsReceiveModalContainer />
+      <Drawer
+        placement="right"
+        onClose={() => handleOnRowClick(null)}
+        open={selectedpartsorder}
+        closable
+        width={drawerPercentage}
+      >
+        {selectedPartsOrderRecord && rowExpander(selectedPartsOrderRecord)}
+      </Drawer>
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(PartsOrderListTableDrawerComponent);
--- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
+++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
@@ -1,33 +1,23 @@
 import { DeleteFilled, EyeFilled, SyncOutlined } from "@ant-design/icons";
-import { useLazyQuery, useMutation } from "@apollo/client";
-import { Button, Card, Checkbox, Drawer, Grid, Input, Popconfirm, Space, Table } from "antd";
-import { PageHeader } from "@ant-design/pro-layout";
-
-import queryString from "query-string";
-import React, { useEffect, useState } from "react";
+import { useMutation } from "@apollo/client";
+import { Button, Card, Checkbox, Input, Popconfirm, Space, Table } from "antd";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { FaTasks } from "react-icons/fa";
 import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import { QUERY_BILL_BY_PK } from "../../graphql/bills.queries";
 import { DELETE_PARTS_ORDER } from "../../graphql/parts-orders.queries";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
 import { alphaSort } from "../../utils/sorters";
-import DataLabel from "../data-label/data-label.component";
-import PartsOrderBackorderEta from "../parts-order-backorder-eta/parts-order-backorder-eta.component";
-import PartsOrderCmReceived from "../parts-order-cm-received/parts-order-cm-received.component";
-import PartsOrderDeleteLine from "../parts-order-delete-line/parts-order-delete-line.component";
-import PartsOrderLineBackorderButton from "../parts-order-line-backorder-button/parts-order-line-backorder-button.component";
+import FeatureWrapperComponent from "../feature-wrapper/feature-wrapper.component";
 import PartsReceiveModalContainer from "../parts-receive-modal/parts-receive-modal.container";
 import PrintWrapper from "../print-wrapper/print-wrapper.component";
-import FeatureWrapperComponent from "../feature-wrapper/feature-wrapper.component";
-import { FaTasks } from "react-icons/fa";
+import PartsOrderDrawer from "./parts-order-list-table-drawer.component";

 const mapStateToProps = createStructuredSelector({
  jobRO: selectJobReadOnly,
@@ -62,19 +52,6 @@ export function PartsOrderListTableComponent({
  setPartsReceiveContext,
  setTaskUpsertContext
 }) {
-  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
-    .filter((screen) => !!screen[1])
-    .slice(-1)[0];
-
-  const bpoints = {
-    xs: "100%",
-    sm: "100%",
-    md: "100%",
-    lg: "75%",
-    xl: "75%",
-    xxl: "65%"
-  };
-  const drawerPercentage = selectedBreakpoint ? bpoints[selectedBreakpoint[0]] : "100%";
  const responsibilityCenters = bodyshop.md_responsibility_centers;
  const Templates = TemplateList("partsorder", { job });

@@ -83,42 +60,17 @@ export function PartsOrderListTableComponent({
    sortedInfo: {}
  });

-  const [returnfrombill, setReturnFromBill] = useState();
-  const [billData, setBillData] = useState();
-  const search = queryString.parse(useLocation().search);
-  const selectedpartsorder = search.partsorderid;
  const [searchText, setSearchText] = useState("");
-
-  const [billQuery] = useLazyQuery(QUERY_BILL_BY_PK);
  const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);

  const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
  const { refetch } = billsQuery;

-  useEffect(() => {
-    if (returnfrombill === null) {
-      setBillData(null);
-    } else {
-      const fetchData = async () => {
-        const result = await billQuery({
-          variables: { billid: returnfrombill }
-        });
-        setBillData(result.data);
-      };
-      fetchData();
-    }
-  }, [returnfrombill, billQuery]);
-
  const recordActions = (record, showView = false) => (
    <Space direction="horizontal" wrap>
      {showView && (
        <Button
          onClick={() => {
-            if (record.returnfrombill) {
-              setReturnFromBill(record.returnfrombill);
-            } else {
-              setReturnFromBill(null);
-            }
            handleOnRowClick(record);
          }}
        >
@@ -298,154 +250,6 @@ export function PartsOrderListTableComponent({
    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
  };

-  const selectedPartsOrderRecord = parts_orders.find((r) => r.id === selectedpartsorder);
-
-  const rowExpander = (record) => {
-    const columns = [
-      {
-        title: t("parts_orders.fields.line_desc"),
-        dataIndex: "line_desc",
-        key: "line_desc",
-        sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
-        sortOrder: state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order
-      },
-      {
-        title: t("parts_orders.fields.quantity"),
-        dataIndex: "quantity",
-        key: "quantity",
-        sorter: (a, b) => a.quantity - b.quantity,
-        sortOrder: state.sortedInfo.columnKey === "quantity" && state.sortedInfo.order
-      },
-      {
-        title: t("parts_orders.fields.act_price"),
-        dataIndex: "act_price",
-        key: "act_price",
-        sorter: (a, b) => a.act_price - b.act_price,
-        sortOrder: state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
-        render: (text, record) => <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
-      },
-      ...(selectedPartsOrderRecord && selectedPartsOrderRecord.return
-        ? [
-            {
-              title: t("parts_orders.fields.cost"),
-              dataIndex: "cost",
-              key: "cost",
-              sorter: (a, b) => a.cost - b.cost,
-              sortOrder: state.sortedInfo.columnKey === "cost" && state.sortedInfo.order,
-              render: (text, record) => <CurrencyFormatter>{record.cost}</CurrencyFormatter>
-            }
-          ]
-        : []),
-      {
-        title: t("parts_orders.fields.part_type"),
-        dataIndex: "part_type",
-        key: "part_type",
-        render: (text, record) => (record.part_type ? t(`joblines.fields.part_types.${record.part_type}`) : null)
-      },
-      {
-        title: t("parts_orders.fields.oem_partno"),
-        dataIndex: "oem_partno",
-        key: "oem_partno",
-        sorter: (a, b) => alphaSort(a.oem_partno, b.oem_partno),
-        sortOrder: state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order
-      },
-      {
-        title: t("parts_orders.fields.line_remarks"),
-        dataIndex: "line_remarks",
-        key: "line_remarks"
-      },
-      {
-        title: t("parts_orders.fields.status"),
-        dataIndex: "status",
-        key: "status"
-      },
-
-      ...(selectedPartsOrderRecord && selectedPartsOrderRecord.return
-        ? [
-            {
-              title: t("parts_orders.fields.cm_received"),
-              dataIndex: "cm_received",
-              key: "cm_received",
-              render: (text, record) => (
-                <PartsOrderCmReceived
-                  orderLineId={record.id}
-                  checked={record.cm_received}
-                  partsorderid={selectedPartsOrderRecord.id}
-                />
-              )
-            }
-          ]
-        : []),
-      {
-        title: t("parts_orders.fields.backordered_on"),
-        dataIndex: "backordered_on",
-        key: "backordered_on",
-        render: (text, record) => <DateFormatter>{text}</DateFormatter>
-      },
-      {
-        title: t("parts_orders.fields.backordered_eta"),
-        dataIndex: "backordered_eta",
-        key: "backordered_eta",
-        render: (text, record) => (
-          <PartsOrderBackorderEta
-            backordered_eta={record.backordered_eta}
-            disabled={jobRO}
-            partsOrderStatus={record.status}
-            partsLineId={record.id}
-            jobLineId={record.job_line_id}
-          />
-        )
-      },
-
-      {
-        title: t("general.labels.actions"),
-        dataIndex: "actions",
-        key: "actions",
-        render: (text, record) => (
-          <Space wrap>
-            <PartsOrderDeleteLine
-              disabled={jobRO}
-              partsOrderStatus={record.status}
-              partsLineId={record.id}
-              partsOrderId={selectedpartsorder}
-              jobLineId={record.job_line_id}
-            />
-            <PartsOrderLineBackorderButton
-              disabled={jobRO}
-              partsOrderStatus={record.status}
-              partsLineId={record.id}
-              jobLineId={record.job_line_id}
-            />
-          </Space>
-        )
-      }
-    ];
-
-    return (
-      <div>
-        <PageHeader
-          title={
-            billData
-              ? `${record.vendor.name} - ${record.order_number} - ${t("bills.labels.returnfrombill")}: ${billData.bills_by_pk.invoice_number}`
-              : `${record.vendor.name} - ${record.order_number}`
-          }
-          extra={recordActions(record)}
-        />
-        <Table
-          scroll={{
-            x: true //y: "50rem"
-          }}
-          columns={columns}
-          rowKey="id"
-          dataSource={record.parts_order_lines}
-        />
-        <DataLabel label={t("parts_orders.fields.comments")}>
-          <div style={{ whiteSpace: "pre" }}>{record.comments}</div>
-        </DataLabel>
-      </div>
-    );
-  };
-
  const filteredPartsOrders = parts_orders
    ? searchText === ""
      ? parts_orders
@@ -476,15 +280,13 @@ export function PartsOrderListTableComponent({
      }
    >
      <PartsReceiveModalContainer />
-      <Drawer
-        placement="right"
-        onClose={() => handleOnRowClick(null)}
-        open={selectedpartsorder}
-        closable
-        width={drawerPercentage}
-      >
-        {selectedPartsOrderRecord && rowExpander(selectedPartsOrderRecord)}
-      </Drawer>
+      <PartsOrderDrawer
+        job={job}
+        billsQuery={billsQuery}
+        handleOnRowClick={handleOnRowClick}
+        setPartsReceiveContext={setPartsReceiveContext}
+        setTaskUpsertContext={setTaskUpsertContext}
+      />
      <Table
        loading={billsQuery.loading}
        scroll={{
--- a/client/src/components/production-board-filters/production-board-filters.component.jsx
+++ b/client/src/components/production-board-filters/production-board-filters.component.jsx
@@ -17,7 +17,6 @@ export default connect(mapStateToProps, mapDispatchToProps)(ProductionBoardFilte

 export function ProductionBoardFilters({ bodyshop, filter, setFilter, loading }) {
  const { t } = useTranslation();
-
  return (
    <Space wrap>
      {loading && <Spin />}
--- a/client/src/components/production-board-kanban-card/production-board-kanban-card-color-legend.component.jsx
+++ b/client/src/components/production-board-kanban-card/production-board-kanban-card-color-legend.component.jsx
@@ -22,7 +22,7 @@ const CardColorLegend = ({ bodyshop }) => {
  });

  return (
-    <Col style={{ marginLeft: "15px" }}>
+    <Col>
      <Typography>{t("production.labels.legend")}</Typography>
      <List
        grid={{
--- a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
+++ b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
@@ -10,6 +10,7 @@ import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
+import Dinero from "dinero.js";

 import ProductionAlert from "../production-list-columns/production-list-columns.alert.component";
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
@@ -30,11 +31,264 @@ const getContrastYIQ = (bgColor) =>

 const findEmployeeById = (employees, id) => employees.find((e) => e.id === id);

-const EllipsesToolTip = React.memo(({ title, children }) => (
-  <Tooltip title={title}>
-    <div className="ellipses">{children}</div>
-  </Tooltip>
-));
+const EllipsesToolTip = React.memo(({ title, children, kiosk }) => {
+  if (kiosk || !title) {
+    return <div className="ellipses no-select">{children}</div>;
+  }
+  return (
+    <Tooltip title={title}>
+      <div className="ellipses">{children}</div>
+    </Tooltip>
+  );
+});
+
+const OwnerNameToolTip = ({ metadata, cardSettings }) =>
+  cardSettings?.ownr_nm && (
+    <Col span={24}>
+      <EllipsesToolTip
+        title={metadata.ownr_ln || metadata.ownr_co_nm ? <OwnerNameDisplay ownerObject={metadata} /> : null}
+        kiosk={cardSettings.kiosk}
+      >
+        {metadata.ownr_ln || metadata.ownr_co_nm ? (
+          cardSettings.compact ? (
+            `${metadata.ownr_ln || ""} ${metadata.ownr_co_nm || ""}`
+          ) : (
+            <OwnerNameDisplay ownerObject={metadata} />
+          )
+        ) : (
+          <span>&nbsp;</span>
+        )}
+      </EllipsesToolTip>
+    </Col>
+  );
+
+const ModelInfoToolTip = ({ metadata, cardSettings }) =>
+  cardSettings?.model_info && (
+    <Col span={24}>
+      <EllipsesToolTip
+        title={
+          metadata.v_model_yr || metadata.v_make_desc || metadata.v_model_desc
+            ? `${metadata.v_model_yr || ""} ${metadata.v_make_desc || ""} ${metadata.v_model_desc || ""}`
+            : null
+        }
+        kiosk={cardSettings.kiosk}
+      >
+        {metadata.v_model_yr || metadata.v_make_desc || metadata.v_model_desc ? (
+          `${metadata.v_model_yr || ""} ${metadata.v_make_desc || ""} ${metadata.v_model_desc || ""}`
+        ) : (
+          <span>&nbsp;</span>
+        )}
+      </EllipsesToolTip>
+    </Col>
+  );
+
+const InsuranceCompanyToolTip = ({ metadata, cardSettings }) =>
+  cardSettings?.ins_co_nm && (
+    <Col span={cardSettings.compact ? 24 : 12}>
+      <EllipsesToolTip title={metadata.ins_co_nm || null} kiosk={cardSettings.kiosk}>
+        {metadata.ins_co_nm ? metadata.ins_co_nm : <span>&nbsp;</span>}
+      </EllipsesToolTip>
+    </Col>
+  );
+
+const ClaimNumberToolTip = ({ metadata, cardSettings }) =>
+  cardSettings?.clm_no && (
+    <Col span={cardSettings.compact ? 24 : 12}>
+      <EllipsesToolTip title={metadata.clm_no || null} kiosk={cardSettings.kiosk}>
+        {metadata.clm_no ? metadata.clm_no : <span>&nbsp;</span>}
+      </EllipsesToolTip>
+    </Col>
+  );
+
+const EmployeeAssignmentsToolTip = ({
+  metadata,
+  cardSettings,
+  employee_body,
+  employee_prep,
+  employee_refinish,
+  employee_csr
+}) =>
+  cardSettings?.employeeassignments && (
+    <Col span={24}>
+      <Row>
+        <Col span={cardSettings.compact ? 24 : 12}>
+          <EllipsesToolTip
+            title={
+              employee_body || metadata.labhrs.aggregate.sum.mod_lb_hrs
+                ? `B: ${employee_body ? `${employee_body.first_name.substring(0, 3)} ${employee_body.last_name.charAt(0)}` : ""} ${metadata.labhrs.aggregate.sum.mod_lb_hrs || "?"}h`
+                : null
+            }
+            kiosk={cardSettings.kiosk}
+          >
+            {employee_body || metadata.labhrs.aggregate.sum.mod_lb_hrs ? (
+              `B: ${employee_body ? `${employee_body.first_name.substring(0, 3)} ${employee_body.last_name.charAt(0)}` : ""} ${metadata.labhrs.aggregate.sum.mod_lb_hrs || "?"}h`
+            ) : (
+              <span>&nbsp;</span>
+            )}
+          </EllipsesToolTip>
+        </Col>
+        <Col span={cardSettings.compact ? 24 : 12}>
+          <EllipsesToolTip
+            title={
+              employee_prep
+                ? `P: ${employee_prep ? `${employee_prep.first_name.substring(0, 3)} ${employee_prep.last_name.charAt(0)}` : ""}`
+                : null
+            }
+            kiosk={cardSettings.kiosk}
+          >
+            {employee_prep ? (
+              `P: ${employee_prep ? `${employee_prep.first_name.substring(0, 3)} ${employee_prep.last_name.charAt(0)}` : ""}`
+            ) : (
+              <span>&nbsp;</span>
+            )}
+          </EllipsesToolTip>
+        </Col>
+        <Col span={cardSettings.compact ? 24 : 12}>
+          <EllipsesToolTip
+            title={
+              employee_refinish || metadata.larhrs.aggregate.sum.mod_lb_hrs
+                ? `R: ${employee_refinish ? `${employee_refinish.first_name.substring(0, 3)} ${employee_refinish.last_name.charAt(0)}` : ""} ${metadata.larhrs.aggregate.sum.mod_lb_hrs || "?"}h`
+                : null
+            }
+            kiosk={cardSettings.kiosk}
+          >
+            {employee_refinish || metadata.larhrs.aggregate.sum.mod_lb_hrs ? (
+              `R: ${employee_refinish ? `${employee_refinish.first_name.substring(0, 3)} ${employee_refinish.last_name.charAt(0)}` : ""} ${metadata.larhrs.aggregate.sum.mod_lb_hrs || "?"}h`
+            ) : (
+              <span>&nbsp;</span>
+            )}
+          </EllipsesToolTip>
+        </Col>
+        <Col span={cardSettings.compact ? 24 : 12}>
+          <EllipsesToolTip
+            title={
+              employee_csr ? `C: ${employee_csr ? `${employee_csr.first_name} ${employee_csr.last_name}` : ""}` : null
+            }
+            kiosk={cardSettings.kiosk}
+          >
+            {employee_csr ? (
+              `C: ${employee_csr ? `${employee_csr.first_name} ${employee_csr.last_name}` : ""}`
+            ) : (
+              <span>&nbsp;</span>
+            )}
+          </EllipsesToolTip>
+        </Col>
+      </Row>
+    </Col>
+  );
+
+const ActualInToolTip = ({ metadata, cardSettings }) =>
+  cardSettings?.actual_in && (
+    <Col span={cardSettings.compact ? 24 : 12}>
+      <EllipsesToolTip title={metadata.actual_in || null} kiosk={cardSettings.kiosk}>
+        {metadata.actual_in ? (
+          <Space>
+            <DownloadOutlined />
+            <DateTimeFormatter format="MM/DD">{metadata.actual_in}</DateTimeFormatter>
+          </Space>
+        ) : (
+          <span>&nbsp;</span>
+        )}
+      </EllipsesToolTip>
+    </Col>
+  );
+
+const EstimatorToolTip = ({ metadata, cardSettings }) => {
+  return (
+    cardSettings?.estimator && (
+      <Col span={cardSettings.compact ? 24 : 12}>
+        <EllipsesToolTip
+          title={metadata.est_ct_fn && metadata.est_ct_ln ? `${metadata.est_ct_fn} ${metadata.est_ct_ln}` : null}
+          kiosk={cardSettings.kiosk}
+        >
+          {metadata.est_ct_fn && metadata.est_ct_ln ? (
+            <span>E: {`${metadata.est_ct_fn} ${metadata.est_ct_ln}`}</span>
+          ) : (
+            <span>&nbsp;</span>
+          )}
+        </EllipsesToolTip>
+      </Col>
+    )
+  );
+};
+
+const SubtotalTooltip = ({ metadata, cardSettings, t }) => {
+  const amount = metadata?.job_totals?.totals?.subtotal?.amount;
+  const dineroAmount = amount ? Dinero({ amount: parseInt(amount * 100) }).toFormat("0,0.00") : null;
+
+  return (
+    cardSettings?.subtotal && (
+      <Col span={cardSettings.compact ? 24 : 12}>
+        <EllipsesToolTip
+          title={!!amount ? `${t("production.statistics.currency_symbol")}${dineroAmount}` : null}
+          kiosk={cardSettings.kiosk}
+        >
+          {!!amount ? (
+            <span>{`${t("production.statistics.currency_symbol")}${dineroAmount}`}</span>
+          ) : (
+            <span>&nbsp;</span>
+          )}
+        </EllipsesToolTip>
+      </Col>
+    )
+  );
+};
+
+const ScheduledCompletionToolTip = ({ metadata, cardSettings, pastDueAlert }) =>
+  cardSettings?.scheduled_completion && (
+    <Col span={cardSettings.compact ? 24 : 12}>
+      <EllipsesToolTip title={metadata.scheduled_completion || null} kiosk={cardSettings.kiosk}>
+        {metadata.scheduled_completion ? (
+          <Space className={pastDueAlert}>
+            <CalendarOutlined />
+            <DateTimeFormatter format="MM/DD">{metadata.scheduled_completion}</DateTimeFormatter>
+          </Space>
+        ) : (
+          <span>&nbsp;</span>
+        )}
+      </EllipsesToolTip>
+    </Col>
+  );
+
+const AltTransportToolTip = ({ metadata, cardSettings }) =>
+  cardSettings?.ats && (
+    <Col span={12}>
+      <EllipsesToolTip title={metadata.alt_transport || null} kiosk={cardSettings.kiosk}>
+        {metadata.alt_transport ? metadata.alt_transport : <span>&nbsp;</span>}
+      </EllipsesToolTip>
+    </Col>
+  );
+
+const SubletsComponent = ({ metadata, cardSettings }) =>
+  cardSettings?.sublets && (
+    <Col span={12}>
+      {metadata.subletLines ? (
+        <ProductionSubletsManageComponent subletJobLines={metadata.subletLines} />
+      ) : (
+        <span>&nbsp;</span>
+      )}
+    </Col>
+  );
+
+const ProductionNoteComponent = ({ metadata, cardSettings, card }) =>
+  cardSettings?.production_note && (
+    <Col span={24} style={{ margin: "2px 0" }}>
+      <ProductionListColumnProductionNote
+        record={{
+          production_vars: metadata?.production_vars,
+          id: card?.id,
+          refetch: card?.refetch
+        }}
+      />
+    </Col>
+  );
+
+const PartsStatusComponent = ({ metadata, cardSettings }) =>
+  cardSettings?.partsstatus && (
+    <Col span={24} style={{ textAlign: "center" }}>
+      {metadata.joblines_status ? <JobPartsQueueCount parts={metadata.joblines_status} /> : <span>&nbsp;</span>}
+    </Col>
+  );

 export default function ProductionBoardCard({ technician, card, bodyshop, cardSettings, clone }) {
  const { t } = useTranslation();
@@ -72,17 +326,19 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe
    return !(
      cardSettings?.ownr_nm ||
      cardSettings?.model_info ||
-      (cardSettings?.ins_co_nm && metadata.ins_co_nm) ||
-      (cardSettings?.clm_no && metadata.clm_no) ||
+      cardSettings?.ins_co_nm ||
+      cardSettings?.clm_no ||
      cardSettings?.employeeassignments ||
-      (cardSettings?.actual_in && metadata.actual_in) ||
-      (cardSettings?.scheduled_completion && metadata.scheduled_completion) ||
-      (cardSettings?.ats && metadata.alt_transport) ||
+      cardSettings?.actual_in ||
+      cardSettings?.scheduled_completion ||
+      cardSettings?.ats ||
      cardSettings?.sublets ||
      cardSettings?.production_note ||
-      cardSettings?.partsstatus
+      cardSettings?.partsstatus ||
+      cardSettings?.estimator ||
+      cardSettings?.subtotal
    );
-  }, [cardSettings, metadata]);
+  }, [cardSettings]);

  const headerContent = (
    <div className="header-content-container">
@@ -97,7 +353,12 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe
        />
        {metadata?.suspended && <PauseCircleOutlined className="circle-outline" key="suspended" />}
        {metadata?.iouparent && (
-          <EllipsesToolTip title={t("jobs.labels.iou")} key="iouparent" className="iouparent">
+          <EllipsesToolTip
+            title={t("jobs.labels.iou")}
+            key="iouparent"
+            className="iouparent"
+            kiosk={cardSettings.kiosk}
+          >
            <BranchesOutlined className="branches-outlined" />
          </EllipsesToolTip>
        )}
@@ -119,122 +380,32 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe

  const bodyContent = (
    <Row>
-      {cardSettings?.ownr_nm && (
-        <Col span={24}>
-          <EllipsesToolTip title={<OwnerNameDisplay ownerObject={metadata} />}>
-            {cardSettings.compact ? (
-              `${metadata.ownr_ln || ""} ${metadata.ownr_co_nm || ""}`
-            ) : (
-              <OwnerNameDisplay ownerObject={metadata} />
-            )}
-          </EllipsesToolTip>
-        </Col>
-      )}
-      {cardSettings?.model_info && (
-        <Col span={24}>
-          <EllipsesToolTip
-            title={`${metadata.v_model_yr || ""} ${metadata.v_make_desc || ""} ${metadata.v_model_desc || ""}`}
-          >
-            {`${metadata.v_model_yr || ""} ${metadata.v_make_desc || ""} ${metadata.v_model_desc || ""}`}
-          </EllipsesToolTip>
-        </Col>
-      )}
-      {cardSettings?.ins_co_nm && metadata.ins_co_nm && (
-        <Col span={cardSettings.compact ? 24 : 12}>
-          <EllipsesToolTip title={metadata.ins_co_nm || ""}>{metadata.ins_co_nm || ""}</EllipsesToolTip>
-        </Col>
-      )}
-      {cardSettings?.clm_no && metadata.clm_no && (
-        <Col span={cardSettings.compact ? 24 : 12}>
-          <EllipsesToolTip title={metadata.clm_no || ""}>{metadata.clm_no || ""}</EllipsesToolTip>
-        </Col>
-      )}
-      {cardSettings?.employeeassignments && (
-        <Col span={24}>
-          <Row>
-            <Col span={cardSettings.compact ? 24 : 12}>
-              <EllipsesToolTip
-                title={`B: ${employee_body ? `${employee_body.first_name.substring(0, 3)} ${employee_body.last_name.charAt(0)}` : ""} ${metadata.labhrs.aggregate.sum.mod_lb_hrs || "?"}h`}
-              >
-                {`B: ${employee_body ? `${employee_body.first_name.substring(0, 3)} ${employee_body.last_name.charAt(0)}` : ""} ${metadata.labhrs.aggregate.sum.mod_lb_hrs || "?"}h`}
-              </EllipsesToolTip>
-            </Col>
-            <Col span={cardSettings.compact ? 24 : 12}>
-              <EllipsesToolTip
-                title={`P: ${employee_prep ? `${employee_prep.first_name.substring(0, 3)} ${employee_prep.last_name.charAt(0)}` : ""}`}
-              >
-                {`P: ${employee_prep ? `${employee_prep.first_name.substring(0, 3)} ${employee_prep.last_name.charAt(0)}` : ""}`}
-              </EllipsesToolTip>
-            </Col>
-            <Col span={cardSettings.compact ? 24 : 12}>
-              <EllipsesToolTip
-                title={`R: ${employee_refinish ? `${employee_refinish.first_name.substring(0, 3)} ${employee_refinish.last_name.charAt(0)}` : ""} ${metadata.larhrs.aggregate.sum.mod_lb_hrs || "?"}h`}
-              >
-                {`R: ${employee_refinish ? `${employee_refinish.first_name.substring(0, 3)} ${employee_refinish.last_name.charAt(0)}` : ""} ${metadata.larhrs.aggregate.sum.mod_lb_hrs || "?"}h`}
-              </EllipsesToolTip>
-            </Col>
-            <Col span={cardSettings.compact ? 24 : 12}>
-              <EllipsesToolTip
-                title={`C: ${employee_csr ? `${employee_csr.first_name} ${employee_csr.last_name}` : ""}`}
-              >
-                {`C: ${employee_csr ? `${employee_csr.first_name} ${employee_csr.last_name}` : ""}`}
-              </EllipsesToolTip>
-            </Col>
-          </Row>
-        </Col>
-      )}
-      {cardSettings?.actual_in && metadata.actual_in && (
-        <Col span={cardSettings.compact ? 24 : 12}>
-          <EllipsesToolTip title={metadata.actual_in}>
-            <Space>
-              <DownloadOutlined />
-              <DateTimeFormatter format="MM/DD">{metadata.actual_in}</DateTimeFormatter>
-            </Space>
-          </EllipsesToolTip>
-        </Col>
-      )}
-      {cardSettings?.scheduled_completion && metadata.scheduled_completion && (
-        <Col span={cardSettings.compact ? 24 : 12}>
-          <EllipsesToolTip title={metadata.scheduled_completion}>
-            <Space className={pastDueAlert}>
-              <CalendarOutlined />
-              <DateTimeFormatter format="MM/DD">{metadata.scheduled_completion}</DateTimeFormatter>
-            </Space>
-          </EllipsesToolTip>
-        </Col>
-      )}
-      {cardSettings?.ats && metadata.alt_transport && (
-        <Col span={12}>
-          <EllipsesToolTip title={metadata.alt_transport}>{metadata.alt_transport || ""}</EllipsesToolTip>
-        </Col>
-      )}
-      {cardSettings?.sublets && (
-        <Col span={12}>
-          <ProductionSubletsManageComponent subletJobLines={metadata.subletLines} />
-        </Col>
-      )}
-      {cardSettings?.production_note && (
-        <Col span={24}>
-          <ProductionListColumnProductionNote
-            record={{
-              production_vars: metadata?.production_vars,
-              id: card?.id,
-              refetch: card?.refetch
-            }}
-          />
-        </Col>
-      )}
-      {cardSettings?.partsstatus && (
-        <Col span={24}>
-          <JobPartsQueueCount parts={metadata.joblines_status} />
-        </Col>
-      )}
+      <OwnerNameToolTip metadata={metadata} cardSettings={cardSettings} />
+      <ModelInfoToolTip metadata={metadata} cardSettings={cardSettings} />
+      <InsuranceCompanyToolTip metadata={metadata} cardSettings={cardSettings} />
+      <ClaimNumberToolTip metadata={metadata} cardSettings={cardSettings} />
+      <EmployeeAssignmentsToolTip
+        metadata={metadata}
+        cardSettings={cardSettings}
+        employee_body={employee_body}
+        employee_prep={employee_prep}
+        employee_refinish={employee_refinish}
+        employee_csr={employee_csr}
+      />
+      <EstimatorToolTip metadata={metadata} cardSettings={cardSettings} />
+      <SubtotalTooltip metadata={metadata} cardSettings={cardSettings} t={t} />
+      <ActualInToolTip metadata={metadata} cardSettings={cardSettings} />
+      <ScheduledCompletionToolTip metadata={metadata} cardSettings={cardSettings} pastDueAlert={pastDueAlert} />
+      <AltTransportToolTip metadata={metadata} cardSettings={cardSettings} />
+      <SubletsComponent metadata={metadata} cardSettings={cardSettings} />
+      <ProductionNoteComponent metadata={metadata} cardSettings={cardSettings} card={card} />
+      <PartsStatusComponent metadata={metadata} cardSettings={cardSettings} />
    </Row>
  );

  return (
    <Card
-      className="react-trello-card"
+      className={`react-trello-card ${cardSettings.kiosk ? "kiosk-mode" : ""}`}
      size="small"
      style={{
        backgroundColor: cardSettings?.cardcolor && `rgba(${bgColor.r},${bgColor.g},${bgColor.b},${bgColor.a})`,
--- a/client/src/components/production-board-kanban/production-board-kanban.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.component.jsx
@@ -1,7 +1,7 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
 import Board from "./trello-board/index";
-import { Button, notification, Skeleton, Space, Statistic } from "antd";
+import { Button, notification, Skeleton, Space } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -18,9 +18,11 @@ import ProductionListDetailComponent from "../production-list-detail/production-
 import CardColorLegend from "../production-board-kanban-card/production-board-kanban-card-color-legend.component";
 import "./production-board-kanban.styles.scss";
 import { createBoardData } from "./production-board-kanban.utils.js";
-import ProductionBoardKanbanSettings from "./production-board-kanban.settings.component.jsx";
+import ProductionBoardKanbanSettings from "./settings/production-board-kanban.settings.component.jsx";
 import cloneDeep from "lodash/cloneDeep";
 import isEqual from "lodash/isEqual";
+import { defaultKanbanSettings } from "./settings/defaultKanbanSettings.js";
+import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -37,7 +39,7 @@ const mapDispatchToProps = (dispatch) => ({
    )
 });

-function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTrail, associationSettings }) {
+function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTrail, associationSettings, statuses }) {
  const [boardLanes, setBoardLanes] = useState({ lanes: [] });
  const [filter, setFilter] = useState({ search: "", employeeId: null });
  const [loading, setLoading] = useState(true);
@@ -57,11 +59,12 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr

  useEffect(() => {
    setIsMoving(true);
-    const newBoardData = createBoardData(
-      [...bodyshop.md_ro_statuses.production_statuses, ...(bodyshop.md_ro_statuses.additional_board_statuses || [])],
+    const newBoardData = createBoardData({
+      statuses,
      data,
-      filter
-    );
+      filter,
+      cardSettings: associationSettings?.kanban_settings
+    });

    newBoardData.lanes = newBoardData.lanes.map((lane) => ({
      ...lane,
@@ -76,7 +79,7 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
      return prevBoardLanes;
    });
    setIsMoving(false);
-  }, [data, bodyshop.md_ro_statuses, filter]);
+  }, [data, bodyshop.md_ro_statuses, filter, statuses, associationSettings?.kanban_settings]);

  const getCardByID = useCallback((data, cardId) => {
    for (const lane of data.lanes) {
@@ -100,23 +103,28 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
      const targetLane = boardLanes.lanes.find((lane) => lane.id === destination.droppableId);
      const sourceLane = boardLanes.lanes.find((lane) => lane.id === source.droppableId);

+      if (!targetLane || !sourceLane) {
+        setIsMoving(false);
+        console.error("Invalid source or destination lane");
+        return;
+      }
+
      const sameColumnTransfer = source.droppableId === destination.droppableId;
      const sourceCard = getCardByID(boardLanes, draggableId);

      const movedCardWillBeFirst = destination.index === 0;
-      const movedCardWillBeLast = destination.index > targetLane.cards.length - 1;
+      const movedCardWillBeLast = destination.index >= targetLane.cards.length - 1;

      const lastCardInTargetLane = targetLane.cards[targetLane.cards.length - 1];
-
-      const oldChildCard = sourceLane.cards[destination.index + 1];
+      const oldChildCard = sourceLane.cards[source.index + 1];

      const newChildCard = movedCardWillBeLast
        ? null
        : targetLane.cards[
            sameColumnTransfer
-              ? destination.index - destination.index > 0
-                ? destination.index
-                : destination.index + 1
+              ? source.index < destination.index
+                ? destination.index + 1
+                : destination.index
              : destination.index
          ];

@@ -127,12 +135,14 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
        movedCardNewKanbanParent = "-1";
      } else if (movedCardWillBeLast) {
        movedCardNewKanbanParent = lastCardInTargetLane.id;
-      } else if (!!newChildCard) {
+      } else if (newChildCard) {
        movedCardNewKanbanParent = newChildCard.metadata.kanbanparent;
      } else {
-        console.log("==> !!!!!!Couldn't find a parent.!!!! <==");
+        console.error("==> !!!!!!Couldn't find a parent.!!!! <==");
      }
+
      const newChildCardNewParent = newChildCard ? draggableId : null;
+
      try {
        const update = await client.mutate({
          mutation: generate_UPDATE_JOB_KANBAN(
@@ -169,50 +179,14 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
        setIsMoving(false);
      }
    },
-    [boardLanes, client, getCardByID, insertAuditTrail, isMoving, t]
-  );
-
-  const totalHrs = useMemo(
-    () =>
-      data
-        .reduce(
-          (acc, val) =>
-            acc + (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0) + (val.larhrs?.aggregate?.sum?.mod_lb_hrs || 0),
-          0
-        )
-        .toFixed(1),
-    [data]
-  );
-
-  const totalLAB = useMemo(
-    () => data.reduce((acc, val) => acc + (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0), 0).toFixed(1),
-    [data]
-  );
-
-  const totalLAR = useMemo(
-    () => data.reduce((acc, val) => acc + (val.larhrs?.aggregate?.sum?.mod_lb_hrs || 0), 0).toFixed(1),
-    [data]
+    [boardLanes, client, getCardByID, isMoving, t, insertAuditTrail]
  );

  const cardSettings = useMemo(
    () =>
      associationSettings?.kanban_settings && Object.keys(associationSettings.kanban_settings).length > 0
        ? associationSettings.kanban_settings
-        : {
-            ats: true,
-            clm_no: true,
-            compact: false,
-            ownr_nm: true,
-            sublets: true,
-            ins_co_nm: true,
-            production_note: true,
-            employeeassignments: true,
-            scheduled_completion: true,
-            cardcolor: false,
-            orientation: false,
-            cardSize: "small",
-            model_info: true
-          },
+        : defaultKanbanSettings,
    [associationSettings]
  );

@@ -230,14 +204,8 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
    <div>
      <IndefiniteLoading loading={isMoving} />
      <PageHeader
-        title={
-          <Space>
-            <Statistic title={t("dashboard.titles.productionhours")} value={totalHrs} />
-            <Statistic title={t("dashboard.titles.labhours")} value={totalLAB} />
-            <Statistic title={t("dashboard.titles.larhours")} value={totalLAR} />
-            <Statistic title={t("appointments.labels.inproduction")} value={data && data.length} />
-          </Space>
-        }
+        title={cardSettings.cardcolor && <CardColorLegend cardSettings={cardSettings} bodyshop={bodyshop} />}
+        style={{ paddingInline: 0, paddingBlock: 0 }}
        extra={
          <Space wrap>
            <Button onClick={() => refetch && refetch()}>
@@ -248,13 +216,23 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
              parentLoading={setLoading}
              associationSettings={associationSettings}
              onSettingsChange={handleSettingsChange}
+              bodyshop={bodyshop}
+              data={data}
            />
          </Space>
        }
      />
-      {cardSettings.cardcolor && <CardColorLegend cardSettings={cardSettings} bodyshop={bodyshop} />}
+
+      <NoteUpsertModal />
      <ProductionListDetailComponent jobs={data} />
-      <Board data={boardLanes} onDragEnd={onDragEnd} orientation={orientation} cardSettings={cardSettings} />
+
+      <Board
+        queryData={data}
+        data={boardLanes}
+        onDragEnd={onDragEnd}
+        orientation={orientation}
+        cardSettings={cardSettings}
+      />
    </div>
  );
 }
--- a/client/src/components/production-board-kanban/production-board-kanban.container.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.container.jsx
@@ -1,5 +1,5 @@
-import { useQuery, useSubscription } from "@apollo/client";
 import React, { useEffect, useMemo } from "react";
+import { useQuery, useSubscription } from "@apollo/client";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { QUERY_JOBS_IN_PRODUCTION, SUBSCRIPTION_JOBS_IN_PRODUCTION } from "../../graphql/jobs.queries";
@@ -13,6 +13,14 @@ const mapStateToProps = createStructuredSelector({
 });

 function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
+  const combinedStatuses = useMemo(
+    () => [
+      ...bodyshop.md_ro_statuses.production_statuses,
+      ...(bodyshop.md_ro_statuses.additional_board_statuses || [])
+    ],
+    [bodyshop.md_ro_statuses.production_statuses, bodyshop.md_ro_statuses.additional_board_statuses]
+  );
+
  const { refetch, loading, data } = useQuery(QUERY_JOBS_IN_PRODUCTION, {
    pollInterval: 3600000,
    fetchPolicy: "network-only",
@@ -20,18 +28,22 @@ function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
    onError: (error) => console.error(`Error fetching jobs in production: ${error.message}`)
  });

-  const { data: updatedJobs } = useSubscription(SUBSCRIPTION_JOBS_IN_PRODUCTION);
+  const { data: updatedJobs } = useSubscription(SUBSCRIPTION_JOBS_IN_PRODUCTION, {
+    onError: (error) => console.error(`Error subscribing to jobs in production: ${error.message}`)
+  });

  const { loading: associationSettingsLoading, data: associationSettings } = useQuery(QUERY_KANBAN_SETTINGS, {
    variables: { email: currentUser.email },
    onError: (error) => console.error(`Error fetching Kanban settings: ${error.message}`)
  });

+  // const currentReducerData = useSelector((state) => (state.trello.lanes ? state.trello : {}));
+
  useEffect(() => {
-    if (updatedJobs) {
+    if (updatedJobs && data) {
      refetch().catch((err) => console.error(`Error re-fetching jobs in production: ${err.message}`));
    }
-  }, [updatedJobs, refetch]);
+  }, [updatedJobs, data, refetch]);

  const filteredAssociationSettings = useMemo(() => {
    return associationSettings?.associations[0] || null;
@@ -43,6 +55,8 @@ function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
      data={data ? data.jobs : []}
      refetch={refetch}
      associationSettings={filteredAssociationSettings}
+      bodyshop={bodyshop}
+      statuses={combinedStatuses}
    />
  );
 }
--- a/client/src/components/production-board-kanban/production-board-kanban.settings.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.settings.component.jsx
@@ -1,173 +0,0 @@
-import { useMutation } from "@apollo/client";
-import { Button, Card, Col, Form, notification, Popover, Row, Checkbox, Radio, Input, Switch } from "antd";
-import React, { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { UPDATE_KANBAN_SETTINGS } from "../../graphql/user.queries";
-
-export default function ProductionBoardKanbanSettings({ associationSettings, parentLoading }) {
-  const [form] = Form.useForm();
-  const [open, setOpen] = useState(false);
-  const [loading, setLoading] = useState(false);
-  const [hasChanges, setHasChanges] = useState(false);
-  const [orientation, setOrientation] = useState(true);
-  const [compact, setCompact] = useState(false);
-  const [colored, setColored] = useState(false);
-  const [updateKbSettings] = useMutation(UPDATE_KANBAN_SETTINGS);
-  const { t } = useTranslation();
-
-  useEffect(() => {
-    if (associationSettings?.kanban_settings) {
-      const { orientation = true, compact = true, cardcolor = true } = associationSettings.kanban_settings;
-      form.setFieldsValue(associationSettings.kanban_settings);
-      setOrientation(orientation);
-      setCompact(compact);
-      setColored(cardcolor);
-    }
-  }, [form, associationSettings]);
-
-  const handleFinish = async (values) => {
-    setLoading(true);
-    parentLoading(true);
-
-    const result = await updateKbSettings({
-      variables: {
-        id: associationSettings?.id,
-        ks: { ...values, orientation, compact, cardcolor: colored }
-      }
-    });
-
-    if (result.errors) {
-      notification.open({
-        type: "error",
-        message: t("production.errors.settings", {
-          error: JSON.stringify(result.errors)
-        })
-      });
-    }
-
-    setOpen(false);
-    setLoading(false);
-    parentLoading(false);
-    setHasChanges(false);
-  };
-
-  const handleValuesChange = () => setHasChanges(true);
-
-  const handleCheckedChanges = (checked, callback) => {
-    callback(checked);
-    setHasChanges(true);
-  };
-
-  const cardStyle = { minWidth: "50vw", marginTop: 10 };
-
-  const renderSwitchItem = (name, checked, callback, labelKey, checkedChildrenKey, unCheckedChildrenKey) => (
-    <Col span={4} key={name}>
-      <Form.Item name={name} valuePropName="checked" label={t(labelKey)}>
-        <Switch
-          checkedChildren={t(checkedChildrenKey)}
-          unCheckedChildren={t(unCheckedChildrenKey)}
-          checked={checked}
-          onChange={(checked) => handleCheckedChanges(checked, callback)}
-        />
-      </Form.Item>
-    </Col>
-  );
-
-  const renderCheckboxItem = (name, labelKey) => (
-    <Col span={4} key={name}>
-      <Form.Item name={name} valuePropName="checked">
-        <Checkbox>{t(labelKey)}</Checkbox>
-      </Form.Item>
-    </Col>
-  );
-
-  const renderCardSettings = () => (
-    <>
-      <Card title={t("production.settings.layout")} style={cardStyle}>
-        <Row gutter={[16, 16]}>
-          {renderSwitchItem(
-            "orientation",
-            orientation,
-            setOrientation,
-            "production.labels.orientation",
-            "production.labels.vertical",
-            "production.labels.horizontal"
-          )}
-          <Col span={4}>
-            <Form.Item name="cardSize" label={t("production.labels.card_size")}>
-              <Radio.Group>
-                <Radio.Button value="compact">{t("production.options.small")}</Radio.Button>
-                <Radio.Button value="medium">{t("production.options.medium")}</Radio.Button>
-                <Radio.Button value="large">{t("production.options.large")}</Radio.Button>
-              </Radio.Group>
-            </Form.Item>
-          </Col>
-          {renderSwitchItem(
-            "compact",
-            compact,
-            setCompact,
-            "production.labels.compact",
-            "production.labels.tall",
-            "production.labels.wide"
-          )}
-          {renderSwitchItem(
-            "cardcolor",
-            colored,
-            setColored,
-            "production.labels.cardcolor",
-            "production.labels.on",
-            "production.labels.off"
-          )}
-        </Row>
-      </Card>
-      <Card title={t("production.settings.information")} style={cardStyle}>
-        <Row gutter={[16, 16]}>
-          {[
-            "model_info",
-            "ownr_nm",
-            "clm_no",
-            "ins_co_nm",
-            "employeeassignments",
-            "actual_in",
-            "scheduled_completion",
-            "ats",
-            "production_note",
-            "sublets",
-            "partsstatus"
-          ].map((item) => renderCheckboxItem(item, `production.labels.${item}`))}
-        </Row>
-      </Card>
-    </>
-  );
-
-  const overlay = (
-    <Card>
-      <Form form={form} onFinish={handleFinish} layout="vertical" onValuesChange={handleValuesChange}>
-        {renderCardSettings()}
-        <Form.Item name="orientation" style={{ display: "none" }}>
-          <Input type="hidden" value={orientation} />
-        </Form.Item>
-        <Row justify="center" style={{ marginTop: 15 }} gutter={16}>
-          <Col span={8}>
-            <Button block onClick={() => setOpen(false)}>
-              {t("general.actions.cancel")}
-            </Button>
-          </Col>
-          <Col span={8}>
-            <Button block onClick={form.submit} loading={loading} type="primary" disabled={!hasChanges}>
-              {t("general.actions.save")}
-            </Button>
-          </Col>
-        </Row>
-      </Form>
-    </Card>
-  );
-
-  return (
-    <Popover content={overlay} open={open} placement="topRight">
-      <Button loading={loading} onClick={() => setOpen(!open)}>
-        {t("production.settings.board_settings")}
-      </Button>
-    </Popover>
-  );
-}
--- a/client/src/components/production-board-kanban/production-board-kanban.statistics.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.statistics.jsx
@@ -0,0 +1,223 @@
+import React, { useMemo } from "react";
+import { Card, Statistic } from "antd";
+import { useTranslation } from "react-i18next";
+import PropTypes from "prop-types";
+import { statisticsItems, defaultKanbanSettings } from "./settings/defaultKanbanSettings.js";
+export const StatisticType = {
+  HOURS: "hours",
+  AMOUNT: "amount",
+  JOBS: "jobs"
+};
+
+const mergeStatistics = (items, values) => {
+  const valuesMap = values.reduce((acc, value) => {
+    acc[value.id] = value;
+    return acc;
+  }, {});
+
+  return items.map((item) => ({
+    ...item,
+    value: valuesMap[item.id]?.value,
+    type: valuesMap[item.id]?.type
+  }));
+};
+
+const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
+  const { t } = useTranslation();
+
+  const calculateTotal = (items, key, subKey) => {
+    return items.reduce((acc, item) => acc + (item[key]?.aggregate?.sum?.[subKey] || 0), 0);
+  };
+
+  const calculateTotalAmount = (items, key) => {
+    return items.reduce((acc, item) => acc + (item[key]?.totals?.subtotal?.amount || 0), 0);
+  };
+
+  const calculateReducerTotal = (lanes, key, subKey) => {
+    return lanes.reduce((acc, lane) => {
+      return (
+        acc + lane.cards.reduce((laneAcc, card) => laneAcc + (card.metadata[key]?.aggregate?.sum?.[subKey] || 0), 0)
+      );
+    }, 0);
+  };
+
+  const calculateReducerTotalAmount = (lanes, key) => {
+    return lanes.reduce((acc, lane) => {
+      return (
+        acc + lane.cards.reduce((laneAcc, card) => laneAcc + (card.metadata[key]?.totals?.subtotal?.amount || 0), 0)
+      );
+    }, 0);
+  };
+
+  const formatValue = (value, type) => {
+    if (type === StatisticType.JOBS) {
+      return value.toFixed(0);
+    }
+    if (type === StatisticType.HOURS) {
+      return value.toFixed(2);
+    }
+    return value;
+  };
+
+  const totalHrs = useMemo(() => {
+    if (!cardSettings.totalHrs) return null;
+    const total = calculateTotal(data, "labhrs", "mod_lb_hrs") + calculateTotal(data, "larhrs", "mod_lb_hrs");
+    return parseFloat(total.toFixed(2));
+  }, [data, cardSettings.totalHrs]);
+
+  const totalLAB = useMemo(() => {
+    if (!cardSettings.totalLAB) return null;
+    const total = calculateTotal(data, "labhrs", "mod_lb_hrs");
+    return parseFloat(total.toFixed(2));
+  }, [data, cardSettings.totalLAB]);
+
+  const totalLAR = useMemo(() => {
+    if (!cardSettings.totalLAR) return null;
+    const total = calculateTotal(data, "larhrs", "mod_lb_hrs");
+    return parseFloat(total.toFixed(2));
+  }, [data, cardSettings.totalLAR]);
+
+  const jobsInProduction = useMemo(
+    () => (cardSettings.jobsInProduction ? data.length : null),
+    [data, cardSettings.jobsInProduction]
+  );
+
+  const totalAmountInProduction = useMemo(() => {
+    if (!cardSettings.totalAmountInProduction) return null;
+    const total = calculateTotalAmount(data, "job_totals");
+    return parseFloat(total.toFixed(2));
+  }, [data, cardSettings.totalAmountInProduction]);
+
+  const totalHrsOnBoard = useMemo(() => {
+    if (!reducerData || !cardSettings.totalHrsOnBoard) return null;
+    const total =
+      calculateReducerTotal(reducerData.lanes, "labhrs", "mod_lb_hrs") +
+      calculateReducerTotal(reducerData.lanes, "larhrs", "mod_lb_hrs");
+    return parseFloat(total.toFixed(2));
+  }, [reducerData, cardSettings.totalHrsOnBoard]);
+
+  const totalLABOnBoard = useMemo(() => {
+    if (!reducerData || !cardSettings.totalLABOnBoard) return null;
+    const total = calculateReducerTotal(reducerData.lanes, "labhrs", "mod_lb_hrs");
+    return parseFloat(total.toFixed(2));
+  }, [reducerData, cardSettings.totalLABOnBoard]);
+
+  const totalLAROnBoard = useMemo(() => {
+    if (!reducerData || !cardSettings.totalLAROnBoard) return null;
+    const total = calculateReducerTotal(reducerData.lanes, "larhrs", "mod_lb_hrs");
+    return parseFloat(total.toFixed(2));
+  }, [reducerData, cardSettings.totalLAROnBoard]);
+
+  const jobsOnBoard = useMemo(
+    () =>
+      reducerData && cardSettings.jobsOnBoard
+        ? reducerData.lanes.reduce((acc, lane) => acc + lane.cards.length, 0)
+        : null,
+    [reducerData, cardSettings.jobsOnBoard]
+  );
+
+  const totalAmountOnBoard = useMemo(() => {
+    if (!reducerData || !cardSettings.totalAmountOnBoard) return null;
+    const total = calculateReducerTotalAmount(reducerData.lanes, "job_totals");
+    return parseFloat(total.toFixed(2));
+  }, [reducerData, cardSettings.totalAmountOnBoard]);
+
+  const statistics = useMemo(
+    () =>
+      mergeStatistics(statisticsItems, [
+        { id: 0, value: totalHrs, type: StatisticType.HOURS },
+        { id: 1, value: totalAmountInProduction, type: StatisticType.AMOUNT },
+        { id: 2, value: totalLAB, type: StatisticType.HOURS },
+        { id: 3, value: totalLAR, type: StatisticType.HOURS },
+        { id: 4, value: jobsInProduction, type: StatisticType.JOBS },
+        { id: 5, value: totalHrsOnBoard, type: StatisticType.HOURS },
+        { id: 6, value: totalAmountOnBoard, type: StatisticType.AMOUNT },
+        { id: 7, value: totalLABOnBoard, type: StatisticType.HOURS },
+        { id: 8, value: totalLAROnBoard, type: StatisticType.HOURS },
+        { id: 9, value: jobsOnBoard, type: StatisticType.JOBS }
+      ]),
+    [
+      totalHrs,
+      totalAmountInProduction,
+      totalLAB,
+      totalLAR,
+      jobsInProduction,
+      totalHrsOnBoard,
+      totalAmountOnBoard,
+      totalLABOnBoard,
+      totalLAROnBoard,
+      jobsOnBoard
+    ]
+  );
+
+  const sortedStatistics = useMemo(() => {
+    const statisticsMap = new Map(statistics.map((stat) => [stat.id, stat]));
+
+    return (
+      cardSettings?.statisticsOrder ? cardSettings.statisticsOrder : defaultKanbanSettings.statisticsOrder
+    ).reduce((sorted, orderId) => {
+      const value = statisticsMap.get(orderId);
+      if (value && value.value !== null) {
+        sorted.push(value);
+      }
+      return sorted;
+    }, []);
+  }, [statistics, cardSettings.statisticsOrder]);
+
+  return (
+    <div style={{ display: "flex", gap: "5px", flexWrap: "wrap", marginBottom: "5px" }}>
+      {sortedStatistics.map((stat) => (
+        <Card styles={{ body: { padding: "8px" } }} key={stat.id}>
+          <Statistic
+            title={t(`production.statistics.${stat.label}`)}
+            value={formatValue(stat.value, stat.type)}
+            prefix={stat.type === StatisticType.AMOUNT ? t("production.statistics.currency_symbol") : undefined}
+            suffix={
+              stat.type === StatisticType.HOURS
+                ? t("production.statistics.hours")
+                : stat.type === StatisticType.JOBS
+                  ? t("production.statistics.jobs")
+                  : undefined
+            }
+          />
+        </Card>
+      ))}
+    </div>
+  );
+};
+
+ProductionStatistics.propTypes = {
+  data: PropTypes.arrayOf(
+    PropTypes.shape({
+      labhrs: PropTypes.object,
+      larhrs: PropTypes.object,
+      job_totals: PropTypes.object
+    })
+  ).isRequired,
+  cardSettings: PropTypes.shape({
+    totalHrs: PropTypes.bool,
+    totalLAB: PropTypes.bool,
+    totalLAR: PropTypes.bool,
+    jobsInProduction: PropTypes.bool,
+    totalAmountInProduction: PropTypes.bool,
+    totalHrsOnBoard: PropTypes.bool,
+    totalLABOnBoard: PropTypes.bool,
+    totalLAROnBoard: PropTypes.bool,
+    jobsOnBoard: PropTypes.bool,
+    totalAmountOnBoard: PropTypes.bool,
+    statisticsOrder: PropTypes.arrayOf(PropTypes.number)
+  }).isRequired,
+  reducerData: PropTypes.shape({
+    lanes: PropTypes.arrayOf(
+      PropTypes.shape({
+        cards: PropTypes.arrayOf(
+          PropTypes.shape({
+            metadata: PropTypes.object
+          })
+        ).isRequired
+      })
+    ).isRequired
+  })
+};
+
+export default ProductionStatistics;
--- a/client/src/components/production-board-kanban/production-board-kanban.utils.js
+++ b/client/src/components/production-board-kanban/production-board-kanban.utils.js
@@ -1,128 +1,102 @@
+// Function to sort an array of objects by parentId
 import { groupBy } from "lodash";

 const sortByParentId = (arr) => {
-  // return arr.reduce((accumulator, currentValue) => {
-  //   //Find the parent item.
-  //   let item = accumulator.find((x) => x.id === currentValue.kanbanparent);
-  //   //Get index of parent item
-  //   let index = accumulator.indexOf(item);
-
-  //   index = index !== -1 ? index + 1 : 0;
-  //   accumulator.splice(index, 0, currentValue);
-  //   return accumulator;
-  // }, []);
-
  let parentId = "-1";
  const sortedList = [];
-  const byParentsIdsList = groupBy(arr, "kanbanparent"); // Create a new array with objects indexed by parentId
-  //console.log("sortByParentId -> byParentsIdsList", byParentsIdsList);
+  const byParentsIdsList = groupBy(arr, "kanbanparent");

  while (byParentsIdsList[parentId]) {
-    sortedList.push(...byParentsIdsList[parentId]); //Spread in the whole list in case several items have the same parents.
-    parentId = byParentsIdsList[parentId][byParentsIdsList[parentId].length - 1].id; //Grab the ID from the last one.
+    sortedList.push(...byParentsIdsList[parentId]);
+    parentId = byParentsIdsList[parentId][byParentsIdsList[parentId].length - 1].id;
  }

-  if (byParentsIdsList["null"]) byParentsIdsList["null"].map((i) => sortedList.push(i));
+  if (byParentsIdsList["null"]) {
+    sortedList.push(...byParentsIdsList["null"]);
+  }

-  //Validate that the 2 arrays are of the same length and no children are missing.
+  // Ensure all items are included in the sorted list
  if (arr.length !== sortedList.length) {
-    arr.map((origItem) => {
-      if (!!!sortedList.find((s) => s.id === origItem.id)) {
+    arr.forEach((origItem) => {
+      if (!sortedList.some((s) => s.id === origItem.id)) {
        sortedList.push(origItem);
-        console.log("DATA CONSISTENCY ERROR: ", origItem.ro_number);
      }
-      return 1;
    });
  }

  return sortedList;
 };

-export const createBoardData = (AllStatuses, Jobs, filter) => {
+// Function to create board data based on statuses and jobs, with optional filtering
+export const createBoardData = ({ statuses, data, filter, cardSettings }) => {
  const { search, employeeId } = filter;
-  const lanes = AllStatuses.map((s) => {
-    return {
-      id: s,
-      title: s,
-      cards: []
-    };
-  });

-  const filteredJobs =
-    (search === "" || !search) && !employeeId
-      ? Jobs
-      : Jobs.filter((j) => {
-          let include = false;
-          if (search && search !== "") {
-            include = CheckSearch(search, j);
-          }
+  const lanes = statuses.map((status) => ({
+    id: status,
+    title: status,
+    cards: []
+  }));

-          if (!!employeeId) {
-            include =
-              include ||
-              j.employee_body === employeeId ||
-              j.employee_prep === employeeId ||
-              j.employee_csr === employeeId ||
-              j.employee_refinish === employeeId;
-          }
+  let filteredJobs =
+    (search === "" || !search) && !employeeId ? data : data.filter((job) => checkFilter(search, employeeId, job));

-          return include;
-        });
+  // Filter jobs by selectedMdInsCos if it has values
+  if (cardSettings?.selectedMdInsCos?.length > 0) {
+    filteredJobs = filteredJobs.filter((job) => cardSettings.selectedMdInsCos.includes(job.ins_co_nm));
+  }

-  const DataGroupedByStatus = groupBy(filteredJobs, (d) => d.status);
+  // Filter jobs by selectedEstimators if it has values
+  if (cardSettings?.selectedEstimators?.length > 0) {
+    filteredJobs = filteredJobs.filter((job) =>
+      cardSettings.selectedEstimators.includes(`${job.est_ct_fn} ${job.est_ct_ln}`)
+    );
+  }

-  Object.keys(DataGroupedByStatus).map((statusGroupKey) => {
+  const DataGroupedByStatus = groupBy(filteredJobs, "status");
+
+  Object.keys(DataGroupedByStatus).forEach((statusGroupKey) => {
    try {
      const lane = lanes.find((l) => l.id === statusGroupKey);
-      if (!lane?.cards) return null;
+      if (!lane) return;
+
      lane.cards = sortByParentId(DataGroupedByStatus[statusGroupKey]).map((job) => {
        const { id, title, description, due_date, ...metadata } = job;
        return {
          id,
          title,
          description,
-          label: job.due_date || "",
+          label: due_date || "",
          metadata
        };
      });
    } catch (error) {
-      console.log("Error while creating board card", error);
+      console.error("Error while creating board card", error);
    }
-    return null;
  });

  return { lanes };
 };

-const CheckSearch = (search, job) => {
-  return (
-    (job.ro_number || "").toLowerCase().includes(search.toLowerCase()) ||
-    (job.ownr_fn || "").toLowerCase().includes(search.toLowerCase()) ||
-    (job.ownr_co_nm || "").toLowerCase().includes(search.toLowerCase()) ||
-    (job.ownr_ln || "").toLowerCase().includes(search.toLowerCase()) ||
-    (job.status || "").toLowerCase().includes(search.toLowerCase()) ||
-    (job.v_make_desc || "").toLowerCase().includes(search.toLowerCase()) ||
-    (job.v_model_desc || "").toLowerCase().includes(search.toLowerCase()) ||
-    (job.clm_no || "").toLowerCase().includes(search.toLowerCase()) ||
-    (job.plate_no || "").toLowerCase().includes(search.toLowerCase())
-  );
+// Function to check if a job matches the search and/or employeeId filter
+const checkFilter = (search, employeeId, job) => {
+  const lowerSearch = search?.toLowerCase() ?? "";
+
+  const matchesSearch =
+    lowerSearch &&
+    [
+      job.ro_number,
+      job.ownr_fn,
+      job.ownr_co_nm,
+      job.ownr_ln,
+      job.status,
+      job.v_make_desc,
+      job.v_model_desc,
+      job.clm_no,
+      job.plate_no
+    ].some((field) => field?.toLowerCase().includes(lowerSearch));
+
+  const matchesEmployeeId =
+    employeeId && [job.employee_body, job.employee_prep, job.employee_csr, job.employee_refinish].includes(employeeId);
+
+  return matchesSearch || matchesEmployeeId;
 };
-
-// export const updateBoardOnMove = (board, card, source, destination) => {
-//   //Slice from source
-
-//   const sourceCardList = board.columns.find((x) => x.id === source.fromColumnId)
-//     .cards;
-//   sourceCardList.slice(source.fromPosition, 0);
-
-//   //Splice into destination.
-//   const destCardList = board.columns.find(
-//     (x) => x.id === destination.toColumnId
-//   ).cards;
-//   console.log("updateBoardOnMove -> destCardList", destCardList);
-
-//   destCardList.splice(destination.toPosition, 0, card);
-//   console.log("updateBoardOnMove -> destCardList", destCardList);
-//   console.log("board", board);
-//   return board;
-// };
--- a/client/src/components/production-board-kanban/settings/FilterSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/FilterSettings.jsx
@@ -0,0 +1,81 @@
+import React from "react";
+import { Card, Form, Select } from "antd";
+import { useTranslation } from "react-i18next";
+import PropTypes from "prop-types";
+
+const FilterSettings = ({
+  selectedMdInsCos,
+  setSelectedMdInsCos,
+  selectedEstimators,
+  setSelectedEstimators,
+  setHasChanges,
+  bodyshop,
+  data
+}) => {
+  const { t } = useTranslation();
+
+  const extractNames = (source, firstNameKey, lastNameKey) =>
+    source.map((item) => ({
+      firstName: item[firstNameKey],
+      lastName: item[lastNameKey]
+    }));
+
+  const bodyshopNames = extractNames(bodyshop.md_estimators, "est_ct_fn", "est_ct_ln");
+  const dataNames = extractNames(data, "est_ct_fn", "est_ct_ln");
+
+  const combinedNames = [...bodyshopNames, ...dataNames];
+
+  const uniqueNames = Array.from(
+    new Map(combinedNames.map((item) => [`${item.firstName} ${item.lastName}`, item])).values()
+  );
+
+  return (
+    <Card title={t("production.settings.filters_title")}>
+      <Form.Item label={t("production.settings.filters.md_ins_cos")}>
+        <Select
+          mode="multiple"
+          placeholder={t("production.settings.filters.md_ins_cos")}
+          value={selectedMdInsCos}
+          onChange={(value) => {
+            setSelectedMdInsCos(value);
+            setHasChanges(true);
+          }}
+          options={bodyshop.md_ins_cos.map((item) => ({
+            value: item.name,
+            label: item.name
+          }))}
+        />
+      </Form.Item>
+      <Form.Item label={t("production.settings.filters.md_estimators")}>
+        <Select
+          mode="multiple"
+          placeholder={t("production.settings.filters.md_estimators")}
+          value={selectedEstimators}
+          onChange={(value) => {
+            setSelectedEstimators(value);
+            setHasChanges(true);
+          }}
+          options={uniqueNames.map((item) => {
+            const name = `${item.firstName} ${item.lastName}`.trim();
+            return {
+              value: name,
+              label: name
+            };
+          })}
+        />
+      </Form.Item>
+    </Card>
+  );
+};
+
+FilterSettings.propTypes = {
+  selectedMdInsCos: PropTypes.array.isRequired,
+  setSelectedMdInsCos: PropTypes.func.isRequired,
+  setHasChanges: PropTypes.func.isRequired,
+  selectedEstimators: PropTypes.array.isRequired,
+  setSelectedEstimators: PropTypes.func,
+  bodyshop: PropTypes.object.isRequired,
+  data: PropTypes.arrayOf(PropTypes.object).isRequired
+};
+
+export default FilterSettings;
--- a/client/src/components/production-board-kanban/settings/InformationSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/InformationSettings.jsx
@@ -0,0 +1,37 @@
+import { Card, Checkbox, Col, Form, Row } from "antd";
+import React from "react";
+import PropTypes from "prop-types";
+
+const InformationSettings = ({ t }) => (
+  <Card title={t("production.settings.information")}>
+    <Row gutter={[16, 16]}>
+      {[
+        "model_info",
+        "ownr_nm",
+        "clm_no",
+        "ins_co_nm",
+        "employeeassignments",
+        "actual_in",
+        "scheduled_completion",
+        "ats",
+        "production_note",
+        "sublets",
+        "partsstatus",
+        "estimator",
+        "subtotal"
+      ].map((item) => (
+        <Col span={4} key={item}>
+          <Form.Item name={item} valuePropName="checked">
+            <Checkbox>{t(`production.labels.${item}`)}</Checkbox>
+          </Form.Item>
+        </Col>
+      ))}
+    </Row>
+  </Card>
+);
+
+InformationSettings.propTypes = {
+  t: PropTypes.func.isRequired
+};
+
+export default InformationSettings;
--- a/client/src/components/production-board-kanban/settings/LayoutSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/LayoutSettings.jsx
@@ -0,0 +1,71 @@
+import { Card, Col, Form, Radio, Row } from "antd";
+import React from "react";
+import PropTypes from "prop-types";
+
+const LayoutSettings = ({ t }) => (
+  <Card title={t("production.settings.layout")}>
+    <Row gutter={[16, 16]}>
+      {[
+        {
+          name: "orientation",
+          label: t("production.labels.orientation"),
+          options: [
+            { value: true, label: t("production.labels.vertical") },
+            { value: false, label: t("production.labels.horizontal") }
+          ]
+        },
+        {
+          name: "cardSize",
+          label: t("production.labels.card_size"),
+          options: [
+            { value: "small", label: t("production.options.small") },
+            { value: "medium", label: t("production.options.medium") },
+            { value: "large", label: t("production.options.large") }
+          ]
+        },
+        {
+          name: "compact",
+          label: t("production.labels.compact"),
+          options: [
+            { value: true, label: t("production.labels.tall") },
+            { value: false, label: t("production.labels.wide") }
+          ]
+        },
+        {
+          name: "cardcolor",
+          label: t("production.labels.cardcolor"),
+          options: [
+            { value: true, label: t("production.labels.on") },
+            { value: false, label: t("production.labels.off") }
+          ]
+        },
+        {
+          name: "kiosk",
+          label: t("production.labels.kiosk_mode"),
+          options: [
+            { value: true, label: t("production.labels.on") },
+            { value: false, label: t("production.labels.off") }
+          ]
+        }
+      ].map(({ name, label, options }) => (
+        <Col span={4} key={name}>
+          <Form.Item name={name} label={label}>
+            <Radio.Group>
+              {options.map((option) => (
+                <Radio.Button key={option.value.toString()} value={option.value}>
+                  {option.label}
+                </Radio.Button>
+              ))}
+            </Radio.Group>
+          </Form.Item>
+        </Col>
+      ))}
+    </Row>
+  </Card>
+);
+
+LayoutSettings.propTypes = {
+  t: PropTypes.func.isRequired
+};
+
+export default LayoutSettings;
--- a/client/src/components/production-board-kanban/settings/StatisticsSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/StatisticsSettings.jsx
@@ -0,0 +1,59 @@
+import { DragDropContext, Draggable, Droppable } from "../trello-board/dnd/lib/index.js";
+import { statisticsItems } from "./defaultKanbanSettings.js";
+import { Card, Checkbox, Form } from "antd";
+import React from "react";
+import PropTypes from "prop-types";
+
+const StatisticsSettings = ({ t, statisticsOrder, setStatisticsOrder, setHasChanges }) => {
+  const onDragEnd = (result) => {
+    if (!result.destination) return;
+    const newOrder = Array.from(statisticsOrder);
+    const [movedItem] = newOrder.splice(result.source.index, 1);
+    newOrder.splice(result.destination.index, 0, movedItem);
+    setStatisticsOrder(newOrder);
+    setHasChanges(true);
+  };
+
+  return (
+    <Card title={t("production.settings.statistics_title")}>
+      <DragDropContext onDragEnd={onDragEnd}>
+        <Droppable direction="grid" droppableId="statistics">
+          {(provided) => (
+            <div
+              {...provided.droppableProps}
+              ref={provided.innerRef}
+              style={{ display: "flex", flexWrap: "wrap", gap: "8px" }}
+            >
+              {statisticsOrder.map((itemId, index) => {
+                const item = statisticsItems.find((stat) => stat.id === itemId);
+                return (
+                  <Draggable key={itemId} draggableId={itemId.toString()} index={index}>
+                    {(provided) => (
+                      <div ref={provided.innerRef} {...provided.draggableProps} {...provided.dragHandleProps}>
+                        <Card styles={{ body: { padding: "5px" } }} style={{ marginBottom: 8, flex: "0 1 auto" }}>
+                          <Form.Item style={{ marginBottom: 0 }} name={item.name} valuePropName="checked">
+                            <Checkbox>{t(`production.settings.statistics.${item.label}`)}</Checkbox>
+                          </Form.Item>
+                        </Card>
+                      </div>
+                    )}
+                  </Draggable>
+                );
+              })}
+              {provided.placeholder}
+            </div>
+          )}
+        </Droppable>
+      </DragDropContext>
+    </Card>
+  );
+};
+
+StatisticsSettings.propTypes = {
+  t: PropTypes.func.isRequired,
+  statisticsOrder: PropTypes.arrayOf(PropTypes.number).isRequired,
+  setStatisticsOrder: PropTypes.func.isRequired,
+  setHasChanges: PropTypes.func.isRequired
+};
+
+export default StatisticsSettings;
--- a/client/src/components/production-board-kanban/settings/defaultKanbanSettings.js
+++ b/client/src/components/production-board-kanban/settings/defaultKanbanSettings.js
@@ -0,0 +1,46 @@
+const statisticsItems = [
+  { id: 0, name: "totalHrs", label: "total_hours_in_production" },
+  { id: 1, name: "totalAmountInProduction", label: "total_amount_in_production" },
+  { id: 2, name: "totalLAB", label: "total_lab_in_production" },
+  { id: 3, name: "totalLAR", label: "total_lar_in_production" },
+  { id: 4, name: "jobsInProduction", label: "jobs_in_production" },
+  { id: 5, name: "totalHrsOnBoard", label: "total_hours_on_board" },
+  { id: 6, name: "totalAmountOnBoard", label: "total_amount_on_board" },
+  { id: 7, name: "totalLABOnBoard", label: "total_lab_on_board" },
+  { id: 8, name: "totalLAROnBoard", label: "total_lar_on_board" },
+  { id: 9, name: "jobsOnBoard", label: "total_jobs_on_board" }
+];
+
+const defaultKanbanSettings = {
+  ats: true,
+  clm_no: true,
+  compact: false,
+  ownr_nm: true,
+  sublets: true,
+  ins_co_nm: true,
+  production_note: true,
+  employeeassignments: true,
+  scheduled_completion: true,
+  cardcolor: false,
+  orientation: false,
+  cardSize: "small",
+  model_info: true,
+  kiosk: false,
+  totalHrs: true,
+  totalAmountInProduction: false,
+  totalLAB: true,
+  totalLAR: true,
+  jobsInProduction: true,
+  totalHrsOnBoard: false,
+  totalLABOnBoard: false,
+  totalLAROnBoard: false,
+  jobsOnBoard: false,
+  totalAmountOnBoard: true,
+  estimator: false,
+  subtotal: false,
+  statisticsOrder: statisticsItems.map((item) => item.id),
+  selectedMdInsCos: [],
+  selectedEstimators: []
+};
+
+export { defaultKanbanSettings, statisticsItems };
--- a/client/src/components/production-board-kanban/settings/production-board-kanban.settings.component.jsx
+++ b/client/src/components/production-board-kanban/settings/production-board-kanban.settings.component.jsx
@@ -0,0 +1,157 @@
+import { useMutation } from "@apollo/client";
+import { Button, Card, Col, Form, notification, Popover, Row, Tabs } from "antd";
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { UPDATE_KANBAN_SETTINGS } from "../../../graphql/user.queries.js";
+import { defaultKanbanSettings } from "./defaultKanbanSettings.js";
+import LayoutSettings from "./LayoutSettings.jsx";
+import InformationSettings from "./InformationSettings.jsx";
+import StatisticsSettings from "./StatisticsSettings.jsx";
+import FilterSettings from "./FilterSettings.jsx";
+
+export default function ProductionBoardKanbanSettings({ associationSettings, parentLoading, bodyshop, data }) {
+  const [form] = Form.useForm();
+  const [open, setOpen] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [hasChanges, setHasChanges] = useState(false);
+  const [statisticsOrder, setStatisticsOrder] = useState(defaultKanbanSettings.statisticsOrder);
+  const [selectedMdInsCos, setSelectedMdInsCos] = useState(defaultKanbanSettings.selectedMdInsCos);
+  const [selectedEstimators, setSelectedEstimators] = useState(defaultKanbanSettings.selectedEstimators);
+
+  const [updateKbSettings] = useMutation(UPDATE_KANBAN_SETTINGS);
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    if (associationSettings?.kanban_settings) {
+      form.setFieldsValue(associationSettings.kanban_settings);
+      if (associationSettings.kanban_settings.statisticsOrder) {
+        setStatisticsOrder(associationSettings.kanban_settings.statisticsOrder);
+      }
+      if (associationSettings.kanban_settings.selectedMdInsCos) {
+        setSelectedMdInsCos(associationSettings.kanban_settings.selectedMdInsCos);
+      }
+      if (associationSettings.kanban_settings.selectedEstimators) {
+        setSelectedEstimators(associationSettings.kanban_settings.selectedEstimators);
+      }
+    }
+  }, [form, associationSettings]);
+
+  const handleFinish = async (values) => {
+    setLoading(true);
+    parentLoading(true);
+
+    const result = await updateKbSettings({
+      variables: {
+        id: associationSettings?.id,
+        ks: {
+          ...associationSettings.kanban_settings,
+          ...values,
+          statisticsOrder,
+          selectedMdInsCos,
+          selectedEstimators
+        }
+      }
+    });
+
+    if (result.errors) {
+      notification.open({
+        type: "error",
+        message: t("production.errors.settings", {
+          error: JSON.stringify(result.errors)
+        })
+      });
+    }
+
+    setOpen(false);
+    setLoading(false);
+    parentLoading(false);
+    setHasChanges(false);
+  };
+
+  const handleValuesChange = () => setHasChanges(true);
+
+  const handleRestoreDefaults = () => {
+    form.setFieldsValue({
+      ...defaultKanbanSettings,
+      statisticsOrder: defaultKanbanSettings.statisticsOrder
+    });
+    setStatisticsOrder(defaultKanbanSettings.statisticsOrder);
+    setSelectedMdInsCos(defaultKanbanSettings.selectedMdInsCos);
+    setSelectedEstimators(defaultKanbanSettings.selectedEstimators);
+    setHasChanges(true);
+  };
+
+  const overlay = (
+    <Card style={{ minWidth: "80vw" }}>
+      <Form form={form} onFinish={handleFinish} layout="vertical" onValuesChange={handleValuesChange}>
+        <Tabs
+          defaultActiveKey="1"
+          items={[
+            {
+              key: "1",
+              label: t("production.settings.layout"),
+              children: <LayoutSettings t={t} />
+            },
+            {
+              key: "2",
+              label: t("production.settings.information"),
+              children: <InformationSettings t={t} />
+            },
+            {
+              key: "3",
+              label: t("production.settings.statistics_title"),
+              children: (
+                <StatisticsSettings
+                  t={t}
+                  statisticsOrder={statisticsOrder}
+                  setStatisticsOrder={setStatisticsOrder}
+                  setHasChanges={setHasChanges}
+                />
+              )
+            },
+            {
+              key: "4",
+              label: t("production.settings.filters_title"),
+              children: (
+                <FilterSettings
+                  selectedMdInsCos={selectedMdInsCos}
+                  setSelectedMdInsCos={setSelectedMdInsCos}
+                  selectedEstimators={selectedEstimators}
+                  setSelectedEstimators={setSelectedEstimators}
+                  setHasChanges={setHasChanges}
+                  bodyshop={bodyshop}
+                  data={data}
+                />
+              )
+            }
+          ]}
+        />
+        <Row justify="center" style={{ marginTop: 15 }} gutter={16}>
+          <Col span={8}>
+            <Button block onClick={() => setOpen(false)}>
+              {t("general.actions.cancel")}
+            </Button>
+          </Col>
+          <Col span={8}>
+            <Button block onClick={handleRestoreDefaults}>
+              {t("general.actions.defaults")}
+            </Button>
+          </Col>
+          <Col span={8}>
+            <Button block onClick={form.submit} loading={loading} type="primary" disabled={!hasChanges}>
+              {t("general.actions.save")}
+            </Button>
+          </Col>
+        </Row>
+      </Form>
+    </Card>
+  );
+
+  return (
+    <Popover content={overlay} open={open} placement="topRight">
+      <Button loading={loading} onClick={() => setOpen(!open)}>
+        {t("production.settings.board_settings")}
+      </Button>
+    </Popover>
+  );
+}
--- a/client/src/components/production-board-kanban/trello-board/components/HeightMemoryWrapper.jsx
+++ b/client/src/components/production-board-kanban/trello-board/components/HeightMemoryWrapper.jsx
@@ -14,6 +14,7 @@ const HeightMemoryWrapper = ({ children, maxHeight, setMaxHeight, override, item
  const ref = useRef(null);
  const heightMapRef = useRef(new Map());
  const [localMaxHeight, setLocalMaxHeight] = useState(maxHeight);
+  const [devicePixelRatio, setDevicePixelRatio] = useState(window.devicePixelRatio);

  useEffect(() => {
    const currentRef = ref.current;
@@ -31,16 +32,30 @@ const HeightMemoryWrapper = ({ children, maxHeight, setMaxHeight, override, item
    };

    const resizeObserver = new ResizeObserver(updateHeight);
+
    if (currentRef?.firstChild) {
      resizeObserver.observe(currentRef.firstChild);
    }

+    const resizeHandler = () => {
+      if (Math.abs(window.devicePixelRatio - devicePixelRatio) > 0.1) {
+        // Threshold to detect significant zoom level change
+        heightMapRef.current.clear(); // Clearing the height memory as zoom level has changed significantly
+        setLocalMaxHeight(0); // Reset local max height
+        setDevicePixelRatio(window.devicePixelRatio); // Update the recorded device pixel ratio
+      }
+      updateHeight();
+    };
+
+    window.addEventListener("resize", resizeHandler);
+
    return () => {
      if (currentRef?.firstChild) {
        resizeObserver.unobserve(currentRef.firstChild);
      }
+      window.removeEventListener("resize", resizeHandler);
    };
-  }, [itemKey, setMaxHeight]);
+  }, [itemKey, setMaxHeight, devicePixelRatio]);

  useEffect(() => {
    if (itemKey && heightMapRef.current.has(itemKey)) {
--- a/client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx
+++ b/client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx
@@ -7,6 +7,7 @@ import Lane from "./Lane";
 import { PopoverWrapper } from "react-popopo";
 import * as actions from "../../../../redux/trello/trello.actions.js";
 import { BoardWrapper } from "../styles/Base.js";
+import ProductionStatistics from "../../production-board-kanban.statistics.jsx";

 const useDragMap = () => {
  const dragMapRef = useRef(new Map());
@@ -30,7 +31,8 @@ const BoardContainer = ({
  orientation = "horizontal",
  cardSettings = {},
  eventBusHandle,
-  reducerData
+  reducerData,
+  queryData
 }) => {
  const [isDragging, setIsDragging] = useState(false);
  const [isProcessing, setIsProcessing] = useState(false);
@@ -124,33 +126,36 @@ const BoardContainer = ({
  );

  return (
-    <PopoverWrapper>
-      <BoardWrapper orientation={orientation}>
-        <DragDropContext onDragEnd={onLaneDrag} onDragStart={onDragStart} contextId="production-board">
-          {currentReducerData.lanes.map((lane, index) => (
-            <Lane
-              key={lane.id}
-              id={lane.id}
-              title={lane.title}
-              index={index}
-              laneSortFunction={laneSortFunction}
-              orientation={orientation}
-              cards={lane.cards}
-              isDragging={isDragging}
-              isProcessing={isProcessing}
-              cardSettings={cardSettings}
-              maxLaneHeight={maxLaneHeight}
-              setMaxLaneHeight={setMaxLaneHeight}
-              maxCardHeight={maxCardHeight}
-              setMaxCardHeight={setMaxCardHeight}
-              maxCardWidth={maxCardWidth}
-              setMaxCardWidth={setMaxCardWidth}
-              lastDrag={getLastDragTime(lane.id)}
-            />
-          ))}
-        </DragDropContext>
-      </BoardWrapper>
-    </PopoverWrapper>
+    <div>
+      <ProductionStatistics data={queryData} reducerData={currentReducerData} cardSettings={cardSettings} />
+      <PopoverWrapper>
+        <BoardWrapper orientation={orientation}>
+          <DragDropContext onDragEnd={onLaneDrag} onDragStart={onDragStart} contextId="production-board">
+            {currentReducerData.lanes.map((lane, index) => (
+              <Lane
+                key={lane.id}
+                id={lane.id}
+                title={lane.title}
+                index={index}
+                laneSortFunction={laneSortFunction}
+                orientation={orientation}
+                cards={lane.cards}
+                isDragging={isDragging}
+                isProcessing={isProcessing}
+                cardSettings={cardSettings}
+                maxLaneHeight={maxLaneHeight}
+                setMaxLaneHeight={setMaxLaneHeight}
+                maxCardHeight={maxCardHeight}
+                setMaxCardHeight={setMaxCardHeight}
+                maxCardWidth={maxCardWidth}
+                setMaxCardWidth={setMaxCardWidth}
+                lastDrag={getLastDragTime(lane.id)}
+              />
+            ))}
+          </DragDropContext>
+        </BoardWrapper>
+      </PopoverWrapper>
+    </div>
  );
 };

--- a/client/src/components/production-list-columns/production-list-columns.date.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.date.component.jsx
@@ -1,11 +1,11 @@
 import { useMutation } from "@apollo/client";
-import { Button, Card, Dropdown, TimePicker } from "antd";
-import dayjs from "../../utils/day";
+import { Button, Card, Dropdown, Space, TimePicker } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { DateFormatter } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";

 export default function ProductionListDate({ record, field, time, pastIndicator }) {
@@ -56,23 +56,25 @@ export default function ProductionListDate({ record, field, time, pastIndicator
        key: "overlayItem1",
        label: (
          <Card style={{ padding: "1rem" }} onClick={(e) => e.stopPropagation()}>
-            <FormDatePicker
-              onClick={(e) => e.stopPropagation()}
-              value={(record[field] && dayjs(record[field])) || null}
-              onChange={handleChange}
-              format="MM/DD/YYYY"
-              isDateOnly={!time}
-            />
-            {time && (
-              <TimePicker
+            <Space direction={"vertical"}>
+              <FormDatePicker
                onClick={(e) => e.stopPropagation()}
                value={(record[field] && dayjs(record[field])) || null}
                onChange={handleChange}
-                minuteStep={15}
-                format="hh:mm a"
+                format="MM/DD/YYYY"
+                isDateOnly={!time}
              />
-            )}
-            <Button onClick={() => setOpen(false)}>{t("general.actions.close")}</Button>
+              {time && (
+                <TimePicker
+                  onClick={(e) => e.stopPropagation()}
+                  value={(record[field] && dayjs(record[field])) || null}
+                  onChange={handleChange}
+                  minuteStep={15}
+                  format="hh:mm a"
+                />
+              )}
+              <Button onClick={() => setOpen(false)}>{t("general.actions.close")}</Button>
+            </Space>
          </Card>
        )
      }
--- a/client/src/components/shop-employees/shop-employees-list.component.jsx
+++ b/client/src/components/shop-employees/shop-employees-list.component.jsx
@@ -63,7 +63,7 @@ export default function ShopEmployeesListComponent({ loading, employees }) {
          value: false
        }
      ],
-      onFilter: (value, record) => value === record.flate_rate,
+      onFilter: (value, record) => value === record.flat_rate,
      render: (text, record) =>
        record.flat_rate ? t("employees.labels.flat_rate") : t("employees.labels.straight_time")
    },
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.taxes.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.taxes.component.jsx
@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";

 const mapStateToProps = createStructuredSelector({
@@ -51,6 +52,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
      <Collapse>
        <Collapse.Panel forceRender header={t("jobs.labels.cieca_pfl")} key="cieca_pfl">
          <LayoutFormRow header={t("joblines.fields.lbr_types.LAB")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAB", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
              name={["md_responsibility_centers", "cieca_pfl", "LAB", "lbr_tax_in"]}
@@ -58,6 +65,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            >
              <Switch />
            </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAB", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAB", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
              name={["md_responsibility_centers", "cieca_pfl", "LAB", "lbr_tx_in1"]}
@@ -95,6 +120,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            </Form.Item>
          </LayoutFormRow>
          <LayoutFormRow header={t("joblines.fields.lbr_types.LAD")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAD", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
              name={["md_responsibility_centers", "cieca_pfl", "LAD", "lbr_tax_in"]}
@@ -102,6 +133,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            >
              <Switch />
            </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAD", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAD", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
              name={["md_responsibility_centers", "cieca_pfl", "LAD", "lbr_tx_in1"]}
@@ -139,6 +188,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            </Form.Item>
          </LayoutFormRow>
          <LayoutFormRow header={t("joblines.fields.lbr_types.LAE")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAE", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
              name={["md_responsibility_centers", "cieca_pfl", "LAE", "lbr_tax_in"]}
@@ -146,6 +201,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            >
              <Switch />
            </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAE", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAE", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
              name={["md_responsibility_centers", "cieca_pfl", "LAE", "lbr_tx_in1"]}
@@ -183,6 +256,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            </Form.Item>
          </LayoutFormRow>
          <LayoutFormRow header={t("joblines.fields.lbr_types.LAF")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAF", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
              name={["md_responsibility_centers", "cieca_pfl", "LAF", "lbr_tax_in"]}
@@ -190,6 +269,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            >
              <Switch />
            </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAF", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAF", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
              name={["md_responsibility_centers", "cieca_pfl", "LAF", "lbr_tx_in1"]}
@@ -227,6 +324,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            </Form.Item>
          </LayoutFormRow>
          <LayoutFormRow header={t("joblines.fields.lbr_types.LAG")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAG", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
              name={["md_responsibility_centers", "cieca_pfl", "LAG", "lbr_tax_in"]}
@@ -234,6 +337,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            >
              <Switch />
            </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAG", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAG", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
              name={["md_responsibility_centers", "cieca_pfl", "LAG", "lbr_tx_in1"]}
@@ -271,6 +392,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            </Form.Item>
          </LayoutFormRow>
          <LayoutFormRow header={t("joblines.fields.lbr_types.LAM")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAM", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
              name={["md_responsibility_centers", "cieca_pfl", "LAM", "lbr_tax_in"]}
@@ -278,6 +405,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            >
              <Switch />
            </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAM", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAM", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
              name={["md_responsibility_centers", "cieca_pfl", "LAM", "lbr_tx_in1"]}
@@ -315,6 +460,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            </Form.Item>
          </LayoutFormRow>
          <LayoutFormRow header={t("joblines.fields.lbr_types.LAR")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAR", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
              name={["md_responsibility_centers", "cieca_pfl", "LAR", "lbr_tax_in"]}
@@ -322,6 +473,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            >
              <Switch />
            </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAR", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAR", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
              name={["md_responsibility_centers", "cieca_pfl", "LAR", "lbr_tx_in1"]}
@@ -359,6 +528,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            </Form.Item>
          </LayoutFormRow>
          <LayoutFormRow header={t("joblines.fields.lbr_types.LAS")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAS", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
              name={["md_responsibility_centers", "cieca_pfl", "LAS", "lbr_tax_in"]}
@@ -366,6 +541,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            >
              <Switch />
            </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAS", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAS", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
              name={["md_responsibility_centers", "cieca_pfl", "LAS", "lbr_tx_in1"]}
@@ -403,6 +596,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            </Form.Item>
          </LayoutFormRow>
          <LayoutFormRow header={t("joblines.fields.lbr_types.LAU")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAU", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
              name={["md_responsibility_centers", "cieca_pfl", "LAU", "lbr_tax_in"]}
@@ -410,6 +609,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            >
              <Switch />
            </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAU", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAU", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={2} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
              name={["md_responsibility_centers", "cieca_pfl", "LAU", "lbr_tx_in1"]}
@@ -462,7 +679,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            >
              <Input />
            </Form.Item>
-
+            <Form.Item
+              label={t("jobs.fields.materials.mat_adjp")}
+              name={["md_responsibility_centers", "cieca_pfm", "MAPA", "mat_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.materials.tax_ind")}
              name={["md_responsibility_centers", "cieca_pfm", "MAPA", "tax_ind"]}
@@ -470,6 +692,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            >
              <Switch />
            </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.materials.mat_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfm", "MAPA", "mat_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfm", "MAPA", "tax_ind"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.materials.mat_tx_in1")}
              name={["md_responsibility_centers", "cieca_pfm", "MAPA", "mat_tx_in1"]}
@@ -519,7 +759,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            >
              <Input />
            </Form.Item>
-
+            <Form.Item
+              label={t("jobs.fields.materials.mat_adjp")}
+              name={["md_responsibility_centers", "cieca_pfm", "MASH", "mat_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.materials.tax_ind")}
              name={["md_responsibility_centers", "cieca_pfm", "MASH", "tax_ind"]}
@@ -527,6 +772,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            >
              <Switch />
            </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.materials.mat_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfm", "MASH", "mat_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfm", "MASH", "tax_ind"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
            <Form.Item
              label={t("jobs.fields.materials.mat_tx_in1")}
              name={["md_responsibility_centers", "cieca_pfm", "MASH", "mat_tx_in1"]}
@@ -1765,25 +2028,37 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
            </Form.Item>
          </LayoutFormRow>
          <LayoutFormRow>
-            <Form.Item label={t("jobs.fields.tax_tow_rt")} name="tax_tow_rt">
+            <Form.Item label={t("jobs.fields.tax_tow_rt")} name={["md_responsibility_centers", "tax_tow_rt"]}>
              <InputNumber min={0} max={100} precision={4} />
            </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_str_rt")} name="tax_str_rt">
+            <Form.Item label={t("jobs.fields.tax_str_rt")} name={["md_responsibility_centers", "tax_str_rt"]}>
              <InputNumber min={0} max={100} precision={4} />
            </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_paint_mat_rt")} name="tax_paint_mat_rt">
+            {InstanceRenderManager({ imex: true, rome: false, promanager: "USE_ROME" }) ? (
+              <>
+                <Form.Item
+                  label={t("jobs.fields.tax_paint_mat_rt")}
+                  name={["md_responsibility_centers", "tax_paint_mat_rt"]}
+                >
+                  <InputNumber min={0} max={100} precision={4} />
+                </Form.Item>
+                <Form.Item
+                  label={t("jobs.fields.tax_shop_mat_rt")}
+                  name={["md_responsibility_centers", "tax_shop_mat_rt"]}
+                >
+                  <InputNumber min={0} max={100} precision={4} />
+                </Form.Item>
+              </>
+            ) : null}
+            <Form.Item label={t("jobs.fields.tax_sub_rt")} name={["md_responsibility_centers", "tax_sub_rt"]}>
              <InputNumber min={0} max={100} precision={4} />
            </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_shop_mat_rt")} name="tax_shop_mat_rt">
-              <InputNumber min={0} max={100} precision={4} />
-            </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_sub_rt")} name="tax_sub_rt">
-              <InputNumber min={0} max={100} precision={4} />
-            </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_lbr_rt")} name="tax_lbr_rt">
-              <InputNumber min={0} max={100} precision={4} />
-            </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_levies_rt")} name="tax_levies_rt">
+            {InstanceRenderManager({ imex: true, rome: false, promanager: "USE_ROME" }) ? (
+              <Form.Item label={t("jobs.fields.tax_lbr_rt")} name={["md_responsibility_centers", "tax_lbr_rt"]}>
+                <InputNumber min={0} max={100} precision={4} />
+              </Form.Item>
+            ) : null}
+            <Form.Item label={t("jobs.fields.tax_levies_rt")} name={["md_responsibility_centers", "tax_levies_rt"]}>
              <InputNumber min={0} max={100} precision={4} />
            </Form.Item>
          </LayoutFormRow>
--- a/client/src/graphql/bills.queries.js
+++ b/client/src/graphql/bills.queries.js
@@ -50,7 +50,7 @@ export const QUERY_ALL_BILLS_PAGINATED = gql`
  }
 `;

-export const QUERY_BILLS_BY_JOBID = gql`
+export const QUERY_PARTS_BILLS_BY_JOBID = gql`
  query QUERY_PARTS_BILLS_BY_JOBID($jobid: uuid!) {
    parts_orders(where: { jobid: { _eq: $jobid } }, order_by: { order_date: desc }) {
      id
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -151,14 +151,6 @@ export const QUERY_PARTS_QUEUE = gql`
    }
  }
 `;
-export const SUBSCRIPTION_JOBS_IN_PRODUCTION = gql`
-  subscription SUBSCRIPTION_JOBS_IN_PRODUCTION {
-    jobs(where: { inproduction: { _eq: true } }) {
-      id
-      updated_at
-    }
-  }
-`;

 export const QUERY_EXACT_JOB_IN_PRODUCTION = gql`
  query QUERY_EXACT_JOB_IN_PRODUCTION($id: uuid!) {
@@ -300,82 +292,6 @@ export const QUERY_EXACT_JOBS_IN_PRODUCTION = gql`
  }
 `;

-export const QUERY_JOBS_IN_PRODUCTION = gql`
-  query QUERY_JOBS_IN_PRODUCTION {
-    jobs(where: { inproduction: { _eq: true } }) {
-      id
-      updated_at
-      comment
-      status
-      category
-      iouparent
-      ro_number
-      ownerid
-      ownr_fn
-      ownr_ln
-      ownr_co_nm
-      v_model_yr
-      v_model_desc
-      clm_no
-      v_make_desc
-      v_color
-      vehicleid
-      plate_no
-      actual_in
-      scheduled_completion
-      scheduled_delivery
-      date_last_contacted
-      date_next_contact
-      ins_co_nm
-      clm_total
-      ownr_ph1
-      ownr_ph2
-      special_coverage_policy
-      owner_owing
-      production_vars
-      kanbanparent
-      alt_transport
-      employee_body
-      employee_refinish
-      employee_prep
-      employee_csr
-      est_ct_fn
-      est_ct_ln
-      suspended
-      date_repairstarted
-      joblines_status {
-        part_type
-        status
-        count
-      }
-      labhrs: joblines_aggregate(where: { _and: [{ mod_lbr_ty: { _neq: "LAR" } }, { removed: { _eq: false } }] }) {
-        aggregate {
-          sum {
-            mod_lb_hrs
-          }
-        }
-      }
-      larhrs: joblines_aggregate(where: { _and: [{ mod_lbr_ty: { _eq: "LAR" } }, { removed: { _eq: false } }] }) {
-        aggregate {
-          sum {
-            mod_lb_hrs
-          }
-        }
-      }
-      subletLines: joblines(
-        where: { _and: { part_type: { _in: ["PAS", "PASL"] }, removed: { _eq: false } } }
-        order_by: { line_no: asc }
-      ) {
-        id
-        line_desc
-        sublet_ignored
-        sublet_completed
-        jobid
-      }
-    }
-  }
-`;
-
 export const QUERY_LBR_HRS_BY_PK = gql`
  query QUERY_LBR_HRS_BY_PK($id: uuid!) {
    jobs_by_pk(id: $id) {
@@ -904,10 +820,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
        status
      }

-      joblines(
-        where: { removed: { _eq: false } }
-        order_by: { line_no: asc }
-      ) {
+      joblines(where: { removed: { _eq: false } }, order_by: { line_no: asc }) {
        id
        alt_partm
        line_no
@@ -1149,6 +1062,7 @@ export const UPDATE_JOB = gql`
        suspended
        queued_for_parts
        scheduled_completion
+        scheduled_delivery
        actual_in
        date_repairstarted
        date_void
@@ -2028,10 +1942,6 @@ export const generate_UPDATE_JOB_KANBAN = (
  newChildId,
  newChildParent
 ) => {
-  // console.log("oldChildId", oldChildId, "oldChildNewParent", oldChildNewParent);
-  // console.log("Moved", movedId, movedNewParent, movedNewStatus);
-  // console.log("new", newChildId, newChildParent);
-
  const oldChildQuery = `
  updateOldChild: update_jobs(where: { id: { _eq: "${oldChildId}" } },
  _set: {kanbanparent: ${oldChildNewParent ? `"${oldChildNewParent}"` : null}}) {
@@ -2542,3 +2452,89 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
    }
  }
 `;
+
+export const SUBSCRIPTION_JOBS_IN_PRODUCTION = gql`
+  subscription SUBSCRIPTION_JOBS_IN_PRODUCTION {
+    jobs(where: { inproduction: { _eq: true } }) {
+      id
+      updated_at
+    }
+  }
+`;
+
+export const QUERY_JOBS_IN_PRODUCTION = gql`
+  query QUERY_JOBS_IN_PRODUCTION {
+    jobs(where: { inproduction: { _eq: true } }) {
+      id
+      updated_at
+      comment
+      status
+      category
+      iouparent
+      ro_number
+      ownerid
+      ownr_fn
+      ownr_ln
+      ownr_co_nm
+      v_model_yr
+      v_model_desc
+      clm_no
+      v_make_desc
+      v_color
+      vehicleid
+      plate_no
+      actual_in
+      scheduled_completion
+      scheduled_delivery
+      date_last_contacted
+      date_next_contact
+      ins_co_nm
+      clm_total
+      ownr_ph1
+      ownr_ph2
+      special_coverage_policy
+      owner_owing
+      production_vars
+      kanbanparent
+      alt_transport
+      employee_body
+      employee_refinish
+      employee_prep
+      employee_csr
+      est_ct_fn
+      est_ct_ln
+      suspended
+      job_totals
+      date_repairstarted
+      joblines_status {
+        part_type
+        status
+        count
+      }
+      labhrs: joblines_aggregate(where: { _and: [{ mod_lbr_ty: { _neq: "LAR" } }, { removed: { _eq: false } }] }) {
+        aggregate {
+          sum {
+            mod_lb_hrs
+          }
+        }
+      }
+      larhrs: joblines_aggregate(where: { _and: [{ mod_lbr_ty: { _eq: "LAR" } }, { removed: { _eq: false } }] }) {
+        aggregate {
+          sum {
+            mod_lb_hrs
+          }
+        }
+      }
+      subletLines: joblines(
+        where: { _and: { part_type: { _in: ["PAS", "PASL"] }, removed: { _eq: false } } }
+        order_by: { line_no: asc }
+      ) {
+        id
+        line_desc
+        sublet_ignored
+        sublet_completed
+        jobid
+      }
+    }
+  }
+`;
--- a/client/src/pages/jobs-create/jobs-create.container.jsx
+++ b/client/src/pages/jobs-create/jobs-create.container.jsx
@@ -10,9 +10,9 @@ import { INSERT_NEW_JOB } from "../../graphql/jobs.queries";
 import { QUERY_OWNER_FOR_JOB_CREATION } from "../../graphql/owners.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import JobsCreateComponent from "./jobs-create.component";
 import JobCreateContext from "./jobs-create.context";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -159,13 +159,6 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
          layout="vertical"
          autoComplete={"off"}
          initialValues={{
-            tax_tow_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-            tax_str_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-            tax_paint_mat_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-            tax_shop_mat_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-            tax_sub_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-            tax_lbr_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-            tax_levies_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
            federal_tax_rate: bodyshop.bill_tax_rates.federal_tax_rate / 100,
            state_tax_rate: bodyshop.bill_tax_rates.state_tax_rate / 100,
            local_tax_rate: bodyshop.bill_tax_rates.local_tax_rate / 100,
@@ -261,19 +254,34 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
                    prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
                  }
                },
-                rome: {
-                  cieca_pft: {
-                    ...bodyshop.md_responsibility_centers.taxes.tax_ty1,
-                    ...bodyshop.md_responsibility_centers.taxes.tax_ty2,
-                    ...bodyshop.md_responsibility_centers.taxes.tax_ty3,
-                    ...bodyshop.md_responsibility_centers.taxes.tax_ty4,
-                    ...bodyshop.md_responsibility_centers.taxes.tax_ty5
-                  },
-                  materials: bodyshop.md_responsibility_centers.cieca_pfm,
-                  cieca_pfl: bodyshop.md_responsibility_centers.cieca_pfl,
-                  parts_tax_rates: bodyshop.md_responsibility_centers.parts_tax_rates
-                }
-              }
+                tax_tow_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+                tax_str_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+                tax_paint_mat_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+                tax_shop_mat_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+                tax_sub_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+                tax_lbr_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+                tax_levies_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+              },
+              rome: {
+                cieca_pft: {
+                  ...bodyshop.md_responsibility_centers.taxes.tax_ty1,
+                  ...bodyshop.md_responsibility_centers.taxes.tax_ty2,
+                  ...bodyshop.md_responsibility_centers.taxes.tax_ty3,
+                  ...bodyshop.md_responsibility_centers.taxes.tax_ty4,
+                  ...bodyshop.md_responsibility_centers.taxes.tax_ty5
+                },
+                materials: bodyshop.md_responsibility_centers.cieca_pfm,
+                cieca_pfl: bodyshop.md_responsibility_centers.cieca_pfl,
+                parts_tax_rates: bodyshop.md_responsibility_centers.parts_tax_rates,
+                tax_tow_rt: bodyshop.md_responsibility_centers.tax_tow_rt,
+                tax_str_rt: bodyshop.md_responsibility_centers.tax_str_rt,
+                tax_paint_mat_rt: bodyshop.md_responsibility_centers.tax_paint_mat_rt,
+                tax_shop_mat_rt: bodyshop.md_responsibility_centers.tax_shop_mat_rt,
+                tax_sub_rt: bodyshop.md_responsibility_centers.tax_sub_rt,
+                tax_lbr_rt: bodyshop.md_responsibility_centers.tax_lbr_rt,
+                tax_levies_rt: bodyshop.md_responsibility_centers.tax_levies_rt
+              },
+              promanager: "USE_ROME"
            })
          }}
        >
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -8,11 +8,11 @@ import Icon, {
  SyncOutlined,
  ToolFilled
 } from "@ant-design/icons";
-import { Badge, Button, Divider, Form, notification, Space, Tabs } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
-
+import { useQuery } from "@apollo/client";
+import { Badge, Button, Divider, Form, notification, Space, Tabs } from "antd";
 import Axios from "axios";
-import dayjs from "../../utils/day";
+import _ from "lodash";
 import queryString from "query-string";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -20,11 +20,13 @@ import { FaHardHat, FaRegStickyNote, FaShieldAlt, FaTasks } from "react-icons/fa
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
 import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
 import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
 import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
 import JobLifecycleComponent from "../../components/job-lifecycle/job-lifecycle.component";
 import JobLineUpsertModalContainer from "../../components/job-lines-upsert-modal/job-lines-upsert-modal.container";
+import JobProfileDataWarning from "../../components/job-profile-data-warning/job-profile-data-warning.component";
 import JobReconciliationModal from "../../components/job-reconciliation-modal/job-reconciliation.modal.container";
 import JobSyncButton from "../../components/job-sync-button/job-sync-button.component";
 import JobsChangeStatus from "../../components/jobs-change-status/jobs-change-status.component";
@@ -42,19 +44,18 @@ import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gal
 import JobNotesContainer from "../../components/jobs-notes/jobs-notes.container";
 import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container";
 import ScheduleJobModalContainer from "../../components/schedule-job-modal/schedule-job-modal.container";
+import TaskListContainer from "../../components/task-list/task-list.container.jsx";
+import { QUERY_PARTS_BILLS_BY_JOBID } from "../../graphql/bills.queries.js";
+import { QUERY_JOB_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import UndefinedToNull from "../../utils/undefinedtonull";
-import _ from "lodash";
-import JobProfileDataWarning from "../../components/job-profile-data-warning/job-profile-data-warning.component";
 import { DateTimeFormat } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
-import TaskListContainer from "../../components/task-list/task-list.container.jsx";
-import { QUERY_JOB_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
+import UndefinedToNull from "../../utils/undefinedtonull";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -95,6 +96,11 @@ export function JobsDetailPage({
  const formItemLayout = {
    layout: "vertical"
  };
+  const billsQuery = useQuery(QUERY_PARTS_BILLS_BY_JOBID, {
+    variables: { jobid: job.id },
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only"
+  });

  useEffect(() => {
    //form.setFieldsValue(transormJobToForm(job));
@@ -103,6 +109,42 @@ export function JobsDetailPage({

  //useKeyboardSaveShortcut(form.submit);

+  const handleBillOnRowClick = (record) => {
+    if (record) {
+      if (record.id) {
+        search.billid = record.id;
+        history({ search: queryString.stringify(search) });
+      }
+    } else {
+      delete search.billid;
+      history({ search: queryString.stringify(search) });
+    }
+  };
+
+  const handlePartsOrderOnRowClick = (record) => {
+    if (record) {
+      if (record.id) {
+        search.partsorderid = record.id;
+        history({ search: queryString.stringify(search) });
+      }
+    } else {
+      delete search.partsorderid;
+      history({ search: queryString.stringify(search) });
+    }
+  };
+
+  const handlePartsDispatchOnRowClick = (record) => {
+    if (record) {
+      if (record.id) {
+        search.partsdispatchid = record.id;
+        history.push({ search: queryString.stringify(search) });
+      }
+    } else {
+      delete search.partsdispatchid;
+      history.push({ search: queryString.stringify(search) });
+    }
+  };
+
  const handleFinish = async (values) => {
    setLoading(true);

@@ -302,7 +344,18 @@ export function JobsDetailPage({
              id: "job-details-repairdata",
              label: t("menus.jobsdetail.repairdata"),
              forceRender: true,
-              children: <JobsLinesContainer job={job} joblines={job.joblines} refetch={refetch} form={form} />
+              children: (
+                <JobsLinesContainer
+                  job={job}
+                  joblines={job.joblines}
+                  billsQuery={billsQuery}
+                  handleBillOnRowClick={handleBillOnRowClick}
+                  handlePartsOrderOnRowClick={handlePartsOrderOnRowClick}
+                  handlePartsDispatchOnRowClick={handlePartsDispatchOnRowClick}
+                  refetch={refetch}
+                  form={form}
+                />
+              )
            },
            {
              key: "rates",
@@ -326,7 +379,15 @@ export function JobsDetailPage({
              label: HasFeatureAccess({ featureName: "bills", bodyshop })
                ? t("menus.jobsdetail.partssublet")
                : t("menus.jobsdetail.parts"),
-              children: <JobsDetailPliContainer job={job} />
+              children: (
+                <JobsDetailPliContainer
+                  job={job}
+                  billsQuery={billsQuery}
+                  handleBillOnRowClick={handleBillOnRowClick}
+                  handlePartsOrderOnRowClick={handlePartsOrderOnRowClick}
+                  handlePartsDispatchOnRowClick={handlePartsDispatchOnRowClick}
+                />
+              )
            },
            ...(InstanceRenderManager({
              imex: true,
--- a/client/src/pages/production-list/production-list.component.jsx
+++ b/client/src/pages/production-list/production-list.component.jsx
@@ -1,6 +1,12 @@
 import React from "react";
+import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
 import ProductionListTable from "../../components/production-list-table/production-list-table.container";

 export default function ProductionListComponent() {
-  return <ProductionListTable />;
+  return (
+    <>
+      <NoteUpsertModal />
+      <ProductionListTable />
+    </>
+  );
 }
--- a/client/src/pages/tech/tech.page.component.jsx
+++ b/client/src/pages/tech/tech.page.component.jsx
@@ -33,6 +33,8 @@ const TimeTicketModalTask = lazy(
 const TechAssignedProdJobs = lazy(() => import("../tech-assigned-prod-jobs/tech-assigned-prod-jobs.component"));
 const TechDispatchedParts = lazy(() => import("../tech-dispatched-parts/tech-dispatched-parts.page"));

+const TaskUpsertModalContainer = lazy(() => import("../../components/task-upsert-modal/task-upsert-modal.container"));
+
 const { Content } = Layout;

 const mapStateToProps = createStructuredSelector({
@@ -67,6 +69,7 @@ export function TechPage({ technician }) {
        <UpdateAlert />
        <TechHeader />
        <TechLookupJobsDrawer />
+        <TaskUpsertModalContainer />
        <Content className="tech-content-container">
          <ErrorBoundary>
            <Suspense
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -1194,6 +1194,17 @@ export const TemplateList = (type, context) => {
            },
            group: "customers"
          },
+          payments_by_date_payment: {
+            title: i18n.t("reportcenter.templates.payments_by_date_payment"),
+            subject: i18n.t("reportcenter.templates.payments_by_date_payment"),
+            key: "payments_by_date_payment",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.payments"),
+              field: i18n.t("payments.fields.date")
+            },
+            group: "customers"
+          },
          schedule: {
            title: i18n.t("reportcenter.templates.schedule"),
            subject: i18n.t("reportcenter.templates.schedule"),
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,9 +9,9 @@
      "version": "0.2.0",
      "license": "UNLICENSED",
      "dependencies": {
-        "@aws-sdk/client-secrets-manager": "^3.614.0",
-        "@aws-sdk/client-ses": "^3.614.0",
-        "@aws-sdk/credential-provider-node": "^3.614.0",
+        "@aws-sdk/client-secrets-manager": "^3.616.0",
+        "@aws-sdk/client-ses": "^3.616.0",
+        "@aws-sdk/credential-provider-node": "^3.616.0",
        "@opensearch-project/opensearch": "^2.10.0",
        "aws4": "^1.13.0",
        "axios": "^1.7.2",
@@ -20,7 +20,7 @@
        "body-parser": "^1.20.2",
        "canvas": "^2.11.2",
        "chart.js": "^4.4.3",
-        "cloudinary": "^2.2.0",
+        "cloudinary": "^2.3.0",
        "compression": "^1.7.4",
        "cookie-parser": "^1.4.6",
        "cors": "2.8.5",
@@ -40,7 +40,7 @@
        "moment-timezone": "^0.5.45",
        "multer": "^1.4.5-lts.1",
        "node-mailjet": "^6.0.5",
-        "node-persist": "^4.0.1",
+        "node-persist": "^4.0.2",
        "nodemailer": "^6.9.14",
        "phone": "^3.1.49",
        "recursive-diff": "^1.0.9",
@@ -180,46 +180,46 @@
      }
    },
    "node_modules/@aws-sdk/client-secrets-manager": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.614.0.tgz",
-      "integrity": "sha512-gxCYaRYF78R5xBxXoKdF+xiWiElIJqOTSNxjt28ch+GEn9TNAYwpQcTxejBZ5VxeDwbmBjRaB9Vpx9FPeImTMw==",
+      "version": "3.616.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.616.0.tgz",
+      "integrity": "sha512-V8WRJ7eGBm01Y9nYg4KrQJ6fpXZkAfGTR9rtjMOdPSBcAD4hOJ6gisufxAKl9MSfTPLfzqSCb5/wWkIviobRZA==",
      "dependencies": {
        "@aws-crypto/sha256-browser": "5.2.0",
        "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/client-sso-oidc": "3.614.0",
-        "@aws-sdk/client-sts": "3.614.0",
-        "@aws-sdk/core": "3.614.0",
-        "@aws-sdk/credential-provider-node": "3.614.0",
-        "@aws-sdk/middleware-host-header": "3.609.0",
+        "@aws-sdk/client-sso-oidc": "3.616.0",
+        "@aws-sdk/client-sts": "3.616.0",
+        "@aws-sdk/core": "3.616.0",
+        "@aws-sdk/credential-provider-node": "3.616.0",
+        "@aws-sdk/middleware-host-header": "3.616.0",
        "@aws-sdk/middleware-logger": "3.609.0",
-        "@aws-sdk/middleware-recursion-detection": "3.609.0",
-        "@aws-sdk/middleware-user-agent": "3.614.0",
+        "@aws-sdk/middleware-recursion-detection": "3.616.0",
+        "@aws-sdk/middleware-user-agent": "3.616.0",
        "@aws-sdk/region-config-resolver": "3.614.0",
        "@aws-sdk/types": "3.609.0",
        "@aws-sdk/util-endpoints": "3.614.0",
        "@aws-sdk/util-user-agent-browser": "3.609.0",
        "@aws-sdk/util-user-agent-node": "3.614.0",
        "@smithy/config-resolver": "^3.0.5",
-        "@smithy/core": "^2.2.6",
-        "@smithy/fetch-http-handler": "^3.2.1",
+        "@smithy/core": "^2.2.7",
+        "@smithy/fetch-http-handler": "^3.2.2",
        "@smithy/hash-node": "^3.0.3",
        "@smithy/invalid-dependency": "^3.0.3",
-        "@smithy/middleware-content-length": "^3.0.3",
+        "@smithy/middleware-content-length": "^3.0.4",
        "@smithy/middleware-endpoint": "^3.0.5",
-        "@smithy/middleware-retry": "^3.0.9",
+        "@smithy/middleware-retry": "^3.0.10",
        "@smithy/middleware-serde": "^3.0.3",
        "@smithy/middleware-stack": "^3.0.3",
        "@smithy/node-config-provider": "^3.1.4",
-        "@smithy/node-http-handler": "^3.1.2",
-        "@smithy/protocol-http": "^4.0.3",
-        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/node-http-handler": "^3.1.3",
+        "@smithy/protocol-http": "^4.0.4",
+        "@smithy/smithy-client": "^3.1.8",
        "@smithy/types": "^3.3.0",
        "@smithy/url-parser": "^3.0.3",
        "@smithy/util-base64": "^3.0.0",
        "@smithy/util-body-length-browser": "^3.0.0",
        "@smithy/util-body-length-node": "^3.0.0",
-        "@smithy/util-defaults-mode-browser": "^3.0.9",
-        "@smithy/util-defaults-mode-node": "^3.0.9",
+        "@smithy/util-defaults-mode-browser": "^3.0.10",
+        "@smithy/util-defaults-mode-node": "^3.0.10",
        "@smithy/util-endpoints": "^2.0.5",
        "@smithy/util-middleware": "^3.0.3",
        "@smithy/util-retry": "^3.0.3",
@@ -244,46 +244,46 @@
      }
    },
    "node_modules/@aws-sdk/client-ses": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-ses/-/client-ses-3.614.0.tgz",
-      "integrity": "sha512-PbnnfIq2oNy+Um++rzqAk+7+OXtRzv6EymiIhvRYCq/T5rRVPjuIgV3mjrxl8hrF4SIAq40YVojzT1DITERFiw==",
+      "version": "3.616.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-ses/-/client-ses-3.616.0.tgz",
+      "integrity": "sha512-GrN5zWLE3gBb9UqSlOkRO/a2NOKODqM8MblGBIRiuLm/thdvzvlUuZOXGzEydhOHq0CqgCiFudYc37ahIKrDWQ==",
      "dependencies": {
        "@aws-crypto/sha256-browser": "5.2.0",
        "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/client-sso-oidc": "3.614.0",
-        "@aws-sdk/client-sts": "3.614.0",
-        "@aws-sdk/core": "3.614.0",
-        "@aws-sdk/credential-provider-node": "3.614.0",
-        "@aws-sdk/middleware-host-header": "3.609.0",
+        "@aws-sdk/client-sso-oidc": "3.616.0",
+        "@aws-sdk/client-sts": "3.616.0",
+        "@aws-sdk/core": "3.616.0",
+        "@aws-sdk/credential-provider-node": "3.616.0",
+        "@aws-sdk/middleware-host-header": "3.616.0",
        "@aws-sdk/middleware-logger": "3.609.0",
-        "@aws-sdk/middleware-recursion-detection": "3.609.0",
-        "@aws-sdk/middleware-user-agent": "3.614.0",
+        "@aws-sdk/middleware-recursion-detection": "3.616.0",
+        "@aws-sdk/middleware-user-agent": "3.616.0",
        "@aws-sdk/region-config-resolver": "3.614.0",
        "@aws-sdk/types": "3.609.0",
        "@aws-sdk/util-endpoints": "3.614.0",
        "@aws-sdk/util-user-agent-browser": "3.609.0",
        "@aws-sdk/util-user-agent-node": "3.614.0",
        "@smithy/config-resolver": "^3.0.5",
-        "@smithy/core": "^2.2.6",
-        "@smithy/fetch-http-handler": "^3.2.1",
+        "@smithy/core": "^2.2.7",
+        "@smithy/fetch-http-handler": "^3.2.2",
        "@smithy/hash-node": "^3.0.3",
        "@smithy/invalid-dependency": "^3.0.3",
-        "@smithy/middleware-content-length": "^3.0.3",
+        "@smithy/middleware-content-length": "^3.0.4",
        "@smithy/middleware-endpoint": "^3.0.5",
-        "@smithy/middleware-retry": "^3.0.9",
+        "@smithy/middleware-retry": "^3.0.10",
        "@smithy/middleware-serde": "^3.0.3",
        "@smithy/middleware-stack": "^3.0.3",
        "@smithy/node-config-provider": "^3.1.4",
-        "@smithy/node-http-handler": "^3.1.2",
-        "@smithy/protocol-http": "^4.0.3",
-        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/node-http-handler": "^3.1.3",
+        "@smithy/protocol-http": "^4.0.4",
+        "@smithy/smithy-client": "^3.1.8",
        "@smithy/types": "^3.3.0",
        "@smithy/url-parser": "^3.0.3",
        "@smithy/util-base64": "^3.0.0",
        "@smithy/util-body-length-browser": "^3.0.0",
        "@smithy/util-body-length-node": "^3.0.0",
-        "@smithy/util-defaults-mode-browser": "^3.0.9",
-        "@smithy/util-defaults-mode-node": "^3.0.9",
+        "@smithy/util-defaults-mode-browser": "^3.0.10",
+        "@smithy/util-defaults-mode-node": "^3.0.10",
        "@smithy/util-endpoints": "^2.0.5",
        "@smithy/util-middleware": "^3.0.3",
        "@smithy/util-retry": "^3.0.3",
@@ -296,43 +296,43 @@
      }
    },
    "node_modules/@aws-sdk/client-sso": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.614.0.tgz",
-      "integrity": "sha512-p5pyYaxRzBttjBkqfc8i3K7DzBdTg3ECdVgBo6INIUxfvDy0J8QUE8vNtCgvFIkq+uPw/8M+Eo4zzln7anuO0Q==",
+      "version": "3.616.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.616.0.tgz",
+      "integrity": "sha512-hwW0u1f8U4dSloAe61/eupUiGd5Q13B72BuzGxvRk0cIpYX/2m0KBG8DDl7jW1b2QQ+CflTLpG2XUf2+vRJxGA==",
      "dependencies": {
        "@aws-crypto/sha256-browser": "5.2.0",
        "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "3.614.0",
-        "@aws-sdk/middleware-host-header": "3.609.0",
+        "@aws-sdk/core": "3.616.0",
+        "@aws-sdk/middleware-host-header": "3.616.0",
        "@aws-sdk/middleware-logger": "3.609.0",
-        "@aws-sdk/middleware-recursion-detection": "3.609.0",
-        "@aws-sdk/middleware-user-agent": "3.614.0",
+        "@aws-sdk/middleware-recursion-detection": "3.616.0",
+        "@aws-sdk/middleware-user-agent": "3.616.0",
        "@aws-sdk/region-config-resolver": "3.614.0",
        "@aws-sdk/types": "3.609.0",
        "@aws-sdk/util-endpoints": "3.614.0",
        "@aws-sdk/util-user-agent-browser": "3.609.0",
        "@aws-sdk/util-user-agent-node": "3.614.0",
        "@smithy/config-resolver": "^3.0.5",
-        "@smithy/core": "^2.2.6",
-        "@smithy/fetch-http-handler": "^3.2.1",
+        "@smithy/core": "^2.2.7",
+        "@smithy/fetch-http-handler": "^3.2.2",
        "@smithy/hash-node": "^3.0.3",
        "@smithy/invalid-dependency": "^3.0.3",
-        "@smithy/middleware-content-length": "^3.0.3",
+        "@smithy/middleware-content-length": "^3.0.4",
        "@smithy/middleware-endpoint": "^3.0.5",
-        "@smithy/middleware-retry": "^3.0.9",
+        "@smithy/middleware-retry": "^3.0.10",
        "@smithy/middleware-serde": "^3.0.3",
        "@smithy/middleware-stack": "^3.0.3",
        "@smithy/node-config-provider": "^3.1.4",
-        "@smithy/node-http-handler": "^3.1.2",
-        "@smithy/protocol-http": "^4.0.3",
-        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/node-http-handler": "^3.1.3",
+        "@smithy/protocol-http": "^4.0.4",
+        "@smithy/smithy-client": "^3.1.8",
        "@smithy/types": "^3.3.0",
        "@smithy/url-parser": "^3.0.3",
        "@smithy/util-base64": "^3.0.0",
        "@smithy/util-body-length-browser": "^3.0.0",
        "@smithy/util-body-length-node": "^3.0.0",
-        "@smithy/util-defaults-mode-browser": "^3.0.9",
-        "@smithy/util-defaults-mode-node": "^3.0.9",
+        "@smithy/util-defaults-mode-browser": "^3.0.10",
+        "@smithy/util-defaults-mode-node": "^3.0.10",
        "@smithy/util-endpoints": "^2.0.5",
        "@smithy/util-middleware": "^3.0.3",
        "@smithy/util-retry": "^3.0.3",
@@ -344,44 +344,44 @@
      }
    },
    "node_modules/@aws-sdk/client-sso-oidc": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.614.0.tgz",
-      "integrity": "sha512-BI1NWcpppbHg/28zbUg54dZeckork8BItZIcjls12vxasy+p3iEzrJVG60jcbUTTsk3Qc1tyxNfrdcVqx0y7Ww==",
+      "version": "3.616.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.616.0.tgz",
+      "integrity": "sha512-YY1hpYS/G1uRGjQf88dL8VLHkP/IjGxKeXdhy+JnzMdCkAWl3V9j0fEALw40NZe0x79gr6R2KUOUH/IKYQfUmg==",
      "dependencies": {
        "@aws-crypto/sha256-browser": "5.2.0",
        "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "3.614.0",
-        "@aws-sdk/credential-provider-node": "3.614.0",
-        "@aws-sdk/middleware-host-header": "3.609.0",
+        "@aws-sdk/core": "3.616.0",
+        "@aws-sdk/credential-provider-node": "3.616.0",
+        "@aws-sdk/middleware-host-header": "3.616.0",
        "@aws-sdk/middleware-logger": "3.609.0",
-        "@aws-sdk/middleware-recursion-detection": "3.609.0",
-        "@aws-sdk/middleware-user-agent": "3.614.0",
+        "@aws-sdk/middleware-recursion-detection": "3.616.0",
+        "@aws-sdk/middleware-user-agent": "3.616.0",
        "@aws-sdk/region-config-resolver": "3.614.0",
        "@aws-sdk/types": "3.609.0",
        "@aws-sdk/util-endpoints": "3.614.0",
        "@aws-sdk/util-user-agent-browser": "3.609.0",
        "@aws-sdk/util-user-agent-node": "3.614.0",
        "@smithy/config-resolver": "^3.0.5",
-        "@smithy/core": "^2.2.6",
-        "@smithy/fetch-http-handler": "^3.2.1",
+        "@smithy/core": "^2.2.7",
+        "@smithy/fetch-http-handler": "^3.2.2",
        "@smithy/hash-node": "^3.0.3",
        "@smithy/invalid-dependency": "^3.0.3",
-        "@smithy/middleware-content-length": "^3.0.3",
+        "@smithy/middleware-content-length": "^3.0.4",
        "@smithy/middleware-endpoint": "^3.0.5",
-        "@smithy/middleware-retry": "^3.0.9",
+        "@smithy/middleware-retry": "^3.0.10",
        "@smithy/middleware-serde": "^3.0.3",
        "@smithy/middleware-stack": "^3.0.3",
        "@smithy/node-config-provider": "^3.1.4",
-        "@smithy/node-http-handler": "^3.1.2",
-        "@smithy/protocol-http": "^4.0.3",
-        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/node-http-handler": "^3.1.3",
+        "@smithy/protocol-http": "^4.0.4",
+        "@smithy/smithy-client": "^3.1.8",
        "@smithy/types": "^3.3.0",
        "@smithy/url-parser": "^3.0.3",
        "@smithy/util-base64": "^3.0.0",
        "@smithy/util-body-length-browser": "^3.0.0",
        "@smithy/util-body-length-node": "^3.0.0",
-        "@smithy/util-defaults-mode-browser": "^3.0.9",
-        "@smithy/util-defaults-mode-node": "^3.0.9",
+        "@smithy/util-defaults-mode-browser": "^3.0.10",
+        "@smithy/util-defaults-mode-node": "^3.0.10",
        "@smithy/util-endpoints": "^2.0.5",
        "@smithy/util-middleware": "^3.0.3",
        "@smithy/util-retry": "^3.0.3",
@@ -392,49 +392,49 @@
        "node": ">=16.0.0"
      },
      "peerDependencies": {
-        "@aws-sdk/client-sts": "^3.614.0"
+        "@aws-sdk/client-sts": "^3.616.0"
      }
    },
    "node_modules/@aws-sdk/client-sts": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.614.0.tgz",
-      "integrity": "sha512-i6QmaVA1KHHYNnI2VYQy/sc31rLm4+jSp8b/YbQpFnD0w3aXsrEEHHlxek45uSkHb4Nrj1omFBVy/xp1WVYx2Q==",
+      "version": "3.616.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.616.0.tgz",
+      "integrity": "sha512-FP7i7hS5FpReqnysQP1ukQF1OUWy8lkomaOnbu15H415YUrfCp947SIx6+BItjmx+esKxPkEjh/fbCVzw2D6hQ==",
      "dependencies": {
        "@aws-crypto/sha256-browser": "5.2.0",
        "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/client-sso-oidc": "3.614.0",
-        "@aws-sdk/core": "3.614.0",
-        "@aws-sdk/credential-provider-node": "3.614.0",
-        "@aws-sdk/middleware-host-header": "3.609.0",
+        "@aws-sdk/client-sso-oidc": "3.616.0",
+        "@aws-sdk/core": "3.616.0",
+        "@aws-sdk/credential-provider-node": "3.616.0",
+        "@aws-sdk/middleware-host-header": "3.616.0",
        "@aws-sdk/middleware-logger": "3.609.0",
-        "@aws-sdk/middleware-recursion-detection": "3.609.0",
-        "@aws-sdk/middleware-user-agent": "3.614.0",
+        "@aws-sdk/middleware-recursion-detection": "3.616.0",
+        "@aws-sdk/middleware-user-agent": "3.616.0",
        "@aws-sdk/region-config-resolver": "3.614.0",
        "@aws-sdk/types": "3.609.0",
        "@aws-sdk/util-endpoints": "3.614.0",
        "@aws-sdk/util-user-agent-browser": "3.609.0",
        "@aws-sdk/util-user-agent-node": "3.614.0",
        "@smithy/config-resolver": "^3.0.5",
-        "@smithy/core": "^2.2.6",
-        "@smithy/fetch-http-handler": "^3.2.1",
+        "@smithy/core": "^2.2.7",
+        "@smithy/fetch-http-handler": "^3.2.2",
        "@smithy/hash-node": "^3.0.3",
        "@smithy/invalid-dependency": "^3.0.3",
-        "@smithy/middleware-content-length": "^3.0.3",
+        "@smithy/middleware-content-length": "^3.0.4",
        "@smithy/middleware-endpoint": "^3.0.5",
-        "@smithy/middleware-retry": "^3.0.9",
+        "@smithy/middleware-retry": "^3.0.10",
        "@smithy/middleware-serde": "^3.0.3",
        "@smithy/middleware-stack": "^3.0.3",
        "@smithy/node-config-provider": "^3.1.4",
-        "@smithy/node-http-handler": "^3.1.2",
-        "@smithy/protocol-http": "^4.0.3",
-        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/node-http-handler": "^3.1.3",
+        "@smithy/protocol-http": "^4.0.4",
+        "@smithy/smithy-client": "^3.1.8",
        "@smithy/types": "^3.3.0",
        "@smithy/url-parser": "^3.0.3",
        "@smithy/util-base64": "^3.0.0",
        "@smithy/util-body-length-browser": "^3.0.0",
        "@smithy/util-body-length-node": "^3.0.0",
-        "@smithy/util-defaults-mode-browser": "^3.0.9",
-        "@smithy/util-defaults-mode-node": "^3.0.9",
+        "@smithy/util-defaults-mode-browser": "^3.0.10",
+        "@smithy/util-defaults-mode-node": "^3.0.10",
        "@smithy/util-endpoints": "^2.0.5",
        "@smithy/util-middleware": "^3.0.3",
        "@smithy/util-retry": "^3.0.3",
@@ -446,14 +446,14 @@
      }
    },
    "node_modules/@aws-sdk/core": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.614.0.tgz",
-      "integrity": "sha512-BUuS5/1YkgmKc4J0bg83XEtMyDHVyqG2QDzfmhYe8gbOIZabUl1FlrFVwhCAthtrrI6MPGTQcERB4BtJKUSplw==",
+      "version": "3.616.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.616.0.tgz",
+      "integrity": "sha512-O/urkh2kECs/IqZIVZxyeyHZ7OR2ZWhLNK7btsVQBQvJKrEspLrk/Fp20Qfg5JDerQfBN83ZbyRXLJOOucdZpw==",
      "dependencies": {
-        "@smithy/core": "^2.2.6",
-        "@smithy/protocol-http": "^4.0.3",
-        "@smithy/signature-v4": "^3.1.2",
-        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/core": "^2.2.7",
+        "@smithy/protocol-http": "^4.0.4",
+        "@smithy/signature-v4": "^4.0.0",
+        "@smithy/smithy-client": "^3.1.8",
        "@smithy/types": "^3.3.0",
        "fast-xml-parser": "4.2.5",
        "tslib": "^2.6.2"
@@ -477,18 +477,18 @@
      }
    },
    "node_modules/@aws-sdk/credential-provider-http": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.614.0.tgz",
-      "integrity": "sha512-YIEjlNUKb3Vo/iTnGAPdsiDC3FUUnNoex2OwU8LmR7AkYZiWdB8nx99DfgkkY+OFMUpw7nKD2PCOtuFONelfGA==",
+      "version": "3.616.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.616.0.tgz",
+      "integrity": "sha512-1rgCkr7XvEMBl7qWCo5BKu3yAxJs71dRaZ55Xnjte/0ZHH6Oc93ZrHzyYy6UH6t0nZrH+FAuw7Yko2YtDDwDeg==",
      "dependencies": {
        "@aws-sdk/types": "3.609.0",
-        "@smithy/fetch-http-handler": "^3.2.1",
-        "@smithy/node-http-handler": "^3.1.2",
+        "@smithy/fetch-http-handler": "^3.2.2",
+        "@smithy/node-http-handler": "^3.1.3",
        "@smithy/property-provider": "^3.1.3",
-        "@smithy/protocol-http": "^4.0.3",
-        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/protocol-http": "^4.0.4",
+        "@smithy/smithy-client": "^3.1.8",
        "@smithy/types": "^3.3.0",
-        "@smithy/util-stream": "^3.0.6",
+        "@smithy/util-stream": "^3.1.0",
        "tslib": "^2.6.2"
      },
      "engines": {
@@ -496,14 +496,14 @@
      }
    },
    "node_modules/@aws-sdk/credential-provider-ini": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.614.0.tgz",
-      "integrity": "sha512-KfLuLFGwlvFSZ2MuzYwWGPb1y5TeiwX5okIDe0aQ1h10oD3924FXbN+mabOnUHQ8EFcGAtCaWbrC86mI7ktC6A==",
+      "version": "3.616.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.616.0.tgz",
+      "integrity": "sha512-5gQdMr9cca3xV7FF2SxpxWGH2t6+t4o+XBGiwsHm8muEjf4nUmw7Ij863x25Tjt2viPYV0UStczSb5Sihp7bkA==",
      "dependencies": {
        "@aws-sdk/credential-provider-env": "3.609.0",
-        "@aws-sdk/credential-provider-http": "3.614.0",
+        "@aws-sdk/credential-provider-http": "3.616.0",
        "@aws-sdk/credential-provider-process": "3.614.0",
-        "@aws-sdk/credential-provider-sso": "3.614.0",
+        "@aws-sdk/credential-provider-sso": "3.616.0",
        "@aws-sdk/credential-provider-web-identity": "3.609.0",
        "@aws-sdk/types": "3.609.0",
        "@smithy/credential-provider-imds": "^3.1.4",
@@ -516,19 +516,19 @@
        "node": ">=16.0.0"
      },
      "peerDependencies": {
-        "@aws-sdk/client-sts": "^3.614.0"
+        "@aws-sdk/client-sts": "^3.616.0"
      }
    },
    "node_modules/@aws-sdk/credential-provider-node": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.614.0.tgz",
-      "integrity": "sha512-4J6gPEuFZP0mkWq5E//oMS1vrmMM88iNNcv7TEljYnsc6JTAlKejCyFwx6CN+nkIhmIZsl06SXIhBemzBdBPfg==",
+      "version": "3.616.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.616.0.tgz",
+      "integrity": "sha512-Se+u6DAxjDPjKE3vX1X2uxjkWgGq69BTo0uTB0vDUiWwBVgh16s9BsBhSAlKEH1CCbbJHvOg4YdTrzjwzqyClg==",
      "dependencies": {
        "@aws-sdk/credential-provider-env": "3.609.0",
-        "@aws-sdk/credential-provider-http": "3.614.0",
-        "@aws-sdk/credential-provider-ini": "3.614.0",
+        "@aws-sdk/credential-provider-http": "3.616.0",
+        "@aws-sdk/credential-provider-ini": "3.616.0",
        "@aws-sdk/credential-provider-process": "3.614.0",
-        "@aws-sdk/credential-provider-sso": "3.614.0",
+        "@aws-sdk/credential-provider-sso": "3.616.0",
        "@aws-sdk/credential-provider-web-identity": "3.609.0",
        "@aws-sdk/types": "3.609.0",
        "@smithy/credential-provider-imds": "^3.1.4",
@@ -557,11 +557,11 @@
      }
    },
    "node_modules/@aws-sdk/credential-provider-sso": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.614.0.tgz",
-      "integrity": "sha512-55+gp0JY4451cWI1qXmVMFM0GQaBKiQpXv2P0xmd9P3qLDyeFUSEW8XPh0d2lb1ICr6x4s47ynXVdGCIv2mXMg==",
+      "version": "3.616.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.616.0.tgz",
+      "integrity": "sha512-3rsWs9GBi8Z8Gps5ROwqguxtw+J6OIg1vawZMLRNMqqZoBvbOToe9wEnpid8ylU+27+oG8uibJNlNuRyXApUjw==",
      "dependencies": {
-        "@aws-sdk/client-sso": "3.614.0",
+        "@aws-sdk/client-sso": "3.616.0",
        "@aws-sdk/token-providers": "3.614.0",
        "@aws-sdk/types": "3.609.0",
        "@smithy/property-provider": "^3.1.3",
@@ -591,12 +591,12 @@
      }
    },
    "node_modules/@aws-sdk/middleware-host-header": {
-      "version": "3.609.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.609.0.tgz",
-      "integrity": "sha512-iTKfo158lc4jLDfYeZmYMIBHsn8m6zX+XB6birCSNZ/rrlzAkPbGE43CNdKfvjyWdqgLMRXF+B+OcZRvqhMXPQ==",
+      "version": "3.616.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.616.0.tgz",
+      "integrity": "sha512-mhNfHuGhCDZwYCABebaOvTgOM44UCZZRq2cBpgPZLVKP0ydAv5aFHXv01goexxXHqgHoEGx0uXWxlw0s2EpFDg==",
      "dependencies": {
        "@aws-sdk/types": "3.609.0",
-        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/protocol-http": "^4.0.4",
        "@smithy/types": "^3.3.0",
        "tslib": "^2.6.2"
      },
@@ -618,12 +618,12 @@
      }
    },
    "node_modules/@aws-sdk/middleware-recursion-detection": {
-      "version": "3.609.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.609.0.tgz",
-      "integrity": "sha512-6sewsYB7/o/nbUfA99Aa/LokM+a/u4Wpm/X2o0RxOsDtSB795ObebLJe2BxY5UssbGaWkn7LswyfvrdZNXNj1w==",
+      "version": "3.616.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.616.0.tgz",
+      "integrity": "sha512-LQKAcrZRrR9EGez4fdCIVjdn0Ot2HMN12ChnoMGEU6oIxnQ2aSC7iASFFCV39IYfeMh7iSCPj7Wopqw8rAouzg==",
      "dependencies": {
        "@aws-sdk/types": "3.609.0",
-        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/protocol-http": "^4.0.4",
        "@smithy/types": "^3.3.0",
        "tslib": "^2.6.2"
      },
@@ -632,13 +632,13 @@
      }
    },
    "node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.614.0.tgz",
-      "integrity": "sha512-xUxh0UPQiMTG6E31Yvu6zVYlikrIcFDKljM11CaatInzvZubGTGiX0DjpqRlfGzUNsuPc/zNrKwRP2+wypgqIw==",
+      "version": "3.616.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.616.0.tgz",
+      "integrity": "sha512-iMcAb4E+Z3vuEcrDsG6T2OBNiqWAquwahP9qepHqfmnmJqHr1mSHtXDYTGBNid31+621sUQmneUQ+fagpGAe4w==",
      "dependencies": {
        "@aws-sdk/types": "3.609.0",
        "@aws-sdk/util-endpoints": "3.614.0",
-        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/protocol-http": "^4.0.4",
        "@smithy/types": "^3.3.0",
        "tslib": "^2.6.2"
      },
@@ -1784,15 +1784,15 @@
      }
    },
    "node_modules/@smithy/core": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.2.6.tgz",
-      "integrity": "sha512-tBbVIv/ui7/lLTKayYJJvi8JLVL2SwOQTbNFEOrvzSE3ktByvsa1erwBOnAMo8N5Vu30g7lN4lLStrU75oDGuw==",
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.2.8.tgz",
+      "integrity": "sha512-1Y0XX0Ucyg0LWTfTVLWpmvSRtFRniykUl3dQ0os1sTd03mKDudR6mVyX+2ak1phwPXx2aEWMAAdW52JNi0mc3A==",
      "dependencies": {
        "@smithy/middleware-endpoint": "^3.0.5",
-        "@smithy/middleware-retry": "^3.0.9",
+        "@smithy/middleware-retry": "^3.0.11",
        "@smithy/middleware-serde": "^3.0.3",
-        "@smithy/protocol-http": "^4.0.3",
-        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/protocol-http": "^4.0.4",
+        "@smithy/smithy-client": "^3.1.9",
        "@smithy/types": "^3.3.0",
        "@smithy/util-middleware": "^3.0.3",
        "tslib": "^2.6.2"
@@ -1817,11 +1817,11 @@
      }
    },
    "node_modules/@smithy/fetch-http-handler": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.1.tgz",
-      "integrity": "sha512-0w0bgUvZmfa0vHN8a+moByhCJT07WN6AHKEhFSOLsDpnszm+5dLVv5utGaqbhOrZ/aF5x3xuPMs/oMCd+4O5xg==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.2.tgz",
+      "integrity": "sha512-3LaWlBZObyGrOOd7e5MlacnAKEwFBmAeiW/TOj2eR9475Vnq30uS2510+tnKbxrGjROfNdOhQqGo5j3sqLT6bA==",
      "dependencies": {
-        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/protocol-http": "^4.0.4",
        "@smithy/querystring-builder": "^3.0.3",
        "@smithy/types": "^3.3.0",
        "@smithy/util-base64": "^3.0.0",
@@ -1863,11 +1863,11 @@
      }
    },
    "node_modules/@smithy/middleware-content-length": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.3.tgz",
-      "integrity": "sha512-Dbz2bzexReYIQDWMr+gZhpwBetNXzbhnEMhYKA6urqmojO14CsXjnsoPYO8UL/xxcawn8ZsuVU61ElkLSltIUQ==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.4.tgz",
+      "integrity": "sha512-wySGje/KfhsnF8YSh9hP16pZcl3C+X6zRsvSfItQGvCyte92LliilU3SD0nR7kTlxnAJwxY8vE/k4Eoezj847Q==",
      "dependencies": {
-        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/protocol-http": "^4.0.4",
        "@smithy/types": "^3.3.0",
        "tslib": "^2.6.2"
      },
@@ -1893,14 +1893,14 @@
      }
    },
    "node_modules/@smithy/middleware-retry": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.9.tgz",
-      "integrity": "sha512-Mrv9omExU1gA7Y0VEJG2LieGfPYtwwcEiOnVGZ54a37NEMr66TJ0glFslOJFuKWG6izg5DpKIUmDV9rRxjm47Q==",
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.11.tgz",
+      "integrity": "sha512-/TIRWmhwMpv99JCGuMhJPnH7ggk/Lah7s/uNDyr7faF02BxNsyD/fz9Tw7pgCf9tYOKgjimm2Qml1Aq1pbkt6g==",
      "dependencies": {
        "@smithy/node-config-provider": "^3.1.4",
-        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/protocol-http": "^4.0.4",
        "@smithy/service-error-classification": "^3.0.3",
-        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/smithy-client": "^3.1.9",
        "@smithy/types": "^3.3.0",
        "@smithy/util-middleware": "^3.0.3",
        "@smithy/util-retry": "^3.0.3",
@@ -1962,12 +1962,12 @@
      }
    },
    "node_modules/@smithy/node-http-handler": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.1.2.tgz",
-      "integrity": "sha512-Td3rUNI7qqtoSLTsJBtsyfoG4cF/XMFmJr6Z2dX8QNzIi6tIW6YmuyFml8mJ2cNpyWNqITKbROMOFrvQjmsOvw==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.1.3.tgz",
+      "integrity": "sha512-UiKZm8KHb/JeOPzHZtRUfyaRDO1KPKPpsd7iplhiwVGOeVdkiVJ5bVe7+NhWREMOKomrDIDdSZyglvMothLg0Q==",
      "dependencies": {
        "@smithy/abort-controller": "^3.1.1",
-        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/protocol-http": "^4.0.4",
        "@smithy/querystring-builder": "^3.0.3",
        "@smithy/types": "^3.3.0",
        "tslib": "^2.6.2"
@@ -1989,9 +1989,9 @@
      }
    },
    "node_modules/@smithy/protocol-http": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.0.3.tgz",
-      "integrity": "sha512-x5jmrCWwQlx+Zv4jAtc33ijJ+vqqYN+c/ZkrnpvEe/uDas7AT7A/4Rc2CdfxgWv4WFGmEqODIrrUToPN6DDkGw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.0.4.tgz",
+      "integrity": "sha512-fAA2O4EFyNRyYdFLVIv5xMMeRb+3fRKc/Rt2flh5k831vLvUmNFXcydeg7V3UeEhGURJI4c1asmGJBjvmF6j8Q==",
      "dependencies": {
        "@smithy/types": "^3.3.0",
        "tslib": "^2.6.2"
@@ -2049,9 +2049,9 @@
      }
    },
    "node_modules/@smithy/signature-v4": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-3.1.2.tgz",
-      "integrity": "sha512-3BcPylEsYtD0esM4Hoyml/+s7WP2LFhcM3J2AGdcL2vx9O60TtfpDOL72gjb4lU8NeRPeKAwR77YNyyGvMbuEA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.0.0.tgz",
+      "integrity": "sha512-ervYjQ+ZvmNG51Ui77IOTPri7nOyo8Kembzt9uwwlmtXJPmFXvslOahbA1blvAVs7G0KlYMiOBog1rAt7RVXxg==",
      "dependencies": {
        "@smithy/is-array-buffer": "^3.0.0",
        "@smithy/types": "^3.3.0",
@@ -2066,15 +2066,15 @@
      }
    },
    "node_modules/@smithy/smithy-client": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.1.7.tgz",
-      "integrity": "sha512-nZbJZB0XI3YnaFBWGDBr7kjaew6O0oNYNmopyIz6gKZEbxzrtH7rwvU1GcVxcSFoOwWecLJEe79fxEMljHopFQ==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.1.9.tgz",
+      "integrity": "sha512-My2RaInZ4gSwJUPMaiLR/Nk82+c4LlvqpXA+n7lonGYgCZq23Tg+/xFhgmiejJ6XPElYJysTPyV90vKyp17+1g==",
      "dependencies": {
        "@smithy/middleware-endpoint": "^3.0.5",
        "@smithy/middleware-stack": "^3.0.3",
-        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/protocol-http": "^4.0.4",
        "@smithy/types": "^3.3.0",
-        "@smithy/util-stream": "^3.0.6",
+        "@smithy/util-stream": "^3.1.1",
        "tslib": "^2.6.2"
      },
      "engines": {
@@ -2158,12 +2158,12 @@
      }
    },
    "node_modules/@smithy/util-defaults-mode-browser": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.9.tgz",
-      "integrity": "sha512-WKPcElz92MAQG09miBdb0GxEH/MwD5GfE8g07WokITq5g6J1ROQfYCKC1wNnkqAGfrSywT7L0rdvvqlBplqiyA==",
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.11.tgz",
+      "integrity": "sha512-O3s9DGb3bmRvEKmT8RwvSWK4A9r6svfd+MnJB+UMi9ZcCkAnoRtliulOnGF0qCMkKF9mwk2tkopBBstalPY/vg==",
      "dependencies": {
        "@smithy/property-provider": "^3.1.3",
-        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/smithy-client": "^3.1.9",
        "@smithy/types": "^3.3.0",
        "bowser": "^2.11.0",
        "tslib": "^2.6.2"
@@ -2173,15 +2173,15 @@
      }
    },
    "node_modules/@smithy/util-defaults-mode-node": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.9.tgz",
-      "integrity": "sha512-dQLrUqFxqpf0GvEKEuFdgXcdZwz6oFm752h4d6C7lQz+RLddf761L2r7dSwGWzESMMB3wKj0jL+skRhEGlecjw==",
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.11.tgz",
+      "integrity": "sha512-qd4a9qtyOa/WY14aHHOkMafhh9z8D2QTwlcBoXMTPnEwtcY+xpe1JyFm9vya7VsB8hHsfn3XodEtwqREiu4ygQ==",
      "dependencies": {
        "@smithy/config-resolver": "^3.0.5",
        "@smithy/credential-provider-imds": "^3.1.4",
        "@smithy/node-config-provider": "^3.1.4",
        "@smithy/property-provider": "^3.1.3",
-        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/smithy-client": "^3.1.9",
        "@smithy/types": "^3.3.0",
        "tslib": "^2.6.2"
      },
@@ -2239,12 +2239,12 @@
      }
    },
    "node_modules/@smithy/util-stream": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.0.6.tgz",
-      "integrity": "sha512-w9i//7egejAIvplX821rPWWgaiY1dxsQUw0hXX7qwa/uZ9U3zplqTQ871jWadkcVB9gFDhkPWYVZf4yfFbZ0xA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.1.tgz",
+      "integrity": "sha512-EhRnVvl3AhoHAT2rGQ5o+oSDRM/BUSMPLZZdRJZLcNVUsFAjOs4vHaPdNQivTSzRcFxf5DA4gtO46WWU2zimaw==",
      "dependencies": {
-        "@smithy/fetch-http-handler": "^3.2.1",
-        "@smithy/node-http-handler": "^3.1.2",
+        "@smithy/fetch-http-handler": "^3.2.2",
+        "@smithy/node-http-handler": "^3.1.3",
        "@smithy/types": "^3.3.0",
        "@smithy/util-base64": "^3.0.0",
        "@smithy/util-buffer-from": "^3.0.0",
@@ -3013,9 +3013,9 @@
      }
    },
    "node_modules/cloudinary": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cloudinary/-/cloudinary-2.2.0.tgz",
-      "integrity": "sha512-akbLTZcNegGSkl07Frnt9fyiK9KZ2zPS+a+j7uLrjNYxVhDpDdIBz9G6snPCYqgk+WLVMRPfXTObalLr5L6g0Q==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cloudinary/-/cloudinary-2.3.0.tgz",
+      "integrity": "sha512-QBa/ePVVfVcVOB1Vut236rjAbTZAArzOm0e2IWUkQJSZFS65Sjf+i3DyRGen4QX8GZzrcbzvKI9b8BTHAv1zqQ==",
      "dependencies": {
        "lodash": "^4.17.21",
        "q": "^1.5.1"
@@ -5502,9 +5502,9 @@
      }
    },
    "node_modules/node-persist": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-4.0.1.tgz",
-      "integrity": "sha512-QtRjwAlcOQChQpfG6odtEhxYmA3nS5XYr+bx9JRjwahl1TM3sm9J3CCn51/MI0eoHRb2DrkEsCOFo8sq8jG5sQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-4.0.2.tgz",
+      "integrity": "sha512-J/xDWS6Tn7kNn3ErAvz2kOVul94s7IKhIQLX24mw2eViLqTCfuIOywBT5kSrOy7vF2HfCWGJtSx7z6OiFXmnzQ==",
      "engines": {
        "node": ">=10.12.0"
      }
--- a/package.json
+++ b/package.json
@@ -19,9 +19,9 @@
    "makeitpretty": "prettier --write \"**/*.{css,js,json,jsx,scss}\""
  },
  "dependencies": {
-    "@aws-sdk/client-secrets-manager": "^3.614.0",
-    "@aws-sdk/client-ses": "^3.614.0",
-    "@aws-sdk/credential-provider-node": "^3.614.0",
+    "@aws-sdk/client-secrets-manager": "^3.616.0",
+    "@aws-sdk/client-ses": "^3.616.0",
+    "@aws-sdk/credential-provider-node": "^3.616.0",
    "@opensearch-project/opensearch": "^2.10.0",
    "aws4": "^1.13.0",
    "axios": "^1.7.2",
@@ -30,7 +30,7 @@
    "body-parser": "^1.20.2",
    "canvas": "^2.11.2",
    "chart.js": "^4.4.3",
-    "cloudinary": "^2.2.0",
+    "cloudinary": "^2.3.0",
    "compression": "^1.7.4",
    "cookie-parser": "^1.4.6",
    "cors": "2.8.5",
@@ -50,7 +50,7 @@
    "moment-timezone": "^0.5.45",
    "multer": "^1.4.5-lts.1",
    "node-mailjet": "^6.0.5",
-    "node-persist": "^4.0.1",
+    "node-persist": "^4.0.2",
    "nodemailer": "^6.9.14",
    "phone": "^3.1.49",
    "recursive-diff": "^1.0.9",
--- a/server/accounting/qb-receivables-lines.js
+++ b/server/accounting/qb-receivables-lines.js
@@ -632,7 +632,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
      }
    }

-    //QB USA with GST
+    //QB USA with GST and PST
    //This was required for the No. 1 Collision Group.
    if (
      bodyshop.accountingconfig &&
@@ -651,9 +651,20 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
          Qty: 1
        }
      });
+      InvoiceLineAdd.push({
+        DetailType: "SalesItemLineDetail",
+        Amount: Dinero(jobs_by_pk.job_totals.totals.state_tax).toFormat(DineroQbFormat),
+        SalesItemLineDetail: {
+          ...(jobs_by_pk.class ? { ClassRef: { value: classes[jobs_by_pk.class] } } : {}),
+          ItemRef: {
+            value: items[bodyshop.md_responsibility_centers.taxes.state.accountitem]
+          },
+          Qty: 1
+        }
+      });
    }
  } else {
-    //Handle insurance profile adjustments
+    //Handle insurance profile adjustments for Parts
    Object.keys(job_totals.parts.adjustments).forEach((key) => {
      if (qbo) {
        //Going to always assume that we need to apply GST and PST for labor.
@@ -707,6 +718,67 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
      }
    });

+    //Handle insurance profile adjustments for Labor and Materials
+    Object.keys(job_totals.rates).forEach((key) => {
+      if (
+        job_totals.rates[key] &&
+        job_totals.rates[key].adjustment &&
+        Dinero(job_totals.rates[key].adjustment).isZero() === false
+      ) {
+        if (qbo) {
+          //Going to always assume that we need to apply GST and PST for labor.
+          const taxAccountCode = findTaxCode(
+            {
+              local: false,
+              federal: process.env.COUNTRY === "USA" ? false : true,
+              state: jobs_by_pk.state_tax_rate === 0 ? false : true
+            },
+            bodyshop.md_responsibility_centers.sales_tax_codes
+          );
+          const account = responsibilityCenters.profits.find(
+            (c) => c.name === responsibilityCenters.defaults.profits[key.toUpperCase()]
+          );
+          const QboTaxId =
+            process.env.COUNTRY === "USA"
+              ? CheckQBOUSATaxID({
+                  //    jobline: jobline,
+                  job: jobs_by_pk,
+                  type: "storage"
+                })
+              : taxCodes[taxAccountCode];
+          InvoiceLineAdd.push({
+            DetailType: "SalesItemLineDetail",
+            Amount: Dinero(job_totals.rates[key].adjustment).toFormat(DineroQbFormat),
+            Description: `${account.accountdesc} - Adjustment`,
+            SalesItemLineDetail: {
+              ...(jobs_by_pk.class ? { ClassRef: { value: classes[jobs_by_pk.class] } } : {}),
+              ItemRef: {
+                value: items[account.accountitem]
+              },
+              TaxCodeRef: {
+                value: QboTaxId
+              },
+              Qty: 1
+            }
+          });
+        } else {
+          InvoiceLineAdd.push({
+            ItemRef: {
+              FullName: responsibilityCenters.profits.find(
+                (c) => c.name === responsibilityCenters.defaults.profits[key.toUpperCase()]
+              ).accountitem
+            },
+            Desc: "Storage",
+            Quantity: 1,
+            Amount: Dinero(job_totals.rates[key].adjustment).toFormat(DineroQbFormat),
+            SalesTaxCodeRef: {
+              FullName: bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON"
+            }
+          });
+        }
+      }
+    });
+
    const QboTaxId =
      process.env.COUNTRY === "USA"
        ? CheckQBOUSATaxID({
--- a/server/accounting/qbo/qbo-payables.js
+++ b/server/accounting/qbo/qbo-payables.js
@@ -273,7 +273,7 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
    return result && result.json && result.json.Bill;
  } catch (error) {
    logger.log("qbo-payables-error", "DEBUG", req.user.email, bill.id, {
-      error: (error && error.authResponse && error.authResponse.body) || (error && error.message),
+      error: error, //(error && error.authResponse && error.authResponse.body) || (error && error.message),
      method: "InsertBill"
    });
    throw error;
--- a/server/cdk/cdk-calculate-allocations.js
+++ b/server/cdk/cdk-calculate-allocations.js
@@ -360,12 +360,10 @@ function calculateAllocations(connectionData, job) {
    }
  }
  if (InstanceManager({ rome: true })) {
-    //profile level adjustments
+    //profile level adjustments for parts
    Object.keys(job.job_totals.parts.adjustments).forEach((key) => {
      const accountName = selectedDmsAllocationConfig.profits[key];
-
      const otherAccount = bodyshop.md_responsibility_centers.profits.find((c) => c.name === accountName);
-
      if (otherAccount) {
        if (!profitCenterHash[accountName]) profitCenterHash[accountName] = Dinero();

@@ -380,6 +378,24 @@ function calculateAllocations(connectionData, job) {
        );
      }
    });
+    //profile level adjustments for labor and materials
+    Object.keys(job.job_totals.rates).forEach((key) => {
+      if (job.job_totals.rates[key] && job.job_totals.rates[key].adjustment && Dinero(job.job_totals.rates[key].adjustment).isZero() === false) {
+        const accountName = selectedDmsAllocationConfig.profits[key.toUpperCase()];
+        const otherAccount = bodyshop.md_responsibility_centers.profits.find((c) => c.name === accountName);
+        if (otherAccount) {
+          if (!profitCenterHash[accountName]) profitCenterHash[accountName] = Dinero();
+
+          profitCenterHash[accountName] = profitCenterHash[accountName].add(Dinero(job.job_totals.rates[key].adjustments));
+        } else {
+          CdkBase.createLogEvent(
+            connectionData,
+            "ERROR",
+            `Error encountered in CdkCalculateAllocations. Unable to find adjustment account. ${error}`
+          );
+        }
+      }
+    });
  }

  const jobAllocations = _.union(Object.keys(profitCenterHash), Object.keys(costCenterHash)).map((key) => {
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -1527,6 +1527,8 @@ exports.QUERY_JOB_COSTING_DETAILS = ` query QUERY_JOB_COSTING_DETAILS($id: uuid!
      ca_bc_pvrt
      ca_customer_gst
      dms_allocation
+      cieca_pfl
+      materials
      joblines(where: { removed: { _eq: false } }) {
        id
        db_ref
@@ -1641,6 +1643,8 @@ exports.QUERY_JOB_COSTING_DETAILS_MULTI = ` query QUERY_JOB_COSTING_DETAILS_MULT
    ca_bc_pvrt
    ca_customer_gst
    dms_allocation
+    cieca_pfl
+    materials
    joblines(where: {removed: {_eq: false}}) {
      id
      db_ref
@@ -1866,6 +1870,8 @@ exports.GET_CDK_ALLOCATIONS = `query QUERY_JOB_CLOSE_DETAILS($id: uuid!) {
    scheduled_in
    actual_in
    ca_bc_pvrt
+    cieca_pfl
+    materials
    timetickets {
      id
      actualhrs
--- a/server/job/job-costing.js
+++ b/server/job/job-costing.js
@@ -286,9 +286,45 @@ function GenerateCostingData(job) {

          const rateName = `rate_${(val.mod_lbr_ty || "").toLowerCase()}`;

-          const laborAmount = Dinero({
+          let laborAmount = Dinero();
+          laborAmount = Dinero({
            amount: Math.round((job[rateName] || 0) * 100)
          }).multiply(val.mod_lb_hrs || 0);
+
+          if (
+            job.cieca_pfl &&
+            job.cieca_pfl[val.mod_lbr_ty.toUpperCase()] &&
+            job.cieca_pfl[val.mod_lbr_ty.toUpperCase()].lbr_adjp !== 0
+          ) {
+            let adjp = 0;
+            if (
+              val.mod_lbr_ty === "la1" ||
+              val.mod_lbr_ty === "la2" ||
+              val.mod_lbr_ty === "la3" ||
+              val.mod_lbr_ty === "la4"
+            ) {
+              adjp =
+                Math.abs(job.cieca_pfl["LAU"].lbr_adjp) > 1
+                  ? job.cieca_pfl["LAU"].lbr_adjp
+                  : job.cieca_pfl["LAU"].lbr_adjp * 100; //Adjust lbr_adjp to whole number
+            } else {
+              if (job.cieca_pfl[val.mod_lbr_ty.toUpperCase()]) {
+                adjp =
+                  Math.abs(job.cieca_pfl[val.mod_lbr_ty.toUpperCase()].lbr_adjp) > 1
+                    ? job.cieca_pfl[val.mod_lbr_ty.toUpperCase()].lbr_adjp
+                    : job.cieca_pfl[val.mod_lbr_ty.toUpperCase()].lbr_adjp * 100; //Adjust lbr_adjp to whole number
+              } else {
+                adjp =
+                  Math.abs(job.cieca_pfl["LAB"].lbr_adjp) > 1
+                    ? job.cieca_pfl["LAB"].lbr_adjp
+                    : job.cieca_pfl["LAB"].lbr_adjp * 100; //Adjust lbr_adjp to whole number
+              }
+            }
+            laborAmount = laborAmount.add(
+              laborAmount.percentage(adjp < 0 ? adjp * -1 : adjp).multiply(adjp < 0 ? -1 : 1)
+            );
+          }
+
          if (!acc.labor[laborProfitCenter]) acc.labor[laborProfitCenter] = Dinero();
          acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add(laborAmount);

@@ -317,7 +353,7 @@ function GenerateCostingData(job) {

          if (!partsProfitCenter)
            console.log("Unknown cost/profit center mapping for parts.", val.line_desc, val.part_type);
-          const partsAmount = Dinero({
+          let partsAmount = Dinero({
            amount: val.act_price_before_ppc
              ? Math.round(val.act_price_before_ppc * 100)
              : Math.round(val.act_price * 100)
@@ -338,6 +374,33 @@ function GenerateCostingData(job) {
                      .multiply(val.prt_dsmk_p > 0 ? 1 : -1)
                : Dinero()
            );
+
+          // Profile Discount for Parts
+          if (job.parts_tax_rates && job.parts_tax_rates[val.part_type.toUpperCase()]) {
+            if (
+              job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp !== undefined &&
+              job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp >= 0
+            ) {
+              const discountRate =
+                Math.abs(job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp) > 1
+                  ? parts_tajob.parts_tax_rates_rates[val.part_type.toUpperCase()].prt_discp
+                  : job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp * 100;
+              const disc = partsAmount.percentage(discountRate).multiply(-1);
+              partsAmount = partsAmount.add(disc);
+            }
+            if (
+              job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp !== undefined &&
+              job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp >= 0
+            ) {
+              const markupRate =
+                Math.abs(job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp) > 1
+                  ? job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp
+                  : job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp * 100;
+              const markup = partsAmount.percentage(markupRate);
+              partsAmount = partsAmount.add(markup);
+            }
+          }
+
          if (!acc.parts[partsProfitCenter]) acc.parts[partsProfitCenter] = Dinero();
          acc.parts[partsProfitCenter] = acc.parts[partsProfitCenter].add(partsAmount);
        }
@@ -413,6 +476,7 @@ function GenerateCostingData(job) {
  if (!hasMapaLine) {
    if (!jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]])
      jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]] = Dinero();
+    
    jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]] = jobLineTotalsByProfitCenter.additional[
      defaultProfits["MAPA"]
    ].add(
@@ -420,10 +484,26 @@ function GenerateCostingData(job) {
        amount: Math.round((job.rate_mapa || 0) * 100)
      }).multiply(materialsHours.mapaHrs || 0)
    );
+    let adjp = 0;
+    if (job.materials["MAPA"] && job.materials["MAPA"].mat_adjp) {
+      adjp =
+        Math.abs(job.materials["MAPA"].mat_adjp) > 1
+          ? job.materials["MAPA"].mat_adjp
+          : job.materials["MAPA"].mat_adjp * 100; //Adjust mat_adjp to whole number
+    }
+
+    jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]] = jobLineTotalsByProfitCenter.additional[
+      defaultProfits["MAPA"]
+    ].add(
+      jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]]
+        .percentage(adjp < 0 ? adjp * -1 : adjp)
+        .multiply(adjp < 0 ? -1 : 1)
+    );
  }
  if (!hasMashLine) {
    if (!jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]])
      jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]] = Dinero();
+
    jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]] = jobLineTotalsByProfitCenter.additional[
      defaultProfits["MASH"]
    ].add(
@@ -431,6 +511,21 @@ function GenerateCostingData(job) {
        amount: Math.round((job.rate_mash || 0) * 100)
      }).multiply(materialsHours.mashHrs || 0)
    );
+    let adjp = 0;
+    if (job.materials["MASH"] && job.materials["MASH"].mat_adjp) {
+      adjp =
+        Math.abs(job.materials["MASH"].mat_adjp) > 1
+          ? job.materials["MASH"].mat_adjp
+          : job.materials["MASH"].mat_adjp * 100; //Adjust mat_adjp to whole number
+    }
+
+    jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]] = jobLineTotalsByProfitCenter.additional[
+      defaultProfits["MASH"]
+    ].add(
+      jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]]
+        .percentage(adjp < 0 ? adjp * -1 : adjp)
+        .multiply(adjp < 0 ? -1 : 1)
+    );
  }

  //Is it a DMS Setup?
--- a/server/job/job-totals-USA.js
+++ b/server/job/job-totals-USA.js
@@ -331,6 +331,8 @@ async function CalculateRatesTotals({ job, client }) {
    //Skip calculating mapa and mash if we got the amounts.
    if (!((property === "mapa" && hasMapaLine) || (property === "mash" && hasMashLine))) {
      if (!ret[property].total) {
+        ret[property].base = Dinero();
+        ret[property].adjustment = Dinero();
        ret[property].total = Dinero();
      }
      let threshold;
@@ -349,13 +351,50 @@ async function CalculateRatesTotals({ job, client }) {
        }
      }

-      const total = Dinero({
+      const base = Dinero({
        amount: Math.round((ret[property].rate || 0) * 100)
      }).multiply(ret[property].hours);

+      let adjp = 0;
+      if (property === "mapa" || property === "mash") {
+        if (job.materials[property.toUpperCase()] && job.materials[property.toUpperCase()].mat_adjp) {
+          adjp =
+            Math.abs(job.materials[property.toUpperCase()].mat_adjp) > 1
+              ? job.materials[property.toUpperCase()].mat_adjp
+              : job.materials[property.toUpperCase()].mat_adjp * 100; //Adjust mat_adjp to whole number
+        }
+      } else {
+        if (property === "la1" || property === "la2" || property === "la3" || property === "la4") {
+          if (job.cieca_pfl["LAU"] && job.cieca_pfl["LAU"].lbr_adjp) {
+            adjp =
+              Math.abs(job.cieca_pfl["LAU"].lbr_adjp) > 1
+                ? job.cieca_pfl["LAU"].lbr_adjp
+                : job.cieca_pfl["LAU"].lbr_adjp * 100; //Adjust lbr_adjp to whole number
+          }
+        } else {
+          if (job.cieca_pfl[property.toUpperCase()] && job.cieca_pfl[property.toUpperCase()].lbr_adjp) {
+            adjp =
+              Math.abs(job.cieca_pfl[property.toUpperCase()].lbr_adjp) > 1
+                ? job.cieca_pfl[property.toUpperCase()].lbr_adjp
+                : job.cieca_pfl[property.toUpperCase()].lbr_adjp * 100; //Adjust lbr_adjp to whole number
+          } else {
+            if (job.cieca_pfl["LAB"].lbr_adjp) {
+              adjp =
+                Math.abs(job.cieca_pfl["LAB"].lbr_adjp) > 1
+                  ? job.cieca_pfl["LAB"].lbr_adjp
+                  : job.cieca_pfl["LAB"].lbr_adjp * 100; //Adjust lbr_adjp to whole number
+            }
+          }
+        }
+      }
+      const adjustment = base.percentage(adjp < 0 ? adjp * -1 : adjp).multiply(adjp < 0 ? -1 : 1);
+      const total = base.add(adjustment);
+
      if (threshold && total.greaterThanOrEqual(threshold)) {
        ret[property].total = ret[property].total.add(threshold);
      } else {
+        ret[property].base = ret[property].base.add(base);
+        ret[property].adjustment = ret[property].adjustment.add(adjustment);
        ret[property].total = ret[property].total.add(total);
      }
    }
@@ -703,18 +742,19 @@ function CalculateTaxesTotals(job, otherTotals) {
  //Potential issue here with Sublet Calculation. Sublets are calculated under labor in Mitchell, but it's done in IO
  //Under the parts rates.

-  let statePartsTax = Dinero();
-  let additionalItemsTax = Dinero();
+  let stateTax = Dinero();
+  // let additionalItemsTax = Dinero(); //This is not used.
  let us_sales_tax_breakdown;

+  // This is not referenced in the code base.
  //Audatex sends additional glass part types. IO-774
-  const BackupGlassTax =
-    job.parts_tax_rates &&
-    (job.parts_tax_rates.PAGD ||
-      job.parts_tax_rates.PAGF ||
-      job.parts_tax_rates.PAGP ||
-      job.parts_tax_rates.PAGQ ||
-      job.parts_tax_rates.PAGR);
+  // const BackupGlassTax =
+  //   job.parts_tax_rates &&
+  //   (job.parts_tax_rates.PAGD ||
+  //     job.parts_tax_rates.PAGF ||
+  //     job.parts_tax_rates.PAGP ||
+  //     job.parts_tax_rates.PAGQ ||
+  //     job.parts_tax_rates.PAGR);

  const taxableAmounts = {
    PAA: Dinero(),
@@ -878,11 +918,27 @@ function CalculateTaxesTotals(job, otherTotals) {
      } else if (key.startsWith("LA")) {
        //Labor.
        for (let tyCounter = 1; tyCounter <= 5; tyCounter++) {
-          if (IsTrueOrYes(pfl[key][`lbr_tx_in${tyCounter}`])) {
-            //This amount is taxable for this type.
-            taxableAmountsByTier[`ty${tyCounter}Tax`] = taxableAmountsByTier[`ty${tyCounter}Tax`].add(
-              taxableAmounts[key]
-            );
+          if (key === "LA1" || key === "LA2" || key === "LA3" || key === "LA4") {
+            if (IsTrueOrYes(pfl["LAU"][`lbr_tx_in${tyCounter}`])) {
+              //This amount is taxable for this type.
+              taxableAmountsByTier[`ty${tyCounter}Tax`] = taxableAmountsByTier[`ty${tyCounter}Tax`].add(
+                taxableAmounts[key]
+              );
+            }
+          } else if (key === "LAA" && !pfl[key]) {
+            if (IsTrueOrYes(pfl["LAB"][`lbr_tx_in${tyCounter}`])) {
+              //This amount is taxable for this type.
+              taxableAmountsByTier[`ty${tyCounter}Tax`] = taxableAmountsByTier[`ty${tyCounter}Tax`].add(
+                taxableAmounts[key]
+              );
+            }
+          } else {
+            if (IsTrueOrYes(pfl[key][`lbr_tx_in${tyCounter}`])) {
+              //This amount is taxable for this type.
+              taxableAmountsByTier[`ty${tyCounter}Tax`] = taxableAmountsByTier[`ty${tyCounter}Tax`].add(
+                taxableAmounts[key]
+              );
+            }
          }
        }
      } else if (key === "TOW") {
@@ -919,7 +975,6 @@ function CalculateTaxesTotals(job, otherTotals) {

    Object.keys(taxableAmountsByTier).forEach((taxTierKey) => {
      taxable_adjustment = taxableAmountsByTier[taxTierKey].multiply(percent_of_adjustment);
-      console.log("🚀 ~ taxableAmountsByTier ~ taxable_adjustment:", taxable_adjustment);
      if (job.adjustment_bottom_line > 0) {
        taxableAmountsByTier[taxTierKey] = taxableAmountsByTier[taxTierKey].add(taxable_adjustment);
      } else {
@@ -937,8 +992,8 @@ function CalculateTaxesTotals(job, otherTotals) {
      let tyCounter = taxTierKey[2]; //Get the number from the key.
      //i represents the tax number. If we got here, this type of tax is applicable. Now we need to add based on the thresholds.
      for (let threshCounter = 1; threshCounter <= 5; threshCounter++) {
-        const thresholdAmount = parseFloat(job.cieca_pft[`ty${tyCounter}_thres${threshCounter}`]);
-        const thresholdTaxRate = parseFloat(job.cieca_pft[`ty${tyCounter}_rate${threshCounter}`]);
+        const thresholdAmount = parseFloat(job.cieca_pft[`ty${tyCounter}_thres${threshCounter}`]) || 0;
+        const thresholdTaxRate = parseFloat(job.cieca_pft[`ty${tyCounter}_rate${threshCounter}`]) || 0;

        let taxableAmountInThisThreshold;
        if (
@@ -946,7 +1001,7 @@ function CalculateTaxesTotals(job, otherTotals) {
          InstanceMgr({
            imex: false,
            rome: thresholdAmount === 0 && parseInt(tyCounter) === 1,
-            promanager: thresholdAmount === 0 && parseInt(tyCounter) === 1
+            promanager: "USE_ROME"
          })
        ) {
          //
@@ -980,10 +1035,10 @@ function CalculateTaxesTotals(job, otherTotals) {
    }
  });

-  // console.log("*** Total Tax by Tier Amounts***");
-  // console.table(JSON.parse(JSON.stringify(totalTaxByTier)));
+  console.log("*** Total Tax by Tier Amounts***");
+  console.table(JSON.parse(JSON.stringify(totalTaxByTier)));

-  statePartsTax = statePartsTax
+  stateTax = stateTax
    .add(totalTaxByTier.ty1Tax)
    .add(totalTaxByTier.ty2Tax)
    .add(totalTaxByTier.ty3Tax)
@@ -991,17 +1046,18 @@ function CalculateTaxesTotals(job, otherTotals) {
    .add(totalTaxByTier.ty5Tax)
    .add(totalTaxByTier.ty6Tax);
  us_sales_tax_breakdown = totalTaxByTier;
-  //console.log("Tiered Taxes Total for Parts/Labor", statePartsTax.toFormat());
+  //console.log("Tiered Taxes Total for Parts/Labor", stateTax.toFormat());

-  let laborTaxTotal = Dinero();
+  // This is not in use as such commented out.
+  // let laborTaxTotal = Dinero();

-  if (Object.keys(job.cieca_pfl).length > 0) {
-    //Ignore it now, we have calculated it above.
-    //This was previously used for JCS before parts were also calculated at a different rate.
-  } else {
-    //We don't have it, just add in how it was before.
-    laborTaxTotal = otherTotals.rates.subtotal.percentage((job.tax_lbr_rt || 0) * 100); // THis is currently using the lbr tax rate from PFH not PFL.
-  }
+  // if (Object.keys(job.cieca_pfl).length > 0) {
+  //   //Ignore it now, we have calculated it above.
+  //   //This was previously used for JCS before parts were also calculated at a different rate.
+  // } else {
+  //   //We don't have it, just add in how it was before.
+  //   laborTaxTotal = otherTotals.rates.subtotal.percentage((job.tax_lbr_rt || 0) * 100); // THis is currently using the lbr tax rate from PFH not PFL.
+  // }

  //console.log("Labor Tax Total", laborTaxTotal.toFormat());

@@ -1010,9 +1066,9 @@ function CalculateTaxesTotals(job, otherTotals) {
    federal_tax: subtotal
      .percentage((job.federal_tax_rate || 0) * 100)
      .add(otherTotals.additional.pvrt.percentage((job.federal_tax_rate || 0) * 100)),
-    statePartsTax,
+    stateTax,
    us_sales_tax_breakdown,
-    state_tax: statePartsTax,
+    state_tax: stateTax,
    local_tax: subtotal.percentage((job.local_tax_rate || 0) * 100)
  };
  ret.total_repairs = ret.subtotal
Author	SHA1	Message	Date
Allan Carr	1f281e8439	IO-2874 InsertBill Full Error Log Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-13 11:03:15 -07:00
Allan Carr	547e279693	Merged in hotfix/2024-08-06 (pull request #1579 ) IO-2865 Job Total Labor InstanceManger	2024-08-06 19:32:32 +00:00
Allan Carr	b9bdefe898	Merged in feature/IO-2865-Job-Total-Labor-InstanceManager (pull request #1578 ) IO-2865 Job Total Labor InstanceManger	2024-08-06 19:31:53 +00:00
Allan Carr	c963cb6fcc	IO-2865 Job Total Labor InstanceManger Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-06 12:22:55 -07:00
Dave Richer	190b2e5b5c	Merged in release/2024-08-02 (pull request #1573 ) - Show default stats instead of no stats if statisticsOrder object is not yet valid.	2024-08-02 23:55:03 +00:00
Dave Richer	3e2a517272	Merged in feature/IO-2743-Production-Board-GridDND (pull request #1572 ) - Show default stats instead of no stats if statisticsOrder object is not yet valid.	2024-08-02 23:54:16 +00:00
Dave Richer	a6cd35bd06	- Show default stats instead of no stats if statisticsOrder object is not yet valid. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-02 19:52:49 -04:00
Dave Richer	ba3032e553	Merged in release/2024-08-02 (pull request #1571 ) - Fix bug	2024-08-02 23:39:35 +00:00
Dave Richer	20fd452335	Merged in feature/IO-2743-Production-Board-GridDND (pull request #1569 ) - Fix bug	2024-08-02 23:35:26 +00:00
Dave Richer	8f83a5f5e6	- Fix bug Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-02 19:34:15 -04:00
Dave Richer	4e417d1b10	Merged in release/2024-08-02 (pull request #1568 ) Release/2024 08 02	2024-08-02 22:28:13 +00:00
Allan Carr	3ee63a503a	Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1567 ) Dinero Object	2024-08-02 22:10:16 +00:00
Allan Carr	8dd0e12398	Dinero Object Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-02 15:12:51 -07:00
Allan Carr	253b4d0ddc	Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1566 ) Correct for Dinero type	2024-08-02 21:54:24 +00:00
Allan Carr	a8b0931659	Correct for Dinero type Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-02 14:49:20 -07:00
Allan Carr	11a182c68a	Correct query and object call Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-02 14:19:58 -07:00
Allan Carr	2583d21cf1	Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1564 ) Correct query and object call	2024-08-02 21:17:49 +00:00
Dave Richer	aa6032d74f	Merged in feature/IO-2743-Production-Board-GridDND (pull request #1563 ) Feature/IO-2743 Production Board GridDND	2024-08-02 20:37:59 +00:00
Dave Richer	e1bac5fe9f	- V1 Finished Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-02 16:37:00 -04:00
Dave Richer	0c74848c54	Merged in feature/IO-2743-Production-Board-GridDND (pull request #1561 ) Feature/IO-2743 Production Board GridDND	2024-08-02 20:34:33 +00:00
Dave Richer	1c4f2d2de0	- V1 Finished Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-02 16:33:50 -04:00
Dave Richer	d67d2aa064	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2743-Production-Board-GridDND	2024-08-02 16:32:17 -04:00
Dave Richer	208f3281a9	- V1 Finished Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-02 16:28:50 -04:00
Dave Richer	fb7e3bc812	- Check Point Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-02 15:49:09 -04:00
Allan Carr	884adb963c	Merged in release/2024-08-02 (pull request #1560 ) IO-2854 Handle Exporting to Accounting	2024-08-02 19:18:38 +00:00
Allan Carr	29c4df9f76	Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1559 ) IO-2854 Handle Exporting to Accounting Approved-by: Dave Richer	2024-08-02 19:13:03 +00:00
Allan Carr	f1940a320c	IO-2854 Handle Exporting to Accounting Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-02 11:30:08 -07:00
Dave Richer	a297bba193	- Check Point Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-02 11:29:31 -04:00
Allan Carr	375a3fe386	Merged in hotfix/AIO/2024-08-01 (pull request #1558 ) Hotfix/AIO/2024 08 01	2024-08-01 21:59:59 +00:00
Allan Carr	d837754ef6	Merged in feature/IO-2857-Tech-Job-Drawer-PartsOrderDrawer-Component (pull request #1557 ) Feature/IO-2857 Tech Job Drawer PartsOrderDrawer Component	2024-08-01 21:58:49 +00:00
Allan Carr	49a1f0c42c	Correct for Labor Adjustment being null Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-01 14:42:07 -07:00
Allan Carr	a5033e10cd	Merged in release/2024-08-02 (pull request #1556 ) Correct for Labor Adjustment being null	2024-08-01 21:40:13 +00:00
Allan Carr	00f0952ab2	Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1555 ) Correct for Labor Adjustment being null	2024-08-01 21:39:34 +00:00
Allan Carr	ec5b636c26	Merge branch 'release/2024-08-02' into test-AIO Signed-off-by: Allan Carr <allan.carr@thinkimex.com> # Conflicts: # client/src/translations/en_us/common.json # client/src/translations/es/common.json # client/src/translations/fr/common.json	2024-08-01 13:57:45 -07:00
Allan Carr	7126cc0d56	Correction for upsteam change Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-01 13:31:44 -07:00
Allan Carr	568d8887ce	Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1554 ) Correction for upsteam change	2024-08-01 20:29:37 +00:00
Allan Carr	4927e84a88	Adjustment to only have PartsDrawer show if not a technician Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-01 12:47:41 -07:00
Allan Carr	d2d8039cb9	Merged in feature/IO-2857-Tech-Job-Drawer-PartsOrderDrawer-Component (pull request #1553 ) IO-2857 Tech console fixes Approved-by: Dave Richer	2024-08-01 19:46:10 +00:00
Allan Carr	5da242d785	Remove unneeded spaces Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-01 12:29:04 -07:00
Allan Carr	87f25b1ed4	IO-2857 Tech console fixes Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-01 12:16:56 -07:00
Dave Richer	4f9afc8578	Merged in feature/IO-2743-Production-Board-GridDND (pull request #1552 ) - fix regression in settings - add defaults	2024-08-01 15:52:27 +00:00
Dave Richer	defadf70e3	- fix regression in settings - add defaults Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-01 11:51:13 -04:00
Dave Richer	82be3853f0	Merged in feature/IO-2743-Production-Board-GridDND (pull request #1551 ) Feature/IO-2743 Production Board GridDND	2024-08-01 15:31:32 +00:00
Dave Richer	ff184926fc	- add noteupsert modal to PB Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-01 11:31:06 -04:00
Dave Richer	0e9768c0f6	- fix regression in card sizes Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-01 11:27:46 -04:00
Allan Carr	805c924a15	Merged in feature/IO-2852-Production-Add-Job-Note (pull request #1550 ) IO-2852 Production Add Job Note	2024-07-31 22:26:56 +00:00
Allan Carr	10ff8fc432	Reverting in favor of correcting in new Production Board Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-31 15:22:22 -07:00
Allan Carr	e2db0bab9f	Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1549 ) IO-2854 Profile Adjustments for LA and MA Approved-by: Dave Richer	2024-07-31 22:14:59 +00:00
Allan Carr	92ee5169ab	IO-2852 Production Add Job Note Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-31 14:49:01 -07:00
Allan Carr	5cf2345dca	IO-2854 Profile Adjustments for LA and MA Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-31 14:15:31 -07:00
Dave Richer	0accf6a18f	Merged in feature/IO-2743-Production-Board-GridDND (pull request #1548 ) Feature/IO-2743 Production Board GridDND Approved-by: Allan Carr	2024-07-31 20:47:28 +00:00
Dave Richer	52e46aad86	- fix bug with body empty Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-31 14:18:01 -04:00
Dave Richer	43f49e5e51	- minor refactor to defaults Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-31 14:07:36 -04:00
Dave Richer	60908b123d	- Clean up Card Settings - Code refactor for maintainability - Allow users to adjust the order of the statistics via drag and drop Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-31 14:04:50 -04:00
Dave Richer	5169fd178a	Merged in feature/IO-2743-Production-Board-GridDND (pull request #1547 ) Statistics and Tool Tip Bug fix	2024-07-30 21:31:20 +00:00
Dave Richer	bbc446ef01	- Finish up with Statistics Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-30 17:24:55 -04:00
Dave Richer	65bb8c6f26	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2743-Production-Board-GridDND	2024-07-30 13:01:46 -04:00
Allan Carr	171f40819c	Merged in release/2024-07-26 (pull request #1546 ) Release/2024 07 26 Approved-by: Dave Richer	2024-07-29 21:27:54 +00:00
Allan Carr	4baa26cb25	Merged in release/2024-07-26 (pull request #1545 ) Release/2024 07 26	2024-07-29 19:52:48 +00:00
Allan Carr	01da7fde31	Merged in feature/IO-2564-Row-Expander-Links (pull request #1543 ) IO-2564 Row Expander Links Approved-by: Dave Richer	2024-07-29 18:57:50 +00:00
Allan Carr	3c8234d715	Merged in feature/IO-2853-Production-Board-Date-Modal (pull request #1544 ) IO-2853 Production Board Date Modal Approved-by: Dave Richer	2024-07-29 18:53:48 +00:00
Allan Carr	866f242465	IO-2853 Production Board Date Modal Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-29 11:30:52 -07:00
Allan Carr	f690596825	IO-2564 Row Expander Links Move Drawer from Parts Order into seperate componenet and pass props down from main page and then link the BillDetailEdit Container into joblines Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-29 11:21:40 -07:00
Allan Carr	5f494e4b78	IO-2564 Revert location of query Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-26 13:28:29 -07:00
Allan Carr	7b814329da	Merged in release/2024-07-26 (pull request #1542 ) IO-2564 Revert location of query	2024-07-26 20:27:00 +00:00
Allan Carr	2fc0e1cf50	Merged in feature/IO-2564-Row-Expander-Links (pull request #1541 ) IO-2564 Revert location of query	2024-07-26 20:26:20 +00:00
Allan Carr	ba3f98aeb4	Merged in release/2024-07-26 (pull request #1540 ) Release/2024 07 26	2024-07-26 16:15:53 +00:00
Dave Richer	f49818ade3	- Alans tool tip issue Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-25 14:07:15 -04:00
Dave Richer	b37c70494b	Merged in feature/IO-2743-Production-Board-GridDND (pull request #1539 ) Feature/IO-2743 Production Board GridDND	2024-07-25 17:18:28 +00:00
Dave Richer	ff1db26f41	- fix minor issue with production notes / add some notes on Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-25 13:16:30 -04:00
Allan Carr	3550c97966	Merged in feature/IO-2849-Missing-Translation-from-Shop-Config (pull request #1538 ) IO-2849 Missing Translation from Shop Config Approved-by: Dave Richer	2024-07-25 16:57:22 +00:00
Allan Carr	956c686360	Merged in feature/IO-2850-Missing-Fields-from-Shop-Config (pull request #1537 ) IO-2850 Missing fields from save on Shop Config Taxes	2024-07-25 16:56:26 +00:00
Allan Carr	508b0d7711	Merged in feature/IO-2851-Rome-Manual-Job-Creation-Taxes (pull request #1536 ) IO-2851 Manual Job Creation Taxes Approved-by: Dave Richer	2024-07-25 16:55:41 +00:00
Allan Carr	abb1464e30	IO-2849 Missing Translation from Shop Config Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-25 08:39:42 -07:00
Allan Carr	704d5415d6	IO-2850 Missing fields from save on Shop Config Taxes Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-25 08:38:01 -07:00
Allan Carr	6cc1cfd1b0	IO-2851 Manual Job Creation Taxes Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-25 08:36:08 -07:00
Dave Richer	e6455a7fd3	- Fix a zooming issue (zoom far in, then out, lanes don't adjust back) I noticed during the call. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-23 16:08:48 -04:00
Dave Richer	a9aad2a751	Merged in feature/IO-2743-Production-Board-GridDND (pull request #1535 ) Production Board Update 1 Approved-by: Allan Carr	2024-07-23 16:50:24 +00:00
Allan Carr	1bf745345d	Merged in feature/IO-2564-Row-Expander-Links (pull request #1533 ) IO-2564 Row Expander Links Approved-by: Dave Richer	2024-07-23 03:36:53 +00:00
Allan Carr	63c71ed923	Merged in feature/IO-2848-Update_Job-Query (pull request #1534 ) IO-2848 UPDATE_JOB query Approved-by: Dave Richer	2024-07-23 03:35:53 +00:00
Dave Richer	3a844aefa0	- Merge Master, update packages. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-22 23:34:46 -04:00
Allan Carr	4a16df36dd	IO-2848 UPDATE_JOB query Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-22 17:35:05 -07:00
Allan Carr	93c92e8976	IO-2564 Row Expander Links Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-22 13:30:08 -07:00
Dave Richer	9523e5534d	Merged in feature/IO-2743-Production-Board-GridDND (pull request #1532 ) Feature/IO-2743 Production Board GridDND Approved-by: Allan Carr	2024-07-19 21:56:52 +00:00
Dave Richer	d20048026c	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2743-Production-Board-GridDND	2024-07-19 16:17:22 -04:00
Dave Richer	7ba3ed2b89	Merged in release/2024-07-19 (pull request #1531 ) Release/2024 07 19	2024-07-19 20:02:39 +00:00
Dave Richer	2cc0b7d741	Merged in bugfix/ProductFruitsWrapper (pull request #1530 ) Bugfix/ProductFruitsWrapper	2024-07-19 20:02:11 +00:00
Dave Richer	97693fbcff	- Add Prop Types to ProductFruitsWrapper.jsx Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-19 16:01:40 -04:00
Dave Richer	5e94b1a71e	- Improve product fruits wrapper for extra checks Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-19 15:50:09 -04:00
Allan Carr	970275e62a	Merged in release/2024-07-19 (pull request #1529 ) Release/2024 07 19	2024-07-19 19:02:15 +00:00
Allan Carr	15c7b6f1c8	Merged in release/2024-07-19 (pull request #1528 ) Release/2024 07 19	2024-07-19 17:26:48 +00:00
Dave Richer	aa076da255	Merged in bugfix/ProductFruitsWrapper (pull request #1527 ) - Improve product fruits wrapper for extra checks Approved-by: Allan Carr	2024-07-19 17:24:22 +00:00
Dave Richer	3dd154de79	- Improve product fruits wrapper for extra checks Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-19 13:23:43 -04:00
Dave Richer	72a2366abe	- Improve product fruits wrapper for extra checks Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-19 13:18:10 -04:00
Allan Carr	36f517e8e1	Merged in feature/IO-2845-Payment-by-Date-Grouped-by-Payment-Type (pull request #1525 ) IO-2845 Payments Grouped by Payment Type Approved-by: Dave Richer	2024-07-19 17:16:26 +00:00
Allan Carr	981fb57d36	Merged in feature/IO-2847-Employee-Rate-Filter (pull request #1526 ) IO-2847 Employee Rate Filter Approved-by: Dave Richer	2024-07-19 17:15:04 +00:00
Dave Richer	3149c3cfc6	- Patricks request for card settings to be buttons and not switches Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-19 11:54:50 -04:00
Allan Carr	a059c2b5a8	IO-2847 Employee Rate Filter Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-19 08:41:12 -07:00
Dave Richer	f91e0ec39f	- Package updates Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-19 10:56:51 -04:00
Dave Richer	c31d4096c6	- Make sure subscription and initial query only grab jobs that have statuses that are on the board Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-18 16:59:17 -04:00
Dave Richer	118f14ed4c	- Touch point for working kanbanparents Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-18 15:45:11 -04:00
Allan Carr	207bb39672	IO-2845 Payments Grouped by Payment Type Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-17 14:15:38 -07:00
Dave Richer	16e34e4ed9	Merged in bugfix/productfruits (pull request #1523 ) - misc updates / clear stage	2024-07-17 16:30:53 +00:00
Allan Carr	f15f5d7309	Merged in release/2024-07-19 (pull request #1522 ) IO-2843 State Tax for QBO_USA and Region CA_	2024-07-15 23:56:22 +00:00
Allan Carr	ae6b2fe4f5	Merged in feature/IO-2843-QBO_USA-Switch-for-IO (pull request #1521 ) IO-2843 State Tax for QBO_USA and Region CA_	2024-07-15 23:53:59 +00:00
Allan Carr	4ca686126a	IO-2843 State Tax for QBO_USA and Region CA_ Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-07-15 16:53:48 -07:00
Allan Carr	852231b503	Merged in release/2024-07-12 (pull request #1519 ) Release/2024 07 12	2024-07-11 23:10:42 +00:00
Allan Carr	2761356f02	Merged in release/2024-06-28 (pull request #1509 ) IO-2832 Purchases by RO - Invoice Date bound	2024-06-28 17:04:50 +00:00
Allan Carr	64e3f5f2ac	Merged in release/2024-06-28 (pull request #1505 ) Release/2024 06 28	2024-06-26 16:33:28 +00:00
Allan Carr	edef0b194d	Merged in release/2024-06-21 (pull request #1497 ) IO-2820 Adjustment to Bottom Line	2024-06-21 22:33:09 +00:00
Allan Carr	37f0c98e75	Merged in release/2024-06-21 (pull request #1495 ) IO-2828 Add InstanceManager and correct delete button for delivery checklist Approved-by: Dave Richer	2024-06-21 18:39:43 +00:00
Allan Carr	48f18514af	Merged in release/2024-06-21 (pull request #1492 ) IO-2793 Change Additional Costs tax item	2024-06-20 21:15:15 +00:00
Allan Carr	76c13700be	Merged in release/2024-06-21 (pull request #1490 ) IO-2793 Adjustment for parts	2024-06-20 20:46:19 +00:00
Allan Carr	8ae8737fe2	Merged in release/2024-06-21 (pull request #1488 ) Release/2024 06 21	2024-06-20 19:04:05 +00:00
Allan Carr	cd055f7344	Merged in release/AIO/2024-06-07 (pull request #1481 ) IO-2793 Correction for Sublet Part Tax	2024-06-10 21:42:16 +00:00
Allan Carr	c43709395f	Merged in release/AIO/2024-06-07 (pull request #1479 ) IO-2793 Better tax handling	2024-06-10 21:13:55 +00:00
Allan Carr	870f8463db	Merged in release/AIO/2024-06-07 (pull request #1477 ) IO-2793 Correct passed Variable	2024-06-10 18:27:02 +00:00
Allan Carr	5567a69142	Merged in release/AIO/2024-06-07 (pull request #1475 ) IO-2793 Correct variables	2024-06-10 18:04:15 +00:00
Allan Carr	762fec1d9a	Merged in release/AIO/2024-06-07 (pull request #1473 ) IO-2793 Change to function for better clarity	2024-06-10 17:49:59 +00:00
Allan Carr	0946b0d3a3	Merged in release/AIO/2024-06-07 (pull request #1471 ) IO-2793 Correct Parts Side for Taxes	2024-06-07 23:02:20 +00:00
Allan Carr	976dd2cbfb	Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1469 ) IO-2793 Add Comment to see output for testing	2024-06-07 21:31:50 +00:00
Allan Carr	b6956b3649	Merged in release/AIO/2024-06-07 (pull request #1468 ) IO-2814 Remove Comment as api.test.romeonline.io doesn't update w/ CICD	2024-06-07 19:16:31 +00:00
Allan Carr	b2b4902d23	Merged in release/AIO/2024-06-07 (pull request #1466 ) IO-2814 Correct Parts Price and add Console Log	2024-06-07 18:40:32 +00:00
Allan Carr	6f69129829	Merged in release/AIO/2024-06-07 (pull request #1464 ) Release/AIO/2024 06 07	2024-06-07 15:26:04 +00:00
Allan Carr	7d3101c877	Merged in release/AIO/2024-06-07 (pull request #1461 ) IO-2793 State Tax to QBO refactor Approved-by: Dave Richer	2024-06-04 15:20:12 +00:00
Dave Richer	c3f0e6f10c	Merged in hotfix/revert-tax-import-code (pull request #1460 ) revert previous change due to problems with tax import.	2024-06-03 22:05:04 +00:00
Dave Richer	d0da2dd66c	Merged in release/AIO/2024-06-07 (pull request #1457 ) IO-2801 os-loader bills data	2024-06-03 18:59:47 +00:00
Dave Richer	877b3ab39c	Merged in release/AIO/2024-05-31 (pull request #1453 ) Release/AIO/2024 05 31	2024-06-01 17:20:15 +00:00
Dave Richer	1d1ff5d20b	Merged in release/AIO/2024-05-24 (pull request #1447 ) Release/AIO/2024 05 24	2024-05-24 17:22:41 +00:00
Patrick Fic	133d593689	Merge branch 'release/AIO/2024-05-24' into test-AIO	2024-05-22 08:44:12 -07:00
Patrick Fic	5206ba7a74	Merge branch 'release/AIO/2024-05-17' into test-AIO	2024-05-15 10:28:40 -07:00