!10970 添加功能

Merge pull request !10970 from 李鹏宇/dev_zhou

yuthon_hr_attendance/models/vacation_overtime_active.py

@@ -138,7 +138,7 @@ class VacationOvertimeActive(models.Model):
         carryover_id = self.env['overtime.carryover'].search([
                         ('carry_forward_date', '=', self.carry_forward_date),
                         ('employee_id', '=', self.employee_id.id),
-                        ('is_void', '!=', False),
+                        ('is_void', '!=', True),
                         ('carryover_type', '=', 'fee'),])
         if carryover_id:
             carryover_id.is_void = True

yuthon_hr_attendance/models/yuthon_vacation_reports.py

@@ -2536,7 +2536,7 @@ class VacationOverline(models.Model):
     workflow_id = fields.Many2one('soong.workflow', compute="_compute_overtime", string='审批类型', store=True)
     start_time = fields.Datetime(string="开始时间", compute="_compute_overtime", store=True)
     end_time = fields.Datetime(string="结束时间", compute="_compute_overtime", store=True)
-    duration = fields.Float(string="时长", compute="_compute_overtime", store=True)
+    duration = fields.Float(string="时长", compute="_compute_overtime", store=True, digits=(16, 1))
     remaining_quantity = fields.Float(string='剩余数', compute="_compute_carry_forward_info", store=True, digits=(16, 1))
     remaining_quantity1 = fields.Float(string='剩余数', compute="_compute_carry_forward_info1", digits=(16, 1)) # 动态值根据选择的年月过滤无效额度
     logging_data = fields.Char(string="日志日志日志")