16.0 mig hr timesheet overtime

hr_timesheet_overtime/README.rst

@@ -2,10 +2,13 @@
 Timesheet/Contract - Overtime
 =============================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:864f762c46f2380ae49c8c705bd419243ee57a30b935ef491a26df7837f119d4
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
@@ -14,10 +17,10 @@ Timesheet/Contract - Overtime
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-coopiteasy%2Fcie--timesheet-lightgray.png?logo=github
-    :target: https://github.com/coopiteasy/cie-timesheet/tree/12.0/hr_timesheet_overtime
+    :target: https://github.com/coopiteasy/cie-timesheet/tree/16.0/hr_timesheet_overtime
     :alt: coopiteasy/cie-timesheet
 
-|badge1| |badge2| |badge3| 
+|badge1| |badge2| |badge3|
 
 Computes overtime hours according to employee's contracts.
 
@@ -31,8 +34,8 @@ Bug Tracker
 
 Bugs are tracked on `GitHub Issues <https://github.com/coopiteasy/cie-timesheet/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/coopiteasy/cie-timesheet/issues/new?body=module:%20hr_timesheet_overtime%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/coopiteasy/cie-timesheet/issues/new?body=module:%20hr_timesheet_overtime%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.
 
@@ -63,6 +66,6 @@ The development of this module has been paid for by
 Maintainers
 ~~~~~~~~~~~
 
-This module is part of the `coopiteasy/cie-timesheet <https://github.com/coopiteasy/cie-timesheet/tree/12.0/hr_timesheet_overtime>`_ project on GitHub.
+This module is part of the `coopiteasy/cie-timesheet <https://github.com/coopiteasy/cie-timesheet/tree/16.0/hr_timesheet_overtime>`_ project on GitHub.
 
 You are welcome to contribute.

hr_timesheet_overtime/__manifest__.py

@@ -7,7 +7,7 @@
     "category": "Human Resources",
     "summary": "Overtime Calculation",
     "author": "Coop IT Easy SC, Odoo Community Association (OCA)",
