5b10bd7065
fix: ensure branch departments always display short names
...
- Modified name_get method to prioritize is_branch flag
- Branch departments (is_branch=True) now always show name only
- Maintains context support for other cases
- Fixes issue where branch names showed full hierarchical path
- Ensures consistent short name display across all related fields
Files modified:
- odex25_hr/hr_base/models/hr_department.py
This resolves the issue where branch names appeared with full path
even when context was provided for short display.
2025-11-13 15:33:55 +03:00
1ff8aca934
Merge pull request #5406 from expsa/maz_hr_multicompany_employee
...
Maz hr multicompany employee
2025-11-13 14:13:15 +02:00
8a7a3755cd
Modified employee creation to assign a valid emp_no if missing or '/'
2025-11-13 14:12:41 +02:00
b3a92a1543
Modified employee creation to assign a valid emp_no if missing or '/'
2025-11-13 14:11:13 +02:00
dfdfc24c23
Merge pull request #5405 from expsa/fix/hr-department-tree-view-20251113-145804
...
fix: correct XPath selectors in HR department views
2025-11-13 14:59:18 +03:00
6a2a93e0f6
fix: correct XPath selectors in HR department tree and search views
...
- Fixed tree view XPath from 'name' to 'display_name' (matches Odoo 14 standard)
- Fixed search view groupby filter position to use 'inactive' filter reference
- Ensures proper inheritance of hr.department views
- Resolves XML validation error during module upgrade
Files modified:
- odex25_hr/hr_base/views/hr_base_view.xml
Fixes XPath validation error in hr_department tree view inheritance
2025-11-13 14:58:29 +03:00
6aad0c3752
Merge pull request #5403 from expsa/feature/hr-branch-correct-paths-20251113-144806
...
feat: enhance HR branch display with correct paths and tree/search views
2025-11-13 14:51:19 +03:00
4830170638
feat: enhance HR branch display with correct paths
...
- Modified name_get method in hr.department for short branch display
- Added context support for show_branch_short and from_branch_field
- Updated HR views to use short branch name context
- Added branch field to department tree view with context
- Added branch field to department search view with groupby filter
- Added Arabic translations for branch field
Files modified with correct paths:
- odex25_hr/hr_base/models/hr_department.py
- odex25_hr/hr_base/views/hr_base_view.xml
- odex25_hr/hr_base/i18n/ar_001.po
Synced with latest dev_odex25_hr on Thu Nov 13 14:49:04 +03 2025
2025-11-13 14:49:04 +03:00
14ffaad1ab
Merge pull request #5401 from expsa/revert/hr-wrong-merge-20251113-144413
...
Revert "Merge pull request #5398 - Wrong file paths"
2025-11-13 14:46:10 +03:00
01e859a417
Revert "Merge pull request #5398 from expsa/feature/hr-branch-display-20251113-124438"
...
This reverts commit 50afce2741b3a7b959d8
2025-11-13 14:44:06 +03:00
50afce2741
Merge pull request #5398 from expsa/feature/hr-branch-display-20251113-124438
...
feat: enhance branch name display in HR module
2025-11-13 12:46:30 +03:00
89760b65c8
feat: enhance branch name display in HR module
...
- Modified name_get method in hr.department to show short branch names
- Added context support for 'from_branch_field' and 'show_branch_short'
- Updated hr_base_view.xml to use short branch name context
- Branch names now display without hierarchical path when requested
Synced with latest dev_odex25_hr on Thu Nov 13 12:45:02 +03 2025
2025-11-13 12:45:02 +03:00
b3a7b959d8
Merge pull request #5394 from expsa/fix/accounting_manager_access_rights
...
Update Accounting Manager Permissions to Create contract.advantage
2025-11-12 17:09:43 +02:00
50fc3b1e4d
Update Accounting Manager Permissions to Create contract.advantage
2025-11-12 17:07:25 +02:00
40c57e37c7
Merge pull request #5331 from expsa/kch_dev_odex25_hr
...
[IMP] employee_requests: skip no_quick_create
2025-11-11 09:17:43 +01:00
b90ebf5e1b
[IMP] employee_requests: skip no_quick_create
2025-11-11 09:15:10 +01:00
633bc97fb6
Merge pull request #5272 from expsa/JAZ-3842
...
[FIX] hr_base: model absolute path
2025-11-07 14:15:55 +02:00
5596da7de3
[FIX] hr_base: model absolute path
2025-11-07 14:15:23 +02:00
21ac823535
Merge pull request #5271 from expsa/JAZ-3842
...
[FIX] hr_base: model absolute path
2025-11-07 13:58:33 +02:00
d20e64e88e
[FIX] hr_base: model absolute path
2025-11-07 13:58:02 +02:00
878e165955
Merge pull request #5270 from expsa/JAZ-3842
...
[IMP][FIX] attendances, hr_base, *: adjust access rights for accounting manager
2025-11-07 13:53:22 +02:00
fc17283f90
[IMP][FIX] attendances, hr_base, *: adjust access rights for accounting manager
2025-11-07 13:52:23 +02:00
0fbeb50a50
Merge pull request #5259 from expsa/maz_payroll_albilad
...
fix
2025-11-06 10:42:35 +02:00
9840355e2d
fix
2025-11-06 10:41:38 +02:00
6db95bcbfd
Merge pull request #5258 from expsa/maz_payroll_albilad
...
Adding modifications to the xlsx report
2025-11-06 08:51:28 +02:00
64774e612b
Adding modifications to the xlsx report
2025-11-06 08:49:17 +02:00
4e449a3772
Merge pull request #5228 from expsa/fix_hr_rules
...
[FIX] attendances, employee_requests, exp_hr_appraisal, exp_official_…
2025-11-05 12:40:38 +02:00
58de5ac1a1
[FIX] attendances, employee_requests, exp_hr_appraisal, exp_official_mission, hr_contract_custom: use child_of operator correctly
2025-11-05 12:39:38 +02:00
b77ea8c34e
Merge pull request #5206 from expsa/fix_security_files_ma
...
fix secuirty files
2025-11-04 15:05:04 +02:00
c4726da640
fix secuirty files
2025-11-04 14:44:22 +02:00
0d87001bcf
Merge pull request #5159 from expsa/hr_report_groups
...
security
2025-11-02 17:51:00 +02:00
310719db9b
security
2025-11-02 17:50:20 +02:00
ab7ed64992
Merge pull request #5157 from expsa/hr_report_groups
...
security
2025-11-02 17:40:46 +02:00
ccfeca24a6
security
2025-11-02 17:39:07 +02:00
83d4673c4a
Merge pull request #5155 from expsa/hr_report_groups
...
security
2025-11-02 17:31:25 +02:00
d34ea2e3fd
security
2025-11-02 17:30:11 +02:00
8fcac51ff3
Merge pull request #5153 from expsa/JAZ-3842
...
Jaz 3842
2025-11-02 15:14:52 +02:00
891bd1bac3
[IMP] hr_government_relations, exp_ticket_request: add accounting approva
2025-11-02 15:14:34 +02:00
4267fbc5e6
Merge branch 'JAZ-3842' of exp:expsa/odex25-standard-modules into JAZ-3842
2025-11-02 15:05:21 +02:00
34bccc0445
[IMP] hr_government_relations, exp_ticket_request: add accounting approva
2025-11-02 15:05:09 +02:00
776336b0e2
[IMP] exp_official_mission: adjust approval process
2025-11-01 13:18:29 +02:00
63de98f43a
Merge pull request #5137 from expsa/JAZ-3842
...
[IMP] exp_official_mission: adjust approval process
2025-11-01 13:11:13 +02:00
d06e689491
[IMP] exp_official_mission: adjust approval process
2025-11-01 13:10:38 +02:00
b85935c87d
Merge pull request #5136 from expsa/JAZ-3842
...
[IMP] exp_official_mission: adjust approval process
2025-11-01 12:55:54 +02:00
bc5f38bc73
[IMP] exp_official_mission: adjust approval process
2025-11-01 12:55:17 +02:00
d936541b9c
Merge pull request #5135 from expsa/JAZ-3842
...
[IMP] exp_official_mission: adjust approval process
2025-11-01 12:44:05 +02:00
8d9eb01e48
[IMP] exp_official_mission: adjust approval process
2025-11-01 12:43:33 +02:00
873a7e580c
Merge pull request #5134 from expsa/JAZ-3842
...
[IMP] exp_official_mission: adjust approval process
2025-11-01 12:31:21 +02:00
59b4f60397
[IMP] exp_official_mission: adjust approval process
2025-11-01 12:30:47 +02:00
893c1a269e
Merge pull request #5120 from expsa/JAZ-3834
...
Jaz 3834
2025-10-30 00:09:28 +02:00
Mohamed Eltayar
mazenmuhamad
Mohamed Eltayar
kchyounes19
abdurrahman-saber
Abdurrahman Saber
eslamtalaat744