diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9de9ece027..1b29493559 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,6 @@ exclude: | # NOT INSTALLABLE ADDONS ^fs_attachment/| ^fs_attachment_environment/| - ^fs_attachment_s3/| ^fs_attachment_s3_environment/| ^fs_file/| ^fs_folder/| diff --git a/fs_attachment_s3/README.rst b/fs_attachment_s3/README.rst index 49c4c461a8..6fd36e5412 100644 --- a/fs_attachment_s3/README.rst +++ b/fs_attachment_s3/README.rst @@ -21,13 +21,13 @@ Fs Attachment S3 :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstorage-lightgray.png?logo=github - :target: https://github.com/OCA/storage/tree/19.0/fs_attachment_s3 + :target: https://github.com/OCA/storage/tree/20.0/fs_attachment_s3 :alt: OCA/storage .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/storage-19-0/storage-19-0-fs_attachment_s3 + :target: https://translation.odoo-community.org/projects/storage-20-0/storage-20-0-fs_attachment_s3 :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/storage&target_branch=19.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/storage&target_branch=20.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -147,7 +147,7 @@ Bug Tracker 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. @@ -194,6 +194,6 @@ Current `maintainer `__: |maintainer-lmignon| -This module is part of the `OCA/storage `_ project on GitHub. +This module is part of the `OCA/storage `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/fs_attachment_s3/__manifest__.py b/fs_attachment_s3/__manifest__.py index 31e0bfab55..49cbfa44cc 100644 --- a/fs_attachment_s3/__manifest__.py +++ b/fs_attachment_s3/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Fs Attachment S3", "summary": """Store attachments into S3 complient filesystem""", - "version": "19.0.1.2.1", + "version": "20.0.1.0.0", "license": "AGPL-3", "author": "ACSONE SA/NV,Odoo Community Association (OCA)", "website": "https://github.com/OCA/storage", @@ -18,5 +18,4 @@ "views/fs_storage.xml", ], "maintainers": ["lmignon"], - "installable": False, } diff --git a/fs_attachment_s3/i18n/it.po b/fs_attachment_s3/i18n/it.po index 64eba8350f..973a3c5797 100644 --- a/fs_attachment_s3/i18n/it.po +++ b/fs_attachment_s3/i18n/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 18.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2026-01-19 10:50+0000\n" +"PO-Revision-Date: 2026-09-25 20:46+0000\n" "Last-Translator: mymage \n" "Language-Team: none\n" "Language: it\n" @@ -25,7 +25,7 @@ msgstr "Allegato" #: model:ir.model.fields,field_description:fs_attachment_s3.field_fs_storage__display_name #: model:ir.model.fields,field_description:fs_attachment_s3.field_ir_attachment__display_name msgid "Display Name" -msgstr "" +msgstr "Nome visualizzato" #. module: fs_attachment_s3 #: model:ir.model,name:fs_attachment_s3.model_fs_storage @@ -36,7 +36,7 @@ msgstr "Deposito FS" #: model:ir.model.fields,field_description:fs_attachment_s3.field_fs_storage__id #: model:ir.model.fields,field_description:fs_attachment_s3.field_ir_attachment__id msgid "ID" -msgstr "" +msgstr "ID" #. module: fs_attachment_s3 #: model:ir.model.fields,help:fs_attachment_s3.field_fs_storage__s3_uses_signed_url_for_x_sendfile @@ -63,6 +63,9 @@ msgid "" "to preserve the server environment managed fields of 'fs.storage'. Make it " "available on the addons path before upgrading 'fs_attachment_s3'." msgstr "" +"Il modulo 'fs_attachment_s3_environment' non è disponibile. È necessario per " +"preservare i campi di 'fs.storage' gestiti dall'ambiente server. Renderlo " +"disponibile nel percorso degli addon prima di aggiornare 'fs_attachment_s3'." #. module: fs_attachment_s3 #: model:ir.model.fields,help:fs_attachment_s3.field_fs_storage__s3_signed_url_expiration diff --git a/fs_attachment_s3/pyproject.toml b/fs_attachment_s3/pyproject.toml new file mode 100644 index 0000000000..4231d0cccb --- /dev/null +++ b/fs_attachment_s3/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/fs_attachment_s3/static/description/index.html b/fs_attachment_s3/static/description/index.html index c6f2777a27..67123d3d35 100644 --- a/fs_attachment_s3/static/description/index.html +++ b/fs_attachment_s3/static/description/index.html @@ -374,7 +374,7 @@

Fs Attachment S3

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:b9ef6f12b2c5da8691f2b68238ca35918c5dfe5a75c717bc5727e84a74d6bd91 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/storage Translate me on Weblate Try me on Runboat

+

Beta License: AGPL-3 OCA/storage Translate me on Weblate Try me on Runboat

This module extends the functionality of fs_attachment to better support Amazon S3 storage. It includes features such as:

@@ -503,7 +503,7 @@

Bug Tracker

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.

@@ -540,7 +540,7 @@

Maintainers

promote its widespread use.

Current maintainer:

lmignon

-

This module is part of the OCA/storage project on GitHub.

+

This module is part of the OCA/storage project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/fs_attachment_s3/tests/common.py b/fs_attachment_s3/tests/common.py index 3f2c61b581..128eb5c616 100644 --- a/fs_attachment_s3/tests/common.py +++ b/fs_attachment_s3/tests/common.py @@ -3,14 +3,12 @@ from odoo.tests.common import TransactionCase -from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT - class TestFSAttachmentS3Common(TransactionCase): @classmethod def setUpClass(cls): super().setUpClass() - cls.env = cls.env(context=dict(cls.env.context, **DISABLED_MAIL_CONTEXT)) + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) cls.s3_backend_config = { "name": "S3 Storage", "protocol": "s3", diff --git a/fs_attachment_s3/upgrades/19.0.1.2.1/post-migration.py b/fs_attachment_s3/upgrades/19.0.1.2.1/post-migration.py deleted file mode 100644 index a716e623c0..0000000000 --- a/fs_attachment_s3/upgrades/19.0.1.2.1/post-migration.py +++ /dev/null @@ -1,21 +0,0 @@ -from openupgradelib import openupgrade - -from odoo import exceptions - - -@openupgrade.migrate() -def migrate(env, version): - module = env["ir.module.module"].search( - [("name", "=", "fs_attachment_s3_environment")] - ) - if not module: - raise exceptions.UserError( - env._( - "The 'fs_attachment_s3_environment' module is not available. " - "It is required to preserve the server environment managed " - "fields of 'fs.storage'. Make it available on the " - "addons path before upgrading 'fs_attachment_s3'." - ) - ) - if module.state == "uninstalled": - module.button_install() diff --git a/fs_attachment_s3/views/fs_storage.xml b/fs_attachment_s3/views/fs_storage.xml index 68b3b2eae7..04825138b7 100644 --- a/fs_attachment_s3/views/fs_storage.xml +++ b/fs_attachment_s3/views/fs_storage.xml @@ -1,8 +1,8 @@ - + - + fs.storage diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000000..bf85775309 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +# generated from manifests external_dependencies +fsspec[s3] diff --git a/test-requirements.txt b/test-requirements.txt index e63f876677..96d6cc6d0c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,3 +2,5 @@ odoo_test_helper requests_mock vcrpy-unittest s3fs>=2025.3.0 +odoo-addon-fs_storage @ git+https://github.com/OCA/storage@refs/pull/670/head#subdirectory=fs_storage +odoo-addon-fs_attachment @ git+https://github.com/OCA/storage@refs/pull/679/head#subdirectory=fs_attachment