Fork Sync Branch 18.0

README.md

@@ -29,7 +29,7 @@ addon | version | maintainers | summary
 [fs_folder_ms_drive](fs_folder_ms_drive/) | 18.0.2.0.0 | <a href='https://github.com/lmignon'><img src='https://github.com/lmignon.png' width='32' height='32' style='border-radius:50%;' alt='lmignon'/></a> | Display and manage your files from Microsoft drives from within Odoo
 [fs_folder_webdav](fs_folder_webdav/) | 18.0.1.0.0 | <a href='https://github.com/jguenat'><img src='https://github.com/jguenat.png' width='32' height='32' style='border-radius:50%;' alt='jguenat'/></a> | UI improvement when managing WebDAV folder
 [fs_image](fs_image/) | 18.0.1.0.0 | <a href='https://github.com/lmignon'><img src='https://github.com/lmignon.png' width='32' height='32' style='border-radius:50%;' alt='lmignon'/></a> | Field to store images into filesystem storages
-[fs_storage](fs_storage/) | 18.0.2.1.0 |  | Implement the concept of Storage with amazon S3, sftp...
+[fs_storage](fs_storage/) | 18.0.2.1.1 |  | Implement the concept of Storage with amazon S3, sftp...
 [fs_storage_ms_drive](fs_storage_ms_drive/) | 18.0.2.0.0 | <a href='https://github.com/lmignon'><img src='https://github.com/lmignon.png' width='32' height='32' style='border-radius:50%;' alt='lmignon'/></a> | Add the microsoft drives (OneDrive, Sharepoint) as a storage backend
 [image_tag](image_tag/) | 18.0.1.0.0 |  | Image tag model
 [microsoft_drive_account](microsoft_drive_account/) | 18.0.2.0.0 | <a href='https://github.com/lmignon'><img src='https://github.com/lmignon.png' width='32' height='32' style='border-radius:50%;' alt='lmignon'/></a> | Link user with Microsoft

fs_file/tests/test_fs_file.py

@@ -40,6 +40,11 @@ def setUpClass(cls):
 
     def setUp(self):
         super().setUp()
+        # Remove check_attrs cleanup if exists to avoid conflict with FakeModelLoader.
+        # since superClass uses it for its own puposes not relevant for our tests.
+        check_attrs = (getattr(self, "check_attrs", None), tuple(), {})
+        if check_attrs in self._cleanups:
+            self._cleanups.remove(check_attrs)
         self.temp_dir: FSStorage = self.env["fs.storage"].create(
             {
                 "name": "Temp FS Storage",

fs_folder/tests/common.py

@@ -48,6 +48,11 @@ def cleanup_tempdir():
 
     def setUp(self):
         super().setUp()
+        # Remove check_attrs cleanup if exists to avoid conflict with FakeModelLoader.
+        # since superClass uses it for its own puposes not relevant for our tests.
+        check_attrs = (getattr(self, "check_attrs", None), tuple(), {})
+        if check_attrs in self._cleanups:
+            self._cleanups.remove(check_attrs)
         # enforce temp_backend field since it seems that they are reset on
         # savepoint rollback when managed by server_environment -> TO Be investigated
         self.temp_backend.write(

fs_image/tests/test_fs_image.py

@@ -42,6 +42,11 @@ def setUpClass(cls):
 
     def setUp(self):
         super().setUp()
+        # Remove check_attrs cleanup if exists to avoid conflict with FakeModelLoader.
+        # since superClass uses it for its own puposes not relevant for our tests.
+        check_attrs = (getattr(self, "check_attrs", None), tuple(), {})
+        if check_attrs in self._cleanups:
+            self._cleanups.remove(check_attrs)
         self.temp_dir: FSStorage = self.env["fs.storage"].create(
             {
                 "name": "Temp FS Storage",

fs_storage/README.rst

@@ -11,7 +11,7 @@ Filesystem Storage Backend
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d014f99f164322e5728945acba9501ad254147c8285694164249782a838f3b15
+   !! source digest: sha256:56e35c5816f37443d3bfb1ac7d6ebd4451e7b8c6e3d7c94a0f176f2b7d38b520
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

fs_storage/__manifest__.py

@@ -5,7 +5,7 @@
 {
     "name": "Filesystem Storage Backend",
     "summary": "Implement the concept of Storage with amazon S3, sftp...",
-    "version": "18.0.2.1.0",
+    "version": "18.0.2.1.1",
     "category": "FS Storage",
     "website": "https://github.com/OCA/storage",
     "author": " ACSONE SA/NV, Odoo Community Association (OCA)",