[MIG] hr_attendance_report_theoretical_time: Migration to 18.0

OCA · Oct 15, 2024 · 20d1be4 · 20d1be4
1 parent 4f61f34
commit 20d1be4
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 22 deletions.
diff --git a/hr_attendance_report_theoretical_time/README.rst b/hr_attendance_report_theoretical_time/README.rst
@@ -17,13 +17,13 @@ Theoretical vs Attended Time Analysis
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fhr--attendance-lightgray.png?logo=github
-    :target: https://github.com/OCA/hr-attendance/tree/17.0/hr_attendance_report_theoretical_time
+    :target: https://github.com/OCA/hr-attendance/tree/18.0/hr_attendance_report_theoretical_time
     :alt: OCA/hr-attendance
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/hr-attendance-17-0/hr-attendance-17-0-hr_attendance_report_theoretical_time
+    :target: https://translation.odoo-community.org/projects/hr-attendance-18-0/hr-attendance-18-0-hr_attendance_report_theoretical_time
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/hr-attendance&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/hr-attendance&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -129,7 +129,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/hr-attendance/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/hr-attendance/issues/new?body=module:%20hr_attendance_report_theoretical_time%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/hr-attendance/issues/new?body=module:%20hr_attendance_report_theoretical_time%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -156,6 +156,7 @@ Contributors
 -  `Trobz <https://trobz.com>`__:
 
    -  Dzung Tran <[email protected]>
+   -  Do Anh Duy <[email protected]>
 
 Other credits
 -------------
