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

5368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Allan Carr
29c4df9f76 Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1559) 
IO-2854 Handle Exporting to Accounting

Approved-by: Dave Richer
 2024-08-02 19:13:03 +00:00
Allan Carr
f1940a320c IO-2854 Handle Exporting to Accounting 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-08-02 11:30:08 -07:00
Allan Carr
49a1f0c42c Correct for Labor Adjustment being null 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-08-01 14:42:07 -07:00
Allan Carr
00f0952ab2 Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1555) 
Correct for Labor Adjustment being null
 2024-08-01 21:39:34 +00:00
Allan Carr
7126cc0d56 Correction for upsteam change 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-08-01 13:31:44 -07:00
Allan Carr
568d8887ce Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1554) 
Correction for upsteam change
 2024-08-01 20:29:37 +00:00
Allan Carr
d2d8039cb9 Merged in feature/IO-2857-Tech-Job-Drawer-PartsOrderDrawer-Component (pull request #1553) 
IO-2857 Tech console fixes

Approved-by: Dave Richer
 2024-08-01 19:46:10 +00:00
Allan Carr
4927e84a88 Adjustment to only have PartsDrawer show if not a technician 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-08-01 12:47:41 -07:00
Allan Carr
5da242d785 Remove unneeded spaces 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-08-01 12:29:04 -07:00
Allan Carr
87f25b1ed4 IO-2857 Tech console fixes 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-08-01 12:16:56 -07:00
Allan Carr
805c924a15 Merged in feature/IO-2852-Production-Add-Job-Note (pull request #1550) 
IO-2852 Production Add Job Note
 2024-07-31 22:26:56 +00:00
Allan Carr
10ff8fc432 Reverting in favor of correcting in new Production Board 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-31 15:22:22 -07:00
Allan Carr
e2db0bab9f Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1549) 
IO-2854 Profile Adjustments for LA and MA

Approved-by: Dave Richer
 2024-07-31 22:14:59 +00:00
Allan Carr
92ee5169ab IO-2852 Production Add Job Note 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-31 14:49:01 -07:00
Allan Carr
5cf2345dca IO-2854 Profile Adjustments for LA and MA 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-31 14:15:31 -07:00
Allan Carr
171f40819c Merged in release/2024-07-26 (pull request #1546) 
Release/2024 07 26

Approved-by: Dave Richer
 2024-07-29 21:27:54 +00:00
Allan Carr
01da7fde31 Merged in feature/IO-2564-Row-Expander-Links (pull request #1543) 
IO-2564 Row Expander Links

Approved-by: Dave Richer
 2024-07-29 18:57:50 +00:00
Allan Carr
3c8234d715 Merged in feature/IO-2853-Production-Board-Date-Modal (pull request #1544) 
IO-2853 Production Board Date Modal

Approved-by: Dave Richer
 2024-07-29 18:53:48 +00:00
Allan Carr
866f242465 IO-2853 Production Board Date Modal 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-29 11:30:52 -07:00
Allan Carr
f690596825 IO-2564 Row Expander Links 
Move Drawer from Parts Order into seperate componenet and pass props down from main page and then link the BillDetailEdit Container into joblines

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-29 11:21:40 -07:00
Allan Carr
5f494e4b78 IO-2564 Revert location of query 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-26 13:28:29 -07:00
Allan Carr
2fc0e1cf50 Merged in feature/IO-2564-Row-Expander-Links (pull request #1541) 
IO-2564 Revert location of query
 2024-07-26 20:26:20 +00:00
Allan Carr
3550c97966 Merged in feature/IO-2849-Missing-Translation-from-Shop-Config (pull request #1538) 
IO-2849 Missing Translation from Shop Config

Approved-by: Dave Richer
 2024-07-25 16:57:22 +00:00
Allan Carr
956c686360 Merged in feature/IO-2850-Missing-Fields-from-Shop-Config (pull request #1537) 
IO-2850 Missing fields from save on Shop Config Taxes
 2024-07-25 16:56:26 +00:00
Allan Carr
508b0d7711 Merged in feature/IO-2851-Rome-Manual-Job-Creation-Taxes (pull request #1536) 
IO-2851 Manual Job Creation Taxes

Approved-by: Dave Richer
 2024-07-25 16:55:41 +00:00
Allan Carr
abb1464e30 IO-2849 Missing Translation from Shop Config 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-25 08:39:42 -07:00
Allan Carr
704d5415d6 IO-2850 Missing fields from save on Shop Config Taxes 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-25 08:38:01 -07:00
Allan Carr
6cc1cfd1b0 IO-2851 Manual Job Creation Taxes 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-25 08:36:08 -07:00
Allan Carr
1bf745345d Merged in feature/IO-2564-Row-Expander-Links (pull request #1533) 
IO-2564 Row Expander Links

Approved-by: Dave Richer
 2024-07-23 03:36:53 +00:00
Allan Carr
63c71ed923 Merged in feature/IO-2848-Update_Job-Query (pull request #1534) 
IO-2848 UPDATE_JOB query

Approved-by: Dave Richer
 2024-07-23 03:35:53 +00:00
Allan Carr
4a16df36dd IO-2848 UPDATE_JOB query 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-22 17:35:05 -07:00
Allan Carr
93c92e8976 IO-2564 Row Expander Links 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-22 13:30:08 -07:00
Dave Richer
7ba3ed2b89 Merged in release/2024-07-19 (pull request #1531) 
Release/2024 07 19
 2024-07-19 20:02:39 +00:00
Dave Richer
2cc0b7d741 Merged in bugfix/ProductFruitsWrapper (pull request #1530) 
Bugfix/ProductFruitsWrapper
 2024-07-19 20:02:11 +00:00
Dave Richer
97693fbcff - Add Prop Types to ProductFruitsWrapper.jsx 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-19 16:01:40 -04:00
Dave Richer
5e94b1a71e - Improve product fruits wrapper for extra checks 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-19 15:50:09 -04:00
Allan Carr
970275e62a Merged in release/2024-07-19 (pull request #1529) 
Release/2024 07 19
 2024-07-19 19:02:15 +00:00
Dave Richer
aa076da255 Merged in bugfix/ProductFruitsWrapper (pull request #1527) 
- Improve product fruits wrapper for extra checks

Approved-by: Allan Carr
 2024-07-19 17:24:22 +00:00
Dave Richer
3dd154de79 - Improve product fruits wrapper for extra checks 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-19 13:23:43 -04:00
Dave Richer
72a2366abe - Improve product fruits wrapper for extra checks 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-19 13:18:10 -04:00
Allan Carr
36f517e8e1 Merged in feature/IO-2845-Payment-by-Date-Grouped-by-Payment-Type (pull request #1525) 
IO-2845 Payments Grouped by Payment Type

Approved-by: Dave Richer
 2024-07-19 17:16:26 +00:00
Allan Carr
981fb57d36 Merged in feature/IO-2847-Employee-Rate-Filter (pull request #1526) 
IO-2847 Employee Rate Filter

Approved-by: Dave Richer
 2024-07-19 17:15:04 +00:00
Allan Carr
a059c2b5a8 IO-2847 Employee Rate Filter 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-19 08:41:12 -07:00
Allan Carr
207bb39672 IO-2845 Payments Grouped by Payment Type 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-17 14:15:38 -07:00
Dave Richer
16e34e4ed9 Merged in bugfix/productfruits (pull request #1523) 
- misc updates / clear stage
 2024-07-17 16:30:53 +00:00
Dave Richer
cd04f2b2b2 Merged in bugfix/productfruits (pull request #1524) 
- misc updates / clear stage
 2024-07-17 16:30:40 +00:00
Dave Richer
26e164b4d1 - misc updates / clear stage 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-17 12:22:31 -04:00
Allan Carr
ae6b2fe4f5 Merged in feature/IO-2843-QBO_USA-Switch-for-IO (pull request #1521) 
IO-2843 State Tax for QBO_USA and Region CA_
 2024-07-15 23:53:59 +00:00
Allan Carr
4ca686126a IO-2843 State Tax for QBO_USA and Region CA_ 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-15 16:53:48 -07:00
Allan Carr
c254a8abfe Merged in release/2024-07-12 (pull request #1520) 
Release/2024 07 12
 2024-07-12 20:15:53 +00:00