diff --git a/odex25_hr/hr_base/models/hr_department.py b/odex25_hr/hr_base/models/hr_department.py index 81eb690f6..49a8effb6 100644 --- a/odex25_hr/hr_base/models/hr_department.py +++ b/odex25_hr/hr_base/models/hr_department.py @@ -23,6 +23,18 @@ class HrDepartment(models.Model): branch_name = fields.Many2one('hr.department',domain=[("is_branch","=",True)]) + def name_get(self): + result = [] + for department in self: + # إذا كان السياق من branch_name field أو طلب عرض مختصر + if self.env.context.get('from_branch_field') or self.env.context.get('show_branch_short'): + name = department.name # الاسم فقط بدون مسار + else: + # العرض الافتراضي (مع المسار الهرمي) + name = super(HrDepartment, department).name_get()[0][1] + result.append((department.id, name)) + return result + @api.depends('is_branch','parent_id') def get_is_branch(self): """To know which unit or department belongs to a specific branch""" diff --git a/odex25_hr/hr_base/views/hr_base_view.xml b/odex25_hr/hr_base/views/hr_base_view.xml index 7728631b5..d969d23ab 100644 --- a/odex25_hr/hr_base/views/hr_base_view.xml +++ b/odex25_hr/hr_base/views/hr_base_view.xml @@ -73,7 +73,7 @@ attrs="{'readonly':[('state','!=','draft')]}"/> - + @@ -566,7 +566,7 @@ - + + + + hr.department.tree.inherit + hr.department + + + + + + + + + + + hr.department.search.inherit + hr.department + + + + + + + + + + + resource.calendar.form.inherit resource.calendar