diff --git a/hr_timesheet_analytic_tag/README.rst b/hr_timesheet_analytic_tag/README.rst new file mode 100644 index 0000000000..f620c5a455 --- /dev/null +++ b/hr_timesheet_analytic_tag/README.rst @@ -0,0 +1,94 @@ +========================= +Hr Timesheet Analytic Tag +========================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:618b0e3c7c18155dc29be473e79af28f27c2c9f7d99fbf8ecabf35c5f79ba7d2 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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-OCA%2Faccount--analytic-lightgray.png?logo=github + :target: https://github.com/OCA/account-analytic/tree/18.0/hr_timesheet_analytic_tag + :alt: OCA/account-analytic +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-analytic-18-0/account-analytic-18-0-hr_timesheet_analytic_tag + :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/account-analytic&target_branch=18.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +The module restores the possibility of defining analytical tags in +project tasks and timesheets so that the analytical items generated have +those tags. + +**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 +------- + +* Tecnativa + +Contributors +------------ + +- `Tecnativa `__: + + - Víctor Martínez + - Pedro M. Baeza + +- `APSL-Nagarro `__: + + - Bernat Obrador + - Antoni Marroig + +Maintainers +----------- + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. + +.. |maintainer-victoralmau| image:: https://github.com/victoralmau.png?size=40px + :target: https://github.com/victoralmau + :alt: victoralmau + +Current `maintainer `__: + +|maintainer-victoralmau| + +This module is part of the `OCA/account-analytic `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/hr_timesheet_analytic_tag/__init__.py b/hr_timesheet_analytic_tag/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/hr_timesheet_analytic_tag/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/hr_timesheet_analytic_tag/__manifest__.py b/hr_timesheet_analytic_tag/__manifest__.py new file mode 100644 index 0000000000..d2fe9b792b --- /dev/null +++ b/hr_timesheet_analytic_tag/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2023 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + "name": "Hr Timesheet Analytic Tag", + "version": "18.0.1.0.0", + "category": "Accounting & Finance", + "website": "https://github.com/OCA/account-analytic", + "author": "Tecnativa, Odoo Community Association (OCA)", + "license": "AGPL-3", + "depends": ["hr_timesheet", "account_analytic_tag"], + "installable": True, + "auto_install": True, + "data": [ + "views/project_task_view.xml", + ], + "maintainers": ["victoralmau"], +} diff --git a/hr_timesheet_analytic_tag/i18n/es.po b/hr_timesheet_analytic_tag/i18n/es.po new file mode 100644 index 0000000000..a6ff20176a --- /dev/null +++ b/hr_timesheet_analytic_tag/i18n/es.po @@ -0,0 +1,33 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_timesheet_analytic_tag +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-10-20 07:06+0000\n" +"PO-Revision-Date: 2023-10-20 09:07+0200\n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: \n" +"X-Generator: Poedit 3.0.1\n" + +#. module: hr_timesheet_analytic_tag +#: model:ir.model,name:hr_timesheet_analytic_tag.model_account_analytic_line +msgid "Analytic Line" +msgstr "Línea analítica" + +#. module: hr_timesheet_analytic_tag +#: model:ir.model.fields,field_description:hr_timesheet_analytic_tag.field_project_task__analytic_tag_ids +msgid "Analytic Tags" +msgstr "Etiquetas analíticas" + +#. module: hr_timesheet_analytic_tag +#: model:ir.model,name:hr_timesheet_analytic_tag.model_project_task +msgid "Task" +msgstr "Tarea" diff --git a/hr_timesheet_analytic_tag/i18n/hr_timesheet_analytic_tag.pot b/hr_timesheet_analytic_tag/i18n/hr_timesheet_analytic_tag.pot new file mode 100644 index 0000000000..7ecf81d00a --- /dev/null +++ b/hr_timesheet_analytic_tag/i18n/hr_timesheet_analytic_tag.pot @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_timesheet_analytic_tag +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 17.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: hr_timesheet_analytic_tag +#: model:ir.model,name:hr_timesheet_analytic_tag.model_account_analytic_line +msgid "Analytic Line" +msgstr "" + +#. module: hr_timesheet_analytic_tag +#: model:ir.model.fields,field_description:hr_timesheet_analytic_tag.field_project_task__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + +#. module: hr_timesheet_analytic_tag +#: model:ir.model,name:hr_timesheet_analytic_tag.model_project_task +msgid "Task" +msgstr "" diff --git a/hr_timesheet_analytic_tag/i18n/it.po b/hr_timesheet_analytic_tag/i18n/it.po new file mode 100644 index 0000000000..b3e19a866e --- /dev/null +++ b/hr_timesheet_analytic_tag/i18n/it.po @@ -0,0 +1,32 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_timesheet_analytic_tag +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2024-02-23 08:43+0000\n" +"Last-Translator: mymage \n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. module: hr_timesheet_analytic_tag +#: model:ir.model,name:hr_timesheet_analytic_tag.model_account_analytic_line +msgid "Analytic Line" +msgstr "Riga analitica" + +#. module: hr_timesheet_analytic_tag +#: model:ir.model.fields,field_description:hr_timesheet_analytic_tag.field_project_task__analytic_tag_ids +msgid "Analytic Tags" +msgstr "Etichette analitiche" + +#. module: hr_timesheet_analytic_tag +#: model:ir.model,name:hr_timesheet_analytic_tag.model_project_task +msgid "Task" +msgstr "Lavoro" diff --git a/hr_timesheet_analytic_tag/models/__init__.py b/hr_timesheet_analytic_tag/models/__init__.py new file mode 100644 index 0000000000..08d84c1345 --- /dev/null +++ b/hr_timesheet_analytic_tag/models/__init__.py @@ -0,0 +1,4 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import account_analytic_line +from . import project_task diff --git a/hr_timesheet_analytic_tag/models/account_analytic_line.py b/hr_timesheet_analytic_tag/models/account_analytic_line.py new file mode 100644 index 0000000000..4de51c9779 --- /dev/null +++ b/hr_timesheet_analytic_tag/models/account_analytic_line.py @@ -0,0 +1,15 @@ +# Copyright 2023 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) +from odoo import Command, api, models + + +class AccountAnalyticLine(models.Model): + _inherit = "account.analytic.line" + + @api.model_create_multi + def create(self, vals_list): + for vals in vals_list: + if vals.get("task_id") and not vals.get("tag_ids"): + task = self.env["project.task"].browse(vals.get("task_id")) + vals["tag_ids"] = [Command.set(task.analytic_tag_ids.ids)] + return super().create(vals_list) diff --git a/hr_timesheet_analytic_tag/models/project_task.py b/hr_timesheet_analytic_tag/models/project_task.py new file mode 100644 index 0000000000..98933f4811 --- /dev/null +++ b/hr_timesheet_analytic_tag/models/project_task.py @@ -0,0 +1,14 @@ +# Copyright 2023 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) +from odoo import fields, models + + +class ProjectTask(models.Model): + _inherit = "project.task" + + analytic_tag_ids = fields.Many2many( + comodel_name="account.analytic.tag", + string="Analytic Tags", + domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]", + check_company=True, + ) diff --git a/hr_timesheet_analytic_tag/pyproject.toml b/hr_timesheet_analytic_tag/pyproject.toml new file mode 100644 index 0000000000..4231d0cccb --- /dev/null +++ b/hr_timesheet_analytic_tag/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/hr_timesheet_analytic_tag/readme/CONTRIBUTORS.md b/hr_timesheet_analytic_tag/readme/CONTRIBUTORS.md new file mode 100644 index 0000000000..4f4ad8cc65 --- /dev/null +++ b/hr_timesheet_analytic_tag/readme/CONTRIBUTORS.md @@ -0,0 +1,6 @@ +- [Tecnativa](https://www.tecnativa.com): + - Víctor Martínez + - Pedro M. Baeza +- [APSL-Nagarro](https://www.apsl.tech): + - Bernat Obrador \<\> + - Antoni Marroig \<\> \ No newline at end of file diff --git a/hr_timesheet_analytic_tag/readme/DESCRIPTION.md b/hr_timesheet_analytic_tag/readme/DESCRIPTION.md new file mode 100644 index 0000000000..c9ac78a2ec --- /dev/null +++ b/hr_timesheet_analytic_tag/readme/DESCRIPTION.md @@ -0,0 +1,3 @@ +The module restores the possibility of defining analytical tags in +project tasks and timesheets so that the analytical items generated have +those tags. diff --git a/hr_timesheet_analytic_tag/static/description/icon.png b/hr_timesheet_analytic_tag/static/description/icon.png new file mode 100644 index 0000000000..3a0328b516 Binary files /dev/null and b/hr_timesheet_analytic_tag/static/description/icon.png differ diff --git a/hr_timesheet_analytic_tag/static/description/index.html b/hr_timesheet_analytic_tag/static/description/index.html new file mode 100644 index 0000000000..cdb17b2767 --- /dev/null +++ b/hr_timesheet_analytic_tag/static/description/index.html @@ -0,0 +1,436 @@ + + + + + +Hr Timesheet Analytic Tag + + + +
+

