diff --git a/account_reconcile_analytic_tag/README.rst b/account_reconcile_analytic_tag/README.rst new file mode 100644 index 0000000000..8980a9b576 --- /dev/null +++ b/account_reconcile_analytic_tag/README.rst @@ -0,0 +1,86 @@ +======================================= +Analytic tags in account reconciliation +======================================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:5e65f5558294201ee5178e15be3ac2f796fbc6560fa805c6a72486cd4b57df0d + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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--reconcile-lightgray.png?logo=github + :target: https://github.com/OCA/account-reconcile/tree/16.0/account_reconcile_analytic_tag + :alt: OCA/account-reconcile +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-reconcile-16-0/account-reconcile-16-0-account_reconcile_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-reconcile&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module adds the analytical tags to the bank reconciliation. + +**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 + +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-reconcile `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_reconcile_analytic_tag/__init__.py b/account_reconcile_analytic_tag/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/account_reconcile_analytic_tag/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_reconcile_analytic_tag/__manifest__.py b/account_reconcile_analytic_tag/__manifest__.py new file mode 100644 index 0000000000..3041054748 --- /dev/null +++ b/account_reconcile_analytic_tag/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2024 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + "name": "Analytic tags in account reconciliation", + "author": "Tecnativa, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/account-reconcile", + "version": "16.0.1.0.0", + "depends": ["account_reconcile_oca", "account_analytic_tag"], + "license": "AGPL-3", + "category": "Accounting", + "installable": True, + "maintainers": ["victoralmau"], + "data": [ + "views/account_bank_statement_line_views.xml", + ], +} diff --git a/account_reconcile_analytic_tag/i18n/account_reconcile_analytic_tag.pot b/account_reconcile_analytic_tag/i18n/account_reconcile_analytic_tag.pot new file mode 100644 index 0000000000..3645db765b --- /dev/null +++ b/account_reconcile_analytic_tag/i18n/account_reconcile_analytic_tag.pot @@ -0,0 +1,31 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconcile_analytic_tag +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-11-26 15:08+0000\n" +"PO-Revision-Date: 2024-11-26 15:08+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_reconcile_analytic_tag +#: model:ir.model,name:account_reconcile_analytic_tag.model_account_reconcile_abstract +msgid "Account Reconcile Abstract" +msgstr "" + +#. module: account_reconcile_analytic_tag +#: model:ir.model.fields,field_description:account_reconcile_analytic_tag.field_account_bank_statement_line__manual_analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + +#. module: account_reconcile_analytic_tag +#: model:ir.model,name:account_reconcile_analytic_tag.model_account_bank_statement_line +msgid "Bank Statement Line" +msgstr "" diff --git a/account_reconcile_analytic_tag/i18n/es.po b/account_reconcile_analytic_tag/i18n/es.po new file mode 100644 index 0000000000..9836df2bb1 --- /dev/null +++ b/account_reconcile_analytic_tag/i18n/es.po @@ -0,0 +1,33 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconcile_analytic_tag +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-11-26 15:08+0000\n" +"PO-Revision-Date: 2024-11-26 16:08+0100\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: account_reconcile_analytic_tag +#: model:ir.model,name:account_reconcile_analytic_tag.model_account_reconcile_abstract +msgid "Account Reconcile Abstract" +msgstr "Resumen de conciliación de cuenta" + +#. module: account_reconcile_analytic_tag +#: model:ir.model.fields,field_description:account_reconcile_analytic_tag.field_account_bank_statement_line__manual_analytic_tag_ids +msgid "Analytic Tags" +msgstr "Etiquetas analíticas" + +#. module: account_reconcile_analytic_tag +#: model:ir.model,name:account_reconcile_analytic_tag.model_account_bank_statement_line +msgid "Bank Statement Line" +msgstr "Línea de extracto bancario" diff --git a/account_reconcile_analytic_tag/models/__init__.py b/account_reconcile_analytic_tag/models/__init__.py new file mode 100644 index 0000000000..50480c58e6 --- /dev/null +++ b/account_reconcile_analytic_tag/models/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from . import account_reconcile_abstract +from . import account_bank_statement_line diff --git a/account_reconcile_analytic_tag/models/account_bank_statement_line.py b/account_reconcile_analytic_tag/models/account_bank_statement_line.py new file mode 100644 index 0000000000..f04432024c --- /dev/null +++ b/account_reconcile_analytic_tag/models/account_bank_statement_line.py @@ -0,0 +1,37 @@ +# Copyright 2024 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) +from odoo import api, fields, models + + +class AccountBankStatementLine(models.Model): + _inherit = "account.bank.statement.line" + + manual_analytic_tag_ids = fields.Many2many( + comodel_name="account.analytic.tag", + string="Analytic Tags", + domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]", + ) + + def _get_manual_delete_vals(self): + vals = super()._get_manual_delete_vals() + vals["manual_analytic_tag_ids"] = False + return vals + + def _process_manual_reconcile_from_line(self, line): + res = super()._process_manual_reconcile_from_line(line) + self.manual_analytic_tag_ids = line.get("manual_analytic_tag_ids") + return res + + def _get_manual_reconcile_vals(self): + vals = super()._get_manual_reconcile_vals() + vals["manual_analytic_tag_ids"] = [(6, 0, self.manual_analytic_tag_ids.ids)] + return vals + + @api.onchange("manual_analytic_tag_ids") + def _onchange_analytic_tag_ids(self): + return super()._onchange_manual_reconcile_vals() + + def _reconcile_move_line_vals(self, line, move_id=False): + vals = super()._reconcile_move_line_vals(line=line, move_id=move_id) + vals["analytic_tag_ids"] = line.get("manual_analytic_tag_ids") + return vals diff --git a/account_reconcile_analytic_tag/models/account_reconcile_abstract.py b/account_reconcile_analytic_tag/models/account_reconcile_abstract.py new file mode 100644 index 0000000000..9161878fe4 --- /dev/null +++ b/account_reconcile_analytic_tag/models/account_reconcile_abstract.py @@ -0,0 +1,20 @@ +# Copyright 2024 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) +from odoo import models + + +class AccountReconcileAbstract(models.AbstractModel): + _inherit = "account.reconcile.abstract" + + def _get_reconcile_line( + self, line, kind, is_counterpart=False, max_amount=False, from_unreconcile=False + ): + vals = super()._get_reconcile_line( + line=line, + kind=kind, + is_counterpart=is_counterpart, + max_amount=max_amount, + from_unreconcile=from_unreconcile, + ) + vals[0]["manual_analytic_tag_ids"] = [(6, 0, line.analytic_tag_ids.ids)] + return vals diff --git a/account_reconcile_analytic_tag/readme/CONTRIBUTORS.rst b/account_reconcile_analytic_tag/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..2327c90dff --- /dev/null +++ b/account_reconcile_analytic_tag/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Tecnativa `_: + * Víctor Martínez + * Pedro M. Baeza diff --git a/account_reconcile_analytic_tag/readme/DESCRIPTION.rst b/account_reconcile_analytic_tag/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..4f2c619227 --- /dev/null +++ b/account_reconcile_analytic_tag/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module adds the analytical tags to the bank reconciliation. diff --git a/account_reconcile_analytic_tag/static/description/icon.png b/account_reconcile_analytic_tag/static/description/icon.png new file mode 100644 index 0000000000..3a0328b516 Binary files /dev/null and b/account_reconcile_analytic_tag/static/description/icon.png differ diff --git a/account_reconcile_analytic_tag/static/description/index.html b/account_reconcile_analytic_tag/static/description/index.html new file mode 100644 index 0000000000..df646a231b --- /dev/null +++ b/account_reconcile_analytic_tag/static/description/index.html @@ -0,0 +1,424 @@ + + + + + +Analytic tags in account reconciliation + + + +
+

