Merge pull request #3415 from expsa/absent_calc

fix templaate email
This commit is contained in:
mohammed-alkhazrji 2025-06-03 14:53:40 +03:00 committed by GitHub
commit ca72115bae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 7 deletions

View File

@ -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"

View File

@ -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')),

View File

@ -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')

View File

@ -66,7 +66,7 @@
<tree editable="bottom" decoration-danger="total_deduction &gt; 0">
<field name="employee_name" string="Employee Name" readonly="1"/>
<field name="delay" string="Delay" widget="float_time" readonly="1" sum="Total:"/>
<field name="exists" string="Early Exist" widget="float_time" readonly="1" sum="Total:"/>
<field name="exist_hours" string="Early Exist" widget="float_time" readonly="1" sum="Total:"/>
<field name="total_permission_hours" string="Permission Hours" widget="float_time" readonly="1" sum="Total:" optional="show"/>
<field name="actual_absent_hours" string="Actual Absent Hours" widget="float_time" readonly="1" sum="Total:" />
<field name="missing_punch_hours" string="Missing Punch Hours" widget="float_time" readonly="1" sum="Total:" />
@ -88,7 +88,7 @@
<field name="employee_name" string="Employee Name"/>
<field name="delay" string="Delay" widget="float_time"/>
<field name="leave" string="Leave" widget="float_time"/>
<field name="exists" string="Early Exist" widget="float_time"/>
<field name="exist_hours" string="Early Exist" widget="float_time"/>
<field name="total_permission_hours" string="Permission Hours" widget="float_time"/>
<field name="actual_absent_hours" string="Actual Absent Hours" widget="float_time"/>
<field name="missing_punch_hours" string="Missing Punch Hours" widget="float_time"/>