diff --git a/yuthon_hr_attendance/models/yuthon_holiday_statement.py b/yuthon_hr_attendance/models/yuthon_holiday_statement.py index 205bc6342..492accd77 100644 --- a/yuthon_hr_attendance/models/yuthon_holiday_statement.py +++ b/yuthon_hr_attendance/models/yuthon_holiday_statement.py @@ -67,6 +67,6 @@ class InheritHrLeave(models.Model): ('date_from', '<=', end_of_year), ('state', '=', 'validate'), ]) - total_days = sum(leave.number_of_days for leave in leave_records) + total_days = sum(leave.length_leave for leave in leave_records) leave_type_name = record.holiday_status_id.name record.leave_stats = f"本年内已请{leave_type_name}{total_days:.1f}天" \ No newline at end of file diff --git a/yuthon_hr_attendance/views/yuthon_holiday_statement.xml b/yuthon_hr_attendance/views/yuthon_holiday_statement.xml index d6d09fc15..872b21d18 100644 --- a/yuthon_hr_attendance/views/yuthon_holiday_statement.xml +++ b/yuthon_hr_attendance/views/yuthon_holiday_statement.xml @@ -12,7 +12,7 @@ - + diff --git a/yuthon_issue/views/issue_approval_decision_views.xml b/yuthon_issue/views/issue_approval_decision_views.xml index c5680f3d2..81c402e0b 100644 --- a/yuthon_issue/views/issue_approval_decision_views.xml +++ b/yuthon_issue/views/issue_approval_decision_views.xml @@ -80,6 +80,7 @@ issue.approval.decision +