Merge release & add time ticket calculations.

client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx

@@ -120,7 +120,9 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
                 {totals.totalSale.toFormat()}
               </Table.Summary.Cell>
               <Table.Summary.Cell>
-                {totals.totalCost.toFormat()}
+                {
+                  //  totals.totalCost.toFormat()
+                }
               </Table.Summary.Cell>
               <Table.Summary.Cell></Table.Summary.Cell>
               <Table.Summary.Cell></Table.Summary.Cell>

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

@@ -13,6 +13,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CABCpvrtCalculator from "../ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
@@ -22,9 +23,10 @@ import JobsDetailRatesParts from "./jobs-detail-rates.parts.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
+  bodyshop: selectBodyshop,
 });
 
-export function JobsDetailRates({ jobRO, form, job }) {
+export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
   const { t } = useTranslation();
   return (
     <div>
@@ -77,7 +79,7 @@ export function JobsDetailRates({ jobRO, form, job }) {
           label={t("jobs.fields.adjustment_bottom_line")}
           name="adjustment_bottom_line"
         >
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} />
         </Form.Item>
         <Space align="end">
           <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">

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

@@ -121,6 +121,27 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
             >
               <Input />
             </Form.Item>
+            <Form.Item
+              label={t("bodyshop.fields.dms.itc_federal")}
+              valuePropName="checked"
+              name={["cdk_configuration", "itc_federal"]}
+            >
+              <Switch />
+            </Form.Item>
+            <Form.Item
+              label={t("bodyshop.fields.dms.itc_state")}
+              valuePropName="checked"
+              name={["cdk_configuration", "itc_state"]}
+            >
+              <Switch />
+            </Form.Item>
+            <Form.Item
+              label={t("bodyshop.fields.dms.itc_local")}
+              valuePropName="checked"
+              name={["cdk_configuration", "itc_local"]}
+            >
+              <Switch />
+            </Form.Item>
           </LayoutFormRow>
           <LayoutFormRow header={t("bodyshop.labels.dms.cdk.payers")}>
             <Form.List name={["cdk_configuration", "payers"]}>
@@ -471,20 +492,26 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                     {fields.map((field, index) => (
                       <Form.Item key={field.key}>
                         <div>
-                          <Form.Item
-                            label={t("bodyshop.fields.dms.mappingname")}
-                            key={`${index}name`}
-                            name={[field.name, "name"]}
-                            rules={[
-                              {
-                                required: true,
-                                //message: t("general.validation.required"),
-                              },
-                            ]}
-                          >
-                            <Input />
-                          </Form.Item>
-
+                          <LayoutFormRow>
+                            <Form.Item
+                              label={t("bodyshop.fields.dms.mappingname")}
+                              key={`${index}name`}
+                              name={[field.name, "name"]}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                            >
+                              <Input />
+                            </Form.Item>
+                            <DeleteFilled
+                              onClick={() => {
+                                remove(field.name);
+                              }}
+                            />
+                          </LayoutFormRow>
                           <LayoutFormRow
                             header={t("bodyshop.labels.defaultcostsmapping")}
                           >
@@ -1627,12 +1654,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                               </Select>
                             </Form.Item>
                           </LayoutFormRow>
-
-                          <DeleteFilled
-                            onClick={() => {
-                              remove(field.name);
-                            }}
-                          />
                         </div>
                       </Form.Item>
                     ))}
@@ -2717,7 +2738,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         </Form.Item>
         {bodyshop.cdk_dealerid && (
           <Form.Item
-            label={t("bodyshop.fields.responsibilitycenter_dms_acctnumber")}
+            label={t("bodyshop.fields.dms.dms_acctnumber")}
             rules={[
               {
                 required: true,
@@ -2815,7 +2836,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         </Form.Item>
         {bodyshop.cdk_dealerid && (
           <Form.Item
-            label={t("bodyshop.fields.responsibilitycenter_dms_acctnumber")}
+            label={t("bodyshop.fields.dms.dms_acctnumber")}
             rules={[
               {
                 required: true,
@@ -2911,21 +2932,9 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         >
           <Input />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_rate")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "local", "rate"]}
-        >
-          <InputNumber precision={2} />
-        </Form.Item>
         {bodyshop.cdk_dealerid && (
           <Form.Item
-            label={t("bodyshop.fields.responsibilitycenter_dms_acctnumber")}
+            label={t("bodyshop.fields.dms.dms_acctnumber")}
             rules={[
               {
                 required: true,
@@ -2942,6 +2951,18 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
             <Input />
           </Form.Item>
         )}
+        <Form.Item
+          label={t("bodyshop.fields.responsibilitycenter_rate")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_responsibility_centers", "taxes", "local", "rate"]}
+        >
+          <InputNumber precision={2} />
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow header={<div>AR</div>}>
         {/* <Form.Item

client/src/pages/dms/dms.container.jsx

@@ -108,6 +108,8 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
       });
       history.push("/manage/accounting/receivables");
     });
+
+    if (socket.disconnected) socket.connect();
     return () => {
       socket.removeAllListeners();
       socket.disconnect();

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -218,7 +218,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
                 },
               ]}
             >
-              <InputNumber disabled={jobRO} />
+              <InputNumber precision={0} disabled={jobRO} />
             </Form.Item>
           )}
           {bodyshop.cdk_dealerid && (
@@ -244,7 +244,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
                 }),
               ]}
             >
-              <InputNumber disabled={jobRO} />
+              <InputNumber precision={0} disabled={jobRO} />
             </Form.Item>
           )}
         </LayoutFormRow>