IO-2814 Job Costing Correction for OP14 Duplication

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

client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx

@@ -3,7 +3,6 @@ import { Button, Space, notification } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { DELETE_DELIVERY_CHECKLIST, DELETE_INTAKE_CHECKLIST } from "../../graphql/jobs.queries";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 export default function JobAdminDeleteIntake({ job }) {
   const { t } = useTranslation();
@@ -48,22 +47,16 @@ export default function JobAdminDeleteIntake({ job }) {
     setLoading(false);
   };
 
-  const InstanceRender = InstanceRenderManager({
-    imex: true,
-    rome: "USE_IMEX",
-    promanager: false
-  });
-
-  return InstanceRender ? (
+  return (
     <>
       <Space wrap>
         <Button loading={loading} onClick={handleDelete} disabled={!job.intakechecklist}>
           {t("jobs.labels.deleteintake")}
         </Button>
-        <Button loading={loading} onClick={handleDeleteDelivery} disabled={!job.deliverchecklist}>
+        <Button loading={loading} onClick={handleDeleteDelivery} disabled={!job.deliverychecklist}>
           {t("jobs.labels.deletedelivery")}
         </Button>
       </Space>
     </>
-  ) : null;
+  );
 }

server/accounting/qb-receivables-lines.js

@@ -891,19 +891,22 @@ function checkStateTax(jobline, jobs_by_pk) {
   }
 
   const isAdditionalCost =
-    (jobline.lbr_op === "OP13" ||
-      (jobline.lbr_op === "OP14" && jobline.act_price > 0 && jobline.mod_lb_hrs === 0) ||
-      (jobline.db_ref && jobline.db_ref.startsWith("9360")) ||
-      (jobline.db_ref && jobline.db_ref.startsWith("90051"))) &&
-    !isPaintOrShopMat;
+    (jobline.lbr_op === "OP13" || (jobline.db_ref && jobline.db_ref.startsWith("9360"))) && !isPaintOrShopMat;
 
-    if (!jobline.part_type && isAdditionalCost) {
-      if (jobs_by_pk.tax_lbr_rt === 0) {
-        return false;
-      } else {
-        return true;
-      }
+  if (!jobline.part_type && isAdditionalCost) {
+    if (jobs_by_pk.tax_lbr_rt === 0) {
+      return false;
+    } else {
+      return true;
     }
+  }
+
+  if (
+    jobline.db_ref === "900511" ||
+    jobline.db_ref === "900510" ||
+    (jobline.mod_lb_hrs === 0 && jobline.act_price > 0 && jobline.lbr_op === "OP14")
+  )
+    return true; //Extending IO-1375 as a part of IO-2023
 
   if (jobline.tax_part === false) {
     return false;

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";