diff --git a/account_analytic_tag/tests/common.py b/account_analytic_tag/tests/common.py index 7ff99d73d5..e32b0b2809 100644 --- a/account_analytic_tag/tests/common.py +++ b/account_analytic_tag/tests/common.py @@ -67,7 +67,7 @@ def setUpClass(cls): ) cls.product_b = cls.env["product.product"].create( { - "name": "product_a", + "name": "product_b", "uom_id": cls.env.ref("uom.product_uom_unit").id, "lst_price": 200.0, "standard_price": 100.0, diff --git a/account_analytic_tag_distribution/README.rst b/account_analytic_tag_distribution/README.rst new file mode 100644 index 0000000000..47dd3e30a3 --- /dev/null +++ b/account_analytic_tag_distribution/README.rst @@ -0,0 +1,91 @@ +================================= +Account Analytic Tag Distribution +================================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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/16.0/account_analytic_tag_distribution + :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-16-0/account-analytic-16-0-account_analytic_tag_distribution + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/87/16.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module restores the option to define the analytical distribution at the level of analytical labels. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +#. In the creation/editing of an analytic label check the box "Analytic Distribution" and define the distribution you need. +#. Define this label in an invoice line. +#. Publish the invoice. +#. The analytical notes will have been created according to the analytical distribution of the defined 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 smashing 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 + +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/account_analytic_tag_distribution/__init__.py b/account_analytic_tag_distribution/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/account_analytic_tag_distribution/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_analytic_tag_distribution/__manifest__.py b/account_analytic_tag_distribution/__manifest__.py new file mode 100644 index 0000000000..1ad815372d --- /dev/null +++ b/account_analytic_tag_distribution/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2023 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + "name": "Account Analytic Tag Distribution", + "version": "16.0.1.0.0", + "author": "Tecnativa, Odoo Community Association (OCA)", + "category": "Account", + "website": "https://github.com/OCA/account-analytic", + "depends": ["account_analytic_tag"], + "license": "AGPL-3", + "data": [ + "views/account_analytic_tag_views.xml", + "views/account_move_views.xml", + ], + "installable": True, + "maintainers": ["victoralmau"], +} diff --git a/account_analytic_tag_distribution/i18n/account_analytic_tag_distribution.pot b/account_analytic_tag_distribution/i18n/account_analytic_tag_distribution.pot new file mode 100644 index 0000000000..17121ddda5 --- /dev/null +++ b/account_analytic_tag_distribution/i18n/account_analytic_tag_distribution.pot @@ -0,0 +1,46 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_analytic_tag_distribution +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-08-24 11:30+0000\n" +"PO-Revision-Date: 2023-08-24 11:30+0000\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: account_analytic_tag_distribution +#: model:ir.model.fields,field_description:account_analytic_tag_distribution.field_account_analytic_tag__analytic_distribution +msgid "Analytic" +msgstr "" + +#. module: account_analytic_tag_distribution +#: model:ir.model.fields,field_description:account_analytic_tag_distribution.field_account_analytic_tag__active_analytic_distribution +msgid "Analytic Distribution" +msgstr "" + +#. module: account_analytic_tag_distribution +#: model:ir.model.fields,field_description:account_analytic_tag_distribution.field_account_analytic_tag__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: account_analytic_tag_distribution +#: model:ir.model.fields,field_description:account_analytic_tag_distribution.field_account_analytic_tag__analytic_precision +msgid "Analytic Precision" +msgstr "" + +#. module: account_analytic_tag_distribution +#: model:ir.model,name:account_analytic_tag_distribution.model_account_analytic_tag +msgid "Analytic Tags" +msgstr "" + +#. module: account_analytic_tag_distribution +#: model:ir.model,name:account_analytic_tag_distribution.model_account_move +msgid "Journal Entry" +msgstr "" diff --git a/account_analytic_tag_distribution/i18n/es.po b/account_analytic_tag_distribution/i18n/es.po new file mode 100644 index 0000000000..f5a2064923 --- /dev/null +++ b/account_analytic_tag_distribution/i18n/es.po @@ -0,0 +1,46 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_analytic_tag_distribution +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-08-24 11:31+0000\n" +"PO-Revision-Date: 2023-08-24 11:31+0000\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: account_analytic_tag_distribution +#: model:ir.model.fields,field_description:account_analytic_tag_distribution.field_account_analytic_tag__analytic_distribution +msgid "Analytic" +msgstr "Analítico" + +#. module: account_analytic_tag_distribution +#: model:ir.model.fields,field_description:account_analytic_tag_distribution.field_account_analytic_tag__active_analytic_distribution +msgid "Analytic Distribution" +msgstr "Distribución Analítica" + +#. module: account_analytic_tag_distribution +#: model:ir.model.fields,field_description:account_analytic_tag_distribution.field_account_analytic_tag__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "Búsqueda de distribución analítica" + +#. module: account_analytic_tag_distribution +#: model:ir.model.fields,field_description:account_analytic_tag_distribution.field_account_analytic_tag__analytic_precision +msgid "Analytic Precision" +msgstr "Precisión analítica" + +#. module: account_analytic_tag_distribution +#: model:ir.model,name:account_analytic_tag_distribution.model_account_analytic_tag +msgid "Analytic Tags" +msgstr "Etiquetas Analíticas" + +#. module: account_analytic_tag_distribution +#: model:ir.model,name:account_analytic_tag_distribution.model_account_move +msgid "Journal Entry" +msgstr "Asiento contable" diff --git a/account_analytic_tag_distribution/models/__init__.py b/account_analytic_tag_distribution/models/__init__.py new file mode 100644 index 0000000000..d259220d40 --- /dev/null +++ b/account_analytic_tag_distribution/models/__init__.py @@ -0,0 +1,2 @@ +from . import account_analytic_tag +from . import account_move_line diff --git a/account_analytic_tag_distribution/models/account_analytic_tag.py b/account_analytic_tag_distribution/models/account_analytic_tag.py new file mode 100644 index 0000000000..128d5452b8 --- /dev/null +++ b/account_analytic_tag_distribution/models/account_analytic_tag.py @@ -0,0 +1,20 @@ +# Copyright 2023 Tecnativa - Víctor Martínez +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +from odoo import api, fields, models + + +class AccountAnalyticTag(models.Model): + _name = "account.analytic.tag" + _inherit = ["account.analytic.tag", "analytic.mixin"] + + active_analytic_distribution = fields.Boolean(string="Analytic Distribution") + + @api.onchange("active_analytic_distribution") + def _onchange_active_analytic_distribution(self): + if self.active_analytic_distribution: + self.account_analytic_id = False + + def write(self, values): + if values.get("active_analytic_distribution"): + values["account_analytic_id"] = False + return super().write(values) diff --git a/account_analytic_tag_distribution/models/account_move_line.py b/account_analytic_tag_distribution/models/account_move_line.py new file mode 100644 index 0000000000..15006ee18d --- /dev/null +++ b/account_analytic_tag_distribution/models/account_move_line.py @@ -0,0 +1,34 @@ +# Copyright 2023 Tecnativa - Víctor Martínez +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +from odoo import api, models + + +class AccountMoveLine(models.Model): + _inherit = "account.move.line" + + @api.onchange("analytic_tag_ids") + def _onchange_analytic_tag_ids(self): + """If any tag has a distribution, we will disable the standard analytical + distribution.""" + if any(tag.active_analytic_distribution for tag in self.analytic_tag_ids): + self.analytic_distribution = False + + def _prepare_analytic_lines(self): + """If any tag has distribution, we will not call super() to avoid conflicts + with standard flow.""" + tags_with_distribution = self.analytic_tag_ids.filtered( + lambda x: x.active_analytic_distribution + ) + if not tags_with_distribution: + return super()._prepare_analytic_lines() + analytic_line_vals = [] + for tag in tags_with_distribution: + distribution_on_each_plan = {} + for account_id, distribution in tag.analytic_distribution.items(): + line_values = self._prepare_analytic_distribution_line( + float(distribution), account_id, distribution_on_each_plan + ) + line_values.update({"tag_ids": [(6, 0, tag.ids)]}) + if not self.currency_id.is_zero(line_values.get("amount")): + analytic_line_vals.append(line_values) + return analytic_line_vals diff --git a/account_analytic_tag_distribution/readme/CONTRIBUTORS.rst b/account_analytic_tag_distribution/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..ae3b3ea56a --- /dev/null +++ b/account_analytic_tag_distribution/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Tecnativa `__: + + * Víctor Martínez diff --git a/account_analytic_tag_distribution/readme/DESCRIPTION.rst b/account_analytic_tag_distribution/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..ede73be2fd --- /dev/null +++ b/account_analytic_tag_distribution/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module restores the option to define the analytical distribution at the level of analytical labels. diff --git a/account_analytic_tag_distribution/readme/USAGE.rst b/account_analytic_tag_distribution/readme/USAGE.rst new file mode 100644 index 0000000000..c9802ba88b --- /dev/null +++ b/account_analytic_tag_distribution/readme/USAGE.rst @@ -0,0 +1,4 @@ +#. In the creation/editing of an analytic label check the box "Analytic Distribution" and define the distribution you need. +#. Define this label in an invoice line. +#. Publish the invoice. +#. The analytical notes will have been created according to the analytical distribution of the defined tags. diff --git a/account_analytic_tag_distribution/static/description/icon.png b/account_analytic_tag_distribution/static/description/icon.png new file mode 100644 index 0000000000..3a0328b516 Binary files /dev/null and b/account_analytic_tag_distribution/static/description/icon.png differ diff --git a/account_analytic_tag_distribution/static/description/index.html b/account_analytic_tag_distribution/static/description/index.html new file mode 100644 index 0000000000..cac5e0b964 --- /dev/null +++ b/account_analytic_tag_distribution/static/description/index.html @@ -0,0 +1,434 @@ + + + + + + +Account Analytic Tag Distribution + + + +
+

Account Analytic Tag Distribution

+ + +

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

+

This module restores the option to define the analytical distribution at the level of analytical labels.

+

Table of contents

+ +
+

Usage

+
    +
  1. In the creation/editing of an analytic label check the box “Analytic Distribution” and define the distribution you need.
    2. +
  2. Define this label in an invoice line.
    3. +
  3. Publish the invoice.
    4. +
  4. The analytical notes will have been created according to the analytical distribution of the defined tags.
    5. +
+
+
+

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 smashing 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/account_analytic_tag_distribution/tests/__init__.py b/account_analytic_tag_distribution/tests/__init__.py new file mode 100644 index 0000000000..ff2bb522c3 --- /dev/null +++ b/account_analytic_tag_distribution/tests/__init__.py @@ -0,0 +1 @@ +from . import test_account_analytic_tag_distribution diff --git a/account_analytic_tag_distribution/tests/test_account_analytic_tag_distribution.py b/account_analytic_tag_distribution/tests/test_account_analytic_tag_distribution.py new file mode 100644 index 0000000000..cf15b1a548 --- /dev/null +++ b/account_analytic_tag_distribution/tests/test_account_analytic_tag_distribution.py @@ -0,0 +1,141 @@ +# Copyright 2023 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) +from odoo.tests import Form, tagged +from odoo.tests.common import users + +from odoo.addons.account_analytic_tag.tests.common import TestAccountAnalyticTagBase + + +@tagged("post_install", "-at_install") +class TestAccountAnalyticTagDistribution(TestAccountAnalyticTagBase): + @classmethod + def setUpClass(cls): + super().setUpClass() + invoice_form = Form( + cls.env["account.move"] + .with_user(cls.user) + .with_context(default_move_type="out_invoice") + ) + invoice_form.partner_id = cls.partner_a + with invoice_form.invoice_line_ids.new() as line_form: + line_form.product_id = cls.product_a + line_form.analytic_tag_ids.add(cls.account_analytic_tag_a) + with invoice_form.invoice_line_ids.new() as line_form: + line_form.product_id = cls.product_b + line_form.analytic_tag_ids.add(cls.account_analytic_tag_b) + cls.invoice = invoice_form.save() + cls.line_a = cls.invoice.invoice_line_ids.filtered( + lambda x: x.product_id == cls.product_a + ) + cls.line_b = cls.invoice.invoice_line_ids.filtered( + lambda x: x.product_id == cls.product_b + ) + cls.account_analytic_tag_a.account_analytic_id = False + cls.account_analytic_tag_b.account_analytic_id = False + + def test_account_analytic_tag_a_edit(self): + analytic_tag_form = Form(self.account_analytic_tag_a) + analytic_tag_form.account_analytic_id = self.analytic_account_a + analytic_tag_form.active_analytic_distribution = True + self.assertFalse(analytic_tag_form.account_analytic_id) + analytic_tag = analytic_tag_form.save() + self.assertFalse(analytic_tag.account_analytic_id) + + def test_account_analytic_tag_write(self): + self.account_analytic_tag_a.account_analytic_id = self.analytic_account_a + self.account_analytic_tag_a.write({"active_analytic_distribution": True}) + self.assertFalse(self.account_analytic_tag_a.account_analytic_id) + + @users("test-analytic-tag-user") + def test_action_post_analytic_lines_01(self): + self.invoice.action_post() + self.assertFalse(self.line_a.analytic_line_ids) + self.assertFalse(self.line_b.analytic_line_ids) + + @users("test-analytic-tag-user") + def test_action_post_analytic_lines_02(self): + self.account_analytic_tag_a.active_analytic_distribution = True + self.account_analytic_tag_a.analytic_distribution = { + self.analytic_account_a.id: 100 + } + self.invoice.action_post() + # line_a + self.assertFalse(self.line_a.analytic_distribution) + self.assertIn( + self.account_analytic_tag_a, self.line_a.analytic_line_ids.tag_ids + ) + self.assertNotIn( + self.account_analytic_tag_b, self.line_a.analytic_line_ids.tag_ids + ) + # line_b + self.assertFalse(self.line_b.analytic_distribution) + self.assertFalse(self.line_b.analytic_line_ids) + + @users("test-analytic-tag-user") + def test_action_post_analytic_lines_03(self): + self.account_analytic_tag_a.active_analytic_distribution = True + self.account_analytic_tag_a.analytic_distribution = { + self.analytic_account_a.id: 100 + } + self.account_analytic_tag_b.active_analytic_distribution = True + self.account_analytic_tag_b.analytic_distribution = { + self.analytic_account_b.id: 100 + } + self.invoice.action_post() + # line_a + self.assertFalse(self.line_a.analytic_distribution) + self.assertIn( + self.account_analytic_tag_a, self.line_a.analytic_line_ids.tag_ids + ) + self.assertNotIn( + self.account_analytic_tag_b, self.line_a.analytic_line_ids.tag_ids + ) + # line_b + self.assertFalse(self.line_b.analytic_distribution) + self.assertNotIn( + self.account_analytic_tag_a, self.line_b.analytic_line_ids.tag_ids + ) + self.assertIn( + self.account_analytic_tag_b, self.line_b.analytic_line_ids.tag_ids + ) + + @users("test-analytic-tag-user") + def test_action_post_analytic_lines_04(self): + self.account_analytic_tag_a.active_analytic_distribution = True + self.account_analytic_tag_a.analytic_distribution = { + self.analytic_account_a.id: 50 + } + self.account_analytic_tag_b.active_analytic_distribution = True + self.account_analytic_tag_b.analytic_distribution = { + self.analytic_account_a.id: 50, + self.analytic_account_b.id: 100, + } + self.invoice.action_post() + # line_a + self.assertFalse(self.line_a.analytic_distribution) + self.assertIn( + self.account_analytic_tag_a, self.line_a.analytic_line_ids.tag_ids + ) + self.assertNotIn( + self.account_analytic_tag_b, self.line_a.analytic_line_ids.tag_ids + ) + self.assertIn( + self.analytic_account_a, self.line_a.analytic_line_ids.mapped("account_id") + ) + self.assertNotIn( + self.analytic_account_b, self.line_a.analytic_line_ids.mapped("account_id") + ) + # line_b + self.assertFalse(self.line_b.analytic_distribution) + self.assertNotIn( + self.account_analytic_tag_a, self.line_b.analytic_line_ids.tag_ids + ) + self.assertIn( + self.account_analytic_tag_b, self.line_b.analytic_line_ids.tag_ids + ) + self.assertIn( + self.analytic_account_a, self.line_b.analytic_line_ids.mapped("account_id") + ) + self.assertIn( + self.analytic_account_b, self.line_b.analytic_line_ids.mapped("account_id") + ) diff --git a/account_analytic_tag_distribution/views/account_analytic_tag_views.xml b/account_analytic_tag_distribution/views/account_analytic_tag_views.xml new file mode 100644 index 0000000000..0a47c822dd --- /dev/null +++ b/account_analytic_tag_distribution/views/account_analytic_tag_views.xml @@ -0,0 +1,26 @@ + + + account.analytic.tag + + + + {'invisible': [('active_analytic_distribution', '=', True)]} + 1 + + + + + + + + diff --git a/account_analytic_tag_distribution/views/account_move_views.xml b/account_analytic_tag_distribution/views/account_move_views.xml new file mode 100644 index 0000000000..33af33bb47 --- /dev/null +++ b/account_analytic_tag_distribution/views/account_move_views.xml @@ -0,0 +1,21 @@ + + + account.move.tag_ids.form.inherit + account.move + + + + 1 + + + 1 + + + + diff --git a/setup/account_analytic_tag_distribution/odoo/addons/account_analytic_tag_distribution b/setup/account_analytic_tag_distribution/odoo/addons/account_analytic_tag_distribution new file mode 120000 index 0000000000..bf808c5e43 --- /dev/null +++ b/setup/account_analytic_tag_distribution/odoo/addons/account_analytic_tag_distribution @@ -0,0 +1 @@ +../../../../account_analytic_tag_distribution \ No newline at end of file diff --git a/setup/account_analytic_tag_distribution/setup.py b/setup/account_analytic_tag_distribution/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/account_analytic_tag_distribution/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)