diff --git a/server/job/job-costing.js b/server/job/job-costing.js index 179b96d4d..e9de9b5ff 100644 --- a/server/job/job-costing.js +++ b/server/job/job-costing.js @@ -265,11 +265,11 @@ function GenerateCostingData(job) { acc.labor[laborProfitCenter].add(laborAmount); if (val.mod_lbr_ty === "LAR") { - if (!acc.labor[defaultProfits["MAPA"]]) - acc.labor[defaultProfits["MAPA"]] = Dinero(); + if (!acc.parts[defaultProfits["MAPA"]]) + acc.parts[defaultProfits["MAPA"]] = Dinero(); materialsHours.mapaHrs += val.mod_lb_hrs || 0; - acc.labor[defaultProfits["MAPA"]] = acc.labor[ + acc.parts[defaultProfits["MAPA"]] = acc.parts[ defaultProfits["MAPA"] ].add( Dinero({ @@ -277,11 +277,11 @@ function GenerateCostingData(job) { }).multiply(val.mod_lb_hrs || 0) ); } - if (!acc.labor[defaultProfits["MASH"]]) - acc.labor[defaultProfits["MASH"]] = Dinero(); + if (!acc.parts[defaultProfits["MASH"]]) + acc.parts[defaultProfits["MASH"]] = Dinero(); if (val.mod_lbr_ty !== "LAR") { - acc.labor[defaultProfits["MASH"]] = acc.labor[ + acc.parts[defaultProfits["MASH"]] = acc.parts[ defaultProfits["MASH"] ].add( Dinero({ @@ -402,6 +402,7 @@ function GenerateCostingData(job) { }).multiply(materialsHours.mapaHrs) ); } + if (job.bodyshop.jc_hourly_rates && job.bodyshop.jc_hourly_rates.mash) { if ( !billTotalsByCostCenters[