Commit Graph

1179 Commits

Author SHA1 Message Date
nishainnogent
4eeee4be16 Resolved conflict 2024-12-05 12:44:11 +05:30
harish
87b2d4aaaf Resolved conflicts while syncing with master 2024-12-05 12:16:47 +05:30
piyushkag
80e1eefd29 Created Appointment creation flow. 2024-12-04 21:07:06 +05:30
rajeshkhore
8654e8ab0c Merge pull request #119 from Kitzanos/jwt_issue
Fixed JWT issue
2024-12-04 20:48:52 +05:30
rajeshkhore
60af881924 FIxed JWT issue 2024-12-04 20:45:42 +05:30
nisha
dcaa769903 Added json field in company 2024-12-04 20:02:45 +05:30
rbonazzo-KZ
aa81f5d81f Merge pull request #118 from Kitzanos/amendment-template-issue-task-prod
Cherry-pick (Fixed amendment email issue)
2024-12-04 12:43:40 +01:00
rajesh
80c00760a8 updated code 2024-12-04 16:48:59 +05:30
rajesh
594f7f02e9 Resolved conflicts 2024-12-04 16:40:07 +05:30
piyushkag
dcbad56f07 Resolved conflicts 2024-12-04 16:38:46 +05:30
rbonazzo-KZ
25f90d5bdb Merge pull request #117 from Kitzanos/amendment-template-issue-task
Fixed amendment email issue
2024-12-04 11:50:13 +01:00
rajesh
b0b38db4c7 updated code 2024-12-04 16:17:39 +05:30
piyushkag
c1a3e12e68 Template issue. 2024-12-03 19:29:31 +05:30
rbonazzo-KZ
e64a98ad4c Merge pull request #115 from Kitzanos/application-evaluation-issue-prod
Cherrry pick (Application Evaluation issue)
2024-12-03 12:13:49 +01:00
rajesh
676a3298da Updated code 2024-12-03 16:41:54 +05:30
rajesh
346b550466 Updated code 2024-12-03 15:39:30 +05:30
rajesh
cac4a7efac User management 2024-12-02 18:20:08 +05:30
rbonazzo-KZ
7d46f01638 Merge pull request #113 from Kitzanos/feature/GEPAFINBE-100
GEPAFINBE-100,99(Script for migrating deleted documents)
2024-12-02 08:29:31 +01:00
nisha
30d1e22684 Updated Code 2024-12-02 12:35:36 +05:30
nisha
d397b3f7b7 Script for migrating deleted Documents 2024-11-29 20:44:18 +05:30
rajesh
b7c381899b updated code for vatcheck 2024-11-29 18:50:03 +05:30
rbonazzo-KZ
f334f869f7 Merge pull request #112 from Kitzanos/feature/GEPAFINBE-100
GEPAFINBE-100,99(S3 Management for Deleted and Amendment Documents)
2024-11-29 08:28:20 +01:00
nishainnogent
d8066aa61d Resolve Conflicts 2024-11-29 11:53:10 +05:30
rbonazzo-KZ
629f7831a4 Merge pull request #109 from Kitzanos/feature/GEPAFINBE-90
GEPAFINBE-90(Breakdown Timeline)
2024-11-28 08:52:27 +01:00
nishainnogent
20f865ee4b Resolve Conflicts 2024-11-28 13:17:07 +05:30
nisha
62d1c62385 Resolved conflicts 2024-11-28 13:04:43 +05:30
nisha
35669bae39 Update code 2024-11-28 12:42:20 +05:30
harish
51998245d6 updated code for Amendment scheduler 2024-11-28 12:37:12 +05:30
nishainnogent
d21445be38 Amendment Documents 2024-11-28 12:17:31 +05:30
rbonazzo-KZ
3b5069737c Merge pull request #110 from Kitzanos/feature/GEPAFINBE-104
GEPAFINBE-104 (Added field userWithCompanyId in Application)
2024-11-27 13:52:17 +01:00
nishainnogent
3735da36fc Resolve Conflicts 2024-11-27 18:16:50 +05:30
rajesh
9f715618b1 Resolved conflicts 2024-11-27 17:01:03 +05:30
rbonazzo-KZ
e1577d0516 Merge pull request #111 from Kitzanos/fixed-evaluation-issue-prod
Cherry Pick (Fixed issue with Application Evaluation)
2024-11-27 10:35:25 +01:00
rajesh
9fe5a916f1 Fixed issue with evaluation 2024-11-27 14:52:50 +05:30
rbonazzo-KZ
ae33c5ae5b Merge pull request #107 from Kitzanos/feature/GEPAFINBE-31
GEPAFINBE-31(All action made by User must be logged)
2024-11-27 09:32:04 +01:00
rajesh
2ffc924343 Fixed issue with evaluation 2024-11-27 12:20:06 +05:30
rajesh
f0c6bc2a01 Resolved conflicts 2024-11-26 19:51:14 +05:30
rajesh
6d2374c3e6 Done ticket GEPAFINBE-104 2024-11-26 19:23:12 +05:30
rajesh
80cd8c4bb0 Resolve Conflicts 2024-11-26 17:11:43 +05:30
rajesh
202e9604a8 Deleted Documents 2024-11-26 17:07:25 +05:30
nishainnogent
13d3e47e15 Resolved conflicts 2024-11-26 15:47:50 +05:30
piyushkag
f6a5dd4523 Added user action and versioning in form. 2024-11-26 15:44:21 +05:30
piyushkag
7d04e4ab58 Added user action log and versioning for communication. 2024-11-26 12:47:03 +05:30
nisha
c1313f1591 Updated code 2024-11-26 09:46:18 +05:30
piyushkag
4f68d09568 Resolved conflicts for GEPAFINBE-31. 2024-11-25 19:14:48 +05:30
piyushkag
98a7720b33 Merge branch 'feature/GEPAFINBE-31' of https://github.com/Kitzanos/GEPAFIN-BE into feature/GEPAFINBE-31 2024-11-25 19:10:46 +05:30
piyushkag
420939aa49 Resolved conflicts for GEPAFINBE-31. 2024-11-25 19:10:24 +05:30
rbonazzo-KZ
9f9441f2fd Merge pull request #108 from Kitzanos/develop
Sync master with develop branch(25/11/2024)
2024-11-25 11:20:00 +01:00
rajesh
04aaa23c2c updated code for document 2024-11-25 15:20:10 +05:30
rajesh
bc11a40723 Fix issue related to senderUserId and receiverUserId 2024-11-25 12:57:05 +05:30