From 6837e5eb7422a391df14dbe97e7e0cc26c44a2ce Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Tue, 28 Apr 2026 09:53:39 +0200 Subject: [PATCH 1/3] !donotmerge [UPD] test-requirements.txt: Temporary dependencies --- test-requirements.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index 4ad8e0e..3502ff3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1 +1,6 @@ odoo-test-helper + + +odoo-addon-base_url @ git+https://github.com/OCA/server-tools@refs/pull/3591/head#subdirectory=base_url + +odoo-addon-shopinvader_product_brand @ git+https://github.com/shopinvader/odoo-shopinvader-catalog@refs/pull/14/head#subdirectory=shopinvader_product_brand From edeeb79058a3a057fe90232972830e05142523ae Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Wed, 4 Feb 2026 14:47:57 +0100 Subject: [PATCH 2/3] [IMP] shopinvader_product_brand_tag: pre-commit auto fixes --- .pre-commit-config.yaml | 3 ++ requirements.txt | 4 --- shopinvader_product_brand_tag/README.rst | 29 ++++++++++--------- shopinvader_product_brand_tag/__manifest__.py | 4 +-- shopinvader_product_brand_tag/pyproject.toml | 3 ++ .../readme/CONTRIBUTORS.md | 5 ++++ .../readme/CONTRIBUTORS.rst | 4 --- .../readme/DESCRIPTION.md | 2 ++ .../readme/DESCRIPTION.rst | 2 -- .../static/description/index.html | 20 ++++++------- 10 files changed, 40 insertions(+), 36 deletions(-) delete mode 100644 requirements.txt create mode 100644 shopinvader_product_brand_tag/pyproject.toml create mode 100644 shopinvader_product_brand_tag/readme/CONTRIBUTORS.md delete mode 100644 shopinvader_product_brand_tag/readme/CONTRIBUTORS.rst create mode 100644 shopinvader_product_brand_tag/readme/DESCRIPTION.md delete mode 100644 shopinvader_product_brand_tag/readme/DESCRIPTION.rst diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5dd131a..6b90b7b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,6 +4,9 @@ exclude: | ^shopinvader_base_url/| ^shopinvader_product_brand/| ^shopinvader_product_brand_tag/| + ^shopinvader_product_description/| + ^shopinvader_product_sale_packaging/| + ^shopinvader_product_seo/| ^shopinvader_product_url/| # END NOT INSTALLABLE ADDONS # Files and folders generated by bots, to avoid loops diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 5981365..0000000 --- a/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -# generated from manifests external_dependencies -extendable_pydantic>=1.2.0 -pydantic>=2.0.0 -unidecode diff --git a/shopinvader_product_brand_tag/README.rst b/shopinvader_product_brand_tag/README.rst index 26d5bd8..425577d 100644 --- a/shopinvader_product_brand_tag/README.rst +++ b/shopinvader_product_brand_tag/README.rst @@ -16,14 +16,14 @@ Shopvinvader Product Brand Tag .. |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-shopinvader%2Fodoo--shopinvader-lightgray.png?logo=github - :target: https://github.com/shopinvader/odoo-shopinvader/tree/16.0/shopinvader_product_brand_tag - :alt: shopinvader/odoo-shopinvader +.. |badge3| image:: https://img.shields.io/badge/github-shopinvader%2Fodoo--shopinvader--catalog-lightgray.png?logo=github + :target: https://github.com/shopinvader/odoo-shopinvader-catalog/tree/18.0/shopinvader_product_brand_tag + :alt: shopinvader/odoo-shopinvader-catalog |badge1| |badge2| |badge3| -Index Product Brand Tags in Shopinvader. -Tags are defined in OCA module `product_brand_tag` +Index Product Brand Tags in Shopinvader. Tags are defined in OCA module +product_brand_tag .. IMPORTANT:: This is an alpha version, the data model and design can change at any time without warning. @@ -38,10 +38,10 @@ Tags are defined in OCA module `product_brand_tag` Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. +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. @@ -49,22 +49,23 @@ Credits ======= Authors -~~~~~~~ +------- * Camptocamp * ACSONE SA/NV Contributors -~~~~~~~~~~~~ +------------ -* `Camptocamp `_ +- `Camptocamp `__ - * Iván Todorovich -* Marie Lejeune + - Iván Todorovich + +- Marie Lejeune Maintainers -~~~~~~~~~~~ +----------- -This module is part of the `shopinvader/odoo-shopinvader `_ project on GitHub. +This module is part of the `shopinvader/odoo-shopinvader-catalog `_ project on GitHub. You are welcome to contribute. diff --git a/shopinvader_product_brand_tag/__manifest__.py b/shopinvader_product_brand_tag/__manifest__.py index 60157a1..52d2118 100644 --- a/shopinvader_product_brand_tag/__manifest__.py +++ b/shopinvader_product_brand_tag/__manifest__.py @@ -5,13 +5,13 @@ { "name": "Shopvinvader Product Brand Tag", "summary": "Index Product Brand Tags in Shopinvader", - "version": "16.0.1.0.1", + "version": "18.0.1.0.0", "category": "e-Commerce", "website": "https://github.com/shopinvader/odoo-shopinvader-catalog", "author": "Camptocamp,ACSONE SA/NV", "license": "AGPL-3", "depends": ["shopinvader_product_brand", "product_brand_tag"], - "installable": False, + "installable": True, "external_dependencies": {"python": ["extendable_pydantic>=1.2.0"]}, "development_status": "Alpha", } diff --git a/shopinvader_product_brand_tag/pyproject.toml b/shopinvader_product_brand_tag/pyproject.toml new file mode 100644 index 0000000..4231d0c --- /dev/null +++ b/shopinvader_product_brand_tag/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/shopinvader_product_brand_tag/readme/CONTRIBUTORS.md b/shopinvader_product_brand_tag/readme/CONTRIBUTORS.md new file mode 100644 index 0000000..7108ddb --- /dev/null +++ b/shopinvader_product_brand_tag/readme/CONTRIBUTORS.md @@ -0,0 +1,5 @@ +- [Camptocamp](https://www.camptocamp.com) + + > - Iván Todorovich \ + +- Marie Lejeune \ diff --git a/shopinvader_product_brand_tag/readme/CONTRIBUTORS.rst b/shopinvader_product_brand_tag/readme/CONTRIBUTORS.rst deleted file mode 100644 index 7359ed5..0000000 --- a/shopinvader_product_brand_tag/readme/CONTRIBUTORS.rst +++ /dev/null @@ -1,4 +0,0 @@ -* `Camptocamp `_ - - * Iván Todorovich -* Marie Lejeune diff --git a/shopinvader_product_brand_tag/readme/DESCRIPTION.md b/shopinvader_product_brand_tag/readme/DESCRIPTION.md new file mode 100644 index 0000000..6297c6f --- /dev/null +++ b/shopinvader_product_brand_tag/readme/DESCRIPTION.md @@ -0,0 +1,2 @@ +Index Product Brand Tags in Shopinvader. Tags are defined in OCA module +product_brand_tag diff --git a/shopinvader_product_brand_tag/readme/DESCRIPTION.rst b/shopinvader_product_brand_tag/readme/DESCRIPTION.rst deleted file mode 100644 index c686950..0000000 --- a/shopinvader_product_brand_tag/readme/DESCRIPTION.rst +++ /dev/null @@ -1,2 +0,0 @@ -Index Product Brand Tags in Shopinvader. -Tags are defined in OCA module `product_brand_tag` diff --git a/shopinvader_product_brand_tag/static/description/index.html b/shopinvader_product_brand_tag/static/description/index.html index a810e67..9a61894 100644 --- a/shopinvader_product_brand_tag/static/description/index.html +++ b/shopinvader_product_brand_tag/static/description/index.html @@ -1,4 +1,3 @@ - @@ -9,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. @@ -275,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 } @@ -301,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -369,9 +369,9 @@

