From 7ff6ca00abc6c397f0caf93a799d9e77dec8c34c Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Fri, 27 Mar 2026 11:29:42 +0100 Subject: [PATCH 1/2] !donotmerge [UPD] test-requirements.txt: Temporary dependencies --- test-requirements.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index f31697f..c97c510 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,2 +1,21 @@ odoo-test-helper vcrpy-unittest + +odoo-addon-fs_image_thumbnail @ git+https://github.com/OCA/storage.git@refs/pull/470/head#subdirectory=fs_image_thumbnail +odoo-addon-fs_base_multi_image @ git+https://github.com/OCA/storage.git@refs/pull/506/head#subdirectory=fs_base_multi_image +odoo-addon-fs_product_multi_image @ git+https://github.com/OCA/storage.git@refs/pull/449/head#subdirectory=fs_product_multi_image +odoo-addon-fs_product_brand_multi_image @ git+https://github.com/OCA/storage.git@refs/pull/505/head#subdirectory=fs_product_brand_multi_image + +odoo-addon-search_engine_image_thumbnail @ git+https://github.com/OCA/search-engine.git@refs/pull/228/head#subdirectory=search_engine_image_thumbnail + +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_image @ git+https://github.com/shopinvader/odoo-shopinvader-search-engine@refs/pull/8/head#subdirectory=shopinvader_search_engine_image +odoo-addon-shopinvader_search_engine_product_brand_image @ git+https://github.com/shopinvader/odoo-shopinvader-search-engine@refs/pull/9/head#subdirectory=shopinvader_search_engine_product_brand_image +odoo-addon-shopinvader_search_engine_update @ git+https://github.com/shopinvader/odoo-shopinvader-search-engine@refs/pull/14/head#subdirectory=shopinvader_search_engine_update +odoo-addon-shopinvader_search_engine_update_product_brand @ git+https://github.com/shopinvader/odoo-shopinvader-search-engine@refs/pull/17/head#subdirectory=shopinvader_search_engine_update_product_brand From d619fafc6a5922c43f65cf9aab645eacfb46cf0d Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Fri, 27 Mar 2026 10:57:45 +0100 Subject: [PATCH 2/2] [MIG] shopinvader_search_engine_update_product_brand_image: Migration to 18.0 --- .pre-commit-config.yaml | 1 - requirements.txt | 0 .../README.rst | 14 +++++++------- .../__manifest__.py | 12 ++++++------ .../pyproject.toml | 3 +++ .../static/description/index.html | 16 ++++++++-------- .../tests/test_update.py | 18 ++++++++---------- 7 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 requirements.txt create mode 100644 shopinvader_search_engine_update_product_brand_image/pyproject.toml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bfbe9ed..0e26216 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,6 @@ exclude: | ^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/| ^shopinvader_search_engine_update_product_template_multi_link/| diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index e69de29..0000000 diff --git a/shopinvader_search_engine_update_product_brand_image/README.rst b/shopinvader_search_engine_update_product_brand_image/README.rst index d1a080c..36ce43a 100644 --- a/shopinvader_search_engine_update_product_brand_image/README.rst +++ b/shopinvader_search_engine_update_product_brand_image/README.rst @@ -16,9 +16,9 @@ Shopinvader Search Engine Update Product Brand Image .. |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_image - :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_image + :alt: shopinvader/odoo-shopinvader-search-engine |badge1| |badge2| |badge3| @@ -49,10 +49,10 @@ 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. @@ -67,11 +67,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_image/__manifest__.py b/shopinvader_search_engine_update_product_brand_image/__manifest__.py index b6d23c2..173c60d 100644 --- a/shopinvader_search_engine_update_product_brand_image/__manifest__.py +++ b/shopinvader_search_engine_update_product_brand_image/__manifest__.py @@ -3,18 +3,18 @@ { "name": "Shopinvader Search Engine Update Product Brand Image", - "summary": """ - Mark brand and product bindings to export on product image brand update""", - "version": "16.0.1.0.0", + "summary": "Mark brand and product bindings to export on " + "product image 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", "depends": [ - "shopinvader_search_engine_update", "shopinvader_search_engine_product_brand_image", + "shopinvader_search_engine_update", + "shopinvader_search_engine_update_product_brand", ], "data": [], - "demo": [], "development_status": "Alpha", - "installable": False, + "installable": True, } diff --git a/shopinvader_search_engine_update_product_brand_image/pyproject.toml b/shopinvader_search_engine_update_product_brand_image/pyproject.toml new file mode 100644 index 0000000..4231d0c --- /dev/null +++ b/shopinvader_search_engine_update_product_brand_image/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/shopinvader_search_engine_update_product_brand_image/static/description/index.html b/shopinvader_search_engine_update_product_brand_image/static/description/index.html index e90c270..9cbfc55 100644 --- a/shopinvader_search_engine_update_product_brand_image/static/description/index.html +++ b/shopinvader_search_engine_update_product_brand_image/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 Image

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:f1cf4b809267c056e7c6793e1df307333bf7ef333c7a7c77e482958a446bed40 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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_image modules to mark the @@ -403,10 +403,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.

@@ -425,7 +425,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_image/tests/test_update.py b/shopinvader_search_engine_update_product_brand_image/tests/test_update.py index 003f51e..3a524e4 100644 --- a/shopinvader_search_engine_update_product_brand_image/tests/test_update.py +++ b/shopinvader_search_engine_update_product_brand_image/tests/test_update.py @@ -2,25 +2,23 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). import base64 -from odoo.addons.shopinvader_search_engine.tests.common import TestProductBindingMixin from odoo.addons.shopinvader_search_engine_product_brand_image.tests.common import ( ProductBrandImageCase, ) -class TestUpdate(ProductBrandImageCase, TestProductBindingMixin): - @classmethod - def setUpClass(cls): - super().setUpClass() - TestProductBindingMixin.setup_records(cls) - cls.product.product_brand_id = cls.brand - cls.product_binding.state = "done" - cls.brand_binding.state = "done" - cls.new_tag = cls.env["image.tag"].create( +class TestUpdate(ProductBrandImageCase): + def setup_records(self, backend=None): + rv = super().setup_records(backend=backend) + self.product.product_brand_id = self.brand + self.product_binding.state = "done" + self.brand_binding.state = "done" + self.new_tag = self.env["image.tag"].create( { "name": "new_tag", } ) + return rv def test_unlink_image(self): self.brand.image_ids.unlink()