-    "website": "https://coopiteasy.be",
+    "website": "https://github.com/coopiteasy/cie-timesheet",
     "license": "AGPL-3",
     "depends": [
         "company_today",

hr_timesheet_overtime/models/account_analytic_line.py

@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 import logging
 
-from odoo import api, fields, models
+from odoo import fields, models
 
 _logger = logging.getLogger(__name__)
 

hr_timesheet_overtime/models/hr_employee.py

@@ -18,25 +18,22 @@ class HrEmployee(models.Model):
         help="Hours to work for the current day",
     )
     initial_overtime = fields.Float(
-        string="Initial Overtime",
         default=0.0,
         help="Initial Overtime to start Overtime Start Date with",
     )
     total_overtime = fields.Float(
-        string="Total Overtime",
         compute="_compute_total_overtime",
         help="Total Overtime since Overtime Start Date",
         store=True,
     )
     timesheet_sheet_ids = fields.One2many(
+        string="Timesheet sheets",
         comodel_name="hr_timesheet.sheet",
         inverse_name="employee_id",
-        string="Timesheet sheets",
     )
 
     # Date fields
     overtime_start_date = fields.Date(
-        string="Overtime Start Date",
         required=True,
         default=date.today().replace(month=1, day=1),
         help="Overtime Start Date to compute overtime",

hr_timesheet_overtime/models/hr_timesheet_sheet.py

@@ -12,7 +12,7 @@
 class HrTimesheetSheet(models.Model):
     _inherit = "hr_timesheet.sheet"
 
-    active = fields.Boolean("Active", default=True)
+    active = fields.Boolean(default=True)
     # Numeric fields
     daily_working_time = fields.Float(
         "Daily Working Hours",
@@ -26,25 +26,21 @@ class HrTimesheetSheet(models.Model):
         store=True,
     )
     daily_overtime = fields.Float(
-        "Daily Overtime",
         compute="_compute_daily_overtime",
         help="Overtime for the current day",
     )
     timesheet_overtime = fields.Float(
-        "Timesheet Overtime",
         compute="_compute_timesheet_overtime",
         help="Overtime for this timesheet period",
         store=True,
     )
     timesheet_overtime_trimmed = fields.Float(
-        "Trimmed Timesheet Overtime",
         compute="_compute_timesheet_overtime_trimmed",
         help="Overtime for this timesheet period, from the employee's start date until"
         " today",
         store=True,
     )
     total_overtime = fields.Float(
-        "Overtime Total",
         related="employee_id.total_overtime",
         help="Overtime total since employee's overtime start date",
     )

hr_timesheet_overtime/models/resource_overtime.py

@@ -13,18 +13,18 @@ class ResourceOvertime(models.Model):
 
     # Relational fields
     rate_ids = fields.One2many(
+        string="Overtime Rate",
         comodel_name="resource.overtime.rate",
         inverse_name="overtime_id",
-        string="Overtime Rate",
         copy=True,
     )
     company_id = fields.Many2one(
-        "res.company",
         string="Company",
+        comodel_name="res.company",
         default=lambda self: self.env["res.company"]._company_default_get(),
     )
     manager = fields.Many2one(
-        "res.users",
         string="Workgroup Manager",
+        comodel_name="res.users",
         default=lambda self: self.env.uid,
     )

hr_timesheet_overtime/models/resource_overtime_rate.py

@@ -12,7 +12,8 @@ class ResourceOvertimeRate(models.Model):
     # String fields
     name = fields.Char(required=True)
     dayofweek = fields.Selection(
-        [
+        string="Day of Week",
+        selection=[
             ("0", "Monday"),
             ("1", "Tuesday"),
             ("2", "Wednesday"),
@@ -21,13 +22,12 @@ class ResourceOvertimeRate(models.Model):
             ("5", "Saturday"),
             ("6", "Sunday"),
         ],
-        "Day of Week",
         required=True,
         index=True,
     )
 
     # Numeric fields
-    rate = fields.Float("Rate", default="1.00", digits=(3, 2))
+    rate = fields.Float(default="1.00", digits=(3, 2))
     overtime_id = fields.Many2one(
         "resource.overtime",
         string="Resource's Overtime",

hr_timesheet_overtime/static/description/index.html

@@ -1,20 +1,19 @@
-<?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>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
 <title>Timesheet/Contract - Overtime</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger ([email protected])
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
 
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
 */
 
@@ -366,39 +365,42 @@ <h1 class="title">Timesheet/Contract - Overtime</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:864f762c46f2380ae49c8c705bd419243ee57a30b935ef491a26df7837f119d4
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/coopiteasy/cie-timesheet/tree/12.0/hr_timesheet_overtime"><img alt="coopiteasy/cie-timesheet" src="https://img.shields.io/badge/github-coopiteasy%2Fcie--timesheet-lightgray.png?logo=github" /></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/coopiteasy/cie-timesheet/tree/16.0/hr_timesheet_overtime"><img alt="coopiteasy/cie-timesheet" src="https://img.shields.io/badge/github-coopiteasy%2Fcie--timesheet-lightgray.png?logo=github" /></a></p>
 <p>Computes overtime hours according to employee’s contracts.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-5">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
+<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/coopiteasy/cie-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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/coopiteasy/cie-timesheet/issues/new?body=module:%20hr_timesheet_overtime%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/coopiteasy/cie-timesheet/issues/new?body=module:%20hr_timesheet_overtime%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">
-<h1><a class="toc-backref" href="#id2">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id3">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
 <ul class="simple">
 <li>Coop IT Easy SC</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 <ul class="simple">
 <li><a class="reference external" href="https://coopiteasy.be">Coop IT Easy SC</a>:<ul>
 <li>Vincent Van Rossem</li>
@@ -409,9 +411,14 @@ <h2><a class="toc-backref" href="#id4">Contributors</a></h2>
 </li>
 </ul>
 </div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-5">Other credits</a></h2>
+<p>The development of this module has been paid for by
+<a class="reference external" href="https://www.provelo.org/">Pro Velo</a>.</p>
+</div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
-<p>This module is part of the <a class="reference external" href="https://github.com/coopiteasy/cie-timesheet/tree/12.0/hr_timesheet_overtime">coopiteasy/cie-timesheet</a> project on GitHub.</p>
+<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/coopiteasy/cie-timesheet/tree/16.0/hr_timesheet_overtime">coopiteasy/cie-timesheet</a> project on GitHub.</p>
 <p>You are welcome to contribute.</p>
 </div>
 </div>

hr_timesheet_overtime/views/resource_view.xml

@@ -36,7 +36,7 @@
         <field name="name">resource.overtime.tree</field>
         <field name="model">resource.overtime</field>
         <field name="arch" type="xml">
-            <tree string="Overtime Rate">
+            <tree>
                 <field name="name" />
                 <field name="manager" />
                 <field name="company_id" groups="base.group_multi_company" />
@@ -63,7 +63,7 @@
         <field name="name">resource.overtime.rate.tree</field>
         <field name="model">resource.overtime.rate</field>
         <field name="arch" type="xml">
-            <tree string="Overtime Rate" editable="top">
+            <tree editable="top">
                 <field name="name" />
                 <field name="dayofweek" />
                 <field name="rate" />

setup/hr_timesheet_overtime/odoo/addons/hr_timesheet_overtime

@@ -0,0 +1 @@
+../../../../hr_timesheet_overtime

setup/hr_timesheet_overtime/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)