From a73df312e37591104097f5d1ed96b24a13b0a3c8 Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Fri, 27 Mar 2026 10:04:07 +0100 Subject: [PATCH 1/2] !donotmerge [UPD] test-requirements.txt: Temporary dependencies --- test-requirements.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index f31697f..62a0430 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,2 +1,11 @@ odoo-test-helper vcrpy-unittest + +odoo-addon-shopinvader_base_url @ git+https://github.com/shopinvader/odoo-shopinvader-catalog@refs/pull/1/head#subdirectory=shopinvader_base_url +odoo-addon-shopinvader_product @ git+https://github.com/shopinvader/odoo-shopinvader-catalog@refs/pull/2/head#subdirectory=shopinvader_product +odoo-addon-shopinvader_product_seo @ git+https://github.com/shopinvader/odoo-shopinvader-catalog@refs/pull/5/head#subdirectory=shopinvader_product_seo +odoo-addon-shopinvader_product_brand @ git+https://github.com/shopinvader/odoo-shopinvader-catalog@refs/pull/6/head#subdirectory=shopinvader_product_brand + +odoo-addon-shopinvader_search_engine @ git+https://github.com/shopinvader/odoo-shopinvader-search-engine@refs/pull/2/head#subdirectory=shopinvader_search_engine +odoo-addon-shopinvader_search_engine_product_brand @ git+https://github.com/shopinvader/odoo-shopinvader-search-engine@refs/pull/6/head#subdirectory=shopinvader_search_engine_product_brand +odoo-addon-shopinvader_search_engine_update @ git+https://github.com/shopinvader/odoo-shopinvader-search-engine@refs/pull/14/head#subdirectory=shopinvader_search_engine_update From bcb0b9969463372a711eba21826477607055163b Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Fri, 27 Mar 2026 10:57:43 +0100 Subject: [PATCH 2/2] [MIG] shopinvader_search_engine_update_product_brand: Migration to 18.0 --- .pre-commit-config.yaml | 1 - requirements.txt | 0 .../README.rst | 14 +++++----- .../__manifest__.py | 9 +++---- .../pyproject.toml | 3 +++ .../static/description/index.html | 16 ++++++------ .../tests/common.py | 26 +++++++++---------- 7 files changed, 35 insertions(+), 34 deletions(-) delete mode 100644 requirements.txt create mode 100644 shopinvader_search_engine_update_product_brand/pyproject.toml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bfbe9ed..bc91877 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,7 +16,6 @@ exclude: | ^shopinvader_search_engine_update/| ^shopinvader_search_engine_update_image/| ^shopinvader_search_engine_update_pricelist/| - ^shopinvader_search_engine_update_product_brand/| ^shopinvader_search_engine_update_product_brand_image/| ^shopinvader_search_engine_update_product_brand_tag/| ^shopinvader_search_engine_update_product_media/| diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index e69de29..0000000 diff --git a/shopinvader_search_engine_update_product_brand/README.rst b/shopinvader_search_engine_update_product_brand/README.rst index 6be837f..27260aa 100644 --- a/shopinvader_search_engine_update_product_brand/README.rst +++ b/shopinvader_search_engine_update_product_brand/README.rst @@ -16,9 +16,9 @@ Shopinvader Search Engine Update Product Brand .. |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_search_engine_update_product_brand - :alt: shopinvader/odoo-shopinvader +.. |badge3| image:: https://img.shields.io/badge/github-shopinvader%2Fodoo--shopinvader--search--engine-lightgray.png?logo=github + :target: https://github.com/shopinvader/odoo-shopinvader-search-engine/tree/18.0/shopinvader_search_engine_update_product_brand + :alt: shopinvader/odoo-shopinvader-search-engine |badge1| |badge2| |badge3| @@ -48,10 +48,10 @@ changes applied into the search engine as soon as possible. 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. @@ -66,11 +66,11 @@ Authors Contributors ------------ -- Laurent Mignon laurent.mignon@acsone.eu (https://www.acsone.eu) +- Laurent Mignon laurent.mignon@acsone.eu (https://www.acsone.eu) Maintainers ----------- -This module is part of the `shopinvader/odoo-shopinvader `_ project on GitHub. +This module is part of the `shopinvader/odoo-shopinvader-search-engine `_ project on GitHub. You are welcome to contribute. diff --git a/shopinvader_search_engine_update_product_brand/__manifest__.py b/shopinvader_search_engine_update_product_brand/__manifest__.py index 857b41b..72dd248 100644 --- a/shopinvader_search_engine_update_product_brand/__manifest__.py +++ b/shopinvader_search_engine_update_product_brand/__manifest__.py @@ -3,9 +3,9 @@ { "name": "Shopinvader Search Engine Update Product Brand", - "summary": """ - Shopinvader: Mark brand and product bindings to export on product brand update""", - "version": "16.0.1.0.0", + "summary": "Shopinvader: Mark brand and product bindings to export " + "on product brand update", + "version": "18.0.1.0.0", "license": "AGPL-3", "author": "ACSONE SA/NV,Odoo Community Association (OCA)", "website": "https://github.com/shopinvader/odoo-shopinvader-search-engine", @@ -14,7 +14,6 @@ "shopinvader_search_engine_product_brand", ], "data": [], - "demo": [], "development_status": "Alpha", - "installable": False, + "installable": True, } diff --git a/shopinvader_search_engine_update_product_brand/pyproject.toml b/shopinvader_search_engine_update_product_brand/pyproject.toml new file mode 100644 index 0000000..4231d0c --- /dev/null +++ b/shopinvader_search_engine_update_product_brand/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/shopinvader_search_engine_update_product_brand/static/description/index.html b/shopinvader_search_engine_update_product_brand/static/description/index.html index 6e8c690..25bde19 100644 --- a/shopinvader_search_engine_update_product_brand/static/description/index.html +++ b/shopinvader_search_engine_update_product_brand/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,7 +369,7 @@