@@ -181,6 +182,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/hr-attendance <https://github.com/OCA/hr-attendance/tree/17.0/hr_attendance_report_theoretical_time>`_ project on GitHub.
+This module is part of the `OCA/hr-attendance <https://github.com/OCA/hr-attendance/tree/18.0/hr_attendance_report_theoretical_time>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/hr_attendance_report_theoretical_time/__manifest__.py b/hr_attendance_report_theoretical_time/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
     "name": "Theoretical vs Attended Time Analysis",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "category": "Human Resources",
     "website": "https://github.com/OCA/hr-attendance",
     "author": "Tecnativa, Odoo Community Association (OCA)",

diff --git a/hr_attendance_report_theoretical_time/models/__init__.py b/hr_attendance_report_theoretical_time/models/__init__.py
@@ -6,3 +6,4 @@
 from . import hr_holidays_public
 from . import hr_leave
 from . import hr_leave_type
+from . import resource_calendar
diff --git a/hr_attendance_report_theoretical_time/models/resource_calendar.py b/hr_attendance_report_theoretical_time/models/resource_calendar.py
@@ -0,0 +1,41 @@
+# Copyright 2024 Janik von Rotz <[email protected]>
+# Copyright 2024 Camptocamp
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models
+
+from odoo.addons.resource.models.resource_resource import Intervals
+
+
+class ResourceCalendar(models.Model):
+    _inherit = "resource.calendar"
+
+    def _attendance_intervals_batch_exclude_public_holidays(
+        self, start_dt, end_dt, intervals, resources, tz
+    ):
+        partner_id = self.env.context.get("partner_id", False)
+        if not partner_id:
+            employee_id = self.env.context.get("employee_id", False)
+            if employee_id:
+                employee = self.env["hr.employee"].browse(employee_id)
+                partner_id = employee.address_id.id
+            list_by_dates = (
+                self.env["hr.holidays.public"]
+                .get_holidays_list(
+                    start_dt=start_dt.date(),
+                    end_dt=end_dt.date(),
+                    partner_id=partner_id,
+                )
+                .mapped("date")
+            )
+            for resource in resources:
+                interval_resource = intervals[resource.id]
+                attendances = []
+                for attendance in interval_resource._items:
+                    if attendance[0].date() not in list_by_dates:
+                        attendances.append(attendance)
+                intervals[resource.id] = Intervals(attendances)
+            return intervals
+        return super()._attendance_intervals_batch_exclude_public_holidays(
+            start_dt, end_dt, intervals, resources, tz
+        )
diff --git a/hr_attendance_report_theoretical_time/readme/CONTRIBUTORS.md b/hr_attendance_report_theoretical_time/readme/CONTRIBUTORS.md
@@ -7,3 +7,4 @@
 - Aritz Olea \<<[email protected]>\>
 - [Trobz](https://trobz.com):
   - Dzung Tran \<<[email protected]>\>
+  - Do Anh Duy \<<[email protected]>\>
diff --git a/hr_attendance_report_theoretical_time/static/description/index.html b/hr_attendance_report_theoretical_time/static/description/index.html
@@ -369,7 +369,7 @@ <h1 class="title">Theoretical vs Attended Time Analysis</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:d7a2513c0f08e9e8ff4f38003f06758993e13d389b8dbaf98b2282aaa1930b5b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/hr-attendance/tree/17.0/hr_attendance_report_theoretical_time"><img alt="OCA/hr-attendance" src="https://img.shields.io/badge/github-OCA%2Fhr--attendance-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-attendance-17-0/hr-attendance-17-0-hr_attendance_report_theoretical_time"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/hr-attendance&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/hr-attendance/tree/18.0/hr_attendance_report_theoretical_time"><img alt="OCA/hr-attendance" src="https://img.shields.io/badge/github-OCA%2Fhr--attendance-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-attendance-18-0/hr-attendance-18-0-hr_attendance_report_theoretical_time"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/hr-attendance&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module adds a new report called “Theoretical vs Attended Time
 Analysis” that compares worked time, measured through attendances
 records, with the theoretical time, computed from employee’s working
@@ -478,7 +478,7 @@ <h1><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/hr-attendance/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/hr-attendance/issues/new?body=module:%20hr_attendance_report_theoretical_time%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/hr-attendance/issues/new?body=module:%20hr_attendance_report_theoretical_time%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -503,6 +503,7 @@ <h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
 <li>Aritz Olea &lt;<a class="reference external" href="mailto:ao&#64;landoo.es">ao&#64;landoo.es</a>&gt;</li>
 <li><a class="reference external" href="https://trobz.com">Trobz</a>:<ul>
 <li>Dzung Tran &lt;<a class="reference external" href="mailto:dungtd&#64;trobz.com">dungtd&#64;trobz.com</a>&gt;</li>
+<li>Do Anh Duy &lt;<a class="reference external" href="mailto:duyda&#64;trobz.com">duyda&#64;trobz.com</a>&gt;</li>
 </ul>
 </li>
 </ul>
@@ -527,7 +528,7 @@ <h2><a class="toc-backref" href="#toc-entry-10">Maintainers</a></h2>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr-attendance/tree/17.0/hr_attendance_report_theoretical_time">OCA/hr-attendance</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr-attendance/tree/18.0/hr_attendance_report_theoretical_time">OCA/hr-attendance</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

diff --git a/hr_attendance_report_theoretical_time/tests/test_hr_attendance_report_theoretical_time.py b/hr_attendance_report_theoretical_time/tests/test_hr_attendance_report_theoretical_time.py
@@ -99,11 +99,16 @@ def setUpClass(cls):
         )
         # Force employee create_date for having auto-generated report entries
         cls.env.cr.execute(
-            "UPDATE hr_employee SET create_date = %s " "WHERE id in %s",
-            ("1946-12-23 12:00:00", (cls.employee_1.id, cls.employee_2.id)),
+            """
+            UPDATE hr_employee
+            SET create_date = '{}'
+            WHERE id IN ({}, {})
+        """.format("1946-12-23 12:00:00", cls.employee_1.id, cls.employee_2.id)
         )
         # Leave for employee 1
-        cls.leave = cls.HrLeave.create(
+        cls.leave = cls.HrLeave.with_context(
+            partner=cls.employee_1.address_id.id
+        ).create(
             {
                 "date_from": "1946-12-26 00:00:00",
                 "date_to": "1946-12-26 23:59:59",
@@ -122,17 +127,17 @@ def setUpClass(cls):
                     cls.env["hr.attendance"].create(
                         {
                             "employee_id": employee.id,
-                            "check_in": "1946-12-%s 08:00:00" % day,
-                            "check_out": "1946-12-%s 12:00:00" % day,
+                            "check_in": f"1946-12-{day} 08:00:00",
+                            "check_out": f"1946-12-{day} 12:00:00",
                         }
                     )
                 )
                 cls.attendances.append(
                     cls.env["hr.attendance"].create(
                         {
                             "employee_id": employee.id,
-                            "check_in": "1946-12-%s 14:00:00" % day,
-                            "check_out": "1946-12-%s 18:00:00" % day,
+                            "check_in": f"1946-12-{day} 14:00:00",
+                            "check_out": f"1946-12-{day} 18:00:00",
                         }
                     )
                 )
@@ -286,7 +291,7 @@ def _define_calendar_2_weeks(cls, name, attendances, tz):
                         0,
                         0,
                         {
-                            "name": "%s_%d" % (name, index),
+                            "name": f"{name}_{index}",
                             "hour_from": att[0],
                             "hour_to": att[1],
                             "dayofweek": str(att[2]),

diff --git a/hr_attendance_report_theoretical_time/wizards/wizard_theoretical_time.py b/hr_attendance_report_theoretical_time/wizards/wizard_theoretical_time.py
@@ -56,7 +56,8 @@ def view_report(self):
         action["domain"] = [
             ("employee_id", "in", self.with_context(active_test=False).employee_ids.ids)
         ]
-        action[
-            "context"
-        ] = "{'search_default_previous_month': 1, 'search_default_current_month': 1}"
+        action["context"] = {
+            "search_default_previous_month": 1,
+            "search_default_current_month": 1,
+        }
         return action
diff --git a/hr_attendance_report_theoretical_time/wizards/wizard_theoretical_time.xml b/hr_attendance_report_theoretical_time/wizards/wizard_theoretical_time.xml
@@ -35,12 +35,12 @@
                 <notebook>
                     <page string="Employees">
                         <field name="employee_ids">
-                            <tree delete="1" editable="0">
+                            <list delete="1" editable="bottom">
                                 <field name="name" readonly="1" />
                                 <field name="department_id" readonly="1" />
                                 <field name="job_id" readonly="1" />
                                 <field name="parent_id" readonly="1" />
-                            </tree>
+                            </list>
                         </field>
                     </page>
                 </notebook>