From 781a01e593b20a1c6e8f38dceb460c92580cd92f Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 31 Jan 2024 10:02:02 +0000 Subject: [PATCH] [FIX] l10n_fr_siret[_lookup]: remove wrong dependency Odoo 16 depends on both requests and python-stdnum, so there's no need to specify those dependencies. Besides, [python-stdnum is pinned to 1.16][1]. Thus, when applying https://github.com/OCA/oca-ci/pull/66 locally, the constraint failed. OCA addons should work with the dependencies pinned upstream. [1]: https://github.com/odoo/odoo/blob/fe4d8e8014e50d4335e0a8b052b5098f3a79bcec/requirements.txt#L48 @moduon MT-4520 --- l10n_fr_siret/README.rst | 7 +++- l10n_fr_siret/__manifest__.py | 2 +- l10n_fr_siret/readme/INSTALL.rst | 1 + l10n_fr_siret/static/description/index.html | 42 +++++++++++-------- l10n_fr_siret_lookup/README.rst | 7 +++- l10n_fr_siret_lookup/__manifest__.py | 2 +- l10n_fr_siret_lookup/readme/INSTALL.rst | 1 + .../static/description/index.html | 35 +++++++++------- requirements.txt | 1 - 9 files changed, 61 insertions(+), 37 deletions(-) create mode 100644 l10n_fr_siret/readme/INSTALL.rst create mode 100644 l10n_fr_siret_lookup/readme/INSTALL.rst diff --git a/l10n_fr_siret/README.rst b/l10n_fr_siret/README.rst index 1641c7fbe..f048f60f8 100644 --- a/l10n_fr_siret/README.rst +++ b/l10n_fr_siret/README.rst @@ -7,7 +7,7 @@ French company identity numbers SIRET/SIREN/NIC !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:94ef8ef9d4aa0069dd19e158ac7f7c065ba1b283e8ea2b048363dac0c4a8166e + !! source digest: sha256:ea67eff242155510a0475c4cde9e7cb9b442becd6900f867e9e22be734254c13 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png @@ -43,6 +43,11 @@ The **l10n_fr** module from the official addons adds a *SIRET* field on partners .. contents:: :local: +Installation +============ + +It's recommended to install ``python-stdnum>=1.18`` for SIRET support. + Usage ===== diff --git a/l10n_fr_siret/__manifest__.py b/l10n_fr_siret/__manifest__.py index e9ac36a08..d6848a76e 100644 --- a/l10n_fr_siret/__manifest__.py +++ b/l10n_fr_siret/__manifest__.py @@ -12,7 +12,7 @@ "website": "https://github.com/OCA/l10n-france", "license": "AGPL-3", "depends": ["l10n_fr", "base_view_inheritance_extension"], - "external_dependencies": {"python": ["python-stdnum>=1.18"]}, + "external_dependencies": {"python": ["python-stdnum"]}, "data": [ "views/res_partner.xml", "views/res_company.xml", diff --git a/l10n_fr_siret/readme/INSTALL.rst b/l10n_fr_siret/readme/INSTALL.rst new file mode 100644 index 000000000..4d53f118c --- /dev/null +++ b/l10n_fr_siret/readme/INSTALL.rst @@ -0,0 +1 @@ +It's recommended to install ``python-stdnum>=1.18`` for SIRET support. diff --git a/l10n_fr_siret/static/description/index.html b/l10n_fr_siret/static/description/index.html index 2e3658435..5c8b217b9 100644 --- a/l10n_fr_siret/static/description/index.html +++ b/l10n_fr_siret/static/description/index.html @@ -8,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -274,7 +275,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -300,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -366,7 +367,7 @@

French company identity numbers SIRET/SIREN/NIC

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:94ef8ef9d4aa0069dd19e158ac7f7c065ba1b283e8ea2b048363dac0c4a8166e +!! source digest: sha256:ea67eff242155510a0475c4cde9e7cb9b442becd6900f867e9e22be734254c13 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Mature License: AGPL-3 OCA/l10n-france Translate me on Weblate Try me on Runboat

The l10n_fr module from the official addons adds a SIRET field on partners, but it doesn’t verify its validity. This module l10n_fr_siret adds several features:

@@ -382,18 +383,23 @@

French company identity numbers SIRET/SIREN/NIC

Table of contents

+
+

Installation

+

It’s recommended to install python-stdnum>=1.18 for SIRET support.

+
-

Usage

+

Usage

On the Partner form, users will be able to enter: * the SIREN and NIC numbers: the SIRET number will be computed automatically. * the SIRET number: the SIREN and NIC will be computed automatically.

@@ -404,7 +410,7 @@

Usage

- if the partner is not attached to a specific company: is in any company or not attached to a specific company.

-

Bug Tracker

+

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 @@ -412,25 +418,27 @@

Bug Tracker

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

-

Credits

+

Credits

-

Authors

+

Authors

  • Numérigraphe
  • Akretion
-

Contributors

+

Contributors

-

Maintainers

+

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +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.

diff --git a/l10n_fr_siret_lookup/README.rst b/l10n_fr_siret_lookup/README.rst index a0312b344..4e7c15428 100644 --- a/l10n_fr_siret_lookup/README.rst +++ b/l10n_fr_siret_lookup/README.rst @@ -7,7 +7,7 @@ SIRET Lookup !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:03fba67efc8266229377bb6b509fc696ca15a5c46eef0db0a8d749d51c7d7cdd + !! source digest: sha256:ac452255edc06fcf3217f59520707f90747aa0c82f8f5b4d4bf2fddc31fc1dfb !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png @@ -51,6 +51,11 @@ In the 2 scenarios, it will update the following fields: .. contents:: :local: +Installation +============ + +It's recommended to install ``python-stdnum>=1.18`` for SIRET support. + Usage ===== diff --git a/l10n_fr_siret_lookup/__manifest__.py b/l10n_fr_siret_lookup/__manifest__.py index b6e76d996..be504afc6 100644 --- a/l10n_fr_siret_lookup/__manifest__.py +++ b/l10n_fr_siret_lookup/__manifest__.py @@ -14,7 +14,7 @@ "depends": [ "l10n_fr_siret", ], - "external_dependencies": {"python": ["requests", "python-stdnum>=1.18"]}, + "external_dependencies": {"python": ["requests", "python-stdnum"]}, "data": [ "wizard/fr_siret_lookup_view.xml", "views/res_partner.xml", diff --git a/l10n_fr_siret_lookup/readme/INSTALL.rst b/l10n_fr_siret_lookup/readme/INSTALL.rst new file mode 100644 index 000000000..4d53f118c --- /dev/null +++ b/l10n_fr_siret_lookup/readme/INSTALL.rst @@ -0,0 +1 @@ +It's recommended to install ``python-stdnum>=1.18`` for SIRET support. diff --git a/l10n_fr_siret_lookup/static/description/index.html b/l10n_fr_siret_lookup/static/description/index.html index 9f33ea1b6..40b742498 100644 --- a/l10n_fr_siret_lookup/static/description/index.html +++ b/l10n_fr_siret_lookup/static/description/index.html @@ -367,7 +367,7 @@

SIRET Lookup

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:03fba67efc8266229377bb6b509fc696ca15a5c46eef0db0a8d749d51c7d7cdd +!! source digest: sha256:ac452255edc06fcf3217f59520707f90747aa0c82f8f5b4d4bf2fddc31fc1dfb !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/l10n-france Translate me on Weblate Try me on Runboat

This modules updates partner fields via the SIRENE database <https://data.opendatasoft.com>. It uses the dataset economicref-france-sirene-v3 of opendatasoft <https://public.opendatasoft.com/explore/dataset/economicref-france-sirene-v3/information/>. It computes a theorical VAT number from the SIREN and then checks the validity of the VAT number on VIES (if invalid, the VAT number is discarded).

@@ -390,25 +390,30 @@

SIRET Lookup

Table of contents

+
+

Installation

+

It’s recommended to install python-stdnum>=1.18 for SIRET support.

+
-

Usage

+

Usage

To update an existing parter, go to the partner form view and click on Action > SIREN Lookup.

By default, the search field is filled with Company name. To get more accurate results, you may want to add the City name where the company is registered. Then click on Lookup.

A list of company is displayed. You may want to click on one in order to see corresponding information or directly selecting company from tree view. Once a company is selected, the partner information is updated and a message is logged in the chatter.

-

Bug Tracker

+

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 @@ -416,16 +421,16 @@

Bug Tracker

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

-

Credits

+

Credits

-

Authors

+

Authors

  • Le Filament
  • Akretion
-

Contributors

+

Contributors

-

Other credits

+

Other credits

The development of this module has been financially supported by:

  • Le Filament
-

Maintainers

+

Maintainers

This module is maintained by the OCA.

Odoo Community Association

OCA, or the Odoo Community Association, is a nonprofit organization whose diff --git a/requirements.txt b/requirements.txt index e9cac352c..73f8521cd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,6 @@ pyfrdas2>=0.4 pypdf>=3.1.0 python-stdnum -python-stdnum>=1.18 requests requests_oauthlib unidecode