Commit Graph

286 Commits

Author SHA1 Message Date
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
eslamabady ad074683af fix repoer 2024-09-01 14:48:05 +03:00
eslam 420c8d09ab
Merge pull request #927 from expsa/fix-report
fix repoer
2024-08-31 17:09:13 +03:00
eslamabady 07df220522 fix repoer 2024-08-31 17:06:49 +03:00
eslam 210508998f
Merge pull request #909 from expsa/fix-report
fix
2024-08-28 17:13:31 +03:00
eslamabady 1070cc816f fix 2024-08-28 17:09:27 +03:00
Bakry 04e6f6248d fix 2024-08-22 17:00:04 +03:00
zainab2097 7b1461a64d
Update hr_attendance_view.xml 2024-08-21 12:23:23 +03:00
zainab2097 13ec202f0d
Update ar_001.po 2024-08-21 11:17:26 +03:00
zainab2097 5758800303
Update hr_attendance_view.xml 2024-08-20 18:34:15 +03:00
bakry 0cdd11208a
Merge pull request #811 from expsa/bakry_hr
fix
2024-08-20 14:25:49 +03:00
Bakry 61d1ab8180 fix 2024-08-20 14:22:57 +03:00
bakry 9d3868a4fb
Merge pull request #809 from expsa/bakry_hr
fix
2024-08-20 14:10:39 +03:00
Bakry f4d3d71488 fix 2024-08-20 13:56:25 +03:00
bakry c3875014d2
Merge pull request #771 from expsa/bakry_hr
Bakry hr
2024-08-18 10:40:36 +03:00
Bakry 68141ac3ee fix 2024-08-18 10:36:39 +03:00
odex 6980ab4ac0 FIX CALC attendances HOLDAY 2024-08-12 16:08:48 +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 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 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
odex b33bf53760 [CALC] add calc attens 2024-08-07 17:33:14 +03:00
Bakry 34b3a3c04b add search attendance 2024-08-05 17:14:43 +03:00
Bakry 23ad2f87ce add search attendance 2024-08-05 15:55:13 +03:00
Bakry 15263bb617 fix 2024-08-05 10:32:45 +03:00
Bakry 2572bae877 fix 2024-08-04 13:50:07 +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 cfbb56497f fix 2024-07-29 15:05:46 +03:00
Bakry e0201d9e66 fix 2024-07-29 14:22:50 +03:00
Bakry 22391d8a53 fix 2024-07-29 11:07:31 +03:00
Bakry ea48f53a54 fix attendance 2024-07-18 11:54:07 +03:00
Bakry 49c5bda3de fix overtime transfer to accounting 2024-07-16 10:31:22 +03:00
Bakry 0968ecd71a fix 2024-07-15 13:49:37 +03:00
expert 0be409eab9 Add odex25_hr 2024-06-24 14:09:02 +03:00