Commit Graph

2507 Commits

Author SHA1 Message Date
Bakry a68edc2282 fix hr_department fields 2024-08-14 10:16:48 +03:00
bakry 39645eee7b
Merge pull request #662 from expsa/preprod_odex25_hr
Preprod odex25 hr
2024-08-13 09:58:43 +03:00
bakry a015971d39
Merge pull request #655 from expsa/dev_odex25_hr
Dev odex25 hr
2024-08-13 09:52:57 +03:00
bakry ffd04a69ce
Merge pull request #654 from expsa/bakry_hr
add filter and search loan
2024-08-12 16:29:33 +03:00
bakry 99beb801fd
Merge pull request #651 from expsa/preprod_odex25_hr
Preprod odex25 hr
2024-08-12 16:26:08 +03:00
Bakry 92df1b18bc add filter and search loan 2024-08-12 16:25:04 +03:00
AbuzarExp 3d411d11cb
Merge pull request #653 from expsa/dev_odex25_hr
Dev odex25 hr
2024-08-12 16:10:46 +03:00
AbuzarExp 1166ac135b
Merge pull request #652 from expsa/abuzar_hr_task
FIX CALC attendances HOLDAY
2024-08-12 16:09:43 +03:00
odex 6980ab4ac0 FIX CALC attendances HOLDAY 2024-08-12 16:08:48 +03:00
bakry 5867f19056
Merge pull request #650 from expsa/dev_odex25_hr
Dev odex25 hr
2024-08-12 16:05:32 +03:00
bakry 97b8f0e682
Merge pull request #649 from expsa/bakry_hr
Bakry hr
2024-08-12 15:50:23 +03:00
Bakry 91e1431b85 add filter and search termination 2024-08-12 15:37:48 +03:00
Bakry 535da6a374 add filter and search termination 2024-08-12 15:33:02 +03:00
Bakry 5cba6c5f02 add filter and search penalty 2024-08-12 15:29:36 +03:00
Bakry 4a86c48ce6 add filter and search penalty 2024-08-12 15:14:30 +03:00
Bakry a0fe4eeb82 add filter and search mission 2024-08-12 15:14:10 +03:00
Bakry 5f0ceb1d51 add filter and search mission 2024-08-12 14:58:31 +03:00
Bakry dca2ec3341 add filter and search mission 2024-08-12 14:42:18 +03:00
bakry ba07c3aee2
Merge pull request #647 from expsa/bakry_hr
add filter and search mission
2024-08-12 14:35:10 +03:00
Bakry fd3dafe0d0 add filter and search mission 2024-08-12 14:16:27 +03:00
AbuzarExp 4a90370303
Merge pull request #646 from expsa/dev_odex25_hr
FIX CALC attendances HOLDAY
2024-08-12 13:23:14 +03:00
AbuzarExp 65984991d3
Merge pull request #645 from expsa/abuzar_hr_task
FIX CALC attendances HOLDAY
2024-08-12 13:22:40 +03:00
odex 351da89130 Merge branch 'dev_odex25_hr' of github.com:expsa/odex25-standard-modules into abuzar_hr_task 2024-08-12 13:21:41 +03:00
odex ba2c779b01 FIX CALC attendances HOLDAY 2024-08-12 13:21:09 +03:00
bakry fc74a2ba71
Merge pull request #643 from expsa/dev_odex25_hr
Dev odex25 hr
2024-08-12 12:01:46 +03:00
bakry 7464cccede
Merge pull request #642 from expsa/bakry_hr
add filter and search employee request
2024-08-12 11:29:22 +03:00
Bakry cab395c7ce add filter and search employee request 2024-08-12 11:25:11 +03:00
bakry 8e3969394b
Merge pull request #639 from expsa/preprod_odex25_hr
Preprod odex25 hr
2024-08-12 09:43:02 +03:00
bakry 015daf2027
Merge pull request #638 from expsa/dev_odex25_hr
Dev odex25 hr
2024-08-12 09:30:14 +03:00
bakry 2b2d989e96
Merge pull request #637 from expsa/bakry_hr
add filter and search permission
2024-08-12 09:18:11 +03:00
Bakry 7c63c9aa0e add filter and search permission 2024-08-12 09:15:39 +03:00
bakry f7b3b0a93b
Merge pull request #635 from expsa/bakry_hr
fix attandance
2024-08-11 18:00:48 +03:00
Bakry 919f702ce5 fix attandance 2024-08-11 17:29:45 +03:00
bakry 5da6d68f4b
Merge pull request #625 from expsa/bakry_hr
Bakry hr
2024-08-11 13:51:56 +03:00
Bakry 78d0328363 fix salary 2024-08-11 11:35:11 +03:00
Bakry 4dbf24c47e fix salary 2024-08-11 11:29:30 +03:00
Bakry f069b892ab fix 2024-08-08 16:47:14 +03:00
bakry 285fb022e1
Merge pull request #600 from expsa/bakry_hr
fix
2024-08-08 14:51:49 +03:00
Bakry 0587f9493f fix 2024-08-08 14:29:39 +03:00
bakry b731b97bd5
Merge pull request #597 from expsa/bakry_hr
fix
2024-08-08 13:44:09 +03:00
Bakry a090d4de36 fix 2024-08-08 13:32:12 +03:00
bakry 2f001b1b19
Merge pull request #595 from expsa/bakry_hr
Bakry hr
2024-08-08 12:18:33 +03:00
Bakry e3b1887f99 add module watermark report 2024-08-08 12:04:15 +03:00
AbuzarExp b6e73e8f1d
Merge pull request #592 from expsa/dev_odex25_hr
[CALC] add calc attens
2024-08-08 10:52:10 +03:00
AbuzarExp eb3323ceba
Merge pull request #591 from expsa/abuzar_task_hr
[CALC] add calc attens
2024-08-08 10:51:36 +03:00
odex b33bf53760 [CALC] add calc attens 2024-08-07 17:33:14 +03:00
Bakry e506a01d04 add module watermark report 2024-08-07 17:09:35 +03:00
AbuzarExp 06ec94d5df
Merge pull request #563 from expsa/preprod_odex25_hr
[FIX] fix access in ir-attch
2024-08-06 16:29:38 +03:00
AbuzarExp ff1b843303
Merge pull request #561 from expsa/dev_odex25_hr
[FIX] fix access in ir-attch
2024-08-06 15:39:26 +03:00
AbuzarExp 6884ee9c93
Merge pull request #560 from expsa/abuzar_task_hr
[FIX] fix access in ir-attch
2024-08-06 15:38:31 +03:00