Revert "IO-1606 Include additional costs in reconciliation."

This reverts commit 821b044515.
This commit is contained in:
Patrick Fic
2022-01-19 11:50:14 -08:00
parent 4a7eb9b373
commit 4deed41a12
2 changed files with 4 additions and 22 deletions

View File

@@ -64,9 +64,9 @@ export default function JobBillsTotalComponent({
}) })
); );
const totalPartsSublet = Dinero(totals.parts.parts.total) const totalPartsSublet = Dinero(totals.parts.parts.total).add(
.add(Dinero(totals.parts.sublets.total)) Dinero(totals.parts.sublets.total)
.add(Dinero(totals.additional.additionalCosts)); );
const discrepancy = totalPartsSublet.subtract(billTotals); const discrepancy = totalPartsSublet.subtract(billTotals);

View File

@@ -18,8 +18,7 @@ export default function JobReconciliationModalComponent({ job, bills }) {
.flat() || []; .flat() || [];
const jobLineData = job.joblines.filter( const jobLineData = job.joblines.filter(
(j) => (j) => j.part_type !== null && j.part_type !== "PAE"
(j.part_type !== null && j.part_type !== "PAE") || IsAdditionalCost(j)
); );
return ( return (
@@ -51,20 +50,3 @@ export default function JobReconciliationModalComponent({ job, bills }) {
</div> </div>
); );
} }
function IsAdditionalCost(jobLine) {
//May be able to use db_ref here to help.
//936012 is Haz Waste Dispoal
//936008 is Paint/Materials
//936007 is Shop/Materials
//Remove paint and shop mat lines. They're calculated under rates.
const isPaintOrShopMat =
jobLine.db_ref === "936008" || jobLine.db_ref === "936007";
return (
(jobLine.lbr_op === "OP13" || //Added to resolve manual job lines coming into other totals because they have no reference.
(jobLine.db_ref && jobLine.db_ref.startsWith("9360"))) &&
!isPaintOrShopMat
);
}