From d9a09e84fe1d7b1f98191f95fa900363a1588257 Mon Sep 17 00:00:00 2001 From: Carmen Bianca BAKKER Date: Thu, 20 Jun 2024 17:20:04 +0200 Subject: [PATCH] [ADD] hr_timesheet_overtime_begin_end Signed-off-by: Carmen Bianca BAKKER --- hr_timesheet_overtime_begin_end/README.rst | 70 +++ hr_timesheet_overtime_begin_end/__init__.py | 5 + .../__manifest__.py | 21 + .../models/__init__.py | 5 + .../models/account_analytic_line.py | 14 + .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 1 + .../static/description/index.html | 420 ++++++++++++++++++ .../tests/__init__.py | 5 + .../tests/test_analytic_line.py | 46 ++ .../addons/hr_timesheet_overtime_begin_end | 1 + .../hr_timesheet_overtime_begin_end/setup.py | 6 + 12 files changed, 597 insertions(+) create mode 100644 hr_timesheet_overtime_begin_end/README.rst create mode 100644 hr_timesheet_overtime_begin_end/__init__.py create mode 100644 hr_timesheet_overtime_begin_end/__manifest__.py create mode 100644 hr_timesheet_overtime_begin_end/models/__init__.py create mode 100644 hr_timesheet_overtime_begin_end/models/account_analytic_line.py create mode 100644 hr_timesheet_overtime_begin_end/readme/CONTRIBUTORS.rst create mode 100644 hr_timesheet_overtime_begin_end/readme/DESCRIPTION.rst create mode 100644 hr_timesheet_overtime_begin_end/static/description/index.html create mode 100644 hr_timesheet_overtime_begin_end/tests/__init__.py create mode 100644 hr_timesheet_overtime_begin_end/tests/test_analytic_line.py create mode 120000 setup/hr_timesheet_overtime_begin_end/odoo/addons/hr_timesheet_overtime_begin_end create mode 100644 setup/hr_timesheet_overtime_begin_end/setup.py diff --git a/hr_timesheet_overtime_begin_end/README.rst b/hr_timesheet_overtime_begin_end/README.rst new file mode 100644 index 0000000..ccc8206 --- /dev/null +++ b/hr_timesheet_overtime_begin_end/README.rst @@ -0,0 +1,70 @@ +====================================================== +Timesheet - Overtime and begin/end hours compatibility +====================================================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:5ab790e671629b45c0297eceb50037e97ab4827da3d637687db534dd0dd0dde0 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :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/16.0/hr_timesheet_overtime_begin_end + :alt: coopiteasy/cie-timesheet + +|badge1| |badge2| |badge3| + +Make the two modules compatible. + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub 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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Coop IT Easy SC + +Contributors +~~~~~~~~~~~~ + +* `Coop IT Easy SC `_: + + * Carmen Bianca BAKKER + +Maintainers +~~~~~~~~~~~ + +.. |maintainer-carmenbianca| image:: https://github.com/carmenbianca.png?size=40px + :target: https://github.com/carmenbianca + :alt: carmenbianca + +Current maintainer: + +|maintainer-carmenbianca| + +This module is part of the `coopiteasy/cie-timesheet `_ project on GitHub. + +You are welcome to contribute. diff --git a/hr_timesheet_overtime_begin_end/__init__.py b/hr_timesheet_overtime_begin_end/__init__.py new file mode 100644 index 0000000..3eb7887 --- /dev/null +++ b/hr_timesheet_overtime_begin_end/__init__.py @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: 2024 Coop IT Easy SC +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +from . import models diff --git a/hr_timesheet_overtime_begin_end/__manifest__.py b/hr_timesheet_overtime_begin_end/__manifest__.py new file mode 100644 index 0000000..ed42081 --- /dev/null +++ b/hr_timesheet_overtime_begin_end/__manifest__.py @@ -0,0 +1,21 @@ +# SPDX-FileCopyrightText: 2024 Coop IT Easy SC +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +{ + "name": "Timesheet - Overtime and begin/end hours compatibility", + "summary": """ + Make the two modules compatible.""", + "version": "16.0.1.0.0", + "category": "Human Resources", + "website": "https://github.com/coopiteasy/cie-timesheet", + "author": "Coop IT Easy SC", + "maintainers": ["carmenbianca"], + "license": "AGPL-3", + "application": False, + "depends": [ + "hr_timesheet_overtime", + "hr_timesheet_begin_end", + ], + "auto_install": True, +} diff --git a/hr_timesheet_overtime_begin_end/models/__init__.py b/hr_timesheet_overtime_begin_end/models/__init__.py new file mode 100644 index 0000000..84f4adc --- /dev/null +++ b/hr_timesheet_overtime_begin_end/models/__init__.py @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: 2024 Coop IT Easy SC +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +from . import account_analytic_line diff --git a/hr_timesheet_overtime_begin_end/models/account_analytic_line.py b/hr_timesheet_overtime_begin_end/models/account_analytic_line.py new file mode 100644 index 0000000..93cccad --- /dev/null +++ b/hr_timesheet_overtime_begin_end/models/account_analytic_line.py @@ -0,0 +1,14 @@ +# SPDX-FileCopyrightText: 2024 Coop IT Easy SC +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +from odoo import models + + +class AnalyticLine(models.Model): + _inherit = "account.analytic.line" + + def unit_amount_from_start_stop(self): + result = super().unit_amount_from_start_stop() + result *= self.rate_for_date(self.date) + return result diff --git a/hr_timesheet_overtime_begin_end/readme/CONTRIBUTORS.rst b/hr_timesheet_overtime_begin_end/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000..f1ac675 --- /dev/null +++ b/hr_timesheet_overtime_begin_end/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Coop IT Easy SC `_: + + * Carmen Bianca BAKKER diff --git a/hr_timesheet_overtime_begin_end/readme/DESCRIPTION.rst b/hr_timesheet_overtime_begin_end/readme/DESCRIPTION.rst new file mode 100644 index 0000000..58c190c --- /dev/null +++ b/hr_timesheet_overtime_begin_end/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +Make the two modules compatible. diff --git a/hr_timesheet_overtime_begin_end/static/description/index.html b/hr_timesheet_overtime_begin_end/static/description/index.html new file mode 100644 index 0000000..a9ed5b0 --- /dev/null +++ b/hr_timesheet_overtime_begin_end/static/description/index.html @@ -0,0 +1,420 @@ + + + + + +Timesheet - Overtime and begin/end hours compatibility + + + +
+

