添加功能

2026-04-15 19:45:54 +08:00
parent deea2474d2
commit 5b346f0998
3 changed files with 9 additions and 1 deletions
@@ -18,6 +18,7 @@ class OvertimeCarryover(models.Model):
    carryover_type = fields.Selection([('fee', '加班费结算'), ('leave', '假单结算'), ('cancel', '销假')], string='加班补偿方式',
                                      default='leave')
    leave_id = fields.Many2one('hr.leave.batch', string='请假单')
+    date = fields.Date(compute='_compute_date')
    text = fields.Text(string='备注')

    def open_record(self):
@@ -30,6 +31,12 @@ class OvertimeCarryover(models.Model):
            'target': 'current',
        }

+    @api.depends('over_line_id')
+    def _compute_date(self):
+        for record in self:
+            if record.over_line_id:
+                record.date = record.over_line_id.vacation_id.vacation_date
+
 class OvertimeCarryoverLine(models.Model):
    _name = 'overtime.carryover.line'

@@ -184,7 +184,7 @@ class VacationOvertimeActive(models.Model):
            ('carry_forward_date', '=', self.carry_forward_date),
            '&',
            ('carryover_type', '=', 'leave'),
-            ('over_line_id.vacation_id.vacation_date', '>', last_day),
+            ('over_line_id.carry_forward_date', '>', last_day),
        ]
        view_id = self.env.ref('yuthon_hr_attendance.view_overtime_carryover_tree1').id
        return {
@@ -30,6 +30,7 @@
                <field name="duration"/>
                <field name="carry_forward_date"/>
                <field name="carry_forward_quantity"/>
+                <field name="date"/>
                <field name="carryover_type" column_invisible="1"/>
                <field name="text" column_invisible="1"/>
                <field name="is_void" column_invisible="1"/>