From 653692b2a53638134be942281f68726a747b36c7 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 26 May 2022 15:11:44 -0700
Subject: [PATCH 1/2] IO-1868 Prevent returns on invoiced RO.

---
 .../bills-list-table/bills-list-table.component.jsx       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/src/components/bills-list-table/bills-list-table.component.jsx b/client/src/components/bills-list-table/bills-list-table.component.jsx
index 7b5173033..5c7553fd5 100644
--- a/client/src/components/bills-list-table/bills-list-table.component.jsx
+++ b/client/src/components/bills-list-table/bills-list-table.component.jsx
@@ -4,6 +4,7 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -14,7 +15,7 @@ import BillDeleteButton from "../bill-delete-button/bill-delete-button.component
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
-  //jobRO: selectJobReadOnly,
+  jobRO: selectJobReadOnly,
   bodyshop: selectBodyshop,
 });
 
@@ -29,6 +30,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function BillsListTableComponent({
   bodyshop,
+  jobRO,
   job,
   billsQuery,
   handleOnRowClick,
@@ -58,7 +60,9 @@ export function BillsListTableComponent({
       <BillDeleteButton bill={record} />
       <Button
         disabled={
-          record.is_credit_memo || record.vendorid === bodyshop.inhousevendorid
+          record.is_credit_memo ||
+          record.vendorid === bodyshop.inhousevendorid ||
+          jobRO
         }
         onClick={() => {
           setPartsOrderContext({

From b213e5d54fd04eaab5721911d6e25203a38fe8e3 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 26 May 2022 15:19:46 -0700
Subject: [PATCH 2/2] Fix link on active jobs page.

---
 client/src/components/jobs-list/jobs-list.component.jsx | 4 ++--
 client/src/graphql/jobs.queries.js                      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx
index 627f2d8e6..3c2553462 100644
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -137,9 +137,9 @@ export function JobsList({ bodyshop }) {
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
-        return record.owner ? (
+        return record.ownerid ? (
           <Link
-            to={"/manage/owners/" + record.owner.id}
+            to={"/manage/owners/" + record.ownerid}
             onClick={(e) => e.stopPropagation()}
           >
             <OwnerNameDisplay ownerObject={record} />
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 706bf425e..b5611eab7 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -12,6 +12,7 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
       ownr_ph1
       ownr_ph2
       ownr_ea
+      ownerid
       comment
       plate_no
       plate_st