commit
af0e2e12f1
|
|
@ -127,7 +127,11 @@ class HrAttendanceReport(models.Model):
|
|||
missed_hours = planed_hours - working_hours
|
||||
|
||||
missing_punch_transactions = transactions.filtered(
|
||||
lambda t: (t.sign_in and not t.sign_out) or (not t.sign_in and t.sign_out)
|
||||
lambda t: (
|
||||
(t.sign_in and not t.sign_out) or
|
||||
(not t.sign_in and t.sign_out) or
|
||||
(not t.sign_in and not t.sign_out and t.office_hours > 0)
|
||||
)
|
||||
)
|
||||
|
||||
missing_punch_hours = sum([
|
||||
|
|
@ -222,7 +226,7 @@ class HrAttendanceReport(models.Model):
|
|||
'dummy_field': missed_hours,
|
||||
'actual_absent_hours': actual_absent_hours,
|
||||
'total_permission_hours':total_permission_hours,
|
||||
'missing_punch_hours':missing_punch_hours + total_mission,
|
||||
'missing_punch_hours':missing_punch_hours ,
|
||||
'total_amount': employee.contract_id.total_allowance,
|
||||
'amount_per_hour': employee.contract_id.total_allowance / working_hours_flexible_days,
|
||||
'total_deduction': missed_hours * (
|
||||
|
|
@ -313,7 +317,7 @@ class HrAttendanceReport(models.Model):
|
|||
'additional_hours': additional_hours,
|
||||
'actual_absent_hours':actual_absent_hours,
|
||||
'total_permission_hours':total_permission_hours,
|
||||
'missing_punch_hours':missing_punch_hours + total_absent
|
||||
'missing_punch_hours':missing_punch_hours
|
||||
}
|
||||
item_list.append(values)
|
||||
from itertools import groupby, tee
|
||||
|
|
|
|||
Loading…
Reference in New Issue