Merge pull request #1372 from expsa/bakry_hr

fix branch name

odex25_hr/attendances/models/hr_attendance_register.py

@@ -31,7 +31,7 @@ class HrAttendanceRegister(models.Model):
 
     company_id = fields.Many2one(related='employee_id.company_id')
 
-    is_branch = fields.Boolean(related='department_id.his_branch', store=True)
+    is_branch = fields.Many2one(related='department_id.branch_name', store=True, readonly=True)
 
     def unlink(self):
         for rec in self:

odex25_hr/attendances/models/hr_attendance_transactions.py

@@ -37,7 +37,7 @@ class HrAttendanceTransactions(models.Model):
     company_id = fields.Many2one(related='employee_id.company_id')
     employee_number = fields.Char(related='employee_id.emp_no', string='Employee Number',store=True)
     department_id = fields.Many2one(related='employee_id.department_id',string='Department Name' ,store=True) 
-    is_branch = fields.Boolean(related='department_id.his_branch', store=True)
+    is_branch = fields.Many2one(related='department_id.branch_name', store=True, readonly=True)
 
     def get_additional_hours(self):
         for rec in self:

odex25_hr/attendances/views/hr_attendance_transactions.xml

@@ -124,6 +124,11 @@
                         <filter string="My Attendance" name="my_attendance" domain="[('employee_id.user_id', '=', uid)]"/>
                     <separator/>
 
+                    <!--searchpanel>
+                        <field name="company_id" groups="base.group_multi_company" icon="fa-building" enable_counters="1"/>
+                        <field name="department_id" icon="fa-users" enable_counters="1"/>
+                    </searchpanel-->
+
                 </search>
             </field>
         </record>

odex25_hr/employee_requests/models/employee_overtime_request.py

@@ -49,7 +49,7 @@ class employee_overtime_request(models.Model):
 
     company_id = fields.Many2one('res.company',string="Company", default=lambda self: self.env.user.company_id)
 
-    is_branch = fields.Boolean(related='employee_id.department_id.his_branch', store=True)
+    is_branch = fields.Many2one(related='department_id.branch_name', store=True, readonly=True)
 
     def get_user_id(self):
         employee_id = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)

odex25_hr/employee_requests/models/hr_personal_permission.py

@@ -38,7 +38,7 @@ class HrPersonalPermission(models.Model):
                               ('approve', _('Approved')), ('refused', _('Refused'))], default="draft", tracking=True)
     type_exit = fields.Selection([('early_exit', _('Early Exit')), ('late entry', _('Late Entry')), ('during work', _('During Work'))],default="early_exit")
     company_id = fields.Many2one('res.company',string="Company", default=lambda self: self.env.user.company_id)
-    is_branch = fields.Boolean(related='department_id.his_branch', store=True)
+    is_branch = fields.Many2one(related='department_id.branch_name', store=True, readonly=True)
 
     # time_permission_from = fields.Float(string="Permission From (24h format)", help="Time in 24-hour format (e.g., 13.5 for 1:30 PM)")
     # time_permission_to = fields.Float(string="Permission To (24h format)", help="Time in 24-hour format (e.g., 15.75 for 3:45 PM)")

odex25_hr/employee_requests/models/other_request.py

@@ -50,7 +50,7 @@ class EmployeeOtherRequest(models.Model):
 
     company_id = fields.Many2one('res.company', string="Company", default=lambda self: self.env.user.company_id)
 
-    is_branch = fields.Boolean(related='department_id.his_branch', store=True)
+    is_branch = fields.Many2one(related='department_id.branch_name', store=True, readonly=True)
 
     def print_with_details(self):
         return self.env.ref('employee_requests.action_report_employee_identification').report_action(self)

odex25_hr/exp_official_mission/models/hr_official_mission.py

@@ -90,7 +90,7 @@ class HrOfficialMission(models.Model):
 
     ticket_request_id = fields.Many2one('hr.ticket.request', string="Ticket Request", readonly=True)
     department_id2 = fields.Many2one(related='employee_id.department_id', readonly=True,store=True,string='Department')
-    is_branch = fields.Boolean(related='department_id2.his_branch', store=True)
+    is_branch = fields.Many2one(related='department_id2.branch_name', store=True, readonly=True)
 
 
     '''@api.constrains('employee_ids')

odex25_hr/hr_base/i18n/ar_001.po

@@ -4650,6 +4650,12 @@ msgstr "الحساب التحليلي"
 msgid "Is Branch?"
 msgstr "فرع؟"
 
+#. module: hr_base
+#: model:ir.model.fields,field_description:hr_base.field_hr_department__branch_name
+#: model_terms:ir.ui.view,arch_db:hr_base.view_hr_department_form_inherit
+msgid "Branch Name"
+msgstr "إسم الفرع"
+
 #. module: hr
 #: model:res.groups,name:hr.group_hr_user
 msgid "Officer"

odex25_hr/hr_base/models/hr_department.py

@@ -20,6 +20,7 @@ class HrDepartment(models.Model):
     is_branch = fields.Boolean(string='Is Branch?',tracking=True)
 
     his_branch = fields.Boolean(compute='get_is_branch', default=False, store=True)
+    branch_name = fields.Many2one('hr.department',domain=[("is_branch","=",True)])
 
 
     @api.depends('is_branch','parent_id')

odex25_hr/hr_base/views/hr_base_view.xml

@@ -505,6 +505,7 @@
                     <field name="email_manager"/>
                     <field name="department_type" required="1"/>
                     <field name="is_branch" string="Is Branch?"/>
+                    <field name="branch_name" string="Branch Name" context="{'hierarchical_naming': False}"/>
                 </xpath>
                 <xpath expr="//field[@name='name']" position="after">
                     <label for="english_name" class="oe_edit_only"/>

odex25_hr/hr_holidays_public/models/hr_holidays.py

@@ -92,7 +92,7 @@ class HRHolidays(models.Model):
     emp_number = fields.Char(related='employee_id.emp_no',store=True)
 
     request_done = fields.Boolean(default=False,readonly=True)
-    is_branch = fields.Boolean(related='department_id.his_branch', store=True)
+    is_branch = fields.Many2one(related='department_id.branch_name', store=True, readonly=True)
 
 
     def _check_state_access_right(self, vals):