!5524 1

Merge pull request !5524 from 李鹏宇/dev2

yuthon_hr_attendance/models/hr_attendance.py

@@ -44,7 +44,7 @@ class HrAttendance(models.Model):
                              ('seven', '日')], string='星期', compute='_compute_week', store=True)
     abnormal = fields.Integer(string="异常计算")
     shift_id = fields.Many2one('planning.slot', string="班次", store=True)
-    shift_name = fields.Char(string="班次", related="shift_id.template_id.planning_name", store=True)
+    shift_name = fields.Char(string="班次", store=True)
     noon_duty = fields.Datetime(string="中值")
     night_duty = fields.Datetime(string="晚值")
     is_approval = fields.Boolean(string="是否审批修正", default=False)
@@ -114,6 +114,8 @@ class HrAttendance(models.Model):
         for att in self.env["hr.attendance"].browse(self._context.get('active_ids', self._context.get('active_id'))):
             current_data = fields.Datetime.to_datetime(att.current_data) + timedelta(hours=8)
             self.env["hr.attendance.detail"].compute_attendance_detail(att.employee_id, current_data.date(), is_manual=True)
+            if att.employee_id.company_id.name in ['集团本部', '天河粮储']:
+                att.shift_name = '行政班次'
             # planning_slots = self.env['planning.slot'].search([
             #     ('employee_id', '=', att.employee_id.id),
             #     ('start_datetime', '=', att.current_data),

yuthon_hr_attendance/views/hr_attendance_views.xml

@@ -25,7 +25,7 @@
                 <field name="week" optional="show" class="list_ids_width"/>
                 <field name="check_in" optional="show" widget="time" decoration-danger="is_check_in_red == 1"/>
                 <field name="check_out" optional="show" widget="time" class="list_current_data" decoration-danger="is_check_out_red == 1"/>
-                <field name="shift_id" optional="hidden"/>
+                <field name="shift_id" optional="hidden" column_invisible="1"/>
                 <field name="shift_name" optional="show" class="list_current_data"/>
                 <field name="create_date" optional="hidden"/>
                 <field name="user_id" column_invisible="1"/>
@@ -68,7 +68,7 @@
                 <field name="week" optional="show" class="list_ids_width"/>
                 <field name="check_in" optional="show" widget="time"/>
                 <field name="check_out" optional="show" widget="time" class="list_current_data"/>
-                <field name="shift_id" optional="hidden"/>
+                <field name="shift_id" optional="hidden" column_invisible="1"/>
                 <field name="shift_name" optional="show" class="list_current_data"/>
                 <field name="create_date" optional="hidden"/>
                 <field name="user_id" column_invisible="1"/>