diff --git a/hr_timesheet_employee_analytic_tag/README.rst b/hr_timesheet_employee_analytic_tag/README.rst new file mode 100644 index 0000000000..39cc58d9cd --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/README.rst @@ -0,0 +1,120 @@ +================================== +Hr Timesheet Employee Analytic Tag +================================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:0435c584ccd1aa6246f4ba387fc8088c67531069c6ff5b923699f733dcb9b515 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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%2Ftimesheet-lightgray.png?logo=github + :target: https://github.com/OCA/timesheet/tree/17.0/hr_timesheet_employee_analytic_tag + :alt: OCA/timesheet +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/timesheet-17-0/timesheet-17-0-hr_timesheet_employee_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/timesheet&target_branch=17.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to define analytical labels in employees to be set +when creating analytical items. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +To configure this module, you need to: + +1. Go to *Settings > Users & Companies > Users*. + +2. Give your user these technical permissions to see all required + elements: + + - Analytic Accounting + - Analytic Accounting Tags + - Show Full Accounting Features + +3. Go to the Employees app and edit your employee (should match your + user). + +4. Choose or create 'Analytic Tags' in 'Timesheets' under 'HR Settings' + tab. + +Usage +===== + +1. Go to *Timesheets* and creates a new record. +2. Go to *Invoicing > Accounting > Management > Analytic Items*. +3. The previously created record will have the defined employee's + analytical tags. + +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 + +- `Binhex `__: + + - Deriman Alonso + +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/timesheet `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/hr_timesheet_employee_analytic_tag/__init__.py b/hr_timesheet_employee_analytic_tag/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/hr_timesheet_employee_analytic_tag/__manifest__.py b/hr_timesheet_employee_analytic_tag/__manifest__.py new file mode 100644 index 0000000000..59557fd4d9 --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2022 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + "name": "Hr Timesheet Employee Analytic Tag", + "version": "17.0.1.0.0", + "category": "Timesheet", + "website": "https://github.com/OCA/timesheet", + "author": "Tecnativa, Odoo Community Association (OCA)", + "license": "AGPL-3", + "depends": ["hr_timesheet", "account_analytic_tag"], + "installable": True, + "data": [ + "views/hr_employee_view.xml", + ], + "maintainers": ["victoralmau"], +} diff --git a/hr_timesheet_employee_analytic_tag/i18n/es.po b/hr_timesheet_employee_analytic_tag/i18n/es.po new file mode 100644 index 0000000000..5ec62aefb9 --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/i18n/es.po @@ -0,0 +1,41 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_timesheet_employee_analytic_tag +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-09-30 06:13+0000\n" +"PO-Revision-Date: 2022-09-30 06:13+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: hr_timesheet_employee_analytic_tag +#: model:ir.model,name:hr_timesheet_employee_analytic_tag.model_account_analytic_line +msgid "Analytic Line" +msgstr "Línea analítica" + +#. module: hr_timesheet_employee_analytic_tag +#: model:ir.model.fields,field_description:hr_timesheet_employee_analytic_tag.field_hr_employee__timesheet_analytic_tag_ids +msgid "Analytic Tags" +msgstr "Etiquetas analíticas" + +#. module: hr_timesheet_employee_analytic_tag +#: model:ir.model,name:hr_timesheet_employee_analytic_tag.model_hr_employee +msgid "Employee" +msgstr "Empleado" + +#~ msgid "Display Name" +#~ msgstr "Nombre mostrado" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Last Modified on" +#~ msgstr "Última modificación el" diff --git a/hr_timesheet_employee_analytic_tag/i18n/hr_timesheet_employee_analytic_tag.pot b/hr_timesheet_employee_analytic_tag/i18n/hr_timesheet_employee_analytic_tag.pot new file mode 100644 index 0000000000..2a8d72d3d5 --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/i18n/hr_timesheet_employee_analytic_tag.pot @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_timesheet_employee_analytic_tag +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.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_employee_analytic_tag +#: model:ir.model,name:hr_timesheet_employee_analytic_tag.model_account_analytic_line +msgid "Analytic Line" +msgstr "" + +#. module: hr_timesheet_employee_analytic_tag +#: model:ir.model.fields,field_description:hr_timesheet_employee_analytic_tag.field_hr_employee__timesheet_analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + +#. module: hr_timesheet_employee_analytic_tag +#: model:ir.model,name:hr_timesheet_employee_analytic_tag.model_hr_employee +msgid "Employee" +msgstr "" diff --git a/hr_timesheet_employee_analytic_tag/i18n/it.po b/hr_timesheet_employee_analytic_tag/i18n/it.po new file mode 100644 index 0000000000..a6953fd6d6 --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/i18n/it.po @@ -0,0 +1,41 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_timesheet_employee_analytic_tag +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2023-01-12 03:49+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.14.1\n" + +#. module: hr_timesheet_employee_analytic_tag +#: model:ir.model,name:hr_timesheet_employee_analytic_tag.model_account_analytic_line +msgid "Analytic Line" +msgstr "Riga analitica" + +#. module: hr_timesheet_employee_analytic_tag +#: model:ir.model.fields,field_description:hr_timesheet_employee_analytic_tag.field_hr_employee__timesheet_analytic_tag_ids +msgid "Analytic Tags" +msgstr "Etichette analitiche" + +#. module: hr_timesheet_employee_analytic_tag +#: model:ir.model,name:hr_timesheet_employee_analytic_tag.model_hr_employee +msgid "Employee" +msgstr "Dipendente" + +#~ msgid "Display Name" +#~ msgstr "Nome visualizzato" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Last Modified on" +#~ msgstr "Ultima modifica il" diff --git a/hr_timesheet_employee_analytic_tag/i18n/pt_BR.po b/hr_timesheet_employee_analytic_tag/i18n/pt_BR.po new file mode 100644 index 0000000000..49759dfc69 --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/i18n/pt_BR.po @@ -0,0 +1,32 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_timesheet_employee_analytic_tag +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2023-10-27 21:55+0000\n" +"Last-Translator: Adriano Prado \n" +"Language-Team: none\n" +"Language: pt_BR\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_employee_analytic_tag +#: model:ir.model,name:hr_timesheet_employee_analytic_tag.model_account_analytic_line +msgid "Analytic Line" +msgstr "Linha Analítica" + +#. module: hr_timesheet_employee_analytic_tag +#: model:ir.model.fields,field_description:hr_timesheet_employee_analytic_tag.field_hr_employee__timesheet_analytic_tag_ids +msgid "Analytic Tags" +msgstr "Marcadores Analíticos" + +#. module: hr_timesheet_employee_analytic_tag +#: model:ir.model,name:hr_timesheet_employee_analytic_tag.model_hr_employee +msgid "Employee" +msgstr "Funcionário" diff --git a/hr_timesheet_employee_analytic_tag/models/__init__.py b/hr_timesheet_employee_analytic_tag/models/__init__.py new file mode 100644 index 0000000000..f993660636 --- /dev/null +++ b/hr_timesheet_employee_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 hr_employee diff --git a/hr_timesheet_employee_analytic_tag/models/account_analytic_line.py b/hr_timesheet_employee_analytic_tag/models/account_analytic_line.py new file mode 100644 index 0000000000..266867251a --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/models/account_analytic_line.py @@ -0,0 +1,21 @@ +# Copyright 2022 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, models + + +class AccountAnalyticLine(models.Model): + _inherit = "account.analytic.line" + + @api.model_create_multi + def create(self, vals_list): + employee_model = self.env["hr.employee"] + for vals in vals_list: + if vals.get("employee_id") and vals.get("project_id"): + employee = employee_model.browse(vals.get("employee_id")).sudo() + if employee.timesheet_analytic_tag_ids: + vals["tag_ids"] = vals.get("tag_ids", []) + vals["tag_ids"] += [ + (4, tag.id) for tag in employee.timesheet_analytic_tag_ids + ] + return super().create(vals_list) diff --git a/hr_timesheet_employee_analytic_tag/models/hr_employee.py b/hr_timesheet_employee_analytic_tag/models/hr_employee.py new file mode 100644 index 0000000000..8c350bd679 --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/models/hr_employee.py @@ -0,0 +1,13 @@ +# Copyright 2022 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class HrEmployee(models.Model): + _inherit = "hr.employee" + + timesheet_analytic_tag_ids = fields.Many2many( + comodel_name="account.analytic.tag", + string="Analytic Tags", + ) diff --git a/hr_timesheet_employee_analytic_tag/pyproject.toml b/hr_timesheet_employee_analytic_tag/pyproject.toml new file mode 100644 index 0000000000..4231d0cccb --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/hr_timesheet_employee_analytic_tag/readme/CONFIGURE.md b/hr_timesheet_employee_analytic_tag/readme/CONFIGURE.md new file mode 100644 index 0000000000..4157b6fa4d --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/readme/CONFIGURE.md @@ -0,0 +1,14 @@ +To configure this module, you need to: + +1. Go to *Settings \> Users & Companies \> Users*. + +2. Give your user these technical permissions to see all required elements: + - Analytic Accounting + - Analytic Accounting Tags + - Show Full Accounting Features + +3. Go to the Employees app and edit your employee (should match your + user). + +4. Choose or create 'Analytic Tags' in 'Timesheets' under 'HR Settings' + tab. diff --git a/hr_timesheet_employee_analytic_tag/readme/CONTRIBUTORS.md b/hr_timesheet_employee_analytic_tag/readme/CONTRIBUTORS.md new file mode 100644 index 0000000000..a7d9698a70 --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/readme/CONTRIBUTORS.md @@ -0,0 +1,5 @@ +- [Tecnativa](https://www.tecnativa.com): + - Víctor Martínez + - Pedro M. Baeza +- [Binhex](https://binhex.cloud/): + - Deriman Alonso diff --git a/hr_timesheet_employee_analytic_tag/readme/DESCRIPTION.md b/hr_timesheet_employee_analytic_tag/readme/DESCRIPTION.md new file mode 100644 index 0000000000..017f55c09a --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/readme/DESCRIPTION.md @@ -0,0 +1,2 @@ +This module allows to define analytical labels in employees to be set +when creating analytical items. diff --git a/hr_timesheet_employee_analytic_tag/readme/USAGE.md b/hr_timesheet_employee_analytic_tag/readme/USAGE.md new file mode 100644 index 0000000000..c5ad7a7063 --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/readme/USAGE.md @@ -0,0 +1,4 @@ +1. Go to *Timesheets* and creates a new record. +2. Go to *Invoicing \> Accounting \> Management \> Analytic Items*. +3. The previously created record will have the defined employee's + analytical tags. diff --git a/hr_timesheet_employee_analytic_tag/static/description/icon.png b/hr_timesheet_employee_analytic_tag/static/description/icon.png new file mode 100644 index 0000000000..3a0328b516 Binary files /dev/null and b/hr_timesheet_employee_analytic_tag/static/description/icon.png differ diff --git a/hr_timesheet_employee_analytic_tag/static/description/index.html b/hr_timesheet_employee_analytic_tag/static/description/index.html new file mode 100644 index 0000000000..9bc2ac136c --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/static/description/index.html @@ -0,0 +1,463 @@ + + + + + +Hr Timesheet Employee Analytic Tag + + + +
+

