Commit Graph

1122 Commits

Author SHA1 Message Date
Esraa-Exp 19ab4027fb
Merge pull request #2493 from expsa/Esraa-Ensan-hr-tasks
traning course status change
2025-02-25 15:41:43 +02:00
Esraa-Exp 10d1cb34f6 traning course status change 2025-02-25 15:40:03 +02:00
Esraa-Exp b1830ce5a3
Merge pull request #2490 from expsa/Esraa-Ensan-hr-tasks
write access in appraisal result
2025-02-25 14:59:51 +02:00
Esraa-Exp 0fa0b98397 write access in appraisal result 2025-02-25 14:58:34 +02:00
Bakry 7220f80b66 fix 2025-02-25 15:23:28 +03:00
Esraa-Exp 27ff7eeb27
Merge pull request #2489 from expsa/Esraa-Ensan-hr-tasks
write access to internal user
2025-02-25 14:20:56 +02:00
Esraa-Exp 2a586be7d5 write access to internal user 2025-02-25 14:19:48 +02:00
Manar416 30cf10989b
Merge pull request #2487 from expsa/manar_dev_hr_25_4
UPDATE hr_loans_salary_advance
2025-02-25 14:07:04 +02:00
manar a3d5b03894 UPDATE hr_loans_salary_advance 2025-02-25 14:03:18 +02:00
Esraa-Exp 34352081dc
Merge pull request #2478 from expsa/Esraa-Ensan-hr-tasks
Esraa ensan hr tasks
2025-02-25 05:53:17 +02:00
Esraa-Exp e7c918defc training notes 2025-02-25 05:52:23 +02:00
Esraa-Exp 0bd64b9be5 training notes 2025-02-25 05:47:38 +02:00
Esraa-Exp f714060065
Merge pull request #2472 from expsa/Esraa-Ensan-hr-tasks
appraisal button+remove raise
2025-02-24 16:24:09 +02:00
Esraa-Exp e0289b3642 appraisal button+remove raise 2025-02-24 16:22:33 +02:00
bakry fd3e692a98
Merge pull request #2471 from expsa/bakry_hr3
fix
2025-02-24 14:38:46 +03:00
Bakry 43910a568b fix 2025-02-24 14:38:01 +03:00
Esraa-Exp 6566303039
Merge pull request #2470 from expsa/Esraa-Ensan-hr-tasks
training course appraisal
2025-02-24 11:26:08 +02:00
Esraa-Exp 35d56421c5 training course appraisal 2025-02-24 11:24:51 +02:00
bakry 8b01eb3e2d
Merge pull request #2469 from expsa/bakry_hr3
fix loan
2025-02-24 11:47:39 +03:00
Bakry dee232c8e2 fix loan 2025-02-24 11:45:21 +03:00
bakry 468ea6782b
Merge pull request #2460 from expsa/bakry_hr3
Bakry hr3
2025-02-19 13:52:04 +03:00
Bakry c8dc40d9ad Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3 2025-02-19 13:42:57 +03:00
Bakry 0be73c151b fix 2025-02-19 13:41:27 +03:00
Esraa-Exp f29cccc626
Merge pull request #2450 from expsa/Esraa-Ensan-hr-tasks
training cost should be bigger than zero
2025-02-18 10:37:43 +02:00
Esraa-Exp 83e36b36d7 training cost should be bigger than zero 2025-02-18 10:36:40 +02:00
SamirLADOUI-sa c3185aec41
Merge pull request #2448 from expsa/samir-aladawi-fix-translations
[FIX] exp_payroll_custom: translations
2025-02-18 08:46:51 +01:00
Samir Ladoui af3aa8c6ab [FIX] exp_payroll_custom: translations 2025-02-18 08:46:17 +01:00
Bakry 357d0e0bb6 fix employee record add info holiday 2025-02-17 16:54:23 +03:00
Esraa-Exp 584ce64e12
Merge pull request #2442 from expsa/Esraa-Ensan-hr-tasks
modify rule
2025-02-17 15:53:01 +02:00
Esraa-Exp 2d714c0d0e modify rule 2025-02-17 15:51:44 +02:00
Manar416 8eb343cd37
Merge pull request #2441 from expsa/manar_dev_hr_17_2
UPDATE exp_payroll_custom
2025-02-17 13:35:35 +02:00
manar 3a8b70df99 UPDATE exp_payroll_custom 2025-02-17 13:34:54 +02:00
Esraa-Exp b85939788d
Merge pull request #2431 from expsa/Esraa-Ensan-hr-tasks
trainer required false
2025-02-17 11:00:12 +02:00
Esraa-Exp ca333f5a93 trainer required false 2025-02-17 10:59:13 +02:00
Esraa-Exp 14dbecfba1
Merge pull request #2424 from expsa/Esraa-Ensan-hr-tasks
convert job to many2many at training
2025-02-16 15:56:24 +02:00
Esraa-Exp a8e18f4d77 convert job to many2many at training 2025-02-16 15:55:19 +02:00
Manar416 e3c821f9f9
Merge pull request #2421 from expsa/manar_dev_hr_16_2
UPDATE exp_payroll_custom
2025-02-16 14:15:08 +02:00
manar cbc3f572a7 UPDATE exp_payroll_custom 2025-02-16 14:14:31 +02:00
Manar416 8ef4337b24
Merge pull request #2417 from expsa/manar_dev_hr_16_2
UPDATE exp_payroll_custom
2025-02-16 13:50:38 +02:00
manar 7e178d5139 UPDATE exp_payroll_custom 2025-02-16 13:50:07 +02:00
Manar416 e83f4a0973
Merge pull request #2409 from expsa/manar_dev_hr_16_2
UPDATE exp_payroll_custom & exp_hr_payroll
2025-02-16 11:56:51 +02:00
manar 1c05748ca6 UPDATE exp_payroll_custom & exp_hr_payroll 2025-02-16 11:54:23 +02:00
Manar416 35e6958a58
Merge pull request #2404 from expsa/manar_dev_hr_16_2
UPDATE exp_payroll_custom
2025-02-16 11:08:42 +02:00
manar b6e1777411 UPDATE exp_payroll_custom 2025-02-16 11:07:46 +02:00
Esraa-Exp a5d4453ca8
Merge pull request #2401 from expsa/Esraa-Ensan-hr-tasks
training new notes
2025-02-13 16:18:20 +02:00
Esraa-Exp a87025e44e training new notes 2025-02-13 16:14:38 +02:00
Esraa-Exp 70b50e1e60
Merge pull request #2400 from expsa/Esraa-Ensan-hr-tasks
create user password
2025-02-13 15:43:55 +02:00
Esraa-Exp 7e73dea7ef create user password 2025-02-13 15:42:35 +02:00
Manar416 1796895f93
Merge pull request #2398 from expsa/manar_dev_hr_12_2
UPDATE exp_payroll_custom
2025-02-13 15:20:09 +02:00
manar 15f156fecf UPDATE exp_payroll_custom 2025-02-13 15:19:14 +02:00