Commit Graph

205 Commits

Author SHA1 Message Date
b492aa39e8 changes 2025-05-30 18:03:47 +03:30
2201ade168 merge from teamwork 2025-05-30 15:45:12 +03:30
SamSys
7c2354b386 institutionContract bug 0 fixed add new date coler for expiered 2025-05-29 03:05:52 +03:30
SamSys
a9c489b43d change 2025-05-27 21:33:09 +03:30
MahanCh
2db6a9695c add access accounts to search 2025-05-27 18:40:42 +03:30
SamSys
39bc95731e front chang amo 2025-05-26 21:28:51 +03:30
SamSys
1409d30dfd Amo bug fixed 2025-05-26 20:53:56 +03:30
SamSys
ad9f747027 Amo BackEnd Bug fixed And new fron Feature 2025-05-26 17:42:45 +03:30
MahanCh
eaaab56421 merge from teamwork 2025-05-26 17:30:14 +03:30
SamSys
7d763715cd merge from daylibug 2025-05-25 22:01:09 +03:30
SamSys
7d1eb780a5 amo merged 2025-05-25 21:56:13 +03:30
MahanCh
7bcc052ec6 finish AMO 2025-05-25 21:19:31 +03:30
MahanCh
2c6512faa2 task create modal changes 2025-05-25 18:17:39 +03:30
SamSys
659f647b31 static print merged 2025-05-24 18:45:39 +03:30
SamSys
0112772d3f InsuranceJobItems Start End Added - merged 2025-05-23 16:10:32 +03:30
SamSys
7eb8255215 InsuranceJobe Add Start End Completed 2025-05-23 16:07:30 +03:30
SamSys
3650caabfa Camera Icon Task Merged 2025-05-21 21:52:22 +03:30
SamSys
faac2bf707 changes 2025-05-21 21:36:35 +03:30
SamSys
3058f95e0e EmployeDocment Upload change size 2025-05-20 22:37:21 +03:30
SamSys
8fa8c33415 ReCalculate Values meged 2025-05-20 22:19:54 +03:30
MahanCh
4d81de755e add camera modal for task 2025-05-20 20:38:05 +03:30
MahanCh
59112d9635 add static checkout style 2025-05-20 18:34:30 +03:30
MahanCh
987c1b51fa merge from loan added to checkout 2025-05-20 17:47:34 +03:30
SamSys
db8bb247b3 Task Merged 2025-05-19 21:05:34 +03:30
MahanCh
3b38b80a28 add list pending 2025-05-19 20:32:15 +03:30
MahanCh
aeebb983a4 recalculate values grouping 2025-05-19 17:48:13 +03:30
MahanCh
e17ca40df6 Merge branch 'master' into Feature/Checkout/RotatingShiftReport 2025-05-18 17:26:04 +03:30
SamSys
ee2adf1c13 DateChange LeftWorkCheck Completed 2025-05-15 17:30:51 +03:30
SamSys
986092135f change temp 2025-05-15 15:02:36 +03:30
SamSys
bc36d8e151 change 2025-05-14 19:57:01 +03:30
SamSys
b8e831ce4d RotatingShiftReport BackEnd Changed 2025-05-14 18:51:36 +03:30
MahanCh
3c73a277ce fix case history bug 2025-05-14 18:36:46 +03:30
MahanCh
56def568b5 fix bugs 2025-05-14 16:26:53 +03:30
MahanCh
ffa728d05d send missed merge 2025-05-13 22:05:41 +03:30
SamSys
d99e69fa5b Revert "seperate left work and leftwork insurance"
This reverts commit da738054df.
2025-05-13 21:28:05 +03:30
MahanCh
30c70c83b2 recalculte values group 2025-05-13 19:39:19 +03:30
SamSys
d90e01d733 Sepration js Admin\ContractinParty 2025-05-13 19:27:47 +03:30
MahanCh
ec0996f53c Add rotating shift report 2025-05-13 19:21:26 +03:30
MahanCh
5f71cf829b Merge branch 'sepration-js' of https://github.com/syntax24/OriginalGozareshgir into sepration-js 2025-05-13 18:52:57 +03:30
MahanCh
da738054df seperate left work and leftwork insurance 2025-05-13 18:52:26 +03:30
SamSys
521aa9b6ee Sepration js Admin\Contracts All 2025-05-13 18:34:50 +03:30
SamSys
2049d8b2eb Sepration Contracts Index js 2025-05-13 17:48:18 +03:30
SamSys
88a0552a07 Sepration js client/Contract/index 2025-05-13 15:39:49 +03:30
MahanCh
541f60d6cd finish loan and salaryAid to Checkout 2025-05-12 17:40:46 +03:30
MahanCh
71c55cd779 fix new employee bug 2025-05-12 15:20:52 +03:30
MahanCh
a9c2f09f9e FIX SubAccountChangePassword 2025-05-11 18:13:39 +03:30
SamSys
51291d6de7 Merge Edit CustomizeChekout after change salaryAid or .... 2025-05-10 20:49:49 +03:30
MahanCh
802f9a39c5 fix small front bugs for salaryAid and edit checkout 2025-05-10 16:40:42 +03:30
MahanCh
a9c5c8f8ca fix js bugs 2025-05-10 14:08:18 +03:30
MahanCh
d1e5adf96f add salaryAid calculation Date and
edit checkout on cahnge salary & ...
2025-05-08 14:08:28 +03:30