From 3c0e62ffacdd1c91385a9dac9dfa27530491bba9 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Tue, 4 Nov 2025 08:57:23 -0800 Subject: [PATCH] IO-3430 Additional Cost Items Signed-off-by: Allan Carr --- server/job/job-totals-USA.js | 2 +- server/job/job-totals.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/job/job-totals-USA.js b/server/job/job-totals-USA.js index f875c3551..d1ff5abe6 100644 --- a/server/job/job-totals-USA.js +++ b/server/job/job-totals-USA.js @@ -381,7 +381,7 @@ async function CalculateRatesTotals({ job, client }) { if (item.mod_lbr_ty) { //Check to see if it has 0 hours and a price instead. - if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0)) { + if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0) && !IsAdditionalCost(item)) { //Scenario where SGI may pay out hours using a part price. if (!ret[item.mod_lbr_ty.toLowerCase()].total) { ret[item.mod_lbr_ty.toLowerCase()].base = Dinero(); diff --git a/server/job/job-totals.js b/server/job/job-totals.js index b6617b18c..c11d8d7de 100644 --- a/server/job/job-totals.js +++ b/server/job/job-totals.js @@ -315,7 +315,7 @@ function CalculateRatesTotals(ratesList) { if (item.mod_lbr_ty) { //Check to see if it has 0 hours and a price instead. //Extend for when there are hours and a price. - if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0)) { + if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0) && !IsAdditionalCost(item)) { //Scenario where SGI may pay out hours using a part price. if (!ret[item.mod_lbr_ty.toLowerCase()].total) { ret[item.mod_lbr_ty.toLowerCase()].total = Dinero();