IO-3430 Additional Cost Items

Signed-off-by: Allan Carr <allan@imexsystems.ca>
Merged in release/2025-10-24 (pull request #2640 )
2025-11-04 08:57:23 -08:00 · 2025-10-25 01:41:09 +00:00 · 2025-10-23 18:49:29 +00:00 · 2025-10-23 16:21:03 +00:00 · 2025-10-23 09:17:15 -07:00
3 changed files with 3 additions and 3 deletions
--- a/server/job/job-costing.js
+++ b/server/job/job-costing.js
@@ -405,7 +405,7 @@ function GenerateCostingData(job) {
            ) {
              const discountRate =
                Math.abs(job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp) > 1
-                  ? job.parts_tax_rates_rates[val.part_type.toUpperCase()].prt_discp
+                  ? job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp
                  : job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp * 100;
              const disc = partsAmount.percentage(discountRate).multiply(-1);
              partsAmount = partsAmount.add(disc);
--- 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();
--- 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();
Author	SHA1	Message	Date
Allan Carr	3c0e62ffac	IO-3430 Additional Cost Items Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-11-04 08:57:23 -08:00
Dave Richer	907f291f90	Merged in release/2025-10-24 (pull request #2640 ) Release/2025 10 24 into master-AIO - IO-3412 - IO-3398	2025-10-25 01:41:09 +00:00
Patrick Fic	abce19530f	Merged in feature/IO-3398-bill-line-select-display (pull request #2638 ) IO-3398 Bill line search select will now show price in select value.	2025-10-23 18:49:29 +00:00
Patrick Fic	cff1afe605	Merged in feature/IO-3412-costing-tax-rate-typo (pull request #2637 ) IO-3412 Resolve tax rate typo in job costing.	2025-10-23 16:21:03 +00:00
Patrick Fic	b337309f94	IO-3412 Resolve tax rate typo in job costing.	2025-10-23 09:17:15 -07:00