- The Great merge

Signed-off-by: Dave Richer <dave@imexsystems.ca>

.circleci/config.yml

@@ -3,6 +3,7 @@ orbs:
   #snyk: snyk/snyk@0.0.8
   #cypress: cypress-io/cypress@1.23.0
   aws-s3: circleci/aws-s3@4.0.0
+  aws-cli: circleci/aws-cli@4.0
   eb: circleci/aws-elastic-beanstalk@2.0.1
 jobs:
   api-deploy:
@@ -57,10 +58,148 @@ jobs:
           to: "s3://imex-online-production/"
           arguments: "--exclude '*.map'"
 
+  rome-api-deploy:
+    docker:
+      - image: "cimg/base:stable"
+    steps:
+      - checkout
+      - eb/setup
+      - run:
+          command: |
+            eb init romeonline-productionapi -r us-east-2 -p "Node.js 18 running on 64bit Amazon Linux 2"
+            eb status --verbose
+            eb deploy
+            eb status
+
+  rome-hasura-migrate:
+    docker:
+      - image: cimg/node:16.15.0
+    parameters:
+      secret:
+        type: string
+        default: $HASURA_PROD_SECRET
+    working_directory: ~/repo/hasura
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Execute migration
+          command: |
+            npm install hasura-cli -g
+            hasura migrate apply --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >>
+            hasura metadata apply --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >>
+            hasura metadata reload --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >>
+
+  rome-app-build:
+    docker:
+      - image: cimg/node:16.15.0
+
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+
+      - restore_cache:
+          name: Restore Yarn Package Cache
+          keys:
+            - yarn-packages-{{ checksum "yarn.lock" }}
+      - run:
+          name: Install Dependencies
+          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+      - save_cache:
+          name: Save Yarn Package Cache
+          key: yarn-packages-{{ checksum "yarn.lock" }}
+          paths:
+            - ~/.cache/yarn
+
+      - run: yarn run build
+
+      - aws-s3/sync:
+          from: build
+          to: "s3://rome-online-production/"
+      - jira/notify
+
+  test-rome-hasura-migrate:
+    docker:
+      - image: cimg/node:16.15.0
+    parameters:
+      secret:
+        type: string
+        default: $HASURA_ROME_TEST_SECRET
+    working_directory: ~/repo/hasura
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Execute migration
+          command: |
+            npm install hasura-cli -g
+            echo ${HASURA_TEST_SECRET}
+            hasura migrate apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
+            hasura metadata apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
+            hasura metadata reload --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
+
+  test-rome-app-build:
+    docker:
+      - image: cimg/node:16.15.0
+
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+
+      - restore_cache:
+          name: Restore Yarn Package Cache
+          keys:
+            - yarn-packages-{{ checksum "yarn.lock" }}
+      - run:
+          name: Install Dependencies
+          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+      - save_cache:
+          name: Save Yarn Package Cache
+          key: yarn-packages-{{ checksum "yarn.lock" }}
+          paths:
+            - ~/.cache/yarn
+
+      - run: yarn run build:test
+
+      - aws-s3/sync:
+          from: build
+          to: "s3://rome-online-test/"
+      - jira/notify
+
   app-beta-build:
     docker:
       - image: cimg/node:18.18.2
-    resource_class: xlarge
+    resource_class: large
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Install Dependencies
+          command: npm i
+
+      - run: npm run build
+
+      - aws-cli/setup:
+          aws_access_key_id: AWS_ACCESS_KEY_ID
+          aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+          region: AWS_REGION
+
+      - aws-s3/sync:
+          from: build
+          to: "s3://imex-online-beta/"
+          arguments: "--exclude '*.map'"
+      - jira/notify
+
+  rome-app-beta-build:
+    docker:
+      - image: cimg/node:18.18.2
+    resource_class: large
     working_directory: ~/repo/client
 
     steps:
@@ -74,8 +213,8 @@ jobs:
 
       - aws-s3/sync:
           from: build
-          to: "s3://imex-online-beta/"
+          to: "s3://rome-online-production-beta/"
-          arguments: "--exclude '*.map'"
+      - jira/notify
 
   test-hasura-migrate:
     docker:
@@ -120,7 +259,35 @@ jobs:
   test-app-beta-build:
     docker:
       - image: cimg/node:18.18.2
-    resource_class: snaptsoft/pfic
+    resource_class: large
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+
+      - run:
+          name: Install Dependencies
+          command: npm i
+
+      - run: npm run build:test
+
+      - run: npm run sentry:sourcemaps
+
+      - aws-cli/setup:
+          aws_access_key_id: AWS_ACCESS_KEY_ID
+          aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+          region: AWS_REGION
+
+      - aws-s3/sync:
+          from: build
+          to: "s3://imex-online-test-beta/"
+          arguments: "--exclude '*.map'"
+
+  rome-test-app-beta-build:
+    docker:
+      - image: cimg/node:18.18.2
+    resource_class: large
     working_directory: ~/repo/client
 
     steps:
@@ -135,8 +302,8 @@ jobs:
 
       - aws-s3/sync:
           from: build
-          to: "s3://imex-online-test-beta/"
+          to: "s3://rome-online-test-beta/"
-          arguments: "--exclude '*.map'"
+
 
   admin-app-build:
     docker:
@@ -183,15 +350,36 @@ workflows:
           filters:
             branches:
               only: master-beta
+      - rome-app-beta-build:
+          filters:
+            branches:
+              only: rome/master-beta
       - hasura-migrate:
           secret: ${HASURA_PROD_SECRET}
           filters:
             branches:
               only: master
+      - rome-api-deploy:
+          filters:
+            branches:
+              only: rome/master
+      - rome-app-build:
+          filters:
+            branches:
+              only: rome/master
+      - rome-hasura-migrate:
+          secret: ${HASURA_PROD_SECRET}
+          filters:
+            branches:
+              only: rome/master
       - test-app-build:
           filters:
             branches:
               only: test
+      - rome-test-app-beta-build:
+          filters:
+            branches:
+              only: rome/test-beta
       - test-app-beta-build:
           filters:
             branches:
@@ -201,6 +389,15 @@ workflows:
           filters:
             branches:
               only: test
+      - test-rome-app-build:
+          filters:
+            branches:
+              only: rome/test
+      - test-rome-hasura-migrate:
+          secret: ${HASURA_ROME_TEST_SECRET}
+          filters:
+            branches:
+              only: rome/test
       #- admin-app-build:
       #filters:
       #branches:

.eslintrc.json

@@ -8,7 +8,6 @@
     "Atomics": "readonly",
     "SharedArrayBuffer": "readonly"
   },
-
   "parserOptions": {
     "ecmaVersion": 2018,
     "sourceType": "module"

.vscode/launch.json

@@ -8,7 +8,6 @@
       "type": "pwa-chrome",
       "webRoot": "${workspaceFolder}/client/src"
     },
