admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,060 Commits 1,012 Branches 0 Tags
33c282051bf892c15fb87d3c487df569770e9acc
Commit Graph

940 Commits

Author SHA1 Message Date
Dave Richer
33c282051b Fix Formatting issues 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-04-08 22:25:07 -04:00
Dave Richer
e23f13a1b3 - Merge Test-AIO 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-04-08 20:25:08 -04:00
Patrick Fic
9605bf5c21 Merge branch 'release/2024-04-05' into release/AIO/2024-04-05 2024-04-08 13:55:43 -07:00
Allan Carr
88a71dd647 IO-2731 Payment Edit 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-04-08 12:23:04 -07:00
Dave Richer
bd3d86a6dd - Tasks Audit Trail Additions 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-04-08 13:26:37 -04:00
Dave Richer
d004133ad6 - Merge AIO 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-04-05 09:35:35 -04:00
Patrick Fic
96242a555a RO Closer bug fixes. 2024-04-04 20:41:39 -07:00
Patrick Fic
c4d39cf3d3 Merge branch 'test-AIO' into feature/IO-2458-RO-Closer 
# Conflicts:
#	client/src/components/job-bills-total/job-bills-total.component.jsx
#	client/src/components/job-costing-statistics/job-costing-statistics.component.jsx
#	client/src/components/job-lifecycle/job-lifecycle.component.jsx
#	client/src/components/job-payments/job-payments.component.jsx
#	client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
#	client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
#	client/src/components/shop-info/shop-info.component.jsx
#	client/src/graphql/bodyshop.queries.js
#	client/src/graphql/jobs.queries.js
#	client/src/pages/jobs-close/jobs-close.component.jsx
#	client/src/utils/instanceRenderMgr.js
 2024-04-04 11:12:49 -07:00
