From 13b57722e87659b2fd1bda45899599b5270fb324 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Wed, 13 May 2026 09:53:25 +0200 Subject: [PATCH 1/5] [REM] obsolete 'setup' dir --- setup/_metapackage/pyproject.toml | 32 ------------------- .../odoo/addons/storage_media_product | 1 - setup/storage_media_product/setup.py | 6 ---- 3 files changed, 39 deletions(-) delete mode 100644 setup/_metapackage/pyproject.toml delete mode 120000 setup/storage_media_product/odoo/addons/storage_media_product delete mode 100644 setup/storage_media_product/setup.py diff --git a/setup/_metapackage/pyproject.toml b/setup/_metapackage/pyproject.toml deleted file mode 100644 index 144717281b..0000000000 --- a/setup/_metapackage/pyproject.toml +++ /dev/null @@ -1,32 +0,0 @@ -[project] -name = "odoo-addons-oca-storage" -version = "18.0.20251020.0" -dependencies = [ - "odoo-addon-fs_attachment==18.0.*", - "odoo-addon-fs_attachment_s3==18.0.*", - "odoo-addon-fs_file==18.0.*", - "odoo-addon-fs_folder==18.0.*", - "odoo-addon-fs_folder_demo==18.0.*", - "odoo-addon-fs_folder_ms_drive==18.0.*", - "odoo-addon-fs_folder_webdav==18.0.*", - "odoo-addon-fs_image==18.0.*", - "odoo-addon-fs_storage==18.0.*", - "odoo-addon-fs_storage_ms_drive==18.0.*", - "odoo-addon-image_tag==18.0.*", - "odoo-addon-microsoft_drive_account==18.0.*", - "odoo-addon-storage_backend==18.0.*", - "odoo-addon-storage_backend_ftp==18.0.*", - "odoo-addon-storage_backend_s3==18.0.*", - "odoo-addon-storage_backend_sftp==18.0.*", - "odoo-addon-storage_file==18.0.*", - "odoo-addon-storage_image==18.0.*", - "odoo-addon-storage_image_product==18.0.*", - "odoo-addon-storage_media==18.0.*", - "odoo-addon-storage_media_product==18.0.*", - "odoo-addon-storage_thumbnail==18.0.*", -] -classifiers=[ - "Programming Language :: Python", - "Framework :: Odoo", - "Framework :: Odoo :: 18.0", -] diff --git a/setup/storage_media_product/odoo/addons/storage_media_product b/setup/storage_media_product/odoo/addons/storage_media_product deleted file mode 120000 index 10ef58a48b..0000000000 --- a/setup/storage_media_product/odoo/addons/storage_media_product +++ /dev/null @@ -1 +0,0 @@ -../../../../storage_media_product \ No newline at end of file diff --git a/setup/storage_media_product/setup.py b/setup/storage_media_product/setup.py deleted file mode 100644 index 28c57bb640..0000000000 --- a/setup/storage_media_product/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) From 355a801fc35230bc611d6e65f9b57b8da70c190b Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Wed, 13 May 2026 09:55:41 +0200 Subject: [PATCH 2/5] [FIX] test-requirements: pin max supported version for fsspec deps --- test-requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index e63f876677..ddd6ddda03 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,3 +2,5 @@ odoo_test_helper requests_mock vcrpy-unittest s3fs>=2025.3.0 +pyOpenSSL<24 +cryptography<43 From 7c5e43c4b169d2848af31bcfc555a34a60f71bdb Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 20 May 2026 09:50:07 +0000 Subject: [PATCH 3/5] [BOT] add or update setup/_metapackage --- setup/_metapackage/pyproject.toml | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 setup/_metapackage/pyproject.toml diff --git a/setup/_metapackage/pyproject.toml b/setup/_metapackage/pyproject.toml new file mode 100644 index 0000000000..9379342d07 --- /dev/null +++ b/setup/_metapackage/pyproject.toml @@ -0,0 +1,32 @@ +[project] +name = "odoo-addons-oca-storage" +version = "18.0.20260520.0" +dependencies = [ + "odoo-addon-fs_attachment==18.0.*", + "odoo-addon-fs_attachment_s3==18.0.*", + "odoo-addon-fs_file==18.0.*", + "odoo-addon-fs_folder==18.0.*", + "odoo-addon-fs_folder_demo==18.0.*", + "odoo-addon-fs_folder_ms_drive==18.0.*", + "odoo-addon-fs_folder_webdav==18.0.*", + "odoo-addon-fs_image==18.0.*", + "odoo-addon-fs_storage==18.0.*", + "odoo-addon-fs_storage_ms_drive==18.0.*", + "odoo-addon-image_tag==18.0.*", + "odoo-addon-microsoft_drive_account==18.0.*", + "odoo-addon-storage_backend==18.0.*", + "odoo-addon-storage_backend_ftp==18.0.*", + "odoo-addon-storage_backend_s3==18.0.*", + "odoo-addon-storage_backend_sftp==18.0.*", + "odoo-addon-storage_file==18.0.*", + "odoo-addon-storage_image==18.0.*", + "odoo-addon-storage_image_product==18.0.*", + "odoo-addon-storage_media==18.0.*", + "odoo-addon-storage_media_product==18.0.*", + "odoo-addon-storage_thumbnail==18.0.*", +] +classifiers=[ + "Programming Language :: Python", + "Framework :: Odoo", + "Framework :: Odoo :: 18.0", +] From d3c0eda0c55d07dc43757844af9b5ca7e707e26c Mon Sep 17 00:00:00 2001 From: Henry Backman Date: Tue, 12 May 2026 10:51:25 +0200 Subject: [PATCH 4/5] [FIX] storage_media: fix deletion of file The `unlink` hook was missing from the storage media, causing the files not being marked to be deleted when a storage media record was deleted --- storage_media/models/storage_media.py | 4 ++++ storage_media/tests/test_storage_media.py | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/storage_media/models/storage_media.py b/storage_media/models/storage_media.py index b7337537cb..b37907d842 100644 --- a/storage_media/models/storage_media.py +++ b/storage_media/models/storage_media.py @@ -38,3 +38,7 @@ def _get_default_backend_id(self): return self.env["storage.backend"]._get_backend_id_from_param( self.env, "storage.media.backend_id" ) + + def unlink(self): + files = self.mapped("file_id") + return super().unlink() and files.unlink() diff --git a/storage_media/tests/test_storage_media.py b/storage_media/tests/test_storage_media.py index 64f5a83d15..5d1dc4a123 100644 --- a/storage_media/tests/test_storage_media.py +++ b/storage_media/tests/test_storage_media.py @@ -27,3 +27,10 @@ def test_create_media(self): media = self.env["storage.media"].create({"name": self.filename}) self.assertEqual(media.file_type, "media") self.assertIsNotNone(media.backend_id) + + def test_unlink(self): + media = self.env["storage.media"].create({"name": self.filename}) + stfile = media.file_id + media.unlink() + self.assertEqual(stfile.to_delete, True) + self.assertEqual(stfile.active, False) From ae3846e28a02d8d3eb1bde2f99be7f154878b343 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 20 May 2026 15:07:26 +0000 Subject: [PATCH 5/5] [BOT] post-merge updates --- README.md | 2 +- storage_media/__manifest__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cba65bafc8..653dd618ec 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ addon | version | maintainers | summary [storage_file](storage_file/) | 18.0.1.0.0 | | Storage file in storage backend [storage_image](storage_image/) | 18.0.1.0.1 | | Store image and resized image in a storage backend [storage_image_product](storage_image_product/) | 18.0.1.0.2 | | Link images to products and categories -[storage_media](storage_media/) | 18.0.1.1.1 | | Give the posibility to store media data in Odoo +[storage_media](storage_media/) | 18.0.1.1.2 | | Give the posibility to store media data in Odoo [storage_media_product](storage_media_product/) | 18.0.1.0.1 | | Link media to products and categories [storage_thumbnail](storage_thumbnail/) | 18.0.1.0.0 | | Abstract module that add the possibility to have thumbnail diff --git a/storage_media/__manifest__.py b/storage_media/__manifest__.py index b2300e7768..6d93d86439 100644 --- a/storage_media/__manifest__.py +++ b/storage_media/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Storage Media", "summary": "Give the posibility to store media data in Odoo", - "version": "18.0.1.1.1", + "version": "18.0.1.1.2", "category": "Uncategorized", "website": "https://github.com/OCA/storage", "author": " Akretion, Odoo Community Association (OCA)",