Timesheet - Overtime and begin/end hours compatibility

+ + +

Beta License: AGPL-3 coopiteasy/cie-timesheet

+

Make the two modules compatible.

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub 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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Coop IT Easy SC
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

Current maintainer:

+

carmenbianca

+

This module is part of the coopiteasy/cie-timesheet project on GitHub.

+

You are welcome to contribute.

+
+
+
+ + diff --git a/hr_timesheet_overtime_begin_end/tests/__init__.py b/hr_timesheet_overtime_begin_end/tests/__init__.py new file mode 100644 index 0000000..926bcd5 --- /dev/null +++ b/hr_timesheet_overtime_begin_end/tests/__init__.py @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: 2024 Coop IT Easy SC +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +from . import test_analytic_line diff --git a/hr_timesheet_overtime_begin_end/tests/test_analytic_line.py b/hr_timesheet_overtime_begin_end/tests/test_analytic_line.py new file mode 100644 index 0000000..5d187ec --- /dev/null +++ b/hr_timesheet_overtime_begin_end/tests/test_analytic_line.py @@ -0,0 +1,46 @@ +# SPDX-FileCopyrightText: 2024 Coop IT Easy SC +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +from odoo.tests.common import TransactionCase + + +class TestAnalyticLine(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.project = cls.env.ref("project.project_project_1") + cls.employee = cls.env.ref("hr.employee_qdp") + # I'm not sure what this record does in this context. + cls.overtime = cls.env["resource.overtime"].create({"name": "test"}) + cls.rate = cls.env["resource.overtime.rate"].create( + { + "name": "test", + "dayofweek": "0", # Monday + "rate": 2.0, + "overtime_id": cls.overtime.id, + } + ) + + def base_line(self): + return { + "name": "test", + "date": "2024-01-01", # Monday + "time_start": 10.0, + "time_stop": 12.0, + "project_id": self.project.id, + "employee_id": self.employee.id, + } + + def test_rate_applied(self): + line = self.base_line() + line_record = self.env["account.analytic.line"].create(line) + self.assertEqual(line_record.unit_amount, 4.0) + + def test_rate_applied_after_edit(self): + line = self.base_line() + del line["time_start"] + del line["time_stop"] + line_record = self.env["account.analytic.line"].create(line) + line_record.write({"time_start": 10.0, "time_stop": 12.0}) + self.assertEqual(line_record.unit_amount, 4.0) diff --git a/setup/hr_timesheet_overtime_begin_end/odoo/addons/hr_timesheet_overtime_begin_end b/setup/hr_timesheet_overtime_begin_end/odoo/addons/hr_timesheet_overtime_begin_end new file mode 120000 index 0000000..58ec292 --- /dev/null +++ b/setup/hr_timesheet_overtime_begin_end/odoo/addons/hr_timesheet_overtime_begin_end @@ -0,0 +1 @@ +../../../../hr_timesheet_overtime_begin_end \ No newline at end of file diff --git a/setup/hr_timesheet_overtime_begin_end/setup.py b/setup/hr_timesheet_overtime_begin_end/setup.py new file mode 100644 index 0000000..28c57bb --- /dev/null +++ b/setup/hr_timesheet_overtime_begin_end/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)