Skip to content

Commit

Permalink
Merge PR #704 into 17.0
Browse files Browse the repository at this point in the history
Signed-off-by pedrobaeza
  • Loading branch information
OCA-git-bot committed Oct 17, 2024
2 parents 02604ec + ec5b979 commit ca93d3b
Show file tree
Hide file tree
Showing 17 changed files with 795 additions and 0 deletions.
93 changes: 93 additions & 0 deletions hr_timesheet_analytic_tag/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
=========================
Hr Timesheet Analytic Tag
=========================

..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:4c38d3d7f2d2a35653886e0fd6d37fe32dc7b21192c9a3b539024085d1e4c388
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |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/17.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-17-0/account-analytic-17-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=17.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 <https://github.com/OCA/account-analytic/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/account-analytic/issues/new?body=module:%20hr_timesheet_analytic_tag%0Aversion:%2017.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.

Credits
=======

Authors
-------

* Tecnativa

Contributors
------------

- `Tecnativa <https://www.tecnativa.com>`__:

- Víctor Martínez
- Pedro M. Baeza

- APSL - Nagarro <https://apsl.tech>

- Bernat Obrador

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 <https://odoo-community.org/page/maintainer-role>`__:

|maintainer-victoralmau|

This module is part of the `OCA/account-analytic <https://github.com/OCA/account-analytic/tree/17.0/hr_timesheet_analytic_tag>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
1 change: 1 addition & 0 deletions hr_timesheet_analytic_tag/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import models
17 changes: 17 additions & 0 deletions hr_timesheet_analytic_tag/__manifest__.py
Original file line number Diff line number Diff line change
@@ -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": "17.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"],
}
33 changes: 33 additions & 0 deletions hr_timesheet_analytic_tag/i18n/es.po
Original file line number Diff line number Diff line change
@@ -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"
29 changes: 29 additions & 0 deletions hr_timesheet_analytic_tag/i18n/hr_timesheet_analytic_tag.pot
Original file line number Diff line number Diff line change
@@ -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 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_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 ""
32 changes: 32 additions & 0 deletions hr_timesheet_analytic_tag/i18n/it.po
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>\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"
4 changes: 4 additions & 0 deletions hr_timesheet_analytic_tag/models/__init__.py
Original file line number Diff line number Diff line change
@@ -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
15 changes: 15 additions & 0 deletions hr_timesheet_analytic_tag/models/account_analytic_line.py
Original file line number Diff line number Diff line change
@@ -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, models


class AccountAnalyticLine(models.Model):
_inherit = "account.analytic.line"

def _timesheet_preprocess(self, vals_list):
res = super()._timesheet_preprocess(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 res
14 changes: 14 additions & 0 deletions hr_timesheet_analytic_tag/models/project_task.py
Original file line number Diff line number Diff line change
@@ -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,
)
3 changes: 3 additions & 0 deletions hr_timesheet_analytic_tag/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["whool"]
build-backend = "whool.buildapi"
5 changes: 5 additions & 0 deletions hr_timesheet_analytic_tag/readme/CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- [Tecnativa](https://www.tecnativa.com):
- Víctor Martínez
- Pedro M. Baeza
- APSL - Nagarro \<<https://apsl.tech>\>
- Bernat Obrador
3 changes: 3 additions & 0 deletions hr_timesheet_analytic_tag/readme/DESCRIPTION.md
Original file line number Diff line number Diff line change
@@ -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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ca93d3b

Please sign in to comment.