odoo-addon-dms 16.0.1.8.3.2__py3-none-any.whl → 16.0.1.8.5__py3-none-any.whl

odoo/addons/dms/README.rst

@@ -7,7 +7,7 @@ Document Management System
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:a1e09fa33b9ef1f4f1ff039a3ff5685f7de8ade40a250dca4e24d40b0b695fe5
+   !! source digest: sha256:a679dc80b0bc5020e1bcc24d4777a8b73a2223c966ba9505f304988e56349b6f
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

odoo/addons/dms/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Document Management System",
     "summary": """Document Management System for Odoo""",
-    "version": "16.0.1.8.3",
+    "version": "16.0.1.8.5",
     "category": "Document Management",
     "license": "LGPL-3",
     "website": "https://github.com/OCA/dms",

odoo/addons/dms/models/dms_file.py

@@ -202,6 +202,7 @@ class File(models.Model):
         prefetch=False,
         invisible=True,
         ondelete="cascade",
+        index=True,
     )
 
     def get_human_size(self):
@@ -619,6 +620,13 @@ class File(models.Model):
             new_vals_list.append(vals)
         return super(File, self).create(new_vals_list)
 
+    def unlink(self):
+        attachments = self.mapped("attachment_id")
+        res = super().unlink()
+        if not self.env.context.get("dms_file"):
+            attachments.with_context(dms_file=True).unlink()
+        return res
+
     # ----------------------------------------------------------
     # Locking fields and functions
     # ----------------------------------------------------------

odoo/addons/dms/models/ir_attachment.py

@@ -1,4 +1,4 @@
-# Copyright 2021 Tecnativa - Víctor Martínez
+# Copyright 2021-2025 Tecnativa - Víctor Martínez
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 from odoo import api, models
 from odoo.tools import ormcache
@@ -100,3 +100,10 @@ class IrAttachment(models.Model):
         ):
             self._dms_operations()
         return res
+
+    def unlink(self):
+        if not self.env.context.get("dms_file"):
+            self.env["dms.file"].search(
+                [("attachment_id", "in", self.ids)]
+            ).with_context(dms_file=True).unlink()
+        return super().unlink()

odoo/addons/dms/static/description/index.html

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:a1e09fa33b9ef1f4f1ff039a3ff5685f7de8ade40a250dca4e24d40b0b695fe5
+!! source digest: sha256:a679dc80b0bc5020e1bcc24d4777a8b73a2223c966ba9505f304988e56349b6f
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/dms/tree/16.0/dms"><img alt="OCA/dms" src="https://img.shields.io/badge/github-OCA%2Fdms-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/dms-16-0/dms-16-0-dms"><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/dms&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>DMS is a module for creating, managing and viewing document files directly

odoo/addons/dms/static/src/js/views/dms_file_upload.esm.js

