IO-2814 Job Costing Correction for OP14 Duplication

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -1,5 +1,6 @@
 import { useMutation } from "@apollo/client";
 import { Button, Card, Form, Input, notification, Switch } from "antd";
+import dayjs from "../../../../utils/day";
 import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -13,7 +14,6 @@ import { UPDATE_OWNER } from "../../../../graphql/owners.queries";
 import { insertAuditTrail } from "../../../../redux/application/application.actions";
 import { selectBodyshop, selectCurrentUser } from "../../../../redux/user/user.selectors";
 import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
-import dayjs from "../../../../utils/day";
 import ConfigFormComponents from "../../../config-form-components/config-form-components.component";
 import DateTimePicker from "../../../form-date-time-picker/form-date-time-picker.component";
 
@@ -275,19 +275,7 @@ export function JobChecklistForm({ insertAuditTrail, formItems, bodyshop, curren
             >
               <DateTimePicker disabled={readOnly} />
             </Form.Item>
-            <Form.Item
-              name="actual_delivery"
-              label={t("jobs.fields.actual_delivery")}
-              rules={[
-                {
-                  required: bodyshop.deliverchecklist.actual_delivery
-                    ? bodyshop.deliverchecklist.actual_delivery
-                    : false
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              disabled={readOnly}
-            >
+            <Form.Item name="actual_delivery" label={t("jobs.fields.actual_delivery")} disabled={readOnly}>
               <DateTimePicker disabled={readOnly} />
             </Form.Item>
             <Form.Item

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

@@ -319,18 +319,6 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
             ))}
           </Select>
         </Form.Item>
-        <Form.Item
-          name={["deliverchecklist", "actual_delivery"]}
-          label={t("bodyshop.fields.deliver.require_actual_delivery_date")}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
-        >
-          <Switch />
-        </Form.Item>
       </SelectorDiv>
     </div>
   );

client/src/translations/en_us/common.json

@@ -295,8 +295,7 @@
 				"dailypainttarget": "Scoreboard - Daily Paint Target",
 				"default_adjustment_rate": "Default Labor Deduction Adjustment Rate",
 				"deliver": {
-					"templates": "Delivery Templates",
-					"require_actual_delivery_date": "Require Actual Delivery"
+					"templates": "Delivery Templates"
 				},
 				"dms": {
 					"apcontrol": "AP Control Number",

client/src/translations/es/common.json

@@ -295,8 +295,7 @@
 				"dailypainttarget": "",
 				"default_adjustment_rate": "",
 				"deliver": {
-					"templates": "",
-					"require_actual_delivery_date": ""
+					"templates": ""
 				},
 				"dms": {
 					"apcontrol": "",

client/src/translations/fr/common.json

@@ -295,8 +295,7 @@
 				"dailypainttarget": "",
 				"default_adjustment_rate": "",
 				"deliver": {
-					"templates": "",
-					"require_actual_delivery_date": ""
+					"templates": ""
 				},
 				"dms": {
 					"apcontrol": "",

server/job/job-costing.js

@@ -318,7 +318,9 @@ function GenerateCostingData(job) {
           if (!partsProfitCenter)
             console.log("Unknown cost/profit center mapping for parts.", val.line_desc, val.part_type);
           const partsAmount = Dinero({
-            amount: val.act_price_before_ppc ? Math.round(val.act_price_before_ppc * 100) : Math.round(val.act_price * 100)
+            amount: val.act_price_before_ppc
+              ? Math.round(val.act_price_before_ppc * 100)
+              : Math.round(val.act_price * 100)
           })
             .multiply(val.part_qty || 1)
             .add(
@@ -327,7 +329,9 @@ function GenerateCostingData(job) {
                 ? val.prt_dsmk_m
                   ? Dinero({ amount: Math.round(val.prt_dsmk_m * 100) })
                   : Dinero({
-                      amount: val.act_price_before_ppc ? Math.round(val.act_price_before_ppc * 100) : Math.round(val.act_price * 100)
+                      amount: val.act_price_before_ppc
+                        ? Math.round(val.act_price_before_ppc * 100)
+                        : Math.round(val.act_price * 100)
                     })
                       .multiply(val.part_qty || 0)
                       .percentage(Math.abs(val.prt_dsmk_p || 0))
@@ -368,7 +372,10 @@ function GenerateCostingData(job) {
         }
 
         //Additional Profit Center
-        if ((!val.part_type && !val.mod_lbr_ty) || (!val.part_type && val.mod_lbr_ty)) {
+        if (
+          (!val.part_type && !val.mod_lbr_ty) ||
+          (!val.part_type && val.mod_lbr_ty && val.act_price > 0 && val.lbr_op !== "OP14")
+        ) {
           //Does it already have a defined profit center?
           //If so, use it, otherwise try to use the same from the auto-allocate logic in IO app jobs-close-auto-allocate.
           const partsProfitCenter = val.profitcenter_part || getAdditionalCostCenter(val, defaultProfits) || "Unknown";