Bakry
|
7c317c4943
|
fix new Attendance calculation
|
2025-07-07 14:21:03 +03:00 |
bakry
|
b97e23678f
|
Merge pull request #3788 from expsa/bakry_hr
Bakry hr
|
2025-07-07 14:20:08 +03:00 |
|
Bakry
|
fa6c578e07
|
fix new GOSI calculation
|
2025-07-07 14:12:41 +03:00 |
|
Bakry
|
7a645ce875
|
fix
|
2025-07-07 14:12:04 +03:00 |
|
bakry
|
b54f9b817b
|
Merge pull request #3779 from expsa/bakry_hr
fix termination
|
2025-07-07 11:27:15 +03:00 |
|
Bakry
|
9696efbc2e
|
fix termination
|
2025-07-07 11:26:21 +03:00 |
|
bakry
|
24f63e7768
|
Merge pull request #3778 from expsa/bakry_hr
fix termination
|
2025-07-07 11:11:42 +03:00 |
|
Bakry
|
5a43b1aa2a
|
fix termination
|
2025-07-07 11:10:32 +03:00 |
blackbelts
|
115b4518e5
|
fix hr base trans error
|
2025-07-02 13:05:49 +03:00 |
mohammed-alkhazrji
|
cae617b330
|
terminate emp there custody requests exceeded
|
2025-07-01 17:02:51 +03:00 |
|
mohammed-alkhazrji
|
6d1fe6622a
|
terminate emp there custody requests exceeded
|
2025-07-01 17:00:21 +03:00 |
eslamtalaat744
|
18f040b9fe
|
Merge pull request #3719 from expsa/hr_groups
hr payslip goups
|
2025-06-30 17:48:32 +03:00 |
|
blackbelts
|
8b7539ea23
|
hr payslip goups
|
2025-06-30 17:46:14 +03:00 |
|
mohammed-alkhazrji
|
5740c3321c
|
add punch mission in report attendances
|
2025-06-29 18:12:11 +03:00 |
|
mohammed-alkhazrji
|
4929f48e01
|
add punch mission in report attendances
|
2025-06-29 18:08:10 +03:00 |
|
Bakry
|
5aad3e7f48
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3
|
2025-06-29 15:02:41 +03:00 |
|
Bakry
|
8c1106aa54
|
fix
|
2025-06-29 15:01:07 +03:00 |
|
blackbelts
|
3ed037ae2a
|
payroll groups
|
2025-06-29 11:21:33 +03:00 |
|
blackbelts
|
9bf1194d7f
|
payroll groups
|
2025-06-29 11:10:59 +03:00 |
|
Bakry
|
4321905e84
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3
|
2025-06-26 14:53:19 +03:00 |
|
blackbelts
|
5bfccdd8e6
|
HR Advance Payroll ecurity
|
2025-06-26 14:53:16 +03:00 |
|
Bakry
|
2af9f7cbbb
|
fix
|
2025-06-26 14:52:09 +03:00 |
|
blackbelts
|
a2651808a3
|
HR Advance Payroll ecurity
|
2025-06-26 14:45:32 +03:00 |
|
blackbelts
|
94c9d977e2
|
HR Advance Payroll ecurity
|
2025-06-26 14:39:05 +03:00 |
|
blackbelts
|
f1360f9f9b
|
HR Advance Payroll ecurity
|
2025-06-26 13:20:37 +03:00 |
|
blackbelts
|
c25f708fe7
|
HR Advance Payroll ecurity
|
2025-06-26 12:34:59 +03:00 |
|
blackbelts
|
666d3ad567
|
HR Advance Payroll ecurity
|
2025-06-26 12:27:43 +03:00 |
|
blackbelts
|
8556a3daf9
|
make course name store
|
2025-06-26 11:05:52 +03:00 |
|
blackbelts
|
e1594197f6
|
make course name store
|
2025-06-26 10:55:08 +03:00 |
Samir Ladoui
|
e9ccfeab01
|
[FIX] exp_official_mission: translation
|
2025-06-25 14:39:06 +01:00 |
|
eslamtalaat744
|
ab251320e9
|
Merge pull request #3622 from expsa/attendence_total_hou
cla
|
2025-06-24 14:32:45 +03:00 |
|
blackbelts
|
b09b1d44e6
|
cla
|
2025-06-24 14:31:37 +03:00 |
|
eslamtalaat744
|
a6ae2a16be
|
Merge pull request #3620 from expsa/attendence_total_hou
cla
|
2025-06-24 13:23:21 +03:00 |
|
blackbelts
|
c3b4227993
|
cla
|
2025-06-24 13:22:30 +03:00 |
|
eslamtalaat744
|
7e3514eece
|
Merge pull request #3617 from expsa/attendence_total_hou
Attendence total hou
|
2025-06-24 13:03:17 +03:00 |
|
blackbelts
|
62750864b3
|
cla
|
2025-06-24 12:58:21 +03:00 |
|
eslamtalaat744
|
8074103079
|
Merge pull request #3616 from expsa/attendence_total_hou
cla
|
2025-06-24 12:43:36 +03:00 |
|
blackbelts
|
3e8aa1e4bc
|
cla
|
2025-06-24 12:42:44 +03:00 |
|
blackbelts
|
3cb98d5a5b
|
cla
|
2025-06-24 12:34:49 +03:00 |
|
eslamtalaat744
|
1d4d44d9af
|
Merge pull request #3615 from expsa/attendence_total_hou
Attendence total hou
|
2025-06-24 12:31:23 +03:00 |
|
blackbelts
|
7ef5f0037a
|
cla
|
2025-06-24 12:29:42 +03:00 |
|
blackbelts
|
dcd8b9e6a0
|
cla
|
2025-06-24 12:28:17 +03:00 |
|
eslamtalaat744
|
63fb19eeb0
|
Merge pull request #3611 from expsa/attendence_total_hou
cla
|
2025-06-24 10:54:57 +03:00 |
|
blackbelts
|
b3ba705d97
|
cla
|
2025-06-24 10:51:14 +03:00 |
|
eslamtalaat744
|
862401d8b7
|
Merge pull request #3608 from expsa/attendence_total_hou
Attendence total hou
|
2025-06-24 10:12:00 +03:00 |
|
blackbelts
|
5930697b8e
|
appraial fin
|
2025-06-24 10:10:30 +03:00 |
|
blackbelts
|
385996f5b4
|
appraial fin
|
2025-06-24 10:08:26 +03:00 |
|
bakry
|
28bf7ce076
|
Merge pull request #3591 from expsa/bakry_hr3
fix
|
2025-06-23 16:38:56 +03:00 |
|
Bakry
|
815ad37ddc
|
fix
|
2025-06-23 16:37:05 +03:00 |
|
bakry
|
db6e22c56a
|
Merge pull request #3590 from expsa/bakry_hr3
fix
|
2025-06-23 16:16:01 +03:00 |
|
Bakry
|
a242ef8bfe
|
fix
|
2025-06-23 16:15:16 +03:00 |
|
eslamtalaat744
|
67be6cafa1
|
Merge pull request #3589 from expsa/attendence_total_hour
appraial priority mclassif
|
2025-06-23 16:03:13 +03:00 |
|
blackbelts
|
d8e1e08589
|
appraial priority mclassif
|
2025-06-23 16:00:04 +03:00 |
|
Bakry
|
12d44bb101
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3
|
2025-06-23 15:55:24 +03:00 |
|
Bakry
|
857e64726d
|
fix
|
2025-06-23 15:53:45 +03:00 |
|
bakry
|
c68079ccd2
|
Merge branch 'dev_odex25_hr' into bakry_hr3
|
2025-06-23 15:37:57 +03:00 |
|
Bakry
|
eefcc724da
|
fix mission
|
2025-06-23 15:35:52 +03:00 |
|
Bakry
|
ff0b84a786
|
fix loan
|
2025-06-23 15:35:41 +03:00 |
|
blackbelts
|
8e206de046
|
appraial priority mclassif
|
2025-06-23 15:22:26 +03:00 |
|
blackbelts
|
eca246abf1
|
appraial priority mclassif
|
2025-06-23 15:05:08 +03:00 |
|
blackbelts
|
f31e442d1d
|
appraial priority
|
2025-06-23 14:37:34 +03:00 |
|
blackbelts
|
382c638619
|
appraial priority mclassif
|
2025-06-23 14:34:06 +03:00 |
|
blackbelts
|
c9d960c694
|
appraial priority
|
2025-06-23 14:21:00 +03:00 |
|
blackbelts
|
811b96e852
|
curr claim reserv
|
2025-06-23 14:07:16 +03:00 |
|
blackbelts
|
e81372ce76
|
curr claim reserv
|
2025-06-23 13:54:06 +03:00 |
|
blackbelts
|
e5318ba145
|
appraial priority
|
2025-06-23 13:49:09 +03:00 |
|
blackbelts
|
ec8c2392a6
|
appraial priority
|
2025-06-23 13:45:32 +03:00 |
|
blackbelts
|
e3a75065ce
|
appraial priority
|
2025-06-23 12:41:34 +03:00 |
|
blackbelts
|
b013c4823c
|
appraial
|
2025-06-23 10:20:13 +03:00 |
|
blackbelts
|
6310c7d719
|
appraial
|
2025-06-23 10:04:09 +03:00 |
|
blackbelts
|
2cd9f4bd3b
|
appraial
|
2025-06-23 09:41:56 +03:00 |
|
blackbelts
|
890110fda9
|
log
|
2025-06-22 18:39:09 +03:00 |
|
eslamtalaat744
|
6c0136bee4
|
Merge pull request #3559 from expsa/attendence_total_hour
fi public hoiday error
|
2025-06-22 13:57:39 +03:00 |
|
blackbelts
|
767d1bc8a5
|
fi public hoiday error
|
2025-06-22 13:52:36 +03:00 |
|
eslamtalaat744
|
67e257fade
|
Merge pull request #3557 from expsa/attendence_total_hour
fi total_permission_hours error
|
2025-06-22 13:09:36 +03:00 |
|
blackbelts
|
a1ebaa3745
|
fi total_permission_hours error
|
2025-06-22 13:03:36 +03:00 |
ahmed-nouri051
|
11daaaaf77
|
Merge pull request #3555 from expsa/training-hr
fix it issue
|
2025-06-22 11:59:55 +02:00 |
|
ahmed-nouri051
|
0efa432f11
|
fix it issue
|
2025-06-22 11:52:49 +02:00 |
|
ahmed-nouri051
|
2e63125834
|
Merge pull request #3554 from expsa/training-hr
fix context field
|
2025-06-22 10:58:01 +02:00 |
|
ahmed-nouri051
|
f59e6eb61c
|
fix context field
|
2025-06-22 10:55:53 +02:00 |
|
eslamtalaat744
|
2ce7acc73d
|
Merge pull request #3552 from expsa/hr_traning_table
classification
|
2025-06-22 09:48:50 +03:00 |
|
blackbelts
|
cb46220b64
|
classification
|
2025-06-22 09:43:18 +03:00 |
|
Bakry
|
6656e164bb
|
fix termination report
|
2025-06-19 17:37:39 +03:00 |
|
eslamtalaat744
|
4583eb45e5
|
Merge pull request #3548 from expsa/hr_traning_table
add hr.classification model
|
2025-06-19 17:31:18 +03:00 |
|
blackbelts
|
8756410394
|
add hr.classification model
|
2025-06-19 17:29:57 +03:00 |
|
ahmed-nouri051
|
5b271567e4
|
Merge pull request #3538 from expsa/training-hr
Training hr
|
2025-06-19 13:35:26 +02:00 |
|
ahmed-nouri051
|
ead8132b13
|
remove
|
2025-06-19 09:41:15 +02:00 |
|
ahmed-nouri051
|
4b57dd1151
|
reomve comennt
|
2025-06-19 09:40:09 +02:00 |
|
ahmed-nouri051
|
9c66aeb54e
|
modification related to training
|
2025-06-19 09:26:03 +02:00 |
|
eslamtalaat744
|
1210bacfda
|
Merge pull request #3535 from expsa/hr_traning_table
view_employee_form_leave_inherit_action
|
2025-06-19 10:21:23 +03:00 |
|
blackbelts
|
c63622a241
|
view_employee_form_leave_inherit_action
|
2025-06-19 10:20:45 +03:00 |
|
ahmed-nouri051
|
9d6fb64419
|
modification in hr
# Conflicts:
# odex25_hr/exp_official_mission/views/training.xml
|
2025-06-19 09:14:30 +02:00 |
|
ahmed-nouri051
|
7b1ea86913
|
add space
# Conflicts:
# odex25_hr/exp_official_mission/models/attendance.py
|
2025-06-19 09:13:46 +02:00 |
|
eslamtalaat744
|
1e2da27bef
|
Merge pull request #3534 from expsa/hr_traning_table
view_employee_form_leave_inherit_action
|
2025-06-19 10:09:55 +03:00 |
|
blackbelts
|
650124c868
|
view_employee_form_leave_inherit_action
|
2025-06-19 10:08:30 +03:00 |
|
eslamtalaat744
|
5dda7bbae5
|
Merge pull request #3529 from expsa/hr_traning_table
change leaves_balancee_action
|
2025-06-18 18:26:23 +03:00 |
|
blackbelts
|
6048d45792
|
change leaves_balancee_action
|
2025-06-18 18:25:38 +03:00 |
|
eslamtalaat744
|
5c8fd8afb2
|
Merge pull request #3528 from expsa/hr_traning_table
change leaves_balancee_action
|
2025-06-18 18:22:16 +03:00 |
|
blackbelts
|
1979098602
|
change leaves_balancee_action
|
2025-06-18 18:19:08 +03:00 |
|
eslamtalaat744
|
0a13503892
|
Merge pull request #3527 from expsa/hr_traning_table
change leaves_balancee_action
|
2025-06-18 18:08:03 +03:00 |
|
blackbelts
|
fbd9157114
|
change leaves_balancee_action
|
2025-06-18 18:06:05 +03:00 |
|
eslamtalaat744
|
493847f148
|
Merge pull request #3520 from expsa/hr_traning_table
date req
|
2025-06-18 16:51:12 +03:00 |
|
blackbelts
|
617b7a2f39
|
date req
|
2025-06-18 16:49:24 +03:00 |
|
eslamtalaat744
|
e091459845
|
Merge pull request #3515 from expsa/hr_traning_table
date req
|
2025-06-18 16:12:06 +03:00 |
|
blackbelts
|
f88c2e7603
|
date req
|
2025-06-18 16:09:50 +03:00 |
|
eslamtalaat744
|
db583eac1d
|
Merge pull request #3514 from expsa/hr_traning_table
date req
|
2025-06-18 15:35:23 +03:00 |
|
blackbelts
|
273d28d4be
|
date req
|
2025-06-18 15:33:13 +03:00 |
|
eslamtalaat744
|
98bce84d0a
|
Merge pull request #3509 from expsa/hr_traning_table
Hr traning table
|
2025-06-18 12:26:30 +03:00 |
|
blackbelts
|
8c562d431a
|
comiute total hours
|
2025-06-18 12:25:05 +03:00 |
|
blackbelts
|
86d5b2c176
|
comiute total hours
|
2025-06-18 12:24:32 +03:00 |
|
eslamtalaat744
|
e70423aaef
|
Merge pull request #3508 from expsa/hr_traning_table
training report
|
2025-06-18 11:15:20 +03:00 |
|
blackbelts
|
d6bb9b5d0e
|
training report
|
2025-06-18 11:14:11 +03:00 |
|
eslamtalaat744
|
0f3516b590
|
Merge pull request #3505 from expsa/hr_traning_table
Hr traning table
|
2025-06-18 09:25:35 +03:00 |
|
blackbelts
|
2518cce77d
|
modify on official_mission_id222
|
2025-06-18 09:24:47 +03:00 |
|
mohammed-alkhazrji
|
3ade80faad
|
fix calc nissing punch
|
2025-06-17 18:24:26 +03:00 |
|
blackbelts
|
41c9092188
|
modify on official_mission_id2
|
2025-06-17 18:01:15 +03:00 |
|
eslamtalaat744
|
42b952622d
|
Merge pull request #3498 from expsa/hr_traning_table
modify on official_mission_id2
|
2025-06-17 17:52:22 +03:00 |
|
blackbelts
|
570eea313f
|
modify on official_mission_id2
|
2025-06-17 17:51:10 +03:00 |
|
eslamtalaat744
|
1e2bb3c192
|
Merge pull request #3497 from expsa/hr_traning_table
modify on official_mission_id2
|
2025-06-17 17:49:53 +03:00 |
|
blackbelts
|
6db4991169
|
modify on official_mission_id2
|
2025-06-17 17:48:35 +03:00 |
|
eslamtalaat744
|
d0b2b3fef2
|
Merge pull request #3496 from expsa/hr_traning_table
modify on official_mission_id2
|
2025-06-17 17:46:34 +03:00 |
|
blackbelts
|
829039af9d
|
modify on official_mission_id2
|
2025-06-17 17:45:48 +03:00 |
|
eslamtalaat744
|
cb8ebd7eb6
|
Merge pull request #3495 from expsa/hr_traning_table
Hr traning table
|
2025-06-17 17:44:01 +03:00 |
|
blackbelts
|
e1fa2740fd
|
modify on official_mission_id2
|
2025-06-17 17:42:59 +03:00 |
|
blackbelts
|
3e9b619e86
|
modify on official_mission_id2
|
2025-06-17 17:34:46 +03:00 |
|
eslamtalaat744
|
6ecb1314c8
|
Merge pull request #3493 from expsa/hr_traning_table
modify on official_mission_id2
|
2025-06-17 17:29:17 +03:00 |
|
blackbelts
|
93fa7749a5
|
modify on official_mission_id2
|
2025-06-17 17:28:29 +03:00 |
|
eslamtalaat744
|
838f34ef7d
|
Merge pull request #3492 from expsa/hr_traning_table
modify on official_mission_id
|
2025-06-17 17:22:02 +03:00 |
|
blackbelts
|
b68ee7ea4e
|
modify on official_mission_id
|
2025-06-17 17:19:14 +03:00 |
kchyounes19
|
44bd92e200
|
Merge pull request #3483 from expsa/kch_dev_odex25_hr
fix bug
|
2025-06-17 11:46:18 +01:00 |
|
younes
|
b43f8d1b03
|
fix bug
|
2025-06-17 11:45:20 +01:00 |
|
eslamtalaat744
|
6f922fdf69
|
Merge pull request #3477 from expsa/hr_traning_table
on publicleaves_balance_action
|
2025-06-17 12:46:38 +03:00 |
|
blackbelts
|
3765ba5dd2
|
on publicleaves_balance_action
|
2025-06-17 12:45:12 +03:00 |
|
younes
|
e1bea016cd
|
fix bug
|
2025-06-17 10:30:07 +01:00 |
|
eslamtalaat744
|
9c1c408e6c
|
Merge pull request #3471 from expsa/hr_traning_table
delete can delete ,edite false from balance view
|
2025-06-17 10:14:15 +03:00 |
|
blackbelts
|
ee5b55a361
|
delete can delete ,edite false from balance view
|
2025-06-17 10:11:50 +03:00 |
|
bakry
|
58e886ca5c
|
Merge pull request #3468 from expsa/bakry_hr3
fix termination report
|
2025-06-16 21:58:53 +03:00 |
|
Bakry
|
5494b4cc8c
|
fix termination report
|
2025-06-16 21:57:38 +03:00 |
|
bakry
|
be4ce92d05
|
Merge pull request #3467 from expsa/bakry_hr3
fix termination report
|
2025-06-16 17:24:08 +03:00 |
|
Bakry
|
5636dd6b83
|
fix termination report
|
2025-06-16 17:23:22 +03:00 |
|
bakry
|
37e271ce58
|
Merge pull request #3466 from expsa/bakry_hr3
Bakry hr3
|
2025-06-16 17:19:31 +03:00 |
|
Bakry
|
a06ee93538
|
fix termination report
|
2025-06-16 17:18:47 +03:00 |
|
blackbelts
|
af4399b4ef
|
add ne tab on hr.official.mission ,tran, date duration on the end
|
2025-06-16 16:07:23 +03:00 |
|
blackbelts
|
7f0298f1ca
|
fix merge error
|
2025-06-16 15:18:53 +03:00 |
|
blackbelts
|
51844ef15e
|
fix merge error
|
2025-06-16 15:17:18 +03:00 |
|
eslamtalaat744
|
fe1558461c
|
Merge branch 'dev_odex25_hr' into hr_change_title
|
2025-06-16 14:59:57 +03:00 |
|
blackbelts
|
1e52369fbc
|
add ne tab on hr.official.mission ,tran
|
2025-06-16 14:47:46 +03:00 |
|
bakry
|
addf1e8790
|
Merge pull request #3459 from expsa/bakry_hr3
fix
|
2025-06-16 12:54:09 +03:00 |
|
eslamtalaat744
|
743dce6278
|
Merge pull request #3457 from expsa/hr_change_title
add field on public hr
|
2025-06-16 11:29:35 +03:00 |
|
blackbelts
|
6a19fb1a76
|
add field on public hr
|
2025-06-16 11:20:49 +03:00 |
|
younes
|
1eb7b63bf7
|
fix bug
|
2025-06-12 14:25:32 +01:00 |
|
younes
|
b5a1ad4c1f
|
fix bug
|
2025-06-12 14:08:59 +01:00 |
|
younes
|
b639a9fd66
|
fix bug
|
2025-06-12 14:02:43 +01:00 |
|
ahmed-nouri051
|
fffe872d83
|
apply changement on respartner
|
2025-06-12 09:21:22 +02:00 |
|
eslamtalaat744
|
d1a9460d5f
|
Merge pull request #3431 from expsa/hr_change_title
add dep field
|
2025-06-04 16:31:31 +03:00 |
|
blackbelts
|
751078d6d5
|
add dep field
|
2025-06-04 16:30:33 +03:00 |
|
eslamtalaat744
|
6adff93171
|
Merge pull request #3430 from expsa/hr_change_title
delete calende
|
2025-06-04 15:21:03 +03:00 |
|
blackbelts
|
22dd19657d
|
delete calende
|
2025-06-04 15:19:11 +03:00 |
|
eslamtalaat744
|
ffcccb72f3
|
Merge pull request #3429 from expsa/hr_change_title
delete calende
|
2025-06-04 14:45:14 +03:00 |
|
blackbelts
|
7fccd99d60
|
delete calende
|
2025-06-04 14:15:02 +03:00 |
|
Bakry
|
f4184fac2a
|
fix
|
2025-06-04 13:52:02 +03:00 |
|
kchyounes19
|
ae51ec9121
|
Merge pull request #3426 from expsa/younes_dev_odex25_hr
Implement working days-only calculation for training missions
|
2025-06-04 09:25:04 +01:00 |
|
younes
|
e1918e1864
|
Implement working days-only calculation for training missions
|
2025-06-04 09:23:05 +01:00 |
|
eslamtalaat744
|
af504d676b
|
Merge pull request #3418 from expsa/hr_change_title
modify on fields and report
|
2025-06-03 16:46:50 +03:00 |
|
blackbelts
|
8a76b628ce
|
modify on fields and report
|
2025-06-03 16:44:21 +03:00 |
|
ahmed-nouri051
|
095b2a8862
|
Merge pull request #3416 from expsa/ahmed_odex_hr
ahmed odex hr
|
2025-06-03 14:03:44 +02:00 |
|
ahmed-nouri051
|
dce828f1d7
|
ahmed odex hr
|
2025-06-03 13:59:46 +02:00 |
|
mohammed-alkhazrji
|
f45262c52f
|
fix templaate email
|
2025-06-03 14:46:25 +03:00 |
|
eslamtalaat744
|
d9d9c5fc19
|
Merge pull request #3409 from expsa/hr_change_title
modify on fields and report
|
2025-06-03 10:33:05 +03:00 |
|
blackbelts
|
c37f11712b
|
modify on fields and report
|
2025-06-03 10:30:53 +03:00 |
Mazen Abdo
|
9cdeee0e07
|
fix error
|
2025-06-02 16:12:03 +03:00 |
|
Mazen Abdo
|
9b337a0f08
|
fix error
|
2025-06-02 15:55:16 +03:00 |
|
eslamtalaat744
|
0d0bc254c4
|
Merge pull request #3385 from expsa/hr_change_title
modify on fields and report
|
2025-06-02 11:37:52 +03:00 |
|
blackbelts
|
7f895b40c8
|
modify on fields and report
|
2025-06-02 10:23:23 +03:00 |
|
mohammed-alkhazrji
|
c6fd39c746
|
calc the absent
|
2025-06-01 22:20:49 +03:00 |
|
bakry
|
ee00790b82
|
Merge pull request #3376 from expsa/bakry_hr3
Bakry hr3
|
2025-06-01 13:53:18 +03:00 |
|
Bakry
|
29e39627fe
|
fix
|
2025-06-01 13:41:58 +03:00 |
|
Bakry
|
b85ce8ae2f
|
fix
|
2025-06-01 13:41:48 +03:00 |
|
Bakry
|
e10813728c
|
fix
|
2025-06-01 13:29:11 +03:00 |
|
eslamtalaat744
|
5c5a75a680
|
Merge pull request #3367 from expsa/hr_rep_mod
emp reporttt
|
2025-06-01 11:00:43 +03:00 |
|
blackbelts
|
88eea96292
|
emp reporttt
|
2025-06-01 10:59:19 +03:00 |
|
eslamtalaat744
|
b71083ccb7
|
Merge pull request #3362 from expsa/hr_rep_mod
emp reporttt
|
2025-05-29 17:12:38 +03:00 |
|
blackbelts
|
dfa8d27804
|
emp reporttt
|
2025-05-29 17:11:52 +03:00 |
|
eslamtalaat744
|
ee5308bd1b
|
Merge pull request #3361 from expsa/hr_rep_mod
emp reporttt
|
2025-05-29 17:09:02 +03:00 |
|
blackbelts
|
a03415510f
|
emp reporttt
|
2025-05-29 17:07:12 +03:00 |
|
Bakry
|
9d28e30cae
|
fix transfer account
|
2025-05-29 14:21:58 +03:00 |
|
eslamtalaat744
|
a66687a8fe
|
Merge pull request #3358 from expsa/hr_rep_mod
emp reporttt
|
2025-05-29 12:49:40 +03:00 |
|
blackbelts
|
ea83e7b540
|
emp reporttt
|
2025-05-29 12:48:35 +03:00 |
|
eslamtalaat744
|
254e2a7f96
|
Merge pull request #3351 from expsa/hr_rep_mod
land ,port
|
2025-05-29 11:30:07 +03:00 |
|
blackbelts
|
e8c8e7d038
|
land ,port
|
2025-05-29 11:29:02 +03:00 |
|
eslamtalaat744
|
e81d1a04e4
|
Merge pull request #3349 from expsa/hr_rep_mod
land ,port
|
2025-05-29 10:27:57 +03:00 |
|
blackbelts
|
7441e0b372
|
land ,port
|
2025-05-29 10:27:00 +03:00 |
|
eslamtalaat744
|
e57104b8d7
|
Merge pull request #3345 from expsa/hr_rep_mod
land ,port
|
2025-05-29 10:03:34 +03:00 |
|
blackbelts
|
a429abd969
|
land ,port
|
2025-05-29 09:59:56 +03:00 |
|
eslamtalaat744
|
a9bdbe1620
|
Merge pull request #3343 from expsa/hr_rep_mod
land ,port
|
2025-05-29 09:40:29 +03:00 |
|
blackbelts
|
6fa8c12645
|
land ,port
|
2025-05-29 09:39:07 +03:00 |
|
bakry
|
72e593d5ef
|
Merge pull request #3340 from expsa/bakry_hr3
fix
|
2025-05-28 17:40:13 +03:00 |
|
Bakry
|
3eaa38569b
|
fix
|
2025-05-28 17:34:46 +03:00 |
|
mohammed-alkhazrji
|
af0e2e12f1
|
Merge pull request #3334 from expsa/missing_punch
fix punch calc
|
2025-05-28 15:09:51 +03:00 |
|
mohammed-alkhazrji
|
0a81fb1456
|
fix punch calc
|
2025-05-28 15:08:45 +03:00 |
|
blackbelts
|
55b4855d11
|
emp reporttt
|
2025-05-28 14:43:58 +03:00 |
|
blackbelts
|
10476be506
|
emp reporttt
|
2025-05-28 13:37:01 +03:00 |
|
blackbelts
|
b1c3dc566d
|
emp reportف
|
2025-05-28 13:33:39 +03:00 |
|
blackbelts
|
1550d6d488
|
emp reportف
|
2025-05-28 13:10:14 +03:00 |
|
blackbelts
|
be46e2af49
|
emp report
|
2025-05-28 12:14:59 +03:00 |
|
eslamtalaat744
|
0abbe8d406
|
Merge pull request #3319 from expsa/dev_odex25_hr
Dev odex25 hr
|
2025-05-28 10:53:46 +03:00 |
|
blackbelts
|
93c47a8481
|
emp rep
|
2025-05-27 18:10:20 +03:00 |
|
blackbelts
|
75835d7cf8
|
emp rep
|
2025-05-27 18:09:02 +03:00 |
|
kchyounes19
|
50ed46567e
|
Merge pull request #3315 from expsa/younes_dev_odex25_hr
Fix issue with leave balance calculation in end-of-service report
|
2025-05-27 15:38:43 +01:00 |
|
younes
|
2cb7bf479b
|
Fix issue with leave balance calculation in end-of-service report
|
2025-05-27 15:37:36 +01:00 |
|
ahmed-nouri051
|
bb246d4b1c
|
Merge pull request #3314 from expsa/ahmed_odex_hr
modifincation administrative circular
|
2025-05-27 16:18:37 +02:00 |
|
ahmed-nouri051
|
1a9df050ee
|
modifincation administrative circular
|
2025-05-27 15:51:50 +02:00 |
|
kchyounes19
|
f8c6bc42ba
|
Merge pull request #3313 from expsa/younes_dev_odex25_hr
Fix issue with leave balance calculation in end-of-service report
|
2025-05-27 12:45:50 +01:00 |
|
younes
|
4008c2d3a4
|
Fix issue with leave balance calculation in end-of-service report
|
2025-05-27 12:44:51 +01:00 |
|
kchyounes19
|
0c07b8357a
|
Merge pull request #3312 from expsa/younes_dev_odex25_hr
²Fix issue with leave balance calculation in end-of-service report
|
2025-05-27 12:40:24 +01:00 |
|
younes
|
a22f456d73
|
Fix issue with leave balance calculation in end-of-service report
|
2025-05-27 12:38:25 +01:00 |
|
mohammed-alkhazrji
|
c709f72411
|
add missing punch
|
2025-05-27 14:28:34 +03:00 |
|
mohammed-alkhazrji
|
b35003aff3
|
change sum edit
|
2025-05-22 00:16:30 +03:00 |
|
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 |
|
bakry
|
d845e03fa3
|
Merge pull request #3267 from expsa/bakry_hr3
fix
|
2025-05-21 10:26:20 +03:00 |
|
Bakry
|
1d617b9688
|
fix
|
2025-05-21 10:25:05 +03:00 |
Mostafa
|
9c48738390
|
fix report attendance
|
2025-05-20 19:07:28 -07:00 |
|
mohammed-alkhazrji
|
53f6838db0
|
Merge pull request #3260 from expsa/attendance_certification
Attendance certification
|
2025-05-20 17:21:22 +03: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 |
|
bakry
|
8755faded5
|
Merge pull request #3257 from expsa/bakry_hr3
fix
|
2025-05-20 16:47:15 +03:00 |
|
Bakry
|
599383019f
|
fix
|
2025-05-20 16:45:55 +03:00 |
|
bakry
|
58b9c4bc1e
|
Merge pull request #3252 from expsa/bakry_hr3
fix cron atten
|
2025-05-20 15:36:07 +03:00 |
|
Bakry
|
fd9797b5c7
|
fix cron atten
|
2025-05-20 15:20:10 +03:00 |
|
bakry
|
823b32850e
|
Merge pull request #3251 from expsa/bakry_hr3
fix cron atten
|
2025-05-20 14:51:37 +03:00 |
|
Bakry
|
b9fc3be225
|
fix cron atten
|
2025-05-20 14:50:42 +03:00 |
|
bakry
|
22fc3bc300
|
Merge pull request #3243 from expsa/bakry_hr3
fix term
|
2025-05-20 12:24:28 +03:00 |
|
Bakry
|
6bcde7aeea
|
fix term
|
2025-05-20 12:22:24 +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
|
f0332f2ab2
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3
|
2025-05-18 17:14:24 +03:00 |
|
Bakry
|
2604bd548d
|
fix term
|
2025-05-18 17:13:03 +03:00 |
|
bakry
|
353698f545
|
Merge branch 'dev_odex25_hr' into bakry_hr3
|
2025-05-18 16:51:25 +03:00 |
|
Bakry
|
88be5d0bbc
|
fix
|
2025-05-18 16:48:07 +03:00 |
|
Bakry
|
2734b1104f
|
fix overtime to transfer multi accounts base on emp type
|
2025-05-18 16:43:07 +03:00 |
|
Bakry
|
7eec8f9e7a
|
fix Mission to transfer multi accounts base on emp type
|
2025-05-13 10:10:33 +03:00 |
|
Samir Ladoui
|
d003b586a1
|
[FIX] exp_official_mission
|
2025-05-12 13:27:43 +01:00 |
|
Samir Ladoui
|
fcbb178b17
|
[UPD] exp_official_mission
|
2025-05-12 12:41:22 +01:00 |
|
ahmed-nouri051
|
f3ec541ebe
|
noupdate for hr
|
2025-05-11 10:05:10 +02:00 |
|
Samir Ladoui
|
ef69eddccb
|
[FIX] hr_base
|
2025-05-07 12:10:05 +01: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 |
|
bakry
|
4d8fb7da13
|
Merge pull request #2944 from expsa/bakry_hr3
fix remove field
|
2025-05-01 12:12:21 +03:00 |
|
Bakry
|
fb2d1b5fca
|
fix remove field
|
2025-05-01 12:11:03 +03: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 |
|
Samir Ladoui
|
fad9d12f44
|
[FIX] hr_holidays_public
|
2025-04-28 00:39:52 +01:00 |
|
younes
|
3db8da5b9a
|
update pyslip logic
|
2025-04-27 14:46:00 +01:00 |
|
younes
|
2ec0c082b5
|
update pyslip logic
|
2025-04-27 14:31:34 +01:00 |
Esraa-Exp
|
63dcfeae1f
|
Merge pull request #2901 from expsa/Esraa-Ensan-hr-tasks
comment
|
2025-04-27 09:02:34 +02:00 |
|
Esraa-Exp
|
6c6f0c1cad
|
comment
|
2025-04-27 08:59:26 +02:00 |
|
Esraa-Exp
|
6f9a0b6b7d
|
Merge pull request #2900 from expsa/Esraa-Ensan-hr-tasks
user login
|
2025-04-27 08:49:16 +02:00 |
|
Esraa-Exp
|
40fb7208e5
|
user login
|
2025-04-27 08:47:46 +02:00 |
|
Esraa-Exp
|
bae731da2d
|
Merge pull request #2899 from expsa/Esraa-Ensan-hr-tasks
comment
|
2025-04-25 17:24:31 +02:00 |
|
Esraa-Exp
|
05e8688a5c
|
comment
|
2025-04-25 17:23:40 +02:00 |
|
Esraa-Exp
|
8b82bd4804
|
Merge pull request #2898 from expsa/Esraa-Ensan-hr-tasks
comment
|
2025-04-25 17:16:47 +02:00 |
|
Esraa-Exp
|
fb0710d4f4
|
comment
|
2025-04-25 17:15:43 +02:00 |
|
Esraa-Exp
|
bb427de7d6
|
Merge pull request #2897 from expsa/Esraa-Ensan-hr-tasks
comment login
|
2025-04-25 17:05:23 +02:00 |
|
Esraa-Exp
|
38427bb65f
|
comment login
|
2025-04-25 17:04:30 +02:00 |
|
Esraa-Exp
|
bcbddb2393
|
Merge pull request #2896 from expsa/Esraa-Ensan-hr-tasks
login-label
|
2025-04-25 09:40:45 +02:00 |
|
Esraa-Exp
|
8e8a03e58e
|
login-label
|
2025-04-25 09:39:15 +02:00 |
|
Esraa-Exp
|
528b39ac56
|
Merge pull request #2895 from expsa/Esraa-Ensan-hr-tasks
comment login-label
|
2025-04-25 09:34:53 +02:00 |
|
Esraa-Exp
|
8f7e4e0c81
|
comment login-label
|
2025-04-25 09:32:40 +02:00 |
|
Esraa-Exp
|
99b54eb067
|
Merge pull request #2894 from expsa/Esraa-Ensan-hr-tasks
attendance report + login by identity edits
|
2025-04-24 22:51:18 +02:00 |
|
Esraa-Exp
|
9572ea4313
|
attendance report + login by identity edits
|
2025-04-24 22:48:20 +02:00 |
|
Esraa-Exp
|
3ac77ffab8
|
Merge pull request #2892 from expsa/Esraa-Ensan-hr-tasks
comment
|
2025-04-24 20:05:25 +02:00 |
|
Esraa-Exp
|
b40be89585
|
comment
|
2025-04-24 19:57:38 +02:00 |
|
Esraa-Exp
|
22ba05f058
|
Merge pull request #2891 from expsa/Esraa-Ensan-hr-tasks
hr transaltion
|
2025-04-24 19:45:24 +02:00 |
|
Esraa-Exp
|
845082a2ec
|
hr transaltion
|
2025-04-24 18:57:03 +02:00 |
|
Esraa-Exp
|
394a3a1ed3
|
Merge pull request #2890 from expsa/Esraa-Ensan-hr-tasks
hr edits
|
2025-04-24 18:10:38 +02:00 |
|
Esraa-Exp
|
fc9dcc4cdf
|
hr edits
|
2025-04-24 18:04:08 +02:00 |
|
Esraa-Exp
|
a87df024e5
|
Merge pull request #2888 from expsa/Esraa-Ensan-hr-tasks
payslips edits
|
2025-04-24 15:08:32 +02:00 |
|
Esraa-Exp
|
01b97f3d84
|
payslips edits
|
2025-04-24 15:07:34 +02:00 |
|
Esraa-Exp
|
b926cc8dd7
|
Merge pull request #2883 from expsa/Esraa-Ensan-hr-tasks
payslips edits
|
2025-04-24 14:15:40 +02:00 |
|
Esraa-Exp
|
b60e54304b
|
payslips edits
|
2025-04-24 14:14:57 +02:00 |
|
bakry
|
1e9c63a84c
|
Merge pull request #2882 from expsa/bakry_hr3
fix mission constrain
|
2025-04-24 13:39:38 +03:00 |
|
Bakry
|
72341be9a2
|
fix mission constrain
|
2025-04-24 13:38:13 +03:00 |
|
Esraa-Exp
|
d9dcff46bd
|
Merge pull request #2870 from expsa/Esraa-Ensan-hr-tasks
fix
|
2025-04-23 17:25:35 +02:00 |
|
Esraa-Exp
|
e87715e5b5
|
fix
|
2025-04-23 17:24:20 +02:00 |
|
Esraa-Exp
|
65092d8c6d
|
Merge pull request #2869 from expsa/Esraa-Ensan-hr-tasks
login by identity + attendance zone + date required
|
2025-04-23 17:05:41 +02:00 |
|
Esraa-Exp
|
e8c12d7635
|
login by identity + attendance zone + date required
|
2025-04-23 17:04:43 +02:00 |
|
Esraa-Exp
|
ff75113586
|
Merge pull request #2861 from expsa/Esraa-Ensan-hr-tasks
department in attendance report + create_uid in holiday
|
2025-04-23 15:30:34 +02:00 |
|
Esraa-Exp
|
923c4293a2
|
department in attendance report + create_uid in holiday
|
2025-04-23 15:29:04 +02:00 |
|
Esraa-Exp
|
8bcb9e143a
|
Merge pull request #2860 from expsa/Esraa-Ensan-hr-tasks
department in attendance report + create_uid in holiday
|
2025-04-23 15:10:45 +02:00 |
|
Esraa-Exp
|
9ad2d896b5
|
department in attendance report + create_uid in holiday
|
2025-04-23 15:04:50 +02:00 |
|
Esraa-Exp
|
00f4e06043
|
Merge pull request #2858 from expsa/Esraa-Ensan-hr-tasks
div by zero
|
2025-04-23 13:12:36 +02:00 |
|
Esraa-Exp
|
074395ea8f
|
div by zero
|
2025-04-23 13:11:06 +02:00 |
|
Esraa-Exp
|
1e074a2e41
|
Merge pull request #2854 from expsa/Esraa-Ensan-hr-tasks
nomination edits
|
2025-04-23 12:18:12 +02:00 |
|
Esraa-Exp
|
ae80f791a6
|
nomination edits
|
2025-04-23 12:13:34 +02:00 |
|
bakry
|
8a3695e2a2
|
Merge pull request #2834 from expsa/bakry_hr3
Bakry hr3
|
2025-04-22 13:51:51 +03:00 |
|
Bakry
|
148ac10844
|
fix overtime and mission constrain
|
2025-04-22 13:50:15 +03:00 |