Hr Timesheet Analytic Tag

+ + +

Beta License: AGPL-3 OCA/account-analytic Translate me on Weblate Try me on Runboat

+

The module restores the possibility of defining analytical tags in +project tasks and timesheets so that the analytical items generated have +those tags.

+

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

+
    +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+ +Odoo Community Association + +

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.

+

Current maintainer:

+

victoralmau

+

This module is part of the OCA/account-analytic project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/hr_timesheet_analytic_tag/tests/__init__.py b/hr_timesheet_analytic_tag/tests/__init__.py new file mode 100644 index 0000000000..20791df9c2 --- /dev/null +++ b/hr_timesheet_analytic_tag/tests/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2023 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_hr_timesheet_analytic_tag diff --git a/hr_timesheet_analytic_tag/tests/test_hr_timesheet_analytic_tag.py b/hr_timesheet_analytic_tag/tests/test_hr_timesheet_analytic_tag.py new file mode 100644 index 0000000000..6c3ba045bb --- /dev/null +++ b/hr_timesheet_analytic_tag/tests/test_hr_timesheet_analytic_tag.py @@ -0,0 +1,69 @@ +# Copyright 2023 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo.tests import common, new_test_user + +from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT + + +class TestHrTimesheetAnalyticTag(common.TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env(context=dict(cls.env.context, **DISABLED_MAIL_CONTEXT)) + cls.user = new_test_user( + cls.env, + login="test-user", + groups="hr_timesheet.group_hr_timesheet_user,account_analytic_tag.group_analytic_tags,account.group_account_manager", + ) + cls.employee = cls.env["hr.employee"].create( + { + "name": "Test employee", + "user_id": cls.user.id, + } + ) + cls.project = cls.env["project.project"].create({"name": "Test project"}) + cls.task = cls.env["project.task"].create( + { + "name": "Test task", + "project_id": cls.project.id, + } + ) + aa_tag_model = cls.env["account.analytic.tag"] + cls.analytic_tag_1 = aa_tag_model.create({"name": "Test tag 1"}) + cls.analytic_tag_2 = aa_tag_model.create({"name": "Test tag 2"}) + + def _create_hr_timesheet(self): + return ( + self.env["account.analytic.line"] + .with_user(self.user) + .create( + { + "project_id": self.project.id, + "task_id": self.task.id, + "employee_id": self.employee.id, + } + ) + ) + + def test_hr_timesheet_without_tags(self): + timesheet = self._create_hr_timesheet() + self.assertNotIn(self.analytic_tag_1, timesheet.tag_ids) + self.assertNotIn(self.analytic_tag_2, timesheet.tag_ids) + + def test_hr_timesheet_with_tag_01(self): + self.task.analytic_tag_ids = self.analytic_tag_1 + timesheet = self._create_hr_timesheet() + self.assertIn(self.analytic_tag_1, timesheet.tag_ids) + self.assertNotIn(self.analytic_tag_2, timesheet.tag_ids) + + def test_hr_timesheet_with_tag_02(self): + self.task.analytic_tag_ids = self.analytic_tag_2 + timesheet = self._create_hr_timesheet() + self.assertNotIn(self.analytic_tag_1, timesheet.tag_ids) + self.assertIn(self.analytic_tag_2, timesheet.tag_ids) + + def test_hr_timesheet_with_tags(self): + self.task.analytic_tag_ids = self.analytic_tag_1 + self.analytic_tag_2 + timesheet = self._create_hr_timesheet() + self.assertIn(self.analytic_tag_1, timesheet.tag_ids) + self.assertIn(self.analytic_tag_2, timesheet.tag_ids) diff --git a/hr_timesheet_analytic_tag/views/project_task_view.xml b/hr_timesheet_analytic_tag/views/project_task_view.xml new file mode 100644 index 0000000000..0301b4a3b2 --- /dev/null +++ b/hr_timesheet_analytic_tag/views/project_task_view.xml @@ -0,0 +1,17 @@ + + + + project.task.form + project.task + + + + + + + +