Commit Graph

537 Commits

Author SHA1 Message Date
MahanCh
ffa728d05d send missed merge 2025-05-13 22:05:41 +03:30
MahanCh
30c70c83b2 recalculte values group 2025-05-13 19:39:19 +03:30
SamSys
2c6a39bf67 delete craete 5 2025-05-13 17:09:31 +03:30
SamSys
88a0552a07 Sepration js client/Contract/index 2025-05-13 15:39:49 +03:30
SamSys
429b9aad27 changes 2025-05-12 21:20:22 +03:30
SamSys
60052f6cd2 ConvertStatic ckeckout and BreakTime merged to master 2025-05-12 21:16:51 +03:30
SamSys
c7ac3ac7cb BreakTime Merged 2025-05-12 21:14:26 +03:30
SamSys
48f7a7f975 merge from master 2025-05-12 19:42:19 +03:30
SamSys
e0793bc300 convert completed 2025-05-12 19:36:58 +03:30
SamSys
601511ef77 DailyBug Fixed merged 2025-05-12 15:43:51 +03:30
SamSys
020b46f911 Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir 2025-05-12 15:41:43 +03:30
SamSys
ac1bb05515 Insuranc IsManager condition set for new props 2025-05-12 15:41:35 +03:30
MahanCh
2a8d2d5581 remove toturial 2025-05-12 15:28:34 +03:30
MahanCh
71c55cd779 fix new employee bug 2025-05-12 15:20:52 +03:30
MahanCh
3c8f212825 CHANGE FIND ROTATING SHIFT FOR TIME DIFFERENCES 2025-05-12 15:12:20 +03:30
SamSys
73feb3dd78 convert static complex shift 2025-05-11 21:13:07 +03:30
SamSys
8d175920d5 Fixed some bugs [rotatingshift cal - subAccountPass] 2025-05-11 19:52:10 +03:30
SamSys
6857ba6bc1 convet 12-24 2025-05-11 19:47:37 +03:30
MahanCh
a9c2f09f9e FIX SubAccountChangePassword 2025-05-11 18:13:39 +03:30
MahanCh
22b722e3dc show the TimeDifferences in Customize Checkout to three number 2025-05-11 17:20:12 +03:30
MahanCh
c168843afc add new find rotating shifts 2025-05-11 17:02:48 +03:30
SamSys
1b7af456b0 change 2025-05-11 16:46:05 +03:30
SamSys
51291d6de7 Merge Edit CustomizeChekout after change salaryAid or .... 2025-05-10 20:49:49 +03:30
SamSys
97ac0e440c Insurance Completed merge 2025-05-10 20:37:38 +03:30
SamSys
586f0a29c2 Insurance New Change Completed 2025-05-10 20:29:08 +03:30
MahanCh
a620872de1 remove leftWork for rejected employeedocument rejected 2025-05-10 19:53:20 +03:30
MahanCh
cebb525968 fix bugs and add tomam for salaryAid calculation date 2025-05-10 19:50:01 +03:30
SamSys
666964609d PrintListWorkshop added sort by ArchiveCode 2025-05-10 17:16:57 +03:30
SamSys
5ef277d604 Insurance changes 2025-05-10 16:59:59 +03:30
MahanCh
802f9a39c5 fix small front bugs for salaryAid and edit checkout 2025-05-10 16:40:42 +03:30
SamSys
8cc26936cd DateSalary - GetDateSalaryViewModel metod bug fixed 2025-05-10 16:33:15 +03:30
SamSys
b0293bf25c DateSalary bug fix [کمک دولت پورعلی ابر 1403] 2025-05-10 16:30:55 +03:30
SamSys
5b97f79fbd JsBugs merged 2025-05-10 15:28:17 +03:30
MahanCh
a9c5c8f8ca fix js bugs 2025-05-10 14:08:18 +03:30
SamSys
9e60c12212 Insurance New Change 2025-05-10 13:06:16 +03:30
SamSys
ff339b9eee ConvertStatic ADD 12-24 2025-05-10 11:55:23 +03:30
SamSys
86c7113987 commented 2025-05-08 17:12:52 +03:30
SamSys
552ee74d56 Merge FindRotatingShift 2025-05-08 16:26:39 +03:30
MahanCh
d1e5adf96f add salaryAid calculation Date and
edit checkout on cahnge salary & ...
2025-05-08 14:08:28 +03:30
MahanCh
fbf367677c Change rollcall rotating shift TimeDifferences 2025-05-08 12:16:26 +03:30
SamSys
612dd99bfe ConvertStaticChekout - shift4 completed 2025-05-07 22:50:42 +03:30
MahanCh
8e8e9ef5de Revert "changes"
This reverts commit 1e18fe1067.
2025-05-07 22:39:25 +03:30
MahanCh
1e18fe1067 changes 2025-05-07 22:39:09 +03:30
SamSys
d1aef862cf merge ModalCamera change Clinet 2025-05-06 21:52:29 +03:30
SamSys
fb2f7ba7c1 ConvertStaticHourse to RollCall - FindStaticShiftsStatus Metod 2025-05-06 21:38:40 +03:30
SamSys
fc18985334 change kabise 365 counter 2025-05-06 20:16:32 +03:30
SamSys
92d36f2966 Front changes 2025-05-06 19:19:52 +03:30
SamSys
0c6a8821ac Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir 2025-05-06 19:18:24 +03:30
SamSys
4b9d39f1e7 InsuranceJob Bug fix 2025-05-06 19:18:18 +03:30
SamSys
5daa36cfb5 start Convert Static compute to rollCall Compute 2025-05-06 19:16:40 +03:30