diff --git a/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx b/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx index 26ce3dd8e..ea91a4b91 100644 --- a/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx +++ b/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx @@ -108,6 +108,9 @@ export default function JobReconciliationBillsTable({ rowSelection={{ onChange: handleOnRowClick, selectedRowKeys: selectedLines, + getCheckboxProps: (record) => { + return { disabled: record.deductedfromlbr }; + }, }} /> diff --git a/client/src/components/job-reconciliation-totals/job-reconciliation-totals.utility.js b/client/src/components/job-reconciliation-totals/job-reconciliation-totals.utility.js index b3f2771cc..ea3b1d8b4 100644 --- a/client/src/components/job-reconciliation-totals/job-reconciliation-totals.utility.js +++ b/client/src/components/job-reconciliation-totals/job-reconciliation-totals.utility.js @@ -11,7 +11,7 @@ export const reconcileByAssocLine = ( const [selectedJobLines, setSelectedJobLines] = jobLineState; const allJoblinesFromBills = billLines - .filter((bl) => bl.joblineid && !(bl.jobline && bl.jobline.removed)) + .filter((bl) => bl.joblineid && bl.jobline && !bl.jobline.removed) .map((bl) => bl.joblineid); const duplicatedJobLinesbyInvoiceId = _.filter( diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index 94a210a98..bb2839dfc 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -630,7 +630,7 @@ export const GET_JOB_RECONCILIATION_BY_PK = gql` is_credit_memo isinhouse exported - billlines { + billlines(where: { deductedfromlbr: { _eq: false } }) { actual_price quantity actual_cost