Commit Graph

843 Commits

Author SHA1 Message Date
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
Manar416 a8418cc14a
Merge pull request #2393 from expsa/manar_dev_hr_12_2
UPDATE exp_payroll_custom
2025-02-13 13:19:34 +02:00
manar 3a65f4443e UPDATE exp_payroll_custom 2025-02-13 13:18:22 +02:00
Manar416 16d57c4ee4
Merge pull request #2385 from expsa/manar_dev_hr_12_2
ADD salary_rule_multiple_accounts
2025-02-13 11:28:30 +02:00
manar 870d988ab1 ADD salary_rule_multiple_accounts 2025-02-13 11:27:49 +02:00
bakry e7d7ae0c90
Merge pull request #2379 from expsa/bakry_hr3
Bakry hr3
2025-02-13 11:35:14 +03:00
bakry 0264b6ad7c
Merge branch 'dev_odex25_hr' into bakry_hr3 2025-02-13 11:35:01 +03:00
Bakry 5aaa8a7da8 fix gosi sanad 2025-02-13 11:22:31 +03:00
Esraa-Exp ce8441f8f4
Merge pull request #2378 from expsa/Esraa-Ensan-hr-tasks
mission type condition
2025-02-13 10:22:21 +02:00
Esraa-Exp d6f15be742 mission type condition 2025-02-13 10:18:05 +02:00
Manar416 8617cc5ff3
Merge pull request #2361 from expsa/manar_dev_hr_12_2
UPDATE exp_payroll_custom
2025-02-12 10:39:51 +02:00
manar 184d539ad0 UPDATE exp_payroll_custom 2025-02-12 10:39:04 +02:00
Esraa-Exp 7a2e870272
Merge pull request #2356 from expsa/Esraa-Ensan-hr-tasks
HR Notes in employee record + employee reward+ permissions menu
2025-02-12 09:29:37 +02:00
Esraa-Exp b5e9722e4c HR Notes in employee record + employee reward+ permissions menu 2025-02-12 09:27:39 +02:00
Esraa-Exp 3e942fd609
Merge pull request #2350 from expsa/Esraa-Ensan-hr-tasks
refuse buttons group
2025-02-11 14:16:28 +02:00
Esraa-Exp ed512ee8a5 refuse buttons group 2025-02-11 14:13:11 +02:00
Esraa-Exp 7f1ba4b342
Merge pull request #2349 from expsa/Esraa-Ensan-hr-tasks
training security
2025-02-11 12:44:47 +02:00
Esraa-Exp 785ed76804 training security 2025-02-11 12:40:03 +02:00
Esraa-Exp 3c1103b008
Merge pull request #2348 from expsa/Esraa-Ensan-hr-tasks
attachment+readonly fields
2025-02-11 11:31:48 +02:00
Esraa-Exp e815a72ffb attachment+readonly fields 2025-02-11 11:26:45 +02:00
Esraa-Exp eaddab84a7
Merge pull request #2347 from expsa/Esraa-Ensan-hr-tasks
holiday
2025-02-11 10:34:32 +02:00
Esraa-Exp 1d8d69fed7 holiday 2025-02-11 10:33:31 +02:00
Esraa-Exp 5caa6686cb
Merge pull request #2346 from expsa/Esraa-Ensan-hr-tasks
department required
2025-02-11 08:36:14 +02:00
Esraa-Exp e39afe9500 department required 2025-02-11 08:32:43 +02:00
Esraa-Exp 883ebcd498
Merge pull request #2345 from expsa/Esraa-Ensan-hr-tasks
buttons spact+draft translation+ tree decoration
2025-02-10 23:08:42 +02:00
Esraa-Exp 0f58b21b1b buttons spact+draft translation+ tree decoration 2025-02-10 23:04:32 +02:00
Esraa-Exp 31b982b0f2
Merge pull request #2344 from expsa/Esraa-Ensan-hr-tasks
alocation cut
2025-02-10 16:19:30 +02:00
Esraa-Exp 7e73698a58 alocation cut 2025-02-10 16:18:24 +02:00
Esraa-Exp 6763c09546
Merge pull request #2343 from expsa/Esraa-Ensan-hr-tasks
training new notes
2025-02-10 16:03:29 +02:00
Esraa-Exp a00b4e1da5 training new notes 2025-02-10 16:02:34 +02:00