[MIG] hr_timesheet_sheet_activity: Migration to 16.0

hr_timesheet_sheet_activity/README.rst

@@ -17,13 +17,13 @@ HR Timesheet Sheet Activities
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Ftimesheet-lightgray.png?logo=github
-    :target: https://github.com/OCA/timesheet/tree/14.0/hr_timesheet_sheet_activity
+    :target: https://github.com/OCA/timesheet/tree/16.0/hr_timesheet_sheet_activity
     :alt: OCA/timesheet
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/timesheet-14-0/timesheet-14-0-hr_timesheet_sheet_activity
+    :target: https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-hr_timesheet_sheet_activity
     :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/timesheet&target_branch=14.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/timesheet&target_branch=16.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -46,7 +46,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/timesheet/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/timesheet/issues/new?body=module:%20hr_timesheet_sheet_activity%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/timesheet/issues/new?body=module:%20hr_timesheet_sheet_activity%0Aversion:%2016.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.
 
@@ -82,6 +82,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/timesheet <https://github.com/OCA/timesheet/tree/14.0/hr_timesheet_sheet_activity>`_ project on GitHub.
+This module is part of the `OCA/timesheet <https://github.com/OCA/timesheet/tree/16.0/hr_timesheet_sheet_activity>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

hr_timesheet_sheet_activity/__manifest__.py

@@ -4,7 +4,7 @@
 
 {
     "name": "HR Timesheet Sheet Activities",
-    "version": "14.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Human Resources",
     "website": "https://github.com/OCA/timesheet",
     "author": "CorporateHub, " "Odoo Community Association (OCA)",

hr_timesheet_sheet_activity/data/hr_timesheet_sheet_activity_data.xml

@@ -10,19 +10,19 @@
     <record id="activity_sheet_submission" model="mail.activity.type">
         <field name="name">Timesheet Sheet Submission</field>
         <field name="icon">fa-calendar-check-o</field>
-        <field name="res_model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet" />
+        <field name="res_model">hr_timesheet.sheet</field>
     </record>
 
     <record id="activity_sheet_review" model="mail.activity.type">
         <field name="name">Timesheet Sheet Review</field>
         <field name="icon">fa-calendar-check-o</field>
-        <field name="res_model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet" />
+        <field name="res_model">hr_timesheet.sheet</field>
     </record>
 
     <record id="activity_sheet_resubmission" model="mail.activity.type">
         <field name="name">Timesheet Sheet Re-submission</field>
         <field name="icon">fa-calendar-check-o</field>
-        <field name="res_model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet" />
+        <field name="res_model">hr_timesheet.sheet</field>
     </record>
 
 </odoo>

hr_timesheet_sheet_activity/models/hr_timesheet_sheet.py

@@ -97,10 +97,10 @@ def action_timesheet_draft(self):
                 user_id=sheet.user_id.id,
             )
 
-        super().action_timesheet_draft()
+        return super().action_timesheet_draft()
 
     def action_timesheet_confirm(self):
-        super().action_timesheet_confirm()
+        res = super().action_timesheet_confirm()
 
         # NOTE: activity_reschedule is used instead of activity_feedback
         # to accomodate non-assigned-user completion
@@ -124,9 +124,10 @@ def action_timesheet_confirm(self):
                     date_deadline=deadline,
                     user_id=reviewer.id,
                 )
+        return res
 
     def action_timesheet_done(self):
-        super().action_timesheet_done()
+        res = super().action_timesheet_done()
 
         # NOTE: activity_reschedule is used instead of activity_feedback
         # to accomodate non-assigned-user completion
@@ -140,6 +141,7 @@ def action_timesheet_done(self):
                 # NOTE: Only assigned user can update the activity
                 activity = activity.sudo()
             activity.action_feedback()
+        return res
 
     def action_timesheet_refuse(self):
         for sheet in self:
@@ -149,7 +151,7 @@ def action_timesheet_refuse(self):
                 user_id=sheet.user_id.id,
             )
 
-        super().action_timesheet_refuse()
+        res = super().action_timesheet_refuse()
 
         # NOTE: activity_reschedule is used instead of activity_feedback
         # to accomodate non-assigned-user completion
@@ -163,6 +165,7 @@ def action_timesheet_refuse(self):
                 # NOTE: Only assigned user can update the activity
                 activity = activity.sudo()
             activity.action_feedback()
+        return res
 
     def _activity_sheet_submission_deadline(self):
         """Hook for extensions"""

hr_timesheet_sheet_activity/static/description/index.html

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -9,10 +8,11 @@
 
 /*
 :Author: David Goodger ([email protected])
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -369,7 +369,7 @@ <h1 class="title">HR Timesheet Sheet Activities</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:fe04fe07b7e649beb3b78bb931a004609d534e967cd81dbf3756234698c6784a
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/timesheet/tree/14.0/hr_timesheet_sheet_activity"><img alt="OCA/timesheet" src="https://img.shields.io/badge/github-OCA%2Ftimesheet-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/timesheet-14-0/timesheet-14-0-hr_timesheet_sheet_activity"><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/timesheet&amp;target_branch=14.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/timesheet/tree/16.0/hr_timesheet_sheet_activity"><img alt="OCA/timesheet" src="https://img.shields.io/badge/github-OCA%2Ftimesheet-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-hr_timesheet_sheet_activity"><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/timesheet&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module adds the following activities related to submission and review of
 timesheet sheets:</p>
 <ul class="simple">
@@ -394,7 +394,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/timesheet/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/timesheet/issues/new?body=module:%20hr_timesheet_sheet_activity%0Aversion:%2014.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/timesheet/issues/new?body=module:%20hr_timesheet_sheet_activity%0Aversion:%2016.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">
@@ -421,11 +421,13 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <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/timesheet/tree/14.0/hr_timesheet_sheet_activity">OCA/timesheet</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/timesheet/tree/16.0/hr_timesheet_sheet_activity">OCA/timesheet</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>

hr_timesheet_sheet_activity/tests/test_hr_timesheet_sheet_activity.py

@@ -224,9 +224,7 @@ def test_period_ends_on_workday(self):
         sheet = (
             self.HrTimesheetSheet.with_user(user_1)
             .with_context(
-                {
-                    "hr_timesheet_sheet_activity_today": date(2020, 2, 7),
-                }
+                hr_timesheet_sheet_activity_today=date(2020, 2, 7),
             )
             .create(
                 {
@@ -314,9 +312,7 @@ def test_period_ends_on_weekend(self):
         sheet = (
             self.HrTimesheetSheet.with_user(user_1)
             .with_context(
-                {
-                    "hr_timesheet_sheet_activity_today": date(2020, 2, 7),
-                }
+                hr_timesheet_sheet_activity_today=date(2020, 2, 7),
             )
             .create(
                 {
@@ -404,9 +400,7 @@ def test_period_overdue(self):
         sheet = (
             self.HrTimesheetSheet.with_user(user_1)
             .with_context(
-                {
-                    "hr_timesheet_sheet_activity_today": date(2020, 2, 7),
-                }
+                hr_timesheet_sheet_activity_today=date(2020, 2, 7),
             )
             .create(
                 {
@@ -494,9 +488,7 @@ def test_weekend_period(self):
         sheet = (
             self.HrTimesheetSheet.with_user(user_1)
             .with_context(
-                {
-                    "hr_timesheet_sheet_activity_today": date(2020, 2, 1),
-                }
+                hr_timesheet_sheet_activity_today=date(2020, 2, 1),
             )
             .create(
                 {

hr_timesheet_sheet_activity/views/mail_activity.xml

@@ -12,7 +12,7 @@
         <field name="name">Activity Types</field>
         <field name="res_model">mail.activity.type</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('res_model_id.model', '=', 'hr_timesheet.sheet')]</field>
+        <field name="domain">[('res_model', '=', 'hr_timesheet.sheet')]</field>
         <field name="context">{'default_res_model': 'hr_timesheet.sheet'}</field>
     </record>