Analytic tags in account reconciliation

+ + +

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

+

This module adds the analytical tags to the bank reconciliation.

+

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

+
    +
  • Tecnativa: +* Víctor Martínez +* Pedro M. Baeza
    • +
+
+
+

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

+

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

+
+
+
+ + diff --git a/account_reconcile_analytic_tag/tests/__init__.py b/account_reconcile_analytic_tag/tests/__init__.py new file mode 100644 index 0000000000..7a41b08633 --- /dev/null +++ b/account_reconcile_analytic_tag/tests/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2024 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_account_reconcile_analytic_tag diff --git a/account_reconcile_analytic_tag/tests/test_account_reconcile_analytic_tag.py b/account_reconcile_analytic_tag/tests/test_account_reconcile_analytic_tag.py new file mode 100644 index 0000000000..2ad5c3943d --- /dev/null +++ b/account_reconcile_analytic_tag/tests/test_account_reconcile_analytic_tag.py @@ -0,0 +1,83 @@ +# Copyright 2024 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +import time + +from odoo.tests import Form, tagged + +from odoo.addons.account.tests.common import TestAccountReconciliationCommon + + +@tagged("post_install", "-at_install") +class TestAccountReconcileAnalyticTag(TestAccountReconciliationCommon): + @classmethod + def setUpClass(cls, chart_template_ref=None): + super().setUpClass(chart_template_ref=chart_template_ref) + cls.env.user.groups_id += cls.env.ref("analytic.group_analytic_accounting") + cls.env.user.groups_id += cls.env.ref( + "account_analytic_tag.group_analytic_tags" + ) + bank_stmt = cls.env["account.bank.statement"].create( + { + "company_id": cls.env.company.id, + "journal_id": cls.bank_journal_euro.id, + "date": time.strftime("%Y-07-15"), + "name": "test", + } + ) + cls.bank_stmt_line = cls.env["account.bank.statement.line"].create( + { + "name": "testLine", + "journal_id": cls.bank_journal_euro.id, + "statement_id": bank_stmt.id, + "amount": 50, + "date": time.strftime("%Y-07-15"), + } + ) + cls.plan = cls.env["account.analytic.plan"].create( + { + "name": "Test Plan", + "company_id": False, + } + ) + cls.analytic_account = cls.env["account.analytic.account"].create( + { + "name": "Test account", + "plan_id": cls.plan.id, + }, + ) + cls.analytic_tag = cls.env["account.analytic.tag"].create({"name": "Test tag"}) + + def test_account_reconcile_manual_with_tags(self): + reconcile_data = self.bank_stmt_line._default_reconcile_data() + data = reconcile_data["data"][1] + self.bank_stmt_line.manual_reference = data["reference"] + self.bank_stmt_line._process_manual_reconcile_from_line(data) + line_form = Form( + self.bank_stmt_line, + view="account_reconcile_oca.bank_statement_line_form_reconcile_view", + ) + line_form.manual_partner_id = self.partner_a + line_form.analytic_distribution = {str(self.analytic_account.id): 100} + line_form.manual_analytic_tag_ids.add(self.analytic_tag) + line_form.save() + self.bank_stmt_line.reconcile_bank_line() + analytic_line = self.bank_stmt_line.move_id.line_ids.analytic_line_ids + self.assertEqual( + analytic_line.tag_ids, self.bank_stmt_line.manual_analytic_tag_ids + ) + + def test_account_reconcile_manual_without_tags(self): + reconcile_data = self.bank_stmt_line._default_reconcile_data() + data = reconcile_data["data"][1] + self.bank_stmt_line.manual_reference = data["reference"] + self.bank_stmt_line._process_manual_reconcile_from_line(data) + line_form = Form( + self.bank_stmt_line, + view="account_reconcile_oca.bank_statement_line_form_reconcile_view", + ) + line_form.manual_partner_id = self.partner_a + line_form.analytic_distribution = {str(self.analytic_account.id): 100} + line_form.save() + self.bank_stmt_line.reconcile_bank_line() + analytic_line = self.bank_stmt_line.move_id.line_ids.analytic_line_ids + self.assertFalse(analytic_line.tag_ids) diff --git a/account_reconcile_analytic_tag/views/account_bank_statement_line_views.xml b/account_reconcile_analytic_tag/views/account_bank_statement_line_views.xml new file mode 100644 index 0000000000..bc1b376d3d --- /dev/null +++ b/account_reconcile_analytic_tag/views/account_bank_statement_line_views.xml @@ -0,0 +1,24 @@ + + + + account.bank.statement.line.reconcile + account.bank.statement.line + + + + + + + + diff --git a/account_reconcile_oca/models/account_bank_statement_line.py b/account_reconcile_oca/models/account_bank_statement_line.py index c6311ac38b..439567e66f 100644 --- a/account_reconcile_oca/models/account_bank_statement_line.py +++ b/account_reconcile_oca/models/account_bank_statement_line.py @@ -296,6 +296,46 @@ def _check_line_changed(self, line): != line.get("partner_id") ) + def _get_manual_delete_vals(self): + return { + "manual_reference": False, + "manual_account_id": False, + "manual_amount": False, + "manual_exchange_counterpart": False, + "manual_in_currency_id": False, + "manual_in_currency": False, + "manual_name": False, + "manual_partner_id": False, + "manual_line_id": False, + "manual_move_id": False, + "manual_move_type": False, + "manual_kind": False, + "manual_original_amount": False, + "manual_currency_id": False, + "analytic_distribution": False, + } + + def _process_manual_reconcile_from_line(self, line): + self.manual_account_id = line["account_id"][0] + self.manual_amount = line["amount"] + self.manual_currency_id = line["currency_id"] + self.manual_in_currency_id = line.get("line_currency_id") + self.manual_in_currency = line.get("line_currency_id") and line[ + "currency_id" + ] != line.get("line_currency_id") + self.manual_amount_in_currency = line.get("currency_amount") + self.manual_name = line["name"] + self.manual_exchange_counterpart = line.get("is_exchange_counterpart", False) + self.manual_partner_id = line.get("partner_id") and line["partner_id"][0] + manual_line = self.env["account.move.line"].browse(line["id"]).exists() + self.manual_line_id = manual_line + self.analytic_distribution = line.get("analytic_distribution", {}) + if self.manual_line_id: + self.manual_move_id = self.manual_line_id.move_id + self.manual_move_type = self.manual_line_id.move_id.move_type + self.manual_kind = line["kind"] + self.manual_original_amount = line.get("original_amount", 0.0) + @api.onchange("manual_reference", "manual_delete") def _onchange_manual_reconcile_reference(self): self.ensure_one() @@ -316,53 +356,10 @@ def _onchange_manual_reconcile_reference(self): continue if line["reference"] == self.manual_reference: if self.manual_delete: - self.update( - { - "manual_reference": False, - "manual_account_id": False, - "manual_amount": False, - "manual_exchange_counterpart": False, - "manual_in_currency_id": False, - "manual_in_currency": False, - "manual_name": False, - "manual_partner_id": False, - "manual_line_id": False, - "manual_move_id": False, - "manual_move_type": False, - "manual_kind": False, - "manual_original_amount": False, - "manual_currency_id": False, - "analytic_distribution": False, - "manual_amount_in_currency": False, - } - ) + self.update(self._get_manual_delete_vals()) continue else: - self.manual_account_id = line["account_id"][0] - self.manual_amount = line["amount"] - self.manual_currency_id = line["currency_id"] - self.manual_in_currency_id = line.get("line_currency_id") - self.manual_in_currency = line.get("line_currency_id") and line[ - "currency_id" - ] != line.get("line_currency_id") - self.manual_amount_in_currency = line.get("currency_amount") - self.manual_name = line["name"] - self.manual_exchange_counterpart = line.get( - "is_exchange_counterpart", False - ) - self.manual_partner_id = ( - line.get("partner_id") and line["partner_id"][0] - ) - manual_line = ( - self.env["account.move.line"].browse(line["id"]).exists() - ) - self.manual_line_id = manual_line - self.analytic_distribution = line.get("analytic_distribution", {}) - if self.manual_line_id: - self.manual_move_id = self.manual_line_id.move_id - self.manual_move_type = self.manual_line_id.move_id.move_type - self.manual_kind = line["kind"] - self.manual_original_amount = line.get("original_amount", 0.0) + self._process_manual_reconcile_from_line(line) new_data.append(line) self.update({"manual_delete": False}) self.reconcile_data_info = self._recompute_suspense_line( @@ -383,6 +380,21 @@ def _onchange_manual_amount_in_currency(self): ) self._onchange_manual_reconcile_vals() + def _get_manual_reconcile_vals(self): + return { + "name": self.manual_name, + "partner_id": self.manual_partner_id + and self.manual_partner_id.name_get()[0] + or (False, self.partner_name), + "account_id": self.manual_account_id.name_get()[0] + if self.manual_account_id + else [False, _("Undefined")], + "amount": self.manual_amount, + "credit": -self.manual_amount if self.manual_amount < 0 else 0.0, + "debit": self.manual_amount if self.manual_amount > 0 else 0.0, + "analytic_distribution": self.analytic_distribution, + } + @api.onchange( "manual_account_id", "manual_partner_id", @@ -397,28 +409,11 @@ def _onchange_manual_reconcile_vals(self): for line in data: if line["reference"] == self.manual_reference: if self._check_line_changed(line): - line.update( - { - "name": self.manual_name, - "partner_id": self.manual_partner_id - and self.manual_partner_id.name_get()[0] - or (False, self.partner_name), - "account_id": self.manual_account_id.name_get()[0] - if self.manual_account_id - else [False, _("Undefined")], - "amount": self.manual_amount, - "credit": -self.manual_amount - if self.manual_amount < 0 - else 0.0, - "debit": self.manual_amount - if self.manual_amount > 0 - else 0.0, - "analytic_distribution": self.analytic_distribution, - "kind": line["kind"] - if line["kind"] != "suspense" - else "other", - } + line_vals = self._get_manual_reconcile_vals() + line_vals["kind"] = ( + line["kind"] if line["kind"] != "suspense" else "other" ) + line.update(line_vals) if line["kind"] == "liquidity": self._update_move_partner() if self.manual_line_id and self.manual_line_id.id == line.get( diff --git a/setup/account_reconcile_analytic_tag/odoo/addons/account_reconcile_analytic_tag b/setup/account_reconcile_analytic_tag/odoo/addons/account_reconcile_analytic_tag new file mode 120000 index 0000000000..f1565cbfb6 --- /dev/null +++ b/setup/account_reconcile_analytic_tag/odoo/addons/account_reconcile_analytic_tag @@ -0,0 +1 @@ +../../../../account_reconcile_analytic_tag \ No newline at end of file diff --git a/setup/account_reconcile_analytic_tag/setup.py b/setup/account_reconcile_analytic_tag/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/account_reconcile_analytic_tag/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)