[BOT] post-merge updates

README.md

@@ -24,13 +24,13 @@ addon | version | maintainers | summary
 [fs_attachment](fs_attachment/) | 16.0.1.0.1 | [![lmignon](https://github.com/lmignon.png?size=30px)](https://github.com/lmignon) | Store attachments on external object store
 [fs_base_multi_image](fs_base_multi_image/) | 16.0.1.0.0 | [![lmignon](https://github.com/lmignon.png?size=30px)](https://github.com/lmignon) | Mulitple Images from External File System
 [fs_base_multi_media](fs_base_multi_media/) | 16.0.1.0.1 | [![lmignon](https://github.com/lmignon.png?size=30px)](https://github.com/lmignon) | Give the possibility to store media data in external filesystem from odoo
-[fs_file](fs_file/) | 16.0.1.0.1 | [![lmignon](https://github.com/lmignon.png?size=30px)](https://github.com/lmignon) | Field to store files into filesystem storages
+[fs_file](fs_file/) | 16.0.1.0.2 | [![lmignon](https://github.com/lmignon.png?size=30px)](https://github.com/lmignon) | Field to store files into filesystem storages
 [fs_file_demo](fs_file_demo/) | 16.0.1.0.0 |  | Demo addon for fs_file and fs_image
 [fs_image](fs_image/) | 16.0.1.0.0 | [![lmignon](https://github.com/lmignon.png?size=30px)](https://github.com/lmignon) | Field to store images into filesystem storages
-[fs_image_thumbnail](fs_image_thumbnail/) | 16.0.1.0.0 | [![lmignon](https://github.com/lmignon.png?size=30px)](https://github.com/lmignon) | Generate and store thumbnail for images
+[fs_image_thumbnail](fs_image_thumbnail/) | 16.0.1.0.1 | [![lmignon](https://github.com/lmignon.png?size=30px)](https://github.com/lmignon) | Generate and store thumbnail for images
 [fs_product_brand_multi_image](fs_product_brand_multi_image/) | 16.0.1.0.0 | [![lmignon](https://github.com/lmignon.png?size=30px)](https://github.com/lmignon) | Link images to product brands
-[fs_product_multi_image](fs_product_multi_image/) | 16.0.1.0.1 | [![lmignon](https://github.com/lmignon.png?size=30px)](https://github.com/lmignon) | Manage multi images from extenal file system on product
-[fs_product_multi_media](fs_product_multi_media/) | 16.0.1.0.1 | [![lmignon](https://github.com/lmignon.png?size=30px)](https://github.com/lmignon) | Link media to products and categories
+[fs_product_multi_image](fs_product_multi_image/) | 16.0.1.0.2 | [![lmignon](https://github.com/lmignon.png?size=30px)](https://github.com/lmignon) | Manage multi images from extenal file system on product
+[fs_product_multi_media](fs_product_multi_media/) | 16.0.1.0.2 | [![lmignon](https://github.com/lmignon.png?size=30px)](https://github.com/lmignon) | Link media to products and categories
 [fs_storage](fs_storage/) | 16.0.1.0.1 |  | Implement the concept of Storage with amazon S3, sftp...
 [image_tag](image_tag/) | 16.0.1.0.1 |  | Image tag model
 [storage_backend](storage_backend/) | 16.0.1.0.1 |  | Implement the concept of Storage with amazon S3, sftp...

fs_file/README.rst

@@ -2,12 +2,12 @@
 Fs File
 =======
 
-..
+.. 
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:b586cfea660156b6fadc07c560c47b0b6fca1311df98bf215011b8c7ebfe358d
+   !! source digest: sha256:8c23d6a1bf56a1efbd09e48e8b6c5eeacfe38788e1537b75b20c6fec98bd75f6
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
@@ -212,7 +212,7 @@ promote its widespread use.
 
 Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-lmignon|
+|maintainer-lmignon| 
 
 This module is part of the `OCA/storage <https://github.com/OCA/storage/tree/16.0/fs_file>`_ project on GitHub.
 

fs_file/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "Fs File",
     "summary": """
         Field to store files into filesystem storages""",
-    "version": "16.0.1.0.1",
+    "version": "16.0.1.0.2",
     "license": "AGPL-3",
     "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/storage",

fs_file/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">Fs File</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:b586cfea660156b6fadc07c560c47b0b6fca1311df98bf215011b8c7ebfe358d
+!! source digest: sha256:8c23d6a1bf56a1efbd09e48e8b6c5eeacfe38788e1537b75b20c6fec98bd75f6
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/storage/tree/16.0/fs_file"><img alt="OCA/storage" src="https://img.shields.io/badge/github-OCA%2Fstorage-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/storage-16-0/storage-16-0-fs_file"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/storage&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This addon defines a new field type <cite>FSFile</cite> which is a file field that stores

fs_image_thumbnail/README.rst

@@ -7,7 +7,7 @@ Fs Image Thumbnail
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:2870e8b0fff2e9c98e03464d4e19512a1b92c822997d6cd7ca1fd062805d7931
+   !! source digest: sha256:3bb3cbeae4c613ddad99937001cf3035bbfc1097e93d97c8d4caf64e941256fe
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
@@ -125,6 +125,21 @@ is even simpler:
   thumbnails = record.image.get_or_create_thumbnails(my_record.image,
       [(800,600), (400, 200)], 'my base name')
 
+Changelog
+=========
+
+16.0.1.0.1 (2023-10-04)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+**Bugfixes**
+
+- The call to the method *get_or_create_thumbnails* on the *fs.image.thumbnail.mixin*
+  class returns now an ordered dictionary where the key is the original image and
+  the value is a recordset of thumbnail images. The order of the dict is the order
+  of the images passed to the method. This ensures that when you process the result
+  of the method you can be sure that the order of the images is the same as the
+  order of the images passed to the method. (`#282 <https://github.com/OCA/storage/issues/282>`_)
+
 Bug Tracker
 ===========
 

fs_image_thumbnail/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "Fs Image Thumbnail",
     "summary": """
         Generate and store thumbnail for images""",
-    "version": "16.0.1.0.0",
+    "version": "16.0.1.0.1",
     "license": "AGPL-3",
     "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/storage",

fs_image_thumbnail/readme/HISTORY.rst

@@ -0,0 +1,11 @@
+16.0.1.0.1 (2023-10-04)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+**Bugfixes**
+
+- The call to the method *get_or_create_thumbnails* on the *fs.image.thumbnail.mixin*
+  class returns now an ordered dictionary where the key is the original image and
+  the value is a recordset of thumbnail images. The order of the dict is the order
+  of the images passed to the method. This ensures that when you process the result
+  of the method you can be sure that the order of the images is the same as the
+  order of the images passed to the method. (`#282 <https://github.com/OCA/storage/issues/282>`_)

fs_image_thumbnail/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">Fs Image Thumbnail</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:2870e8b0fff2e9c98e03464d4e19512a1b92c822997d6cd7ca1fd062805d7931
+!! source digest: sha256:3bb3cbeae4c613ddad99937001cf3035bbfc1097e93d97c8d4caf64e941256fe
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/storage/tree/16.0/fs_image_thumbnail"><img alt="OCA/storage" src="https://img.shields.io/badge/github-OCA%2Fstorage-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/storage-16-0/storage-16-0-fs_image_thumbnail"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/storage&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the <strong>fs_image</strong> addon to support the creation and the storage of
@@ -385,12 +385,16 @@ <h1 class="title">Fs Image Thumbnail</h1>
 <ul class="simple">
 <li><a class="reference internal" href="#use-cases-context" id="toc-entry-1">Use Cases / Context</a></li>
 <li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
-<li><a class="reference internal" href="#other-credits" id="toc-entry-7">Other credits</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
+<li><a class="reference internal" href="#changelog" id="toc-entry-3">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-4">16.0.1.0.1 (2023-10-04)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-5">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-6">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-7">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-8">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-9">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-10">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -463,37 +467,52 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 </span>    <span class="p">[(</span><span class="mi">800</span><span class="p">,</span><span class="mi">600</span><span class="p">),</span> <span class="p">(</span><span class="mi">400</span><span class="p">,</span> <span class="mi">200</span><span class="p">)],</span> <span class="s1">'my base name'</span><span class="p">)</span>
 </pre>
 </div>
+<div class="section" id="changelog">
+<h1><a class="toc-backref" href="#toc-entry-3">Changelog</a></h1>
+<div class="section" id="section-1">
+<h2><a class="toc-backref" href="#toc-entry-4">16.0.1.0.1 (2023-10-04)</a></h2>
+<p><strong>Bugfixes</strong></p>
+<ul class="simple">
+<li>The call to the method <em>get_or_create_thumbnails</em> on the <em>fs.image.thumbnail.mixin</em>
+class returns now an ordered dictionary where the key is the original image and
+the value is a recordset of thumbnail images. The order of the dict is the order
+of the images passed to the method. This ensures that when you process the result
+of the method you can be sure that the order of the images is the same as the
+order of the images passed to the method. (<a class="reference external" href="https://github.com/OCA/storage/issues/282">#282</a>)</li>
+</ul>
+</div>
+</div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/storage/issues">GitHub Issues</a>.
 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
 <a class="reference external" href="https://github.com/OCA/storage/issues/new?body=module:%20fs_image_thumbnail%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-6">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-7">Authors</a></h2>
 <ul class="simple">
 <li>ACSONE SA/NV</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
 <ul class="simple">
 <li>Laurent Mignon &lt;<a class="reference external" href="mailto:laurent.mignon&#64;acsone.eu">laurent.mignon&#64;acsone.eu</a>&gt; (<a class="reference external" href="https://acsone.eu">https://acsone.eu</a>)</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
-<h2><a class="toc-backref" href="#toc-entry-7">Other credits</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-9">Other credits</a></h2>
 <p>The development of this module has been financially supported by:</p>
 <ul class="simple">
 <li><a class="reference external" href="https://www.alcyonbelux.be/">Alcyon Belux</a></li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-10">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose

fs_product_multi_image/README.rst

@@ -7,7 +7,7 @@ Fs Product Multi Image
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:04191dc8bd79efbbdc6817de4322bcbee0438dce6f1d5b09e77c15513e3b64b7
+   !! source digest: sha256:df1c70da592eb6cbd718959231d1bb4aa9ca1f4d69c4a81baf5b3d9a794d01a7
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
@@ -60,6 +60,17 @@ the image tag of the product template for the same variant attribute values.
 In every case, a main image is computed and used as the default image for the
 object. It depends on the sequence of the images (first one is the main one).
 
+Changelog
+=========
+
+16.0.1.0.2 (2023-10-04)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+**Bugfixes**
+
+- Ensures the variant_image_ids are sorted by sequence and name. Before this
+  change, the order was random and could change between runs. (`#282 <https://github.com/OCA/storage/issues/282>`_)
+
 Bug Tracker
 ===========
 

fs_product_multi_image/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "Fs Product Multi Image",
     "summary": """
         Manage multi images from extenal file system on product""",
-    "version": "16.0.1.0.1",
+    "version": "16.0.1.0.2",
     "license": "AGPL-3",
     "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/storage",

fs_product_multi_image/readme/HISTORY.rst

@@ -0,0 +1,7 @@
+16.0.1.0.2 (2023-10-04)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+**Bugfixes**
+
+- Ensures the variant_image_ids are sorted by sequence and name. Before this
+  change, the order was random and could change between runs. (`#282 <https://github.com/OCA/storage/issues/282>`_)