Bakry
|
1f8ae01dcb
|
fix
|
2024-12-04 14:44:12 +03:00 |
|
Bakry
|
cff86a2a51
|
fix
|
2024-12-03 17:12:22 +03:00 |
|
Bakry
|
b668b743de
|
fix Annual Leave Balance Notification
|
2024-12-03 16:26:47 +03:00 |
|
Bakry
|
f16ee6538b
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr
|
2024-12-03 16:14:04 +03:00 |
Hamed-exp
|
279ccb7517
|
Merge pull request #1885 from expsa/031224_hr
update hr_holidays_public translate
|
2024-12-03 14:02:38 +02:00 |
HamedHamed-cs
|
12ed2f7b0d
|
update hr_holidays_public translate
|
2024-12-03 14:00:47 +02:00 |
|
Hamed-exp
|
1f49715b51
|
Merge pull request #1881 from expsa/031224_hr
solve public holidays report error and update the excel translate
|
2024-12-03 08:26:21 +02:00 |
|
HamedHamed-cs
|
cbba1d996a
|
solve public holidays report error and update the excel translate
|
2024-12-03 08:24:27 +02:00 |
|
Bakry
|
8623c63ebd
|
fix promotion
|
2024-12-02 15:06:34 +03:00 |
bakry
|
220c26e3ad
|
Merge pull request #1869 from expsa/bakry_hr
fix promotion
|
2024-12-02 13:31:45 +03:00 |
|
Bakry
|
e2c57ec810
|
fix promotion
|
2024-12-02 13:30:38 +03:00 |
|
Bakry
|
b86064f0b5
|
fix promotion
|
2024-12-02 13:03:09 +03:00 |
|
bakry
|
6010827372
|
Merge pull request #1866 from expsa/bakry_hr
fix promotion
|
2024-12-02 12:31:47 +03:00 |
|
Bakry
|
fa1d98476f
|
fix promotion
|
2024-12-02 12:30:50 +03:00 |
|
bakry
|
8ac246cca7
|
Merge pull request #1864 from expsa/bakry_hr
fix promotion
|
2024-12-02 12:21:40 +03:00 |
|
Bakry
|
f577c1bb70
|
fix promotion
|
2024-12-02 12:19:53 +03:00 |
|
Hamed-exp
|
ad12bc0111
|
Merge pull request #1852 from expsa/dev_011224_hr
add translate to add employees wizard, modifiy required fields, solve…
|
2024-12-01 14:42:12 +02:00 |
|
HamedHamed-cs
|
c1ef0d8a7f
|
add translate to add employees wizard, modifiy required fields, solve issue of hr_holidays_public pdf and excel
|
2024-12-01 14:39:29 +02:00 |
|
Hamed-exp
|
fa07980992
|
Merge pull request #1843 from expsa/dev_hamed_attendances
update attendance reports, add wizard for promotion
|
2024-11-28 14:51:40 +02:00 |
|
HamedHamed-cs
|
759473500d
|
update attendance reports, add wizard for promotion
|
2024-11-28 14:31:30 +02:00 |
|
bakry
|
8865e94007
|
Merge pull request #1836 from expsa/bakry_hr
Bakry hr
|
2024-11-27 17:04:55 +03:00 |
|
Bakry
|
c26cb37c6f
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr
|
2024-11-27 17:03:40 +03:00 |
|
Bakry
|
23334f3cdf
|
Revert "fix holiday permission"
This reverts commit daa3f896af.
|
2024-11-27 17:03:23 +03:00 |
|
Bakry
|
97569423e5
|
Revert "fix"
This reverts commit 8331c6cc8b.
|
2024-11-27 17:01:54 +03:00 |
|
Bakry
|
8331c6cc8b
|
fix
|
2024-11-27 16:54:42 +03:00 |
|
Bakry
|
5817324bdc
|
fix
|
2024-11-26 18:27:37 +03:00 |
|
Bakry
|
daa3f896af
|
fix holiday permission
|
2024-11-26 18:25:46 +03:00 |
SamirLADOUI-sa
|
bdf5dd7108
|
Merge pull request #1831 from expsa/samir-aladawi-hr-improves
[FIX] attendances: remove reset to initial fields
|
2024-11-26 12:11:07 +01:00 |
Samir Ladoui
|
bf6b648a07
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into samir-aladawi-hr-improves
|
2024-11-26 12:10:10 +01:00 |
|
Samir Ladoui
|
d6f6f29ebd
|
[FIX] attendances: remove reset to initial fields
|
2024-11-26 12:09:26 +01:00 |
mazenmuhamad
|
9115b3ed19
|
Merge pull request #1810 from expsa/lgen_zen_email
add Attendance Notification Email Template tempelet email
|
2024-11-24 10:27:13 +02:00 |
|
Mazen Abdo
|
3d79654fb2
|
add Attendance Notification Email Template tempelet email
|
2024-11-24 10:26:28 +02:00 |
|
mazenmuhamad
|
2de278ce34
|
Merge pull request #1809 from expsa/lgen_zen_email
remove tempelet email
|
2024-11-24 10:20:00 +02:00 |
|
Mazen Abdo
|
edd4d5ddd3
|
remove tempelet email
|
2024-11-24 10:19:04 +02:00 |
|
bakry
|
cb62816e7c
|
Merge pull request #1801 from expsa/bakry_hr
fix
|
2024-11-21 16:18:40 +03:00 |
|
Bakry
|
42d8e53122
|
fix
|
2024-11-21 16:16:28 +03:00 |
|
mazenmuhamad
|
f2b3fe36b5
|
Merge pull request #1797 from expsa/zen_is_absent
fix two Missed Punch
|
2024-11-21 09:37:01 +02:00 |
|
Mazen Abdo
|
538526aa88
|
fix two Missed Punch
|
2024-11-21 09:36:10 +02:00 |
|
mazenmuhamad
|
21d4ae8d9a
|
Merge pull request #1790 from expsa/zen_is_absent
fix int strftime again2 is_absent
|
2024-11-20 12:43:19 +02:00 |
|
Mazen Abdo
|
1215cc5739
|
fix int strftime again2 is_absent
|
2024-11-20 12:42:05 +02:00 |
|
mazenmuhamad
|
2fbc85a5db
|
Merge pull request #1789 from expsa/zen_is_absent
fix strftime again is_absent
|
2024-11-20 12:27:02 +02:00 |
|
Mazen Abdo
|
fc2a44d64a
|
fix strftime again is_absent
|
2024-11-20 12:25:55 +02:00 |
|
mazenmuhamad
|
b47650f55b
|
Merge pull request #1788 from expsa/zen_is_absent
fix again is_absent
|
2024-11-20 11:31:46 +02:00 |
|
Mazen Abdo
|
8825311ed2
|
fix again is_absent
|
2024-11-20 11:30:29 +02:00 |
|
mazenmuhamad
|
c3c2714cda
|
Merge pull request #1787 from expsa/zen_is_absent
fix and updata
|
2024-11-20 10:12:30 +02:00 |
|
Mazen Abdo
|
2f37f7b90d
|
fix and updata
|
2024-11-20 10:07:20 +02:00 |
|
mazenmuhamad
|
dfe02eaf07
|
Merge pull request #1786 from expsa/zen_is_absent
fix is_absent Missed Punch true or false
|
2024-11-20 09:58:15 +02:00 |
|
Mazen Abdo
|
dd3e68d203
|
fix is_absent Missed Punch true or false
|
2024-11-20 09:57:30 +02:00 |
|
mazenmuhamad
|
f2b8793125
|
Merge pull request #1779 from expsa/zen_send_lateness_test
add module exp_hr_appraisal_kpi
|
2024-11-19 08:28:02 +02:00 |
|
Mazen Abdo
|
b21115b02e
|
add module exp_hr_appraisal_kpi
|
2024-11-19 08:26:54 +02:00 |