Shopinvader Search Engine Update Product Brand

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:e97b63edd2fadff4ed47b94f3e3767342db03cdf41cd671300d6b516bc184d82 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Alpha License: AGPL-3 shopinvader/odoo-shopinvader

+

Alpha License: AGPL-3 shopinvader/odoo-shopinvader-search-engine

This module extends the functionality of the shopinvader_search_engine_update and shopinvader_search_engine_product_brand modules to mark the @@ -402,10 +402,10 @@

Use Cases / Context

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.

@@ -424,7 +424,7 @@

Contributors

Maintainers

-

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

+

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

You are welcome to contribute.

diff --git a/shopinvader_search_engine_update_product_brand/tests/common.py b/shopinvader_search_engine_update_product_brand/tests/common.py index 634f1fb..bce6ba1 100644 --- a/shopinvader_search_engine_update_product_brand/tests/common.py +++ b/shopinvader_search_engine_update_product_brand/tests/common.py @@ -7,21 +7,21 @@ class TestProductBrandUpdateBase(TestProductBindingUpdateBase): - @classmethod - def setUpClass(cls): - super().setUpClass() - cls.brand = cls.env["product.brand"].create({"name": "brand"}) - cls.brand_index = cls.env["se.index"].create( + def setup_records(self, backend=None): + rv = super().setup_records(backend=backend) + self.brand = self.env["product.brand"].create({"name": "brand"}) + self.brand_index = self.env["se.index"].create( { "name": "brand", - "backend_id": cls.backend.id, - "model_id": cls.env.ref("product_brand.model_product_brand").id, + "backend_id": self.backend.id, + "model_id": self.env.ref("product_brand.model_product_brand").id, "serializer_type": "shopinvader_brand_exports", } ) - cls.product.product_brand_id = cls.brand - cls.brand_binding = cls.brand._add_to_index(cls.brand_index) - cls.brand_binding.state = "done" - cls.new_brand = cls.env["product.brand"].create({"name": "new brand"}) - cls.new_brand_binding = cls.new_brand._add_to_index(cls.brand_index) - cls.new_brand_binding.state = "done" + self.product.product_brand_id = self.brand + self.brand_binding = self.brand._add_to_index(self.brand_index) + self.brand_binding.state = "done" + self.new_brand = self.env["product.brand"].create({"name": "new brand"}) + self.new_brand_binding = self.new_brand._add_to_index(self.brand_index) + self.new_brand_binding.state = "done" + return rv