Merge branch 'release/2024-01-26' into feature/IO-1828-Front-End-Package-Updates
# Conflicts: # client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx # client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx # client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx # client/src/components/report-center-modal/report-center-modal.component.jsx
This commit is contained in:
@@ -99,6 +99,7 @@
|
||||
},
|
||||
"audit_trail": {
|
||||
"messages": {
|
||||
"admin_job_remove_from_ar": "",
|
||||
"admin_jobmarkexported": "",
|
||||
"admin_jobmarkforreexport": "",
|
||||
"admin_jobuninvoice": "",
|
||||
@@ -1868,6 +1869,7 @@
|
||||
},
|
||||
"reconciliationheader": "",
|
||||
"relatedros": "",
|
||||
"remove_from_ar": "",
|
||||
"returntotals": "",
|
||||
"rosaletotal": "",
|
||||
"sale_additional": "",
|
||||
@@ -2598,6 +2600,7 @@
|
||||
},
|
||||
"templates": {
|
||||
"anticipated_revenue": "",
|
||||
"ar_aging": "",
|
||||
"attendance_detail": "",
|
||||
"attendance_employee": "",
|
||||
"attendance_summary": "",
|
||||
|
||||
Reference in New Issue
Block a user