admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,459 Commits 1,012 Branches 0 Tags
7326ffbae6edfcf5a0884df3c3e640fa6d7c5097
Commit Graph

3945 Commits

Author SHA1 Message Date
Allan Carr
596132b2af Merge branch 'release/2025-01-31' into feature/IO-3114-Quick-Intake 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
#	client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx
 2025-01-29 15:24:47 -08:00
Allan Carr
a55102b0ae IO-3114 Quick Intake 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-29 15:16:20 -08:00
Allan Carr
9b75993ac1 IO-3114 Quick Intake 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-29 15:14:03 -08:00
Allan Carr
d5e750c1f0 IO-3114 Quick Intake Data 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-29 15:12:20 -08:00
Allan Carr
8801990d4a Merged in feature/IO-3075-Crisp-in-ROME (pull request #2085) 
IO-3075 Crisp in Rome Online

Approved-by: Dave Richer
 2025-01-29 21:39:21 +00:00
Allan Carr
e8cda88a33 IO-3075 Crisp in Rome Online 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-28 16:17:11 -08:00
Allan Carr
a240391a28 Merged in feature/IO-2676-Target-Date-to-Schedule-Completion-Translation (pull request #2083) 
IO-2676 Target Date to Schedule Completion Translation Adjustment

Approved-by: Dave Richer
 2025-01-27 18:10:17 +00:00
Dave Richer
42660a7dd1 release/2025-01-31 - Add ID to tasks upsert modal title 2025-01-27 11:05:42 -05:00
Allan Carr
f186d9f8be IO-2676 Target Date to Schedule Completion Translation Adjustment 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-24 14:07:09 -08:00
Allan Carr
5ec032d8d6 IO-3108 Remove Console Log 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-23 15:21:10 -08:00
Allan Carr
3f58f9a5f5 Merged in feature/IO-3108-Job-Totals-USA-PASL (pull request #2080) 
Feature/IO-3108 Job Totals USA PASL
 2025-01-23 23:20:17 +00:00
Allan Carr
2718a66fb0 IO-3108 Adjust Initial Values/FieldValues 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-23 15:19:33 -08:00
Allan Carr
4c737371e3 IO-3108 Adjust Initial Values 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-23 14:49:51 -08:00
Dave Richer
85fcd64220 release/2025-01-31 - Manual Merge conflict done 2025-01-23 13:00:13 -08:00
Dave Richer
11e2f5d83d feature/IO-3108-Job-Totals-USA-PASL - Fix submit button for Product Fruits reasons, to go into hotfix 2025-01-23 12:57:10 -08:00
Dave Richer
8a97c5109f Merged in feature/IO-3103-Ant5-Notifications (pull request #2075) 
feature/IO-3103-Ant5-Notifications - Job Icons fixed (spacing)
 2025-01-22 18:48:12 +00:00
Dave Richer
d767302c4a feature/IO-3103-Ant5-Notifications - Job Icons fixed (spacing) 2025-01-22 10:47:44 -08:00
Dave Richer
2fdb06fabe Merged in feature/IO-3103-Ant5-Notifications (pull request #2071) 
feature/IO-3103-Ant5-Notifications
 2025-01-22 18:11:05 +00:00
Dave Richer
32bb04939f feature/IO-3103-Ant5-Notifications - Bill Lines Fix 2025-01-22 09:59:57 -08:00
Dave Richer
9cddc9cce0 feature/IO-3103-Ant5-Notifications - Bill Lines Fix 2025-01-22 09:30:27 -08:00
Dave Richer
ed023cd62a feature/IO-3103-Ant5-Notifications - Missing Deps on UseDep 2025-01-21 18:19:32 -08:00
Dave Richer
b1ca423a59 feature/IO-3103-Ant5-Notifications - Missing Dep on UseDep 2025-01-21 18:16:20 -08:00
Dave Richer
85d25862eb feature/IO-3103-Ant5-Notifications 2025-01-21 17:20:46 -08:00
Allan Carr
b8c56c5c24 Merged in feature/IO-2952-RBAC-Defaults (pull request #2070) 
IO-2952 RBAC Defaults

Approved-by: Dave Richer
 2025-01-20 23:26:23 +00:00
Allan Carr
b2239351f6 IO-2952 RBAC Defaults 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-20 15:11:13 -08:00
Patrick Fic
b021992552 IO-3099 check for intellipay initialization before calling. rename files to remove erroneous period. 2025-01-20 12:16:24 -08:00
Dave Richer
ca02937461 Merged in hotfix/AdditionalProductFruitIds (pull request #2064) 
hotfix/AdditionalProductFruitsIds - Add additional IDs for product fruits
 2025-01-17 18:14:26 +00:00
Dave Richer
fa7e0a107b hotfix/AdditionalProductFruitsIds - Add additional IDs for product fruits 2025-01-17 10:13:41 -08:00
Dave Richer
f68ad181e4 feature/IO-999-Part-Tax-rate-Label 2025-01-17 09:52:35 -08:00
Allan Carr
e4325e39bf Merged in feature/IO-2951-Ro-Guard-Labor-Warning (pull request #2061) 
IO-2951 RO Guard Labor Warning

Approved-by: Dave Richer
 2025-01-17 15:32:51 +00:00
Allan Carr
584c2e5de2 IO-999 Part Tax Rate Label 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-16 18:39:41 -08:00
Allan Carr
eccc992cfa IO-2951 RO Guard Labor Warning 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-16 18:28:54 -08:00
Allan Carr
f293e80d0d Merged in feature/IO-3063-LOU-on-Schedule-PopOver (pull request #2059) 
IO-3063 LOU on Schedule PopOver

Approved-by: Dave Richer
 2025-01-16 15:23:59 +00:00
Allan Carr
eea2a758b0 IO-3063 LOU on Schedule PopOver 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-15 17:14:08 -08:00
Dave Richer
f9105806ba feature/IO-3083-i18-Translation-Shop-Info-Warning 
resolve conflicts
 2025-01-15 07:49:19 -08:00
Allan Carr
a4a6fac224 Merged in feature/IO-3094-Purchases-by-Date-Excel (pull request #2056) 
IO-3094 Purchases by Date - Excel Report

Approved-by: Dave Richer
 2025-01-15 15:39:12 +00:00
Allan Carr
4a56fbb135 IO-3094 Purchases by Date - Excel Report 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-14 18:00:46 -08:00
Allan Carr
e1fcb0ecba IO-3083 Merge Conflit Resolution 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-14 17:54:12 -08:00
Allan Carr
ee5e091118 Merge branch 'release/2025-01-17' into feature/IO-3083-i18-Translation-Shop-Info-Warning 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	client/src/translations/en_us/common.json
 2025-01-14 17:48:10 -08:00
Patrick Fic
9f46f8ec31 IO-3065 All manual toggle to include $0 line in part status count. 2025-01-14 13:49:38 -08:00
Allan Carr
1861bd68d1 Merged in feature/IO-3080-Restrict-Claimable-Hours-Label (pull request #2042) 
IO-3080 Restrict Claimable Hours Label

Approved-by: Dave Richer
 2025-01-14 14:43:12 +00:00
Allan Carr
348561c812 Merged in feature/IO-3078-Job-Presets-Company-Setup-Markup-Rule (pull request #2043) 
IO-3078 Jobs Presets Company Setup Markup Discount

Approved-by: Dave Richer
 2025-01-14 14:42:59 +00:00
Allan Carr
bf4a52b3c1 Merged in feature/IO-3022-Export-Payments-Payment-Methods (pull request #2045) 
IO-3022 Export Payments - Payment Method

Approved-by: Dave Richer
 2025-01-14 14:42:34 +00:00
Allan Carr
1950023f37 Merged in feature/IO-3082-Additional-IO-Basic-Lock-Out-Reports (pull request #2041) 
IO-3082 Additional IO Basic Lock Out Reports

Approved-by: Dave Richer
 2025-01-14 14:42:17 +00:00
Allan Carr
c7f293ceca IO-1927 Export Button as Primary 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-09 19:28:28 -08:00
Allan Carr
66e60e96ad IO-3022 Export Payments - Payment Method 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-09 19:16:45 -08:00
Allan Carr
54a9beb37f IO-3083 i18 Translation Warning in Shop Info 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-09 19:00:23 -08:00
Allan Carr
779cc7d9e8 IO-3078 Jobs Presets Company Setup Markup Discount 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-09 18:57:21 -08:00
Allan Carr
c1b3df9c3b IO-3080 Restrict Claimable Hours Label 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-09 17:43:43 -08:00
Allan Carr
80379cdd79 IO-3082 Additional IO Basic Lock Out Reports 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2025-01-09 17:37:30 -08:00