- Merge AIO

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/pages/bills/bills.page.component.jsx

@@ -216,7 +216,7 @@ export function BillsListPage({ loading, data, refetch, total, setPartsOrderCont
       extra={
         <Space wrap>
           {search.search && (
-            <>
+            <Space align="center">
               <Typography.Title level={4}>
                 {t("general.labels.searchresults", { search: search.search })}
               </Typography.Title>
@@ -229,7 +229,7 @@ export function BillsListPage({ loading, data, refetch, total, setPartsOrderCont
               >
                 {t("general.actions.clear")}
               </Button>
-            </>
+            </Space>
           )}
           <Button onClick={() => refetch()}>
             <SyncOutlined />

client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx

@@ -72,7 +72,11 @@ export function CourtesyCarCreateContainer({ bodyshop, setBreadcrumbs, setSelect
     <RbacWrapper action="courtesycar:create">
       <FeatureWrapperComponent featureName="courtesycars">
         <Form form={form} autoComplete="new-password" onFinish={handleFinish} layout="vertical">
-          <CourtesyCarFormComponent form={form} saveLoading={loading} />
+          <CourtesyCarFormComponent
+          form={form}
+          saveLoading={loading}
+          newCC={true}
+        />
         </Form>
       </FeatureWrapperComponent>
     </RbacWrapper>

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -41,6 +41,7 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import JobCloseRoGuardContainer from '../../components/job-close-ro-guard/job-close-ro-guard.container';
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -183,7 +184,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail }) {
             </Space>
           }
         />
-
+     <JobCloseRoGuardContainer form={form} job={job} />
         <Space wrap direction="vertical" style={{ width: "100%" }}>
           <FormsFieldChanged form={form} />
           {!job.actual_in && job.scheduled_in && <Alert type="warning" message={t("jobs.labels.actual_in_inferred")} />}