Merged in feature/america (pull request #839)

Feature/america

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -560,6 +560,7 @@ async function ResolveCCCLineIssues(estData, bodyshop) {
     );
     estData.joblines.data[nonRefLineIndex + 1] = {
       ...estData.joblines.data[nonRefLineIndex + 1],
+      part_type: null,
       act_price: 0,
       db_price: 0,
       prt_dsmk_p: 0,

client/src/components/time-ticket-list/time-ticket-list.component.jsx

@@ -1,6 +1,5 @@
 import { EditFilled } from "@ant-design/icons";
 import { Button, Card, Checkbox, Space, Table } from "antd";
-import Dinero from "dinero.js";
 import moment from "moment";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";

client/src/components/time-ticket-task-modal/time-ticket-task-modal.component.jsx

@@ -23,7 +23,6 @@ import JobSearchSelectComponent from "../job-search-select/job-search-select.com
 import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
 import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component";
 import TimeTicketsTasksPresets from "../time-ticket-tasks-presets/time-ticket-tasks-presets.component";
-import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -55,7 +54,6 @@ export function TimeTicketTaskModalComponent({
         calculateTimeTickets={calculateTimeTickets}
       />
       <Row gutter={[16, 16]}>
-  
         <Col xl={12} lg={24}>
           <Form.Item
             name="jobid"
@@ -369,7 +367,10 @@ export function TimeTicketTaskModalComponent({
       </Form.Item>
       {bodyshop?.md_tasks_presets?.use_approvals && (
         <Col span={24}>
-          <Alert message={t("tt_approvals.labels.approval_queue_in_use")} type="warning" />
+          <Alert
+            message={t("tt_approvals.labels.approval_queue_in_use")}
+            type="warning"
+          />
         </Col>
       )}
     </div>

client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx

@@ -5,15 +5,12 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {
-  UPDATE_TIME_TICKET,
-  UPDATE_TIME_TICKETS,
-} from "../../graphql/timetickets.queries";
+import { UPDATE_TIME_TICKET } from "../../graphql/timetickets.queries";
+import { setModalContext } from "../../redux/modals/modals.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import { setModalContext } from "../../redux/modals/modals.actions";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,