Merge pull request #18 from hbrunn/15.0-14-hr_attendance_break

[ADD] hr_attendance_break

repos.yml

@@ -5,6 +5,8 @@ hr-attendance:
         - oca 15.0
         # https://github.com/OCA/hr-attendance/pull/140
         - oca refs/pull/140/head
+        # https://github.com/OCA/hr-attendance/pull/142
+        - oca refs/pull/142/head
 hr-holidays:
     remotes:
         oca: https://github.com/OCA/hr-holidays.git

verdigado_attendance/__manifest__.py

@@ -11,6 +11,9 @@
     "installable": True,
     "depends": [
         "hr_attendance",
+        "hr_attendance_autoclose",
+        "hr_attendance_break",
+        "hr_attendance_break_autoclose",
         "hr_holidays_attendance",
         "l10n_de_holidays",
         "hr_holidays_public_overtime",

verdigado_attendance/models/__init__.py

@@ -1,5 +1,6 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
 from . import hr_attendance
+from . import hr_attendance_break
 from . import hr_attendance_report
 from . import hr_leave_type

verdigado_attendance/models/hr_attendance.py

@@ -1,11 +1,12 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
-#
-# dummy model to allow verdigado_hr_attendance_rule_attendance_manager rule
-#
-
 from odoo import models
 
+from .hr_attendance_break import DatetimeWithoutSeconds
+
 
 class HrAttendance(models.Model):
     _inherit = "hr.attendance"
+
+    check_in = DatetimeWithoutSeconds()
+    check_out = DatetimeWithoutSeconds()

verdigado_attendance/models/hr_attendance_break.py

@@ -0,0 +1,20 @@
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from odoo import fields, models
+
+
+class DatetimeWithoutSeconds(fields.Datetime):
+    def convert_to_column(self, value, record, values=None, validate=True):
+        return super().convert_to_column(
+            value and self.to_datetime(value).replace(second=0) or value,
+            record,
+            values=values,
+            validate=validate,
+        )
+
+
+class HrAttendanceBreak(models.Model):
+    _inherit = "hr.attendance.break"
+
+    begin = DatetimeWithoutSeconds()
+    end = DatetimeWithoutSeconds()

verdigado_attendance/models/hr_attendance_report.py

@@ -11,7 +11,10 @@ class HrAttendanceReport(models.Model):
     def _join(self):
         """Add overtime adjustments"""
         return super()._join() + " UNION %s %s %s" % (
-            self._select().replace("hra.worked_hours", "0"),
+            self._select()
+            .replace("hra.worked_hours", "0")
+            .replace("break_hours", "0")
+            .replace("ot.duration", "0"),
             self._from(),
             super()._join().replace("ot.adjustment = FALSE", "ot.adjustment = TRUE"),
         )

verdigado_attendance/tests/__init__.py

@@ -3,3 +3,4 @@
 
 from . import test_hr_access
 from . import test_overtime_calculation
+from odoo.addons.hr_attendance_break.tests import test_hr_attendance_break