mohammed-alkhazrji
|
6a50a820a9
|
change sum edit
|
2025-05-22 00:14:19 +03:00 |
bakry
|
a54b3ceb4b
|
Merge pull request #3268 from expsa/bakry_hr3
fix
|
2025-05-21 11:27:25 +03:00 |
Bakry
|
988a85b652
|
fix
|
2025-05-21 11:25:49 +03:00 |
Mostafa
|
9c48738390
|
fix report attendance
|
2025-05-20 19:07:28 -07:00 |
|
mohammed-alkhazrji
|
dc16fd67ea
|
make absent hours and temp email
|
2025-05-20 17:20:49 +03:00 |
|
mohammed-alkhazrji
|
ab09479003
|
make absent hours and temp email
|
2025-05-20 17:19:17 +03:00 |
|
mohammed-alkhazrji
|
e4cb1d88ff
|
make absent hours and temp email
|
2025-05-20 12:09:50 +03:00 |
|
mohammed-alkhazrji
|
3a6ea88dcf
|
make absent hours and temp email
|
2025-05-20 11:56:01 +03:00 |
|
mohammed-alkhazrji
|
8c48bbc83a
|
make absent hours and temp email
|
2025-05-20 10:38:23 +03:00 |
|
bakry
|
353698f545
|
Merge branch 'dev_odex25_hr' into bakry_hr3
|
2025-05-18 16:51:25 +03:00 |
|
Bakry
|
2734b1104f
|
fix overtime to transfer multi accounts base on emp type
|
2025-05-18 16:43:07 +03:00 |
Samir Ladoui
|
ea8c0b9bd7
|
[FIX] attendances
|
2025-05-06 12:32:23 +01:00 |
|
Samir Ladoui
|
815ba32353
|
[FIX] attendances
|
2025-05-06 12:17:43 +01:00 |
|
Mostafa
|
0b0de1f3d9
|
new report for employee attendance
|
2025-04-29 19:10:09 -07:00 |
ahmed-nouri051
|
4818f7e553
|
fix attendence
|
2025-04-29 14:20:14 +02:00 |
|
ahmed-nouri051
|
e7a0853044
|
fixing prod error
|
2025-04-29 10:51:57 +02:00 |
Esraa-Exp
|
9572ea4313
|
attendance report + login by identity edits
|
2025-04-24 22:48:20 +02:00 |
|
Esraa-Exp
|
fc9dcc4cdf
|
hr edits
|
2025-04-24 18:04:08 +02:00 |
|
Esraa-Exp
|
923c4293a2
|
department in attendance report + create_uid in holiday
|
2025-04-23 15:29:04 +02:00 |
|
Esraa-Exp
|
074395ea8f
|
div by zero
|
2025-04-23 13:11:06 +02:00 |
|
Bakry
|
04baa81cb8
|
fix
|
2025-04-17 17:06:05 +03:00 |
|
Bakry
|
a4a7d95933
|
fix
|
2025-04-10 12:51:39 +03:00 |
|
Bakry
|
70419c7661
|
fix
|
2025-03-25 14:34:13 +03:00 |
|
Samir Ladoui
|
e49bdc715b
|
[FIX] attendances: check module existence before using field device_id
|
2025-03-05 12:44:03 +01:00 |
|
Bakry
|
55f2f4ad8c
|
fix
|
2025-01-30 15:16:23 +03:00 |
|
Bakry
|
13471b6400
|
fix alternative days holiday
|
2025-01-27 12:37:38 +03:00 |
|
Bakry
|
c4306943a3
|
edit attendance more one in day
|
2025-01-20 11:21:01 +03:00 |
|
bakry
|
31fb9630c6
|
Merge pull request #2121 from expsa/bakry_hr3
fix
|
2025-01-13 14:25:43 +03:00 |
|
Bakry
|
4ec2409584
|
fix
|
2025-01-13 14:25:13 +03:00 |
|
bakry
|
69cb331b45
|
Merge pull request #2102 from expsa/bakry_hr3
Bakry hr3
|
2025-01-12 11:53:14 +03:00 |
|
Bakry
|
da94b6c667
|
fix
|
2025-01-12 11:52:02 +03:00 |
|
bakry
|
8b4746e081
|
Merge pull request #2079 from expsa/bakry_hr3
fix
|
2025-01-06 17:49:02 +03:00 |
|
Bakry
|
61afaa583e
|
fix
|
2025-01-06 17:48:04 +03:00 |
|
bakry
|
eac2130651
|
Merge pull request #2057 from expsa/bakry_hr3
fix
|
2025-01-02 17:12:06 +03:00 |
|
Bakry
|
81a6bdd165
|
fix
|
2025-01-02 16:56:58 +03:00 |
|
Samir Ladoui
|
d6f192f6e4
|
[UPD] attendances: roolback get_hours
|
2025-01-02 13:38:49 +01:00 |
|
Bakry
|
fcb225a421
|
fix
|
2025-01-01 15:57:13 +03:00 |
|
Bakry
|
3da2ef1517
|
fix
|
2024-12-31 09:58:45 +03:00 |
|
Bakry
|
eac72cefd7
|
fix
|
2024-12-29 15:14:02 +03:00 |
|
bakry
|
3edcfaa5dc
|
Merge pull request #1990 from expsa/bakry_hr3
fix
|
2024-12-26 15:42:06 +03:00 |
|
Bakry
|
7025de93e2
|
fix
|
2024-12-26 13:42:00 +03:00 |
SamirLADOUI-sa
|
efb54f8660
|
Merge pull request #1966 from expsa/samir-aladawi-fix-attendances-records
[FIX] attendances: fix get_hours method early exit
|
2024-12-24 12:54:11 +01:00 |
|
Samir Ladoui
|
64bdd29c3a
|
[FIX] attendances: fix get_hours method early exit
|
2024-12-24 12:53:30 +01:00 |
|
SamirLADOUI-sa
|
587cdd3275
|
Merge pull request #1965 from expsa/samir-aladawi-fix-attendances-records
[FIX] attendances: fix get_hours method
|
2024-12-24 12:42:20 +01:00 |
|
Samir Ladoui
|
ccb292e7e6
|
[FIX] attendances: fix get_hours method
|
2024-12-24 12:41:47 +01:00 |
|
SamirLADOUI-sa
|
5d41bb8dde
|
Merge pull request #1963 from expsa/samir-aladawi-fix-attendances-records
[FIX] attendances: time from and to in permissions
|
2024-12-24 12:08:45 +01:00 |
|
Samir Ladoui
|
6d1b055dfc
|
[FIX] attendances: time from and to in permissions
|
2024-12-24 12:08:03 +01:00 |
|
SamirLADOUI-sa
|
ecdfcd30f3
|
Merge pull request #1955 from expsa/samir-aladawi-fix-attendances-records
[FIX] attendances
|
2024-12-22 12:42:29 +01:00 |
|
Samir Ladoui
|
d882764e06
|
[FIX] attendances
|
2024-12-22 12:42:00 +01:00 |
|
SamirLADOUI-sa
|
cc68e6c55c
|
Merge pull request #1954 from expsa/samir-aladawi-fix-attendances-records
[FIX] attendances
|
2024-12-22 12:29:20 +01:00 |
|
Samir Ladoui
|
2efaf1b7a1
|
[FIX] attendances
|
2024-12-22 12:28:53 +01:00 |
|
SamirLADOUI-sa
|
61adf44031
|
Merge pull request #1953 from expsa/samir-aladawi-fix-attendances-records
[FIX] attendances
|
2024-12-22 12:12:19 +01:00 |
|
Samir Ladoui
|
64f7db50dd
|
[FIX] attendances
|
2024-12-22 12:11:52 +01:00 |
|
SamirLADOUI-sa
|
9941ac28db
|
Merge pull request #1952 from expsa/samir-aladawi-fix-attendances-records
[FIX] attendances
|
2024-12-22 12:03:58 +01:00 |
|
Samir Ladoui
|
e0c19db88c
|
[FIX] attendances
|
2024-12-22 12:03:34 +01:00 |
|
SamirLADOUI-sa
|
68415ff64e
|
Merge pull request #1951 from expsa/samir-aladawi-fix-attendances-records
[FIX] attendances: print permission_type_id name in report
|
2024-12-22 10:58:55 +01:00 |
|
Samir Ladoui
|
a4198f8e5d
|
[FIX] attendances: print permission_type_id name in report
|
2024-12-22 10:57:17 +01:00 |
|
SamirLADOUI-sa
|
392697d4ec
|
Merge pull request #1950 from expsa/samir-aladawi-fix-attendances-records
[FIX] attendances: calculate early exit and lateness
|
2024-12-22 10:52:12 +01:00 |
|
Samir Ladoui
|
89903ccce3
|
[FIX] attendances: calculate early exit and lateness
|
2024-12-22 10:50:57 +01:00 |
|
bakry
|
bc6abd4ae8
|
Merge pull request #1949 from expsa/bakry_hr3
fix attendance create
|
2024-12-22 11:52:03 +03:00 |
|
Bakry
|
5a5782f9a0
|
fix attendance create
|
2024-12-22 11:21:44 +03:00 |
|
bakry
|
fdb70cc103
|
Merge pull request #1942 from expsa/bakry_hr3
Bakry hr3
|
2024-12-19 16:45:43 +03:00 |
|
Bakry
|
176c5461ea
|
fix
|
2024-12-19 16:44:24 +03:00 |
|
Samir Ladoui
|
bf9e55ca0a
|
[FIX] attendances: check if has sign in and out
|
2024-12-19 13:54:01 +01:00 |
|
SamirLADOUI-sa
|
edcdb4855a
|
Merge pull request #1940 from expsa/samir-aladawi-fix-attendances-records
[FIX] attendances: check if has sign in and out
|
2024-12-19 13:44:24 +01:00 |
|
Samir Ladoui
|
2c60149a7b
|
[FIX] attendances: check if has sign in and out
|
2024-12-19 13:44:00 +01:00 |
|
SamirLADOUI-sa
|
be2ca601dc
|
Merge pull request #1939 from expsa/samir-aladawi-fix-attendances-records
[FIX] attendances: mission date & in holidays or day mission calculat…
|
2024-12-19 12:39:03 +01:00 |
|
Samir Ladoui
|
2dc811fa54
|
[FIX] attendances: mission date & in holidays or day mission calculate plan hours and office hours
|
2024-12-19 12:38:27 +01:00 |
|
Bakry
|
7775664383
|
fix notification attendance time format
|
2024-12-18 16:03:29 +03:00 |
|
Bakry
|
feaa0f7609
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3
|
2024-12-18 14:36:39 +03:00 |
|
Samir Ladoui
|
9f24337c4a
|
[FIX] attendances: refactoring get_hours function
|
2024-12-17 15:29:41 +01:00 |
|
Bakry
|
109a9529ef
|
fix notification attendance time format
|
2024-12-17 16:53:15 +03:00 |
|
Bakry
|
ae486d7c82
|
fix notification attendance time format
|
2024-12-16 18:01:35 +03:00 |
|
Bakry
|
bffdefd3fa
|
fix notification attendance time format
|
2024-12-16 17:16:19 +03:00 |
|
Bakry
|
0ccfcceb07
|
fix
|
2024-12-15 15:29:02 +03:00 |
|
Bakry
|
4220badf22
|
fix
|
2024-12-15 15:24:06 +03:00 |
|
Bakry
|
f628c3ac5e
|
fix
|
2024-12-12 13:20:01 +03:00 |
HamedHamed-cs
|
09230c2cf4
|
issue in attendances
|
2024-12-04 09:34:41 +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 |
|
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 |
Mazen Abdo
|
3d79654fb2
|
add Attendance Notification Email Template tempelet email
|
2024-11-24 10:26:28 +02:00 |
|
Mazen Abdo
|
edd4d5ddd3
|
remove tempelet email
|
2024-11-24 10:19:04 +02:00 |
|
Mazen Abdo
|
538526aa88
|
fix two Missed Punch
|
2024-11-21 09:36:10 +02:00 |
|
Mazen Abdo
|
1215cc5739
|
fix int strftime again2 is_absent
|
2024-11-20 12:42:05 +02:00 |
|
Mazen Abdo
|
fc2a44d64a
|
fix strftime again is_absent
|
2024-11-20 12:25:55 +02:00 |
|
Mazen Abdo
|
8825311ed2
|
fix again is_absent
|
2024-11-20 11:30:29 +02:00 |
|
Mazen Abdo
|
2f37f7b90d
|
fix and updata
|
2024-11-20 10:07:20 +02:00 |
|
Mazen Abdo
|
dd3e68d203
|
fix is_absent Missed Punch true or false
|
2024-11-20 09:57:30 +02:00 |
|
Mazen Abdo
|
d2d13fa08c
|
fix send_lateness_notifications
|
2024-11-19 08:22:43 +02:00 |
|
bakry
|
0b5fd0e406
|
Merge pull request #1736 from expsa/bakry_hr
Bakry hr
|
2024-11-11 14:03:55 +03:00 |
|
Bakry
|
e8039d22ab
|
fix attendance
|
2024-11-11 14:03:03 +03:00 |
|
bakry
|
a3e5b24a34
|
Merge pull request #1710 from expsa/bakry_hr
Bakry hr
|
2024-11-07 15:58:27 +03:00 |
|
Bakry
|
512ff920a7
|
fix
|
2024-11-07 15:55:19 +03:00 |
|
Samir Ladoui
|
5249bcf8be
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into samir-aladawi-hr-permission-type
|
2024-11-06 14:53:33 +01:00 |
|
Samir Ladoui
|
58e1d26451
|
[UPD] attendances: remove permission fields from calendar
|
2024-11-06 14:51:38 +01:00 |
|
Mazen Abdo
|
ec5a0cf55f
|
fix records_to_notify
|
2024-11-06 13:06:43 +02:00 |
|
Bakry
|
4cf88628c4
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr
|
2024-10-31 16:50:30 +03:00 |
|
Bakry
|
a59515a3d5
|
fix
|
2024-10-31 16:35:30 +03:00 |
|
Mazen Abdo
|
0be6d5a18b
|
update
|
2024-10-31 15:31:05 +03:00 |
|
Mazen Abdo
|
71efc3ff03
|
send_mail__lateness_notifications UPDATE
|
2024-10-31 13:02:35 +03:00 |
|
Mazen Abdo
|
db5f52c50b
|
send_mail__lateness_notifications
|
2024-10-31 12:42:25 +03:00 |
|
bakry
|
d1a20b0b62
|
Merge pull request #1572 from expsa/bakry_hr
fix
|
2024-10-16 12:26:48 +03:00 |
|
Bakry
|
67f3714921
|
fix
|
2024-10-16 11:55:40 +03:00 |
|
bakry
|
b923735829
|
Merge pull request #1424 from expsa/bakry_hr
fix attendance
|
2024-10-03 15:08:38 +03:00 |
|
Bakry
|
733d34d67d
|
fix attendance
|
2024-10-03 15:02:36 +03:00 |
|
bakry
|
d20bc8f488
|
Merge pull request #1417 from expsa/bakry_hr
fix attendance
|
2024-10-03 14:12:00 +03:00 |
|
Bakry
|
0ce7f0ac57
|
fix attendance
|
2024-10-03 14:10:07 +03:00 |
|
bakry
|
3b1e511e31
|
Merge pull request #1372 from expsa/bakry_hr
fix branch name
|
2024-10-01 16:36:24 +03:00 |
|
Bakry
|
f3fe075a26
|
fix branch name
|
2024-10-01 16:32:50 +03:00 |
|
bakry
|
b742e5880c
|
Merge pull request #1300 from expsa/bakry_hr
fix
|
2024-10-01 12:27:12 +03:00 |
|
Bakry
|
9687c0c7b2
|
fix
|
2024-10-01 12:24:03 +03:00 |
|
Bakry
|
507c5dbeda
|
fix
|
2024-10-01 12:22:15 +03:00 |
|
Bakry
|
944befebac
|
fix
|
2024-09-26 17:06:53 +03:00 |
eslam
|
e6fa117ead
|
Merge pull request #1226 from expsa/fix-excel-report
enhcance
|
2024-09-19 16:35:19 +03:00 |
eslamabady
|
46a44efae5
|
enhcance
|
2024-09-19 15:21:08 +03:00 |
|
bakry
|
aed2ad69b7
|
Merge pull request #1216 from expsa/bakry_hr
fix
|
2024-09-19 10:13:48 +03:00 |
|
Bakry
|
f4dffd8a7a
|
fix
|
2024-09-19 10:01:09 +03:00 |
|
eslam
|
797c0e8561
|
Merge pull request #1212 from expsa/fix-excel-report
fix layout and print data time zone
|
2024-09-18 15:32:12 +03:00 |
|
eslamabady
|
f5666b2bf1
|
fix layout and print data time zone
|
2024-09-18 15:30:23 +03:00 |
|
Bakry
|
19547b52f1
|
fix
|
2024-09-18 14:50:52 +03:00 |
|
eslam
|
bd7dbe4af4
|
Merge pull request #1205 from expsa/fix-excel-report
fix layout and print data time zone
|
2024-09-18 13:26:41 +03:00 |
|
Bakry
|
3b3bf62d83
|
fix group by branch
|
2024-09-18 13:06:30 +03:00 |
|
eslamabady
|
7281cb3a6e
|
fix layout and print data time zone
|
2024-09-18 12:32:37 +03:00 |
|
eslam
|
94eb5de806
|
Merge pull request #1174 from expsa/fix-excel-report
fix excel report
|
2024-09-16 11:32:37 +03:00 |
|
eslamabady
|
fed807a65e
|
fix excel report
|
2024-09-16 11:21:42 +03:00 |
|
eslamabady
|
6af21c25d0
|
fix excel report
|
2024-09-16 11:18:38 +03:00 |
|
eslamabady
|
cde57b6e1d
|
fix excel report
|
2024-09-16 11:06:51 +03:00 |
|
eslam
|
1b99af9c32
|
Merge pull request #1173 from expsa/fix-excel-report
fix excel report
|
2024-09-16 10:58:51 +03:00 |
|
eslamabady
|
bee61e4aef
|
fix excel report
|
2024-09-16 10:55:30 +03:00 |
|
eslamabady
|
2331f7f5ac
|
fix excel report
|
2024-09-16 10:51:58 +03:00 |
|
Bakry
|
05eb0f5e94
|
fix
|
2024-09-16 10:50:04 +03:00 |
|
Bakry
|
2c58ec25ae
|
fix
|
2024-09-16 10:47:11 +03:00 |
|
Bakry
|
96cea28cb6
|
fix
|
2024-09-10 10:54:41 +03:00 |
|
Bakry
|
43d774dbc5
|
fix
|
2024-09-10 10:44:33 +03:00 |
|
bakry
|
7918b28611
|
Merge pull request #1015 from expsa/bakry_hr
fix
|
2024-09-04 17:10:09 +03:00 |
|
Bakry
|
32ab8a879d
|
fix
|
2024-09-04 17:04:55 +03:00 |
|
bakry
|
5aca6e9748
|
Merge pull request #983 from expsa/bakry_hr
fix egister Attendance
|
2024-09-03 15:29:04 +03:00 |
|
Bakry
|
5a9efd52d8
|
fix egister Attendance
|
2024-09-03 15:18:40 +03:00 |
|
eslam
|
d28b058067
|
Merge pull request #957 from expsa/fix-report
fix report layout
|
2024-09-02 17:42:35 +03:00 |
|
eslamabady
|
8830d6f4f1
|
fix report layout
|
2024-09-02 17:30:06 +03:00 |
|
eslam
|
d614137b51
|
Merge pull request #954 from expsa/fix-report
fix report
|
2024-09-02 16:08:14 +03:00 |
|
eslamabady
|
f2b89b9251
|
fix report
|
2024-09-02 16:04:35 +03:00 |
|
eslam
|
9f885f0f19
|
Merge pull request #944 from expsa/fix-report
fix repoer
|
2024-09-02 11:06:18 +03:00 |
|
eslamabady
|
426f150b42
|
fix repoer
|
2024-09-02 10:46:56 +03:00 |
|
eslam
|
e47a84ab97
|
Merge pull request #933 from expsa/fix-report
fix repoer
|
2024-09-01 18:00:07 +03:00 |
|
eslamabady
|
46e80aaf0b
|
fix repoer
|
2024-09-01 17:47:18 +03:00 |
|
eslam
|
d59cb7570a
|
Merge pull request #930 from expsa/fix-report
fix repoer
|
2024-09-01 14:54:44 +03:00 |