From f45262c52f330b0b91519599831863703521ab26 Mon Sep 17 00:00:00 2001 From: mohammed-alkhazrji Date: Tue, 3 Jun 2025 14:46:25 +0300 Subject: [PATCH] fix templaate email --- odex25_hr/attendances/i18n/ar_001.po | 1 + odex25_hr/attendances/models/hr_attendance_report.py | 8 ++++---- odex25_hr/attendances/models/hr_attendance_report_line.py | 2 +- odex25_hr/attendances/views/hr_attendance_report.xml | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/odex25_hr/attendances/i18n/ar_001.po b/odex25_hr/attendances/i18n/ar_001.po index 83b332a19..5d447e121 100644 --- a/odex25_hr/attendances/i18n/ar_001.po +++ b/odex25_hr/attendances/i18n/ar_001.po @@ -185,6 +185,7 @@ msgstr "نسيان البصمة" msgid "Absent Report" msgstr "" + #. module: attendances #: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form msgid "Account Overtime" diff --git a/odex25_hr/attendances/models/hr_attendance_report.py b/odex25_hr/attendances/models/hr_attendance_report.py index 37364b7b3..019e85d72 100644 --- a/odex25_hr/attendances/models/hr_attendance_report.py +++ b/odex25_hr/attendances/models/hr_attendance_report.py @@ -237,7 +237,7 @@ class HrAttendanceReport(models.Model): 'delay': 0.0, 'leave': leaves, 'additional_hours': 0.0, - 'exists': 0.0, + 'exist_hours': 0.0, 'extra_break_duration': 0.0, 'absent': actual_absent_hours + missing_punch_hours + break_hours + early_exit_hours + lateness_hours , 'mission_by_days': total_mission, @@ -325,7 +325,7 @@ class HrAttendanceReport(models.Model): 'employee_name': attendance.employee_id.id, 'delay': lateness, 'leave': total_leaves, - 'exists': early_exist, + 'exist_hours': early_exist, 'extra_break_duration': extra_break_duration, 'absent': actual_absent_hours + missing_punch_hours + lateness + early_exist + extra_break_duration, 'mission_by_days': total_mission_by_day, @@ -358,7 +358,7 @@ class HrAttendanceReport(models.Model): temp_dict["leave"] = sum(item1["leave"] for item1 in grp2) temp_dict["mission_by_days"] = sum(item1["mission_by_days"] for item1 in grp14) temp_dict["absent"] = sum(item1["absent"] for item1 in grp3) - temp_dict["exists"] = sum(item1["exists"] for item1 in grp4) + temp_dict["exist_hours"] = sum(item1["exist_hours"] for item1 in grp4) temp_dict["extra_break_duration"] = sum(item1["extra_break_duration"] for item1 in grp5) temp_dict["absent_days_by_hr"] = sum(item1["absent_days_by_hr"] for item1 in grp6) temp_dict["total_hours"] = sum(item["total_hours"] for item in grp7) - ( @@ -418,7 +418,7 @@ class HrAttendanceReport(models.Model): 'delay': sum_line.delay + sum(sum_recs.mapped('line_ids.delay')), 'leave': sum_line.leave + sum(sum_recs.mapped('line_ids.leave')), 'absent': sum_line.absent + sum(sum_recs.mapped('line_ids.absent')), - 'exists': sum_line.exists + sum(sum_recs.mapped('line_ids.exists')), + 'exist_hours': sum_line.exists + sum(sum_recs.mapped('line_ids.exist_hours')), 'total_hours': sum_line.total_hours + sum(sum_recs.mapped('line_ids.total_hours')), 'dummy_field': sum_line.dummy_field + sum(sum_recs.mapped('line_ids.dummy_field')), 'total_deduction': sum_line.total_deduction + sum(sum_recs.mapped('line_ids.total_deduction')), diff --git a/odex25_hr/attendances/models/hr_attendance_report_line.py b/odex25_hr/attendances/models/hr_attendance_report_line.py index 62b7781c6..68f261613 100644 --- a/odex25_hr/attendances/models/hr_attendance_report_line.py +++ b/odex25_hr/attendances/models/hr_attendance_report_line.py @@ -8,7 +8,7 @@ class HrAttendanceReportLine(models.Model): employee_name = fields.Many2one(comodel_name='hr.employee') delay = fields.Float() leave = fields.Float(string='Holiday Hours') - exists = fields.Float() + exist_hours = fields.Float() extra_break_duration = fields.Float() absent = fields.Float(string='Absent Hours') mission_by_days = fields.Float(string='Mission Hours') diff --git a/odex25_hr/attendances/views/hr_attendance_report.xml b/odex25_hr/attendances/views/hr_attendance_report.xml index 50ea227d3..87d7cd3f7 100644 --- a/odex25_hr/attendances/views/hr_attendance_report.xml +++ b/odex25_hr/attendances/views/hr_attendance_report.xml @@ -66,7 +66,7 @@ - + @@ -88,7 +88,7 @@ - +