Merge branch 'release/2025-04-25' into feature/IO-3213-Hit-and-Run-Toggle

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	client/src/components/jobs-detail-general/jobs-detail-general.component.jsx

client/src/graphql/jobs-lines.queries.js

@@ -35,6 +35,30 @@ export const GET_LINE_TICKET_BY_PK = gql`
       lbr_adjustments
       converted
       status
+      employee_body
+      employee_body_rel {
+        id
+        first_name
+        last_name
+      }
+      employee_csr
+      employee_csr_rel {
+        id
+        first_name
+        last_name
+      }
+      employee_prep
+      employee_prep_rel {
+        id
+        first_name
+        last_name
+      }
+      employee_refinish
+      employee_refinish_rel {
+        id
+        first_name
+        last_name
+      }
     }
     joblines(where: { jobid: { _eq: $id }, removed: { _eq: false } }) {
       id

client/src/graphql/jobs.queries.js

@@ -423,6 +423,7 @@ export const GET_JOB_BY_PK = gql`
       actual_completion
       actual_delivery
       actual_in
+      acv_amount
       adjustment_bottom_line
       alt_transport
       area_of_damage