Hr Timesheet Employee Analytic Tag

+ + +

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

+

This module allows to define analytical labels in employees to be set +when creating analytical items.

+

Table of contents

+ +
+

Configuration

+

To configure this module, you need to:

+
    +
  1. Go to Settings > Users & Companies > Users.
    2. +
  2. Give your user these technical permissions to see all required +elements:
      +
    • Analytic Accounting
      • +
    • Analytic Accounting Tags
      • +
    • Show Full Accounting Features
      • +
    +
    3. +
  3. Go to the Employees app and edit your employee (should match your +user).
    4. +
  4. Choose or create ‘Analytic Tags’ in ‘Timesheets’ under ‘HR Settings’ +tab.
    5. +
+
+
+

Usage

+
    +
  1. Go to Timesheets and creates a new record.
    2. +
  2. Go to Invoicing > Accounting > Management > Analytic Items.
    3. +
  3. The previously created record will have the defined employee’s +analytical tags.
    4. +
+
+
+

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
      • +
    +
    • +
  • Binhex:
      +
    • Deriman Alonso
      • +
    +
    • +
+
+
+

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/timesheet project on GitHub.

+

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

+
+
+
+ + diff --git a/hr_timesheet_employee_analytic_tag/tests/__init__.py b/hr_timesheet_employee_analytic_tag/tests/__init__.py new file mode 100644 index 0000000000..9fee102d10 --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/tests/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_hr_timesheet_employee_analytic_tag diff --git a/hr_timesheet_employee_analytic_tag/tests/test_hr_timesheet_employee_analytic_tag.py b/hr_timesheet_employee_analytic_tag/tests/test_hr_timesheet_employee_analytic_tag.py new file mode 100644 index 0000000000..1afbfc371c --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/tests/test_hr_timesheet_employee_analytic_tag.py @@ -0,0 +1,88 @@ +# Copyright 2022 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests import Form, common, new_test_user +from odoo.tests.common import users + + +class TestHrTimesheetEmployeeAnalyticTag(common.TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env( + context=dict( + cls.env.context, + mail_create_nolog=True, + mail_create_nosubscribe=True, + mail_notrack=True, + no_reset_password=True, + tracking_disable=True, + ) + ) + cls.tag_1 = cls.env["account.analytic.tag"].create({"name": "Test tag 1"}) + cls.tag_2 = cls.env["account.analytic.tag"].create({"name": "Test tag 2"}) + cls.project = cls.env["project.project"].create( + {"name": "Test project", "allow_timesheets": True} + ) + cls.task = cls.env["project.task"].create( + {"name": "Test task", "project_id": cls.project.id} + ) + cls.user = new_test_user( + cls.env, login="test-user", groups="hr_timesheet.group_hr_timesheet_user" + ) + cls.employee_1 = cls.env["hr.employee"].create( + { + "name": "Test employee 1", + "timesheet_analytic_tag_ids": [(6, 0, cls.tag_1.ids)], + "user_id": cls.user.id, + } + ) + cls.employee_2 = cls.env["hr.employee"].create( + { + "name": "Test employee 2", + } + ) + cls.account_analytic_line_model = cls.env["account.analytic.line"] + + def _create_account_analytic_line(self, employee, tag): + vals = { + "name": "TEST", + "employee_id": employee.id, + "project_id": self.project.id, + "task_id": self.task.id, + "amount": 10, + } + if tag: + vals["tag_ids"] = [(6, 0, tag.ids)] + return self.account_analytic_line_model.create(vals) + + def _create_timesheet_item(self): + view_id = "hr_timesheet.hr_timesheet_line_tree" + timesheet = Form(self.env["account.analytic.line"], view=view_id) + timesheet.project_id = self.project + timesheet.task_id = self.task + timesheet.name = "TEST" + timesheet.unit_amount = 0.5 + return timesheet.save() + + def test_account_analytic_line_create_01(self): + item = self._create_account_analytic_line(self.employee_1, False) + self.assertIn(self.tag_1, item.tag_ids) + self.assertNotIn(self.tag_2, item.tag_ids) + item = self._create_account_analytic_line(self.employee_2, False) + self.assertNotIn(self.tag_1, item.tag_ids) + self.assertNotIn(self.tag_2, item.tag_ids) + + def test_account_analytic_line_create_02(self): + item = self._create_account_analytic_line(self.employee_1, self.tag_2) + self.assertIn(self.tag_1, item.tag_ids) + self.assertIn(self.tag_2, item.tag_ids) + item = self._create_account_analytic_line(self.employee_2, self.tag_2) + self.assertNotIn(self.tag_1, item.tag_ids) + self.assertIn(self.tag_2, item.tag_ids) + + @users("test-user") + def test_account_analytic_line_create_03(self): + item = self._create_timesheet_item().sudo() + self.assertIn(self.tag_1, item.tag_ids) + self.assertNotIn(self.tag_2, item.tag_ids) diff --git a/hr_timesheet_employee_analytic_tag/views/hr_employee_view.xml b/hr_timesheet_employee_analytic_tag/views/hr_employee_view.xml new file mode 100644 index 0000000000..043b660f5c --- /dev/null +++ b/hr_timesheet_employee_analytic_tag/views/hr_employee_view.xml @@ -0,0 +1,21 @@ + + + hr.employee.form.timesheet + hr.employee + + + + + + + +