Commit Graph

2507 Commits

Author SHA1 Message Date
Mazen Abdo 3697455a09 fix report report_employee_identify 2025-07-17 16:06:54 +03:00
mazenmuhamad 946b02fe7e
Merge pull request #3948 from expsa/dev_odex25_hr
Dev odex25 hr
2025-07-17 12:25:26 +03:00
mazenmuhamad 024ddf926c
Merge pull request #3947 from expsa/zen_hr_employee_request
fix report report_employee_identify
2025-07-17 12:24:42 +03:00
Mazen Abdo 923d71a25b fix report report_employee_identify 2025-07-17 12:23:55 +03:00
mazenmuhamad c0de47aaab
Merge pull request #3946 from expsa/dev_odex25_hr
Dev odex25 hr
2025-07-17 11:15:29 +03:00
mazenmuhamad 29eebdafeb
Merge pull request #3945 from expsa/zen_hr_employee_request
Zen hr employee request
2025-07-17 10:34:18 +03:00
Mazen Abdo 00394b3768 fix report report_employee_identify 2025-07-17 10:33:50 +03:00
Mazen Abdo dab911c02d fix report report_employee_identify 2025-07-17 10:32:41 +03:00
bakry cb81125e5f
Merge pull request #3934 from expsa/bakry_hr
fix Gosi calculation
2025-07-16 12:20:08 +03:00
Bakry 5b17bc2a29 fix Gosi calculation 2025-07-16 12:18:40 +03:00
kchyounes19 d19e3b6d31
Merge pull request #3918 from expsa/dev_odex25_hr
Dev odex25 hr
2025-07-15 11:51:54 +01:00
kchyounes19 f730368062
Merge pull request #3917 from expsa/ky_dev_odex25_hr
restrict check-in outside allowed working hours
2025-07-15 11:45:18 +01:00
younes 1691056468 restrict check-in outside allowed working hours 2025-07-15 11:44:21 +01:00
bakry 15eb62fbf1
Merge pull request #3912 from expsa/bakry_hr
Bakry hr
2025-07-15 11:16:58 +03:00
Bakry ee01c1f141 Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr 2025-07-15 11:15:02 +03:00
Bakry e34e8b06a1 fix report Termination 2025-07-15 11:00:12 +03:00
mohammed-alkhazrji fb89efd58d
Merge pull request #3905 from expsa/dev_odex25_hr
Dev odex25 hr
2025-07-14 16:20:13 +03:00
mohammed-alkhazrji 14d799f84c
Merge pull request #3904 from expsa/re-gradati
fix install
2025-07-14 16:17:56 +03:00
mohammed-alkhazrji 4c97837d5b fix install 2025-07-14 16:15:42 +03:00
kchyounes19 dd966002ef
Merge pull request #3893 from expsa/dev_odex25_hr
Dev odex25 hr
2025-07-14 07:55:12 +01:00
kchyounes19 8c844bb44c
Merge pull request #3892 from expsa/ky_dev_odex25_hr
restrict check-in outside allowed working hours
2025-07-14 07:52:19 +01:00
younes 291815c1b1 restrict check-in outside allowed working hours 2025-07-14 07:50:36 +01:00
kchyounes19 d5d20ed133
Merge pull request #3889 from expsa/dev_odex25_hr
Dev odex25 hr
2025-07-13 15:12:49 +01:00
kchyounes19 7d10b06476
Merge pull request #3888 from expsa/ky_dev_odex25_hr
restrict check-in outside allowed working hours
2025-07-13 15:08:58 +01:00
younes a1a3f24382 restrict check-in outside allowed working hours 2025-07-13 15:06:38 +01:00
kchyounes19 5f326c74ef
Merge pull request #3882 from expsa/dev_odex25_hr
Dev odex25 hr
2025-07-13 14:33:32 +01:00
kchyounes19 f152841d07
Merge pull request #3881 from expsa/ky_dev_odex25_hr
Ky dev odex25 hr
2025-07-13 14:32:37 +01:00
younes 20eb2d292d restrict check-in outside allowed working hours 2025-07-13 14:30:46 +01:00
younes c5063c3b98 restrict check-in outside allowed working hours 2025-07-13 14:29:35 +01:00
GitHub Actions Bot 036e8f44ff Add or update prevent-invalid-branch-merges workflow 2025-07-10 23:25:27 +03:00
GitHub Actions Bot 0da944eea8 Add or update prevent-invalid-branch-merges workflow 2025-07-10 23:25:10 +03:00
GitHub Actions Bot fcaf55a1eb Add or update block_reserved_branches workflow 2025-07-10 23:16:13 +03:00
GitHub Actions Bot f5a11d7b7b Add or update block_reserved_branches workflow 2025-07-10 23:15:56 +03:00
GitHub Actions Bot 6c08922cae Add or update delete-merged-branches workflow 2025-07-10 23:09:37 +03:00
GitHub Actions Bot 29cd96c9ca Add or update delete-merged-branches workflow 2025-07-10 23:09:20 +03:00
GitHub Actions Bot c98df2426b Add or update delete-merged-branches workflow 2025-07-10 22:49:38 +03:00
GitHub Actions Bot a1c92c20b2 Add or update delete-merged-branches workflow 2025-07-10 22:49:21 +03:00
شركة خبير المحدودة d2c4fff71d
Update Block_Reserved_Branches.yml 2025-07-10 22:24:32 +03:00
شركة خبير المحدودة ecff923198
Merge pull request #3867 from expsa/revert-3866-expsa-patch-1
Revert "Update delete-merged-branches.yml"
2025-07-10 22:23:21 +03:00
شركة خبير المحدودة ab39cdb1fd
Revert "Update delete-merged-branches.yml" 2025-07-10 22:23:07 +03:00
شركة خبير المحدودة a84f065e38
Merge pull request #3866 from expsa/expsa-patch-1
Update delete-merged-branches.yml
2025-07-10 22:19:12 +03:00
شركة خبير المحدودة 54462fe005
Update delete-merged-branches.yml 2025-07-10 22:09:11 +03:00
شركة خبير المحدودة a5a7656208
Update Block_Reserved_Branches.yml 2025-07-10 21:30:58 +03:00
شركة خبير المحدودة a017909234
Create Block_Reserved_Branches.yml 2025-07-10 21:26:44 +03:00
GitHub Actions Bot 8d794ec184 Add or update delete-merged-branches workflow 2025-07-10 21:11:31 +03:00
GitHub Actions Bot ded50dc441 Add or update delete-merged-branches workflow 2025-07-10 21:11:16 +03:00
GitHub Actions Bot dd6814ee18 Add or update delete-merged-branches workflow 2025-07-10 20:59:14 +03:00
GitHub Actions Bot 79159db482 Add or update delete-merged-branches workflow 2025-07-10 20:58:56 +03:00
GitHub Actions Bot 73d9c9f046 Add or update delete-merged-branches workflow 2025-07-10 20:49:23 +03:00
شركة خبير المحدودة 89e1e55175
Update prevent-invalid-branch-merges.yml 2025-07-10 20:15:19 +03:00