From 6510ca14e49083ac010fb62699924dc8807739b8 Mon Sep 17 00:00:00 2001
From: maltayyar2 <M.Altayyar@exp-sa.com>
Date: Thu, 13 Nov 2025 23:35:01 +0300
Subject: [PATCH] fix: correct department and branch name display logic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 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
---
 odex25_hr/hr_base/models/hr_department.py | 27 ++++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/odex25_hr/hr_base/models/hr_department.py b/odex25_hr/hr_base/models/hr_department.py
index f91e76d88..24beb5bad 100644
--- a/odex25_hr/hr_base/models/hr_department.py
+++ b/odex25_hr/hr_base/models/hr_department.py
@@ -26,24 +26,25 @@ class HrDepartment(models.Model):
     def name_get(self):
         result = []
         for department in self:
-            # إذا كان السياق يطلب المسار الكامل
-            if self.env.context.get('show_full_path'):
-                name = super(HrDepartment, department).name_get()[0][1]
-            else:
-                # الاسم المختصر (الافتراضي)
-                name = department.name
+            name = department.name
+            
+            # إضافة اسم الفرع فقط للأقسام (ليس للفروع)
+            if not department.is_branch and department.branch_name:
+                name = f"{department.name} - {department.branch_name.name}"
+            
             result.append((department.id, name))
         return result
     
     @property
     def display_name(self):
-        """Override display_name to show short name for all departments"""
-        # إذا كان السياق يطلب المسار الكامل
-        if self.env.context.get('show_full_path'):
-            return super().display_name
-        else:
-            # الاسم المختصر (الافتراضي)
-            return self.name
+        """Override display_name to show department name with branch"""
+        name = self.name
+        
+        # إضافة اسم الفرع فقط للأقسام (ليس للفروع)
+        if not self.is_branch and self.branch_name:
+            name = f"{self.name} - {self.branch_name.name}"
+            
+        return name
 
     @api.depends('is_branch','parent_id')
     def get_is_branch(self):