From fafc5f7822ef67c3b2f910cc16eb68c76305f9d7 Mon Sep 17 00:00:00 2001 From: manu Date: Wed, 18 May 2022 12:28:21 +0200 Subject: [PATCH 01/12] [13.0][ADD]l10n_es_aeat_mod390_oss: casilla 126 modelo 390 --- l10n_es_aeat_mod390_oss/__init__.py | 1 + l10n_es_aeat_mod390_oss/__manifest__.py | 15 +++ .../data/tax_code_map_mod390_data.xml | 26 ++++ l10n_es_aeat_mod390_oss/models/__init__.py | 1 + l10n_es_aeat_mod390_oss/models/mod390.py | 21 ++++ .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 3 + l10n_es_aeat_mod390_oss/readme/ROADMAP.rst | 1 + .../static/description/icon.png | Bin 0 -> 6772 bytes .../static/description/icon.svg | 112 ++++++++++++++++++ l10n_es_aeat_mod390_oss/tests/__init__.py | 1 + .../tests/test_l10n_es_aeat_mod390_oss.py | 64 ++++++++++ 12 files changed, 248 insertions(+) create mode 100644 l10n_es_aeat_mod390_oss/__init__.py create mode 100644 l10n_es_aeat_mod390_oss/__manifest__.py create mode 100644 l10n_es_aeat_mod390_oss/data/tax_code_map_mod390_data.xml create mode 100644 l10n_es_aeat_mod390_oss/models/__init__.py create mode 100644 l10n_es_aeat_mod390_oss/models/mod390.py create mode 100644 l10n_es_aeat_mod390_oss/readme/CONTRIBUTORS.rst create mode 100644 l10n_es_aeat_mod390_oss/readme/DESCRIPTION.rst create mode 100644 l10n_es_aeat_mod390_oss/readme/ROADMAP.rst create mode 100644 l10n_es_aeat_mod390_oss/static/description/icon.png create mode 100644 l10n_es_aeat_mod390_oss/static/description/icon.svg create mode 100644 l10n_es_aeat_mod390_oss/tests/__init__.py create mode 100644 l10n_es_aeat_mod390_oss/tests/test_l10n_es_aeat_mod390_oss.py diff --git a/l10n_es_aeat_mod390_oss/__init__.py b/l10n_es_aeat_mod390_oss/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/l10n_es_aeat_mod390_oss/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/l10n_es_aeat_mod390_oss/__manifest__.py b/l10n_es_aeat_mod390_oss/__manifest__.py new file mode 100644 index 00000000000..c286982eb97 --- /dev/null +++ b/l10n_es_aeat_mod390_oss/__manifest__.py @@ -0,0 +1,15 @@ +# Copyright 2022 Sygel - Manuel Regidor +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0 + +{ + "name": "AEAT modelo 390 - OSS", + "version": "13.0.1.0.0", + "category": "Accounting", + "author": "Sygel, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/l10n-spain", + "license": "AGPL-3", + "depends": ["l10n_es_aeat_mod390", "l10n_eu_oss"], + "data": ["data/tax_code_map_mod390_data.xml"], + "installable": True, + "autoinstall": True, +} diff --git a/l10n_es_aeat_mod390_oss/data/tax_code_map_mod390_data.xml b/l10n_es_aeat_mod390_oss/data/tax_code_map_mod390_data.xml new file mode 100644 index 00000000000..aad4f66f052 --- /dev/null +++ b/l10n_es_aeat_mod390_oss/data/tax_code_map_mod390_data.xml @@ -0,0 +1,26 @@ + + + + + 126 + OSS. Operaciones no sujetas por reglas de localización acogidas a la OSS + all + base + both + + + + + + 127 + OSS. Operaciones sujetas y acogidas a la OSS + all + base + both + + + + diff --git a/l10n_es_aeat_mod390_oss/models/__init__.py b/l10n_es_aeat_mod390_oss/models/__init__.py new file mode 100644 index 00000000000..0bc422b1bf5 --- /dev/null +++ b/l10n_es_aeat_mod390_oss/models/__init__.py @@ -0,0 +1 @@ +from . import mod390 diff --git a/l10n_es_aeat_mod390_oss/models/mod390.py b/l10n_es_aeat_mod390_oss/models/mod390.py new file mode 100644 index 00000000000..a864876d5c0 --- /dev/null +++ b/l10n_es_aeat_mod390_oss/models/mod390.py @@ -0,0 +1,21 @@ +# Copyright 2022 Sygel - Manuel Regidor +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0 + +from odoo import models + + +class L10nEsAeatMod390Report(models.Model): + _inherit = "l10n.es.aeat.mod390.report" + + def get_taxes_from_map(self, map_line): + oss_map_lines = [ + self.env.ref("l10n_es_aeat_mod390_oss.aeat_mod390_map_line_126"), + ] + if map_line in oss_map_lines: + return self.env["account.tax"].search( + [ + ("oss_country_id", "!=", False), + ("company_id", "=", self.company_id.id), + ] + ) + return super().get_taxes_from_map(map_line) diff --git a/l10n_es_aeat_mod390_oss/readme/CONTRIBUTORS.rst b/l10n_es_aeat_mod390_oss/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..6f2f9795406 --- /dev/null +++ b/l10n_es_aeat_mod390_oss/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Sygel `__: + + * Manuel Regidor diff --git a/l10n_es_aeat_mod390_oss/readme/DESCRIPTION.rst b/l10n_es_aeat_mod390_oss/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..20253b4b0b4 --- /dev/null +++ b/l10n_es_aeat_mod390_oss/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +Este módulo añade las casillas 126 y 127 al modelo390 +y genera el valor de la casilla 126, dependiente de +los impuestos OSS. diff --git a/l10n_es_aeat_mod390_oss/readme/ROADMAP.rst b/l10n_es_aeat_mod390_oss/readme/ROADMAP.rst new file mode 100644 index 00000000000..cd086c05380 --- /dev/null +++ b/l10n_es_aeat_mod390_oss/readme/ROADMAP.rst @@ -0,0 +1 @@ +* No se contempla el cálculo de la casilla 127 diff --git a/l10n_es_aeat_mod390_oss/static/description/icon.png b/l10n_es_aeat_mod390_oss/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..411cc605bfda0207e5a782478a68e8d9e64b2a92 GIT binary patch literal 6772 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 + + + + + + + image/svg+xml + + + + + + + + + + + + + + + 390 + OSS + diff --git a/l10n_es_aeat_mod390_oss/tests/__init__.py b/l10n_es_aeat_mod390_oss/tests/__init__.py new file mode 100644 index 00000000000..ccde2896147 --- /dev/null +++ b/l10n_es_aeat_mod390_oss/tests/__init__.py @@ -0,0 +1 @@ +from . import test_l10n_es_aeat_mod390_oss diff --git a/l10n_es_aeat_mod390_oss/tests/test_l10n_es_aeat_mod390_oss.py b/l10n_es_aeat_mod390_oss/tests/test_l10n_es_aeat_mod390_oss.py new file mode 100644 index 00000000000..3542cab0562 --- /dev/null +++ b/l10n_es_aeat_mod390_oss/tests/test_l10n_es_aeat_mod390_oss.py @@ -0,0 +1,64 @@ +# Copyright 2022 Sygel - Manuel Regidor +# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0 + +from odoo.tests.common import Form + +from odoo.addons.l10n_es_aeat_mod390.tests.test_l10n_es_aeat_mod390 import ( + TestL10nEsAeatMod390Base, +) + + +class TestL10nEsAeatMod390OSS(TestL10nEsAeatMod390Base): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.oss_country = cls.env.ref("base.fr") + general_tax = cls.env.ref( + "l10n_es.%s_account_tax_template_s_iva21b" % cls.company.id + ) + wizard = cls.env["l10n.eu.oss.wizard"].create( + { + "company_id": cls.company.id, + "general_tax": general_tax.id, + "todo_country_ids": [(4, cls.oss_country.id)], + } + ) + wizard.generate_eu_oss_taxes() + cls.taxes_sale = {} + cls.oss_tax = cls.env["account.tax"].search( + [ + ("oss_country_id", "=", cls.oss_country.id), + ("company_id", "=", cls.company.id), + ] + ) + line_data = { + "name": "Test for OSS tax", + "account_id": cls.accounts["700000"].id, + "price_unit": 100, + "quantity": 1, + "tax_ids": [(4, cls.oss_tax.id)], + } + extra_vals = {"invoice_line_ids": [(0, 0, line_data)]} + cls._invoice_sale_create("2021-01-01", extra_vals) + cls._invoice_sale_create("2021-12-31", extra_vals) + # Create reports + mod390_form = Form(cls.env["l10n.es.aeat.mod390.report"]) + mod390_form.company_id = cls.company + mod390_form.year = 2021 + mod390_form.company_vat = "1234567890" + cls.model390 = mod390_form.save() + cls.model390 = cls.model390.copy( + { + "name": "OSS4000000390", + "date_start": "2021-01-01", + "date_end": "2021-12-31", + } + ) + + def _check_field_amount(self, report, number, amount): + lines = report.tax_line_ids.filtered(lambda x: x.field_number == number) + self.assertAlmostEqual(sum(lines.mapped("amount")), amount) + + def test_l10n_es_aeat_mod390_oss(self): + self.model390.button_calculate() + self._check_field_amount(self.model390, 126, 200) From 3899be7e6141c0ec435f13bbdd51bd68c630b4b1 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Fri, 17 Jun 2022 09:03:13 +0000 Subject: [PATCH 02/12] [UPD] Update l10n_es_aeat_mod390_oss.pot --- .../i18n/l10n_es_aeat_mod390_oss.pot | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 l10n_es_aeat_mod390_oss/i18n/l10n_es_aeat_mod390_oss.pot diff --git a/l10n_es_aeat_mod390_oss/i18n/l10n_es_aeat_mod390_oss.pot b/l10n_es_aeat_mod390_oss/i18n/l10n_es_aeat_mod390_oss.pot new file mode 100644 index 00000000000..98c9e2644f2 --- /dev/null +++ b/l10n_es_aeat_mod390_oss/i18n/l10n_es_aeat_mod390_oss.pot @@ -0,0 +1,19 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * l10n_es_aeat_mod390_oss +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.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: l10n_es_aeat_mod390_oss +#: model:ir.model,name:l10n_es_aeat_mod390_oss.model_l10n_es_aeat_mod390_report +msgid "AEAT 390 report" +msgstr "" From e040411031132ed89a1dd89a7c95bf17067935dd Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 17 Jun 2022 09:18:33 +0000 Subject: [PATCH 03/12] [UPD] README.rst --- l10n_es_aeat_mod390_oss/README.rst | 82 ++++ .../static/description/index.html | 431 ++++++++++++++++++ 2 files changed, 513 insertions(+) create mode 100644 l10n_es_aeat_mod390_oss/README.rst create mode 100644 l10n_es_aeat_mod390_oss/static/description/index.html diff --git a/l10n_es_aeat_mod390_oss/README.rst b/l10n_es_aeat_mod390_oss/README.rst new file mode 100644 index 00000000000..e1df8759efa --- /dev/null +++ b/l10n_es_aeat_mod390_oss/README.rst @@ -0,0 +1,82 @@ +===================== +AEAT modelo 390 - OSS +===================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fl10n--spain-lightgray.png?logo=github + :target: https://github.com/OCA/l10n-spain/tree/13.0/l10n_es_aeat_mod390_oss + :alt: OCA/l10n-spain +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/l10n-spain-13-0/l10n-spain-13-0-l10n_es_aeat_mod390_oss + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/189/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Este módulo añade las casillas 126 y 127 al modelo390 +y genera el valor de la casilla 126, dependiente de +los impuestos OSS. + +**Table of contents** + +.. contents:: + :local: + +Known issues / Roadmap +====================== + +* No se contempla el cálculo de la casilla 127 + +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 +~~~~~~~ + +* Sygel + +Contributors +~~~~~~~~~~~~ + +* `Sygel `__: + + * Manuel Regidor + +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. + +This module is part of the `OCA/l10n-spain `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/l10n_es_aeat_mod390_oss/static/description/index.html b/l10n_es_aeat_mod390_oss/static/description/index.html new file mode 100644 index 00000000000..e2f7fbe3db6 --- /dev/null +++ b/l10n_es_aeat_mod390_oss/static/description/index.html @@ -0,0 +1,431 @@ + + + + + + +AEAT modelo 390 - OSS + + + +
+

