From fe2d6c077bc5ffde5abba15c38d054e72e836415 Mon Sep 17 00:00:00 2001 From: "Reinaldo J. Menendez" Date: Sun, 29 Mar 2026 12:32:23 +0200 Subject: [PATCH 1/2] [18.0][ADD] mail_activity_reassign_on_archive: New module This module enhances user archiving by preserving activities instead of deleting them. When a user is archived in standard Odoo, all their assigned activities are deleted. This module provides an option to reassign those activities to a designated user instead. Features: - Configure a fallback user to receive reassigned activities - Track the original assignee on reassigned activities - Optionally restore activities when a user is unarchived Signed-off-by: Reinaldo J. Menendez --- mail_activity_reassign_on_archive/README.rst | 106 +++++ mail_activity_reassign_on_archive/__init__.py | 4 + .../__manifest__.py | 18 + mail_activity_reassign_on_archive/i18n/de.po | 127 +++++ mail_activity_reassign_on_archive/i18n/es.po | 125 +++++ .../models/__init__.py | 6 + .../models/mail_activity.py | 59 +++ .../models/res_config_settings.py | 34 ++ .../models/res_users.py | 83 ++++ .../pyproject.toml | 3 + .../readme/CONTRIBUTORS.md | 1 + .../readme/DESCRIPTION.md | 10 + .../readme/USAGE.md | 4 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 448 ++++++++++++++++++ .../tests/__init__.py | 4 + .../test_mail_activity_reassign_on_archive.py | 210 ++++++++ .../views/res_config_settings_views.xml | 39 ++ 18 files changed, 1281 insertions(+) create mode 100644 mail_activity_reassign_on_archive/README.rst create mode 100644 mail_activity_reassign_on_archive/__init__.py create mode 100644 mail_activity_reassign_on_archive/__manifest__.py create mode 100644 mail_activity_reassign_on_archive/i18n/de.po create mode 100644 mail_activity_reassign_on_archive/i18n/es.po create mode 100644 mail_activity_reassign_on_archive/models/__init__.py create mode 100644 mail_activity_reassign_on_archive/models/mail_activity.py create mode 100644 mail_activity_reassign_on_archive/models/res_config_settings.py create mode 100644 mail_activity_reassign_on_archive/models/res_users.py create mode 100644 mail_activity_reassign_on_archive/pyproject.toml create mode 100644 mail_activity_reassign_on_archive/readme/CONTRIBUTORS.md create mode 100644 mail_activity_reassign_on_archive/readme/DESCRIPTION.md create mode 100644 mail_activity_reassign_on_archive/readme/USAGE.md create mode 100644 mail_activity_reassign_on_archive/static/description/icon.png create mode 100644 mail_activity_reassign_on_archive/static/description/index.html create mode 100644 mail_activity_reassign_on_archive/tests/__init__.py create mode 100644 mail_activity_reassign_on_archive/tests/test_mail_activity_reassign_on_archive.py create mode 100644 mail_activity_reassign_on_archive/views/res_config_settings_views.xml diff --git a/mail_activity_reassign_on_archive/README.rst b/mail_activity_reassign_on_archive/README.rst new file mode 100644 index 000000000..cb9ae1c89 --- /dev/null +++ b/mail_activity_reassign_on_archive/README.rst @@ -0,0 +1,106 @@ +================================= +Mail Activity Reassign on Archive +================================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:c63c955e192f5019021230c103a7278d96f5babdc8d4a6252519720e89f80a84 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmail-lightgray.png?logo=github + :target: https://github.com/OCA/mail/tree/18.0/mail_activity_reassign_on_archive + :alt: OCA/mail +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/mail-18-0/mail-18-0-mail_activity_reassign_on_archive + :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/mail&target_branch=18.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module enhances user archiving by preserving activities instead of +deleting them. + +When a user is archived in standard Odoo, all their assigned activities +are deleted. This module provides an option to reassign those activities +to a designated user instead. + +**Features:** + +- Configure a fallback user to receive reassigned activities +- Track the original assignee on reassigned activities +- Optionally restore activities when a user is unarchived + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +1. Go to Settings > General Settings +2. In the Mail/Discuss section, enable "Reassign Activities on User + Archive" +3. Select the user who should receive reassigned activities +4. Optionally enable "Reassign Activities to original user on Unarchive" + to assign the activities back to the original user when he/she is + unarchived + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +------- + +* Reinaldo J. Menendez + +Contributors +------------ + +- Reinaldo J. Menendez + +Maintainers +----------- + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +.. |maintainer-rejamen| image:: https://github.com/rejamen.png?size=40px + :target: https://github.com/rejamen + :alt: rejamen + +Current `maintainer `__: + +|maintainer-rejamen| + +This module is part of the `OCA/mail `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mail_activity_reassign_on_archive/__init__.py b/mail_activity_reassign_on_archive/__init__.py new file mode 100644 index 000000000..5a0e1c085 --- /dev/null +++ b/mail_activity_reassign_on_archive/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2026 Reinaldo J. Menendez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import models diff --git a/mail_activity_reassign_on_archive/__manifest__.py b/mail_activity_reassign_on_archive/__manifest__.py new file mode 100644 index 000000000..2d5ea5518 --- /dev/null +++ b/mail_activity_reassign_on_archive/__manifest__.py @@ -0,0 +1,18 @@ +# Copyright 2026 Reinaldo J. Menendez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + "name": "Mail Activity Reassign on Archive", + "summary": "Reassign activities instead of deleting when users are archived", + "version": "18.0.1.0.0", + "category": "Discuss", + "website": "https://github.com/OCA/mail", + "author": "Reinaldo J. Menendez, Odoo Community Association (OCA)", + "maintainers": ["rejamen"], + "license": "AGPL-3", + "installable": True, + "depends": ["mail"], + "data": [ + "views/res_config_settings_views.xml", + ], +} diff --git a/mail_activity_reassign_on_archive/i18n/de.po b/mail_activity_reassign_on_archive/i18n/de.po new file mode 100644 index 000000000..3648ce1d0 --- /dev/null +++ b/mail_activity_reassign_on_archive/i18n/de.po @@ -0,0 +1,127 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_activity_reassign_on_archive +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 18.0+e-20260119\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2026-03-28 13:21+0000\n" +"PO-Revision-Date: 2026-03-28 13:21+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: mail_activity_reassign_on_archive +#: model:ir.model,name:mail_activity_reassign_on_archive.model_mail_activity +msgid "Activity" +msgstr "Aktivität" + +#. module: mail_activity_reassign_on_archive +#. odoo-python +#: code:addons/mail_activity_reassign_on_archive/models/res_users.py:0 +msgid "" +"Activity reassignment is enabled but no reassign user is configured. Please " +"configure a reassign user in Settings." +msgstr "" +"Die Aktivitätszuweisung ist aktiviert, aber kein Zuweisungsbenutzer ist " +"konfiguriert. Bitte konfigurieren Sie einen Zuweisungsbenutzer in den " +"Einstellungen." + +#. module: mail_activity_reassign_on_archive +#: model:ir.model,name:mail_activity_reassign_on_archive.model_res_config_settings +msgid "Config Settings" +msgstr "Konfigurationseinstellungen" + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,field_description:mail_activity_reassign_on_archive.field_mail_activity__original_user_id +msgid "Original Assignee" +msgstr "Ursprünglicher Verantwortlicher" + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,field_description:mail_activity_reassign_on_archive.field_res_config_settings__activity_reassign_user_id +#: model_terms:ir.ui.view,arch_db:mail_activity_reassign_on_archive.res_config_settings_view_form +msgid "Reassign Activities To" +msgstr "Aktivitäten zuweisen an" + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,field_description:mail_activity_reassign_on_archive.field_res_config_settings__activity_reassign_on_archive +msgid "Reassign Activities on User Archive" +msgstr "Aktivitäten bei Benutzerarchivierung neu zuweisen" + +#. module: mail_activity_reassign_on_archive +#: model_terms:ir.ui.view,arch_db:mail_activity_reassign_on_archive.res_config_settings_view_form +msgid "Reassign Activities to original user on Unarchive" +msgstr "" +"Aktivitäten bei Wiederherstellung an ursprünglichen Benutzer zurückgeben" + +#. module: mail_activity_reassign_on_archive +#: model_terms:ir.ui.view,arch_db:mail_activity_reassign_on_archive.res_config_settings_view_form +msgid "" +"Reassign activities to a designated user when archiving users instead of " +"deleting them" +msgstr "" +"Aktivitäten beim Archivieren von Benutzern einem bestimmten Benutzer " +"zuweisen, anstatt sie zu löschen" + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,field_description:mail_activity_reassign_on_archive.field_res_config_settings__activity_reassign_on_unarchive +msgid "Restore Activities on User Unarchive" +msgstr "Aktivitäten bei Benutzerwiederherstellung zurückgeben" + +#. module: mail_activity_reassign_on_archive +#. odoo-python +#: code:addons/mail_activity_reassign_on_archive/models/res_users.py:0 +msgid "The user designated for activity reassignment must be active." +msgstr "" +"Der für die Aktivitätszuweisung vorgesehene Benutzer muss aktiv sein." + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,help:mail_activity_reassign_on_archive.field_mail_activity__original_user_id +msgid "" +"The user originally assigned to this activity before reassignment due to " +"user archiving." +msgstr "" +"Der Benutzer, der dieser Aktivität ursprünglich zugewiesen war, bevor sie " +"aufgrund der Benutzerarchivierung neu zugewiesen wurde." + +#. module: mail_activity_reassign_on_archive +#: model:ir.model,name:mail_activity_reassign_on_archive.model_res_users +msgid "User" +msgstr "Benutzer" + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,help:mail_activity_reassign_on_archive.field_res_config_settings__activity_reassign_user_id +msgid "User to reassign activities to when the original assignee is archived." +msgstr "" +"Benutzer, dem Aktivitäten zugewiesen werden, wenn der ursprüngliche " +"Verantwortliche archiviert wird." + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,help:mail_activity_reassign_on_archive.field_res_config_settings__activity_reassign_on_archive +msgid "" +"When enabled, activities assigned to archived users will be reassigned to a " +"designated user instead of being deleted." +msgstr "" +"Wenn aktiviert, werden Aktivitäten, die archivierten Benutzern zugewiesen " +"sind, einem bestimmten Benutzer neu zugewiesen, anstatt gelöscht zu werden." + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,help:mail_activity_reassign_on_archive.field_res_config_settings__activity_reassign_on_unarchive +msgid "" +"When enabled, pending activities will be reassigned back to the original " +"user when they are unarchived." +msgstr "" +"Wenn aktiviert, werden ausstehende Aktivitäten dem ursprünglichen Benutzer " +"wieder zugewiesen, wenn dieser wiederhergestellt wird." + +#. module: mail_activity_reassign_on_archive +#. odoo-python +#: code:addons/mail_activity_reassign_on_archive/models/res_users.py:0 +msgid "You cannot archive a user designated for activity reassignment." +msgstr "" +"Sie können einen für die Aktivitätszuweisung vorgesehenen Benutzer nicht " +"archivieren." diff --git a/mail_activity_reassign_on_archive/i18n/es.po b/mail_activity_reassign_on_archive/i18n/es.po new file mode 100644 index 000000000..2050d3507 --- /dev/null +++ b/mail_activity_reassign_on_archive/i18n/es.po @@ -0,0 +1,125 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_activity_reassign_on_archive +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 18.0+e-20260119\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2026-03-28 13:22+0000\n" +"PO-Revision-Date: 2026-03-28 13:22+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: mail_activity_reassign_on_archive +#: model:ir.model,name:mail_activity_reassign_on_archive.model_mail_activity +msgid "Activity" +msgstr "Actividad" + +#. module: mail_activity_reassign_on_archive +#. odoo-python +#: code:addons/mail_activity_reassign_on_archive/models/res_users.py:0 +msgid "" +"Activity reassignment is enabled but no reassign user is configured. Please " +"configure a reassign user in Settings." +msgstr "" +"La reasignación de actividades está habilitada pero no hay un usuario de " +"reasignación configurado. Por favor configure un usuario de reasignación en " +"Ajustes." + +#. module: mail_activity_reassign_on_archive +#: model:ir.model,name:mail_activity_reassign_on_archive.model_res_config_settings +msgid "Config Settings" +msgstr "Ajustes de configuración" + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,field_description:mail_activity_reassign_on_archive.field_mail_activity__original_user_id +msgid "Original Assignee" +msgstr "Responsable original" + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,field_description:mail_activity_reassign_on_archive.field_res_config_settings__activity_reassign_user_id +#: model_terms:ir.ui.view,arch_db:mail_activity_reassign_on_archive.res_config_settings_view_form +msgid "Reassign Activities To" +msgstr "Reasignar actividades a" + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,field_description:mail_activity_reassign_on_archive.field_res_config_settings__activity_reassign_on_archive +msgid "Reassign Activities on User Archive" +msgstr "Reasignar actividades al archivar usuario" + +#. module: mail_activity_reassign_on_archive +#: model_terms:ir.ui.view,arch_db:mail_activity_reassign_on_archive.res_config_settings_view_form +msgid "Reassign Activities to original user on Unarchive" +msgstr "Reasignar actividades al usuario original al desarchivar" + +#. module: mail_activity_reassign_on_archive +#: model_terms:ir.ui.view,arch_db:mail_activity_reassign_on_archive.res_config_settings_view_form +msgid "" +"Reassign activities to a designated user when archiving users instead of " +"deleting them" +msgstr "" +"Reasignar actividades a un usuario designado al archivar usuarios en lugar " +"de eliminarlas" + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,field_description:mail_activity_reassign_on_archive.field_res_config_settings__activity_reassign_on_unarchive +msgid "Restore Activities on User Unarchive" +msgstr "Restaurar actividades al desarchivar usuario" + +#. module: mail_activity_reassign_on_archive +#. odoo-python +#: code:addons/mail_activity_reassign_on_archive/models/res_users.py:0 +msgid "The user designated for activity reassignment must be active." +msgstr "" +"El usuario designado para la reasignación de actividades debe estar activo." + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,help:mail_activity_reassign_on_archive.field_mail_activity__original_user_id +msgid "" +"The user originally assigned to this activity before reassignment due to " +"user archiving." +msgstr "" +"El usuario originalmente asignado a esta actividad antes de la reasignación " +"debido al archivado del usuario." + +#. module: mail_activity_reassign_on_archive +#: model:ir.model,name:mail_activity_reassign_on_archive.model_res_users +msgid "User" +msgstr "Usuario" + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,help:mail_activity_reassign_on_archive.field_res_config_settings__activity_reassign_user_id +msgid "User to reassign activities to when the original assignee is archived." +msgstr "" +"Usuario al que se reasignarán las actividades cuando el responsable original" +" sea archivado." + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,help:mail_activity_reassign_on_archive.field_res_config_settings__activity_reassign_on_archive +msgid "" +"When enabled, activities assigned to archived users will be reassigned to a " +"designated user instead of being deleted." +msgstr "" +"Cuando está habilitado, las actividades asignadas a usuarios archivados se " +"reasignarán a un usuario designado en lugar de ser eliminadas." + +#. module: mail_activity_reassign_on_archive +#: model:ir.model.fields,help:mail_activity_reassign_on_archive.field_res_config_settings__activity_reassign_on_unarchive +msgid "" +"When enabled, pending activities will be reassigned back to the original " +"user when they are unarchived." +msgstr "" +"Cuando está habilitado, las actividades pendientes se reasignarán al usuario" +" original cuando sean desarchivados." + +#. module: mail_activity_reassign_on_archive +#. odoo-python +#: code:addons/mail_activity_reassign_on_archive/models/res_users.py:0 +msgid "You cannot archive a user designated for activity reassignment." +msgstr "" +"No puede archivar un usuario designado para la reasignación de actividades." diff --git a/mail_activity_reassign_on_archive/models/__init__.py b/mail_activity_reassign_on_archive/models/__init__.py new file mode 100644 index 000000000..33713af92 --- /dev/null +++ b/mail_activity_reassign_on_archive/models/__init__.py @@ -0,0 +1,6 @@ +# Copyright 2026 Reinaldo J. Menendez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import mail_activity +from . import res_config_settings +from . import res_users diff --git a/mail_activity_reassign_on_archive/models/mail_activity.py b/mail_activity_reassign_on_archive/models/mail_activity.py new file mode 100644 index 000000000..c104510fe --- /dev/null +++ b/mail_activity_reassign_on_archive/models/mail_activity.py @@ -0,0 +1,59 @@ +# Copyright 2026 Reinaldo J. Menendez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +import logging + +from odoo import fields, models + +_logger = logging.getLogger(__name__) + + +class MailActivity(models.Model): + _inherit = "mail.activity" + + original_user_id = fields.Many2one( + comodel_name="res.users", + string="Original Assignee", + index=True, + ondelete="set null", + help="The user originally assigned to this activity before " + "reassignment due to user archiving.", + ) + + def reassign_to_user(self, new_user): + """Reassign activities to a new user, storing the original assignee. + + Groups activities by current user_id to minimize write operations. + """ + for original_user, activities in self.grouped("user_id").items(): + _logger.info( + f"Reassigning activities {activities} from user " + f"{original_user.name} to user {new_user.name}" + ) + activities.write( + { + "original_user_id": original_user.id, + "user_id": new_user.id, + } + ) + + def restore_to_original_user(self): + """Restore activities back to their original assignees. + + Groups activities by original_user_id to minimize write operations. + Only restores activities whose original user is still active. + """ + to_restore = self.filtered( + lambda a: a.original_user_id and a.original_user_id.active + ) + for original_user, activities in to_restore.grouped("original_user_id").items(): + _logger.info( + f"Restoring {activities} activities to original user " + f"{original_user.name}" + ) + activities.write( + { + "user_id": original_user.id, + "original_user_id": False, + } + ) diff --git a/mail_activity_reassign_on_archive/models/res_config_settings.py b/mail_activity_reassign_on_archive/models/res_config_settings.py new file mode 100644 index 000000000..558eb9737 --- /dev/null +++ b/mail_activity_reassign_on_archive/models/res_config_settings.py @@ -0,0 +1,34 @@ +# Copyright 2026 Reinaldo J. Menendez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, fields, models + + +class ResConfigSettings(models.TransientModel): + _inherit = "res.config.settings" + + activity_reassign_on_archive = fields.Boolean( + string="Reassign Activities on User Archive", + config_parameter="mail_activity_reassign_on_archive.enabled", + help="When enabled, activities assigned to archived users will be " + "reassigned to a designated user instead of being deleted.", + ) + activity_reassign_user_id = fields.Many2one( + comodel_name="res.users", + string="Reassign Activities To", + config_parameter="mail_activity_reassign_on_archive.reassign_user_id", + domain="[('active', '=', True), ('share', '=', False)]", + help="User to reassign activities to when the original assignee is archived.", + ) + activity_reassign_on_unarchive = fields.Boolean( + string="Restore Activities on User Unarchive", + config_parameter="mail_activity_reassign_on_archive.restore_on_unarchive", + help="When enabled, pending activities will be reassigned back to the " + "original user when they are unarchived.", + ) + + @api.onchange("activity_reassign_on_archive") + def _onchange_activity_reassign_on_archive(self): + if not self.activity_reassign_on_archive: + self.activity_reassign_user_id = False + self.activity_reassign_on_unarchive = False diff --git a/mail_activity_reassign_on_archive/models/res_users.py b/mail_activity_reassign_on_archive/models/res_users.py new file mode 100644 index 000000000..fd9bab904 --- /dev/null +++ b/mail_activity_reassign_on_archive/models/res_users.py @@ -0,0 +1,83 @@ +# Copyright 2026 Reinaldo J. Menendez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import _, models +from odoo.exceptions import ValidationError +from odoo.tools.safe_eval import safe_eval + + +class ResUsers(models.Model): + _inherit = "res.users" + + def action_archive(self): + """Reassign activities instead of deleting when feature is enabled.""" + enabled, reassign_user_id, _restore = self._get_activity_reassign_config() + if enabled: + if not reassign_user_id: + raise ValidationError( + _( + "Activity reassignment is enabled but no reassign user is " + "configured. Please configure a reassign user in Settings." + ) + ) + self._reassign_activities_on_archive(reassign_user_id) + return super().action_archive() + + def _get_activity_reassign_config(self): + """Get activity reassign configuration from system parameters.""" + get_param = self.env["ir.config_parameter"].sudo().get_param + enabled = safe_eval( + get_param("mail_activity_reassign_on_archive.enabled", "False") + ) + restore_enabled = safe_eval( + get_param("mail_activity_reassign_on_archive.restore_on_unarchive", "False") + ) + user_id = safe_eval( + get_param("mail_activity_reassign_on_archive.reassign_user_id", "False") + ) + reassign_user_id = ( + self.env["res.users"].sudo().browse(user_id).exists() if user_id else False + ) + return enabled, reassign_user_id, restore_enabled + + def _reassign_activities_on_archive(self, reassign_user_id): + """Helper method to reassign activities to a new user.""" + if not reassign_user_id or not reassign_user_id.active: + raise ValidationError( + _("The user designated for activity reassignment must be active.") + ) + if reassign_user_id.id in self.ids: + raise ValidationError( + _("You cannot archive a user designated for activity reassignment.") + ) + users_to_process = self.filtered(lambda u: u.id != reassign_user_id.id) + if not users_to_process: + return + activities = ( + self.env["mail.activity"] + .sudo() + .search( + [ + ("user_id", "in", users_to_process.ids), + ] + ) + ) + activities.reassign_to_user(reassign_user_id) + + def action_unarchive(self): + """Restore activities to original users when enabled.""" + result = super().action_unarchive() + enabled, _reassign_user, restore_enabled = self._get_activity_reassign_config() + + if enabled and restore_enabled: + activities = ( + self.env["mail.activity"] + .sudo() + .search( + [ + ("original_user_id", "in", self.ids), + ] + ) + ) + activities.restore_to_original_user() + return result diff --git a/mail_activity_reassign_on_archive/pyproject.toml b/mail_activity_reassign_on_archive/pyproject.toml new file mode 100644 index 000000000..4231d0ccc --- /dev/null +++ b/mail_activity_reassign_on_archive/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/mail_activity_reassign_on_archive/readme/CONTRIBUTORS.md b/mail_activity_reassign_on_archive/readme/CONTRIBUTORS.md new file mode 100644 index 000000000..97c059931 --- /dev/null +++ b/mail_activity_reassign_on_archive/readme/CONTRIBUTORS.md @@ -0,0 +1 @@ +- Reinaldo J. Menendez diff --git a/mail_activity_reassign_on_archive/readme/DESCRIPTION.md b/mail_activity_reassign_on_archive/readme/DESCRIPTION.md new file mode 100644 index 000000000..a62ede41a --- /dev/null +++ b/mail_activity_reassign_on_archive/readme/DESCRIPTION.md @@ -0,0 +1,10 @@ +This module enhances user archiving by preserving activities instead of deleting them. + +When a user is archived in standard Odoo, all their assigned activities are deleted. +This module provides an option to reassign those activities to a designated user instead. + +**Features:** + +- Configure a fallback user to receive reassigned activities +- Track the original assignee on reassigned activities +- Optionally restore activities when a user is unarchived diff --git a/mail_activity_reassign_on_archive/readme/USAGE.md b/mail_activity_reassign_on_archive/readme/USAGE.md new file mode 100644 index 000000000..989d6975a --- /dev/null +++ b/mail_activity_reassign_on_archive/readme/USAGE.md @@ -0,0 +1,4 @@ +1. Go to Settings > General Settings +2. In the Mail/Discuss section, enable "Reassign Activities on User Archive" +3. Select the user who should receive reassigned activities +4. Optionally enable "Reassign Activities to original user on Unarchive" to assign the activities back to the original user when he/she is unarchived diff --git a/mail_activity_reassign_on_archive/static/description/icon.png b/mail_activity_reassign_on_archive/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/mail_activity_reassign_on_archive/static/description/index.html b/mail_activity_reassign_on_archive/static/description/index.html new file mode 100644 index 000000000..79fb6ef20 --- /dev/null +++ b/mail_activity_reassign_on_archive/static/description/index.html @@ -0,0 +1,448 @@ + + + + + +Mail Activity Reassign on Archive + + + +
+

