diff --git a/intrastat_base/README.rst b/intrastat_base/README.rst index 8566f78..2246c4f 100644 --- a/intrastat_base/README.rst +++ b/intrastat_base/README.rst @@ -17,13 +17,13 @@ Intrastat Reporting Base :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fintrastat--extrastat-lightgray.png?logo=github - :target: https://github.com/OCA/intrastat-extrastat/tree/16.0/intrastat_base + :target: https://github.com/OCA/intrastat-extrastat/tree/17.0/intrastat_base :alt: OCA/intrastat-extrastat .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/intrastat-extrastat-16-0/intrastat-extrastat-16-0-intrastat_base + :target: https://translation.odoo-community.org/projects/intrastat-extrastat-17-0/intrastat-extrastat-17-0-intrastat_base :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/intrastat-extrastat&target_branch=16.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/intrastat-extrastat&target_branch=17.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -33,12 +33,12 @@ should be used in combination with the generic reporting module *intrastat_product* and with the country-specific reporting modules such as: -- *l10n_fr_intrastat_service*: - the module for the *Déclaration Européenne des Services* (DES) for France -- *l10n_fr_intrastat_product*: - the module for the *Déclaration d'Echange de Biens* (DEB) for France -- *l10n_be_intrastat_product*: - the module for the Intrastat Declaration for Belgium. +- *l10n_fr_intrastat_service*: the module for the *Déclaration + Européenne des Services* (DES) for France +- *l10n_fr_intrastat_product*: the module for the *Déclaration + d'Echange de Biens* (DEB) for France +- *l10n_be_intrastat_product*: the module for the Intrastat Declaration + for Belgium. **Table of contents** @@ -50,16 +50,18 @@ Installation WARNING: -This module conflicts with the module *account_intrastat* from Odoo Enterprise. -If you have already installed the module *account_intrastat*, -you should uninstall it first before installing this module. +This module conflicts with the module *account_intrastat* from Odoo +Enterprise. If you have already installed the module +*account_intrastat*, you should uninstall it first before installing +this module. Usage ===== This module adds an intrastat property on fiscal positions. -With this module, the country field on partners becomes a required field. +With this module, the country field on partners becomes a required +field. It adds an *Intrastat* section on the *Invoicing* configuration page. @@ -69,7 +71,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 to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -77,23 +79,23 @@ Credits ======= Authors -~~~~~~~ +------- * ACSONE SA/NV * Akretion * Noviat Contributors -~~~~~~~~~~~~ +------------ -* Alexis de Lattre, Akretion -* Luc De Meyer, Noviat -* Kumar Aberer, brain-tec AG -* Andrea Stirpe -* Denis Roussel +- Alexis de Lattre, Akretion +- Luc De Meyer, Noviat +- Kumar Aberer, brain-tec AG +- Andrea Stirpe +- Denis Roussel Maintainers -~~~~~~~~~~~ +----------- This module is maintained by the OCA. @@ -116,6 +118,6 @@ Current `maintainers `__: |maintainer-alexis-via| |maintainer-luc-demeyer| -This module is part of the `OCA/intrastat-extrastat `_ project on GitHub. +This module is part of the `OCA/intrastat-extrastat `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/intrastat_base/models/res_company.py b/intrastat_base/models/res_company.py index 7198994..0c315b7 100644 --- a/intrastat_base/models/res_company.py +++ b/intrastat_base/models/res_company.py @@ -62,7 +62,7 @@ class ResCompany(models.Model): logger.warning("The XML file is invalid against the XML Schema Definition") logger.warning(xml_bytes) logger.warning(e) - usererror = "{}\n\n{}".format(e.__class__.__name__, str(e)) + usererror = f"{e.__class__.__name__}\n\n{str(e)}" raise UserError(usererror) from e except Exception as e: error = _("Unknown Error") diff --git a/intrastat_base/pyproject.toml b/intrastat_base/pyproject.toml new file mode 100644 index 0000000..4231d0c --- /dev/null +++ b/intrastat_base/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/intrastat_base/readme/CONTRIBUTORS.md b/intrastat_base/readme/CONTRIBUTORS.md new file mode 100644 index 0000000..319b1f5 --- /dev/null +++ b/intrastat_base/readme/CONTRIBUTORS.md @@ -0,0 +1,5 @@ +- Alexis de Lattre, Akretion \<\> +- Luc De Meyer, Noviat \<\> +- Kumar Aberer, brain-tec AG \<\> +- Andrea Stirpe \<\> +- Denis Roussel \<\> diff --git a/intrastat_base/readme/CONTRIBUTORS.rst b/intrastat_base/readme/CONTRIBUTORS.rst deleted file mode 100644 index af9ef52..0000000 --- a/intrastat_base/readme/CONTRIBUTORS.rst +++ /dev/null @@ -1,5 +0,0 @@ -* Alexis de Lattre, Akretion -* Luc De Meyer, Noviat -* Kumar Aberer, brain-tec AG -* Andrea Stirpe -* Denis Roussel diff --git a/intrastat_base/readme/DESCRIPTION.md b/intrastat_base/readme/DESCRIPTION.md new file mode 100644 index 0000000..ed84ff1 --- /dev/null +++ b/intrastat_base/readme/DESCRIPTION.md @@ -0,0 +1,11 @@ +This module contains common functions for the intrastat reporting and +should be used in combination with the generic reporting module +*intrastat_product* and with the country-specific reporting modules such +as: + +- *l10n_fr_intrastat_service*: the module for the *Déclaration + Européenne des Services* (DES) for France +- *l10n_fr_intrastat_product*: the module for the *Déclaration d'Echange + de Biens* (DEB) for France +- *l10n_be_intrastat_product*: the module for the Intrastat Declaration + for Belgium. diff --git a/intrastat_base/readme/DESCRIPTION.rst b/intrastat_base/readme/DESCRIPTION.rst deleted file mode 100644 index 179c7eb..0000000 --- a/intrastat_base/readme/DESCRIPTION.rst +++ /dev/null @@ -1,11 +0,0 @@ -This module contains common functions for the intrastat reporting and -should be used in combination with the generic reporting module -*intrastat_product* and with the country-specific reporting modules such -as: - -- *l10n_fr_intrastat_service*: - the module for the *Déclaration Européenne des Services* (DES) for France -- *l10n_fr_intrastat_product*: - the module for the *Déclaration d'Echange de Biens* (DEB) for France -- *l10n_be_intrastat_product*: - the module for the Intrastat Declaration for Belgium. diff --git a/intrastat_base/readme/INSTALL.md b/intrastat_base/readme/INSTALL.md new file mode 100644 index 0000000..ced70fe --- /dev/null +++ b/intrastat_base/readme/INSTALL.md @@ -0,0 +1,6 @@ +WARNING: + +This module conflicts with the module *account_intrastat* from Odoo +Enterprise. If you have already installed the module +*account_intrastat*, you should uninstall it first before installing +this module. diff --git a/intrastat_base/readme/INSTALL.rst b/intrastat_base/readme/INSTALL.rst deleted file mode 100644 index 2f4f69f..0000000 --- a/intrastat_base/readme/INSTALL.rst +++ /dev/null @@ -1,5 +0,0 @@ -WARNING: - -This module conflicts with the module *account_intrastat* from Odoo Enterprise. -If you have already installed the module *account_intrastat*, -you should uninstall it first before installing this module. diff --git a/intrastat_base/readme/USAGE.rst b/intrastat_base/readme/USAGE.md similarity index 95% rename from intrastat_base/readme/USAGE.rst rename to intrastat_base/readme/USAGE.md index 7f7a6d0..0024237 100644 --- a/intrastat_base/readme/USAGE.rst +++ b/intrastat_base/readme/USAGE.md @@ -1,5 +1,6 @@ This module adds an intrastat property on fiscal positions. -With this module, the country field on partners becomes a required field. +With this module, the country field on partners becomes a required +field. It adds an *Intrastat* section on the *Invoicing* configuration page. diff --git a/intrastat_base/static/description/index.html b/intrastat_base/static/description/index.html index 4dd24ea..5d98b54 100644 --- a/intrastat_base/static/description/index.html +++ b/intrastat_base/static/description/index.html @@ -369,18 +369,18 @@ ul.auto-toc { !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:28aa058f14d9b8414cad83bafa1c8d416330287450167531b2787c4d47348560 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