@@ -102,16 +102,18 @@ export const FileUpload = {
     async onUpload(attachments) {
         const self = this;
         const attachmentIds = attachments.map((a) => a.id);
-        const ctx = this.props.context;
+        const ctx = Object.assign(
+            {},
+            this.actionService.currentController.props.context,
+            this.props.context
+        );
         const controllerID = this.actionService.currentController.jsId;
 
         if (!attachmentIds.length) {
             this.notification.add(_t("An error occurred during the upload"));
             return;
         }
-
         // Search the correct directory_id value according to the domain
-        ctx.default_directory_id = false;
         if (this.props.domain) {
             for (const domain_item of this.props.domain) {
                 if (domain_item.length === 3) {
@@ -122,7 +124,7 @@ export const FileUpload = {
             }
         }
 
-        if (ctx.default_directory_id === false) {
+        if (!ctx.default_directory_id) {
             self.actionService.restore(controllerID);
             return self.notification.add(
                 this.env._t("You must select a directory first"),

odoo/addons/dms/tests/test_storage_attachment.py

@@ -2,6 +2,7 @@
 # Copyright 2021 Tecnativa - João Marques
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
+from odoo.exceptions import AccessError
 from odoo.tests.common import users
 from odoo.tools import mute_logger
 
@@ -42,6 +43,26 @@ class StorageAttachmentTestCase(StorageAttachmentBaseCase):
         directories = self.env["dms.directory"].search([])
         self.assertNotIn(directory.id, directories.ids)
 
+    @mute_logger("odoo.models.unlink")
+    def test_storage_attachment_unlink_lock_file(self):
+        group_partner_manager = self.env.ref("base.group_partner_manager")
+        self.dms_manager_user.write({"groups_id": [(4, group_partner_manager.id)]})
+        self.dms_user.write({"groups_id": [(4, group_partner_manager.id)]})
+        attachment = self._create_attachment("demo.txt")
+        attachment = attachment.with_user(self.dms_manager_user)
+        file = self.storage.storage_file_ids.filtered(lambda x: x.name == "demo.txt")
+        file.with_user(self.dms_user).lock()
+        self.assertTrue(file.is_locked)
+        self.assertFalse(file.is_lock_editor)
+        with self.assertRaises(AccessError):
+            attachment.unlink()
+        self.assertTrue(file.exists())
+        file.with_user(self.dms_user).unlock()
+        self.assertFalse(file.is_locked)
+        file.invalidate_recordset()
+        attachment.unlink()
+        self.assertFalse(file.exists())
+
     @users("dms-manager")
     def test_storage_attachment_misc(self):
         attachment = self._create_attachment("demo.txt")
@@ -67,6 +88,8 @@ class StorageAttachmentTestCase(StorageAttachmentBaseCase):
         self.assertEqual(file_01.storage_id.save_type, "attachment")
         self.assertEqual(file_01.save_type, "database")
         self.assertEqual(self.storage.count_storage_files, 2)
+        dms_file.unlink()
+        self.assertFalse(attachment.exists())
 
     @users("dms-manager")
     def test_storage_attachment_directory_record_ref_access_dms_manager(self):

odoo/addons/dms/views/dms_file.xml

@@ -152,7 +152,7 @@
                                                 Unlock
                                             </a>
                                             <a
-                                                t-if="record.permission_write.raw_value and record.active.raw_value"
+                                                t-if="record.permission_write.raw_value and record.active.raw_value and (!record.is_locked.raw_value or (record.is_locked.raw_value and record.is_lock_editor.raw_value))"
                                                 role="menuitem"
                                                 name="toggle_active"
                                                 type="object"
@@ -162,7 +162,7 @@
                                                 Archive
                                             </a>
                                             <a
-                                                t-if="record.permission_write.raw_value and !record.active.raw_value"
+                                                t-if="record.permission_write.raw_value and !record.active.raw_value and (!record.is_locked.raw_value or (record.is_locked.raw_value and record.is_lock_editor.raw_value))"
                                                 role="menuitem"
                                                 name="toggle_active"
                                                 type="object"
@@ -204,7 +204,7 @@
                                                 Edit
                                             </a>
                                             <a
-                                                t-if="record.permission_unlink.raw_value"
+                                                t-if="record.permission_unlink.raw_value and (!record.is_locked.raw_value or (record.is_locked.raw_value and record.is_lock_editor.raw_value))"
                                                 role="menuitem"
                                                 type="delete"
                                                 class="dropdown-item"

{odoo_addon_dms-16.0.1.8.3.2.dist-info → odoo_addon_dms-16.0.1.8.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-dms
-Version: 16.0.1.8.3.2
+Version: 16.0.1.8.5
 Summary: Document Management System for Odoo
 Home-page: https://github.com/OCA/dms
 Author: MuK IT, Tecnativa, Odoo Community Association (OCA)
@@ -22,7 +22,7 @@ Document Management System
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:a1e09fa33b9ef1f4f1ff039a3ff5685f7de8ade40a250dca4e24d40b0b695fe5
+   !! source digest: sha256:a679dc80b0bc5020e1bcc24d4777a8b73a2223c966ba9505f304988e56349b6f
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_dms-16.0.1.8.3.2.dist-info → odoo_addon_dms-16.0.1.8.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/dms/README.rst,sha256=PSg56jpmuFGiiYotdb5bEGUDKr2bnhcHpeyUj-2H-fU,7893
+odoo/addons/dms/README.rst,sha256=XDvnBEY9qxxRkZV6YHUuP7j_9pXlKn5VV3u5-U49xVI,7893
 odoo/addons/dms/__init__.py,sha256=dnUeA_K1torbiMNF3tt2dtECdk-FkWm01DByr9MBMIA,69
-odoo/addons/dms/__manifest__.py,sha256=W8Sfrk27fwkVS90XL7w4l8cv8zswmV9UmeWNg7iedZ0,1863
+odoo/addons/dms/__manifest__.py,sha256=BxPmRh4FG4XMvDD8aTZRZXdbdfja0KbtWF0rS2fx-Yg,1863
 odoo/addons/dms/actions/file.xml,sha256=NlRIQoCbbDSaRmsumJP9dcrNtYpQji74hwhfi5TillE,524
 odoo/addons/dms/controllers/__init__.py,sha256=akfNDwFGryweTYowOA3DbbP0zvLmQtCdihtGhYvsIPQ,40
 odoo/addons/dms/controllers/main.py,sha256=9TjOKDeNerPNN4CKL0TWQiqOpNug8pqG6F5uBJO3bkM,1960
@@ -31,9 +31,9 @@ odoo/addons/dms/models/access_groups.py,sha256=ldhs1cc_wlG1G4zfg8ohPwh_mFO1C5wEq
 odoo/addons/dms/models/base.py,sha256=t7uhbkDE9L4UdvYJAwPTlX5ff2Y9S01urlFfC3KlLxM,893
 odoo/addons/dms/models/category.py,sha256=MB36VPKw3DItR5ZYM7CCROO3LDDTpTx87clML966GAs,4132
 odoo/addons/dms/models/directory.py,sha256=agc1vxXW13w_q18W4Y9arE2zg1b96r-9jBPzyafQWgQ,28826
-odoo/addons/dms/models/dms_file.py,sha256=khNVtNZ08ddcyVevViUnN-Hhm-jxUqY_lkQwxAw-Wns,25568
+odoo/addons/dms/models/dms_file.py,sha256=mUqQeR3ElEEBQ9qL988m3WRQAxf-pBmk6XT19DQl8w8,25822
 odoo/addons/dms/models/dms_security_mixin.py,sha256=DfbwMbV8itLQhZp1I9_uORHG91KeXY9rlhddz0DxZGU,9898
-odoo/addons/dms/models/ir_attachment.py,sha256=aEhmB_nH0aLyOqv4ECKX4yRBUn2txbdMgH0cUa8eCPw,3988
+odoo/addons/dms/models/ir_attachment.py,sha256=BJgSKzctRFJxhScmEl7BjSrKBLOyevzGHcfKFdYSIH0,4241
 odoo/addons/dms/models/mail_thread.py,sha256=ccAn2MHONCncjsJewBrLqMVBl6tmn2kezyJVJq2utVk,583
 odoo/addons/dms/models/mixins_thumbnail.py,sha256=DCb8wrWTjdQp2ev9SfYHe9LLZuC18c5jSftm2Er9Aho,1466
 odoo/addons/dms/models/res_company.py,sha256=dyQUHq9H_idTcytaV9QgO1QFWsHBBj_xW2mQHedqY6E,3370
@@ -51,7 +51,7 @@ odoo/addons/dms/security/ir.model.access.csv,sha256=_SuEwHD3SOXbpLalbr5FqGjPvwtD
 odoo/addons/dms/security/security.xml,sha256=plasjSwS2w5GK07BvW9obXNOpPgeBLKeEkUJ6Wpc6nA,9085
 odoo/addons/dms/static/description/icon.png,sha256=8xwcyAfhzMOu_xBinu4KwZsvmqUj6X5aF2LUQvvwdc4,7197
 odoo/addons/dms/static/description/icon.svg,sha256=cICSzGzl0Z00q7m0yhriujt2ip5_v4ymxAMTGzolxsc,8025
-odoo/addons/dms/static/description/index.html,sha256=d5zgkLP5xc2_ZQWWhWdN_t1ZAwnDh-lH3XWJdH5YQn8,20593
+odoo/addons/dms/static/description/index.html,sha256=kkqgIjByd6zWReP3fQr5j0YVs-ZZ6LnBAUq_dgnl7p4,20593
 odoo/addons/dms/static/icons/file_ai.svg,sha256=HeCXVJivVnn6jjj__5WJiLfZv4mrmAamPFek0CwozCc,3343
 odoo/addons/dms/static/icons/file_aj.svg,sha256=mUbfvaV5_m3zJ3zZKldBbaFz4AZNQNecSZ1W_JCZeE4,3063
 odoo/addons/dms/static/icons/file_avi.svg,sha256=Pf78IrO6gGsg3aUVguOu6osDwLYz5ceIOLMbTRpya5s,1862
@@ -119,7 +119,7 @@ odoo/addons/dms/static/src/js/components/path/path.esm.js,sha256=47DEQpj8HBSa-_T
 odoo/addons/dms/static/src/js/fields/path.js,sha256=YZohwYuwaMjII2KBKwjdAutujsTKbBmwdYQlcOUfKtw,3275
 odoo/addons/dms/static/src/js/fields/path_owl.esm.js,sha256=c_MKVLkX5-_IPzSh-0x-xrI-6QKrn45KyLYdleNsRPQ,1001
 odoo/addons/dms/static/src/js/fields/path_owl.xml,sha256=qvLsXEr9hG10dN15fbgTjbs_Fptdx9eni_ZqwRUsyWU,944
-odoo/addons/dms/static/src/js/views/dms_file_upload.esm.js,sha256=RC4euAV9DEu21AREGsV3jkL3iq8HkQ9S7UC-sQ_TWGA,4870
+odoo/addons/dms/static/src/js/views/dms_file_upload.esm.js,sha256=zDRA-WzMj9e_V8IxTI1OBUH-0mU0Gxf0KpybMD7SdRA,4935
 odoo/addons/dms/static/src/js/views/file_kanban_controller.esm.js,sha256=sWB9Al_qt74lk8WKht5d2WJnKda7kqkg6-iIQQtyk6Y,517
 odoo/addons/dms/static/src/js/views/file_kanban_controller.xml,sha256=WZ2yhLRlIJGSJrwZajb_7ktCSglA5DMATLe5yhZdsr0,778
 odoo/addons/dms/static/src/js/views/file_kanban_record.esm.js,sha256=RCWo1IBSxsv99rznib-I_UuYc9QNk1a6IxZpY-8VwuE,2086
@@ -186,7 +186,7 @@ odoo/addons/dms/tests/test_directory.py,sha256=qVti7SPiLEGl38LHcZnNUshlguP3uDMPG
 odoo/addons/dms/tests/test_file.py,sha256=U8-RNRPQipIst6Js36Tz1xPHFziRfwFlRSX_6a9D4Rs,4651
 odoo/addons/dms/tests/test_file_database.py,sha256=et3PD45scSfmQhfR-bGgEglLFkLxKpkSZJPQ4kgdJsM,4715
 odoo/addons/dms/tests/test_portal.py,sha256=cnoAyxeaESErn4FkTeFzsH4FTr-k0HKDv0CZ76WKjLc,3350
-odoo/addons/dms/tests/test_storage_attachment.py,sha256=itCx4omjp8gRQn6O7YnIYJTQdTe-02i_5CyIcjPhjDQ,5847
+odoo/addons/dms/tests/test_storage_attachment.py,sha256=hdz8xrx9GJxfPHRl9OXxf6Q6Zf377IBRrOlz7G8hLtQ,6937
 odoo/addons/dms/tests/test_storage_database.py,sha256=XN-Se2BgLxgFx_mWqmZ6mClgRoc9odSrD6EEIqLUSMs,3943
 odoo/addons/dms/tests/data/dms.category.csv,sha256=VBWa6-PEA6__yv_D6CXUZ7xU-8AAxD7z8jWo4sKb8S0,2631
 odoo/addons/dms/tests/data/dms.directory.csv,sha256=Klh3tEdMt_BB9hWgc_FRUsv_q4Uy-asUut0EuTmnLLU,53514
@@ -200,7 +200,7 @@ odoo/addons/dms/tools/file.py,sha256=NYgdhsu1qdcLfMInmzhMs-PzDKmFm3wuo9kx610mSJs
 odoo/addons/dms/views/category.xml,sha256=fjes6BqnZpcB8IJhZliZP4C7HqjJHlRVqRo4mvlEt38,4434
 odoo/addons/dms/views/directory.xml,sha256=rEv4ykJ4aBj3Tv8lLfs3rIHFw1fMENU0uNxhxnhqpqY,35526
 odoo/addons/dms/views/dms_access_groups_views.xml,sha256=vVeq7iGl7YfT1GKVGsulwOdPc6z3xS51hsRXfR2hR7w,5427
-odoo/addons/dms/views/dms_file.xml,sha256=BSpOsGRRVpoyeG8dRbZju6guv_oEpK2RN_faCuLsYdY,31826
+odoo/addons/dms/views/dms_file.xml,sha256=dvrLT1SeGr-cTGFiDC_47Dk2zhPmJiDMCY4uq4UhMWw,32132
 odoo/addons/dms/views/dms_portal_templates.xml,sha256=piujeenSeFNfeQzME_wphQ16Heg2AFmWtBnLO_yv3Z0,5638
 odoo/addons/dms/views/menu.xml,sha256=YJxLfNpa7HqM5rj09kXGUeernJp9sSTA_mDICKvIs9I,792
 odoo/addons/dms/views/res_config_settings.xml,sha256=0ypGd5018Lh7ItlOo8Ks5-4RuTImAWocvgTFtYP-RK4,5214
@@ -211,7 +211,7 @@ odoo/addons/dms/wizards/wizard_dms_file_move.py,sha256=zQouQDJuLWOrjzkksiUaTf0DF
 odoo/addons/dms/wizards/wizard_dms_file_move_views.xml,sha256=bYWdX_QlMpIOS5gRk7iEyddHKLCvAkvzDxfT3oM1lCo,1931
 odoo/addons/dms/wizards/wizard_dms_share.py,sha256=s7n6nQy0I6qVsvQ7Z57lfY28wi8tbd9062Bdw-BSoWg,558
 odoo/addons/dms/wizards/wizard_dms_share_views.xml,sha256=63BhWyowqJ2Yf3RdOdjT6WvC13jXxTKzsJEZXmaHv-A,1230
-odoo_addon_dms-16.0.1.8.3.2.dist-info/METADATA,sha256=gPZmukbQnnFkR1oqTABJRWIM3Fi0MEkTI02g_z38jPY,8415
-odoo_addon_dms-16.0.1.8.3.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-odoo_addon_dms-16.0.1.8.3.2.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_dms-16.0.1.8.3.2.dist-info/RECORD,,
+odoo_addon_dms-16.0.1.8.5.dist-info/METADATA,sha256=e-Gglb4wOXDHZx_zOpP1fylQt7y8z2IoLGFtldvXLPM,8413
+odoo_addon_dms-16.0.1.8.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+odoo_addon_dms-16.0.1.8.5.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_dms-16.0.1.8.5.dist-info/RECORD,,