Samir Ladoui
|
9a2c53a8af
|
[FIX] hr_base_reports: attendances report take long time for excel
|
2025-03-12 13:34:50 +01:00 |
mazenmuhamad
|
2f77ac7cf3
|
Merge pull request #2625 from expsa/zen_hr_termination
code
|
2025-03-12 13:45:10 +02:00 |
|
mazenmuhamad
|
15f78dfcfd
|
code
|
2025-03-12 13:44:28 +02:00 |
|
mazenmuhamad
|
22f1acd332
|
Merge pull request #2624 from expsa/zen_hr_termination
zen updata code
|
2025-03-12 13:41:58 +02:00 |
|
mazenmuhamad
|
e6b68e217a
|
zen updata code
|
2025-03-12 13:41:25 +02:00 |
Esraa-Exp
|
c503e54ab4
|
Merge pull request #2621 from expsa/Esraa-Ensan-hr-tasks
Employees widget
|
2025-03-11 15:29:03 +02:00 |
|
Esraa-Exp
|
ef6d79c0a6
|
Employees widget
|
2025-03-11 15:27:53 +02:00 |
SamirLADOUI-sa
|
67af6bcaae
|
Merge pull request #2584 from expsa/samir-aladawi-fix-dvice-biometric
[FIX] attendances: check module existence before using field device_id
|
2025-03-05 12:44:32 +01:00 |
|
Samir Ladoui
|
e49bdc715b
|
[FIX] attendances: check module existence before using field device_id
|
2025-03-05 12:44:03 +01:00 |
|
SamirLADOUI-sa
|
41cf9c7a29
|
Merge pull request #2571 from expsa/samir-aladawi-fix-fleet-permissions
[FIX] employee_requests: vehicle.delegation permission
|
2025-03-04 13:59:23 +01:00 |
|
Samir Ladoui
|
65170c7e93
|
[FIX] employee_requests: vehicle.delegation permission
|
2025-03-04 13:58:58 +01:00 |
bakry
|
7974b95aaf
|
Merge pull request #2566 from expsa/bakry_hr3
fix termination cal
|
2025-03-04 15:17:46 +03:00 |
Bakry
|
b359886ace
|
fix termination cal
|
2025-03-04 15:16:25 +03:00 |
|
Esraa-Exp
|
a04ece14cb
|
Merge pull request #2565 from expsa/Esraa-Ensan-hr-tasks
termination transfer by emp type
|
2025-03-04 11:27:59 +02:00 |
|
Esraa-Exp
|
87192ac07c
|
termination transfer by emp type
|
2025-03-04 11:27:15 +02:00 |
|
Esraa-Exp
|
4b68329556
|
Merge pull request #2562 from expsa/Esraa-Ensan-hr-tasks
new notes
|
2025-03-04 08:56:23 +02:00 |
|
Esraa-Exp
|
55578d72f3
|
new notes
|
2025-03-04 08:54:42 +02:00 |
|
Esraa-Exp
|
c3dad968ef
|
Merge pull request #2561 from expsa/Esraa-Ensan-hr-tasks
termination transfer by emp type
|
2025-03-04 08:13:55 +02:00 |
|
Esraa-Exp
|
9ad8519c69
|
termination transfer by emp type
|
2025-03-04 08:11:09 +02:00 |
|
Esraa-Exp
|
ce5bed469d
|
Merge pull request #2556 from expsa/Esraa-Ensan-hr-tasks
Employees Appraisal
|
2025-03-03 16:15:00 +02:00 |
|
Esraa-Exp
|
ec6e4b3106
|
Employees Appraisal
|
2025-03-03 16:13:28 +02:00 |
|
bakry
|
bb529c4efb
|
Merge pull request #2555 from expsa/bakry_hr3
fix termination cal
|
2025-03-03 16:36:39 +03:00 |
|
Bakry
|
6ed9938f0f
|
fix termination cal
|
2025-03-03 16:34:26 +03:00 |
|
Esraa-Exp
|
6e17d38509
|
Merge pull request #2542 from expsa/Esraa-Ensan-hr-tasks
training payment fix
|
2025-03-02 15:45:39 +02:00 |
|
Esraa-Exp
|
661cabdfe0
|
training payment fix
|
2025-03-02 15:44:18 +02:00 |
|
SamirLADOUI-sa
|
560961f549
|
Merge pull request #2538 from expsa/samir-aladawi-fix-exp-hr-appraisal
[FIX] exp_hr_appraisal: mak same changes on accrued_degree_id
|
2025-03-02 13:48:20 +01:00 |
|
Samir Ladoui
|
e07a06059d
|
[FIX] exp_hr_appraisal: mak same changes on accrued_degree_id
|
2025-03-02 13:47:50 +01:00 |
|
SamirLADOUI-sa
|
ab18a201bf
|
Merge pull request #2529 from expsa/samir-aladawi-improve-hr-appraisal
[FIX] exp_hr_appraisal: can change accrued greed in state employe con…
|
2025-03-02 11:48:34 +01:00 |
|
Samir Ladoui
|
6ed89943b5
|
[FIX] exp_hr_appraisal: can change accrued greed in state employe confirmation state only
|
2025-03-02 11:48:01 +01:00 |
|
Esraa-Exp
|
ef558e5300
|
Merge pull request #2526 from expsa/Esraa-Ensan-hr-tasks
manager appraisal
|
2025-03-02 07:51:47 +02:00 |
|
Esraa-Exp
|
d92dd07510
|
manager appraisal
|
2025-03-02 07:31:59 +02:00 |
|
Esraa-Exp
|
0046be5b54
|
Merge pull request #2525 from expsa/Esraa-Ensan-hr-tasks
appraisal result
|
2025-02-27 12:49:29 +02:00 |
|
Esraa-Exp
|
cdba343a2c
|
appraisal result
|
2025-02-27 12:47:51 +02:00 |
|
bakry
|
327e1ce62a
|
Merge pull request #2524 from expsa/bakry_hr3
Bakry hr3
|
2025-02-27 13:47:42 +03:00 |
|
Bakry
|
56e4f3f6c7
|
fix reward transfer
|
2025-02-27 13:46:49 +03:00 |
|
SamirLADOUI-sa
|
7b4bdfa700
|
Merge pull request #2520 from expsa/samir-aladawi-improve-hr-appraisal
[FIX] exp_hr_appraisal: remove groups from emplyee_protest in python
|
2025-02-27 08:00:09 +01:00 |
|
Samir Ladoui
|
a0db72ff31
|
[FIX] exp_hr_appraisal: remove groups from emplyee_protest in python
|
2025-02-27 07:59:00 +01:00 |
|
Esraa-Exp
|
000a795b56
|
Merge pull request #2517 from expsa/Esraa-Ensan-hr-tasks
general report rounding
|
2025-02-26 20:22:38 +02:00 |
|
Esraa-Exp
|
63c5f125b4
|
general report rounding
|
2025-02-26 20:21:25 +02:00 |
|
Bakry
|
27e74c9a82
|
fix order tree list
|
2025-02-26 17:52:53 +03:00 |
|
Esraa-Exp
|
844c8fc758
|
Merge pull request #2514 from expsa/Esraa-Ensan-hr-tasks
notes in general report
|
2025-02-26 16:05:52 +02:00 |
|
Esraa-Exp
|
c36e0f09fd
|
notes in general report
|
2025-02-26 16:04:06 +02:00 |
|
Bakry
|
7ebe35b7e2
|
fix
|
2025-02-26 16:16:57 +03:00 |
|
SamirLADOUI-sa
|
904cb94a0a
|
Merge pull request #2510 from expsa/samir-aladawi-improve-hr-appraisal
[FIX] exp_hr_appraisal: make sure employee_protest is available in view
|
2025-02-26 11:26:48 +01:00 |
|
Samir Ladoui
|
4544bbca4a
|
[FIX] exp_hr_appraisal: make sure employee_protest is available in view
|
2025-02-26 11:26:18 +01:00 |
|
bakry
|
8aa342f5bd
|
Merge pull request #2509 from expsa/bakry_hr3
fix sudo contract
|
2025-02-26 12:07:22 +03:00 |
|
Bakry
|
76b331e923
|
fix sudo contract
|
2025-02-26 12:06:34 +03:00 |
Manar416
|
359e8383a5
|
Merge pull request #2506 from expsa/manar_dev_hr_25_2
UPDATE hr_base_reports
|
2025-02-25 19:06:18 +02:00 |
manar
|
b5b6e41ea9
|
UPDATE hr_base_reports
|
2025-02-25 19:05:31 +02:00 |
|
Manar416
|
422e57523c
|
Merge pull request #2505 from expsa/manar_dev_hr_25_2
UPDATE hr_base_reports
|
2025-02-25 19:03:36 +02:00 |