This module contains common functions for the intrastat reporting and should be used in combination with the generic reporting module intrastat_product and with the country-specific reporting modules such as:

    -
  • l10n_fr_intrastat_service: -the module for the Déclaration Européenne des Services (DES) for France
    • -
  • l10n_fr_intrastat_product: -the module for the Déclaration d’Echange de Biens (DEB) for France
    • -
  • l10n_be_intrastat_product: -the module for the Intrastat Declaration for Belgium.
    • +
  • l10n_fr_intrastat_service: the module for the Déclaration +Européenne des Services (DES) for France
    • +
  • l10n_fr_intrastat_product: the module for the Déclaration +d’Echange de Biens (DEB) for France
    • +
  • l10n_be_intrastat_product: the module for the Intrastat Declaration +for Belgium.

Table of contents

@@ -399,14 +399,16 @@ the module for the Intrastat Declaration for Belgium.

Installation

WARNING:

-

This module conflicts with the module account_intrastat from Odoo Enterprise. -If you have already installed the module account_intrastat, -you should uninstall it first before installing this module.

+

This module conflicts with the module account_intrastat from Odoo +Enterprise. If you have already installed the module +account_intrastat, you should uninstall it first before installing +this module.

Usage

This module adds an intrastat property on fiscal positions.

-

With this module, the country field on partners becomes a required field.

+

With this module, the country field on partners becomes a required +field.

It adds an Intrastat section on the Invoicing configuration page.

@@ -414,7 +416,7 @@ you should uninstall it first before installing this module.

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.

+feedback.

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

@@ -446,7 +448,7 @@ mission is to support the collaborative development of Odoo features and promote its widespread use.

Current maintainers:

alexis-via luc-demeyer

-

This module is part of the OCA/intrastat-extrastat project on GitHub.

+

This module is part of the OCA/intrastat-extrastat project on GitHub.

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

diff --git a/intrastat_base/tests/common.py b/intrastat_base/tests/common.py index ac1fbf3..7190bae 100644 --- a/intrastat_base/tests/common.py +++ b/intrastat_base/tests/common.py @@ -2,7 +2,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -class IntrastatCommon(object): +class IntrastatCommon: @classmethod def setUpClass(cls): super().setUpClass()