AEAT modelo 390 - OSS

+ + +

Beta License: AGPL-3 OCA/l10n-spain Translate me on Weblate Try me on Runbot

+

Este módulo añade las casillas 126 y 127 al modelo390 +y genera el valor de la casilla 126, dependiente de +los impuestos OSS.

+

Table of contents

+ +
+

Known issues / Roadmap

+
    +
  • No se contempla el cálculo de la casilla 127
    • +
+
+
+

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

+
    +
  • Sygel
    • +
+
+
+

Contributors

+
    +
  • Sygel:
      +
    • Manuel Regidor
      • +
    +
    • +
+
+
+

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.

+

This module is part of the OCA/l10n-spain project on GitHub.

+

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

+
+
+
+ + From 6a0ccbeb5f8a05da0831fa38c847c347b48705db Mon Sep 17 00:00:00 2001 From: manu Date: Fri, 17 Jun 2022 11:59:13 +0200 Subject: [PATCH 04/12] [MIG]l10n_es_aeat_mod390_oss: Migration to 14.0 --- l10n_es_aeat_mod390_oss/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10n_es_aeat_mod390_oss/__manifest__.py b/l10n_es_aeat_mod390_oss/__manifest__.py index c286982eb97..fd28f910e9f 100644 --- a/l10n_es_aeat_mod390_oss/__manifest__.py +++ b/l10n_es_aeat_mod390_oss/__manifest__.py @@ -3,7 +3,7 @@ { "name": "AEAT modelo 390 - OSS", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "category": "Accounting", "author": "Sygel, Odoo Community Association (OCA)", "website": "https://github.com/OCA/l10n-spain", From 45a8e009a3bae11324589538bc46170cffe77572 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Fri, 17 Jun 2022 10:31:07 +0000 Subject: [PATCH 05/12] [UPD] Update l10n_es_aeat_mod390_oss.pot --- .../i18n/l10n_es_aeat_mod390_oss.pot | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/l10n_es_aeat_mod390_oss/i18n/l10n_es_aeat_mod390_oss.pot b/l10n_es_aeat_mod390_oss/i18n/l10n_es_aeat_mod390_oss.pot index 98c9e2644f2..3ddf5c98ac4 100644 --- a/l10n_es_aeat_mod390_oss/i18n/l10n_es_aeat_mod390_oss.pot +++ b/l10n_es_aeat_mod390_oss/i18n/l10n_es_aeat_mod390_oss.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -17,3 +17,18 @@ msgstr "" #: model:ir.model,name:l10n_es_aeat_mod390_oss.model_l10n_es_aeat_mod390_report msgid "AEAT 390 report" msgstr "" + +#. module: l10n_es_aeat_mod390_oss +#: model:ir.model.fields,field_description:l10n_es_aeat_mod390_oss.field_l10n_es_aeat_mod390_report__display_name +msgid "Display Name" +msgstr "" + +#. module: l10n_es_aeat_mod390_oss +#: model:ir.model.fields,field_description:l10n_es_aeat_mod390_oss.field_l10n_es_aeat_mod390_report__id +msgid "ID" +msgstr "" + +#. module: l10n_es_aeat_mod390_oss +#: model:ir.model.fields,field_description:l10n_es_aeat_mod390_oss.field_l10n_es_aeat_mod390_report____last_update +msgid "Last Modified on" +msgstr "" From cf119b3951b607033251cccb696d59d16868de9d Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 17 Jun 2022 10:46:52 +0000 Subject: [PATCH 06/12] [UPD] README.rst --- l10n_es_aeat_mod390_oss/README.rst | 10 +++++----- l10n_es_aeat_mod390_oss/static/description/index.html | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/l10n_es_aeat_mod390_oss/README.rst b/l10n_es_aeat_mod390_oss/README.rst index e1df8759efa..efa6f6fa9cf 100644 --- a/l10n_es_aeat_mod390_oss/README.rst +++ b/l10n_es_aeat_mod390_oss/README.rst @@ -14,13 +14,13 @@ AEAT modelo 390 - OSS :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--spain-lightgray.png?logo=github - :target: https://github.com/OCA/l10n-spain/tree/13.0/l10n_es_aeat_mod390_oss + :target: https://github.com/OCA/l10n-spain/tree/14.0/l10n_es_aeat_mod390_oss :alt: OCA/l10n-spain .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/l10n-spain-13-0/l10n-spain-13-0-l10n_es_aeat_mod390_oss + :target: https://translation.odoo-community.org/projects/l10n-spain-14-0/l10n-spain-14-0-l10n_es_aeat_mod390_oss :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/189/13.0 + :target: https://runbot.odoo-community.org/runbot/189/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -45,7 +45,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -77,6 +77,6 @@ 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. -This module is part of the `OCA/l10n-spain `_ project on GitHub. +This module is part of the `OCA/l10n-spain `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/l10n_es_aeat_mod390_oss/static/description/index.html b/l10n_es_aeat_mod390_oss/static/description/index.html index e2f7fbe3db6..0ad7dc5ea95 100644 --- a/l10n_es_aeat_mod390_oss/static/description/index.html +++ b/l10n_es_aeat_mod390_oss/static/description/index.html @@ -367,7 +367,7 @@

AEAT modelo 390 - OSS

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/l10n-spain Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/l10n-spain Translate me on Weblate Try me on Runbot

Este módulo añade las casillas 126 y 127 al modelo390 y genera el valor de la casilla 126, dependiente de los impuestos OSS.

@@ -395,7 +395,7 @@

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.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -422,7 +422,7 @@

Maintainers

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.

-

This module is part of the OCA/l10n-spain project on GitHub.

+

This module is part of the OCA/l10n-spain project on GitHub.

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

From 492af64d3414dc253fce818760deabbae548d051 Mon Sep 17 00:00:00 2001 From: manu Date: Fri, 17 Jun 2022 14:40:38 +0200 Subject: [PATCH 07/12] [MIG]l10n_es_aeat_mod390_oss: Migration to 15.0 --- l10n_es_aeat_mod390_oss/__manifest__.py | 4 ++-- .../tests/test_l10n_es_aeat_mod390_oss.py | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/l10n_es_aeat_mod390_oss/__manifest__.py b/l10n_es_aeat_mod390_oss/__manifest__.py index fd28f910e9f..872ccd2e5dd 100644 --- a/l10n_es_aeat_mod390_oss/__manifest__.py +++ b/l10n_es_aeat_mod390_oss/__manifest__.py @@ -3,12 +3,12 @@ { "name": "AEAT modelo 390 - OSS", - "version": "14.0.1.0.0", + "version": "15.0.1.0.0", "category": "Accounting", "author": "Sygel, Odoo Community Association (OCA)", "website": "https://github.com/OCA/l10n-spain", "license": "AGPL-3", - "depends": ["l10n_es_aeat_mod390", "l10n_eu_oss"], + "depends": ["l10n_es_aeat_mod390", "l10n_eu_oss_oca"], "data": ["data/tax_code_map_mod390_data.xml"], "installable": True, "autoinstall": True, diff --git a/l10n_es_aeat_mod390_oss/tests/test_l10n_es_aeat_mod390_oss.py b/l10n_es_aeat_mod390_oss/tests/test_l10n_es_aeat_mod390_oss.py index 3542cab0562..5269169a484 100644 --- a/l10n_es_aeat_mod390_oss/tests/test_l10n_es_aeat_mod390_oss.py +++ b/l10n_es_aeat_mod390_oss/tests/test_l10n_es_aeat_mod390_oss.py @@ -24,6 +24,9 @@ def setUpClass(cls): } ) wizard.generate_eu_oss_taxes() + fr_fiscal_position = cls.env["account.fiscal.position"].search( + [("country_id", "=", cls.oss_country.id), ("oss_oca", "=", True)], limit=1 + ) cls.taxes_sale = {} cls.oss_tax = cls.env["account.tax"].search( [ @@ -38,7 +41,10 @@ def setUpClass(cls): "quantity": 1, "tax_ids": [(4, cls.oss_tax.id)], } - extra_vals = {"invoice_line_ids": [(0, 0, line_data)]} + extra_vals = { + "invoice_line_ids": [(0, 0, line_data)], + "fiscal_position_id": fr_fiscal_position.id, + } cls._invoice_sale_create("2021-01-01", extra_vals) cls._invoice_sale_create("2021-12-31", extra_vals) # Create reports From 446e0709fc5a87c808fd18e274d9be694ada1dba Mon Sep 17 00:00:00 2001 From: oca-ci Date: Fri, 1 Jul 2022 10:52:19 +0000 Subject: [PATCH 08/12] [UPD] Update l10n_es_aeat_mod390_oss.pot --- .../i18n/l10n_es_aeat_mod390_oss.pot | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/l10n_es_aeat_mod390_oss/i18n/l10n_es_aeat_mod390_oss.pot b/l10n_es_aeat_mod390_oss/i18n/l10n_es_aeat_mod390_oss.pot index 3ddf5c98ac4..2cc9cdc6054 100644 --- a/l10n_es_aeat_mod390_oss/i18n/l10n_es_aeat_mod390_oss.pot +++ b/l10n_es_aeat_mod390_oss/i18n/l10n_es_aeat_mod390_oss.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -17,18 +17,3 @@ msgstr "" #: model:ir.model,name:l10n_es_aeat_mod390_oss.model_l10n_es_aeat_mod390_report msgid "AEAT 390 report" msgstr "" - -#. module: l10n_es_aeat_mod390_oss -#: model:ir.model.fields,field_description:l10n_es_aeat_mod390_oss.field_l10n_es_aeat_mod390_report__display_name -msgid "Display Name" -msgstr "" - -#. module: l10n_es_aeat_mod390_oss -#: model:ir.model.fields,field_description:l10n_es_aeat_mod390_oss.field_l10n_es_aeat_mod390_report__id -msgid "ID" -msgstr "" - -#. module: l10n_es_aeat_mod390_oss -#: model:ir.model.fields,field_description:l10n_es_aeat_mod390_oss.field_l10n_es_aeat_mod390_report____last_update -msgid "Last Modified on" -msgstr "" From 5ca9d2bf43f0557a97d4ba51cee78088191970e6 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 1 Jul 2022 11:03:22 +0000 Subject: [PATCH 09/12] [UPD] README.rst --- l10n_es_aeat_mod390_oss/README.rst | 10 +++++----- l10n_es_aeat_mod390_oss/static/description/index.html | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/l10n_es_aeat_mod390_oss/README.rst b/l10n_es_aeat_mod390_oss/README.rst index efa6f6fa9cf..68c4a8036ff 100644 --- a/l10n_es_aeat_mod390_oss/README.rst +++ b/l10n_es_aeat_mod390_oss/README.rst @@ -14,13 +14,13 @@ AEAT modelo 390 - OSS :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--spain-lightgray.png?logo=github - :target: https://github.com/OCA/l10n-spain/tree/14.0/l10n_es_aeat_mod390_oss + :target: https://github.com/OCA/l10n-spain/tree/15.0/l10n_es_aeat_mod390_oss :alt: OCA/l10n-spain .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/l10n-spain-14-0/l10n-spain-14-0-l10n_es_aeat_mod390_oss + :target: https://translation.odoo-community.org/projects/l10n-spain-15-0/l10n-spain-15-0-l10n_es_aeat_mod390_oss :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/189/14.0 + :target: https://runbot.odoo-community.org/runbot/189/15.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -45,7 +45,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -77,6 +77,6 @@ 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. -This module is part of the `OCA/l10n-spain `_ project on GitHub. +This module is part of the `OCA/l10n-spain `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/l10n_es_aeat_mod390_oss/static/description/index.html b/l10n_es_aeat_mod390_oss/static/description/index.html index 0ad7dc5ea95..9c68eb43015 100644 --- a/l10n_es_aeat_mod390_oss/static/description/index.html +++ b/l10n_es_aeat_mod390_oss/static/description/index.html @@ -367,7 +367,7 @@

AEAT modelo 390 - OSS

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/l10n-spain Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/l10n-spain Translate me on Weblate Try me on Runbot

Este módulo añade las casillas 126 y 127 al modelo390 y genera el valor de la casilla 126, dependiente de los impuestos OSS.

@@ -395,7 +395,7 @@

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.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -422,7 +422,7 @@

Maintainers

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.

-

This module is part of the OCA/l10n-spain project on GitHub.

+

This module is part of the OCA/l10n-spain project on GitHub.

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

From 8f35ef7ececeaebfbbc699cfca675a8362cb0797 Mon Sep 17 00:00:00 2001 From: Alejandro Ji Cheung Date: Wed, 2 Aug 2023 16:48:28 +0200 Subject: [PATCH 10/12] [IMP] l10n_es_aeat_mod390_oss: pre-commit stuff --- .../odoo/addons/l10n_es_aeat_mod390_oss | 1 + setup/l10n_es_aeat_mod390_oss/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/l10n_es_aeat_mod390_oss/odoo/addons/l10n_es_aeat_mod390_oss create mode 100644 setup/l10n_es_aeat_mod390_oss/setup.py diff --git a/setup/l10n_es_aeat_mod390_oss/odoo/addons/l10n_es_aeat_mod390_oss b/setup/l10n_es_aeat_mod390_oss/odoo/addons/l10n_es_aeat_mod390_oss new file mode 120000 index 00000000000..801bc030f21 --- /dev/null +++ b/setup/l10n_es_aeat_mod390_oss/odoo/addons/l10n_es_aeat_mod390_oss @@ -0,0 +1 @@ +../../../../l10n_es_aeat_mod390_oss \ No newline at end of file diff --git a/setup/l10n_es_aeat_mod390_oss/setup.py b/setup/l10n_es_aeat_mod390_oss/setup.py new file mode 100644 index 00000000000..28c57bb6403 --- /dev/null +++ b/setup/l10n_es_aeat_mod390_oss/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 2d8aca3f6b28d4a1b4edc7df153931240f0b3615 Mon Sep 17 00:00:00 2001 From: Alejandro Ji Cheung Date: Wed, 2 Aug 2023 17:18:49 +0200 Subject: [PATCH 11/12] [MIG] l10n_es_aeat_mod390_oss: Migration to 16.0 --- l10n_es_aeat_mod390_oss/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10n_es_aeat_mod390_oss/__manifest__.py b/l10n_es_aeat_mod390_oss/__manifest__.py index 872ccd2e5dd..a260666269a 100644 --- a/l10n_es_aeat_mod390_oss/__manifest__.py +++ b/l10n_es_aeat_mod390_oss/__manifest__.py @@ -3,7 +3,7 @@ { "name": "AEAT modelo 390 - OSS", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "category": "Accounting", "author": "Sygel, Odoo Community Association (OCA)", "website": "https://github.com/OCA/l10n-spain", From 035d213129ec95f83651ae45000d44ac9fa2742d Mon Sep 17 00:00:00 2001 From: "Luis J. Salvatierra" Date: Thu, 16 Jan 2025 11:35:59 +0100 Subject: [PATCH 12/12] [IMP] l10n_es_aeat_mod390_oss: 2024 tax mapping --- l10n_es_aeat_mod390_oss/README.rst | 23 ++++++----- l10n_es_aeat_mod390_oss/__manifest__.py | 6 ++- .../2024/aeat.model.export.config.line.csv | 3 ++ .../data/2024/tax_code_map_mod390_data.xml | 26 ++++++++++++ l10n_es_aeat_mod390_oss/models/mod390.py | 1 + .../static/description/index.html | 41 ++++++++++--------- .../tests/test_l10n_es_aeat_mod390_oss.py | 10 ++--- 7 files changed, 74 insertions(+), 36 deletions(-) create mode 100644 l10n_es_aeat_mod390_oss/data/2024/aeat.model.export.config.line.csv create mode 100644 l10n_es_aeat_mod390_oss/data/2024/tax_code_map_mod390_data.xml diff --git a/l10n_es_aeat_mod390_oss/README.rst b/l10n_es_aeat_mod390_oss/README.rst index 68c4a8036ff..c6943c1a744 100644 --- a/l10n_es_aeat_mod390_oss/README.rst +++ b/l10n_es_aeat_mod390_oss/README.rst @@ -2,10 +2,13 @@ AEAT modelo 390 - OSS ===================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:763e5076a2b38a556b0161faaca54ad3ec440d7f38f438a588cedd51165b9a13 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ AEAT modelo 390 - OSS :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--spain-lightgray.png?logo=github - :target: https://github.com/OCA/l10n-spain/tree/15.0/l10n_es_aeat_mod390_oss + :target: https://github.com/OCA/l10n-spain/tree/16.0/l10n_es_aeat_mod390_oss :alt: OCA/l10n-spain .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/l10n-spain-15-0/l10n-spain-15-0-l10n_es_aeat_mod390_oss + :target: https://translation.odoo-community.org/projects/l10n-spain-16-0/l10n-spain-16-0-l10n_es_aeat_mod390_oss :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/189/15.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/l10n-spain&target_branch=16.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| Este módulo añade las casillas 126 y 127 al modelo390 y genera el valor de la casilla 126, dependiente de @@ -44,8 +47,8 @@ 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 `_. +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. @@ -77,6 +80,6 @@ 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. -This module is part of the `OCA/l10n-spain `_ project on GitHub. +This module is part of the `OCA/l10n-spain `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/l10n_es_aeat_mod390_oss/__manifest__.py b/l10n_es_aeat_mod390_oss/__manifest__.py index a260666269a..3f214069bfb 100644 --- a/l10n_es_aeat_mod390_oss/__manifest__.py +++ b/l10n_es_aeat_mod390_oss/__manifest__.py @@ -9,7 +9,11 @@ "website": "https://github.com/OCA/l10n-spain", "license": "AGPL-3", "depends": ["l10n_es_aeat_mod390", "l10n_eu_oss_oca"], - "data": ["data/tax_code_map_mod390_data.xml"], + "data": [ + "data/tax_code_map_mod390_data.xml", + "data/2024/tax_code_map_mod390_data.xml", + "data/2024/aeat.model.export.config.line.csv", + ], "installable": True, "autoinstall": True, } diff --git a/l10n_es_aeat_mod390_oss/data/2024/aeat.model.export.config.line.csv b/l10n_es_aeat_mod390_oss/data/2024/aeat.model.export.config.line.csv new file mode 100644 index 00000000000..5decbcc6c35 --- /dev/null +++ b/l10n_es_aeat_mod390_oss/data/2024/aeat.model.export.config.line.csv @@ -0,0 +1,3 @@ +id,alignment,apply_sign,bool_no,bool_yes,conditional_expression,decimal_size,export_config_id:id,export_type,expression,fixed_value,name,sequence,size,subconfig_id:id +l10n_es_aeat_mod390.aeat_mod390_2021_sub06_export_line_37,"right","True",,,,"2","l10n_es_aeat_mod390.aeat_mod390_2021_sub06_export_config","float","${object.tax_line_ids.filtered(lambda r: r.field_number == 126).amount}",,"10. Volumen de operaciones - OSS. Operaciones no sujetas por reglas de localización acogidas a la OSS [126]","37","17", +l10n_es_aeat_mod390.aeat_mod390_2021_sub06_export_line_38,"right","True",,,,"2","l10n_es_aeat_mod390.aeat_mod390_2021_sub06_export_config","float","${object.tax_line_ids.filtered(lambda r: r.field_number == 127).amount}",,"10. Volumen de operaciones - OSS. Operaciones sujetas y acogidas a la OSS [127]","38","17", diff --git a/l10n_es_aeat_mod390_oss/data/2024/tax_code_map_mod390_data.xml b/l10n_es_aeat_mod390_oss/data/2024/tax_code_map_mod390_data.xml new file mode 100644 index 00000000000..d2ba59c5fb0 --- /dev/null +++ b/l10n_es_aeat_mod390_oss/data/2024/tax_code_map_mod390_data.xml @@ -0,0 +1,26 @@ + + + + + 126 + OSS. Operaciones no sujetas por reglas de localización acogidas a la OSS + all + base + both + + + + + + 127 + OSS. Operaciones sujetas y acogidas a la OSS + all + base + both + + + + diff --git a/l10n_es_aeat_mod390_oss/models/mod390.py b/l10n_es_aeat_mod390_oss/models/mod390.py index a864876d5c0..535cd20e741 100644 --- a/l10n_es_aeat_mod390_oss/models/mod390.py +++ b/l10n_es_aeat_mod390_oss/models/mod390.py @@ -10,6 +10,7 @@ class L10nEsAeatMod390Report(models.Model): def get_taxes_from_map(self, map_line): oss_map_lines = [ self.env.ref("l10n_es_aeat_mod390_oss.aeat_mod390_map_line_126"), + self.env.ref("l10n_es_aeat_mod390_oss.aeat_mod390_2024_map_line_126"), ] if map_line in oss_map_lines: return self.env["account.tax"].search( diff --git a/l10n_es_aeat_mod390_oss/static/description/index.html b/l10n_es_aeat_mod390_oss/static/description/index.html index 9c68eb43015..3a8de330e83 100644 --- a/l10n_es_aeat_mod390_oss/static/description/index.html +++ b/l10n_es_aeat_mod390_oss/static/description/index.html @@ -1,20 +1,19 @@ - - + AEAT modelo 390 - OSS