admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/IO-3503-Job-Costing-Fixes (pull request #2921)

Browse Source 
IO-3503 Job Costing Corrections

Approved-by: Dave Richer
This commit is contained in:
Allan Carr
2026-01-31 01:10:20 +00:00
committed by Dave Richer
parent 9e2ae2cc10 78770ed54e
commit 1896c4db59
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/graphql-client/queries.js
View File

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

25
server/job/job-costing.js
View File

@@ -343,7 +343,7 @@ function GenerateCostingData(job) {
if (!acc.labor[laborProfitCenter]) acc.labor[laborProfitCenter] = Dinero(); if (!acc.labor[laborProfitCenter]) acc.labor[laborProfitCenter] = Dinero();
acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add(laborAmount); acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add(laborAmount);
if (val.act_price > 0 && val.lbr_op === "OP14") { if (val.act_price > 0 && val.lbr_op === "OP14" && !val.part_type) {
//Scenario where SGI may pay out hours using a part price. //Scenario where SGI may pay out hours using a part price.
acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add( acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add(
Dinero({ Dinero({
@@ -363,6 +363,9 @@ function GenerateCostingData(job) {
if (val.mod_lbr_ty !== "LAR" && mashOpCodes.includes(val.lbr_op)) { if (val.mod_lbr_ty !== "LAR" && mashOpCodes.includes(val.lbr_op)) {
materialsHours.mashHrs += val.mod_lb_hrs || 0; 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;
}
} }
} }
@@ -499,7 +502,7 @@ function GenerateCostingData(job) {
let disc = Dinero(), let disc = Dinero(),
markup = Dinero(); markup = Dinero();
const convertedKey = Object.keys(defaultProfits).find((k) => defaultProfits[k] === key); const convertedKey = Object.keys(defaultProfits).find((k) => defaultProfits[k] === key);
if (job.parts_tax_rates && job.parts_tax_rates[convertedKey.toUpperCase()]) { if (convertedKey && job.parts_tax_rates && job.parts_tax_rates[convertedKey.toUpperCase()]) {
if ( if (
job.parts_tax_rates[convertedKey.toUpperCase()].prt_discp !== undefined && job.parts_tax_rates[convertedKey.toUpperCase()].prt_discp !== undefined &&
job.parts_tax_rates[convertedKey.toUpperCase()].prt_discp >= 0 job.parts_tax_rates[convertedKey.toUpperCase()].prt_discp >= 0
@@ -523,14 +526,16 @@ function GenerateCostingData(job) {
} }
if (InstanceManager({ rome: true })) { if (InstanceManager({ rome: true })) {
const correspondingCiecaStlTotalLine = job.cieca_stl?.data.find( if (convertedKey) {
(c) => c.ttl_typecd === convertedKey.toUpperCase() const correspondingCiecaStlTotalLine = job.cieca_stl?.data.find(
); (c) => c.ttl_typecd === convertedKey.toUpperCase()
if ( );
correspondingCiecaStlTotalLine && if (
Math.abs(jobLineTotalsByProfitCenter.parts[key].getAmount() - correspondingCiecaStlTotalLine.ttl_amt * 100) > 1 correspondingCiecaStlTotalLine &&
) { Math.abs(jobLineTotalsByProfitCenter.parts[key].getAmount() - correspondingCiecaStlTotalLine.ttl_amt * 100) > 1
jobLineTotalsByProfitCenter.parts[key] = jobLineTotalsByProfitCenter.parts[key].add(disc).add(markup); ) {
jobLineTotalsByProfitCenter.parts[key] = jobLineTotalsByProfitCenter.parts[key].add(disc).add(markup);
}
} }
} }
}); });