Commit Graph

205 Commits

Author SHA1 Message Date
eman 94fca4d5c7 HR base reports(Attendance Report) 2024-08-05 03:19:55 +03:00
bakry 0fb5b2d716
Merge pull request #499 from expsa/bakry_hr
fix
2024-08-04 15:46:15 +03:00
Bakry 2572bae877 fix 2024-08-04 13:50:07 +03:00
bakry 12184b192b
Merge pull request #488 from expsa/bakry_hr
fix
2024-08-04 11:53:47 +03:00
Bakry 36a7e91800 fix 2024-08-04 11:24:08 +03:00
bakry 89064e9faa
Merge pull request #473 from expsa/bakry_hr
fix
2024-08-01 17:38:06 +03:00
Bakry c77ea224a9 fix 2024-08-01 17:21:21 +03:00
AbuzarExp acf51460dc
Merge pull request #450 from expsa/abuzar_task_hr
[ADD] add api contrand date from leave
2024-07-31 15:46:50 +03:00
odex 58f7dc2683 [ADD] add api contrand date from leave 2024-07-31 15:44:36 +03:00
bakry dc86c64669
Merge pull request #449 from expsa/bakry_hr
fix payroll domain
2024-07-31 11:49:39 +03:00
Bakry 037f251e87 fix payroll domain 2024-07-31 11:44:13 +03:00
شركة خبير المحدودة 72881b407a Update github action file 2024-07-30 23:18:02 +03:00
bakry f1e981b84f
Merge pull request #436 from expsa/bakry_hr
fix att
2024-07-30 17:33:50 +03:00
Bakry c9750c0656 fix att 2024-07-30 16:50:43 +03:00
AbuzarExp 0ddb6c29fd
Merge pull request #435 from expsa/abuzar_task_hr
Abuzar task hr
2024-07-30 16:45:49 +03:00
odex 007c538938 remove print 2024-07-30 13:18:44 +03:00
odex 795565febc [ADD] add cacl holday balance jron 2024-07-29 17:58:36 +03:00
bakry ed3457fccd
Merge pull request #422 from expsa/bakry_hr
Bakry hr
2024-07-29 16:18:22 +03:00
Bakry 80708326dc fix att 2024-07-29 16:15:08 +03:00
Bakry 01e99bbaad fix att 2024-07-29 15:59:02 +03:00
bakry 9d508d75da
Merge pull request #418 from expsa/bakry_edit
Bakry edit
2024-07-29 15:07:49 +03:00
Bakry cfbb56497f fix 2024-07-29 15:05:46 +03:00
شركة خبير المحدودة 2740817f4c
Delete .github/workflows/cyber-project.yml 2024-07-29 14:45:03 +03:00
شركة خبير المحدودة aba091cc15
Update ensan-project.yml 2024-07-29 14:44:44 +03:00
شركة خبير المحدودة b407fb170c
Delete .github/workflows/odex25-general.yml 2024-07-29 14:44:18 +03:00
شركة خبير المحدودة c5eaf6a6dd
Delete .github/workflows/odex25-standard.yml 2024-07-29 14:44:07 +03:00
شركة خبير المحدودة 3dc8d794ae
Delete .github/workflows/twahod-project.yml 2024-07-29 14:43:54 +03:00
شركة خبير المحدودة d08d72dbdd
Create app-server.yml 2024-07-29 14:43:38 +03:00
Bakry e0201d9e66 fix 2024-07-29 14:22:50 +03:00
شركة خبير المحدودة e11bae6c58 Update github action file 2024-07-29 13:33:16 +03:00
شركة خبير المحدودة 614bca748c Update github action file 2024-07-29 13:32:00 +03:00
شركة خبير المحدودة e01f64e8d8 Update github action file 2024-07-29 13:25:04 +03:00
شركة خبير المحدودة dc5c88e422 Update github action file 2024-07-29 13:24:02 +03:00
شركة خبير المحدودة a0fa9165f3 Update github action file 2024-07-29 13:23:37 +03:00
شركة خبير المحدودة ca88c0271a Update github action file 2024-07-29 13:20:58 +03:00
bakry 50d55c7afc
Merge pull request #417 from expsa/bakry_edit
fix
2024-07-29 13:00:18 +03:00
Bakry f08c82ef16 fix 2024-07-29 12:09:04 +03:00
bakry 36e216ddda
Merge pull request #413 from expsa/bakry_edit
fix
2024-07-29 11:57:48 +03:00
Bakry 22391d8a53 fix 2024-07-29 11:07:31 +03:00
شركة خبير المحدودة 942e3dd448 Update github action file 2024-07-28 15:17:00 +03:00
bakry 893b6bf10e
Merge pull request #343 from expsa/bakry_edit
Bakry edit
2024-07-21 15:15:04 +03:00
Bakry fcd69c6888 fix 2024-07-21 14:59:32 +03:00
Bakry 509bf02555 fix 2024-07-21 14:45:29 +03:00
Bakry 05a232caa8 Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_edit
# Conflicts:
#	odex25_hr/employee_requests/views/hr_personal_permission.xml
2024-07-21 14:14:16 +03:00
Bakry ab964b31d7 fix 2024-07-21 14:11:56 +03:00
bakry 34bb79bc89
Merge pull request #325 from expsa/bakry_edit
fix trans
2024-07-21 10:43:02 +03:00
Bakry 154eed0b1d fix trans 2024-07-21 10:41:48 +03:00
AbuzarExp 5cbc46a211
Merge pull request #294 from expsa/abuzar_fix_hr
fix bug
2024-07-20 14:53:51 +03:00
Elyageen add21cd942 fix bug 2024-07-20 14:52:27 +03:00
AbuzarExp 949a97ee56
Merge pull request #287 from expsa/abuzar_fix_hr
fix bug
2024-07-20 13:44:27 +03:00