feature/IO-3503-Job-Costing-Fixes-2

server/graphql-client/queries.js

@@ -1725,7 +1725,6 @@ query QUERY_JOB_COSTING_DETAILS($id: uuid!) {
         profitcenter_part
         profitcenter_labor
         act_price_before_ppc
-        manual_line
       }
       bills {
         id
@@ -1843,7 +1842,6 @@ exports.QUERY_JOB_COSTING_DETAILS_MULTI = ` query QUERY_JOB_COSTING_DETAILS_MULT
       op_code_desc
       profitcenter_part
       profitcenter_labor
-      manual_line
     }
     bills {
       id

server/job/job-costing.js

@@ -267,6 +267,7 @@ function GenerateCostingData(job) {
 
   const materialsHours = { mapaHrs: 0, mashHrs: 0 };
   let mashOpCodes = InstanceManager({
+    imex: [],
     rome: ParseCalopCode(job.materials["MASH"]?.cal_opcode)
   });
   let hasMapaLine = false;
@@ -343,7 +344,7 @@ function GenerateCostingData(job) {
           if (!acc.labor[laborProfitCenter]) acc.labor[laborProfitCenter] = Dinero();
           acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add(laborAmount);
 
-          if (val.act_price > 0 && val.lbr_op === "OP14" && !val.part_type) {
+          if (val.act_price > 0 && val.lbr_op === "OP14") {
             //Scenario where SGI may pay out hours using a part price.
             acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add(
               Dinero({
@@ -355,17 +356,8 @@ function GenerateCostingData(job) {
           if (val.mod_lbr_ty === "LAR") {
             materialsHours.mapaHrs += val.mod_lb_hrs || 0;
           }
-          if (InstanceManager({ imex: true, rome: false })) {
-            if (val.mod_lbr_ty !== "LAR") {
-              materialsHours.mashHrs += val.mod_lb_hrs || 0;
-            }
-          } else {
-            if (val.mod_lbr_ty !== "LAR" && mashOpCodes.includes(val.lbr_op)) {
-              materialsHours.mashHrs += val.mod_lb_hrs || 0;
-            }
-            if (val.manual_line === true && !mashOpCodes.includes(val.lbr_op) && val.mod_lbr_ty !== "LAR" ) {
-              materialsHours.mashHrs += val.mod_lb_hrs || 0;
-            }
+          if (val.mod_lbr_ty !== "LAR" && mashOpCodes.includes(val.lbr_op)) {
+            materialsHours.mashHrs += val.mod_lb_hrs || 0;
           }
         }
 
@@ -502,7 +494,7 @@ function GenerateCostingData(job) {
     let disc = Dinero(),
       markup = Dinero();
     const convertedKey = Object.keys(defaultProfits).find((k) => defaultProfits[k] === key);
-    if (convertedKey && job.parts_tax_rates && job.parts_tax_rates[convertedKey.toUpperCase()]) {
+    if (job.parts_tax_rates && job.parts_tax_rates[convertedKey.toUpperCase()]) {
       if (
         job.parts_tax_rates[convertedKey.toUpperCase()].prt_discp !== undefined &&
         job.parts_tax_rates[convertedKey.toUpperCase()].prt_discp >= 0
@@ -525,28 +517,25 @@ function GenerateCostingData(job) {
       }
     }
 
-    if (InstanceManager({ rome: true })) {
-      if (convertedKey) {
-        const correspondingCiecaStlTotalLine = job.cieca_stl?.data.find(
-          (c) => c.ttl_typecd === convertedKey.toUpperCase()
-        );
-        if (
-          correspondingCiecaStlTotalLine &&
-          Math.abs(jobLineTotalsByProfitCenter.parts[key].getAmount() - correspondingCiecaStlTotalLine.ttl_amt * 100) > 1
-        ) {
-          jobLineTotalsByProfitCenter.parts[key] = jobLineTotalsByProfitCenter.parts[key].add(disc).add(markup);
-        }
+    if (InstanceManager({ imex: true, rome: false })) {
+      //this might need to be removed for ImEX
+      jobLineTotalsByProfitCenter.parts[key] = jobLineTotalsByProfitCenter.parts[key].add(disc).add(markup);
+    } else {
+      const correspondingCiecaStlTotalLine = job.cieca_stl?.data.find(
+        (c) => c.ttl_typecd === convertedKey.toUpperCase()
+      );
+      if (
+        correspondingCiecaStlTotalLine &&
+        Math.abs(jobLineTotalsByProfitCenter.parts[key].getAmount() - correspondingCiecaStlTotalLine.ttl_amt * 100) > 1
+      ) {
+        jobLineTotalsByProfitCenter.parts[key] = jobLineTotalsByProfitCenter.parts[key].add(disc).add(markup);
       }
     }
   });
 
   if (!hasMapaLine) {
     let threshold;
-    if (
-      job.materials["MAPA"] &&
-      job.materials["MAPA"].cal_maxdlr !== undefined &&
-      job.materials["MAPA"].cal_maxdlr >= 0
-    ) {
+    if (job.materials["MAPA"].cal_maxdlr !== undefined && job.materials["MAPA"].cal_maxdlr >= 0) {
       //It has an upper threshhold.
       threshold = Dinero({
         amount: Math.round(job.materials["MAPA"].cal_maxdlr * 100)
@@ -592,11 +581,7 @@ function GenerateCostingData(job) {
   }
   if (!hasMashLine) {
     let threshold;
-    if (
-      job.materials["MASH"] &&
-      job.materials["MASH"].cal_maxdlr !== undefined &&
-      job.materials["MASH"].cal_maxdlr >= 0
-    ) {
+    if (job.materials["MASH"].cal_maxdlr !== undefined && job.materials["MASH"].cal_maxdlr >= 0) {
       //It has an upper threshhold.
       threshold = Dinero({
         amount: Math.round(job.materials["MASH"].cal_maxdlr * 100)