Commit Graph

1242 Commits

Author SHA1 Message Date
Mazen Abdo 1729e51206 fix 2025-08-24 14:28:18 +03:00
Mazen Abdo b54cd33a13 fix 2025-08-24 14:02:33 +03:00
Mazen Abdo 2da6b1ff8e fix 2025-08-24 13:57:25 +03:00
Mazen Abdo 77bf081f17 fix 2025-08-24 13:37:30 +03:00
Mazen Abdo 7d92fe3ea8 fix 2025-08-24 13:35:21 +03:00
Mazen Abdo 350474daaf fix 2025-08-24 13:32:22 +03:00
Mazen Abdo ffffa29edd fix 2025-08-24 13:28:36 +03:00
Mazen Abdo 91a9faf2fd fix 2025-08-24 12:49:01 +03:00
Mazen Abdo d2e2c74e68 fix 2025-08-24 12:42:55 +03:00
Mazen Abdo a95ec2205d fix 2025-08-24 12:38:11 +03:00
Mazen Abdo 1acae09813 fix 2025-08-24 12:22:22 +03:00
Mazen Abdo 531ef4e180 fix 2025-08-24 12:16:39 +03:00
Mazen Abdo 75a2837a12 fix 2025-08-24 11:57:04 +03:00
Mazen Abdo c30ff7831e fix 2025-08-24 11:53:29 +03:00
Mazen Abdo 1a60dc2fbd fix 2025-08-24 11:47:25 +03:00
Mazen Abdo 33f2d68c1e fix 2025-08-24 11:40:28 +03:00
Mazen Abdo d4d1f268dc fix 2025-08-24 11:37:22 +03:00
Mazen Abdo 6d4ef56de5 fix 2025-08-24 11:21:12 +03:00
younes 6e4d557ed7 Fix bug 2025-08-21 08:19:33 +01:00
younes 63443a14d2 Fix bug 2025-08-21 08:08:50 +01:00
younes db6915cb7d Fix bug 2025-08-20 16:02:31 +01:00
younes b502bd8bc0 Fix bug 2025-08-20 14:38:10 +01:00
younes cda392d5a0 Fix bug 2025-08-20 13:58:39 +01:00
younes 2824e94097 IMP reasons lateness 2025-08-20 10:49:41 +01:00
younes 9783abc8c5 IMP reasons lateness 2025-08-19 16:00:22 +01:00
ahmed-nouri051 9cd950bf88
Merge pull request #4250 from expsa/ahmed-odex-hr
fixing
2025-08-18 17:33:58 +02:00
ahmed-nouri051 69ca55a03a fixing 2025-08-18 17:30:07 +02:00
kchyounes19 d1fd10c776
Merge pull request #4169 from expsa/younes_dev_odex25_hr
Fix bug
2025-08-10 15:29:20 +01:00
younes 2791d87e86 Fix bug 2025-08-10 15:21:06 +01:00
kchyounes19 4e36f45cf0
Merge pull request #4162 from expsa/younes_dev_odex25_hr
Younes dev odex25 hr
2025-08-07 13:07:40 +01:00
younes 05694dc473 Payroll Notes 2025-08-07 13:06:40 +01:00
younes e2cef96cf6 Payroll Notes 2025-08-07 13:04:47 +01:00
kchyounes19 4b938c5372
Merge pull request #4161 from expsa/younes_dev_odex25_hr
Fix bug
2025-08-07 12:30:26 +01:00
younes c70e2e05e2 Fix bug 2025-08-07 12:29:23 +01:00
Mazen Abdo 139630ab7c fix Cannot Create Employee from users 2025-08-07 10:01:16 +03:00
younes a3f4926a44 Fix bug 2025-08-06 15:23:07 +01:00
Bakry e164f8be85 fix 2025-08-06 15:34:43 +03:00
younes fcc619568a FIX bug 2025-08-06 11:18:06 +01:00
Samir Ladoui 5993413a0f [FIX] attendances 2025-08-04 14:32:19 +01:00
Samir Ladoui c486f1ab19 [FIX] attendances: translation 2025-08-04 10:47:18 +01:00
Samir Ladoui 3b05568d3c [UPD] attendances 2025-08-04 10:45:40 +01:00
Samir Ladoui 8897a601e8 [FIX] exp_official_mission 2025-08-04 09:06:57 +01:00
Samir Ladoui 7fae61bbad [FIX] hr_holidays_public 2025-08-04 08:12:43 +01:00
bakry 49f9850112
Merge pull request #4077 from expsa/bakry_hr
add employee type
2025-07-31 16:49:17 +03:00
Bakry 83c263e8b8 add employee type 2025-07-31 16:38:12 +03:00
bakry 698dfd18d5
Merge pull request #4076 from expsa/bakry_hr
Bakry hr
2025-07-31 15:38:46 +03:00
Bakry a5dfc769bd add employee type 2025-07-31 15:35:04 +03:00
younes ee4e08f258 Updated menu structure 2025-07-31 10:05:36 +01:00
Samir Ladoui 6dac0b064c [UPD] hr_holidays_public 2025-07-30 11:00:36 +01:00
bakry e045c0ed1c
Merge pull request #4044 from expsa/bakry_hr
fix like Effective Form with contrat
2025-07-29 14:06:42 +03:00
Bakry cc233000ae Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr 2025-07-29 14:01:24 +03:00
Bakry 62a28bd9cc fix like Effective Form with contrat 2025-07-29 13:17:11 +03:00
Samir Ladoui a3378e19a9 [UPD] hr_base 2025-07-27 09:23:24 +01:00
Samir Ladoui e8c02293a5 [FIX] hr_holidays_public 2025-07-24 09:58:37 +01:00
Samir Ladoui ad82eaa838 [UPD] hr_holidays_public 2025-07-24 01:15:51 +01:00
Samir Ladoui 84cff45c65 [FIX] hr_holidays_community 2025-07-24 01:15:32 +01:00
Samir Ladoui 4aa5391a6b [FIX] hr_base 2025-07-24 01:14:54 +01:00
Samir Ladoui b87d3cb933 [FIX] hr_base_reports 2025-07-23 15:59:49 +01:00
Samir Ladoui a86570a175 [UPD] hr_holidays_public 2025-07-23 15:53:46 +01:00
Samir Ladoui f8bfc11d42 [UPD] hr_holidays_community 2025-07-23 15:53:05 +01:00
Samir Ladoui 0492a80270 [UPD] hr_base 2025-07-23 15:52:33 +01:00
Samir Ladoui 9f203995db [FIX] hr_base_reports 2025-07-23 15:08:12 +01:00
Samir Ladoui 32633353d8 [FIX] hr_base_reports 2025-07-23 14:32:47 +01:00
Samir Ladoui 49d8dc64cf [UPD] hr_base_reports 2025-07-23 13:45:57 +01:00
Samir Ladoui 6e11bd77ec [FIX] employee_requests 2025-07-23 08:57:24 +01:00
Samir Ladoui 01725b321b [FIX] hr_loans_salary_advance 2025-07-22 11:11:46 +01:00
Samir Ladoui c7abaa35d3 [FIX] employee_requests 2025-07-22 11:11:29 +01:00
eslamtalaat744 c3a083a2c7
Merge pull request #3961 from expsa/loan_security
loan type menu groups
2025-07-20 11:03:13 +03:00
blackbelts ceefd63371 loan type menu groups 2025-07-20 09:59:26 +03:00
Mazen Abdo 3697455a09 fix report report_employee_identify 2025-07-17 16:06:54 +03:00
Mazen Abdo 923d71a25b fix report report_employee_identify 2025-07-17 12:23:55 +03:00
Mazen Abdo 00394b3768 fix report report_employee_identify 2025-07-17 10:33:50 +03:00
Mazen Abdo dab911c02d fix report report_employee_identify 2025-07-17 10:32:41 +03:00
bakry cb81125e5f
Merge pull request #3934 from expsa/bakry_hr
fix Gosi calculation
2025-07-16 12:20:08 +03:00
Bakry 5b17bc2a29 fix Gosi calculation 2025-07-16 12:18:40 +03:00
kchyounes19 f730368062
Merge pull request #3917 from expsa/ky_dev_odex25_hr
restrict check-in outside allowed working hours
2025-07-15 11:45:18 +01:00
younes 1691056468 restrict check-in outside allowed working hours 2025-07-15 11:44:21 +01:00
Bakry ee01c1f141 Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr 2025-07-15 11:15:02 +03:00
Bakry e34e8b06a1 fix report Termination 2025-07-15 11:00:12 +03:00
mohammed-alkhazrji 4c97837d5b fix install 2025-07-14 16:15:42 +03:00
kchyounes19 8c844bb44c
Merge pull request #3892 from expsa/ky_dev_odex25_hr
restrict check-in outside allowed working hours
2025-07-14 07:52:19 +01:00
younes 291815c1b1 restrict check-in outside allowed working hours 2025-07-14 07:50:36 +01:00
kchyounes19 7d10b06476
Merge pull request #3888 from expsa/ky_dev_odex25_hr
restrict check-in outside allowed working hours
2025-07-13 15:08:58 +01:00
younes a1a3f24382 restrict check-in outside allowed working hours 2025-07-13 15:06:38 +01:00
kchyounes19 f152841d07
Merge pull request #3881 from expsa/ky_dev_odex25_hr
Ky dev odex25 hr
2025-07-13 14:32:37 +01:00
younes 20eb2d292d restrict check-in outside allowed working hours 2025-07-13 14:30:46 +01:00
younes c5063c3b98 restrict check-in outside allowed working hours 2025-07-13 14:29:35 +01:00
ahmed-nouri051 259e36e139
Merge pull request #3834 from expsa/ahmed-odex-hr
fix it date field
2025-07-09 15:26:28 +02:00
ahmed-nouri051 5c45e6efcd fix it date field 2025-07-09 15:21:21 +02:00
Bakry 7b2d5c18e0 Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr 2025-07-09 13:10:27 +03:00
Bakry 9385e6af32 fix device_id bug 2025-07-09 13:03:41 +03:00
eslamtalaat744 4299ed1d43
Merge pull request #3830 from expsa/modify_loan_groups
change groups sequrity on loan
2025-07-09 12:20:27 +03:00
blackbelts 1448ecbba4 change groups sequrity on loan 2025-07-09 10:50:45 +03:00
mohammed-alkhazrji 9c81cefb26 calc right missing 2025-07-08 20:35:23 +03:00
mohammed-alkhazrji 39fe6f67f6 calc right missing 2025-07-08 20:31:24 +03:00
blackbelts 41f7be68bd modify on contract view 2025-07-08 10:41:03 +03:00
blackbelts 5c27143711 fix get_speacial_day_timing error 2025-07-08 10:24:21 +03:00
bakry ef34a3713d
Merge pull request #3789 from expsa/bakry_hr
Bakry hr
2025-07-07 14:28:09 +03:00
Bakry f31bdc45ab Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr 2025-07-07 14:27:15 +03:00
Bakry dbbc957166 fix new Attendance calculation 2025-07-07 14:24:47 +03:00
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