fixup! [ADD] hr_attendance_break

OCA · Sep 25, 2023 · e1b0d73 · e1b0d73
1 parent f3b8120
commit e1b0d73
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 10 deletions.
diff --git a/hr_attendance_break/__manifest__.py b/hr_attendance_break/__manifest__.py
@@ -26,6 +26,7 @@
         "views/hr_attendance.xml",
         "views/hr_attendance_break.xml",
         "views/hr_attendance_break_threshold.xml",
+        "views/hr_attendance_reason.xml",
         "views/hr_attendance_report.xml",
         "views/res_config_settings.xml",
     ],

diff --git a/hr_attendance_break/data/hr_attendance_reason.xml b/hr_attendance_break/data/hr_attendance_reason.xml
@@ -6,5 +6,6 @@
         <field name="name">Imposed break</field>
         <field name="action_type">break</field>
         <field name="show_on_attendance_screen" eval="False" />
+        <field name="bypass_minimum_break" eval="True" />
     </record>
 </data>
diff --git a/hr_attendance_break/models/hr_attendance.py b/hr_attendance_break/models/hr_attendance.py
@@ -18,15 +18,11 @@ def _compute_break_hours(self):
         """Compute break hours"""
         for this in self:
             this.break_hours = sum(
-                filter(
-                    lambda x: x
-                    >= this.employee_id.company_id.hr_attendance_break_min_break,
-                    (
-                        (_break.end - _break.begin).total_seconds() / 3600
-                        for _break in this.break_ids
-                        if _break.begin and _break.end
-                    ),
-                ),
+                this.break_ids.filtered(
+                    lambda x: x.reason_id.bypass_minimum_break
+                    or x.break_hours
+                    >= this.employee_id.company_id.hr_attendance_break_min_break
+                ).mapped("break_hours")
             )
 
     @api.depends("break_hours")

diff --git a/hr_attendance_break/models/hr_attendance_break_threshold.py b/hr_attendance_break/models/hr_attendance_break_threshold.py
@@ -7,6 +7,7 @@
 
 class HrAttendanceBreakThreshold(models.Model):
     _name = "hr.attendance.break.threshold"
+    _description = "Minimum break times"
     _rec_name = "company_id"
     _order = "min_hours desc"
 

diff --git a/hr_attendance_break/models/hr_attendance_reason.py b/hr_attendance_break/models/hr_attendance_reason.py
@@ -9,3 +9,7 @@ class HrAttendanceReason(models.Model):
     _inherit = "hr.attendance.reason"
 
     action_type = fields.Selection(selection_add=[("break", "Break")])
+    bypass_minimum_break = fields.Boolean(
+        help="Check this to have breaks of this type always be counted, independent "
+        "of minimum break settings"
+    )
diff --git a/hr_attendance_break/views/hr_attendance_break.xml b/hr_attendance_break/views/hr_attendance_break.xml
@@ -8,7 +8,7 @@
             <tree editable="bottom">
                 <field name="begin" />
                 <field name="end" />
-                <field name="reason_id" />
+                <field name="reason_id" domain="[('action_type', '=', 'break')]" />
             </tree>
         </field>
     </record>

diff --git a/hr_attendance_break/views/hr_attendance_reason.xml b/hr_attendance_break/views/hr_attendance_reason.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2023 Hunki Enterprises BV
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) -->
+<data>
+    <record id="hr_attendance_reason_view_form" model="ir.ui.view">
+        <field name="model">hr.attendance.reason</field>
+        <field
+            name="inherit_id"
+            ref="hr_attendance_reason.hr_attendance_reason_view_form"
+        />
+        <field name="arch" type="xml">
+            <field name="show_on_attendance_screen" position="after">
+                <field name="bypass_minimum_break" />
+            </field>
+        </field>
+    </record>
+</data>