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

6169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Allan Carr
b54d0ed62a Merge branch 'master-AIO' into feature/IO-2814-Job-Costing-Correction 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-18 08:43:51 -07:00
Allan Carr
8386443cb0 IO-2820 State Tax & Adjustment to Bottom Line 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-17 10:13:36 -07:00
Dave Richer
9c41af82d7 - Progress Check 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-14 23:50:10 -04:00
Dave Richer
2997dd4e4d - Update the DND createStore due to it being marked for deprecation. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-14 13:39:51 -04:00
Dave Richer
4602648fe5 - Begin to integrate DND with trello 
- Resolve all ESLint issues in DND

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-13 17:52:03 -04:00
Dave Richer
a8f2ca5643 - MAJOR DND PROGRESS UPDATE 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-12 17:27:38 -04:00
Dave Richer
7959dc67ce Merged in release/AIO/2024-06-07 (pull request #1482) 
Release/AIO/2024 06 07
 2024-06-11 00:38:31 +00:00
Allan Carr
0d2cdec75c IO-2793 Correction for Sublet Part Tax 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-10 14:42:21 -07:00
Allan Carr
cd055f7344 Merged in release/AIO/2024-06-07 (pull request #1481) 
IO-2793 Correction for Sublet Part Tax
 2024-06-10 21:42:16 +00:00
Allan Carr
a4116b6c28 Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1480) 
IO-2793 Correction for Sublet Part Tax
 2024-06-10 21:41:17 +00:00
Allan Carr
269ef25ece IO-2793 Better tax handling 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-10 14:14:15 -07:00
Allan Carr
c43709395f Merged in release/AIO/2024-06-07 (pull request #1479) 
IO-2793 Better tax handling
 2024-06-10 21:13:55 +00:00
Allan Carr
575fbd5357 Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1478) 
IO-2793 Better tax handling
 2024-06-10 21:13:20 +00:00
Dave Richer
10f60752c8 - Add in new DND Library (react-beautiful-dnd-grid), resides in client/src/components/trello-board/dnd/lib/index.js 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-10 15:54:29 -04:00
Allan Carr
870f8463db Merged in release/AIO/2024-06-07 (pull request #1477) 
IO-2793 Correct passed Variable
 2024-06-10 18:27:02 +00:00
Allan Carr
2ad887fb82 Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1476) 
IO-2793 Correct passed Variable
 2024-06-10 18:25:27 +00:00
Allan Carr
40a1a86f72 IO-2793 Correct passed Variable 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-10 11:25:06 -07:00
Allan Carr
5567a69142 Merged in release/AIO/2024-06-07 (pull request #1475) 
IO-2793 Correct variables
 2024-06-10 18:04:15 +00:00
Allan Carr
95d43d936c Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1474) 
IO-2793 Correct variables
 2024-06-10 18:03:12 +00:00
Allan Carr
9f56568680 IO-2793 Correct variables 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-10 10:58:01 -07:00
Allan Carr
762fec1d9a Merged in release/AIO/2024-06-07 (pull request #1473) 
IO-2793 Change to function for better clarity
 2024-06-10 17:49:59 +00:00
Allan Carr
3428940c72 Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1472) 
IO-2793 Change to function for better clarity
 2024-06-10 17:49:06 +00:00
Allan Carr
ea604a5e64 IO-2793 Change to function for better clarity 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-10 09:59:45 -07:00
Allan Carr
0946b0d3a3 Merged in release/AIO/2024-06-07 (pull request #1471) 
IO-2793 Correct Parts Side for Taxes
 2024-06-07 23:02:20 +00:00
Allan Carr
5b76473cbc IO-2793 Correct Parts Side for Taxes 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-07 15:59:51 -07:00
Allan Carr
db5359e086 Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1470) 
Feature/IO-2793 State Tax Null QBO
 2024-06-07 22:58:58 +00:00
Allan Carr
976dd2cbfb Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1469) 
IO-2793 Add Comment to see output for testing
 2024-06-07 21:31:50 +00:00