-
     {
       "name": "Chrome",
       "type": "chrome",

README.MD

@@ -6,7 +6,8 @@ npx deadfile ./src/index.js --exclude build templates
 
 #Crushing all hasura migrations by creating a new initialization from the server.
 hasura migrate create "Init" --from-server --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
-hasura migrate apply --version "1620771761757" --skip-execution --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
+hasura migrate apply --version "1620771761757" --skip-execution --endpoint https://db.imex.online/ --admin-secret '
+Production-ImEXOnline!@#'
 hasura migrate status --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
 
 Generate the license file:

_reference/DeploymentChecklist.md

@@ -1,4 +1,3 @@
-
 Ensure following environment variables are set:
 
 __S3 Related__

_reference/JSReportSetup.md

@@ -16,9 +16,11 @@ jsreport configure
 
 sudo apt-get install -y libgconf-2-4
 sudo wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >>
+/etc/apt/sources.list.d/google.list'
 sudo apt-get update
-sudo apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst --no-install-recommends
+sudo apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst
+--no-install-recommends
 
 # on ubuntu 20 run also
 

_reference/Jest CheatSheet.md

@@ -6,7 +6,9 @@
 
 </div>
 
-_I recommend [Mrm](https://github.com/sapegin/mrm-tasks/tree/master/packages/mrm-task-jest) and [jest-codemods](https://github.com/skovhus/jest-codemods) for single-command Jest installation and easy migration from other frameworks._
+_I recommend [Mrm](https://github.com/sapegin/mrm-tasks/tree/master/packages/mrm-task-jest)
+and [jest-codemods](https://github.com/skovhus/jest-codemods) for single-command Jest installation and easy migration
+from other frameworks._
 
 <!-- To reformat run: npx prettier --print-width 100 --single-quote --no-semi --prose-wrap never --write Readme.md -->
 
@@ -205,8 +207,8 @@ expect(fn.mock.calls[0][0]).toBe(2) // fn.mock.calls[0][0] — the first argumen
 - `nthCalledWith` → `toHaveBeenNthCalledWith`
 - `toReturnTimes` → `toHaveReturnedTimes`
 - `toReturnWith` → `toHaveReturnedWith`
-- `lastReturnedWith` → `toHaveLastReturnedWith`
+- `lastReturnedWith`→ `toHaveLastReturnedWith`
-- `nthReturnedWith` → `toHaveNthReturnedWith`
+- `nthReturnedWith` →`toHaveNthReturnedWith`
   </details>
 
 ### Misc
@@ -244,7 +246,8 @@ test('resolve to lemon', async () => {
 
 See [more examples](https://facebook.github.io/jest/docs/en/tutorial-async.html) in Jest docs.
 
-It’s a good practice to specify a number of expected assertions in async tests, so the test will fail if your assertions weren’t called at all.
+It’s a good practice to specify a number of expected assertions in async tests, so the test will fail if your assertions
+weren’t called at all.
 
 ```js
 test('async test', () => {
@@ -343,7 +346,8 @@ jest.mock('lodash/memoize', () => a => a, { virtual: true }) // The original lod
 
 [jest.mock docs](https://facebook.github.io/jest/docs/jest-object.html#jestmockmodulename-factory-options)
 
-> Note: When using `babel-jest`, calls to `jest.mock` will automatically be hoisted to the top of the code block. Use `jest.doMock` if you want to explicitly avoid this behavior.
+> Note: When using `babel-jest`, calls to `jest.mock` will automatically be hoisted to the top of the code block.
+> Use `jest.doMock` if you want to explicitly avoid this behavior.
 
 ### Mock modules using a mock file
 
@@ -359,7 +363,8 @@ jest.mock('lodash/memoize', () => a => a, { virtual: true }) // The original lod
    jest.mock('lodash/memoize')
    ```
 
-> Note: When using `babel-jest`, calls to `jest.mock` will automatically be hoisted to the top of the code block. Use `jest.doMock` if you want to explicitly avoid this behavior.
+> Note: When using `babel-jest`, calls to `jest.mock` will automatically be hoisted to the top of the code block.
+> Use `jest.doMock` if you want to explicitly avoid this behavior.
 
 [Manual mocks docs](https://facebook.github.io/jest/docs/manual-mocks.html)
 
@@ -407,7 +412,7 @@ fn.mockReset() // Clears and removes any mocked return values or implementations
 fn.mockRestore() // Resets and restores the initial implementation
 ```
 
-> Note: `mockRestore` works only with mocks created by `jest.spyOn`.
+> Note: `mockRestore`works only with mocks created by `jest.spyOn`.
 
 For all mocks:
 
@@ -427,7 +432,8 @@ const fs = require.requireActual('fs') // Original module
 
 ### Timer mocks
 
-Write synchronous test for code that uses native timer functions (`setTimeout`, `setInterval`, `clearTimeout`, `clearInterval`).
+Write synchronous test for code that uses native timer
+functions (`setTimeout`, `setInterval`, `clearTimeout`, `clearInterval`).
 
 ```js
 // Enable fake timers
@@ -501,7 +507,8 @@ tests.only('make each pony pink'...
 
 ## Testing modules with side effects
 
-Node.js and Jest will cache modules you `require`. To test modules with side effects you’ll need to reset the module registry between tests:
+Node.js and Jest will cache modules you `require`. To test modules with side effects you’ll need to reset the module
+registry between tests:
 
 ```js
 const modulePath = '../module-to-test'
@@ -525,7 +532,8 @@ test('second text', () => {
 
 ## Usage with Babel and TypeScript
 
-Add [babel-jest](https://github.com/facebook/jest/tree/master/packages/babel-jest) or [ts-jest](https://github.com/kulshekhar/ts-jest). Check their docs for installation instructions.
+Add [babel-jest](https://github.com/facebook/jest/tree/master/packages/babel-jest)
+or [ts-jest](https://github.com/kulshekhar/ts-jest). Check their docs for installation instructions.
 
 ## Resources
 
@@ -536,10 +544,14 @@ Add [babel-jest](https://github.com/facebook/jest/tree/master/packages/babel-jes
 - [Effective Snapshot Testing](https://blog.kentcdodds.com/effective-snapshot-testing-e0d1a2c28eca) by Kent C. Dodds
 - [Migrating to Jest](https://medium.com/@kentcdodds/migrating-to-jest-881f75366e7e#.pc4s5ut6z) by Kent C. Dodds
 - [Migrating AVA to Jest](http://browniefed.com/blog/migrating-ava-to-jest/) by Jason Brown
-- [How to Test React and MobX with Jest](https://semaphoreci.com/community/tutorials/how-to-test-react-and-mobx-with-jest) by Will Stern
+- [How to Test React and MobX with Jest](https://semaphoreci.com/community/tutorials/how-to-test-react-and-mobx-with-jest)
-- [Testing React Intl components with Jest and Enzyme](https://medium.com/@sapegin/testing-react-intl-components-with-jest-and-enzyme-f9d43d9c923e) by Artem Sapegin
+  by Will Stern
-- [Testing with Jest: 15 Awesome Tips and Tricks](https://medium.com/@stipsan/testing-with-jest-15-awesome-tips-and-tricks-42150ec4c262) by Stian Didriksen
+- [Testing React Intl components with Jest and Enzyme](https://medium.com/@sapegin/testing-react-intl-components-with-jest-and-enzyme-f9d43d9c923e)
-- Taking Advantage of Jest Matchers by Ben McCormick: [Part 1](https://benmccormick.org/2017/08/15/jest-matchers-1/), [Part 2](https://benmccormick.org/2017/09/04/jest-matchers-2/)
+  by Artem Sapegin
+- [Testing with Jest: 15 Awesome Tips and Tricks](https://medium.com/@stipsan/testing-with-jest-15-awesome-tips-and-tricks-42150ec4c262)
+  by Stian Didriksen
+- Taking Advantage of Jest Matchers by Ben
+  McCormick: [Part 1](https://benmccormick.org/2017/08/15/jest-matchers-1/), [Part 2](https://benmccormick.org/2017/09/04/jest-matchers-2/)
 
 ---
 
@@ -559,6 +571,8 @@ This software has been developed with lots of coffee, buy me one more cup to kee
 
 ## Author and license
 
-[Artem Sapegin](http://sapegin.me/), a frontend engineer at [Omio](https://omio.com/) and the creator of [React Styleguidist](https://react-styleguidist.js.org/). I also write about frontend at [my blog](https://blog.sapegin.me/).
+[Artem Sapegin](http://sapegin.me/), a frontend engineer at [Omio](https://omio.com/) and the creator
+of [React Styleguidist](https://react-styleguidist.js.org/). I also write about frontend
+at [my blog](https://blog.sapegin.me/).
 
 CC0 1.0 Universal license, see the included [License.md](/License.md) file.

_reference/New Hasura Deployment.md

@@ -46,7 +46,8 @@ $ hasura migrate create "init" --from-server
 ## mark the migration as applied on this server
 
 $ hasura migrate apply --version "<version>" --skip-execution
-If you are using schemas other than public, use --schema "schema_name" flag to indicate each one of them in the create command. This flag can be used multiple times. See more details about the usage in the docs.
+If you are using schemas other than public, use --schema "schema_name" flag to indicate each one of them in the create
+command. This flag can be used multiple times. See more details about the usage in the docs.
 
 Step 4: Verify the status
 Execute the following command to verify status of migration:
@@ -54,4 +55,5 @@ Execute the following command to verify status of migration:
 $ hasura migrate status
 You have brand new migrations now!
 
-This can also be used to combine (kind of squash) all of your migration files into a single one. You're snapshotting the state of a server and adding it as a new migration.
+This can also be used to combine (kind of squash) all of your migration files into a single one. You're snapshotting the
+state of a server and adding it as a new migration.

_reference/OEC/Audatex.xsl

@@ -96,10 +96,13 @@
                             <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateID">
-                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of select="//Envelope/@SoftwareVersion"/>-<xsl:value-of select="//Envelope/@UniqueFileID"/>
+                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of
+                                select="//Envelope/@SoftwareVersion"/>-
+                            <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateIDv2">
-                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of select="//Envelope/@UniqueFileID"/>
+                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-
+                            <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateFormatVersion">
                             <xsl:value-of select="//Envelope/@EMSVersion"/>
@@ -220,7 +223,8 @@
                                     <xsl:choose>
                                         <xsl:when test="string-length(substring-before(//Admin/@InsuranceZip, '-'))=5">
                                             <xsl:choose>
-                                                <xsl:when test="string-length(substring-after(//Admin/@InsuranceZip, '-'))=4">
+                                                <xsl:when
+                                                        test="string-length(substring-after(//Admin/@InsuranceZip, '-'))=4">
                                                     <xsl:value-of select="//Admin/@InsuranceZip"/>
                                                 </xsl:when>
                                                 <xsl:otherwise>
@@ -231,7 +235,8 @@
                                     </xsl:choose>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin/@InsuranceZip)=9">
-                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>-<xsl:value-of select="substring(//Admin/@InsuranceZip, 6, 4)"/>
+                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>-
+                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 6, 4)"/>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin/@InsuranceZip)&gt;4">
                                     <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>
@@ -244,7 +249,8 @@
                         <xsl:attribute name="Phone">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsurancePhone1Ext[. != '']">
-                                    <xsl:value-of select="//Admin/@InsurancePhone1"/>&#32;x<xsl:value-of select="//Admin/@InsurancePhone1Ext"/>
+                                    <xsl:value-of select="//Admin/@InsurancePhone1"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsurancePhone1Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsurancePhone1"/>
@@ -254,7 +260,8 @@
                         <xsl:attribute name="Phone2">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsurancePhone2Ext[. != '']">
-                                    <xsl:value-of select="//Admin/@InsurancePhone2"/>&#32;x<xsl:value-of select="//Admin/@InsurancePhone2Ext"/>
+                                    <xsl:value-of select="//Admin/@InsurancePhone2"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsurancePhone2Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsurancePhone2"/>
@@ -264,7 +271,8 @@
                         <xsl:attribute name="Fax">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsuranceFaxExt[. != '']">
-                                    <xsl:value-of select="//Admin/@InsuranceFax"/>&#32;x<xsl:value-of select="//Admin/@InsuranceFaxExt"/>
+                                    <xsl:value-of select="//Admin/@InsuranceFax"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsuranceFaxExt"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsuranceFax"/>
@@ -319,7 +327,8 @@
                                     <xsl:choose>
                                         <xsl:when test="string-length(substring-before(//Admin2/@EstimatorZip, '-'))=5">
                                             <xsl:choose>
-                                                <xsl:when test="string-length(substring-after(//Admin2/@EstimatorZip, '-'))=4">
+                                                <xsl:when
+                                                        test="string-length(substring-after(//Admin2/@EstimatorZip, '-'))=4">
                                                     <xsl:value-of select="//Admin2/@EstimatorZip"/>
                                                 </xsl:when>
                                                 <xsl:otherwise>
@@ -330,7 +339,8 @@
                                     </xsl:choose>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin2/@EstimatorZip)=9">
-                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>-<xsl:value-of select="substring(//Admin2/@EstimatorZip, 6, 4)"/>
+                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>-
+                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 6, 4)"/>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin2/@EstimatorZip)&gt;4">
                                     <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>
@@ -343,7 +353,8 @@
                         <xsl:attribute name="Phone">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorPhone1Ext[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone1"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorPhone1Ext"/>
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone1"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone1Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorPhone1"/>
@@ -353,7 +364,8 @@
                         <xsl:attribute name="Phone2">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorPhone2Ext[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone2"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorPhone2Ext"/>
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone2"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone2Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorPhone2"/>
@@ -363,7 +375,8 @@
                         <xsl:attribute name="Fax">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorFaxExt[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorFax"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorFaxExt"/>
+                                    <xsl:value-of select="//Admin2/@EstimatorFax"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorFaxExt"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorFax"/>
@@ -379,7 +392,8 @@
                             <xsl:if test="string-length(//Admin2/@VehicleInDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@VehicleInDate, ' ')"/>
                                 <xsl:if test="string-length(//Admin2/@VehicleInTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleInTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@VehicleInTime, 3, 2)"/>
+                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleInTime, 1, 2)"/>:
+                                    <xsl:value-of select="substring(//Admin2/@VehicleInTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -387,7 +401,8 @@
                             <xsl:if test="string-length(//Admin2/@TargetVehicleOutDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@TargetVehicleOutDate,' ')"/>
                                 <xsl:if test="string-length(//Admin2/@TargetVehicleOutTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 3, 2)"/>
+                                    &#32;<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 1, 2)"/>:
+                                    <xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -395,7 +410,8 @@
                             <xsl:if test="string-length(//Admin2/@VehicleOutDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@VehicleOutDate, ' ')"/>
                                 <xsl:if test="string-length(//Admin2/@VehicleOutTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 3, 2)"/>
+                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 1, 2)"/>:
+                                    <xsl:value-of select="substring(//Admin2/@VehicleOutTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -470,7 +486,9 @@
                             <xsl:when test="$PrimaryPartType='PAN' or $PrimaryPartType='PAP'">1</xsl:when>
                             <xsl:when test="$PrimaryPartType='PAA' or $PrimaryPartType='PATR'">2</xsl:when>
                             <xsl:when test="$PrimaryPartType='PAL'">3</xsl:when>
-                            <xsl:when test="$PrimaryPartType='PAM' or $PrimaryPartType='PAC' or $PrimaryPartType='PAR'">4</xsl:when>
+                            <xsl:when test="$PrimaryPartType='PAM' or $PrimaryPartType='PAC' or $PrimaryPartType='PAR'">
+                                4
+                            </xsl:when>
                             <xsl:otherwise>0</xsl:otherwise>
                         </xsl:choose>
                     </xsl:attribute>
@@ -479,7 +497,10 @@
                             <xsl:when test="$SecondaryPartType='PAN'">1</xsl:when>
                             <xsl:when test="$SecondaryPartType='PAA' or $SecondaryPartType='PATR'">2</xsl:when>
                             <xsl:when test="$SecondaryPartType='PAL'">3</xsl:when>
-                            <xsl:when test="$SecondaryPartType='PAM' or $SecondaryPartType='PAC' or $SecondaryPartType='PAR'">4</xsl:when>
+                            <xsl:when
+                                    test="$SecondaryPartType='PAM' or $SecondaryPartType='PAC' or $SecondaryPartType='PAR'">
+                                4
+                            </xsl:when>
                             <xsl:otherwise>0</xsl:otherwise>
                         </xsl:choose>
                     </xsl:attribute>
@@ -546,11 +567,16 @@
                         <!-- If LaborOp is OP1, then allow the part to import CP 12/28/08 for Shop Client Release 4.1.4 -->
                         <xsl:choose>
                             <xsl:when test="@TransactionCode='3'">False</xsl:when>
-                            <xsl:when test="@TransactionCode='1' or @TransactionCode=' ' or @TransactionCode='' or @TransactionCode='2'">
+                            <xsl:when
+                                    test="@TransactionCode='1' or @TransactionCode=' ' or @TransactionCode='' or @TransactionCode='2'">
                                 <xsl:choose>
-                                    <xsl:when test="@PartType='PAN' or @PartType='PAG' or @PartType='PAM' or @PartType='PAP' or @PartType='PAL' or @PartType='PAA' or @PartType='PAC' or @PartType='PATR'">
+                                    <xsl:when
+                                            test="@PartType='PAN' or @PartType='PAG' or @PartType='PAM' or @PartType='PAP' or @PartType='PAL' or @PartType='PAA' or @PartType='PAC' or @PartType='PATR'">
                                         <xsl:choose>
-                                            <xsl:when test="@LaborType='LAD' or @LaborType='LAE' or @LaborType='LAU' or @LaborType='LAT'">False</xsl:when>
+                                            <xsl:when
+                                                    test="@LaborType='LAD' or @LaborType='LAE' or @LaborType='LAU' or @LaborType='LAT'">
+                                                False
+                                            </xsl:when>
                                             <xsl:otherwise>
                                                 <xsl:choose>
                                                     <!--xsl:when test="@LaborOp='OP0'">False</xsl:when -->

_reference/OEC/AudatexMapping.xml

@@ -1,127 +1,222 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TranslationDescriptor>
-    <FileTranslations FormatName="ADP EMS" ElementName="Estimate" Description="Translation Descriptor for a ADP ShopLink Estimate, Version EMS 2.0">
+    <FileTranslations FormatName="ADP EMS" ElementName="Estimate"
+                      Description="Translation Descriptor for a ADP ShopLink Estimate, Version EMS 2.0">
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.env">
             <DBFFileTranslation ID="ID1" ElementName="Envelope" Description="Envelope Table">
                 <DBFFieldSpec FieldName="RO_ID" Form="attribute" Name="RONum" FieldType="" Description="RO Number"/>
-                <DBFFieldSpec FieldName="UNQFILE_ID" Form="attribute" Name="UniqueFileID" FieldType="" Description="Unique File Identifier"/>
+                <DBFFieldSpec FieldName="UNQFILE_ID" Form="attribute" Name="UniqueFileID" FieldType=""
-                <DBFFieldSpec FieldName="ESTFILE_ID" Form="attribute" Name="EstimateFileID" FieldType="" Description="Estimate File Identifier"/>
+                              Description="Unique File Identifier"/>
-                <DBFFieldSpec FieldName="INCL_ADMIN" Form="attribute" Name="IncludesAdminInfo" FieldType="Boolean" Description="Includes Admin Info Flag"/>
+                <DBFFieldSpec FieldName="ESTFILE_ID" Form="attribute" Name="EstimateFileID" FieldType=""
-                <DBFFieldSpec FieldName="INCL_VEH" Form="attribute" Name="IncludesVehicleInfo" FieldType="Boolean" Description="Includes Vehicle Info Flag"/>
+                              Description="Estimate File Identifier"/>
-                <DBFFieldSpec FieldName="INCL_EST" Form="attribute" Name="IncludesEstimateInfo" FieldType="Boolean" Description="Includes Estimate Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_ADMIN" Form="attribute" Name="IncludesAdminInfo" FieldType="Boolean"
-                <DBFFieldSpec FieldName="INCL_PROFL" Form="attribute" Name="IncludesProfileInfo" FieldType="Boolean" Description="Includes Profile Info Flag"/>
+                              Description="Includes Admin Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_TOTAL" Form="attribute" Name="IncludesTotalsInfo" FieldType="Boolean" Description="Includes Totals Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_VEH" Form="attribute" Name="IncludesVehicleInfo" FieldType="Boolean"
-                <DBFFieldSpec FieldName="INCL_VENDR" Form="attribute" Name="IncludesVendorInfo" FieldType="Boolean" Description="Includes Vendor Info Flag"/>
+                              Description="Includes Vehicle Info Flag"/>
-                <DBFFieldSpec FieldName="EMS_VER" Form="attribute" Name="EMSVersion" FieldType="" Description="EMS Version Number"/>
+                <DBFFieldSpec FieldName="INCL_EST" Form="attribute" Name="IncludesEstimateInfo" FieldType="Boolean"
-                <DBFFieldSpec FieldName="SUPP_NO" Form="attribute" Name="SupplementNum" FieldType="" Description="Supplement Number"/>
+                              Description="Includes Estimate Info Flag"/>
-                <DBFFieldSpec FieldName="TRANS_TYPE" Form="attribute" Name="TransactionType" FieldType="" Description="Transaction Type"/>
+                <DBFFieldSpec FieldName="INCL_PROFL" Form="attribute" Name="IncludesProfileInfo" FieldType="Boolean"
-                <DBFFieldSpec FieldName="EST_SYSTEM" Form="attribute" Name="EstimatingSystem" FieldType="" Description="Estimating System Software"/>
+                              Description="Includes Profile Info Flag"/>
-                <DBFFieldSpec FieldName="SW_VERSION" Form="attribute" Name="SoftwareVersion" FieldType="" Description="Software Version Identifier"/>
+                <DBFFieldSpec FieldName="INCL_TOTAL" Form="attribute" Name="IncludesTotalsInfo" FieldType="Boolean"
+                              Description="Includes Totals Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_VENDR" Form="attribute" Name="IncludesVendorInfo" FieldType="Boolean"
+                              Description="Includes Vendor Info Flag"/>
+                <DBFFieldSpec FieldName="EMS_VER" Form="attribute" Name="EMSVersion" FieldType=""
+                              Description="EMS Version Number"/>
+                <DBFFieldSpec FieldName="SUPP_NO" Form="attribute" Name="SupplementNum" FieldType=""
+                              Description="Supplement Number"/>
+                <DBFFieldSpec FieldName="TRANS_TYPE" Form="attribute" Name="TransactionType" FieldType=""
+                              Description="Transaction Type"/>
+                <DBFFieldSpec FieldName="EST_SYSTEM" Form="attribute" Name="EstimatingSystem" FieldType=""
+                              Description="Estimating System Software"/>
+                <DBFFieldSpec FieldName="SW_VERSION" Form="attribute" Name="SoftwareVersion" FieldType=""
+                              Description="Software Version Identifier"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.LIN">
             <DBFFileTranslation ID="ID2" ElementSetName="PartsList" ElementName="Part" Description="Parts List Table">
-                <DBFFieldSpec FieldName="OEM_PARTNO" Form="attribute" Name="TDPartNum" FieldType="" Description="Part Number"/>
+                <DBFFieldSpec FieldName="OEM_PARTNO" Form="attribute" Name="TDPartNum" FieldType=""
-                <DBFFieldSpec FieldName="ALT_PARTNO" Form="attribute" Name="AltPartNum" FieldType="" Description="Alternate Part Number"/>
+                              Description="Part Number"/>
-                <DBFFieldSpec FieldName="ACT_PRICE" Form="attribute" Name="ActPrice" FieldType="" Description="Actual Part Price"/>
+                <DBFFieldSpec FieldName="ALT_PARTNO" Form="attribute" Name="AltPartNum" FieldType=""
-                <DBFFieldSpec FieldName="LINE_DESC" Form="attribute" Name="TDPartDesc" FieldType="" Description="Part Description"/>
+                              Description="Alternate Part Number"/>
-                <DBFFieldSpec FieldName="DB_PRICE" Form="attribute" Name="TDEstimate" FieldType="" Description="DB_Price"/>
+                <DBFFieldSpec FieldName="ACT_PRICE" Form="attribute" Name="ActPrice" FieldType=""
-                <DBFFieldSpec FieldName="PART_QTY" Form="attribute" Name="TDPartQty" FieldType="" Description="Part Quantity"/>
+                              Description="Actual Part Price"/>
-                <DBFFieldSpec FieldName="PART_TYPE" Form="attribute" Name="PartType" FieldType="" Description="Part Type"/>
+                <DBFFieldSpec FieldName="LINE_DESC" Form="attribute" Name="TDPartDesc" FieldType=""
-                <DBFFieldSpec FieldName="MOD_LBR_TY" Form="attribute" Name="LaborType" FieldType="" Description="Labor Type"/>
+                              Description="Part Description"/>
-                <DBFFieldSpec FieldName="MOD_LB_HRS" Form="attribute" Name="LaborHours" FieldType="" Description="Labor Hours"/>
+                <DBFFieldSpec FieldName="DB_PRICE" Form="attribute" Name="TDEstimate" FieldType=""
+                              Description="DB_Price"/>
+                <DBFFieldSpec FieldName="PART_QTY" Form="attribute" Name="TDPartQty" FieldType=""
+                              Description="Part Quantity"/>
+                <DBFFieldSpec FieldName="PART_TYPE" Form="attribute" Name="PartType" FieldType=""
+                              Description="Part Type"/>
+                <DBFFieldSpec FieldName="MOD_LBR_TY" Form="attribute" Name="LaborType" FieldType=""
+                              Description="Labor Type"/>
+                <DBFFieldSpec FieldName="MOD_LB_HRS" Form="attribute" Name="LaborHours" FieldType=""
+                              Description="Labor Hours"/>
                 <DBFFieldSpec FieldName="LBR_OP" Form="attribute" Name="LaborOp" FieldType="" Description="Labor Op"/>
-                <DBFFieldSpec FieldName="LINE_NO" Form="attribute" Name="LineNumber" FieldType="" Description="Line number"/>
+                <DBFFieldSpec FieldName="LINE_NO" Form="attribute" Name="LineNumber" FieldType=""
+                              Description="Line number"/>
                 <DBFFieldSpec FieldName="UNQ_SEQ" Form="attribute" Name="SequenceNumber" FieldType="" Description=""/>
-                <DBFFieldSpec FieldName="LINE_IND" Form="attribute" Name="SupplementLevel" FieldType="" Description="Supplement Level"/>
+                <DBFFieldSpec FieldName="LINE_IND" Form="attribute" Name="SupplementLevel" FieldType=""
-                <DBFFieldSpec FieldName="TRAN_CODE" Form="attribute" Name="TransactionCode" FieldType="" Description="Transaction Code"/>
+                              Description="Supplement Level"/>
-                <DBFFieldSpec FieldName="PRICE_INC" Form="attribute" Name="PriceIncluded" FieldType="" Description="Price Included"/>
+                <DBFFieldSpec FieldName="TRAN_CODE" Form="attribute" Name="TransactionCode" FieldType=""
-                <DBFFieldSpec FieldName="PRT_DSMK_P" Form="attribute" Name="MarkUp" FieldType="" Description="Price Mark up for non OEM parts"/>
+                              Description="Transaction Code"/>
+                <DBFFieldSpec FieldName="PRICE_INC" Form="attribute" Name="PriceIncluded" FieldType=""
+                              Description="Price Included"/>
+                <DBFFieldSpec FieldName="PRT_DSMK_P" Form="attribute" Name="MarkUp" FieldType=""
+                              Description="Price Mark up for non OEM parts"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.VEH">
             <DBFFileTranslation ID="ID3" ElementName="Vehicle" Description="Vehicle Table">
                 <DBFFieldSpec FieldName="V_VIN" Form="attribute" Name="TransVIN" FieldType="" Description=""/>
-                <DBFFieldSpec FieldName="V_MODEL_YR" Form="attribute" Name="TransYear" FieldType="" Description="V_MODEL_YR"/>
+                <DBFFieldSpec FieldName="V_MODEL_YR" Form="attribute" Name="TransYear" FieldType=""
-                <DBFFieldSpec FieldName="V_MAKEDESC" Form="attribute" Name="ManufName" FieldType="" Description="V_MAKEDESC"/>
+                              Description="V_MODEL_YR"/>
-                <DBFFieldSpec FieldName="V_MAKECODE" Form="attribute" Name="ManufCode" FieldType="" Description="V_MAKECODE"/>
+                <DBFFieldSpec FieldName="V_MAKEDESC" Form="attribute" Name="ManufName" FieldType=""
-                <DBFFieldSpec FieldName="V_MODEL" Form="attribute" Name="TransModel" FieldType="" Description="V_MODEL"/>
+                              Description="V_MAKEDESC"/>
-                <DBFFieldSpec FieldName="V_MILEAGE" Form="attribute" Name="TransMileage" FieldType="" Description="V_MILEAGE"/>
+                <DBFFieldSpec FieldName="V_MAKECODE" Form="attribute" Name="ManufCode" FieldType=""
+                              Description="V_MAKECODE"/>
+                <DBFFieldSpec FieldName="V_MODEL" Form="attribute" Name="TransModel" FieldType=""
+                              Description="V_MODEL"/>
+                <DBFFieldSpec FieldName="V_MILEAGE" Form="attribute" Name="TransMileage" FieldType=""
+                              Description="V_MILEAGE"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.AD1">
             <DBFFileTranslation ID="ID4" ElementName="Admin" Description="Administrative information">
-                <DBFFieldSpec FieldName="OWNR_LN" Form="attribute" Name="OwnerL" FieldType="" Description="Owner Lastname"/>
+                <DBFFieldSpec FieldName="OWNR_LN" Form="attribute" Name="OwnerL" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_FN" Form="attribute" Name="OwnerF" FieldType="" Description="Owner Firstname"/>
+                              Description="Owner Lastname"/>
-                <DBFFieldSpec FieldName="OWNR_CO_NM" Form="attribute" Name="OwnerCompanyName" FieldType="" Description="Owner Company Name"/>
+                <DBFFieldSpec FieldName="OWNR_FN" Form="attribute" Name="OwnerF" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_TITLE" Form="attribute" Name="OwnerTitle" FieldType="" Description="Owner Title"/>
+                              Description="Owner Firstname"/>
-                <DBFFieldSpec FieldName="OWNR_ADDR1" Form="attribute" Name="OwnerAddr1" FieldType="" Description="Owner Address Line 1"/>
+                <DBFFieldSpec FieldName="OWNR_CO_NM" Form="attribute" Name="OwnerCompanyName" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_ADDR2" Form="attribute" Name="OwnerAddr2" FieldType="" Description="Owner Address Line 2"/>
+                              Description="Owner Company Name"/>
-                <DBFFieldSpec FieldName="OWNR_CITY" Form="attribute" Name="OwnerCity" FieldType="" Description="Owner City"/>
+                <DBFFieldSpec FieldName="OWNR_TITLE" Form="attribute" Name="OwnerTitle" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_ST" Form="attribute" Name="OwnerState" FieldType="" Description="Owner State"/>
+                              Description="Owner Title"/>
-                <DBFFieldSpec FieldName="OWNR_ZIP" Form="attribute" Name="OwnerZip" FieldType="" Description="Owner Zip"/>
+                <DBFFieldSpec FieldName="OWNR_ADDR1" Form="attribute" Name="OwnerAddr1" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_CTRY" Form="attribute" Name="OwnerCountry" FieldType="" Description="Owner Country"/>
+                              Description="Owner Address Line 1"/>
-                <DBFFieldSpec FieldName="OWNR_PH1" Form="attribute" Name="OwnerPhone1" FieldType="" Description="Owner Primary Phone"/>
+                <DBFFieldSpec FieldName="OWNR_ADDR2" Form="attribute" Name="OwnerAddr2" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_PH1X" Form="attribute" Name="OwnerPhone1Ext" FieldType="" Description="Owner Primary Phone Extension"/>
+                              Description="Owner Address Line 2"/>
-                <DBFFieldSpec FieldName="OWNR_PH2" Form="attribute" Name="OwnerPhone2" FieldType="" Description="Owner Secondary Phone"/>
+                <DBFFieldSpec FieldName="OWNR_CITY" Form="attribute" Name="OwnerCity" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_PH2X" Form="attribute" Name="OwnerPhone2Ext" FieldType="" Description="Owner Secondary Phone Extension"/>
+                              Description="Owner City"/>
-                <DBFFieldSpec FieldName="OWNR_FAX" Form="attribute" Name="OwnerFax" FieldType="" Description="Owner Fax"/>
+                <DBFFieldSpec FieldName="OWNR_ST" Form="attribute" Name="OwnerState" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_FAXX" Form="attribute" Name="OwnerFaxExt" FieldType="" Description="Owner Fax Extension"/>
+                              Description="Owner State"/>
-                <DBFFieldSpec FieldName="OWNR_EA" Form="attribute" Name="OwnerEmail" FieldType="" Description="Owner Email Address"/>
+                <DBFFieldSpec FieldName="OWNR_ZIP" Form="attribute" Name="OwnerZip" FieldType=""
-                <DBFFieldSpec FieldName="INS_CO_NM" Form="attribute" Name="InsuranceCompanyName" FieldType="" Description="Insurance Company Name"/>
+                              Description="Owner Zip"/>
-                <DBFFieldSpec FieldName="INS_CO_ID" Form="attribute" Name="InsuranceCompanyID" FieldType="" Description="Insurance Company Identifier"/>
+                <DBFFieldSpec FieldName="OWNR_CTRY" Form="attribute" Name="OwnerCountry" FieldType=""
-                <DBFFieldSpec FieldName="INS_ADDR1" Form="attribute" Name="InsuranceAddr1" FieldType="" Description="Insurance Address Line 1"/>
+                              Description="Owner Country"/>
-                <DBFFieldSpec FieldName="INS_ADDR2" Form="attribute" Name="InsuranceAddr2" FieldType="" Description="Insurance Address Line 2"/>
+                <DBFFieldSpec FieldName="OWNR_PH1" Form="attribute" Name="OwnerPhone1" FieldType=""
-                <DBFFieldSpec FieldName="INS_CITY" Form="attribute" Name="InsuranceCity" FieldType="" Description="Insurance City"/>
+                              Description="Owner Primary Phone"/>
-                <DBFFieldSpec FieldName="INS_ST" Form="attribute" Name="InsuranceState" FieldType="" Description="Insurance State"/>
+                <DBFFieldSpec FieldName="OWNR_PH1X" Form="attribute" Name="OwnerPhone1Ext" FieldType=""
-                <DBFFieldSpec FieldName="INS_ZIP" Form="attribute" Name="InsuranceZip" FieldType="" Description="Insurance Zip"/>
+                              Description="Owner Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="INS_CTRY" Form="attribute" Name="InsuranceCountry" FieldType="" Description="Insurance Country"/>
+                <DBFFieldSpec FieldName="OWNR_PH2" Form="attribute" Name="OwnerPhone2" FieldType=""
-                <DBFFieldSpec FieldName="INS_PH1" Form="attribute" Name="InsurancePhone1" FieldType="" Description="Insurance Primary Phone"/>
+                              Description="Owner Secondary Phone"/>
-                <DBFFieldSpec FieldName="INS_PH1X" Form="attribute" Name="InsurancePhone1Ext" FieldType="" Description="Insurance Primary Phone Extension"/>
+                <DBFFieldSpec FieldName="OWNR_PH2X" Form="attribute" Name="OwnerPhone2Ext" FieldType=""
-                <DBFFieldSpec FieldName="INS_PH2" Form="attribute" Name="InsurancePhone2" FieldType="" Description="Insurance Secondary Phone"/>
+                              Description="Owner Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="INS_PH2X" Form="attribute" Name="InsurancePhone2Ext" FieldType="" Description="Insurance Secondary Phone Extension"/>
+                <DBFFieldSpec FieldName="OWNR_FAX" Form="attribute" Name="OwnerFax" FieldType=""
-                <DBFFieldSpec FieldName="INS_FAX" Form="attribute" Name="InsuranceFax" FieldType="" Description="Insurance Fax"/>
+                              Description="Owner Fax"/>
-                <DBFFieldSpec FieldName="INS_FAXX" Form="attribute" Name="InsuranceFaxExt" FieldType="" Description="Insurance Fax Extension"/>
+                <DBFFieldSpec FieldName="OWNR_FAXX" Form="attribute" Name="OwnerFaxExt" FieldType=""
-                <DBFFieldSpec FieldName="INS_EA" Form="attribute" Name="InsuranceEmail" FieldType="" Description="Insurance Email Address"/>
+                              Description="Owner Fax Extension"/>
-                <DBFFieldSpec FieldName="INSD_LN" Form="attribute" Name="InsuranceLName" FieldType="" Description="Insurance Last Name"/>
+                <DBFFieldSpec FieldName="OWNR_EA" Form="attribute" Name="OwnerEmail" FieldType=""
-                <DBFFieldSpec FieldName="CLM_NO" Form="attribute" Name="ClaimNumber" FieldType="" Description="Claim Number"/>
+                              Description="Owner Email Address"/>
+                <DBFFieldSpec FieldName="INS_CO_NM" Form="attribute" Name="InsuranceCompanyName" FieldType=""
+                              Description="Insurance Company Name"/>
+                <DBFFieldSpec FieldName="INS_CO_ID" Form="attribute" Name="InsuranceCompanyID" FieldType=""
+                              Description="Insurance Company Identifier"/>
+                <DBFFieldSpec FieldName="INS_ADDR1" Form="attribute" Name="InsuranceAddr1" FieldType=""
+                              Description="Insurance Address Line 1"/>
+                <DBFFieldSpec FieldName="INS_ADDR2" Form="attribute" Name="InsuranceAddr2" FieldType=""
+                              Description="Insurance Address Line 2"/>
+                <DBFFieldSpec FieldName="INS_CITY" Form="attribute" Name="InsuranceCity" FieldType=""
+                              Description="Insurance City"/>
+                <DBFFieldSpec FieldName="INS_ST" Form="attribute" Name="InsuranceState" FieldType=""
+                              Description="Insurance State"/>
+                <DBFFieldSpec FieldName="INS_ZIP" Form="attribute" Name="InsuranceZip" FieldType=""
+                              Description="Insurance Zip"/>
+                <DBFFieldSpec FieldName="INS_CTRY" Form="attribute" Name="InsuranceCountry" FieldType=""
+                              Description="Insurance Country"/>
+                <DBFFieldSpec FieldName="INS_PH1" Form="attribute" Name="InsurancePhone1" FieldType=""
+                              Description="Insurance Primary Phone"/>
+                <DBFFieldSpec FieldName="INS_PH1X" Form="attribute" Name="InsurancePhone1Ext" FieldType=""
+                              Description="Insurance Primary Phone Extension"/>
+                <DBFFieldSpec FieldName="INS_PH2" Form="attribute" Name="InsurancePhone2" FieldType=""
+                              Description="Insurance Secondary Phone"/>
+                <DBFFieldSpec FieldName="INS_PH2X" Form="attribute" Name="InsurancePhone2Ext" FieldType=""
+                              Description="Insurance Secondary Phone Extension"/>
+                <DBFFieldSpec FieldName="INS_FAX" Form="attribute" Name="InsuranceFax" FieldType=""
+                              Description="Insurance Fax"/>
+                <DBFFieldSpec FieldName="INS_FAXX" Form="attribute" Name="InsuranceFaxExt" FieldType=""
+                              Description="Insurance Fax Extension"/>
+                <DBFFieldSpec FieldName="INS_EA" Form="attribute" Name="InsuranceEmail" FieldType=""
+                              Description="Insurance Email Address"/>
+                <DBFFieldSpec FieldName="INSD_LN" Form="attribute" Name="InsuranceLName" FieldType=""
+                              Description="Insurance Last Name"/>
+                <DBFFieldSpec FieldName="CLM_NO" Form="attribute" Name="ClaimNumber" FieldType=""
+                              Description="Claim Number"/>
 
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.AD2">
             <DBFFileTranslation ID="ID5" ElementName="Admin2" Description="Administrative information2">
-                <DBFFieldSpec FieldName="EST_CT_LN" Form="attribute" Name="EstimatorL" FieldType="" Description="Estimator Lastname"/>
+                <DBFFieldSpec FieldName="EST_CT_LN" Form="attribute" Name="EstimatorL" FieldType=""
-                <DBFFieldSpec FieldName="EST_CT_FN" Form="attribute" Name="EstimatorF" FieldType="" Description="Estimator Firstname"/>
+                              Description="Estimator Lastname"/>
-                <DBFFieldSpec FieldName="EST_CO_NM" Form="attribute" Name="EstimatorCompanyName" FieldType="" Description="Estimator Company Name"/>
+                <DBFFieldSpec FieldName="EST_CT_FN" Form="attribute" Name="EstimatorF" FieldType=""
-                <DBFFieldSpec FieldName="EST_CO_ID" Form="attribute" Name="EstimatorCompanyID" FieldType="" Description="Estimator Company Identifier"/>
+                              Description="Estimator Firstname"/>
-                <DBFFieldSpec FieldName="EST_ADDR1" Form="attribute" Name="EstimatorAddr1" FieldType="" Description="Estimator Address1"/>
+                <DBFFieldSpec FieldName="EST_CO_NM" Form="attribute" Name="EstimatorCompanyName" FieldType=""
-                <DBFFieldSpec FieldName="EST_ADDR2" Form="attribute" Name="EstimatorAddr2" FieldType="" Description="Estimator Address2"/>
+                              Description="Estimator Company Name"/>
-                <DBFFieldSpec FieldName="EST_CITY" Form="attribute" Name="EstimatorCity" FieldType="" Description="Estimator City"/>
+                <DBFFieldSpec FieldName="EST_CO_ID" Form="attribute" Name="EstimatorCompanyID" FieldType=""
-                <DBFFieldSpec FieldName="EST_ST" Form="attribute" Name="EstimatorState" FieldType="" Description="Estimator State"/>
+                              Description="Estimator Company Identifier"/>
-                <DBFFieldSpec FieldName="EST_ZIP" Form="attribute" Name="EstimatorZip" FieldType="" Description="Estimator Zip"/>
+                <DBFFieldSpec FieldName="EST_ADDR1" Form="attribute" Name="EstimatorAddr1" FieldType=""
-                <DBFFieldSpec FieldName="EST_CTRY" Form="attribute" Name="EstimatorCountry" FieldType="" Description="Estimator Country"/>
+                              Description="Estimator Address1"/>
-                <DBFFieldSpec FieldName="EST_PH1" Form="attribute" Name="EstimatorPhone1" FieldType="" Description="Estimator Primary Phone"/>
+                <DBFFieldSpec FieldName="EST_ADDR2" Form="attribute" Name="EstimatorAddr2" FieldType=""
-                <DBFFieldSpec FieldName="EST_PH1X" Form="attribute" Name="EstimatorPhone1Ext" FieldType="" Description="Estimator Primary Phone Extension"/>
+                              Description="Estimator Address2"/>
-                <DBFFieldSpec FieldName="EST_PH2" Form="attribute" Name="EstimatorPhone2" FieldType="" Description="Estimator Secondary Phone"/>
+                <DBFFieldSpec FieldName="EST_CITY" Form="attribute" Name="EstimatorCity" FieldType=""
-                <DBFFieldSpec FieldName="EST_PH2X" Form="attribute" Name="EstimatorPhone2Ext" FieldType="" Description="Estimator Secondary Phone Extension"/>
+                              Description="Estimator City"/>
-                <DBFFieldSpec FieldName="EST_FAX" Form="attribute" Name="EstimatorFax" FieldType="" Description="Estimator Fax"/>
+                <DBFFieldSpec FieldName="EST_ST" Form="attribute" Name="EstimatorState" FieldType=""
-                <DBFFieldSpec FieldName="EST_FAXX" Form="attribute" Name="EstimatorFaxExt" FieldType="" Description="Estimator Fax Extension"/>
+                              Description="Estimator State"/>
-                <DBFFieldSpec FieldName="EST_EA" Form="attribute" Name="EstimatorEmail" FieldType="" Description="Estimator Email Address"/>
+                <DBFFieldSpec FieldName="EST_ZIP" Form="attribute" Name="EstimatorZip" FieldType=""
-                <DBFFieldSpec FieldName="EST_LIC_NO" Form="attribute" Name="EstimatorLicenseNumber" FieldType="" Description="Estimator License Number"/>
+                              Description="Estimator Zip"/>
-                <DBFFieldSpec FieldName="EST_FILENO" Form="attribute" Name="EstimatorFileNumber" FieldType="" Description="Estimator File Number"/>
+                <DBFFieldSpec FieldName="EST_CTRY" Form="attribute" Name="EstimatorCountry" FieldType=""
-                <DBFFieldSpec FieldName="RO_IN_DATE" Form="attribute" Name="VehicleInDate" FieldType="" Description="Date arrived in shop"/>
+                              Description="Estimator Country"/>
-                <DBFFieldSpec FieldName="RO_IN_TIME" Form="attribute" Name="VehicleInTime" FieldType="" Description="Time arrived in shop"/>
+                <DBFFieldSpec FieldName="EST_PH1" Form="attribute" Name="EstimatorPhone1" FieldType=""
-                <DBFFieldSpec FieldName="TAR_DATE" Form="attribute" Name="TargetVehicleOutDate" FieldType="" Description="Target date to be completed"/>
+                              Description="Estimator Primary Phone"/>
-                <DBFFieldSpec FieldName="TAR_TIME" Form="attribute" Name="TargetVehicleOutTime" FieldType="" Description="Target time to be completed"/>
+                <DBFFieldSpec FieldName="EST_PH1X" Form="attribute" Name="EstimatorPhone1Ext" FieldType=""
-                <DBFFieldSpec FieldName="RO_CMPDATE" Form="attribute" Name="VehicleOutDate" FieldType="" Description="Date completed"/>
+                              Description="Estimator Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="RO_CMPTIME" Form="attribute" Name="VehicleOutTime" FieldType="" Description="Time completed"/>
+                <DBFFieldSpec FieldName="EST_PH2" Form="attribute" Name="EstimatorPhone2" FieldType=""
-                <DBFFieldSpec FieldName="RF_CITY" Form="attribute" Name="BodyShopCity" FieldType="" Description="Body Shop City"/>
+                              Description="Estimator Secondary Phone"/>
-                <DBFFieldSpec FieldName="RF_CO_NM" Form="attribute" Name="BodyShopName" FieldType="" Description="Body Shop Name"/>
+                <DBFFieldSpec FieldName="EST_PH2X" Form="attribute" Name="EstimatorPhone2Ext" FieldType=""
+                              Description="Estimator Secondary Phone Extension"/>
+                <DBFFieldSpec FieldName="EST_FAX" Form="attribute" Name="EstimatorFax" FieldType=""
+                              Description="Estimator Fax"/>
+                <DBFFieldSpec FieldName="EST_FAXX" Form="attribute" Name="EstimatorFaxExt" FieldType=""
+                              Description="Estimator Fax Extension"/>
+                <DBFFieldSpec FieldName="EST_EA" Form="attribute" Name="EstimatorEmail" FieldType=""
+                              Description="Estimator Email Address"/>
+                <DBFFieldSpec FieldName="EST_LIC_NO" Form="attribute" Name="EstimatorLicenseNumber" FieldType=""
+                              Description="Estimator License Number"/>
+                <DBFFieldSpec FieldName="EST_FILENO" Form="attribute" Name="EstimatorFileNumber" FieldType=""
+                              Description="Estimator File Number"/>
+                <DBFFieldSpec FieldName="RO_IN_DATE" Form="attribute" Name="VehicleInDate" FieldType=""
+                              Description="Date arrived in shop"/>
+                <DBFFieldSpec FieldName="RO_IN_TIME" Form="attribute" Name="VehicleInTime" FieldType=""
+                              Description="Time arrived in shop"/>
+                <DBFFieldSpec FieldName="TAR_DATE" Form="attribute" Name="TargetVehicleOutDate" FieldType=""
+                              Description="Target date to be completed"/>
+                <DBFFieldSpec FieldName="TAR_TIME" Form="attribute" Name="TargetVehicleOutTime" FieldType=""
+                              Description="Target time to be completed"/>
+                <DBFFieldSpec FieldName="RO_CMPDATE" Form="attribute" Name="VehicleOutDate" FieldType=""
+                              Description="Date completed"/>
+                <DBFFieldSpec FieldName="RO_CMPTIME" Form="attribute" Name="VehicleOutTime" FieldType=""
+                              Description="Time completed"/>
+                <DBFFieldSpec FieldName="RF_CITY" Form="attribute" Name="BodyShopCity" FieldType=""
+                              Description="Body Shop City"/>
+                <DBFFieldSpec FieldName="RF_CO_NM" Form="attribute" Name="BodyShopName" FieldType=""
+                              Description="Body Shop Name"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.TTL">
             <DBFFileTranslation ID="ID6" ElementName="Total" Description="Total Table">
-            <DBFFieldSpec FieldName="G_TTL_AMT" Form="attribute" Name="GrandTotalAmount" FieldType="" Description=""/>
+                <DBFFieldSpec FieldName="G_TTL_AMT" Form="attribute" Name="GrandTotalAmount" FieldType=""
+                              Description=""/>
             </DBFFileTranslation>
         </FileTranslation>
     </FileTranslations>

_reference/OEC/CCC.xsl

@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
     <xsl:template match="/">
@@ -91,10 +90,13 @@
                             <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateID">
-                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of select="//Envelope/@SoftwareVersion"/>-<xsl:value-of select="//Envelope/@UniqueFileID"/>
+                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of
+                                select="//Envelope/@SoftwareVersion"/>-
+                            <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateIDv2">
-                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of select="//Envelope/@UniqueFileID"/>
+                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-
+                            <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateFormatVersion">
                             <xsl:value-of select="//Envelope/@EMSVersion"/>
@@ -215,7 +217,8 @@
                                     <xsl:choose>
                                         <xsl:when test="string-length(substring-before(//Admin/@InsuranceZip, '-'))=5">
                                             <xsl:choose>
-                                                <xsl:when test="string-length(substring-after(//Admin/@InsuranceZip, '-'))=4">
+                                                <xsl:when
+                                                        test="string-length(substring-after(//Admin/@InsuranceZip, '-'))=4">
                                                     <xsl:value-of select="//Admin/@InsuranceZip"/>
                                                 </xsl:when>
                                                 <xsl:otherwise>
@@ -226,7 +229,8 @@
                                     </xsl:choose>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin/@InsuranceZip)=9">
-                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>-<xsl:value-of select="substring(//Admin/@InsuranceZip, 6, 4)"/>
+                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>-
+                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 6, 4)"/>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin/@InsuranceZip)&gt;4">
                                     <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>
@@ -239,7 +243,8 @@
                         <xsl:attribute name="Phone">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsurancePhone1Ext[. != '']">
-                                    <xsl:value-of select="//Admin/@InsurancePhone1"/>&#32;x<xsl:value-of select="//Admin/@InsurancePhone1Ext"/>
+                                    <xsl:value-of select="//Admin/@InsurancePhone1"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsurancePhone1Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsurancePhone1"/>
@@ -249,7 +254,8 @@
                         <xsl:attribute name="Phone2">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsurancePhone2Ext[. != '']">
-                                    <xsl:value-of select="//Admin/@InsurancePhone2"/>&#32;x<xsl:value-of select="//Admin/@InsurancePhone2Ext"/>
+                                    <xsl:value-of select="//Admin/@InsurancePhone2"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsurancePhone2Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsurancePhone2"/>
@@ -259,7 +265,8 @@
                         <xsl:attribute name="Fax">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsuranceFaxExt[. != '']">
-                                    <xsl:value-of select="//Admin/@InsuranceFax"/>&#32;x<xsl:value-of select="//Admin/@InsuranceFaxExt"/>
+                                    <xsl:value-of select="//Admin/@InsuranceFax"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsuranceFaxExt"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsuranceFax"/>
@@ -308,7 +315,8 @@
                                     <xsl:choose>
                                         <xsl:when test="string-length(substring-before(//Admin2/@EstimatorZip, '-'))=5">
                                             <xsl:choose>
-                                                <xsl:when test="string-length(substring-after(//Admin2/@EstimatorZip, '-'))=4">
+                                                <xsl:when
+                                                        test="string-length(substring-after(//Admin2/@EstimatorZip, '-'))=4">
                                                     <xsl:value-of select="//Admin2/@EstimatorZip"/>
                                                 </xsl:when>
                                                 <xsl:otherwise>
@@ -319,7 +327,8 @@
                                     </xsl:choose>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin2/@EstimatorZip)=9">
-                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>-<xsl:value-of select="substring(//Admin2/@EstimatorZip, 6, 4)"/>
+                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>-
+                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 6, 4)"/>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin2/@EstimatorZip)&gt;4">
                                     <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>
@@ -332,7 +341,8 @@
                         <xsl:attribute name="Phone">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorPhone1Ext[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone1"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorPhone1Ext"/>
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone1"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone1Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorPhone1"/>
@@ -342,7 +352,8 @@
                         <xsl:attribute name="Phone2">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorPhone2Ext[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone2"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorPhone2Ext"/>
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone2"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone2Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorPhone2"/>
@@ -352,7 +363,8 @@
                         <xsl:attribute name="Fax">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorFaxExt[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorFax"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorFaxExt"/>
+                                    <xsl:value-of select="//Admin2/@EstimatorFax"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorFaxExt"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorFax"/>
@@ -368,7 +380,8 @@
                             <xsl:if test="string-length(//Admin2/@VehicleInDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@VehicleInDate, ' ')"/>
                                 <xsl:if test="string-length(//Admin2/@VehicleInTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleInTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@VehicleInTime, 3, 2)"/>
+                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleInTime, 1, 2)"/>:
+                                    <xsl:value-of select="substring(//Admin2/@VehicleInTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -376,7 +389,8 @@
                             <xsl:if test="string-length(//Admin2/@TargetVehicleOutDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@TargetVehicleOutDate,' ')"/>
                                 <xsl:if test="string-length(//Admin2/@TargetVehicleOutTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 3, 2)"/>
+                                    &#32;<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 1, 2)"/>:
+                                    <xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -384,7 +398,8 @@
                             <xsl:if test="string-length(//Admin2/@VehicleOutDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@VehicleOutDate, ' ')"/>
                                 <xsl:if test="string-length(//Admin2/@VehicleOutTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 3, 2)"/>
+                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 1, 2)"/>:
+                                    <xsl:value-of select="substring(//Admin2/@VehicleOutTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -565,10 +580,14 @@
                             <xsl:when test="@TransactionCode='3'">False</xsl:when>
                             <xsl:when test="@TransactionCode='1' or @TransactionCode ='2'">
                                 <xsl:choose>
-                                    <xsl:when test="@PartType='PAN' or @PartType='PAG' or @PartType='PAM' or @PartType='PAP' or @PartType='PAL' or @PartType='PAA' or @PartType='PAO' or @PartType='PAR' or @PartType=''" >
+                                    <xsl:when
+                                            test="@PartType='PAN' or @PartType='PAG' or @PartType='PAM' or @PartType='PAP' or @PartType='PAL' or @PartType='PAA' or @PartType='PAO' or @PartType='PAR' or @PartType=''">
                                         <!-- we now handle blank part types-->
                                         <xsl:choose>
-                                            <xsl:when test="@LaborType='LAD' or @LaborType='LAE' or @LaborType='LAU' or @LaborType='LAT'">False</xsl:when>
+                                            <xsl:when
+                                                    test="@LaborType='LAD' or @LaborType='LAE' or @LaborType='LAU' or @LaborType='LAT'">
+                                                False
+                                            </xsl:when>
                                             <xsl:otherwise>
                                                 <xsl:choose>
                                                     <xsl:when test="@LaborOp=''">False</xsl:when>

_reference/OEC/CCCMapping.xml

@@ -1,125 +1,216 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TranslationDescriptor>
-    <FileTranslations FormatName="CCC" ElementName="Estimate" Description="Translation Descriptor for a CCC Estimate, Version 2.0">
+    <FileTranslations FormatName="CCC" ElementName="Estimate"
+                      Description="Translation Descriptor for a CCC Estimate, Version 2.0">
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.env">
             <DBFFileTranslation ID="ID1" ElementName="Envelope" Description="Envelope Table">
                 <DBFFieldSpec FieldName="RO_ID" Form="attribute" Name="RONum" FieldType="" Description="RO Number"/>
-                <DBFFieldSpec FieldName="UNQFILE_ID" Form="attribute" Name="UniqueFileID" FieldType="" Description="Unique File Identifier"/>
+                <DBFFieldSpec FieldName="UNQFILE_ID" Form="attribute" Name="UniqueFileID" FieldType=""
-                <DBFFieldSpec FieldName="ESTFILE_ID" Form="attribute" Name="EstimateFileID" FieldType="" Description="Estimate File Identifier"/>
+                              Description="Unique File Identifier"/>
-                <DBFFieldSpec FieldName="INCL_ADMIN" Form="attribute" Name="IncludesAdminInfo" FieldType="Boolean" Description="Includes Admin Info Flag"/>
+                <DBFFieldSpec FieldName="ESTFILE_ID" Form="attribute" Name="EstimateFileID" FieldType=""
-                <DBFFieldSpec FieldName="INCL_VEH" Form="attribute" Name="IncludesVehicleInfo" FieldType="Boolean" Description="Includes Vehicle Info Flag"/>
+                              Description="Estimate File Identifier"/>
-                <DBFFieldSpec FieldName="INCL_EST" Form="attribute" Name="IncludesEstimateInfo" FieldType="Boolean" Description="Includes Estimate Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_ADMIN" Form="attribute" Name="IncludesAdminInfo" FieldType="Boolean"
-                <DBFFieldSpec FieldName="INCL_PROFL" Form="attribute" Name="IncludesProfileInfo" FieldType="Boolean" Description="Includes Profile Info Flag"/>
+                              Description="Includes Admin Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_TOTAL" Form="attribute" Name="IncludesTotalsInfo" FieldType="Boolean" Description="Includes Totals Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_VEH" Form="attribute" Name="IncludesVehicleInfo" FieldType="Boolean"
-                <DBFFieldSpec FieldName="INCL_VENDR" Form="attribute" Name="IncludesVendorInfo" FieldType="Boolean" Description="Includes Vendor Info Flag"/>
+                              Description="Includes Vehicle Info Flag"/>
-                <DBFFieldSpec FieldName="EMS_VER" Form="attribute" Name="EMSVersion" FieldType="" Description="EMS Version Number"/>
+                <DBFFieldSpec FieldName="INCL_EST" Form="attribute" Name="IncludesEstimateInfo" FieldType="Boolean"
-                <DBFFieldSpec FieldName="SUPP_NO" Form="attribute" Name="SupplementNum" FieldType="" Description="Supplement Number"/>
+                              Description="Includes Estimate Info Flag"/>
-                <DBFFieldSpec FieldName="TRANS_TYPE" Form="attribute" Name="TransactionType" FieldType="" Description="Transaction Type"/>
+                <DBFFieldSpec FieldName="INCL_PROFL" Form="attribute" Name="IncludesProfileInfo" FieldType="Boolean"
-                <DBFFieldSpec FieldName="EST_SYSTEM" Form="attribute" Name="EstimatingSystem" FieldType="" Description="Estimating System Software"/>
+                              Description="Includes Profile Info Flag"/>
-                <DBFFieldSpec FieldName="SW_VERSION" Form="attribute" Name="SoftwareVersion" FieldType="" Description="Software Version Identifier"/>
+                <DBFFieldSpec FieldName="INCL_TOTAL" Form="attribute" Name="IncludesTotalsInfo" FieldType="Boolean"
+                              Description="Includes Totals Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_VENDR" Form="attribute" Name="IncludesVendorInfo" FieldType="Boolean"
+                              Description="Includes Vendor Info Flag"/>
+                <DBFFieldSpec FieldName="EMS_VER" Form="attribute" Name="EMSVersion" FieldType=""
+                              Description="EMS Version Number"/>
+                <DBFFieldSpec FieldName="SUPP_NO" Form="attribute" Name="SupplementNum" FieldType=""
+                              Description="Supplement Number"/>
+                <DBFFieldSpec FieldName="TRANS_TYPE" Form="attribute" Name="TransactionType" FieldType=""
+                              Description="Transaction Type"/>
+                <DBFFieldSpec FieldName="EST_SYSTEM" Form="attribute" Name="EstimatingSystem" FieldType=""
+                              Description="Estimating System Software"/>
+                <DBFFieldSpec FieldName="SW_VERSION" Form="attribute" Name="SoftwareVersion" FieldType=""
+                              Description="Software Version Identifier"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.LIN">
             <DBFFileTranslation ID="ID2" ElementSetName="PartsList" ElementName="Part" Description="Parts List Table">
-                <DBFFieldSpec FieldName="OEM_PARTNO" Form="attribute" Name="TDPartNum" FieldType="" Description="Part Number"/>
+                <DBFFieldSpec FieldName="OEM_PARTNO" Form="attribute" Name="TDPartNum" FieldType=""
-                <DBFFieldSpec FieldName="ALT_PARTNO" Form="attribute" Name="AltPartNum" FieldType="" Description="Alternate Part Number"/>
+                              Description="Part Number"/>
-                <DBFFieldSpec FieldName="ACT_PRICE" Form="attribute" Name="ActPrice" FieldType="" Description="Actual Part Price"/>
+                <DBFFieldSpec FieldName="ALT_PARTNO" Form="attribute" Name="AltPartNum" FieldType=""
-                <DBFFieldSpec FieldName="LINE_DESC" Form="attribute" Name="TDPartDesc" FieldType="" Description="Part Description"/>
+                              Description="Alternate Part Number"/>
-                <DBFFieldSpec FieldName="DB_PRICE" Form="attribute" Name="TDEstimate" FieldType="" Description="DB_Price"/>
+                <DBFFieldSpec FieldName="ACT_PRICE" Form="attribute" Name="ActPrice" FieldType=""
-                <DBFFieldSpec FieldName="PART_QTY" Form="attribute" Name="TDPartQty" FieldType="" Description="PART_QTY"/>
+                              Description="Actual Part Price"/>
+                <DBFFieldSpec FieldName="LINE_DESC" Form="attribute" Name="TDPartDesc" FieldType=""
+                              Description="Part Description"/>
+                <DBFFieldSpec FieldName="DB_PRICE" Form="attribute" Name="TDEstimate" FieldType=""
+                              Description="DB_Price"/>
+                <DBFFieldSpec FieldName="PART_QTY" Form="attribute" Name="TDPartQty" FieldType=""
+                              Description="PART_QTY"/>
                 <DBFFieldSpec FieldName="LINE_NO" Form="attribute" Name="LineNumber" FieldType="" Description=""/>
                 <DBFFieldSpec FieldName="UNQ_SEQ" Form="attribute" Name="SequenceNumber" FieldType="" Description=""/>
-                <DBFFieldSpec FieldName="PART_TYPE" Form="attribute" Name="PartType" FieldType="" Description="Part Type"/>
+                <DBFFieldSpec FieldName="PART_TYPE" Form="attribute" Name="PartType" FieldType=""
-                <DBFFieldSpec FieldName="MOD_LBR_TY" Form="attribute" Name="LaborType" FieldType="" Description="Labor Type"/>
+                              Description="Part Type"/>
-                <DBFFieldSpec FieldName="MOD_LB_HRS" Form="attribute" Name="LaborHours" FieldType="" Description="Labor Hours"/>
+                <DBFFieldSpec FieldName="MOD_LBR_TY" Form="attribute" Name="LaborType" FieldType=""
+                              Description="Labor Type"/>
+                <DBFFieldSpec FieldName="MOD_LB_HRS" Form="attribute" Name="LaborHours" FieldType=""
+                              Description="Labor Hours"/>
                 <DBFFieldSpec FieldName="LBR_OP" Form="attribute" Name="LaborOp" FieldType="" Description="Labor Op"/>
-                <DBFFieldSpec FieldName="LINE_IND" Form="attribute" Name="SupplementLevel" FieldType="" Description="Supplement Level"/>
+                <DBFFieldSpec FieldName="LINE_IND" Form="attribute" Name="SupplementLevel" FieldType=""
-                <DBFFieldSpec FieldName="TRAN_CODE" Form="attribute" Name="TransactionCode" FieldType="" Description="Transaction Code"/>
+                              Description="Supplement Level"/>
-                <DBFFieldSpec FieldName="LINE_REF" Form="attribute" Name="TDLineRef" FieldType="" Description="Line Reference Number"/>
+                <DBFFieldSpec FieldName="TRAN_CODE" Form="attribute" Name="TransactionCode" FieldType=""
+                              Description="Transaction Code"/>
+                <DBFFieldSpec FieldName="LINE_REF" Form="attribute" Name="TDLineRef" FieldType=""
+                              Description="Line Reference Number"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.VEH">
             <DBFFileTranslation ID="ID3" ElementName="Vehicle" Description="Vehicle Table">
                 <DBFFieldSpec FieldName="V_VIN" Form="attribute" Name="TransVIN" FieldType="" Description="V_VIN"/>
-                <DBFFieldSpec FieldName="V_MODEL_YR" Form="attribute" Name="TransYear" FieldType="" Description="V_MODEL_YR"/>
+                <DBFFieldSpec FieldName="V_MODEL_YR" Form="attribute" Name="TransYear" FieldType=""
-                <DBFFieldSpec FieldName="V_MAKEDESC" Form="attribute" Name="ManufName" FieldType="" Description="V_MAKEDESC"/>
+                              Description="V_MODEL_YR"/>
-                <DBFFieldSpec FieldName="V_MAKECODE" Form="attribute" Name="ManufCode" FieldType="" Description="V_MAKECODE"/>
+                <DBFFieldSpec FieldName="V_MAKEDESC" Form="attribute" Name="ManufName" FieldType=""
-                <DBFFieldSpec FieldName="V_MODEL" Form="attribute" Name="TransModel" FieldType="" Description="V_MODEL"/>
+                              Description="V_MAKEDESC"/>
-                <DBFFieldSpec FieldName="V_MILEAGE" Form="attribute" Name="TransMileage" FieldType="" Description="V_MILEAGE"/>
+                <DBFFieldSpec FieldName="V_MAKECODE" Form="attribute" Name="ManufCode" FieldType=""
+                              Description="V_MAKECODE"/>
+                <DBFFieldSpec FieldName="V_MODEL" Form="attribute" Name="TransModel" FieldType=""
+                              Description="V_MODEL"/>
+                <DBFFieldSpec FieldName="V_MILEAGE" Form="attribute" Name="TransMileage" FieldType=""
+                              Description="V_MILEAGE"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.AD1">
             <DBFFileTranslation ID="ID4" ElementName="Admin" Description="Administrative information">
-                <DBFFieldSpec FieldName="OWNR_LN" Form="attribute" Name="OwnerL" FieldType="" Description="Owner Lastname"/>
+                <DBFFieldSpec FieldName="OWNR_LN" Form="attribute" Name="OwnerL" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_FN" Form="attribute" Name="OwnerF" FieldType="" Description="Owner Firstname"/>
+                              Description="Owner Lastname"/>
-                <DBFFieldSpec FieldName="OWNR_CO_NM" Form="attribute" Name="OwnerCompanyName" FieldType="" Description="Owner Company Name"/>
+                <DBFFieldSpec FieldName="OWNR_FN" Form="attribute" Name="OwnerF" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_TITLE" Form="attribute" Name="OwnerTitle" FieldType="" Description="Owner Title"/>
+                              Description="Owner Firstname"/>
-                <DBFFieldSpec FieldName="OWNR_ADDR1" Form="attribute" Name="OwnerAddr1" FieldType="" Description="Owner Address Line 1"/>
+                <DBFFieldSpec FieldName="OWNR_CO_NM" Form="attribute" Name="OwnerCompanyName" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_ADDR2" Form="attribute" Name="OwnerAddr2" FieldType="" Description="Owner Address Line 2"/>
+                              Description="Owner Company Name"/>
-                <DBFFieldSpec FieldName="OWNR_CITY" Form="attribute" Name="OwnerCity" FieldType="" Description="Owner City"/>
+                <DBFFieldSpec FieldName="OWNR_TITLE" Form="attribute" Name="OwnerTitle" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_ST" Form="attribute" Name="OwnerState" FieldType="" Description="Owner State"/>
+                              Description="Owner Title"/>
-                <DBFFieldSpec FieldName="OWNR_ZIP" Form="attribute" Name="OwnerZip" FieldType="" Description="Owner Zip"/>
+                <DBFFieldSpec FieldName="OWNR_ADDR1" Form="attribute" Name="OwnerAddr1" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_CTRY" Form="attribute" Name="OwnerCountry" FieldType="" Description="Owner Country"/>
+                              Description="Owner Address Line 1"/>
-                <DBFFieldSpec FieldName="OWNR_PH1" Form="attribute" Name="OwnerPhone1" FieldType="" Description="Owner Primary Phone"/>
+                <DBFFieldSpec FieldName="OWNR_ADDR2" Form="attribute" Name="OwnerAddr2" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_PH1X" Form="attribute" Name="OwnerPhone1Ext" FieldType="" Description="Owner Primary Phone Extension"/>
+                              Description="Owner Address Line 2"/>
-                <DBFFieldSpec FieldName="OWNR_PH2" Form="attribute" Name="OwnerPhone2" FieldType="" Description="Owner Secondary Phone"/>
+                <DBFFieldSpec FieldName="OWNR_CITY" Form="attribute" Name="OwnerCity" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_PH2X" Form="attribute" Name="OwnerPhone2Ext" FieldType="" Description="Owner Secondary Phone Extension"/>
+                              Description="Owner City"/>
-                <DBFFieldSpec FieldName="OWNR_FAX" Form="attribute" Name="OwnerFax" FieldType="" Description="Owner Fax"/>
+                <DBFFieldSpec FieldName="OWNR_ST" Form="attribute" Name="OwnerState" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_FAXX" Form="attribute" Name="OwnerFaxExt" FieldType="" Description="Owner Fax Extension"/>
+                              Description="Owner State"/>
-                <DBFFieldSpec FieldName="OWNR_EA" Form="attribute" Name="OwnerEmail" FieldType="" Description="Owner Email Address"/>
+                <DBFFieldSpec FieldName="OWNR_ZIP" Form="attribute" Name="OwnerZip" FieldType=""
-                <DBFFieldSpec FieldName="INS_CO_NM" Form="attribute" Name="InsuranceCompanyName" FieldType="" Description="Insurance Company Name"/>
+                              Description="Owner Zip"/>
-                <DBFFieldSpec FieldName="INS_CO_ID" Form="attribute" Name="InsuranceCompanyID" FieldType="" Description="Insurance Company Identifier"/>
+                <DBFFieldSpec FieldName="OWNR_CTRY" Form="attribute" Name="OwnerCountry" FieldType=""
-                <DBFFieldSpec FieldName="INS_ADDR1" Form="attribute" Name="InsuranceAddr1" FieldType="" Description="Insurance Address Line 1"/>
+                              Description="Owner Country"/>
-                <DBFFieldSpec FieldName="INS_ADDR2" Form="attribute" Name="InsuranceAddr2" FieldType="" Description="Insurance Address Line 2"/>
+                <DBFFieldSpec FieldName="OWNR_PH1" Form="attribute" Name="OwnerPhone1" FieldType=""
-                <DBFFieldSpec FieldName="INS_CITY" Form="attribute" Name="InsuranceCity" FieldType="" Description="Insurance City"/>
+                              Description="Owner Primary Phone"/>
-                <DBFFieldSpec FieldName="INS_ST" Form="attribute" Name="InsuranceState" FieldType="" Description="Insurance State"/>
+                <DBFFieldSpec FieldName="OWNR_PH1X" Form="attribute" Name="OwnerPhone1Ext" FieldType=""
-                <DBFFieldSpec FieldName="INS_ZIP" Form="attribute" Name="InsuranceZip" FieldType="" Description="Insurance Zip"/>
+                              Description="Owner Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="INS_CTRY" Form="attribute" Name="InsuranceCountry" FieldType="" Description="Insurance Country"/>
+                <DBFFieldSpec FieldName="OWNR_PH2" Form="attribute" Name="OwnerPhone2" FieldType=""
-                <DBFFieldSpec FieldName="INS_PH1" Form="attribute" Name="InsurancePhone1" FieldType="" Description="Insurance Primary Phone"/>
+                              Description="Owner Secondary Phone"/>
-                <DBFFieldSpec FieldName="INS_PH1X" Form="attribute" Name="InsurancePhone1Ext" FieldType="" Description="Insurance Primary Phone Extension"/>
+                <DBFFieldSpec FieldName="OWNR_PH2X" Form="attribute" Name="OwnerPhone2Ext" FieldType=""
-                <DBFFieldSpec FieldName="INS_PH2" Form="attribute" Name="InsurancePhone2" FieldType="" Description="Insurance Secondary Phone"/>
+                              Description="Owner Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="INS_PH2X" Form="attribute" Name="InsurancePhone2Ext" FieldType="" Description="Insurance Secondary Phone Extension"/>
+                <DBFFieldSpec FieldName="OWNR_FAX" Form="attribute" Name="OwnerFax" FieldType=""
-                <DBFFieldSpec FieldName="INS_FAX" Form="attribute" Name="InsuranceFax" FieldType="" Description="Insurance Fax"/>
+                              Description="Owner Fax"/>
-                <DBFFieldSpec FieldName="INS_FAXX" Form="attribute" Name="InsuranceFaxExt" FieldType="" Description="Insurance Fax Extension"/>
+                <DBFFieldSpec FieldName="OWNR_FAXX" Form="attribute" Name="OwnerFaxExt" FieldType=""
-                <DBFFieldSpec FieldName="INS_EA" Form="attribute" Name="InsuranceEmail" FieldType="" Description="Insurance Email Address"/>
+                              Description="Owner Fax Extension"/>
-                <DBFFieldSpec FieldName="INSD_LN" Form="attribute" Name="InsuranceLName" FieldType="" Description="Insurance Last Name"/>
+                <DBFFieldSpec FieldName="OWNR_EA" Form="attribute" Name="OwnerEmail" FieldType=""
-                <DBFFieldSpec FieldName="CLM_NO" Form="attribute" Name="ClaimNumber" FieldType="" Description="Claim Number"/>
+                              Description="Owner Email Address"/>
+                <DBFFieldSpec FieldName="INS_CO_NM" Form="attribute" Name="InsuranceCompanyName" FieldType=""
+                              Description="Insurance Company Name"/>
+                <DBFFieldSpec FieldName="INS_CO_ID" Form="attribute" Name="InsuranceCompanyID" FieldType=""
+                              Description="Insurance Company Identifier"/>
+                <DBFFieldSpec FieldName="INS_ADDR1" Form="attribute" Name="InsuranceAddr1" FieldType=""
+                              Description="Insurance Address Line 1"/>
+                <DBFFieldSpec FieldName="INS_ADDR2" Form="attribute" Name="InsuranceAddr2" FieldType=""
+                              Description="Insurance Address Line 2"/>
+                <DBFFieldSpec FieldName="INS_CITY" Form="attribute" Name="InsuranceCity" FieldType=""
+                              Description="Insurance City"/>
+                <DBFFieldSpec FieldName="INS_ST" Form="attribute" Name="InsuranceState" FieldType=""
+                              Description="Insurance State"/>
+                <DBFFieldSpec FieldName="INS_ZIP" Form="attribute" Name="InsuranceZip" FieldType=""
+                              Description="Insurance Zip"/>
+                <DBFFieldSpec FieldName="INS_CTRY" Form="attribute" Name="InsuranceCountry" FieldType=""
+                              Description="Insurance Country"/>
+                <DBFFieldSpec FieldName="INS_PH1" Form="attribute" Name="InsurancePhone1" FieldType=""
+                              Description="Insurance Primary Phone"/>
+                <DBFFieldSpec FieldName="INS_PH1X" Form="attribute" Name="InsurancePhone1Ext" FieldType=""
+                              Description="Insurance Primary Phone Extension"/>
+                <DBFFieldSpec FieldName="INS_PH2" Form="attribute" Name="InsurancePhone2" FieldType=""
+                              Description="Insurance Secondary Phone"/>
+                <DBFFieldSpec FieldName="INS_PH2X" Form="attribute" Name="InsurancePhone2Ext" FieldType=""
+                              Description="Insurance Secondary Phone Extension"/>
+                <DBFFieldSpec FieldName="INS_FAX" Form="attribute" Name="InsuranceFax" FieldType=""
+                              Description="Insurance Fax"/>
+                <DBFFieldSpec FieldName="INS_FAXX" Form="attribute" Name="InsuranceFaxExt" FieldType=""
+                              Description="Insurance Fax Extension"/>
+                <DBFFieldSpec FieldName="INS_EA" Form="attribute" Name="InsuranceEmail" FieldType=""
+                              Description="Insurance Email Address"/>
+                <DBFFieldSpec FieldName="INSD_LN" Form="attribute" Name="InsuranceLName" FieldType=""
+                              Description="Insurance Last Name"/>
+                <DBFFieldSpec FieldName="CLM_NO" Form="attribute" Name="ClaimNumber" FieldType=""
+                              Description="Claim Number"/>
 
 
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.AD2">
             <DBFFileTranslation ID="ID5" ElementName="Admin2" Description="Administrative information2">
-                <DBFFieldSpec FieldName="EST_CT_LN" Form="attribute" Name="EstimatorL" FieldType="" Description="Estimator Lastname"/>
+                <DBFFieldSpec FieldName="EST_CT_LN" Form="attribute" Name="EstimatorL" FieldType=""
-                <DBFFieldSpec FieldName="EST_CT_FN" Form="attribute" Name="EstimatorF" FieldType="" Description="Estimator Firstname"/>
+                              Description="Estimator Lastname"/>
-                <DBFFieldSpec FieldName="EST_CO_NM" Form="attribute" Name="EstimatorCompanyName" FieldType="" Description="Estimator Company Name"/>
+                <DBFFieldSpec FieldName="EST_CT_FN" Form="attribute" Name="EstimatorF" FieldType=""
-                <DBFFieldSpec FieldName="EST_CO_ID" Form="attribute" Name="EstimatorCompanyID" FieldType="" Description="Estimator Company Identifier"/>
+                              Description="Estimator Firstname"/>
-                <DBFFieldSpec FieldName="EST_ADDR1" Form="attribute" Name="EstimatorAddr1" FieldType="" Description="Estimator Address1"/>
+                <DBFFieldSpec FieldName="EST_CO_NM" Form="attribute" Name="EstimatorCompanyName" FieldType=""
-                <DBFFieldSpec FieldName="EST_ADDR2" Form="attribute" Name="EstimatorAddr2" FieldType="" Description="Estimator Address2"/>
+                              Description="Estimator Company Name"/>
-                <DBFFieldSpec FieldName="EST_CITY" Form="attribute" Name="EstimatorCity" FieldType="" Description="Estimator City"/>
+                <DBFFieldSpec FieldName="EST_CO_ID" Form="attribute" Name="EstimatorCompanyID" FieldType=""
-                <DBFFieldSpec FieldName="EST_ST" Form="attribute" Name="EstimatorState" FieldType="" Description="Estimator State"/>
+                              Description="Estimator Company Identifier"/>
-                <DBFFieldSpec FieldName="EST_ZIP" Form="attribute" Name="EstimatorZip" FieldType="" Description="Estimator Zip"/>
+                <DBFFieldSpec FieldName="EST_ADDR1" Form="attribute" Name="EstimatorAddr1" FieldType=""
-                <DBFFieldSpec FieldName="EST_CTRY" Form="attribute" Name="EstimatorCountry" FieldType="" Description="Estimator Country"/>
+                              Description="Estimator Address1"/>
-                <DBFFieldSpec FieldName="EST_PH1" Form="attribute" Name="EstimatorPhone1" FieldType="" Description="Estimator Primary Phone"/>
+                <DBFFieldSpec FieldName="EST_ADDR2" Form="attribute" Name="EstimatorAddr2" FieldType=""
-                <DBFFieldSpec FieldName="EST_PH1X" Form="attribute" Name="EstimatorPhone1Ext" FieldType="" Description="Estimator Primary Phone Extension"/>
+                              Description="Estimator Address2"/>
-                <DBFFieldSpec FieldName="EST_PH2" Form="attribute" Name="EstimatorPhone2" FieldType="" Description="Estimator Secondary Phone"/>
+                <DBFFieldSpec FieldName="EST_CITY" Form="attribute" Name="EstimatorCity" FieldType=""
-                <DBFFieldSpec FieldName="EST_PH2X" Form="attribute" Name="EstimatorPhone2Ext" FieldType="" Description="Estimator Secondary Phone Extension"/>
+                              Description="Estimator City"/>
-                <DBFFieldSpec FieldName="EST_FAX" Form="attribute" Name="EstimatorFax" FieldType="" Description="Estimator Fax"/>
+                <DBFFieldSpec FieldName="EST_ST" Form="attribute" Name="EstimatorState" FieldType=""
-                <DBFFieldSpec FieldName="EST_FAXX" Form="attribute" Name="EstimatorFaxExt" FieldType="" Description="Estimator Fax Extension"/>
+                              Description="Estimator State"/>
-                <DBFFieldSpec FieldName="EST_EA" Form="attribute" Name="EstimatorEmail" FieldType="" Description="Estimator Email Address"/>
+                <DBFFieldSpec FieldName="EST_ZIP" Form="attribute" Name="EstimatorZip" FieldType=""
-                <DBFFieldSpec FieldName="EST_LIC_NO" Form="attribute" Name="EstimatorLicenseNumber" FieldType="" Description="Estimator License Number"/>
+                              Description="Estimator Zip"/>
-                <DBFFieldSpec FieldName="EST_FILENO" Form="attribute" Name="EstimatorFileNumber" FieldType="" Description="Estimator File Number"/>
+                <DBFFieldSpec FieldName="EST_CTRY" Form="attribute" Name="EstimatorCountry" FieldType=""
-                <DBFFieldSpec FieldName="RO_IN_DATE" Form="attribute" Name="VehicleInDate" FieldType="" Description="Date arrived in shop"/>
+                              Description="Estimator Country"/>
-                <DBFFieldSpec FieldName="RO_IN_TIME" Form="attribute" Name="VehicleInTime" FieldType="" Description="Time arrived in shop"/>
+                <DBFFieldSpec FieldName="EST_PH1" Form="attribute" Name="EstimatorPhone1" FieldType=""
-                <DBFFieldSpec FieldName="TAR_DATE" Form="attribute" Name="TargetVehicleOutDate" FieldType="" Description="Target date to be completed"/>
+                              Description="Estimator Primary Phone"/>
-                <DBFFieldSpec FieldName="TAR_TIME" Form="attribute" Name="TargetVehicleOutTime" FieldType="" Description="Target time to be completed"/>
+                <DBFFieldSpec FieldName="EST_PH1X" Form="attribute" Name="EstimatorPhone1Ext" FieldType=""
-                <DBFFieldSpec FieldName="RO_CMPDATE" Form="attribute" Name="VehicleOutDate" FieldType="" Description="Date completed"/>
+                              Description="Estimator Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="RO_CMPTIME" Form="attribute" Name="VehicleOutTime" FieldType="" Description="Time completed"/>
+                <DBFFieldSpec FieldName="EST_PH2" Form="attribute" Name="EstimatorPhone2" FieldType=""
+                              Description="Estimator Secondary Phone"/>
+                <DBFFieldSpec FieldName="EST_PH2X" Form="attribute" Name="EstimatorPhone2Ext" FieldType=""
+                              Description="Estimator Secondary Phone Extension"/>
+                <DBFFieldSpec FieldName="EST_FAX" Form="attribute" Name="EstimatorFax" FieldType=""
+                              Description="Estimator Fax"/>
+                <DBFFieldSpec FieldName="EST_FAXX" Form="attribute" Name="EstimatorFaxExt" FieldType=""
+                              Description="Estimator Fax Extension"/>
+                <DBFFieldSpec FieldName="EST_EA" Form="attribute" Name="EstimatorEmail" FieldType=""
+                              Description="Estimator Email Address"/>
+                <DBFFieldSpec FieldName="EST_LIC_NO" Form="attribute" Name="EstimatorLicenseNumber" FieldType=""
+                              Description="Estimator License Number"/>
+                <DBFFieldSpec FieldName="EST_FILENO" Form="attribute" Name="EstimatorFileNumber" FieldType=""
+                              Description="Estimator File Number"/>
+                <DBFFieldSpec FieldName="RO_IN_DATE" Form="attribute" Name="VehicleInDate" FieldType=""
+                              Description="Date arrived in shop"/>
+                <DBFFieldSpec FieldName="RO_IN_TIME" Form="attribute" Name="VehicleInTime" FieldType=""
+                              Description="Time arrived in shop"/>
+                <DBFFieldSpec FieldName="TAR_DATE" Form="attribute" Name="TargetVehicleOutDate" FieldType=""
+                              Description="Target date to be completed"/>
+                <DBFFieldSpec FieldName="TAR_TIME" Form="attribute" Name="TargetVehicleOutTime" FieldType=""
+                              Description="Target time to be completed"/>
+                <DBFFieldSpec FieldName="RO_CMPDATE" Form="attribute" Name="VehicleOutDate" FieldType=""
+                              Description="Date completed"/>
+                <DBFFieldSpec FieldName="RO_CMPTIME" Form="attribute" Name="VehicleOutTime" FieldType=""
+                              Description="Time completed"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.TTL">
             <DBFFileTranslation ID="ID6" ElementName="Total" Description="Total Table">
-            <DBFFieldSpec FieldName="G_TTL_AMT" Form="attribute" Name="GrandTotalAmount" FieldType="" Description=""/>
+                <DBFFieldSpec FieldName="G_TTL_AMT" Form="attribute" Name="GrandTotalAmount" FieldType=""
+                              Description=""/>
             </DBFFileTranslation>
         </FileTranslation>
     </FileTranslations>

_reference/OEC/Mitchell.xsl

@@ -90,10 +90,13 @@
                             <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateID">
-                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of select="//Envelope/@SoftwareVersion"/>-<xsl:value-of select="//Envelope/@EstimateFileID"/>
+                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of
+                                select="//Envelope/@SoftwareVersion"/>-
+                            <xsl:value-of select="//Envelope/@EstimateFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateIDv2">
-                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of select="//Envelope/@EstimateFileID"/>
+                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-
+                            <xsl:value-of select="//Envelope/@EstimateFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateFormatVersion">
                             <xsl:value-of select="//Envelope/@EMSVersion"/>
@@ -214,7 +217,8 @@
                                     <xsl:choose>
                                         <xsl:when test="string-length(substring-before(//Admin/@InsuranceZip, '-'))=5">
                                             <xsl:choose>
-                                                <xsl:when test="string-length(substring-after(//Admin/@InsuranceZip, '-'))=4">
+                                                <xsl:when
+                                                        test="string-length(substring-after(//Admin/@InsuranceZip, '-'))=4">
                                                     <xsl:value-of select="//Admin/@InsuranceZip"/>
                                                 </xsl:when>
                                                 <xsl:otherwise>
@@ -225,7 +229,8 @@
                                     </xsl:choose>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin/@InsuranceZip)=9">
-                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>-<xsl:value-of select="substring(//Admin/@InsuranceZip, 6, 4)"/>
+                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>-
+                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 6, 4)"/>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin/@InsuranceZip)&gt;4">
                                     <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>
@@ -238,7 +243,8 @@
                         <xsl:attribute name="Phone">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsurancePhone1Ext[. != '']">
-                                    <xsl:value-of select="//Admin/@InsurancePhone1"/>&#32;x<xsl:value-of select="//Admin/@InsurancePhone1Ext"/>
+                                    <xsl:value-of select="//Admin/@InsurancePhone1"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsurancePhone1Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsurancePhone1"/>
@@ -248,7 +254,8 @@
                         <xsl:attribute name="Phone2">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsurancePhone2Ext[. != '']">
-                                    <xsl:value-of select="//Admin/@InsurancePhone2"/>&#32;x<xsl:value-of select="//Admin/@InsurancePhone2Ext"/>
+                                    <xsl:value-of select="//Admin/@InsurancePhone2"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsurancePhone2Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsurancePhone2"/>
@@ -258,7 +265,8 @@
                         <xsl:attribute name="Fax">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsuranceFaxExt[. != '']">
-                                    <xsl:value-of select="//Admin/@InsuranceFax"/>&#32;x<xsl:value-of select="//Admin/@InsuranceFaxExt"/>
+                                    <xsl:value-of select="//Admin/@InsuranceFax"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsuranceFaxExt"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsuranceFax"/>
@@ -310,7 +318,8 @@
                                     <xsl:choose>
                                         <xsl:when test="string-length(substring-before(//Admin2/@EstimatorZip, '-'))=5">
                                             <xsl:choose>
-                                                <xsl:when test="string-length(substring-after(//Admin2/@EstimatorZip, '-'))=4">
+                                                <xsl:when
+                                                        test="string-length(substring-after(//Admin2/@EstimatorZip, '-'))=4">
                                                     <xsl:value-of select="//Admin2/@EstimatorZip"/>
                                                 </xsl:when>
                                                 <xsl:otherwise>
@@ -321,7 +330,8 @@
                                     </xsl:choose>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin2/@EstimatorZip)=9">
-                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>-<xsl:value-of select="substring(//Admin2/@EstimatorZip, 6, 4)"/>
+                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>-
+                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 6, 4)"/>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin2/@EstimatorZip)&gt;4">
                                     <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>
@@ -334,7 +344,8 @@
                         <xsl:attribute name="Phone">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorPhone1Ext[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone1"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorPhone1Ext"/>
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone1"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone1Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorPhone1"/>
@@ -344,7 +355,8 @@
                         <xsl:attribute name="Phone2">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorPhone2Ext[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone2"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorPhone2Ext"/>
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone2"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone2Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorPhone2"/>
@@ -354,7 +366,8 @@
                         <xsl:attribute name="Fax">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorFaxExt[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorFax"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorFaxExt"/>
+                                    <xsl:value-of select="//Admin2/@EstimatorFax"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorFaxExt"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorFax"/>
@@ -370,7 +383,8 @@
                             <xsl:if test="string-length(//Admin2/@VehicleInDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@VehicleInDate, ' ')"/>
                                 <xsl:if test="string-length(//Admin2/@VehicleInTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleInTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@VehicleInTime, 3, 2)"/>
+                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleInTime, 1, 2)"/>:
+                                    <xsl:value-of select="substring(//Admin2/@VehicleInTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -378,7 +392,8 @@
                             <xsl:if test="string-length(//Admin2/@TargetVehicleOutDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@TargetVehicleOutDate,' ')"/>
                                 <xsl:if test="string-length(//Admin2/@TargetVehicleOutTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 3, 2)"/>
+                                    &#32;<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 1, 2)"/>:
+                                    <xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -386,7 +401,8 @@
                             <xsl:if test="string-length(//Admin2/@VehicleOutDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@VehicleOutDate, ' ')"/>
                                 <xsl:if test="string-length(//Admin2/@VehicleOutTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 3, 2)"/>
+                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 1, 2)"/>:
+                                    <xsl:value-of select="substring(//Admin2/@VehicleOutTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -542,9 +558,13 @@
                             <xsl:when test="@TransactionCode='3'">False</xsl:when>
                             <xsl:when test="@TransactionCode='1' or @TransactionCode='2'">
                                 <xsl:choose>
-                                    <xsl:when test="@PartType='PAN' or @PartType='PAG' or @PartType='PAM' or @PartType='PAP' or @PartType='PAL' or @PartType='PAA' or @PartType='PAR' or @PartType='PAC'">
+                                    <xsl:when
+                                            test="@PartType='PAN' or @PartType='PAG' or @PartType='PAM' or @PartType='PAP' or @PartType='PAL' or @PartType='PAA' or @PartType='PAR' or @PartType='PAC'">
                                         <xsl:choose>
-                                            <xsl:when test="@LaborType='LAD' or @LaborType='LAE' or @LaborType='LAU' or @LaborType='LAT'">False</xsl:when>
+                                            <xsl:when
+                                                    test="@LaborType='LAD' or @LaborType='LAE' or @LaborType='LAU' or @LaborType='LAT'">
+                                                False
+                                            </xsl:when>
                                             <xsl:otherwise>
                                                 <xsl:choose>
                                                     <xsl:when test="@LaborOp='OP0'">False</xsl:when>

_reference/OEC/MitchellMapping.xml

@@ -1,128 +1,221 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TranslationDescriptor>
-    <FileTranslations FormatName="Mitchell" ElementName="Estimate" Description="Translation Descriptor for a Mitchell Estimate, Version EMS 2.0">
+    <FileTranslations FormatName="Mitchell" ElementName="Estimate"
+                      Description="Translation Descriptor for a Mitchell Estimate, Version EMS 2.0">
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.env">
             <DBFFileTranslation ID="ID1" ElementName="Envelope" Description="Envelope Table">
                 <DBFFieldSpec FieldName="RO_ID" Form="attribute" Name="RONum" FieldType="" Description="RO Number"/>
-                <DBFFieldSpec FieldName="UNQFILE_ID" Form="attribute" Name="UniqueFileID" FieldType="" Description="Unique File Identifier"/>
+                <DBFFieldSpec FieldName="UNQFILE_ID" Form="attribute" Name="UniqueFileID" FieldType=""
-                <DBFFieldSpec FieldName="ESTFILE_ID" Form="attribute" Name="EstimateFileID" FieldType="" Description="Estimate File Identifier"/>
+                              Description="Unique File Identifier"/>
-                <DBFFieldSpec FieldName="INCL_ADMIN" Form="attribute" Name="IncludesAdminInfo" FieldType="Boolean" Description="Includes Admin Info Flag"/>
+                <DBFFieldSpec FieldName="ESTFILE_ID" Form="attribute" Name="EstimateFileID" FieldType=""
-                <DBFFieldSpec FieldName="INCL_VEH" Form="attribute" Name="IncludesVehicleInfo" FieldType="Boolean" Description="Includes Vehicle Info Flag"/>
+                              Description="Estimate File Identifier"/>
-                <DBFFieldSpec FieldName="INCL_EST" Form="attribute" Name="IncludesEstimateInfo" FieldType="Boolean" Description="Includes Estimate Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_ADMIN" Form="attribute" Name="IncludesAdminInfo" FieldType="Boolean"
-                <DBFFieldSpec FieldName="INCL_PROFL" Form="attribute" Name="IncludesProfileInfo" FieldType="Boolean" Description="Includes Profile Info Flag"/>
+                              Description="Includes Admin Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_TOTAL" Form="attribute" Name="IncludesTotalsInfo" FieldType="Boolean" Description="Includes Totals Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_VEH" Form="attribute" Name="IncludesVehicleInfo" FieldType="Boolean"
-                <DBFFieldSpec FieldName="INCL_VENDR" Form="attribute" Name="IncludesVendorInfo" FieldType="Boolean" Description="Includes Vendor Info Flag"/>
+                              Description="Includes Vehicle Info Flag"/>
-                <DBFFieldSpec FieldName="EMS_VER" Form="attribute" Name="EMSVersion" FieldType="" Description="EMS Version Number"/>
+                <DBFFieldSpec FieldName="INCL_EST" Form="attribute" Name="IncludesEstimateInfo" FieldType="Boolean"
-                <DBFFieldSpec FieldName="SUPP_NO" Form="attribute" Name="SupplementNum" FieldType="" Description="Supplement Number"/>
+                              Description="Includes Estimate Info Flag"/>
-                <DBFFieldSpec FieldName="TRANS_TYPE" Form="attribute" Name="TransactionType" FieldType="" Description="Transaction Type"/>
+                <DBFFieldSpec FieldName="INCL_PROFL" Form="attribute" Name="IncludesProfileInfo" FieldType="Boolean"
-                <DBFFieldSpec FieldName="EST_SYSTEM" Form="attribute" Name="EstimatingSystem" FieldType="" Description="Estimating System Software"/>
+                              Description="Includes Profile Info Flag"/>
-                <DBFFieldSpec FieldName="SW_VERSION" Form="attribute" Name="SoftwareVersion" FieldType="" Description="Software Version Identifier"/>
+                <DBFFieldSpec FieldName="INCL_TOTAL" Form="attribute" Name="IncludesTotalsInfo" FieldType="Boolean"
+                              Description="Includes Totals Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_VENDR" Form="attribute" Name="IncludesVendorInfo" FieldType="Boolean"
+                              Description="Includes Vendor Info Flag"/>
+                <DBFFieldSpec FieldName="EMS_VER" Form="attribute" Name="EMSVersion" FieldType=""
+                              Description="EMS Version Number"/>
+                <DBFFieldSpec FieldName="SUPP_NO" Form="attribute" Name="SupplementNum" FieldType=""
+                              Description="Supplement Number"/>
+                <DBFFieldSpec FieldName="TRANS_TYPE" Form="attribute" Name="TransactionType" FieldType=""
+                              Description="Transaction Type"/>
+                <DBFFieldSpec FieldName="EST_SYSTEM" Form="attribute" Name="EstimatingSystem" FieldType=""
+                              Description="Estimating System Software"/>
+                <DBFFieldSpec FieldName="SW_VERSION" Form="attribute" Name="SoftwareVersion" FieldType=""
+                              Description="Software Version Identifier"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.LIN">
             <DBFFileTranslation ID="ID2" ElementSetName="PartsList" ElementName="Part" Description="Parts List Table">
-                <DBFFieldSpec FieldName="OEM_PARTNO" Form="attribute" Name="TDPartNum" FieldType="" Description="Part Number"/>
+                <DBFFieldSpec FieldName="OEM_PARTNO" Form="attribute" Name="TDPartNum" FieldType=""
-                <DBFFieldSpec FieldName="ALT_PARTNO" Form="attribute" Name="AltPartNum" FieldType="" Description="Alternate Part Number"/>
+                              Description="Part Number"/>
-                <DBFFieldSpec FieldName="ACT_PRICE" Form="attribute" Name="ActPrice" FieldType="" Description="Actual Part Price"/>
+                <DBFFieldSpec FieldName="ALT_PARTNO" Form="attribute" Name="AltPartNum" FieldType=""
-                <DBFFieldSpec FieldName="LINE_DESC" Form="attribute" Name="TDPartDesc" FieldType="" Description="Part Description"/>
+                              Description="Alternate Part Number"/>
-                <DBFFieldSpec FieldName="DB_PRICE" Form="attribute" Name="TDEstimate" FieldType="" Description="DB_Price"/>
+                <DBFFieldSpec FieldName="ACT_PRICE" Form="attribute" Name="ActPrice" FieldType=""
-                <DBFFieldSpec FieldName="PART_QTY" Form="attribute" Name="TDPartQty" FieldType="" Description="Part Quantity"/>
+                              Description="Actual Part Price"/>
+                <DBFFieldSpec FieldName="LINE_DESC" Form="attribute" Name="TDPartDesc" FieldType=""
+                              Description="Part Description"/>
+                <DBFFieldSpec FieldName="DB_PRICE" Form="attribute" Name="TDEstimate" FieldType=""
+                              Description="DB_Price"/>
+                <DBFFieldSpec FieldName="PART_QTY" Form="attribute" Name="TDPartQty" FieldType=""
+                              Description="Part Quantity"/>
                 <DBFFieldSpec FieldName="LINE_NO" Form="attribute" Name="LineNumber" FieldType="" Description=""/>
                 <DBFFieldSpec FieldName="UNQ_SEQ" Form="attribute" Name="SequenceNumber" FieldType="" Description=""/>
-                <DBFFieldSpec FieldName="PART_TYPE" Form="attribute" Name="PartType" FieldType="" Description="Part Type"/>
+                <DBFFieldSpec FieldName="PART_TYPE" Form="attribute" Name="PartType" FieldType=""
-                <DBFFieldSpec FieldName="MOD_LBR_TY" Form="attribute" Name="LaborType" FieldType="" Description="Labor Type"/>
+                              Description="Part Type"/>
-                <DBFFieldSpec FieldName="MOD_LB_HRS" Form="attribute" Name="LaborHours" FieldType="" Description="Labor Hours"/>
+                <DBFFieldSpec FieldName="MOD_LBR_TY" Form="attribute" Name="LaborType" FieldType=""
+                              Description="Labor Type"/>
+                <DBFFieldSpec FieldName="MOD_LB_HRS" Form="attribute" Name="LaborHours" FieldType=""
+                              Description="Labor Hours"/>
                 <DBFFieldSpec FieldName="LBR_OP" Form="attribute" Name="LaborOp" FieldType="" Description="Labor Op"/>
-                <DBFFieldSpec FieldName="LINE_IND" Form="attribute" Name="SupplementLevel" FieldType="" Description="Supplement Level"/>
+                <DBFFieldSpec FieldName="LINE_IND" Form="attribute" Name="SupplementLevel" FieldType=""
-                <DBFFieldSpec FieldName="TRAN_CODE" Form="attribute" Name="TransactionCode" FieldType="" Description="Transaction Code"/>
+                              Description="Supplement Level"/>
-                <DBFFieldSpec FieldName="GLASS_FLAG" Form="attribute" Name="GlassFlag" FieldType="" Description="Glass Flag"/>
+                <DBFFieldSpec FieldName="TRAN_CODE" Form="attribute" Name="TransactionCode" FieldType=""
-                <DBFFieldSpec FieldName="PRT_DSMK_M" Form="attribute" Name="MarkUp" FieldType="" Description="Price Mark up for non OEM parts"/>
+                              Description="Transaction Code"/>
+                <DBFFieldSpec FieldName="GLASS_FLAG" Form="attribute" Name="GlassFlag" FieldType=""
+                              Description="Glass Flag"/>
+                <DBFFieldSpec FieldName="PRT_DSMK_M" Form="attribute" Name="MarkUp" FieldType=""
+                              Description="Price Mark up for non OEM parts"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.VEH">
             <DBFFileTranslation ID="ID3" ElementName="Vehicle" Description="Vehicle Table">
                 <DBFFieldSpec FieldName="V_VIN" Form="attribute" Name="TransVIN" FieldType="" Description=""/>
-                <DBFFieldSpec FieldName="V_MODEL_YR" Form="attribute" Name="TransYear" FieldType="" Description="V_MODEL_YR"/>
+                <DBFFieldSpec FieldName="V_MODEL_YR" Form="attribute" Name="TransYear" FieldType=""
-                <DBFFieldSpec FieldName="V_MAKEDESC" Form="attribute" Name="ManufName" FieldType="" Description="V_MAKEDESC"/>
+                              Description="V_MODEL_YR"/>
-                <DBFFieldSpec FieldName="V_MAKECODE" Form="attribute" Name="ManufCode" FieldType="" Description="V_MAKECODE"/>
+                <DBFFieldSpec FieldName="V_MAKEDESC" Form="attribute" Name="ManufName" FieldType=""
-                <DBFFieldSpec FieldName="V_MODEL" Form="attribute" Name="TransModel" FieldType="" Description="V_MODEL"/>
+                              Description="V_MAKEDESC"/>
-                <DBFFieldSpec FieldName="V_MILEAGE" Form="attribute" Name="TransMileage" FieldType="" Description="V_MILEAGE"/>
+                <DBFFieldSpec FieldName="V_MAKECODE" Form="attribute" Name="ManufCode" FieldType=""
+                              Description="V_MAKECODE"/>
+                <DBFFieldSpec FieldName="V_MODEL" Form="attribute" Name="TransModel" FieldType=""
+                              Description="V_MODEL"/>
+                <DBFFieldSpec FieldName="V_MILEAGE" Form="attribute" Name="TransMileage" FieldType=""
+                              Description="V_MILEAGE"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.AD1">
             <DBFFileTranslation ID="ID4" ElementName="Admin" Description="Administrative information">
-                <DBFFieldSpec FieldName="OWNR_LN" Form="attribute" Name="OwnerL" FieldType="" Description="Owner Lastname"/>
+                <DBFFieldSpec FieldName="OWNR_LN" Form="attribute" Name="OwnerL" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_FN" Form="attribute" Name="OwnerF" FieldType="" Description="Owner Firstname"/>
+                              Description="Owner Lastname"/>
-                <DBFFieldSpec FieldName="OWNR_CO_NM" Form="attribute" Name="OwnerCompanyName" FieldType="" Description="Owner Company Name"/>
+                <DBFFieldSpec FieldName="OWNR_FN" Form="attribute" Name="OwnerF" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_TITLE" Form="attribute" Name="OwnerTitle" FieldType="" Description="Owner Title"/>
+                              Description="Owner Firstname"/>
-                <DBFFieldSpec FieldName="OWNR_ADDR1" Form="attribute" Name="OwnerAddr1" FieldType="" Description="Owner Address Line 1"/>
+                <DBFFieldSpec FieldName="OWNR_CO_NM" Form="attribute" Name="OwnerCompanyName" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_ADDR2" Form="attribute" Name="OwnerAddr2" FieldType="" Description="Owner Address Line 2"/>
+                              Description="Owner Company Name"/>
-                <DBFFieldSpec FieldName="OWNR_CITY" Form="attribute" Name="OwnerCity" FieldType="" Description="Owner City"/>
+                <DBFFieldSpec FieldName="OWNR_TITLE" Form="attribute" Name="OwnerTitle" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_ST" Form="attribute" Name="OwnerState" FieldType="" Description="Owner State"/>
+                              Description="Owner Title"/>
-                <DBFFieldSpec FieldName="OWNR_ZIP" Form="attribute" Name="OwnerZip" FieldType="" Description="Owner Zip"/>
+                <DBFFieldSpec FieldName="OWNR_ADDR1" Form="attribute" Name="OwnerAddr1" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_CTRY" Form="attribute" Name="OwnerCountry" FieldType="" Description="Owner Country"/>
+                              Description="Owner Address Line 1"/>
-                <DBFFieldSpec FieldName="OWNR_PH1" Form="attribute" Name="OwnerPhone1" FieldType="" Description="Owner Primary Phone"/>
+                <DBFFieldSpec FieldName="OWNR_ADDR2" Form="attribute" Name="OwnerAddr2" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_PH1X" Form="attribute" Name="OwnerPhone1Ext" FieldType="" Description="Owner Primary Phone Extension"/>
+                              Description="Owner Address Line 2"/>
-                <DBFFieldSpec FieldName="OWNR_PH2" Form="attribute" Name="OwnerPhone2" FieldType="" Description="Owner Secondary Phone"/>
+                <DBFFieldSpec FieldName="OWNR_CITY" Form="attribute" Name="OwnerCity" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_PH2X" Form="attribute" Name="OwnerPhone2Ext" FieldType="" Description="Owner Secondary Phone Extension"/>
+                              Description="Owner City"/>
-                <DBFFieldSpec FieldName="OWNR_FAX" Form="attribute" Name="OwnerFax" FieldType="" Description="Owner Fax"/>
+                <DBFFieldSpec FieldName="OWNR_ST" Form="attribute" Name="OwnerState" FieldType=""
-                <DBFFieldSpec FieldName="OWNR_FAXX" Form="attribute" Name="OwnerFaxExt" FieldType="" Description="Owner Fax Extension"/>
+                              Description="Owner State"/>
-                <DBFFieldSpec FieldName="OWNR_EA" Form="attribute" Name="OwnerEmail" FieldType="" Description="Owner Email Address"/>
+                <DBFFieldSpec FieldName="OWNR_ZIP" Form="attribute" Name="OwnerZip" FieldType=""
-                <DBFFieldSpec FieldName="INS_CO_NM" Form="attribute" Name="InsuranceCompanyName" FieldType="" Description="Insurance Company Name"/>
+                              Description="Owner Zip"/>
-                <DBFFieldSpec FieldName="INS_CO_ID" Form="attribute" Name="InsuranceCompanyID" FieldType="" Description="Insurance Company Identifier"/>
+                <DBFFieldSpec FieldName="OWNR_CTRY" Form="attribute" Name="OwnerCountry" FieldType=""
-                <DBFFieldSpec FieldName="INS_ADDR1" Form="attribute" Name="InsuranceAddr1" FieldType="" Description="Insurance Address Line 1"/>
+                              Description="Owner Country"/>
-                <DBFFieldSpec FieldName="INS_ADDR2" Form="attribute" Name="InsuranceAddr2" FieldType="" Description="Insurance Address Line 2"/>
+                <DBFFieldSpec FieldName="OWNR_PH1" Form="attribute" Name="OwnerPhone1" FieldType=""
-                <DBFFieldSpec FieldName="INS_CITY" Form="attribute" Name="InsuranceCity" FieldType="" Description="Insurance City"/>
+                              Description="Owner Primary Phone"/>
-                <DBFFieldSpec FieldName="INS_ST" Form="attribute" Name="InsuranceState" FieldType="" Description="Insurance State"/>
+                <DBFFieldSpec FieldName="OWNR_PH1X" Form="attribute" Name="OwnerPhone1Ext" FieldType=""
-                <DBFFieldSpec FieldName="INS_ZIP" Form="attribute" Name="InsuranceZip" FieldType="" Description="Insurance Zip"/>
+                              Description="Owner Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="INS_CTRY" Form="attribute" Name="InsuranceCountry" FieldType="" Description="Insurance Country"/>
+                <DBFFieldSpec FieldName="OWNR_PH2" Form="attribute" Name="OwnerPhone2" FieldType=""
-                <DBFFieldSpec FieldName="INS_PH1" Form="attribute" Name="InsurancePhone1" FieldType="" Description="Insurance Primary Phone"/>
+                              Description="Owner Secondary Phone"/>
-                <DBFFieldSpec FieldName="INS_PH1X" Form="attribute" Name="InsurancePhone1Ext" FieldType="" Description="Insurance Primary Phone Extension"/>
+                <DBFFieldSpec FieldName="OWNR_PH2X" Form="attribute" Name="OwnerPhone2Ext" FieldType=""
-                <DBFFieldSpec FieldName="INS_PH2" Form="attribute" Name="InsurancePhone2" FieldType="" Description="Insurance Secondary Phone"/>
+                              Description="Owner Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="INS_PH2X" Form="attribute" Name="InsurancePhone2Ext" FieldType="" Description="Insurance Secondary Phone Extension"/>
+                <DBFFieldSpec FieldName="OWNR_FAX" Form="attribute" Name="OwnerFax" FieldType=""
-                <DBFFieldSpec FieldName="INS_FAX" Form="attribute" Name="InsuranceFax" FieldType="" Description="Insurance Fax"/>
+                              Description="Owner Fax"/>
-                <DBFFieldSpec FieldName="INS_FAXX" Form="attribute" Name="InsuranceFaxExt" FieldType="" Description="Insurance Fax Extension"/>
+                <DBFFieldSpec FieldName="OWNR_FAXX" Form="attribute" Name="OwnerFaxExt" FieldType=""
-                <DBFFieldSpec FieldName="INS_EA" Form="attribute" Name="InsuranceEmail" FieldType="" Description="Insurance Email Address"/>
+                              Description="Owner Fax Extension"/>
-                <DBFFieldSpec FieldName="INSD_LN" Form="attribute" Name="InsuranceLName" FieldType="" Description="Insurance Last Name"/>
+                <DBFFieldSpec FieldName="OWNR_EA" Form="attribute" Name="OwnerEmail" FieldType=""
-                <DBFFieldSpec FieldName="CLM_NO" Form="attribute" Name="ClaimNumber" FieldType="" Description="Claim Number"/>
+                              Description="Owner Email Address"/>
+                <DBFFieldSpec FieldName="INS_CO_NM" Form="attribute" Name="InsuranceCompanyName" FieldType=""
+                              Description="Insurance Company Name"/>
+                <DBFFieldSpec FieldName="INS_CO_ID" Form="attribute" Name="InsuranceCompanyID" FieldType=""
+                              Description="Insurance Company Identifier"/>
+                <DBFFieldSpec FieldName="INS_ADDR1" Form="attribute" Name="InsuranceAddr1" FieldType=""
+                              Description="Insurance Address Line 1"/>
+                <DBFFieldSpec FieldName="INS_ADDR2" Form="attribute" Name="InsuranceAddr2" FieldType=""
+                              Description="Insurance Address Line 2"/>
+                <DBFFieldSpec FieldName="INS_CITY" Form="attribute" Name="InsuranceCity" FieldType=""
+                              Description="Insurance City"/>
+                <DBFFieldSpec FieldName="INS_ST" Form="attribute" Name="InsuranceState" FieldType=""
+                              Description="Insurance State"/>
+                <DBFFieldSpec FieldName="INS_ZIP" Form="attribute" Name="InsuranceZip" FieldType=""
+                              Description="Insurance Zip"/>
+                <DBFFieldSpec FieldName="INS_CTRY" Form="attribute" Name="InsuranceCountry" FieldType=""
+                              Description="Insurance Country"/>
+                <DBFFieldSpec FieldName="INS_PH1" Form="attribute" Name="InsurancePhone1" FieldType=""
+                              Description="Insurance Primary Phone"/>
+                <DBFFieldSpec FieldName="INS_PH1X" Form="attribute" Name="InsurancePhone1Ext" FieldType=""
+                              Description="Insurance Primary Phone Extension"/>
+                <DBFFieldSpec FieldName="INS_PH2" Form="attribute" Name="InsurancePhone2" FieldType=""
+                              Description="Insurance Secondary Phone"/>
+                <DBFFieldSpec FieldName="INS_PH2X" Form="attribute" Name="InsurancePhone2Ext" FieldType=""
+                              Description="Insurance Secondary Phone Extension"/>
+                <DBFFieldSpec FieldName="INS_FAX" Form="attribute" Name="InsuranceFax" FieldType=""
+                              Description="Insurance Fax"/>
+                <DBFFieldSpec FieldName="INS_FAXX" Form="attribute" Name="InsuranceFaxExt" FieldType=""
+                              Description="Insurance Fax Extension"/>
+                <DBFFieldSpec FieldName="INS_EA" Form="attribute" Name="InsuranceEmail" FieldType=""
+                              Description="Insurance Email Address"/>
+                <DBFFieldSpec FieldName="INSD_LN" Form="attribute" Name="InsuranceLName" FieldType=""
+                              Description="Insurance Last Name"/>
+                <DBFFieldSpec FieldName="CLM_NO" Form="attribute" Name="ClaimNumber" FieldType=""
+                              Description="Claim Number"/>
 
 
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.AD2">
             <DBFFileTranslation ID="ID5" ElementName="Admin2" Description="Administrative information2">
-                <DBFFieldSpec FieldName="EST_CT_LN" Form="attribute" Name="EstimatorL" FieldType="" Description="Estimator Lastname"/>
+                <DBFFieldSpec FieldName="EST_CT_LN" Form="attribute" Name="EstimatorL" FieldType=""
-                <DBFFieldSpec FieldName="EST_CT_FN" Form="attribute" Name="EstimatorF" FieldType="" Description="Estimator Firstname"/>
+                              Description="Estimator Lastname"/>
-                <DBFFieldSpec FieldName="EST_CO_NM" Form="attribute" Name="EstimatorCompanyName" FieldType="" Description="Estimator Company Name"/>
+                <DBFFieldSpec FieldName="EST_CT_FN" Form="attribute" Name="EstimatorF" FieldType=""
-                <DBFFieldSpec FieldName="EST_CO_ID" Form="attribute" Name="EstimatorCompanyID" FieldType="" Description="Estimator Company Identifier"/>
+                              Description="Estimator Firstname"/>
-                <DBFFieldSpec FieldName="EST_ADDR1" Form="attribute" Name="EstimatorAddr1" FieldType="" Description="Estimator Address1"/>
+                <DBFFieldSpec FieldName="EST_CO_NM" Form="attribute" Name="EstimatorCompanyName" FieldType=""
-                <DBFFieldSpec FieldName="EST_ADDR2" Form="attribute" Name="EstimatorAddr2" FieldType="" Description="Estimator Address2"/>
+                              Description="Estimator Company Name"/>
-                <DBFFieldSpec FieldName="EST_CITY" Form="attribute" Name="EstimatorCity" FieldType="" Description="Estimator City"/>
+                <DBFFieldSpec FieldName="EST_CO_ID" Form="attribute" Name="EstimatorCompanyID" FieldType=""
-                <DBFFieldSpec FieldName="EST_ST" Form="attribute" Name="EstimatorState" FieldType="" Description="Estimator State"/>
+                              Description="Estimator Company Identifier"/>
-                <DBFFieldSpec FieldName="EST_ZIP" Form="attribute" Name="EstimatorZip" FieldType="" Description="Estimator Zip"/>
+                <DBFFieldSpec FieldName="EST_ADDR1" Form="attribute" Name="EstimatorAddr1" FieldType=""
-                <DBFFieldSpec FieldName="EST_CTRY" Form="attribute" Name="EstimatorCountry" FieldType="" Description="Estimator Country"/>
+                              Description="Estimator Address1"/>
-                <DBFFieldSpec FieldName="EST_PH1" Form="attribute" Name="EstimatorPhone1" FieldType="" Description="Estimator Primary Phone"/>
+                <DBFFieldSpec FieldName="EST_ADDR2" Form="attribute" Name="EstimatorAddr2" FieldType=""
-                <DBFFieldSpec FieldName="EST_PH1X" Form="attribute" Name="EstimatorPhone1Ext" FieldType="" Description="Estimator Primary Phone Extension"/>
+                              Description="Estimator Address2"/>
-                <DBFFieldSpec FieldName="EST_PH2" Form="attribute" Name="EstimatorPhone2" FieldType="" Description="Estimator Secondary Phone"/>
+                <DBFFieldSpec FieldName="EST_CITY" Form="attribute" Name="EstimatorCity" FieldType=""
-                <DBFFieldSpec FieldName="EST_PH2X" Form="attribute" Name="EstimatorPhone2Ext" FieldType="" Description="Estimator Secondary Phone Extension"/>
+                              Description="Estimator City"/>
-                <DBFFieldSpec FieldName="EST_FAX" Form="attribute" Name="EstimatorFax" FieldType="" Description="Estimator Fax"/>
+                <DBFFieldSpec FieldName="EST_ST" Form="attribute" Name="EstimatorState" FieldType=""
-                <DBFFieldSpec FieldName="EST_FAXX" Form="attribute" Name="EstimatorFaxExt" FieldType="" Description="Estimator Fax Extension"/>
+                              Description="Estimator State"/>
-                <DBFFieldSpec FieldName="EST_EA" Form="attribute" Name="EstimatorEmail" FieldType="" Description="Estimator Email Address"/>
+                <DBFFieldSpec FieldName="EST_ZIP" Form="attribute" Name="EstimatorZip" FieldType=""
-                <DBFFieldSpec FieldName="EST_LIC_NO" Form="attribute" Name="EstimatorLicenseNumber" FieldType="" Description="Estimator License Number"/>
+                              Description="Estimator Zip"/>
-                <DBFFieldSpec FieldName="EST_FILENO" Form="attribute" Name="EstimatorFileNumber" FieldType="" Description="Estimator File Number"/>
+                <DBFFieldSpec FieldName="EST_CTRY" Form="attribute" Name="EstimatorCountry" FieldType=""
-                <DBFFieldSpec FieldName="RO_IN_DATE" Form="attribute" Name="VehicleInDate" FieldType="" Description="Date arrived in shop"/>
+                              Description="Estimator Country"/>
-                <DBFFieldSpec FieldName="RO_IN_TIME" Form="attribute" Name="VehicleInTime" FieldType="" Description="Time arrived in shop"/>
+                <DBFFieldSpec FieldName="EST_PH1" Form="attribute" Name="EstimatorPhone1" FieldType=""
-                <DBFFieldSpec FieldName="TAR_DATE" Form="attribute" Name="TargetVehicleOutDate" FieldType="" Description="Target date to be completed"/>
+                              Description="Estimator Primary Phone"/>
-                <DBFFieldSpec FieldName="TAR_TIME" Form="attribute" Name="TargetVehicleOutTime" FieldType="" Description="Target time to be completed"/>
+                <DBFFieldSpec FieldName="EST_PH1X" Form="attribute" Name="EstimatorPhone1Ext" FieldType=""
-                <DBFFieldSpec FieldName="RO_CMPDATE" Form="attribute" Name="VehicleOutDate" FieldType="" Description="Date completed"/>
+                              Description="Estimator Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="RO_CMPTIME" Form="attribute" Name="VehicleOutTime" FieldType="" Description="Time completed"/>
+                <DBFFieldSpec FieldName="EST_PH2" Form="attribute" Name="EstimatorPhone2" FieldType=""
-                <DBFFieldSpec FieldName="RF_CO_NM" Form="attribute" Name="BodyShopName" FieldType="" Description="Body Shop Name"/>
+                              Description="Estimator Secondary Phone"/>
+                <DBFFieldSpec FieldName="EST_PH2X" Form="attribute" Name="EstimatorPhone2Ext" FieldType=""
+                              Description="Estimator Secondary Phone Extension"/>
+                <DBFFieldSpec FieldName="EST_FAX" Form="attribute" Name="EstimatorFax" FieldType=""
+                              Description="Estimator Fax"/>
+                <DBFFieldSpec FieldName="EST_FAXX" Form="attribute" Name="EstimatorFaxExt" FieldType=""
+                              Description="Estimator Fax Extension"/>
+                <DBFFieldSpec FieldName="EST_EA" Form="attribute" Name="EstimatorEmail" FieldType=""
+                              Description="Estimator Email Address"/>
+                <DBFFieldSpec FieldName="EST_LIC_NO" Form="attribute" Name="EstimatorLicenseNumber" FieldType=""
+                              Description="Estimator License Number"/>
+                <DBFFieldSpec FieldName="EST_FILENO" Form="attribute" Name="EstimatorFileNumber" FieldType=""
+                              Description="Estimator File Number"/>
+                <DBFFieldSpec FieldName="RO_IN_DATE" Form="attribute" Name="VehicleInDate" FieldType=""
+                              Description="Date arrived in shop"/>
+                <DBFFieldSpec FieldName="RO_IN_TIME" Form="attribute" Name="VehicleInTime" FieldType=""
+                              Description="Time arrived in shop"/>
+                <DBFFieldSpec FieldName="TAR_DATE" Form="attribute" Name="TargetVehicleOutDate" FieldType=""
+                              Description="Target date to be completed"/>
+                <DBFFieldSpec FieldName="TAR_TIME" Form="attribute" Name="TargetVehicleOutTime" FieldType=""
+                              Description="Target time to be completed"/>
+                <DBFFieldSpec FieldName="RO_CMPDATE" Form="attribute" Name="VehicleOutDate" FieldType=""
+                              Description="Date completed"/>
+                <DBFFieldSpec FieldName="RO_CMPTIME" Form="attribute" Name="VehicleOutTime" FieldType=""
+                              Description="Time completed"/>
+                <DBFFieldSpec FieldName="RF_CO_NM" Form="attribute" Name="BodyShopName" FieldType=""
+                              Description="Body Shop Name"/>
 
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.TTL">
             <DBFFileTranslation ID="ID6" ElementName="Total" Description="Total Table">
-            <DBFFieldSpec FieldName="G_TTL_AMT" Form="attribute" Name="GrandTotalAmount" FieldType="" Description=""/>
+                <DBFFieldSpec FieldName="G_TTL_AMT" Form="attribute" Name="GrandTotalAmount" FieldType=""
+                              Description=""/>
             </DBFFileTranslation>
         </FileTranslation>
     </FileTranslations>

client/.env.development

@@ -1,13 +1,14 @@
-VITE_APP_GRAPHQL_ENDPOINT=https://db.dev.bodyshop.app/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT=https://db.dev.bodyshop.app/v1/graphql
-VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.bodyshop.app/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.bodyshop.app/v1/graphql
-VITE_APP_GA_CODE=231099835
+REACT_APP_GA_CODE=231099835
-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"}
+REACT_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_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/io-test
+REACT_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/io-test
-VITE_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/io-test
+REACT_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/io-test
-VITE_APP_CLOUDINARY_API_KEY=957865933348715
+REACT_APP_CLOUDINARY_API_KEY=957865933348715
-VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
+REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
-VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
-VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
+REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-VITE_APP_AXIOS_BASE_API_URL=http://localhost:4000
+REACT_APP_AXIOS_BASE_API_URL=http://localhost:4000
-VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
-VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
+REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
+REACT_APP_COUNTRY=USA

client/.env.production

@@ -1,14 +1,14 @@
 GENERATE_SOURCEMAP=true
-REACT_APP_GRAPHQL_ENDPOINT=https://db.imex.online/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT=https://db.romeonline.io/v1/graphql
-REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.imex.online/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.romeonline.io/v1/graphql
 REACT_APP_GA_CODE=231103507
-REACT_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU","authDomain":"imex-prod.firebaseapp.com","databaseURL":"https://imex-prod.firebaseio.com","projectId":"imex-prod","storageBucket":"imex-prod.appspot.com","messagingSenderId":"253497221485","appId":"1:253497221485:web:3c81c483b94db84b227a64","measurementId":"G-NTWBKG2L0M"}
+REACT_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"}
 REACT_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/bodyshop
 REACT_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/bodyshop
 REACT_APP_CLOUDINARY_API_KEY=473322739956866
 REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
-REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BMgZT1NZztW2DsJl8Mg2L04hgY9FzAg6b8fbzgNAfww2VDzH3VE63Ot9EaP_U7KWS2JT-7HPHaw0T_Tw_5vkZc8'
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-REACT_APP_AXIOS_BASE_API_URL=https://api.imex.online/
+REACT_APP_AXIOS_BASE_API_URL=https://api.romeonline.io/
-REACT_APP_REPORTS_SERVER_URL=https://reports.imex.online
+REACT_APP_REPORTS_SERVER_URL=https://reports.romeonline.io
 REACT_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk

client/.env.test

@@ -1,14 +1,14 @@
-REACT_APP_GRAPHQL_ENDPOINT=https://db.test.bodyshop.app/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT=https://db.test.romeonline.io/v1/graphql
-REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.test.bodyshop.app/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.test.romeonline.io/v1/graphql
-REACT_APP_GA_CODE=231099835
+REACT_APP_GA_CODE=231103507
-REACT_APP_FIREBASE_CONFIG={   "apiKey":"AIzaSyBw7_GTy7GtQyfkIRPVrWHEGKfcqeyXw0c",   "authDomain":"imex-test.firebaseapp.com",   "projectId":"imex-test",   "storageBucket":"imex-test.appspot.com",   "messagingSenderId":"991923618608",   "appId":"1:991923618608:web:633437569cdad78299bef5",   "measurementId":"G-TW0XLZEH18"}
+REACT_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"}
 REACT_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/bodyshop
 REACT_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/bodyshop
 REACT_APP_CLOUDINARY_API_KEY=473322739956866
 REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
-REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BN2GcDPjipR5MTEosO5dT4CfQ3cmrdBIsI4juoOQrRijn_5aRiHlwj1mlq0W145mOusx6xynEKl_tvYJhpCc9lo'
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-REACT_APP_AXIOS_BASE_API_URL=https://api.test.imex.online/
+REACT_APP_AXIOS_BASE_API_URL=https://api.test.romeonline.io/
-REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+REACT_APP_REPORTS_SERVER_URL=https://reports.test.romeonline.io
 REACT_APP_IS_TEST=true
 REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/README.md

@@ -15,7 +15,8 @@ You will also see any lint errors in the console.
 ### `yarn test`
 
 Launches the test runner in the interactive watch mode.<br />
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more
+information.
 
 ### `yarn build`
 
@@ -31,15 +32,21 @@ See the section about [deployment](https://facebook.github.io/create-react-app/d
 
 **Note: this is a one-way operation. Once you `eject`, you can’t go back!**
 
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will
+remove the single build dependency from your project.
 
-Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right
+into your project so you have full control over them. All of the commands except `eject` will still work, but they will
+point to the copied scripts so you can tweak them. At this point you’re on your own.
 
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you
+shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t
+customize it when you are ready for it.
 
 ## Learn More
 
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+You can learn more in
+the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
 
 To learn React, check out the [React documentation](https://reactjs.org/).
 
@@ -65,4 +72,5 @@ This section has moved here: https://facebook.github.io/create-react-app/docs/de
 
 ### `yarn build` fails to minify
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
+This section has moved
+here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify

client/craco.config.js

@@ -20,7 +20,7 @@ module.exports = {
         //         authToken:
         //             "6b45b028a02342db97a9a2f92c0959058665443d379d4a3a876430009e744260",
         //         org: "snapt-software",
-        //         project: "imexonline",
+        //         project: "rome-online",
         //         release: process.env.REACT_APP_GIT_SHA,
         //
         //         // webpack-specific configuration

client/cypress/e2e/01-General Render/01-home.cy.js

@@ -4,7 +4,8 @@ describe("Renders the General Page", () => {
     beforeEach(() => {
         cy.visit("/");
     });
-  it("Renders Correctly", () => {});
+    it("Renders Correctly", () => {
+    });
     it("Has the Slogan", () => {
         cy.findByText("A whole x22new kind of shop management system.").should(
             "exist"

client/cypress/e2e/2-advanced-examples/misc.cy.js

@@ -89,8 +89,10 @@ context('Misc', () => {
                 scale: false,
                 disableTimersAndAnimations: true,
                 screenshotOnRunFailure: true,
-        onBeforeScreenshot () { },
+                onBeforeScreenshot() {
-        onAfterScreenshot () { },
+                },
+                onAfterScreenshot() {
+                },
             })
         })
     })

client/cypress/e2e/2-advanced-examples/spies_stubs_clocks.cy.js

@@ -8,7 +8,8 @@ context('Spies, Stubs, and Clock', () => {
         cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
 
         const obj = {
-      foo () {},
+            foo() {
+            },
         }
 
         const spy = cy.spy(obj, 'foo').as('anyArgs')

client/cypress/tsconfig.json

@@ -2,7 +2,11 @@
   "compilerOptions": {
     "allowJs": true,
     "baseUrl": "../node_modules",
-    "types": ["cypress"]
+    "types": [
+      "cypress"
+    ]
   },
-  "include": ["**/*.*"]
+  "include": [
+    "**/*.*"
+  ]
 }

client/index.html

@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="/favicon.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#002366" />
-    <meta name="description" content="ImEX Online" />
-    <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
-    <link rel="apple-touch-icon" href="public/logo192.png" />
-    <script type="text/javascript">
-      window.$crisp = [];
-      window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
-      (function () {
-        d = document;
-        s = d.createElement("script");
-        s.src = "https://client.crisp.chat/l.js";
-        s.async = 1;
-        d.getElementsByTagName("head")[0].appendChild(s);
-      })();
-    </script>
-    <script>
-      !(function () {
-        "use strict";
-        var e = [
-          "debug",
-          "destroy",
-          "do",
-          "help",
-          "identify",
-          "is",
-          "off",
-          "on",
-          "ready",
-          "render",
-          "reset",
-          "safe",
-          "set",
-        ];
-        if (window.noticeable)
-          console.warn("Noticeable SDK code snippet loaded more than once");
-        else {
-          var n = (window.noticeable = window.noticeable || []);
-          function t(e) {
-            return function () {
-              var t = Array.prototype.slice.call(arguments);
-              return t.unshift(e), n.push(t), n;
-            };
-          }
-          !(function () {
-            for (var o = 0; o < e.length; o++) {
-              var r = e[o];
-              n[r] = t(r);
-            }
-          })(),
-            (function () {
-              var e = document.createElement("script");
-              (e.async = !0), (e.src = "https://sdk.noticeable.io/l.js");
-              var n = document.head;
-              n.insertBefore(e, n.firstChild);
-            })();
-        }
-      })();
-    </script>
-
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>ImEX Online</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-
-    <script type="module" src="src/index.js"></script>
-  </body>
-</html>

client/package.json

@@ -1,57 +1,48 @@
 {
   "name": "bodyshop",
   "version": "0.2.1",
-  "engines": {
-    "node": "18.18.2"
-  },
-  "type": "commonjs",
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
     "@ant-design/compatible": "^5.1.2",
     "@ant-design/pro-layout": "^7.17.16",
-    "@apollo/client": "^3.9.0",
+    "@apollo/client": "^3.8.10",
     "@asseinfo/react-kanban": "^2.2.0",
     "@craco/craco": "^7.1.0",
     "@fingerprintjs/fingerprintjs": "^4.2.2",
     "@jsreport/browser-client": "^3.1.0",
     "@reduxjs/toolkit": "^2.1.0",
-    "@sentry/cli": "^2.27.0",
+    "@sentry/cli": "^2.28.0",
-    "@sentry/react": "^7.99.0",
+    "@sentry/react": "^7.100.0",
-    "@sentry/tracing": "^7.99.0",
+    "@sentry/tracing": "^7.100.0",
     "@splitsoftware/splitio-react": "^1.11.0",
     "@tanem/react-nprogress": "^5.0.51",
-    "@vitejs/plugin-legacy": "^5.3.0",
+    "antd": "^5.14.0",
-    "@vitejs/plugin-react": "^4.2.1",
-    "@vitejs/plugin-react-refresh": "^1.3.6",
-    "@vitejs/plugin-react-swc": "^3.6.0",
-    "antd": "^5.13.3",
     "apollo-link-logger": "^2.0.1",
     "apollo-link-sentry": "^3.3.0",
     "axios": "^1.6.7",
-    "consola": "^3.2.3",
+    "craco-less": "^3.0.1",
     "dayjs": "^1.11.10",
     "dayjs-business-days2": "^1.2.2",
     "dinero.js": "^1.9.1",
     "dotenv": "^16.4.1",
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
-    "esbuild": "^0.20.0",
     "exifr": "^7.1.3",
-    "firebase": "^10.7.2",
+    "firebase": "^10.8.0",
     "graphql": "^16.6.0",
-    "i18next": "^23.8.1",
+    "i18next": "^23.8.2",
     "i18next-browser-languagedetector": "^7.0.2",
     "jsoneditor": "^10.0.0",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.10.54",
+    "libphonenumber-js": "^1.10.55",
     "logrocket": "^7.0.0",
     "markerjs2": "^2.32.0",
     "normalize-url": "^8.0.0",
     "phone": "^3.1.42",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.8.1",
-    "query-string": "^8.1.0",
+    "query-string": "^8.2.0",
     "rc-queue-anim": "^2.0.0",
     "rc-scroll-anim": "^2.7.6",
     "react": "^18.2.0",
@@ -62,15 +53,16 @@
     "react-drag-listview": "^2.0.0",
     "react-grid-gallery": "^1.0.0",
     "react-grid-layout": "1.3.4",
-    "react-i18next": "^14.0.1",
+    "react-i18next": "^14.0.4",
     "react-icons": "^5.0.1",
     "react-image-lightbox": "^5.1.4",
-    "react-intersection-observer": "^9.5.3",
+    "react-intersection-observer": "^9.7.0",
     "react-markdown": "^9.0.1",
     "react-number-format": "^5.1.4",
     "react-redux": "^9.1.0",
     "react-resizable": "^3.0.5",
-    "react-router-dom": "^6.21.2",
+    "react-router-dom": "^6.22.0",
+    "react-scripts": "^5.0.1",
     "react-sticky": "^6.0.3",
     "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.5",
@@ -85,7 +77,6 @@
     "styled-components": "^6.1.8",
     "subscriptions-transport-ws": "^0.11.0",
     "terser-webpack-plugin": "^5.3.10",
-    "vite-plugin-svgr": "^4.2.0",
     "web-vitals": "^3.5.2",
     "workbox-core": "^7.0.0",
     "workbox-expiration": "^7.0.0",
@@ -97,11 +88,11 @@
   },
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",
-    "start": "vite",
+    "start": "craco start",
-    "build": "cross-env-shell VITE_APP_GIT_SHA=\\\"`git rev-parse --short HEAD`\\\" vite build && npm run sentry:sourcemaps",
+    "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
     "build:test": "env-cmd -f .env.test npm run build",
     "build-deploy:test": "npm run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
-    "buildcra": "cross-env-shell VITE_APP_GIT_SHA=\\\"`git rev-parse --short HEAD`\\\" vite build",
+    "buildcra": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
     "test": "cypress open",
     "eject": "react-scripts eject",
     "madge": "madge  --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular .",
@@ -132,28 +123,12 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/preset-react": "^7.23.3",
+    "@sentry/webpack-plugin": "^2.14.0",
-    "@emotion/babel-plugin": "^11.11.0",
-    "@emotion/react": "^11.11.3",
-    "@sentry/webpack-plugin": "^2.10.3",
-    "@swc/core": "^1.3.107",
-    "@swc/plugin-styled-components": "^1.5.108",
     "@testing-library/cypress": "^10.0.1",
-    "browserslist": "^4.22.3",
-    "browserslist-to-esbuild": "^2.1.1",
-    "craco-less": "^3.0.1",
-    "cross-env": "^7.0.3",
     "cypress": "^13.6.4",
     "eslint-plugin-cypress": "^2.15.1",
-    "memfs": "^4.6.0",
-    "os-browserify": "^0.3.0",
     "react-error-overlay": "6.0.11",
     "redux-logger": "^3.0.6",
-    "source-map-explorer": "^2.5.3",
+    "source-map-explorer": "^2.5.3"
-    "vite": "^5.0.11",
-    "vite-plugin-babel": "^1.2.0",
-    "vite-plugin-legacy": "^2.1.0",
-    "vite-plugin-node-polyfills": "^0.19.0",
-    "vite-plugin-style-import": "^2.0.0"
   }
 }

client/public/firebase-messaging-sw.js

@@ -28,6 +28,17 @@ switch (this.location.hostname) {
             // measurementId: "${config.measurementId}",
         };
         break;
+    case "romeonline.io":
+        firebaseConfig = {
+            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",
+        };
+        break;
     case "imex.online":
     default:
         firebaseConfig = {

client/public/index.html

@@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8"/>
+    <link href="%PUBLIC_URL%/ro-favicon.png" rel="icon"/>
+    <meta content="width=device-width, initial-scale=1" name="viewport"/>
+    <meta content="#002366" name="theme-color"/>
+    <meta content="Rome Online" name="description"/>
+    <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
+
+    <!--Use the below code snippet to provide real time updates to the live chat plugin without the need of copying and paste each time to your website when changes are made via PBX-->
+
+    <call-us-selector party="LiveChat528346" phonesystem-url=https://rometech.east.3cx.us:5001></call-us-selector>
+
+    <!--Incase you don't want real time updates to the live chat plugin when options are changed, use the below code snippet. Please note that each time you change the settings you will need to copy and paste the snippet code to your website-->
+
+    <!--<call-us
+
+    phonesystem-url=https://rometech.east.3cx.us:5001
+
+    style="position:fixed;font-size:16px;line-height:17px;z-index: 99999;right: 20px; bottom: 20px;"
+
+    id="wp-live-chat-by-3CX"
+
+    minimized="true"
+
+    animation-style="noanimation"
+
+    party="LiveChat528346"
+
+    minimized-style="bubbleright"
+
+    allow-call="true"
+
+    allow-video="false"
+
+    allow-soundnotifications="true"
+
+    enable-mute="true"
+
+    enable-onmobile="true"
+
+    offline-enabled="true"
+
+    enable="true"
+
+    ignore-queueownership="false"
+
+    authentication="both"
+
+    show-operator-actual-name="true"
+
+    aknowledge-received="true"
+
+    gdpr-enabled="false"
+
+    message-userinfo-format="name"
+
+    message-dateformat="both"
+
+    lang="browser"
+
+    button-icon-type="default"
+
+    greeting-visibility="none"
+
+    greeting-offline-visibility="none"
+
+    chat-delay="2000"
+
+    enable-direct-call="true"
+
+    enable-ga="false"
+
+    ></call-us>-->
+
+    <script charset="utf-8" defer id="tcx-callus-js"
+            src=https://downloads-global.3cx.com/downloads/livechatandtalk/v1/callus.js></script>
+
+    <link href="logo192.png" rel="apple-touch-icon"/>
+    <script>
+        !(function () {
+            "use strict";
+            var e = [
+                "debug",
+                "destroy",
+                "do",
+                "help",
+                "identify",
+                "is",
+                "off",
+                "on",
+                "ready",
+                "render",
+                "reset",
+                "safe",
+                "set",
+            ];
+            if (window.noticeable)
+                console.warn("Noticeable SDK code snippet loaded more than once");
+            else {
+                var n = (window.noticeable = window.noticeable || []);
+
+                function t(e) {
+                    return function () {
+                        var t = Array.prototype.slice.call(arguments);
+                        return t.unshift(e), n.push(t), n;
+                    };
+                }
+
+                !(function () {
+                    for (var o = 0; o < e.length; o++) {
+                        var r = e[o];
+                        n[r] = t(r);
+                    }
+                })(),
+                    (function () {
+                        var e = document.createElement("script");
+                        (e.async = !0), (e.src = "https://sdk.noticeable.io/l.js");
+                        var n = document.head;
+                        n.insertBefore(e, n.firstChild);
+                    })();
+            }
+        })();
+    </script>
+
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link href="%PUBLIC_URL%/manifest.json" rel="manifest"/>
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>Rome Online</title>
+</head>
+<body>
+<noscript>You need to enable JavaScript to run this app.</noscript>
+<div id="root"></div>
+</body>
+</html>

client/public/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "ImEX Online",
+  "short_name": "Rome Online",
-  "name": "ImEX Online",
+  "name": "Rome Online",
   "description": "The ultimate bodyshop management system.",
   "icons": [
     {

client/src/App/App.container.jsx

@@ -17,7 +17,7 @@ dayjs.locale("en");
 
 const config = {
     core: {
-        authorizationKey: import.meta.env.VITE_APP_SPLIT_API,
+        authorizationKey: process.env.REACT_APP_SPLIT_API,
         key: "anon",
     },
 };

client/src/App/App.jsx

@@ -90,10 +90,10 @@ export function App({bodyshop, checkUserSession, currentUser, online, setOnline,
 
             if (
                 client.getTreatment("LogRocket_Tracking") === "on" ||
-                window.location.hostname === 'beta.imex.online'
+                window.location.hostname === 'beta.romeonline.io'
             ) {
                 console.log("LR Start");
-                LogRocket.init("gvfvfw/bodyshopapp");
+                LogRocket.init("rome-online/rome-online");
             }
         }
     }, [bodyshop, client, currentUser.authorized]);
@@ -129,7 +129,7 @@ export function App({bodyshop, checkUserSession, currentUser, online, setOnline,
 
     // Any route that is not assigned and matched will default to the Landing Page component
     return (
-        <Suspense fallback={<LoadingSpinner message="ImEX Online"/>}>
+        <Suspense fallback={<LoadingSpinner message="Rome Online"/>}>
             <Routes>
                 <Route path="*" element={<ErrorBoundary><LandingPage/></ErrorBoundary>}/>
                 <Route path="/signin" element={<ErrorBoundary><SignInPage/></ErrorBoundary>}/>

client/src/App/App.styles.scss

@@ -83,6 +83,7 @@
   animation: alertBlinker 1s linear infinite;
   color: blue;
 }
+
 @keyframes alertBlinker {
   50% {
     color: red;
@@ -99,6 +100,7 @@
   color: rgba(255, 140, 0, 0.8);
   font-weight: bold;
 }
+
 .production-completion-past {
   color: rgba(255, 0, 0, 0.8);
   font-weight: bold;

client/src/App/themeProvider.js

@@ -23,7 +23,8 @@ const defaultTheme = {
         }
     },
     token: {
-        colorPrimary: '#1677ff'
+        colorPrimary: "#326ade",
+        colorInfo: "#326ade"
     }
 };
 
@@ -50,7 +51,7 @@ const devTheme = {
  */
 const prodTheme = {};
 
-const currentTheme = import.meta.env.DEV ? devTheme
+const currentTheme = process.env.NODE_ENV === "development" ? devTheme
     : prodTheme;
 
 const finaltheme = {

client/src/assets/User.svg

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 -256 1792 1792">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
+     viewBox="0 -256 1792 1792">
     <g transform="matrix(1,0,0,-1,197.42373,1300.6102)">
         <path d="M 1408,131 Q 1408,11 1335,-58.5 1262,-128 1141,-128 H 267 Q 146,-128 73,-58.5 0,11 0,131 0,184 3.5,234.5 7,285 17.5,343.5 28,402 44,452 q 16,50 43,97.5 27,47.5 62,81 35,33.5 85.5,53.5 50.5,20 111.5,20 9,0 42,-21.5 33,-21.5 74.5,-48 41.5,-26.5 108,-48 Q 637,565 704,565 q 67,0 133.5,21.5 66.5,21.5 108,48 41.5,26.5 74.5,48 33,21.5 42,21.5 61,0 111.5,-20 50.5,-20 85.5,-53.5 35,-33.5 62,-81 27,-47.5 43,-97.5 16,-50 26.5,-108.5 10.5,-58.5 14,-109 Q 1408,184 1408,131 z m -320,893 Q 1088,865 975.5,752.5 863,640 704,640 545,640 432.5,752.5 320,865 320,1024 320,1183 432.5,1295.5 545,1408 704,1408 863,1408 975.5,1295.5 1088,1183 1088,1024 z"/>
     </g>

client/src/assets/car.svg

@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M23.5 7c.276 0 .5.224.5.5v.511c0 .793-.926.989-1.616.989l-1.086-2h2.202zm-1.441 3.506c.639 1.186.946 2.252.946 3.666 0 1.37-.397 2.533-1.005 3.981v1.847c0 .552-.448 1-1 1h-1.5c-.552 0-1-.448-1-1v-1h-13v1c0 .552-.448 1-1 1h-1.5c-.552 0-1-.448-1-1v-1.847c-.608-1.448-1.005-2.611-1.005-3.981 0-1.414.307-2.48.946-3.666.829-1.537 1.851-3.453 2.93-5.252.828-1.382 1.262-1.707 2.278-1.889 1.532-.275 2.918-.365 4.851-.365s3.319.09 4.851.365c1.016.182 1.45.507 2.278 1.889 1.079 1.799 2.101 3.715 2.93 5.252zm-16.059 2.994c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5.672 1.5 1.5 1.5 1.5-.672 1.5-1.5zm10 1c0-.276-.224-.5-.5-.5h-7c-.276 0-.5.224-.5.5s.224.5.5.5h7c.276 0 .5-.224.5-.5zm2.941-5.527s-.74-1.826-1.631-3.142c-.202-.298-.515-.502-.869-.566-1.511-.272-2.835-.359-4.441-.359s-2.93.087-4.441.359c-.354.063-.667.267-.869.566-.891 1.315-1.631 3.142-1.631 3.142 1.64.313 4.309.497 6.941.497s5.301-.184 6.941-.497zm2.059 4.527c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5.672 1.5 1.5 1.5 1.5-.672 1.5-1.5zm-18.298-6.5h-2.202c-.276 0-.5.224-.5.5v.511c0 .793.926.989 1.616.989l1.086-2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M23.5 7c.276 0 .5.224.5.5v.511c0 .793-.926.989-1.616.989l-1.086-2h2.202zm-1.441 3.506c.639 1.186.946 2.252.946 3.666 0 1.37-.397 2.533-1.005 3.981v1.847c0 .552-.448 1-1 1h-1.5c-.552 0-1-.448-1-1v-1h-13v1c0 .552-.448 1-1 1h-1.5c-.552 0-1-.448-1-1v-1.847c-.608-1.448-1.005-2.611-1.005-3.981 0-1.414.307-2.48.946-3.666.829-1.537 1.851-3.453 2.93-5.252.828-1.382 1.262-1.707 2.278-1.889 1.532-.275 2.918-.365 4.851-.365s3.319.09 4.851.365c1.016.182 1.45.507 2.278 1.889 1.079 1.799 2.101 3.715 2.93 5.252zm-16.059 2.994c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5.672 1.5 1.5 1.5 1.5-.672 1.5-1.5zm10 1c0-.276-.224-.5-.5-.5h-7c-.276 0-.5.224-.5.5s.224.5.5.5h7c.276 0 .5-.224.5-.5zm2.941-5.527s-.74-1.826-1.631-3.142c-.202-.298-.515-.502-.869-.566-1.511-.272-2.835-.359-4.441-.359s-2.93.087-4.441.359c-.354.063-.667.267-.869.566-.891 1.315-1.631 3.142-1.631 3.142 1.64.313 4.309.497 6.941.497s5.301-.184 6.941-.497zm2.059 4.527c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5.672 1.5 1.5 1.5 1.5-.672 1.5-1.5zm-18.298-6.5h-2.202c-.276 0-.5.224-.5.5v.511c0 .793.926.989 1.616.989l1.086-2z"/>
+</svg>

client/src/assets/icons/technology.svg

@@ -1,5 +1,21 @@
-<?xml version="1.0" ?><svg style="enable-background:new 0 0 128 128;" version="1.1" viewBox="0 0 128 128" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><style type="text/css">
+<?xml version="1.0" ?>
+<svg style="enable-background:new 0 0 128 128;" version="1.1" viewBox="0 0 128 128" xml:space="preserve"
+     xmlns="http://www.w3.org/2000/svg"><style type="text/css">
 	.st0{fill:none;stroke:#000000;stroke-width:8;stroke-miterlimit:10;}
 	.st1{display:none;}
 	.st2{display:inline;opacity:0.25;fill:#F45EFD;}
-</style><g id="_x31_2_3D_Printing"/><g id="_x31_1_VR_Gear"/><g id="_x31_0_Virtual_reality"/><g id="_x39__Augmented_reality"/><g id="_x38__Teleport"/><g id="_x37__Glassess"/><g id="_x36__Folding_phone"/><g id="_x35__Drone"/><g id="_x34__Retina_scan"/><g id="_x33__Smartwatch"/><g id="_x32__Bionic_Arm"/><g id="_x31__Chip"><g><path d="M108,40c-5.2,0-9.6,3.3-11.3,8H84V32h-8V20h-8v12h-8V20h-8v12h-8v16H24v-8.7c4.7-1.7,8-6.1,8-11.3c0-6.6-5.4-12-12-12    S8,21.4,8,28c0,5.2,3.3,9.6,8,11.3V56h28v8H16v16.7c-4.7,1.7-8,6.1-8,11.3c0,6.6,5.4,12,12,12s12-5.4,12-12c0-5.2-3.3-9.6-8-11.3    V72h20v16h8v12h8V88h8v12h8V88h8V72h8v16.7c-4.7,1.7-8,6.1-8,11.3c0,6.6,5.4,12,12,12s12-5.4,12-12c0-5.2-3.3-9.6-8-11.3V64H84v-8    h12.7c1.7,4.7,6.1,8,11.3,8c6.6,0,12-5.4,12-12S114.6,40,108,40z M20,32c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S22.2,32,20,32z     M20,96c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S22.2,96,20,96z M76,80H52V40h24V80z M96,96c2.2,0,4,1.8,4,4s-1.8,4-4,4s-4-1.8-4-4    S93.8,96,96,96z M108,56c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S110.2,56,108,56z"/><rect height="8" width="8" x="56" y="64"/></g></g><g class="st1" id="Guide"><path class="st2" d="M120,8v112H8V8H120 M128,0H0v128h128V0L128,0z"/></g></svg>
+</style>
+    <g id="_x31_2_3D_Printing"/>
+    <g id="_x31_1_VR_Gear"/>
+    <g id="_x31_0_Virtual_reality"/>
+    <g id="_x39__Augmented_reality"/>
+    <g id="_x38__Teleport"/>
+    <g id="_x37__Glassess"/>
+    <g id="_x36__Folding_phone"/>
+    <g id="_x35__Drone"/>
+    <g id="_x34__Retina_scan"/>
+    <g id="_x33__Smartwatch"/>
+    <g id="_x32__Bionic_Arm"/>
+    <g id="_x31__Chip"><g><path d="M108,40c-5.2,0-9.6,3.3-11.3,8H84V32h-8V20h-8v12h-8V20h-8v12h-8v16H24v-8.7c4.7-1.7,8-6.1,8-11.3c0-6.6-5.4-12-12-12    S8,21.4,8,28c0,5.2,3.3,9.6,8,11.3V56h28v8H16v16.7c-4.7,1.7-8,6.1-8,11.3c0,6.6,5.4,12,12,12s12-5.4,12-12c0-5.2-3.3-9.6-8-11.3    V72h20v16h8v12h8V88h8v12h8V88h8V72h8v16.7c-4.7,1.7-8,6.1-8,11.3c0,6.6,5.4,12,12,12s12-5.4,12-12c0-5.2-3.3-9.6-8-11.3V64H84v-8    h12.7c1.7,4.7,6.1,8,11.3,8c6.6,0,12-5.4,12-12S114.6,40,108,40z M20,32c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S22.2,32,20,32z     M20,96c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S22.2,96,20,96z M76,80H52V40h24V80z M96,96c2.2,0,4,1.8,4,4s-1.8,4-4,4s-4-1.8-4-4    S93.8,96,96,96z M108,56c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S110.2,56,108,56z"/><rect
+            height="8" width="8" x="56" y="64"/></g></g>
+    <g class="st1" id="Guide"><path class="st2" d="M120,8v112H8V8H120 M128,0H0v128h128V0L128,0z"/></g></svg>

client/src/assets/unfolded_car-orig.svg

@@ -5,10 +5,9 @@
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:cc="http://creativecommons.org/ns#"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
         xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
         xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns="http://www.w3.org/2000/svg"
         width="1668"
         height="1160"
         id="svg2"

client/src/assets/unfolded_car.svg

@@ -3,10 +3,9 @@
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:cc="http://creativecommons.org/ns#"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
         xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
         xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns="http://www.w3.org/2000/svg"
         viewBox="0 0 1668 1160"
         version="1.1"
         id="svg166"

client/src/assets/unfolded_car_clean.svg

@@ -1,92 +1,162 @@
 <svg id="svg166" version="1.1" viewBox="0 0 1668 1160" xmlns="http://www.w3.org/2000/svg">
     <g id="g158" transform="translate(254 -254)">
         <g id="g34" transform="translate(-13.78 3.524)" stroke="#000">
-   <path id="path10" d="m494.57 1006.9c41.429-15.714 140-11.427 191.43-12.857 51.429-1.429 160.48 10.23 201.43 27.143 40.995 16.93 134.78 67.656 151.43 72.857 22.857 7.143 41.429 7.143 80 20 38.572 12.857 25.714 32.857 25.714 32.857l-30-4.286-5.756 52.92s37.185 1.366 41.47 15.652c4.286 14.286 5.715 31.428-2.856 41.428-8.572 10-14.286-1.428-18.572 12.858-4.286 14.285-2.857 28.571-27.143 27.142-24.285-1.428-98.571 0-98.571 0s-15.714-108.57-98.573-105.71c-82.857 2.857-95.714 105.71-95.714 105.71h-500s-5.714-104.28-97.143-105.71c-91.428-1.428-98.571 105.71-98.571 105.71h-65.713l-18.572-38.571c-0.515 0-26.243 0-21.428-17.143 4.651-16.561-4.286-41.428 17.142-41.428 21.429 0 47.143 1.428 47.143 1.428l15.715-44.286-41.429-2.857s34.286-24.285 118.57-32.857c84.286-8.571 157.14-8.571 192.86-31.428 35.714-22.858 137.14-78.572 137.14-78.572z" fill="none" stroke-width="5"/>
+            <path id="path10"
+                  d="m494.57 1006.9c41.429-15.714 140-11.427 191.43-12.857 51.429-1.429 160.48 10.23 201.43 27.143 40.995 16.93 134.78 67.656 151.43 72.857 22.857 7.143 41.429 7.143 80 20 38.572 12.857 25.714 32.857 25.714 32.857l-30-4.286-5.756 52.92s37.185 1.366 41.47 15.652c4.286 14.286 5.715 31.428-2.856 41.428-8.572 10-14.286-1.428-18.572 12.858-4.286 14.285-2.857 28.571-27.143 27.142-24.285-1.428-98.571 0-98.571 0s-15.714-108.57-98.573-105.71c-82.857 2.857-95.714 105.71-95.714 105.71h-500s-5.714-104.28-97.143-105.71c-91.428-1.428-98.571 105.71-98.571 105.71h-65.713l-18.572-38.571c-0.515 0-26.243 0-21.428-17.143 4.651-16.561-4.286-41.428 17.142-41.428 21.429 0 47.143 1.428 47.143 1.428l15.715-44.286-41.429-2.857s34.286-24.285 118.57-32.857c84.286-8.571 157.14-8.571 192.86-31.428 35.714-22.858 137.14-78.572 137.14-78.572z"
+                  fill="none" stroke-width="5"/>
             <path id="path12" d="m28.857 1254h92.857m180 0h517.14m172.86 0h151.43" fill="none" stroke-width="2"/>
-   <path id="path14" d="m364.57 1101.1c15.715-18.572 123.37-81.525 151.43-88.572 29.502-7.41 103-7.142 103-7.142l-7.143 95.714z" fill="#f0ffeb" stroke-width="5"/>
+            <path id="path14"
+                  d="m364.57 1101.1c15.715-18.572 123.37-81.525 151.43-88.572 29.502-7.41 103-7.142 103-7.142l-7.143 95.714z"
+                  fill="#f0ffeb" stroke-width="5"/>
             <path id="path16" d="m404.57 1071.1v28.571" fill="none" stroke-width="2"/>
-   <path id="path18" d="m644.7 1006.8-4.285 94.328h207.16c-11.307-20.753-46.612-74.906-72.857-88.572-14.285-10-82.878-4.327-130.02-5.756zm167.02 7.164s80 84.286 85.715 87.143c5.714 2.857 115.71 1.428 115.71 1.428s-77.143-47.141-102.86-58.571c-25.715-11.429-90-31.429-98.572-30z" fill="#f0ffeb" stroke-width="5"/>
+            <path id="path18"
+                  d="m644.7 1006.8-4.285 94.328h207.16c-11.307-20.753-46.612-74.906-72.857-88.572-14.285-10-82.878-4.327-130.02-5.756zm167.02 7.164s80 84.286 85.715 87.143c5.714 2.857 115.71 1.428 115.71 1.428s-77.143-47.141-102.86-58.571c-25.715-11.429-90-31.429-98.572-30z"
+                  fill="#f0ffeb" stroke-width="5"/>
             <g fill="none">
-    <path id="path20" d="m345.64 1091.7c-14.075 30.968-18.298 71.788-18.298 94.31 0 22.521 4.223 91.493 22.521 105.57m282.93-298.41c-1.408 5.63-4.047 81.903-6.51 106.93-3.67 18.715-4.989 51.219-6.159 87.315 0 22.522 7.038 80.233 12.669 105.57" stroke-width="5"/>
+                <path id="path20"
-    <path id="path22" d="m103.53 1252.1s15.483-85.864 106.98-85.864c91.494 0 109.79 87.271 109.79 87.271m479.99 0s15.483-85.863 106.98-85.863c91.493 0 109.79 87.27 109.79 87.27m-947.31-57.711h63.342" stroke-width="2"/>
+                      d="m345.64 1091.7c-14.075 30.968-18.298 71.788-18.298 94.31 0 22.521 4.223 91.493 22.521 105.57m282.93-298.41c-1.408 5.63-4.047 81.903-6.51 106.93-3.67 18.715-4.989 51.219-6.159 87.315 0 22.522 7.038 80.233 12.669 105.57"
-    <path id="path24" d="m779.18 1000.2c18.299 12.668 56.304 50.673 92.9 104.16 36.598 53.489 8.447 59.12-18.298 74.603-26.744 15.483-49.266 42.227-67.564 112.61" stroke-width="5"/>
+                      stroke-width="5"/>
+                <path id="path22"
+                      d="m103.53 1252.1s15.483-85.864 106.98-85.864c91.494 0 109.79 87.271 109.79 87.271m479.99 0s15.483-85.863 106.98-85.863c91.493 0 109.79 87.27 109.79 87.27m-947.31-57.711h63.342"
+                      stroke-width="2"/>
+                <path id="path24"
+                      d="m779.18 1000.2c18.299 12.668 56.304 50.673 92.9 104.16 36.598 53.489 8.447 59.12-18.298 74.603-26.744 15.483-49.266 42.227-67.564 112.61"
+                      stroke-width="5"/>
                 <path id="path26" d="m1112.8 1196h-129.5m-696.76-0.222h544.74m-22.522-150.61v54.896" stroke-width="2"/>
             </g>
             <g stroke-width="2">
-    <rect id="rect28" x="558.65" y="1144.9" width="41.286" height="14.541" rx="2.933" ry="7.379" fill="#e6e6e6"/>
+                <rect id="rect28" x="558.65" y="1144.9" width="41.286" height="14.541" rx="2.933" ry="7.379"
-    <rect id="rect30" x="816.24" y="1144.9" width="41.286" height="14.541" rx="2.933" ry="7.379" fill="#e6e6e6"/>
+                      fill="#e6e6e6"/>
-    <rect id="rect32" x="259.53" y="1146.3" width="18.776" height="11.738" rx="1.63" ry="7.692" fill="#ffcb00"/>
+                <rect id="rect30" x="816.24" y="1144.9" width="41.286" height="14.541" rx="2.933" ry="7.379"
+                      fill="#e6e6e6"/>
+                <rect id="rect32" x="259.53" y="1146.3" width="18.776" height="11.738" rx="1.63" ry="7.692"
+                      fill="#ffcb00"/>
             </g>
         </g>
         <g id="g54" transform="translate(-13.78 15.524)" stroke="#000">
-   <path id="path36" d="m62.767 812.59-11.712 16.12-18.95-6.157v-19.925l18.95-6.158z" fill="none" stroke-width="5"/>
+            <path id="path36" d="m62.767 812.59-11.712 16.12-18.95-6.157v-19.925l18.95-6.158z" fill="none"
+                  stroke-width="5"/>
             <path id="path38" d="m31.742 745.02 315.3-111.2m-316.71 254.77 315.3 115.42" fill="none" stroke-width="2"/>
-   <path id="path40" d="m341.41 632.78 140.76 38.005s-8.446 49.222-8.446 71.963v147.62c0 30.967 8.445 78.825 8.445 78.825l-140.76 33.782s-17.242-61.902-17.242-92.901l2.111-185.8c-1.408-30.967 15.132-91.493 15.132-91.493z" fill="#f0ffeb" stroke-width="5"/>
+            <path id="path40"
+                  d="m341.41 632.78 140.76 38.005s-8.446 49.222-8.446 71.963v147.62c0 30.967 8.445 78.825 8.445 78.825l-140.76 33.782s-17.242-61.902-17.242-92.901l2.111-185.8c-1.408-30.967 15.132-91.493 15.132-91.493z"
+                  fill="#f0ffeb" stroke-width="5"/>
             <g fill="none">
-    <path id="path42" d="m482.17 670.79s94.309 5.63 152.02 5.63c106.98 0 201.29-5.63 201.29-5.63m-1.408 297s-77.418-5.63-199.88-5.63c-68.972 0-152.02 7.038-152.02 7.038" stroke-width="5"/>
+                <path id="path42"
-    <rect id="rect44" x="528.62" y="729.2" width="106.98" height="181.58" rx="31.19" ry="34.436" stroke-width="2"/>
+                      d="m482.17 670.79s94.309 5.63 152.02 5.63c106.98 0 201.29-5.63 201.29-5.63m-1.408 297s-77.418-5.63-199.88-5.63c-68.972 0-152.02 7.038-152.02 7.038"
-    <path id="path46" d="m345.78 632.78h-294.19l-14.076 102.75-7.038 11.26v142.17l7.038 14.076 15.483 101.35h288.56m491.11-333.6s-12.668 47.858-12.668 73.195v146.39c0 25.336 12.668 77.417 12.668 77.417l205.51 38.005h108.38s14.076-81.64 14.076-115.42v-147.8c0-38.005-14.076-109.79-14.076-109.79h-108.38z" stroke-width="5"/>
+                      stroke-width="5"/>
+                <rect id="rect44" x="528.62" y="729.2" width="106.98" height="181.58" rx="31.19" ry="34.436"
+                      stroke-width="2"/>
+                <path id="path46"
+                      d="m345.78 632.78h-294.19l-14.076 102.75-7.038 11.26v142.17l7.038 14.076 15.483 101.35h288.56m491.11-333.6s-12.668 47.858-12.668 73.195v146.39c0 25.336 12.668 77.417 12.668 77.417l205.51 38.005h108.38s14.076-81.64 14.076-115.42v-147.8c0-38.005-14.076-109.79-14.076-109.79h-108.38z"
+                      stroke-width="5"/>
             </g>
-   <path id="path48" d="m843.92 689.09s-8.445 40.82-8.445 56.303v144.98c0 19.706 7.038 57.711 7.038 57.711s94.308 26.744 123.87 26.744h42.228v-312.49h-47.859c-25.336 0-116.83 26.745-116.83 26.745z" fill="#f0ffeb" stroke-width="5"/>
+            <path id="path48"
-   <path id="path50" d="m1038.2 632.78s30.967 40.82 30.967 111.2v146.39c0 64.749-30.967 116.83-30.967 116.83m-713.65-263.22 32.374-32.375v-40.82 112.61m-33.078 81.641 32.374-32.375v-40.82 112.61m648.9-116.83-32.375-32.374v-40.82 112.61" fill="none" stroke-width="2"/>
+                  d="m843.92 689.09s-8.445 40.82-8.445 56.303v144.98c0 19.706 7.038 57.711 7.038 57.711s94.308 26.744 123.87 26.744h42.228v-312.49h-47.859c-25.336 0-116.83 26.745-116.83 26.745z"
-   <path id="path52" d="m341.41 632.78s-42.228 78.825-42.228 111.2v146.39c0 40.82 42.228 114.02 42.228 114.02" fill="none" stroke-width="2"/>
+                  fill="#f0ffeb" stroke-width="5"/>
+            <path id="path50"
+                  d="m1038.2 632.78s30.967 40.82 30.967 111.2v146.39c0 64.749-30.967 116.83-30.967 116.83m-713.65-263.22 32.374-32.375v-40.82 112.61m-33.078 81.641 32.374-32.375v-40.82 112.61m648.9-116.83-32.375-32.374v-40.82 112.61"
+                  fill="none" stroke-width="2"/>
+            <path id="path52" d="m341.41 632.78s-42.228 78.825-42.228 111.2v146.39c0 40.82 42.228 114.02 42.228 114.02"
+                  fill="none" stroke-width="2"/>
         </g>
         <g fill="none" stroke="#000">
-   <path id="path56" d="m-106.79 740.92 1.407-91.493s5.63-23.93-25.337-25.337c-30.967-1.408-26.744 2.815-26.744 2.815l1.408 415.24h28.152c28.152 0 22.521-22.52 22.521-22.52v-95.717c-12.677 0-11.26-9.614-11.26-16.891v-149.2c0.45-18.89 9.853-16.892 9.853-16.892z" stroke-width="5"/>
+            <path id="path56"
-   <path id="path58" d="m-155.99 646.16h49.265m-48.415 374.27h49.266m-50.82-315.37h49.266m-46.451 259.81h49.266" stroke-width="2.2"/>
+                  d="m-106.79 740.92 1.407-91.493s5.63-23.93-25.337-25.337c-30.967-1.408-26.744 2.815-26.744 2.815l1.408 415.24h28.152c28.152 0 22.521-22.52 22.521-22.52v-95.717c-12.677 0-11.26-9.614-11.26-16.891v-149.2c0.45-18.89 9.853-16.892 9.853-16.892z"
+                  stroke-width="5"/>
+            <path id="path58"
+                  d="m-155.99 646.16h49.265m-48.415 374.27h49.266m-50.82-315.37h49.266m-46.451 259.81h49.266"
+                  stroke-width="2.2"/>
             <path id="path60" d="m-147.1 703.82v260.4m9.853-258.84v260.4" stroke-width="2"/>
         </g>
         <g id="g88" transform="translate(-13.78 15.524)" stroke="#000">
-   <path id="path62" d="m494.57 641.61c41.429 15.714 140 11.428 191.43 12.856s160.48-10.23 201.43-27.143c40.995-16.93 134.78-67.656 151.43-72.857 22.857-7.143 41.429-7.143 80-20 38.572-12.857 25.714-32.857 25.714-32.857l-30 4.285-5.756-52.92s37.185-1.365 41.47-15.651c4.286-14.286 5.715-31.429-2.856-41.429-8.572-10-14.286 1.429-18.572-12.857-4.286-14.285-2.857-28.571-27.143-27.143-24.285 1.429-98.571 0-98.571 0s-15.714 108.57-98.572 105.72c-82.857-2.857-95.714-105.72-95.714-105.72h-500s-5.714 104.29-97.143 105.72c-91.428 1.428-98.571-105.72-98.571-105.72h-65.714l-18.572 38.572c-0.515 0-26.243 0-21.428 17.143 4.651 16.561-4.286 41.428 17.142 41.428 21.429 0 47.143-1.428 47.143-1.428l15.715 44.285-41.429 2.859s34.286 24.285 118.57 32.857c84.286 8.571 157.14 8.571 192.86 31.428 35.714 22.857 137.14 78.572 137.14 78.572z" fill="none" stroke-width="5"/>
+            <path id="path62"
+                  d="m494.57 641.61c41.429 15.714 140 11.428 191.43 12.856s160.48-10.23 201.43-27.143c40.995-16.93 134.78-67.656 151.43-72.857 22.857-7.143 41.429-7.143 80-20 38.572-12.857 25.714-32.857 25.714-32.857l-30 4.285-5.756-52.92s37.185-1.365 41.47-15.651c4.286-14.286 5.715-31.429-2.856-41.429-8.572-10-14.286 1.429-18.572-12.857-4.286-14.285-2.857-28.571-27.143-27.143-24.285 1.429-98.571 0-98.571 0s-15.714 108.57-98.572 105.72c-82.857-2.857-95.714-105.72-95.714-105.72h-500s-5.714 104.29-97.143 105.72c-91.428 1.428-98.571-105.72-98.571-105.72h-65.714l-18.572 38.572c-0.515 0-26.243 0-21.428 17.143 4.651 16.561-4.286 41.428 17.142 41.428 21.429 0 47.143-1.428 47.143-1.428l15.715 44.285-41.429 2.859s34.286 24.285 118.57 32.857c84.286 8.571 157.14 8.571 192.86 31.428 35.714 22.857 137.14 78.572 137.14 78.572z"
+                  fill="none" stroke-width="5"/>
             <path id="path64" d="m28.857 394.47h92.857m180 0h517.14m172.86 0h151.43" fill="none" stroke-width="2"/>
-   <path id="path66" d="m364.57 547.33c15.715 18.571 123.37 81.524 151.43 88.571 29.502 7.41 103 7.143 103 7.143l-7.143-95.714z" fill="#f0ffeb" stroke-width="5"/>
+            <path id="path66"
+                  d="m364.57 547.33c15.715 18.571 123.37 81.524 151.43 88.571 29.502 7.41 103 7.143 103 7.143l-7.143-95.714z"
+                  fill="#f0ffeb" stroke-width="5"/>
             <path id="path68" d="m404.57 577.33v-28.571" fill="none" stroke-width="2"/>
-   <path id="path70" d="m644.7 641.64-4.285-94.328h207.16c-11.307 20.753-46.612 74.906-72.857 88.571-14.285 10-82.878 4.328-130.02 5.757zm167.02-7.165s80-84.285 85.715-87.142c5.714-2.857 115.71-1.429 115.71-1.429s-77.143 47.143-102.86 58.572c-25.715 11.428-90 31.428-98.572 30z" fill="#f0ffeb" stroke-width="5"/>
+            <path id="path70"
+                  d="m644.7 641.64-4.285-94.328h207.16c-11.307 20.753-46.612 74.906-72.857 88.571-14.285 10-82.878 4.328-130.02 5.757zm167.02-7.165s80-84.285 85.715-87.142c5.714-2.857 115.71-1.429 115.71-1.429s-77.143 47.143-102.86 58.572c-25.715 11.428-90 31.428-98.572 30z"
+                  fill="#f0ffeb" stroke-width="5"/>
             <g fill="none">
-    <path id="path72" d="m345.64 556.81c-14.075-30.967-18.298-71.787-18.298-94.309 0-22.521 4.223-91.493 22.521-105.57m282.93 298.41c-1.408-5.63-4.047-81.905-6.51-106.93-3.67-18.714-4.989-51.218-6.159-87.314 0-22.522 7.038-80.233 12.669-105.57" stroke-width="5"/>
+                <path id="path72"
-    <path id="path74" d="m103.53 396.34s15.483 85.864 106.98 85.864c91.494 0 109.79-87.271 109.79-87.271m479.99 0s15.483 85.863 106.98 85.863c91.493 0 109.79-87.27 109.79-87.27m-947.31 57.71h63.342" stroke-width="2"/>
+                      d="m345.64 556.81c-14.075-30.967-18.298-71.787-18.298-94.309 0-22.521 4.223-91.493 22.521-105.57m282.93 298.41c-1.408-5.63-4.047-81.905-6.51-106.93-3.67-18.714-4.989-51.218-6.159-87.314 0-22.522 7.038-80.233 12.669-105.57"
-    <path id="path76" d="m779.18 648.3c18.299-12.669 56.304-50.674 92.9-104.16 36.598-53.489 8.447-59.12-18.298-74.603-26.744-15.483-49.266-42.228-67.564-112.61" stroke-width="5"/>
+                      stroke-width="5"/>
-    <path id="path78" d="m1112.8 452.42h-129.5m-696.76 0.223h544.74m-22.522 150.61v-54.895" stroke-width="2"/>
+                <path id="path74"
+                      d="m103.53 396.34s15.483 85.864 106.98 85.864c91.494 0 109.79-87.271 109.79-87.271m479.99 0s15.483 85.863 106.98 85.863c91.493 0 109.79-87.27 109.79-87.27m-947.31 57.71h63.342"
+                      stroke-width="2"/>
+                <path id="path76"
+                      d="m779.18 648.3c18.299-12.669 56.304-50.674 92.9-104.16 36.598-53.489 8.447-59.12-18.298-74.603-26.744-15.483-49.266-42.228-67.564-112.61"
+                      stroke-width="5"/>
+                <path id="path78" d="m1112.8 452.42h-129.5m-696.76 0.223h544.74m-22.522 150.61v-54.895"
+                      stroke-width="2"/>
             </g>
             <g stroke-width="2">
-    <rect id="rect80" transform="scale(1 -1)" x="558.65" y="-503.55" width="41.286" height="14.541" rx="2.933" ry="7.379" fill="#e6e6e6"/>
+                <rect id="rect80" transform="scale(1 -1)" x="558.65" y="-503.55" width="41.286" height="14.541"
-    <rect id="rect82" transform="scale(1 -1)" x="816.24" y="-503.55" width="41.286" height="14.541" rx="2.933" ry="7.379" fill="#e6e6e6"/>
+                      rx="2.933" ry="7.379" fill="#e6e6e6"/>
-    <rect id="rect84" transform="scale(1 -1)" x="259.53" y="-502.15" width="18.776" height="11.738" rx="1.63" ry="7.692" fill="#ffcb00"/>
+                <rect id="rect82" transform="scale(1 -1)" x="816.24" y="-503.55" width="41.286" height="14.541"
+                      rx="2.933" ry="7.379" fill="#e6e6e6"/>
+                <rect id="rect84" transform="scale(1 -1)" x="259.53" y="-502.15" width="18.776" height="11.738"
+                      rx="1.63" ry="7.692" fill="#ffcb00"/>
                 <circle id="circle86" transform="translate(941.34 284)" cx="59.119" cy="211.28" r="16.891" fill="#fff"/>
             </g>
         </g>
         <path id="path90" d="m-126.58 704.93v260.4" fill="none" stroke="#000" stroke-width="2"/>
-  <path id="path92" d="m-153.88 992.49v-26.041h45.043v52.08h-45.043zm0-316.71v-27.448h45.043v54.898h-45.043z" fill="#ffffc0"/>
+        <path id="path92" d="m-153.88 992.49v-26.041h45.043v52.08h-45.043zm0-316.71v-27.448h45.043v54.898h-45.043z"
+              fill="#ffffc0"/>
         <g fill="none" stroke="#000">
-   <path id="path94" d="m-157.4 624.38s-4.223-12.669-18.299-12.669-14.076 8.446-14.076 8.446v423.69s1.408 9.853 14.076 9.853c12.669 0 18.3-9.853 18.3-9.853" stroke-width="5"/>
+            <path id="path94"
-   <path id="path96" d="m-191.18 624.38s-35.19-1.408-35.19 21.114v371.6c0 22.521 36.597 25.336 36.597 25.336" stroke-width="5"/>
+                  d="m-157.4 624.38s-4.223-12.669-18.299-12.669-14.076 8.446-14.076 8.446v423.69s1.408 9.853 14.076 9.853c12.669 0 18.3-9.853 18.3-9.853"
+                  stroke-width="5"/>
+            <path id="path96" d="m-191.18 624.38s-35.19-1.408-35.19 21.114v371.6c0 22.521 36.597 25.336 36.597 25.336"
+                  stroke-width="5"/>
             <g stroke-width="2">
                 <rect id="rect98" x="-216.51" y="648.31" width="16.891" height="35.19" rx="7.742" ry="6.284"/>
                 <rect id="rect100" x="-216.51" y="985.58" width="16.891" height="35.19" rx="7.742" ry="6.284"/>
                 <path id="path102" d="m-62.939 645.49h30.967v377.24h-30.967z"/>
             </g>
-   <path id="path104" d="m1200.9 633.86v73.195h67.565v-83.048l-25.337-14.076zm0 329.38h67.565v78.826l-23.93 14.076-43.635-18.3zm0-270.26v284.33m67.565-283.74v284.33" stroke-width="5"/>
+            <path id="path104"
-   <path id="path106" d="m1216.6 759.51h14.076v147.8h-14.076zm7.631-1.408v-53.488m0 257.37v-53.49m30.375-201.06v256.18" stroke-width="2"/>
+                  d="m1200.9 633.86v73.195h67.565v-83.048l-25.337-14.076zm0 329.38h67.565v78.826l-23.93 14.076-43.635-18.3zm0-270.26v284.33m67.565-283.74v284.33"
-   <path id="path108" d="m1268.8 624.97s4.223-12.668 18.299-12.668 14.076 8.445 14.076 8.445v423.69s-1.408 9.853-14.076 9.853c-12.669 0-18.299-9.853-18.299-9.853m33.783-419.46s35.19-1.408 35.19 21.114v371.6c0 22.521-36.598 25.337-36.598 25.337" stroke-width="5"/>
+                  stroke-width="5"/>
+            <path id="path106"
+                  d="m1216.6 759.51h14.076v147.8h-14.076zm7.631-1.408v-53.488m0 257.37v-53.49m30.375-201.06v256.18"
+                  stroke-width="2"/>
+            <path id="path108"
+                  d="m1268.8 624.97s4.223-12.668 18.299-12.668 14.076 8.445 14.076 8.445v423.69s-1.408 9.853-14.076 9.853c-12.669 0-18.299-9.853-18.299-9.853m33.783-419.46s35.19-1.408 35.19 21.114v371.6c0 22.521-36.598 25.337-36.598 25.337"
+                  stroke-width="5"/>
             <g stroke-width="2">
-    <rect id="rect110" transform="scale(-1 1)" x="-1329.9" y="648.9" width="16.891" height="35.19" rx="7.742" ry="6.284"/>
+                <rect id="rect110" transform="scale(-1 1)" x="-1329.9" y="648.9" width="16.891" height="35.19"
-    <rect id="rect112" transform="scale(-1 1)" x="-1329.9" y="986.17" width="16.891" height="35.19" rx="7.742" ry="6.284"/>
+                      rx="7.742" ry="6.284"/>
-    <path id="path114" d="m1199.7 632.82 67.565 74.603m-67.565 0.592 67.565-73.195m-67.342 328.16 67.565 74.602m-67.565 0.593 67.565-73.195"/>
+                <rect id="rect112" transform="scale(-1 1)" x="-1329.9" y="986.17" width="16.891" height="35.19"
+                      rx="7.742" ry="6.284"/>
+                <path id="path114"
+                      d="m1199.7 632.82 67.565 74.603m-67.565 0.592 67.565-73.195m-67.342 328.16 67.565 74.602m-67.565 0.593 67.565-73.195"/>
             </g>
         </g>
         <g stroke="#000">
             <g stroke-width="2">
-    <circle id="circle116" transform="translate(78.489 1074.7)" cx="119.65" cy="202.84" r="76.01" fill="#c8c8c8"/>
+                <circle id="circle116" transform="translate(78.489 1074.7)" cx="119.65" cy="202.84" r="76.01"
-    <circle id="circle118" transform="translate(94.676 1204.9)" cx="103.46" cy="72.633" r="44.339" fill="#fff"/>
+                        fill="#c8c8c8"/>
-    <circle id="circle120" transform="translate(78.489 187.66)" cx="119.65" cy="202.84" r="76.01" fill="#c8c8c8"/>
+                <circle id="circle118" transform="translate(94.676 1204.9)" cx="103.46" cy="72.633" r="44.339"
-    <circle id="circle122" transform="translate(94.676 317.86)" cx="103.46" cy="72.633" r="44.339" fill="#fff"/>
+                        fill="#fff"/>
-    <circle id="circle124" transform="translate(773.02 187.66)" cx="119.65" cy="202.84" r="76.01" fill="#c8c8c8"/>
+                <circle id="circle120" transform="translate(78.489 187.66)" cx="119.65" cy="202.84" r="76.01"
-    <circle id="circle126" transform="translate(789.21 317.86)" cx="103.46" cy="72.633" r="44.339" fill="#fff"/>
+                        fill="#c8c8c8"/>
-    <circle id="circle128" transform="translate(773.02 1074.7)" cx="119.65" cy="202.84" r="76.01" fill="#c8c8c8"/>
+                <circle id="circle122" transform="translate(94.676 317.86)" cx="103.46" cy="72.633" r="44.339"
-    <circle id="circle130" transform="translate(789.21 1204.9)" cx="103.46" cy="72.633" r="44.339" fill="#fff"/>
+                        fill="#fff"/>
+                <circle id="circle124" transform="translate(773.02 187.66)" cx="119.65" cy="202.84" r="76.01"
+                        fill="#c8c8c8"/>
+                <circle id="circle126" transform="translate(789.21 317.86)" cx="103.46" cy="72.633" r="44.339"
+                        fill="#fff"/>
+                <circle id="circle128" transform="translate(773.02 1074.7)" cx="119.65" cy="202.84" r="76.01"
+                        fill="#c8c8c8"/>
+                <circle id="circle130" transform="translate(789.21 1204.9)" cx="103.46" cy="72.633" r="44.339"
+                        fill="#fff"/>
             </g>
             <path id="path132" d="m1338.5 829.07h40.82" fill="none" stroke-width="5"/>
-   <circle id="circle134" transform="translate(1441.3 600.31)" cx="-59.119" cy="229.58" r="4.223" fill="#3c3c3c" stroke-width="5"/>
+            <circle id="circle134" transform="translate(1441.3 600.31)" cx="-59.119" cy="229.58" r="4.223"
+                    fill="#3c3c3c" stroke-width="5"/>
             <g stroke-width="2">
                 <path id="path136" d="m778.06 845.37-38.709-38.709" fill="none"/>
                 <g id="g146" transform="translate(-13.78 15.524)" fill="#3c3c3c">
@@ -139,6 +209,8 @@
         <circle id="s26" cx="1339.4" cy="581.37" r="61.935"/>
     </g>
     <g id="layer3">
-  <text id="p15" opacity="0" x="382.62802" y="1034.3463" fill="#fd0000" font-family="sans-serif" font-size="1696.9px" letter-spacing="0px" stroke-width="17.676" word-spacing="0px" style="line-height:5.25" xml:space="preserve"><tspan id="tspan4997" x="382.62802" y="1034.3463" fill="#fd0000" stroke-width="17.676">x</tspan></text>
+        <text id="p15" opacity="0" x="382.62802" y="1034.3463" fill="#fd0000" font-family="sans-serif"
+              font-size="1696.9px" letter-spacing="0px" stroke-width="17.676" word-spacing="0px"
+              style="line-height:5.25" xml:space="preserve"><tspan id="tspan4997" x="382.62802" y="1034.3463" fill="#fd0000" stroke-width="17.676">x</tspan></text>
     </g>
 </svg>

client/src/components/accounting-payables-table/accounting-payables-table.component.jsx

@@ -1,4 +1,4 @@
-import { Input, Table, Checkbox, Card, Space } from "antd";
+import {Card, Checkbox, Input, Space, Table} from "antd";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {Link} from "react-router-dom";

client/src/components/allocations-assignment/allocations-assignment.component.jsx

@@ -1,4 +1,4 @@
-import { Select, Button, Popover, InputNumber } from "antd";
+import {Button, InputNumber, Popover, Select} from "antd";
 import React from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";

client/src/components/audit-trail-values/audit-trail-values.component.jsx

@@ -2,6 +2,7 @@ import React from "react";
 import {List} from "antd";
 import Icon from "@ant-design/icons";
 import {FaArrowRight} from "react-icons/fa";
+
 export default function AuditTrailValuesComponent({oldV, newV}) {
     if (!oldV && !newV) return <div></div>;
 

client/src/components/barcode-popup/barcode-popup.component.jsx

@@ -1,7 +1,8 @@
-import { Tag, Popover } from "antd";
+import {Popover, Tag} from "antd";
 import React from "react";
 import Barcode from "react-barcode";
 import {useTranslation} from "react-i18next";
+
 export default function BarcodePopupComponent({value, children}) {
     const {t} = useTranslation();
     return (

client/src/components/bill-cm-returns-table/bill-cm-returns-table.component.jsx

@@ -3,6 +3,7 @@ import React, { useEffect } from "react";
 import {useTranslation} from "react-i18next";
 import ReadOnlyFormItemComponent from "../form-items-formatted/read-only-form-item.component";
 import "./bill-cm-returns-table.styles.scss";
+
 export default function BillCmdReturnsTableComponent({
                                                          form,
                                                          returnLoading,

client/src/components/bill-detail-edit/bill-detail-edit-component.jsx

@@ -7,11 +7,7 @@ import { useTranslation } from "react-i18next";
 import {connect} from "react-redux";
 import {useLocation} from "react-router-dom";
 import {createStructuredSelector} from "reselect";
-import {
+import {DELETE_BILL_LINE, INSERT_NEW_BILL_LINES, UPDATE_BILL_LINE} from "../../graphql/bill-lines.queries";
-  DELETE_BILL_LINE,
-  INSERT_NEW_BILL_LINES,
-  UPDATE_BILL_LINE
-} from "../../graphql/bill-lines.queries";
 import {QUERY_BILL_BY_PK, UPDATE_BILL} from "../../graphql/bills.queries";
 import {insertAuditTrail} from "../../redux/application/application.actions";
 import {setModalContext} from "../../redux/modals/modals.actions";

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

@@ -1,5 +1,6 @@
 import {useApolloClient, useMutation} from "@apollo/client";
-import { Button, Checkbox, Form, Modal, Space, notification } from "antd";
+import {useSplitTreatments} from "@splitsoftware/splitio-react";
+import {Button, Checkbox, Form, Modal, notification, Space} from "antd";
 import _ from "lodash";
 import React, {useEffect, useMemo, useState} from "react";
 import {useTranslation} from "react-i18next";
@@ -8,18 +9,12 @@ import { createStructuredSelector } from "reselect";
 import {INSERT_NEW_BILL} from "../../graphql/bills.queries";
 import {UPDATE_INVENTORY_LINES} from "../../graphql/inventory.queries";
 import {UPDATE_JOB_LINE} from "../../graphql/jobs-lines.queries";
-import {
+import {QUERY_JOB_LBR_ADJUSTMENTS, UPDATE_JOB,} from "../../graphql/jobs.queries";
-  QUERY_JOB_LBR_ADJUSTMENTS,
-  UPDATE_JOB,
-} from "../../graphql/jobs.queries";
 import {MUTATION_MARK_RETURN_RECEIVED} from "../../graphql/parts-orders.queries";
 import {insertAuditTrail} from "../../redux/application/application.actions";
 import {toggleModalVisible} from "../../redux/modals/modals.actions";
 import {selectBillEnterModal} from "../../redux/modals/modals.selectors";
-import {
+import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
-  selectBodyshop,
-  selectCurrentUser,
-} from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import {GenerateDocument} from "../../utils/RenderTemplate";
 import {TemplateList} from "../../utils/TemplateConstants";
@@ -63,9 +58,21 @@ function BillEnterModalContainer({
         "enter_bill_generate_label",
         false
     );
+
+    const {treatments: {Enhanced_Payroll}} = useSplitTreatments({
+        attributes: {},
+        names: ["Enhanced_Payroll"],
+        splitKey: bodyshop.imexshopid,
+    });
+
     const formValues = useMemo(() => {
         return {
             ...billEnterModal.context.bill,
+            //Added as a part of IO-2436 for capturing parts price changes.
+            billlines: billEnterModal.context?.bill?.billlines?.map((line) => ({
+                ...line,
+                original_actual_price: line.actual_price,
+            })),
             jobid:
                 (billEnterModal.context.job && billEnterModal.context.job.id) || null,
             federal_tax_rate:
@@ -98,6 +105,7 @@ function BillEnterModalContainer({
         } = values;
 
         let adjustmentsToInsert = {};
+        let payrollAdjustmentsToInsert = [];
 
         const r1 = await insertBill({
             variables: {
@@ -113,14 +121,33 @@ function BillEnterModalContainer({
                                         lbr_adjustment,
                                         location: lineLocation,
                                         part_type,
+                                        create_ppc,
+                                        original_actual_price,
                                         ...restI
                                     } = i;
 
+                                    if (Enhanced_Payroll.treatment === "on") {
+                                        if (
+                                            deductedfromlbr &&
+                                            true //payroll is on
+                                        ) {
+                                            payrollAdjustmentsToInsert.push({
+                                                id: i.joblineid,
+                                                convertedtolbr: true,
+                                                convertedtolbr_data: {
+                                                    mod_lb_hrs: lbr_adjustment.mod_lb_hrs * -1,
+                                                    mod_lbr_ty: lbr_adjustment.mod_lbr_ty,
+                                                },
+                                            });
+                                        }
+                                    } else {
                                         if (deductedfromlbr) {
                                             adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] =
                                                 (adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] || 0) -
                                                 restI.actual_price / lbr_adjustment.rate;
                                         }
+                                    }
+
                                     return {
                                         ...restI,
                                         deductedfromlbr: deductedfromlbr,
@@ -146,6 +173,20 @@ function BillEnterModalContainer({
             refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID", "GET_JOB_BY_PK"],
         });
 
+        await Promise.all(
+            payrollAdjustmentsToInsert.map((li) => {
+                return updateJobLines({
+                    variables: {
+                        lineId: li.id,
+                        line: {
+                            convertedtolbr: li.convertedtolbr,
+                            convertedtolbr_data: li.convertedtolbr_data,
+                        },
+                    },
+                });
+            })
+        );
+
         const adjKeys = Object.keys(adjustmentsToInsert);
         if (adjKeys.length > 0) {
             //Query the adjustments, merge, and update them.
@@ -254,6 +295,14 @@ function BillEnterModalContainer({
                                     location: li.location || location,
                                     status:
                                         bodyshop.md_order_statuses.default_received || "Received*",
+                                    //Added parts price changes.
+                                    ...(li.create_ppc &&
+                                    li.original_actual_price !== li.actual_price
+                                        ? {
+                                            act_price_before_ppc: li.original_actual_price,
+                                            act_price: li.actual_price,
+                                        }
+                                        : {}),
                                 },
                             },
                         });
@@ -322,12 +371,12 @@ function BillEnterModalContainer({
         });
 
         if (enterAgain) {
-      form.resetFields();
+            // form.resetFields();
-      form.resetFields();
             form.setFieldsValue({
                 ...formValues,
                 billlines: [],
             });
+            form.resetFields();
         } else {
             toggleModalVisible();
         }

client/src/components/bill-form-lines-extended/bill-form-lines-extended.component.jsx

@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import {alphaSort} from "../../utils/sorters";
 import BillFormItemsExtendedFormItem from "./bill-form-lines.extended.formitem.component";
+
 export default function BillFormLinesExtended({
                                                   lineData,
                                                   discount,

client/src/components/bill-form-lines-extended/bill-form-lines.extended.formitem.component.jsx

@@ -1,10 +1,6 @@
 import React from "react";
-import {
+import {MinusCircleFilled, PlusCircleFilled, WarningOutlined,} from "@ant-design/icons";
-  PlusCircleFilled,
+import {Button, Form, Input, InputNumber, Select, Space, Switch} from "antd";
-  MinusCircleFilled,
-  WarningOutlined,
-} from "@ant-design/icons";
-import { Form, Button, InputNumber, Input, Select, Switch, Space } from "antd";
 import {useTranslation} from "react-i18next";
 
 import {connect} from "react-redux";

client/src/components/bill-form/bill-form.component.jsx

@@ -27,7 +27,21 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({});
 
-export function BillFormComponent({bodyshop, disabled, form, vendorAutoCompleteOptions, lineData, responsibilityCenters, loadLines, billEdit, disableInvNumber, job, loadOutstandingReturns, loadInventory, preferredMake}) {
+export function BillFormComponent({
+                                      bodyshop,
+                                      disabled,
+                                      form,
+                                      vendorAutoCompleteOptions,
+                                      lineData,
+                                      responsibilityCenters,
+                                      loadLines,
+                                      billEdit,
+                                      disableInvNumber,
+                                      job,
+                                      loadOutstandingReturns,
+                                      loadInventory,
+                                      preferredMake
+                                  }) {
 
     const {t} = useTranslation();
     const client = useApolloClient();
@@ -53,19 +67,19 @@ export function BillFormComponent({bodyshop, disabled, form, vendorAutoCompleteO
         });
     };
 
-  const handleFederalTaxExemptSwitchToggle = (checked) => {
+    // const handleFederalTaxExemptSwitchToggle = (checked) => {
-    // Early gate
+    //   // Early gate
-    if (!checked) return;
+    //   if (!checked) return;
-    const values = form.getFieldsValue("billlines");
+    //   const values = form.getFieldsValue("billlines");
-    // Gate bill lines
+    //   // Gate bill lines
-    if (!values?.billlines?.length) return;
+    //   if (!values?.billlines?.length) return;
 
-    const billlines = values.billlines.map((b) => {
+        //   const billlines = values.billlines.map((b) => {
-      b.applicable_taxes.federal = false;
+    //     b.applicable_taxes.federal = false;
-      return b;
+    //     return b;
-    });
+    //   });
-    form.setFieldsValue({ billlines });
+    //   form.setFieldsValue({ billlines });
-  };
+    // };
 
     useEffect(() => {
         if (job) form.validateFields(["is_credit_memo"]);
@@ -354,13 +368,15 @@ export function BillFormComponent({bodyshop, disabled, form, vendorAutoCompleteO
                 )}
             </LayoutFormRow>
             <LayoutFormRow>
-        <Form.Item
+                {
-          span={3}
+                    // <Form.Item
-          label={t("bills.fields.federal_tax_rate")}
+                    //   span={3}
-          name="federal_tax_rate"
+                    //   label={t("bills.fields.federal_tax_rate")}
-        >
+                    //   name="federal_tax_rate"
-          <CurrencyInput min={0} disabled={disabled} />
+                    // >
-        </Form.Item>
+                    //   <CurrencyInput min={0} disabled={disabled} />
+                    // </Form.Item>
+                }
                 <Form.Item
                     span={3}
                     label={t("bills.fields.state_tax_rate")}
@@ -368,22 +384,22 @@ export function BillFormComponent({bodyshop, disabled, form, vendorAutoCompleteO
                 >
                     <CurrencyInput min={0} disabled={disabled}/>
                 </Form.Item>
-        <Form.Item
+                {/*<Form.Item*/}
-          span={3}
+                {/*  span={3}*/}
-          label={t("bills.fields.local_tax_rate")}
+                {/*  label={t("bills.fields.local_tax_rate")}*/}
-          name="local_tax_rate"
+                {/*  name="local_tax_rate"*/}
-        >
+                {/*>*/}
-          <CurrencyInput min={0} />
+                {/*  <CurrencyInput min={0} />*/}
-        </Form.Item>
+                {/*</Form.Item>*/}
-          {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
+                {/*  {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (*/}
-              <Form.Item
+                {/*      <Form.Item*/}
-                  span={2}
+                      {/*          span={2}*/}
-                  label={t("bills.labels.federal_tax_exempt")}
+                      {/*          label={t("bills.labels.federal_tax_exempt")}*/}
-                  name="federal_tax_exempt"
+                      {/*          name="federal_tax_exempt"*/}
-              >
+                {/*      >*/}
-                  <Switch onChange={handleFederalTaxExemptSwitchToggle} />
+                      {/*          <Switch onChange={handleFederalTaxExemptSwitchToggle} />*/}
-              </Form.Item>
+                {/*      </Form.Item>*/}
-          ) : null}
+                {/*  ) : null}*/}
                 <Form.Item shouldUpdate span={13}>
                     {() => {
                         const values = form.getFieldsValue([
@@ -409,21 +425,25 @@ export function BillFormComponent({bodyshop, disabled, form, vendorAutoCompleteO
                                             value={totals.subtotal.toFormat()}
                                             precision={2}
                                         />
-                    <Statistic
+                                        {
-                      title={t("bills.labels.federal_tax")}
+                                            // <Statistic
-                      value={totals.federalTax.toFormat()}
+                                            //   title={t("bills.labels.federal_tax")}
-                      precision={2}
+                                            //   value={totals.federalTax.toFormat()}
-                    />
+                                            //   precision={2}
+                                            // />
+                                        }
                                         <Statistic
                                             title={t("bills.labels.state_tax")}
                                             value={totals.stateTax.toFormat()}
                                             precision={2}
                                         />
-                    <Statistic
+                                        {
-                      title={t("bills.labels.local_tax")}
+                                            // <Statistic
-                      value={totals.localTax.toFormat()}
+                                            //   title={t("bills.labels.local_tax")}
-                      precision={2}
+                                            //   value={totals.localTax.toFormat()}
-                    />
+                                            //   precision={2}
+                                            // />
+                                        }
                                         <Statistic
                                             title={t("bills.labels.entered_total")}
                                             value={totals.enteredTotal.toFormat()}

client/src/components/bill-form/bill-form.container.jsx

@@ -79,4 +79,5 @@ export function BillFormContainer({
         </>
     );
 }
+
 export default connect(mapStateToProps, null)(BillFormContainer);

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -1,16 +1,6 @@
 import {DeleteFilled, DollarCircleFilled} from "@ant-design/icons";
 import {useSplitTreatments} from "@splitsoftware/splitio-react";
-import {
+import {Button, Checkbox, Form, Input, InputNumber, Select, Space, Switch, Table, Tooltip,} from "antd";
-  Button,
-  Form,
-  Input,
-  InputNumber,
-  Select,
-  Space,
-  Switch,
-  Table,
-  Tooltip,
-} from "antd";
 import React from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
@@ -42,9 +32,9 @@ export function BillEnterModalLinesComponent({
     const {t} = useTranslation();
     const {setFieldsValue, getFieldsValue, getFieldValue} = form;
 
-  const { treatments: {Simple_Inventory} } = useSplitTreatments({
+    const {treatments: {Simple_Inventory, Enhanced_Payroll}} = useSplitTreatments({
         attributes: {},
-    names: ["Simple_Inventory"],
+        names: ["Simple_Inventory", "Enhanced_Payroll"],
         splitKey: bodyshop && bodyshop.imexshopid,
     });
 
@@ -97,6 +87,7 @@ export function BillEnterModalLinesComponent({
                                                 line_desc: opt.line_desc,
                                                 quantity: opt.part_qty || 1,
                                                 actual_price: opt.cost,
+                                                original_actual_price: opt.cost,
                                                 cost_center: opt.part_type
                                                     ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
                                                         ? opt.part_type !== "PAE"
@@ -223,6 +214,43 @@ export function BillEnterModalLinesComponent({
                         }}
                     />
                 ),
+                additional: (record, index) => (
+                    <Form.Item
+                        dependencies={["billlines", record.name, "actual_price"]}
+                        noStyle
+                    >
+                        {() => {
+                            const billLine = getFieldValue(["billlines", record.name]);
+                            const jobLine = lineData.find(
+                                (line) => line.id === billLine?.joblineid
+                            );
+
+                            if (
+                                !billEdit &&
+                                billLine &&
+                                jobLine &&
+                                billLine?.actual_price !== jobLine?.act_price
+                            ) {
+                                return (
+                                    <Space size="small">
+                                        <Form.Item
+                                            noStyle
+                                            label={t("joblines.fields.create_ppc")}
+                                            key={`${index}ppc`}
+                                            valuePropName="checked"
+                                            name={[record.name, "create_ppc"]}
+                                        >
+                                            <Checkbox/>
+                                        </Form.Item>
+                                        {t("joblines.fields.create_ppc")}
+                                    </Space>
+                                );
+                            } else {
+                                return null;
+                            }
+                        }}
+                    </Form.Item>
+                ),
             },
             {
                 title: t("billlines.fields.actual_cost"),
@@ -364,7 +392,7 @@ export function BillEnterModalLinesComponent({
                 },
                 formInput: (record, index) => <Switch disabled={disabled}/>,
                 additional: (record, index) => (
-          <Form.Item shouldUpdate style={{ display: "inline-block" }}>
+                    <Form.Item shouldUpdate noStyle style={{display: "inline-block"}}>
                         {() => {
                             const price = getFieldValue([
                                 "billlines",
@@ -379,12 +407,31 @@ export function BillEnterModalLinesComponent({
                                 "rate",
                             ]);
 
+                            const billline = getFieldValue(["billlines", record.name]);
+
+                            const jobline = lineData.find(
+                                (line) => line.id === billline?.joblineid
+                            );
+
+                            const employeeTeamName = bodyshop.employee_teams.find(
+                                (team) => team.id === jobline?.assigned_team
+                            );
+
                             if (getFieldValue(["billlines", record.name, "deductedfromlbr"]))
                                 return (
                                     <div>
+                                        <Space>
+                                            {t("joblines.fields.assigned_team", {
+                                                name: employeeTeamName?.name,
+                                            })}
+                                            {`${jobline.mod_lb_hrs} units/${t(
+                                                `joblines.fields.lbr_types.${jobline.mod_lbr_ty}`
+                                            )}`}
+                                        </Space>
                                         <Form.Item
                                             label={t("joblines.fields.mod_lbr_ty")}
                                             key={`${index}modlbrty`}
+                                            initialValue={jobline ? jobline.mod_lbr_ty : null}
                                             rules={[
                                                 {
                                                     required: true,
@@ -438,6 +485,24 @@ export function BillEnterModalLinesComponent({
                                                 </Select.Option>
                                             </Select>
                                         </Form.Item>
+                                        {Enhanced_Payroll.treatment === "on" ? (
+                                            <Form.Item
+                                                label={t("billlines.labels.mod_lbr_adjustment")}
+                                                name={[record.name, "lbr_adjustment", "mod_lb_hrs"]}
+                                                rules={[
+                                                    {
+                                                        required: true,
+                                                        //message: t("general.validation.required"),
+                                                    },
+                                                ]}
+                                            >
+                                                <InputNumber
+                                                    precision={5}
+                                                    min={0.01}
+                                                    max={jobline ? jobline.mod_lb_hrs : 0}
+                                                />
+                                            </Form.Item>
+                                        ) : (
                                             <Form.Item
                                                 label={t("jobs.labels.adjustmentrate")}
                                                 name={[record.name, "lbr_adjustment", "rate"]}
@@ -451,9 +516,13 @@ export function BillEnterModalLinesComponent({
                                             >
                                                 <InputNumber precision={2} min={0.01}/>
                                             </Form.Item>
+                                        )}
+
+                                        <Space>
                                             {price &&
                                                 adjustmentRate &&
                                                 `${(price / adjustmentRate).toFixed(1)} hrs`}
+                                        </Space>
                                     </div>
                                 );
                             return <></>;
@@ -461,22 +530,21 @@ export function BillEnterModalLinesComponent({
                     </Form.Item>
                 ),
             },
-      {
+            // {
-        title: t("billlines.fields.federal_tax_applicable"),
+            //   title: t("billlines.fields.federal_tax_applicable"),
-        dataIndex: "applicable_taxes.federal",
+            //   dataIndex: "applicable_taxes.federal",
-        editable: true,
+            //   editable: true,
 
-        formItemProps: (field) => {
+            //   formItemProps: (field) => {
-          return {
+            //     return {
-            key: `${field.index}fedtax`,
+            //       key: `${field.index}fedtax`,
-            valuePropName: "checked",
+            //       valuePropName: "checked",
-            initialValue:
+            //       //  initialValue: true,
-              form.getFieldValue("federal_tax_exempt") === true ? false : true,
+                        //       name: [field.name, "applicable_taxes", "federal"],
-            name: [field.name, "applicable_taxes", "federal"],
+            //     };
-          };
+            //   },
-        },
+            //   formInput: (record, index) => <Switch disabled={disabled} />,
-        formInput: (record, index) => <Switch disabled={disabled} />,
+            // },
-      },
             {
                 title: t("billlines.fields.state_tax_applicable"),
                 dataIndex: "applicable_taxes.state",
@@ -491,20 +559,20 @@ export function BillEnterModalLinesComponent({
                 },
                 formInput: (record, index) => <Switch disabled={disabled}/>,
             },
-      {
+            // {
-        title: t("billlines.fields.local_tax_applicable"),
+            //   title: t("billlines.fields.local_tax_applicable"),
-        dataIndex: "applicable_taxes.local",
+            //   dataIndex: "applicable_taxes.local",
-        editable: true,
+            //   editable: true,
 
-        formItemProps: (field) => {
+            //   formItemProps: (field) => {
-          return {
+            //     return {
-            key: `${field.index}localtax`,
+            //       key: `${field.index}localtax`,
-            valuePropName: "checked",
+            //       valuePropName: "checked",
-            name: [field.name, "applicable_taxes", "local"],
+            //       name: [field.name, "applicable_taxes", "local"],
-          };
+            //     };
-        },
+            //   },
-        formInput: (record, index) => <Switch disabled={disabled} />,
+            //   formInput: (record, index) => <Switch disabled={disabled} />,
-      },
+            // },
             {
                 title: t("general.labels.actions"),
 
@@ -629,7 +697,7 @@ const EditableCell = ({
     if (additional)
         return (
             <td {...restProps}>
-        <Space size="small">
+                <div size="small">
                     <Form.Item
                         name={dataIndex}
                         labelCol={{span: 0}}
@@ -638,7 +706,7 @@ const EditableCell = ({
                         {(formInput && formInput(record, record.name)) || children}
                     </Form.Item>
                     {additional && additional(record, record.name)}
-        </Space>
+                </div>
             </td>
         );
     if (wrapper)

client/src/components/bill-form/bill-form.totals.utility.js

@@ -19,14 +19,14 @@ export const CalculateBillTotal = (invoice) => {
             }).multiply(i.quantity || 1);
 
             subtotal = subtotal.add(itemTotal);
-      if (i.applicable_taxes.federal) {
+            if (i.applicable_taxes?.federal) {
                 federalTax = federalTax.add(
                     itemTotal.percentage(federal_tax_rate || 0)
                 );
             }
-      if (i.applicable_taxes.state)
+            if (i.applicable_taxes?.state)
                 stateTax = stateTax.add(itemTotal.percentage(state_tax_rate || 0));
-      if (i.applicable_taxes.local)
+            if (i.applicable_taxes?.local)
                 localTax = localTax.add(itemTotal.percentage(local_tax_rate || 0));
         }
     });

client/src/components/bill-line-search-select/bill-line-search-select.component.jsx

@@ -67,6 +67,12 @@ const BillLineSearchSelect = (
                     item.oem_partno ? ` - ${item.oem_partno}` : ""
                 }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
               </span>
+                        {item.act_price === 0 && item.mod_lb_hrs > 0 && (
+                            <span style={{float: "right", paddingleft: "1rem"}}>
+                  {`${item.mod_lb_hrs} units`}
+                </span>
+                        )}
+
                         <span style={{float: "right", paddingleft: "1rem"}}>
                 {item.act_price
                     ? `$${item.act_price && item.act_price.toFixed(2)}`

client/src/components/bill-mark-exported-button/bill-mark-exported-button.component.jsx

@@ -1,18 +1,14 @@
-import { useMutation } from "@apollo/client";
+import {gql, useMutation} from "@apollo/client";
 import {Button, notification} from "antd";
-import { gql } from "@apollo/client";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
-import {
+import {selectAuthLevel, selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
-  selectAuthLevel,
-  selectBodyshop,
-  selectCurrentUser,
-} from "../../redux/user/user.selectors";
 import {HasRbacAccess} from "../rbac-wrapper/rbac-wrapper.component";
 import {INSERT_EXPORT_LOG} from "../../graphql/accounting.queries";
+
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
     authLevel: selectAuthLevel,

client/src/components/bill-reexport-button/bill-reexport-button.component.jsx

@@ -1,16 +1,13 @@
-import { useMutation } from "@apollo/client";
+import {gql, useMutation} from "@apollo/client";
 import {Button, notification} from "antd";
-import { gql } from "@apollo/client";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
-import {
+import {selectAuthLevel, selectBodyshop,} from "../../redux/user/user.selectors";
-  selectAuthLevel,
-  selectBodyshop,
-} from "../../redux/user/user.selectors";
 import {HasRbacAccess} from "../rbac-wrapper/rbac-wrapper.component";
+
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
     authLevel: selectAuthLevel,

client/src/components/billline-add-inventory/billline-add-inventory.component.jsx

@@ -7,10 +7,7 @@ import React, { useState } from "react";
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
 import {INSERT_INVENTORY_AND_CREDIT} from "../../graphql/inventory.queries";
-import {
+import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
-  selectBodyshop,
-  selectCurrentUser,
-} from "../../redux/user/user.selectors";
 import {CalculateBillTotal} from "../bill-form/bill-form.totals.utility";
 import queryString from "query-string";
 import {useLocation} from "react-router-dom";

client/src/components/bills-list-table/bills-list-table.component.jsx

@@ -229,6 +229,7 @@ export function BillsListTableComponent({
         </Card>
     );
 }
+
 export default connect(
     mapStateToProps,
     mapDispatchToProps

client/src/components/bills-vendors-list/bills-vendors-list.component.jsx

@@ -3,7 +3,7 @@ import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
 import {useQuery} from "@apollo/client";
 import queryString from "query-string";
 import {useLocation, useNavigate} from "react-router-dom";
-import { Table, Input } from "antd";
+import {Input, Table} from "antd";
 import {useTranslation} from "react-i18next";
 import {alphaSort} from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";

client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx

@@ -3,6 +3,7 @@ import { Button, Form, InputNumber, Popover } from "antd";
 import {logImEXEvent} from "../../firebase/firebase.utils";
 import {useTranslation} from "react-i18next";
 import {CalculatorFilled} from "@ant-design/icons";
+
 export default function CABCpvrtCalculator({disabled, form}) {
     const [visibility, setVisibility] = useState(false);
 

client/src/components/card-payment-modal/card-payment-modal.component..jsx

@@ -1,27 +1,13 @@
 import {DeleteFilled} from "@ant-design/icons";
 import {useLazyQuery, useMutation} from "@apollo/client";
-import {
+import {Button, Card, Col, Form, Input, notification, Row, Space, Spin, Statistic,} from "antd";
-  Button,
-  Card,
-  Col,
-  Form,
-  Input,
-  Row,
-  Space,
-  Spin,
-  Statistic,
-  notification,
-} from "antd";
 import axios from "axios";
 import dayjs from "../../utils/day";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
-import {
+import {INSERT_PAYMENT_RESPONSE, QUERY_RO_AND_OWNER_BY_JOB_PKS,} from "../../graphql/payment_response.queries";
-  INSERT_PAYMENT_RESPONSE,
-  QUERY_RO_AND_OWNER_BY_JOB_PKS,
-} from "../../graphql/payment_response.queries";
 import {INSERT_NEW_PAYMENT} from "../../graphql/payments.queries";
 import {insertAuditTrail} from "../../redux/application/application.actions";
 import {toggleModalVisible} from "../../redux/modals/modals.actions";

client/src/components/chat-affix/chat-affix.container.jsx

@@ -19,7 +19,7 @@ export function ChatAffixContainer({ bodyshop, chatVisible }) {
             try {
                 const r = await axios.post("/notifications/subscribe", {
                     fcm_tokens: await getToken(messaging, {
-            vapidKey: import.meta.env.VITE_APP_FIREBASE_PUBLIC_VAPID_KEY,
+                        vapidKey: process.env.REACT_APP_FIREBASE_PUBLIC_VAPID_KEY,
                     }),
                     type: "messaging",
                     imexshopid: bodyshop.imexshopid,
@@ -71,6 +71,7 @@ export function ChatAffixContainer({ bodyshop, chatVisible }) {
                 payload: (payload && payload.data && payload.data.data) || payload.data,
             });
         }
+
         let stopMessageListener, channel;
         try {
             stopMessageListener = onMessage(messaging, handleMessage);

client/src/components/chat-conversation-list/chat-conversation-list.styles.scss

@@ -3,10 +3,12 @@
   height: 100%;
   border: 1px solid gainsboro;
 }
+
 .chat-list-item {
   .ant-card-head {
     border: none;
   }
+
   &:hover {
     cursor: pointer;
     color: #ff7a00;

client/src/components/chat-conversation/chat-conversation.container.jsx

@@ -2,15 +2,13 @@ import { useMutation, useQuery, useSubscription } from "@apollo/client";
 import React, {useState} from "react";
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
-import {
+import {CONVERSATION_SUBSCRIPTION_BY_PK, GET_CONVERSATION_DETAILS,} from "../../graphql/conversations.queries";
-  CONVERSATION_SUBSCRIPTION_BY_PK,
-  GET_CONVERSATION_DETAILS,
-} from "../../graphql/conversations.queries";
 import {MARK_MESSAGES_AS_READ_BY_CONVERSATION} from "../../graphql/messages.queries";
 import {selectSelectedConversation} from "../../redux/messaging/messaging.selectors";
 import ChatConversationComponent from "./chat-conversation.component";
 import axios from "axios";
 import {selectBodyshop} from "../../redux/user/user.selectors";
+
 const mapStateToProps = createStructuredSelector({
     selectedConversation: selectSelectedConversation,
     bodyshop: selectBodyshop,

client/src/components/chat-label/chat-label.component.jsx

@@ -4,6 +4,7 @@ import { Input, notification, Spin, Tag, Tooltip } from "antd";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {UPDATE_CONVERSATION_LABEL} from "../../graphql/conversations.queries";
+
 export default function ChatLabel({conversation}) {
     const [loading, setLoading] = useState(false);
     const [editing, setEditing] = useState(false);

client/src/components/chat-media-selector/chat-media-selector.component.jsx

@@ -9,7 +9,8 @@ import { GET_DOCUMENTS_BY_JOB } from "../../graphql/documents.queries";
 import {selectBodyshop} from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import JobDocumentsGalleryExternal from "../jobs-documents-gallery/jobs-documents-gallery.external.component";
-import JobDocumentsLocalGalleryExternal from "../jobs-documents-local-gallery/jobs-documents-local-gallery.external.component";
+import JobDocumentsLocalGalleryExternal
+    from "../jobs-documents-local-gallery/jobs-documents-local-gallery.external.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 
 const mapStateToProps = createStructuredSelector({

client/src/components/chat-messages-list/chat-message-list.component.jsx

@@ -4,12 +4,7 @@ import i18n from "i18next";
 import dayjs from "../../utils/day";
 import React, {useEffect, useRef} from "react";
 import {MdDone, MdDoneAll} from "react-icons/md";
-import {
+import {AutoSizer, CellMeasurer, CellMeasurerCache, List,} from "react-virtualized";
-  AutoSizer,
-  CellMeasurer,
-  CellMeasurerCache,
-  List,
-} from "react-virtualized";
 import {DateTimeFormatter} from "../../utils/DateFormatter";
 import "./chat-message-list.styles.scss";
 

client/src/components/chat-messages-list/chat-message-list.styles.scss

@@ -44,6 +44,7 @@
 .yours {
   align-items: flex-start;
 }
+
 .msgmargin {
   margin-top: 0.1rem;
   margin-bottom: 0.1rem;
@@ -66,6 +67,7 @@
   background: #eee;
   border-bottom-right-radius: 15px;
 }
+
 .yours .message.last:after {
   content: "";
   position: absolute;

client/src/components/chat-new-conversation/chat-new-conversation.component.jsx

@@ -5,9 +5,7 @@ import { useTranslation } from "react-i18next";
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
 import {openChatByPhone} from "../../redux/messaging/messaging.actions";
-import PhoneFormItem, {
+import PhoneFormItem, {PhoneItemFormatterValidation,} from "../form-items-formatted/phone-form-item.component";
-  PhoneItemFormatterValidation,
-} from "../form-items-formatted/phone-form-item.component";
 
 const mapStateToProps = createStructuredSelector({
     //currentUser: selectCurrentUser

client/src/components/chat-open-button/chat-open-button.component.jsx

@@ -9,6 +9,7 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import {createStructuredSelector} from "reselect";
 import {selectBodyshop} from "../../redux/user/user.selectors";
 import {searchingForConversation} from "../../redux/messaging/messaging.selectors";
+
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
     searchingForConversation: searchingForConversation,
@@ -49,4 +50,5 @@ export function ChatOpenButton({
         </a>
     );
 }
+
 export default connect(mapStateToProps, mapDispatchToProps)(ChatOpenButton);

client/src/components/chat-popup/chat-popup.component.jsx

@@ -1,24 +1,13 @@
-import {
+import {InfoCircleOutlined, MessageOutlined, ShrinkOutlined, SyncOutlined,} from "@ant-design/icons";
-  InfoCircleOutlined,
-  MessageOutlined,
-  ShrinkOutlined,
-  SyncOutlined,
-} from "@ant-design/icons";
 import {useLazyQuery, useQuery} from "@apollo/client";
 import {Badge, Card, Col, Row, Space, Tag, Tooltip, Typography} from "antd";
 import React, {useCallback, useEffect, useState} from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
-import {
+import {CONVERSATION_LIST_QUERY, UNREAD_CONVERSATION_COUNT,} from "../../graphql/conversations.queries";
-  CONVERSATION_LIST_QUERY,
-  UNREAD_CONVERSATION_COUNT,
-} from "../../graphql/conversations.queries";
 import {toggleChatVisible} from "../../redux/messaging/messaging.actions";
-import {
+import {selectChatVisible, selectSelectedConversation,} from "../../redux/messaging/messaging.selectors";
-  selectChatVisible,
-  selectSelectedConversation,
-} from "../../redux/messaging/messaging.selectors";
 import ChatConversationListComponent from "../chat-conversation-list/chat-conversation-list.component";
 import ChatConversationContainer from "../chat-conversation/chat-conversation.container";
 import ChatNewConversation from "../chat-new-conversation/chat-new-conversation.component";
@@ -140,4 +129,5 @@ export function ChatPopupComponent({
         </Badge>
     );
 }
+
 export default connect(mapStateToProps, mapDispatchToProps)(ChatPopupComponent);

client/src/components/chat-popup/chat-popup.styles.scss

@@ -13,6 +13,7 @@
     height: 100%;
   }
 }
+
 .chat-popup-info-icon {
   margin-right: 5px;
 }

client/src/components/chat-presets/chat-presets.component.jsx

@@ -31,6 +31,7 @@ export function ChatPresetsComponent({ bodyshop, setMessage, className }) {
         </div>
     );
 }
+
 export default connect(
     mapStateToProps,
     mapDispatchToProps

client/src/components/chat-print-button/chat-print-button.component.jsx

@@ -42,4 +42,5 @@ export function ChatPrintButton({ conversation }) {
         </Space>
     );
 }
+
 export default connect(mapStateToProps, mapDispatchToProps)(ChatPrintButton);

client/src/components/chat-send-message/chat-send-message.component.jsx

@@ -5,14 +5,8 @@ import { useTranslation } from "react-i18next";
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
 import {logImEXEvent} from "../../firebase/firebase.utils";
-import {
+import {sendMessage, setMessage,} from "../../redux/messaging/messaging.actions";
-  sendMessage,
+import {selectIsSending, selectMessage,} from "../../redux/messaging/messaging.selectors";
-  setMessage,
-} from "../../redux/messaging/messaging.actions";
-import {
-  selectIsSending,
-  selectMessage,
-} from "../../redux/messaging/messaging.selectors";
 import {selectBodyshop} from "../../redux/user/user.selectors";
 import ChatMediaSelector from "../chat-media-selector/chat-media-selector.component";
 import ChatPresetsComponent from "../chat-presets/chat-presets.component";
@@ -110,6 +104,7 @@ function ChatSendMessageComponent({
         </div>
     );
 }
+
 export default connect(
     mapStateToProps,
     mapDispatchToProps

client/src/components/config-form-components/config-form-types.js

@@ -3,6 +3,7 @@ import Rate from "./rate/rate.component";
 import Slider from "./slider/slider.component";
 import Text from "./text/text.component";
 import Textarea from "./textarea/textarea.component";
+
 const e = {
     checkbox: CheckboxFormItem,
     slider: Slider,

client/src/components/conflict/conflict.component.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Result, Button } from "antd";
+import {Button, Result} from "antd";
 import {useTranslation} from "react-i18next";
 
 export default function ConflictComponent() {

client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx

@@ -1,14 +1,5 @@
 import {useMutation} from "@apollo/client";
-import {
+import {Button, Form, InputNumber, notification, Popover, Radio, Select, Space,} from "antd";
-  Button,
-  Form,
-  InputNumber,
-  notification,
-  Popover,
-  Radio,
-  Select,
-  Space,
-} from "antd";
 import axios from "axios";
 import dayjs from "../../utils/day";
 import React, {useState} from "react";
@@ -17,10 +8,7 @@ import { connect } from "react-redux";
 import {useNavigate} from "react-router-dom";
 import {createStructuredSelector} from "reselect";
 import {INSERT_NEW_JOB} from "../../graphql/jobs.queries";
-import {
+import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
-  selectBodyshop,
-  selectCurrentUser,
-} from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
     //currentUser: selectCurrentUser
@@ -402,6 +390,7 @@ export function ContractConvertToRo({
         </div>
     );
 }
+
 export default connect(
     mapStateToProps,
     mapDispatchToProps