Commit Graph

511 Commits

Author SHA1 Message Date
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
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
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
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
MahanCh
9e5e7b57c7 fix permissions for employee document workflow 2025-05-06 18:47:22 +03:30
MahanCh
a6984e5f1b fix little bugs 2025-05-06 18:33:15 +03:30
MahanCh
fe8eb5d92b fix cleave js bug 2025-05-06 18:18:20 +03:30
MahanCh
24e661252c add sms report loading 2025-05-06 17:20:20 +03:30
SamSys
e7d5716317 EmployeeDocument Refactor 2025-05-06 15:26:52 +03:30
SamSys
a6be044dbb temporary change sms onget 2025-05-06 15:25:40 +03:30
MahanCh
c91f7e7a90 fix employee Document Style Bug 2025-05-06 15:21:04 +03:30
MahanCh
42de15b3db add try catch for sms 2025-05-06 14:40:10 +03:30
MahanCh
ffcfb4ea3f Merge branch 'Feature/EmployeeDocuments/V2' of https://github.com/syntax24/OriginalGozareshgir into Feature/EmployeeDocuments/V2 2025-05-06 14:16:59 +03:30
MahanCh
a49e2dbb75 complete employeeDocument Query(Tomam) 2025-05-06 14:16:55 +03:30
MahanCh
d8cd33732a fix deleting task schedule 2025-05-05 22:24:07 +03:30
SamSys
5aa714e81d set roleid Permission for employeedocument workflow admin 2025-05-05 22:05:30 +03:30
SamSys
62502fcede add HasCheckout Validation in InsuranceList 2025-05-05 20:30:36 +03:30
MahanCh
6eec454685 employeeDocument Refactor 2025-05-05 18:09:53 +03:30
SamSys
4022a1afd8 Add new Checkbox for Insurance in CreateWorshopp And EditWorkshop 2025-05-05 16:43:35 +03:30
SamSys
86cd776c4d merge from master 2025-05-05 15:18:28 +03:30
MahanCh
13cad28356 add WorkshopSettingsPage in client 2025-05-05 14:03:33 +03:30
SamSys
9cdb922aa1 Employee Validation For MarritalStatus CaseHistory 2025-05-04 21:27:46 +03:30
SamSys
6699909b2f overTimePay static changes 2025-05-04 21:26:01 +03:30
MahanCh
718a7d42b7 fix case history bug 2025-05-04 20:03:04 +03:30
MahanCh
9637b6a581 add employee Validation 2025-05-04 20:00:32 +03:30
SamSys
ec29d3b869 add permission to ScheduleTadk Button 2025-05-04 18:30:42 +03:30
SamSys
4648113a28 Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir 2025-05-04 17:30:06 +03:30
SamSys
f4f6fd1bf6 remove Insurance job salarey validation 2025-05-04 17:29:58 +03:30
MahanCh
d9b7245cee Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir 2025-05-03 20:52:48 +03:30
MahanCh
85bec9d7fb add validation for cws in edit rotating shifts 2025-05-03 20:52:45 +03:30