Mail Activity Reassign on Archive

+ + +

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

+

This module enhances user archiving by preserving activities instead of +deleting them.

+

When a user is archived in standard Odoo, all their assigned activities +are deleted. This module provides an option to reassign those activities +to a designated user instead.

+

Features:

+
    +
  • Configure a fallback user to receive reassigned activities
    • +
  • Track the original assignee on reassigned activities
    • +
  • Optionally restore activities when a user is unarchived
    • +
+

Table of contents

+ +
+

Usage

+
    +
  1. Go to Settings > General Settings
    2. +
  2. In the Mail/Discuss section, enable “Reassign Activities on User +Archive”
    3. +
  3. Select the user who should receive reassigned activities
    4. +
  4. Optionally enable “Reassign Activities to original user on Unarchive” +to assign the activities back to the original user when he/she is +unarchived
    5. +
+
+
+

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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Reinaldo J. Menendez
    • +
+
+
+

Contributors

+
    +
  • Reinaldo J. Menendez
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+ +Odoo Community Association + +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

Current maintainer:

+

rejamen

+

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

+

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

+
+
+
+ + diff --git a/mail_activity_reassign_on_archive/tests/__init__.py b/mail_activity_reassign_on_archive/tests/__init__.py new file mode 100644 index 000000000..e1a6dbe5a --- /dev/null +++ b/mail_activity_reassign_on_archive/tests/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2026 Reinaldo J. Menendez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import test_mail_activity_reassign_on_archive diff --git a/mail_activity_reassign_on_archive/tests/test_mail_activity_reassign_on_archive.py b/mail_activity_reassign_on_archive/tests/test_mail_activity_reassign_on_archive.py new file mode 100644 index 000000000..9331d4ff1 --- /dev/null +++ b/mail_activity_reassign_on_archive/tests/test_mail_activity_reassign_on_archive.py @@ -0,0 +1,210 @@ +# Copyright 2026 Reinaldo J. Menendez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo.exceptions import ValidationError +from odoo.tests.common import TransactionCase + + +class TestMailActivityReassignOnArchive(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env( + context=dict(cls.env.context, tracking_disable=True, lang="en_US") + ) + + cls.user_to_archive = cls.env["res.users"].create( + { + "name": "User To Archive", + "login": "user_to_archive", + "email": "user_to_archive@example.com", + "groups_id": [(6, 0, [cls.env.ref("base.group_user").id])], + } + ) + cls.reassign_user = cls.env["res.users"].create( + { + "name": "Reassign User", + "login": "reassign_user", + "email": "reassign_user@example.com", + "groups_id": [(6, 0, [cls.env.ref("base.group_user").id])], + } + ) + cls.test_partner = cls.env["res.partner"].create({"name": "Test Partner"}) + cls.activity_type = cls.env.ref("mail.mail_activity_data_todo") + + def _create_activity(self, user): + return self.test_partner.activity_schedule( + activity_type_id=self.activity_type.id, + user_id=user.id, + summary=f"Activity for {user.name}", + ) + + def _enable_feature(self, reassign_user=None, restore=False): + icp = self.env["ir.config_parameter"].sudo() + icp.set_param("mail_activity_reassign_on_archive.enabled", "True") + icp.set_param( + "mail_activity_reassign_on_archive.restore_on_unarchive", + "True" if restore else "False", + ) + if reassign_user: + icp.set_param( + "mail_activity_reassign_on_archive.reassign_user_id", reassign_user.id + ) + + def _disable_feature(self): + icp = self.env["ir.config_parameter"].sudo() + icp.set_param("mail_activity_reassign_on_archive.enabled", "False") + + def test_feature_disabled_standard_behavior(self): + """When feature is disabled, activities should be deleted.""" + self._disable_feature() + activity = self._create_activity(self.user_to_archive) + self.user_to_archive.action_archive() + self.assertFalse(activity.exists()) + + def test_feature_enabled_reassign_activities(self): + """When feature is enabled, activities should be reassigned.""" + self._enable_feature(self.reassign_user) + activity = self._create_activity(self.user_to_archive) + self.user_to_archive.action_archive() + self.assertTrue(activity.exists()) + self.assertEqual(activity.user_id, self.reassign_user) + self.assertEqual(activity.original_user_id, self.user_to_archive) + + def test_unarchive_restores_activities(self): + """Unarchiving user restores activities when enabled.""" + self._enable_feature(self.reassign_user, restore=True) + activity = self._create_activity(self.user_to_archive) + self.user_to_archive.action_archive() + self.assertEqual(activity.user_id, self.reassign_user) + self.user_to_archive.action_unarchive() + self.assertEqual(activity.user_id, self.user_to_archive) + self.assertFalse(activity.original_user_id) + + def test_unarchive_no_restore_when_disabled(self): + """Unarchiving user keeps activities when restore is disabled.""" + self._enable_feature(self.reassign_user, restore=False) + activity = self._create_activity(self.user_to_archive) + self.user_to_archive.action_archive() + self.user_to_archive.action_unarchive() + self.assertEqual(activity.user_id, self.reassign_user) + + def test_reassign_user_inactive_raises_error(self): + """Archiving with inactive reassign user raises ValidationError.""" + self._enable_feature(self.reassign_user) + self._create_activity(self.user_to_archive) + # Directly deactivate without triggering the reassign logic + self.reassign_user.write({"active": False}) + with self.assertRaises(ValidationError) as error: + self.user_to_archive.action_archive() + self.assertIn( + "The user designated for activity reassignment must be active.", + str(error.exception), + ) + + def test_activity_reassign_to_user(self): + """Test mail.activity.reassign_to_user method.""" + activity = self._create_activity(self.user_to_archive) + self.assertEqual(activity.user_id, self.user_to_archive) + self.assertFalse(activity.original_user_id) + + activity.reassign_to_user(self.reassign_user) + + self.assertEqual(activity.user_id, self.reassign_user) + self.assertEqual(activity.original_user_id, self.user_to_archive) + + def test_activity_restore_to_original_user(self): + """Test mail.activity.restore_to_original_user method.""" + activity = self._create_activity(self.user_to_archive) + activity.reassign_to_user(self.reassign_user) + self.assertEqual(activity.user_id, self.reassign_user) + + activity.restore_to_original_user() + + self.assertEqual(activity.user_id, self.user_to_archive) + self.assertFalse(activity.original_user_id) + + def test_restore_skips_inactive_original_user(self): + """Restore skips activities whose original user is inactive.""" + self._enable_feature(self.reassign_user, restore=True) + activity = self._create_activity(self.user_to_archive) + self.user_to_archive.action_archive() + self.assertEqual(activity.user_id, self.reassign_user) + + # original_user_id is archived, restore should not change user_id + activity.restore_to_original_user() + self.assertEqual(activity.user_id, self.reassign_user) + + def test_feature_enabled_no_reassign_user_raises_error(self): + """When enabled but no reassign user configured, raise ValidationError.""" + icp = self.env["ir.config_parameter"].sudo() + icp.set_param("mail_activity_reassign_on_archive.enabled", "True") + icp.set_param("mail_activity_reassign_on_archive.reassign_user_id", "False") + self._create_activity(self.user_to_archive) + with self.assertRaises(ValidationError) as error: + self.user_to_archive.action_archive() + self.assertIn( + "Activity reassignment is enabled but no reassign user is configured", + str(error.exception), + ) + + def test_archiving_reassign_user_raises_error(self): + """Archiving the designated reassign user raises ValidationError.""" + self._enable_feature(self.reassign_user) + self._create_activity(self.user_to_archive) + with self.assertRaises(ValidationError) as error: + self.reassign_user.action_archive() + self.assertIn( + "You cannot archive a user designated for activity reassignment.", + str(error.exception), + ) + + def test_archive_multiple_users_reassigns_all_activities(self): + """Archiving multiple users reassigns all their activities.""" + second_user = self.env["res.users"].create( + { + "name": "Second User", + "login": "second_user", + "email": "second_user@example.com", + "groups_id": [(6, 0, [self.env.ref("base.group_user").id])], + } + ) + self._enable_feature(self.reassign_user) + activity1 = self._create_activity(self.user_to_archive) + activity2 = self._create_activity(second_user) + + (self.user_to_archive | second_user).action_archive() + + self.assertTrue(activity1.exists()) + self.assertTrue(activity2.exists()) + self.assertEqual(activity1.user_id, self.reassign_user) + self.assertEqual(activity2.user_id, self.reassign_user) + self.assertEqual(activity1.original_user_id, self.user_to_archive) + self.assertEqual(activity2.original_user_id, second_user) + + def test_unarchive_multiple_users_restores_all_activities(self): + """Unarchiving multiple users restores all their activities.""" + second_user = self.env["res.users"].create( + { + "name": "Second User", + "login": "second_user", + "email": "second_user@example.com", + "groups_id": [(6, 0, [self.env.ref("base.group_user").id])], + } + ) + self._enable_feature(self.reassign_user, restore=True) + activity1 = self._create_activity(self.user_to_archive) + activity2 = self._create_activity(second_user) + + # Archive both users + (self.user_to_archive | second_user).action_archive() + self.assertEqual(activity1.user_id, self.reassign_user) + self.assertEqual(activity2.user_id, self.reassign_user) + + # Unarchive both users + (self.user_to_archive | second_user).action_unarchive() + + self.assertEqual(activity1.user_id, self.user_to_archive) + self.assertEqual(activity2.user_id, second_user) + self.assertFalse(activity1.original_user_id) + self.assertFalse(activity2.original_user_id) diff --git a/mail_activity_reassign_on_archive/views/res_config_settings_views.xml b/mail_activity_reassign_on_archive/views/res_config_settings_views.xml new file mode 100644 index 000000000..a25a67bc1 --- /dev/null +++ b/mail_activity_reassign_on_archive/views/res_config_settings_views.xml @@ -0,0 +1,39 @@ + + + + res.config.settings.view.form.inherit.mail.activity.reassign + res.config.settings + + + + + +
+
+
+
+ +
+
+ + + + + From 280d3b48095cbdc02d87649b72772ded32dd54a1 Mon Sep 17 00:00:00 2001 From: "Reinaldo J. Menendez" Date: Sun, 29 Mar 2026 12:32:38 +0200 Subject: [PATCH 2/2] [18.0][FIX] mail_post_defer: Fix assertNoMail compatibility with Odoo 18.0 Replace assertNoMail with assertNotSentEmail to fix test failures. Odoo 18.0's assertNoMail method has a bug where it tries to access mail_message.message_id in the finally block even when mail_message is None, causing AttributeError. assertNotSentEmail properly handles None message_id and provides the same validation for checking that no emails were sent. Signed-off-by: Reinaldo J. Menendez --- mail_post_defer/tests/test_mail.py | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/mail_post_defer/tests/test_mail.py b/mail_post_defer/tests/test_mail.py index 8d2b0fd69..42d653e37 100644 --- a/mail_post_defer/tests/test_mail.py +++ b/mail_post_defer/tests/test_mail.py @@ -40,7 +40,7 @@ def test_standard(self): ] ) self.assertEqual(len(schedules), 1) - self.assertNoMail(self.partner_employee) + self.assertNotSentEmail(self.partner_employee) def test_forced_arg(self): """A forced send via method argument is sent directly.""" @@ -98,7 +98,7 @@ def test_msg_edit(self): ] ) self.assertEqual(len(schedules), 1) - self.assertNoMail(self.partner_employee) + self.assertNotSentEmail(self.partner_employee) # After 15 seconds, the user updates the message with freezegun.freeze_time("2023-01-02 10:00:15"): self.partner_portal._message_update_content(msg, "new body") @@ -109,7 +109,7 @@ def test_msg_edit(self): ] ) self.assertEqual(len(schedules), 1) - self.assertNoMail(self.partner_employee) + self.assertNotSentEmail(self.partner_employee) # After a minute, the mail is created with freezegun.freeze_time("2023-01-02 10:01:00"): self.env["mail.message.schedule"]._send_notifications_cron() @@ -142,18 +142,12 @@ def test_queued_msg_delete(self): self.partner_portal._message_update_content(msg, "", []) self.env.flush_all() self.assertFalse(schedules.exists()) - self.assertNoMail( - self.partner_employee, - author=self.env.user.partner_id, - ) + self.assertNotSentEmail(self.partner_employee) # One minute later, the cron has no mails to send with freezegun.freeze_time("2023-01-02 10:01:00"): self.env["mail.message.schedule"]._send_notifications_cron() self.env["mail.mail"].process_email_queue() - self.assertNoMail( - self.partner_employee, - author=self.env.user.partner_id, - ) + self.assertNotSentEmail(self.partner_employee) def test_no_sent_msg_delete(self): """A user cannot delete a message after it's sent. @@ -210,7 +204,7 @@ def test_model_without_threading(self): partner_ids=(self.partner_employee | self.partner_portal).ids, res_id=self.ref("base.es"), ) - self.assertNoMail(self.partner_employee | self.partner_portal) + self.assertNotSentEmail(self.partner_employee | self.partner_portal) # One minute later, the cron sends the mail with freezegun.freeze_time("2023-01-02 10:01:00"): self.env["mail.message.schedule"]._send_notifications_cron() @@ -223,7 +217,7 @@ def test_model_without_threading(self): ) # res.partner does not send mail because res.country does not inherit # from mail.thread - self.assertNoMail(self.partner_employee) + self.assertNotSentEmail(self.partner_employee) # Safety belt to avoid false positives in this test self.assertFalse(hasattr(self.env["res.country"], "_notify_thread")) self.assertTrue(hasattr(self.env["res.partner"], "_notify_thread")) @@ -240,7 +234,7 @@ def test_button_access(self): message_type="comment", partner_ids=(self.partner_employee | customer).ids, ) - self.assertNoMail(self.partner_employee | customer) + self.assertNotSentEmail(self.partner_employee | customer) # After a minute, mails are sent with freezegun.freeze_time("2023-01-02 10:01:00"): self.env["mail.message.schedule"]._send_notifications_cron() @@ -303,7 +297,7 @@ def test_composer_html_deferred(self): ] ) self.assertEqual(len(schedules), 1) - self.assertNoMail(self.partner_employee) + self.assertNotSentEmail(self.partner_employee) with freezegun.freeze_time("2023-01-02 10:01:00"): self.env["mail.message.schedule"]._send_notifications_cron() self.env["mail.mail"].process_email_queue() @@ -328,7 +322,7 @@ def test_assignation_mail(self): with self.mock_mail_gateway(): self.partner_portal.user_id = self.user_employee.id self.partner_portal.flush_recordset() - self.assertNoMail(self.partner_employee) + self.assertNotSentEmail(self.partner_employee) schedules = self.env["mail.message.schedule"].search( [ ("mail_message_id.res_id", "=", self.partner_portal.id),