Patrick Fic
5e63ce7271 Final changes for RO closer. 2024-04-03 14:18:45 -07:00
Dave Richer
ab031c01de - reapply proper prettier formatting. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-04-03 14:09:09 -04:00
Dave Richer
3eb010285d - Update date picker presets 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-04-03 13:01:56 -04:00
Dave Richer
d94678d4f4 - Progress Commit 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-04-02 15:20:23 -04:00
Dave Richer
90814f41a2 - Progress Commit 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-04-02 15:01:51 -04:00
Dave Richer
282dbd0913 - Progress Commit 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-04-01 20:20:01 -04:00
Dave Richer
ae07f71e76 - Progress Commit 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-04-01 14:45:55 -04:00
Patrick Fic
07a18bcd8c IO-2661 Rename CSR labels to Writer for Rome & PM 2024-04-01 10:44:57 -07:00
Dave Richer
54dc9c8587 - merge AIO 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-03-28 15:03:43 -04:00
Patrick Fic
3acf271dcf Merge branch 'release/2024-03-28' into test-AIO 2024-03-28 10:30:06 -07:00
Dave Richer
cc7c98336f - Progress commit 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-03-28 13:03:09 -04:00
Patrick Fic
e1df64d592 Reformat all project files to use the prettier config file. 2024-03-27 15:35:07 -07:00
Dave Richer
ae9e9f4b72 - Progress commit 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-03-27 17:00:07 -04:00
Dave Richer
301c680bff - Progress commit 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-03-26 21:36:27 -04:00
Patrick Fic
815ada0516 WIP RO Closer. 2024-03-25 15:38:38 -07:00
Patrick Fic
15a9988894 Merge branch 'master-AIO' into feature/IO-2458-RO-Closer 2024-03-22 08:41:12 -07:00
Patrick Fic
6831a79407 Minor proman changes. 2024-03-20 14:01:17 -07:00
Patrick Fic
8cb18d6d1d IO-2701 resolve missing dashboard translation. 2024-03-19 10:42:07 -07:00
Patrick Fic
8ea7db6488 WIP RO Closer. 2024-03-19 08:10:45 -07:00
Patrick Fic
f855e6423e Missing translations. 2024-03-18 08:19:29 -07:00
Patrick Fic
0ae9bb7e64 Merge branch 'master-beta' into master-AIO 2024-03-15 13:35:45 -07:00
Patrick Fic
7e01f667b3 Resolve translations issues. 2024-03-14 13:58:06 -07:00
Dave Richer
0cb0942119 - Merge release 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-03-14 14:57:59 -04:00
Dave Richer
806bdc4c70 Merged in feature/IO-2650-Lifecycle-V2 (pull request #1346) 
- Missing translation
 2024-03-14 16:38:12 +00:00
Dave Richer
a0572a0cec - Missing translation 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-03-14 12:37:38 -04:00
Dave Richer
04cdf13e86 Merged in feature/IO-2650-Lifecycle-V2 (pull request #1344) 
Feature/IO-2650 Lifecycle V2
 2024-03-14 16:33:14 +00:00
Allan Carr
5773f7a0f3 Merged in feature/IO-2650-Lifecycle-Report (pull request #1345) 
IO-2650 Job Lifecycle Report Center Reports

Approved-by: Dave Richer
 2024-03-14 15:58:17 +00:00
Allan Carr
fa5e26c52a IO-2650 Job Lifecycle Report Center Reports 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-03-13 17:22:42 -07:00
Dave Richer
90e1cbd390 - Job Lifecycle Dashboard Component. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-03-13 19:20:10 -04:00
Patrick Fic
6d1f04369e Merged in feature/IO-2674-reorder-resp-centers (pull request #1340) 
IO-2674 Add reordering arrows for responsibility centers in IO.

Approved-by: Allan Carr
 2024-03-13 17:07:09 +00:00
Patrick Fic
4a27726ef3 Adjusted label for payers & added reorder to payers. 2024-03-13 12:54:31 -04:00
Patrick Fic
f61b89f213 Updated translations. 2024-03-13 12:52:20 -04:00
Allan Carr
eedba97237 Merged in feature/IO-2625-BPT-Hrs-in-Employee-Assignment (pull request #1339) 
IO-2625 B/P/T Hrs Display in Employee Assignment Block

Approved-by: Dave Richer
 2024-03-13 16:50:47 +00:00
Patrick Fic
940f77bf86 Merge branch 'master-beta' into master-AIO 2024-03-13 11:38:19 -04:00
Allan Carr
706c70c509 IO-2625 B/P/T Hrs Display in Employee Assignment Block 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-03-12 14:49:12 -07:00
Patrick Fic
53a55dd1ef Added job intake and delivery bypass. 2024-03-12 08:44:35 -04:00
Allan Carr
309a20148a IO-2650 Lifecycle Report for Print Center 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-03-11 17:41:37 -07:00
Dave Richer
cca7215f10 Merge remote-tracking branch 'origin/release/2024-03-01' into feature/IO-1828-Front-End-Package-Updates 
# Conflicts:
#	_reference/reportFiltersAndSorters.md
#	client/src/components/bill-delete-button/bill-delete-button.component.jsx
#	client/src/components/bills-list-table/bills-list-table.component.jsx
#	client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
#	client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
#	client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
#	client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx
#	client/src/components/report-center-modal/report-center-modal-filters-sorters-component.jsx
#	client/src/components/scoreboard-day-stats/scoreboard-day-stats.component.jsx
#	client/src/components/scoreboard-targets-table/scoreboard-targets-table.component.jsx
#	client/src/pages/dms/dms.container.jsx
#	client/src/redux/application/application.sagas.js
#	client/src/translations/en_us/common.json
#	client/src/translations/es/common.json
#	client/src/translations/fr/common.json
#	client/src/utils/AuditTrailMappings.js
#	client/src/utils/graphQLmodifier.js
#	package-lock.json
#	package.json
 2024-03-01 13:03:37 -05:00
Dave Richer
80b7ae0e54 Merge branch 'feautre/IO-2647-Reporting-V3-From-Master' into release/2024-03-01 
# Conflicts:
#	_reference/reportFiltersAndSorters.md
 2024-02-29 22:25:52 -05:00
Dave Richer
0529ac4478 - Reports V3 Targeted at Master 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-29 22:22:55 -05:00
Allan Carr
3cafbebbee Merged in feature/IO-1366-Audit-Logging (pull request #1311) 
Feature/IO-1366 Audit Logging

Approved-by: Dave Richer
 2024-03-01 02:44:05 +00:00
Allan Carr
a4a84572b7 IO-2656 Job Count on Scoreboard Jobs 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-02-29 15:36:58 -08:00