Shopvinvader Product Brand Tag

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:51dbafe5ffba5451df76193fbb461f50dc1abbc0417991acb33375160eba249d !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Alpha License: AGPL-3 shopinvader/odoo-shopinvader

-

Index Product Brand Tags in Shopinvader. -Tags are defined in OCA module product_brand_tag

+

Alpha License: AGPL-3 shopinvader/odoo-shopinvader-catalog

+

Index Product Brand Tags in Shopinvader. Tags are defined in OCA module +product_brand_tag

Important

This is an alpha version, the data model and design can change at any time without warning. @@ -392,10 +392,10 @@

Shopvinvader Product Brand Tag

Bug Tracker

-

Bugs are tracked on GitHub Issues. +

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.

@@ -423,7 +423,7 @@

Contributors

Maintainers

-

This module is part of the shopinvader/odoo-shopinvader project on GitHub.

+

This module is part of the shopinvader/odoo-shopinvader-catalog project on GitHub.

You are welcome to contribute.

From 59e599d4c10a3bdd7b8887b1acae89e805ac4181 Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Tue, 28 Apr 2026 09:56:31 +0200 Subject: [PATCH 3/3] [MIG] shopinvader_product_brand_tag --- .pre-commit-config.yaml | 4 ---- requirements.txt | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 requirements.txt diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6b90b7b..1309a0b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,10 +3,6 @@ exclude: | # NOT INSTALLABLE ADDONS ^shopinvader_base_url/| ^shopinvader_product_brand/| - ^shopinvader_product_brand_tag/| - ^shopinvader_product_description/| - ^shopinvader_product_sale_packaging/| - ^shopinvader_product_seo/| ^shopinvader_product_url/| # END NOT INSTALLABLE ADDONS # Files and folders generated by bots, to avoid loops diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..5981365 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +# generated from manifests external_dependencies +extendable_pydantic>=1.2.0 +pydantic>=2.0.0 +unidecode