Commit Graph

145 Commits

Author SHA1 Message Date
Bakry 5bbaa9f779 fix Validates overtime hours workdays and weekend days 2025-12-25 13:19:03 +03:00
esam 81efc18f0c currnt 2025-12-04 14:00:59 -05:00
esam 81d628b0f6 currnt 2025-12-04 13:30:21 -05:00
maltayyar2 6510ca14e4 fix: correct department and branch name display logic
- Add is_branch check to prevent name duplication
- Branches (is_branch=true) show name only
- Departments (is_branch=false) show 'name - branch' when branch exists
- Fix display_name property with same logic
- Prevent cases like 'فرع الافلاج - فرع الافلاج'

Examples:
- Branch: 'فرع الجنوب' (name only)
- Department: 'أجهزة كهربائية - فرع الجنوب' (with branch)
- Department: 'إدارة التسويق' (no branch)

Synced with latest dev_odex25_hr on Thu Nov 13 23:35:00 +03 2025
2025-11-13 23:35:01 +03:00
maltayyar2 59935dfd2d feat: enhance department name display with flexible context support
- Add context check for 'show_full_path' in name_get method
- Support both short names (default) and full path (optional)
- Enhanced display_name property with same flexibility
- Maintain backward compatibility with existing fields

Usage:
- Default: <field name="department_id"/> (short name)
- Full path: <field name="department_id" context="{'show_full_path': True}"/>

Synced with latest dev_odex25_hr on Thu Nov 13 22:22:02 +03 2025
2025-11-13 22:22:02 +03:00
maltayyar2 e3ec99f527 feat: simplify department name display to show short names
- Remove complex logic from name_get method
- Simplify display_name property
- Show department.name directly for all departments/branches
- Remove dependency on context variables

Synced with latest dev_odex25_hr on Thu Nov 13 21:45:35 +03 2025
2025-11-13 21:45:36 +03:00
Mohamed Eltayar 67d3535274 fix: remove invalid department_id field from hr.department views
🚨 **Critical XML Fix**
Fixed ValidationError: الحقل department_id غير موجود في النموذج hr.department

## 🔧 **Problem Fixed**
- Removed invalid department_id field from hr.department form view
- Removed department_id field and grouping from hr.department search view
- hr.department cannot reference itself via department_id field

## 📁 **Files Modified**
- odex25_hr/hr_base/views/hr_base_view.xml: Removed invalid department_id references

##  **Impact**
- Fixes XML validation error during module upgrade
- Maintains proper model field relationships
- Allows successful hr_base module loading

## 🔗 **Related**
Fixes error in PR #5412 - Department display enhancement
2025-11-13 18:55:10 +03:00
Mohamed Eltayar e290c7fd3c feat: enhance department display with short name support
🔧 **Key Improvements:**
- Extended name_get to support show_department_short context
- Added display_name property override for consistent short display
- Enhanced tree view with department context for clean display
- Fixed translation consistency (Department = القسم)

📁 **Files Modified:**
- odex25_hr/hr_base/models/hr_department.py: Enhanced name_get and added display_name property
- odex25_hr/hr_base/views/hr_base_view.xml: Added context to department fields in all views
- odex25_hr/hr_base/i18n/ar_001.po: Unified Department translation to القسم

 **Impact:**
- Department names now display without hierarchical path when context is set
- Consistent short name display across all HR views (form, tree, search)
- Unified Arabic translation for better UX
- Maintains backward compatibility with existing functionality

Synced with latest dev_odex25_hr on Thu Nov 13 18:25:53 +03 2025
2025-11-13 18:25:54 +03:00
Mohamed Eltayar 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
Mohamed Eltayar 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
Mohamed Eltayar 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
Mazen Abdo 50fc3b1e4d Update Accounting Manager Permissions to Create contract.advantage 2025-11-12 17:07:25 +02:00
abdurrahman-saber 21ac823535
Merge pull request #5271 from expsa/JAZ-3842
[FIX] hr_base: model absolute path
2025-11-07 13:58:33 +02:00
Abdurrahman Saber d20e64e88e [FIX] hr_base: model absolute path 2025-11-07 13:58:02 +02:00
abdurrahman-saber 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
Abdurrahman Saber fc17283f90 [IMP][FIX] attendances, hr_base, *: adjust access rights for accounting manager 2025-11-07 13:52:23 +02:00
Mazen Abdo c4726da640 fix secuirty files 2025-11-04 14:44:22 +02:00
younes 09ae939129 [IMP] hr: Add signature in reports 2025-10-23 08:10:54 +01:00
younes f666b72333 [FIX] hr_base: fix bug 2025-10-22 13:19:35 +01:00
Abdurrahman Saber f8f1923a9f [IMP] hr_base, *: activate multi-company for various custom models 2025-09-17 05:02:24 +03:00
Samir Ladoui 95017c2504 [FIX] hr_base 2025-09-16 19:07:08 +01:00
Samir Ladoui aca3b4bc39 [UPD] hr_base 2025-09-16 11:00:13 +01:00
Mazen Abdo 8ffa23bc25 fix 2025-09-01 16:48:52 +03:00
younes c14feae4d3 Fix bug 2025-08-24 14:04:06 +01:00
younes 252146ba2e Fix bug 2025-08-24 14:01:48 +01:00
younes 785f1f6680 Fix bug 2025-08-24 13:58:44 +01:00
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
Mazen Abdo 139630ab7c fix Cannot Create Employee from users 2025-08-07 10:01:16 +03: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 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 4aa5391a6b [FIX] hr_base 2025-07-24 01:14:54 +01:00
Samir Ladoui 0492a80270 [UPD] hr_base 2025-07-23 15:52:33 +01:00