Bakry
|
ea48f53a54
|
fix attendance
|
2024-07-18 11:54:07 +03:00 |
AbuzarExp
|
1d817bd36e
|
Merge pull request #260 from expsa/preprod_odex25_hr
Preprod odex25 hr
|
2024-07-18 10:34:38 +03:00 |
bakry
|
d50e7b30a4
|
Merge pull request #258 from expsa/dev_odex25_hr
Dev odex25 hr
|
2024-07-18 10:11:41 +03:00 |
|
bakry
|
3e4c5de302
|
Merge pull request #255 from expsa/bakry_edit
Bakry edit
|
2024-07-17 16:49:42 +03:00 |
|
Bakry
|
61a6a28609
|
fix #'views/to_base_templates.xml to_base
|
2024-07-17 16:45:47 +03:00 |
|
Bakry
|
2b69f322da
|
fix loan constrain
|
2024-07-17 16:01:20 +03:00 |
|
Bakry
|
6fd1248f75
|
fix loan constrain
|
2024-07-17 15:59:17 +03:00 |
|
AbuzarExp
|
3045f49072
|
Merge pull request #246 from expsa/dev_odex25_hr
fix loan.payment.suspension trans
|
2024-07-17 13:33:16 +03:00 |
|
AbuzarExp
|
b67bfe66e9
|
Merge pull request #245 from expsa/abuzar_task_hr
[REM] remover file task reject
|
2024-07-17 13:32:40 +03:00 |
odex
|
091c3ea042
|
[REM] remover file task reject
|
2024-07-17 13:30:39 +03:00 |
|
bakry
|
57e38f3461
|
Merge pull request #232 from expsa/bakry_edit
Bakry edit
|
2024-07-16 19:21:34 +03:00 |
|
Bakry
|
9301b81913
|
fix load lang delete trans
|
2024-07-16 17:04:34 +03:00 |
|
Bakry
|
38cabe06a9
|
fix loan.payment.suspension trans
|
2024-07-16 16:53:37 +03:00 |
|
AbuzarExp
|
407ae36715
|
Merge pull request #225 from expsa/dev_odex25_hr
[FIX] refactore name in holday type
|
2024-07-16 15:11:09 +03:00 |
|
AbuzarExp
|
09c8273183
|
Merge pull request #221 from expsa/abuzar_task_hr
[FIX] refactore name in holday type
|
2024-07-16 12:46:47 +03:00 |
|
odex
|
6815e03f77
|
[FIX] refactore name in holday type
|
2024-07-16 12:45:06 +03:00 |
|
bakry
|
cbed2876b2
|
Merge pull request #208 from expsa/preprod_odex25_hr
Preprod odex25 hr
|
2024-07-16 11:29:37 +03:00 |
|
bakry
|
ef37728a8a
|
Merge pull request #217 from expsa/dev_odex25_hr
Dev odex25 hr
|
2024-07-16 11:16:44 +03:00 |
|
bakry
|
0bc78e6310
|
Merge pull request #216 from expsa/bakry_edit
fix overtime transfer to accounting
|
2024-07-16 10:36:50 +03:00 |
|
Bakry
|
49c5bda3de
|
fix overtime transfer to accounting
|
2024-07-16 10:31:22 +03:00 |
|
bakry
|
838a80baf5
|
Merge pull request #203 from expsa/dev_odex25_hr
Dev odex25 hr
|
2024-07-15 15:07:05 +03:00 |
|
bakry
|
922d7e27ea
|
Merge pull request #200 from expsa/bakry_edit
fix
|
2024-07-15 13:52:23 +03:00 |
|
Bakry
|
0968ecd71a
|
fix
|
2024-07-15 13:49:37 +03:00 |
|
AbuzarExp
|
2c9244b824
|
Merge pull request #188 from expsa/abuzar_task_hr
Abuzar task hr
|
2024-07-14 15:09:43 +03:00 |
|
odex
|
9e1b31a9e8
|
fix loan menu payroll
|
2024-07-14 15:08:26 +03:00 |
|
odex
|
cefba3b325
|
fix loan menu payroll
|
2024-07-14 15:07:42 +03:00 |
|
AbuzarExp
|
733417c888
|
Merge pull request #187 from expsa/abuzar_task_hr
fix loan menu
|
2024-07-14 14:49:59 +03:00 |
|
odex
|
d695b17b4e
|
fix loan menu
|
2024-07-14 14:49:26 +03:00 |
|
AbuzarExp
|
c698de8567
|
Merge pull request #165 from expsa/preprod_odex25_hr
Preprod odex25 hr
|
2024-07-14 14:01:52 +03:00 |
|
AbuzarExp
|
64cfb53544
|
Merge pull request #185 from expsa/dev_odex25_hr
Dev odex25 hr
|
2024-07-14 13:35:17 +03:00 |
|
AbuzarExp
|
b8f07b1542
|
Merge pull request #186 from expsa/abuzar_task_hr
fix loan
|
2024-07-14 13:34:11 +03:00 |
|
odex
|
abb0831fac
|
fix loan
|
2024-07-14 13:33:27 +03:00 |
|
bakry
|
c064432038
|
Merge pull request #184 from expsa/bakry_edit
Bakry edit
|
2024-07-14 12:59:24 +03:00 |
|
Bakry
|
18fa34e566
|
fix
|
2024-07-14 12:41:15 +03:00 |
|
Bakry
|
17354dbcc5
|
fix
|
2024-07-14 12:39:37 +03:00 |
شركة خبير المحدودة
|
9014c47f15
|
Update github action file
|
2024-07-12 20:00:10 +03:00 |
|
شركة خبير المحدودة
|
26eb9a68e3
|
Update github action file
|
2024-07-12 19:59:23 +03:00 |
|
شركة خبير المحدودة
|
c125a9ea99
|
Update github action file
|
2024-07-12 19:58:09 +03:00 |
|
AbuzarExp
|
d057918d6a
|
Merge pull request #171 from expsa/dev_odex25_hr
fix some bug
|
2024-07-11 16:56:09 +03:00 |
|
AbuzarExp
|
590df69aa6
|
Merge pull request #168 from expsa/abuzar_task_hr
fix some bug
|
2024-07-11 16:54:32 +03:00 |
|
odex
|
8c305be230
|
fix some bug
|
2024-07-11 16:52:33 +03:00 |
|
bakry
|
196a4e1cbe
|
Merge pull request #162 from expsa/dev_odex25_hr
Dev odex25 hr
|
2024-07-11 15:00:48 +03:00 |
|
bakry
|
a56566b093
|
Merge pull request #161 from expsa/bakry_edit
fix holiday
|
2024-07-11 14:48:51 +03:00 |
|
Bakry
|
668252140b
|
fix holiday
|
2024-07-11 14:47:00 +03:00 |
|
AbuzarExp
|
77cbeda392
|
Merge pull request #146 from expsa/dev_odex25_hr
fix hr
|
2024-07-10 15:01:04 +03:00 |
|
AbuzarExp
|
1cb38acc75
|
Merge pull request #145 from expsa/abuzar_task_hr
fix hr
|
2024-07-10 15:00:15 +03:00 |
|
odex
|
bc426520e7
|
fix hr
|
2024-07-10 14:56:04 +03:00 |
|
AbuzarExp
|
bb8ef87637
|
Merge pull request #144 from expsa/preprod_odex25_hr
Preprod odex25 hr
|
2024-07-09 18:26:22 +03:00 |
|
AbuzarExp
|
e62238c50c
|
Merge pull request #140 from expsa/dev_odex25_hr
Dev odex25 hr
|
2024-07-09 14:26:37 +03:00 |
|
AbuzarExp
|
09eba281e5
|
Merge pull request #139 from expsa/abuzar_task_hr
[FIX] fix bug in hr 007
|
2024-07-09 14:26:04 +03:00 |