Commit Graph

1796 Commits

Author SHA1 Message Date
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
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
شركة خبير المحدودة 7049bccd1d Update github action file 2025-06-19 10:30:36 +03: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 35fae92dc6
Merge pull request #3501 from expsa/calc_missing_punch
fix calc nissing punch
2025-06-17 18:33:13 +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