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

Merged in feature/IO-2425-US-Reconcilliation-Non-Parts-w-$$$ (pull request #1036)

Browse Source 
IO-2425 US Reconcilliation for Non-Parts that have Misc amt
This commit is contained in:
Allan Carr
2023-10-27 17:20:57 +00:00
parent 6656708c8e f4bcad1b06
commit 57909ebc61
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/components/job-bills-total/job-bills-total.component.jsx
View File

@@ -87,7 +87,8 @@ export default function JobBillsTotalComponent({
const totalPartsSublet = Dinero(totals.parts.parts.total) const totalPartsSublet = Dinero(totals.parts.parts.total)
.add(Dinero(totals.parts.sublets.total)) .add(Dinero(totals.parts.sublets.total))
.add(Dinero(totals.additional.shipping)) .add(Dinero(totals.additional.shipping))
.add(Dinero(totals.additional.towing)); .add(Dinero(totals.additional.towing))
.add(Dinero(totals.additional.additionalCosts));
const discrepancy = totalPartsSublet.subtract(billTotals); const discrepancy = totalPartsSublet.subtract(billTotals);

3
client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx
View File

@@ -19,7 +19,8 @@ export default function JobReconciliationModalComponent({ job, bills }) {
const jobLineData = job.joblines.filter( const jobLineData = job.joblines.filter(
(j) => (j) =>
(j.part_type !== null && j.part_type !== "PAE") || (j.part_type !== "PAE" && j.act_price !== 0 && j.part_qty !== 0) ||
j.misc_amt !== 0 ||
(j.line_desc && (j.line_desc &&
j.line_desc.toLowerCase().includes("towing") && j.line_desc.toLowerCase().includes("towing") &&
j.lbr_op === "OP13") || j.lbr_op === "OP13") ||

1
client/src/graphql/jobs.queries.js
View File

@@ -850,6 +850,7 @@ export const GET_JOB_RECONCILIATION_BY_PK = gql`
tax_part tax_part
db_ref db_ref
manual_line manual_line
misc_amt
} }
} }
} }