Allan Carr
35046f11c2 IO-2793 Add Comment to see output for testing 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-07 14:31:33 -07:00
Allan Carr
f4c4005a2a IO-2814 Remove Comment as api.test.romeonline.io doesn't update w/ CICD 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-07 12:16:59 -07:00
Allan Carr
b6956b3649 Merged in release/AIO/2024-06-07 (pull request #1468) 
IO-2814 Remove Comment as api.test.romeonline.io doesn't update w/ CICD
 2024-06-07 19:16:31 +00:00
Allan Carr
69d8d27ad3 Merged in feature/IO-2814-Job-Costing-Correction (pull request #1467) 
IO-2814 Remove Comment as api.test.romeonline.io doesn't update w/ CICD
 2024-06-07 19:16:01 +00:00
Dave Richer
6cf4a50a83 - Clear stage before moving to a sub-sub branch. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-07 15:04:36 -04:00
Allan Carr
755acd24f0 IO-2814 Correct Parts Price and add Console Log 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-07 11:40:39 -07:00
Allan Carr
b2b4902d23 Merged in release/AIO/2024-06-07 (pull request #1466) 
IO-2814 Correct Parts Price and add Console Log
 2024-06-07 18:40:32 +00:00
Allan Carr
079d6cfee6 Merged in feature/IO-2814-Job-Costing-Correction (pull request #1465) 
IO-2814 Correct Parts Price and add Console Log
 2024-06-07 18:39:43 +00:00
Allan Carr
6f69129829 Merged in release/AIO/2024-06-07 (pull request #1464) 
Release/AIO/2024 06 07
 2024-06-07 15:26:04 +00:00
Allan Carr
3e3b3c269a Merged in feature/IO-2814-Job-Costing-Correction (pull request #1462) 
IO-2814 Job Cost Correction
 2024-06-07 03:18:49 +00:00
Allan Carr
39f1af7d4b Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1463) 
IO-2793 State Tax Null QBO
 2024-06-07 03:18:40 +00:00
Allan Carr
1ea4d616d7 IO-2793 State Tax Null QBO 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-06 15:00:58 -07:00
Allan Carr
fdf0ecf6f6 IO-2814 Job Cost Correction 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-06 14:51:44 -07:00
Dave Richer
d846894d22 Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2743-Production-Board 2024-06-05 12:59:19 -04:00
Allan Carr
7d3101c877 Merged in release/AIO/2024-06-07 (pull request #1461) 
IO-2793 State Tax to QBO refactor

Approved-by: Dave Richer
 2024-06-04 15:20:12 +00:00
Allan Carr
e5f7285253 Merge branch 'feature/IO-2793-State-Tax-Null-QBO' into release/AIO/2024-06-07 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	server/accounting/qb-receivables-lines.js
 2024-06-03 17:28:18 -07:00
Allan Carr
e46c304f7c IO-2793 State Tax to QBO refactor 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-03 17:23:33 -07:00
Dave Richer
c3f0e6f10c Merged in hotfix/revert-tax-import-code (pull request #1460) 
revert previous change due to problems with tax import.
 2024-06-03 22:05:04 +00:00
Dave Richer
1aa570db90 Merged in hotfix/revert-tax-import-code (pull request #1459) 
revert previous change due to problems with tax import.
 2024-06-03 22:04:31 +00:00
Dave Richer
1c2be3c890 Merged in hotfix/revert-tax-import-code (pull request #1458) 
revert previous change due to problems with tax import.
 2024-06-03 22:04:05 +00:00
Dave Richer
05e4eacf34 revert previous change due to problems with tax import. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-03 18:03:22 -04:00
Dave Richer
d0da2dd66c Merged in release/AIO/2024-06-07 (pull request #1457) 
IO-2801 os-loader bills data
 2024-06-03 18:59:47 +00:00
Allan Carr
e1417b03f9 Merged in feature/IO-2801-os-loader-bills-data (pull request #1456) 
IO-2801 os-loader bills data

Approved-by: Dave Richer
 2024-06-03 18:59:08 +00:00