diff --git a/mail_activity_team/README.rst b/mail_activity_team/README.rst new file mode 100644 index 0000000..bfc24c8 --- /dev/null +++ b/mail_activity_team/README.rst @@ -0,0 +1,107 @@ +================== +Mail Activity Team +================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |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%2Fsocial-lightgray.png?logo=github + :target: https://github.com/OCA/social/tree/14.0/mail_activity_team + :alt: OCA/social +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/social-14-0/social-14-0-mail_activity_team + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/205/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module adds the possibility to assign teams to activities. + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To set up new teams: + +#. Go to *Settings / Activate developer mode* +#. Go to *Settings / Technical / Email / Activity Teams* +#. Create a new Team and assign (optionally) the models in which it will + be used, and the members of the team. + +You can also assign a user to Activity teams going to +*Settings / Users & Companies / Users*, and in the *Preferences* tab, field +Activity Teams. + +When you create a new activity the application will propose the user's +assigned team. + +You can report on the activities assigned to a team going to +*Dashboards / Activities*, and then filter by a specific team or group by +teams. + +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 smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Eficent +* Sodexis + +Contributors +~~~~~~~~~~~~ + +* `Eficent `_: + + * Jordi Ballester Alomar (jordi.ballester@eficent.com) + * Miquel Raïch (miquel.raich@eficent.com) + * Pedro Gonzalez (pedro.gonzalez@pesol.es) +* `Tecnativa `_: + + * David Vidal + +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. + +This module is part of the `OCA/social `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mail_activity_team/__init__.py b/mail_activity_team/__init__.py new file mode 100644 index 0000000..0650744 --- /dev/null +++ b/mail_activity_team/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/mail_activity_team/__manifest__.py b/mail_activity_team/__manifest__.py new file mode 100644 index 0000000..d5662e1 --- /dev/null +++ b/mail_activity_team/__manifest__.py @@ -0,0 +1,30 @@ +# Copyright 2018-22 ForgeFlow Business and IT Consulting Services, S.L. +# Copyright 2021 Sodexis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + "name": "Mail Activity Team", + "summary": "Add Teams to Activities", + "version": "15.0.1.0.0", + "development_status": "Alpha", + "category": "Social Network", + "website": "https://github.com/OCA/social", + "author": "ForgeFlow, Sodexis, Odoo Community Association (OCA)", + "license": "AGPL-3", + "installable": True, + "depends": ["mail_activity_board"], + "data": [ + "security/ir.model.access.csv", + "security/mail_activity_team_security.xml", + "views/mail_activity_team_views.xml", + "views/mail_activity_views.xml", + "views/res_users_views.xml", + ], + "assets": { + "web.assets_backend": [ + "mail_activity_team/static/src/js/systray.esm.js", + ], + "web.assets_qweb": [ + "mail_activity_team/static/src/xml/systray.xml", + ], + }, +} diff --git a/mail_activity_team/i18n/it.po b/mail_activity_team/i18n/it.po new file mode 100644 index 0000000..244576c --- /dev/null +++ b/mail_activity_team/i18n/it.po @@ -0,0 +1,141 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_activity_team +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2020-12-03 18:36+0000\n" +"Last-Translator: Alessandro Fiorino \n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.10\n" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__active +msgid "Active" +msgstr "Attivo" + +#. module: mail_activity_team +#: model:ir.model,name:mail_activity_team.model_mail_activity +msgid "Activity" +msgstr "Attività" + +#. module: mail_activity_team +#: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_team_view_form +msgid "Activity Team" +msgstr "Team Attività" + +#. module: mail_activity_team +#: model:ir.actions.act_window,name:mail_activity_team.mail_activity_team_action +#: model:ir.model.fields,field_description:mail_activity_team.field_res_users__activity_team_ids +#: model:ir.ui.menu,name:mail_activity_team.menu_mail_activity_team +msgid "Activity Teams" +msgstr "Team Attività" + +#. module: mail_activity_team +#: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_team_view_form +msgid "Assign to missing activities" +msgstr "Assegna ad attività mancanti" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__create_uid +msgid "Created by" +msgstr "Creato da" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__create_date +msgid "Created on" +msgstr "Creato il" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__display_name +msgid "Display Name" +msgstr "Nome Visualizzato" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__id +msgid "ID" +msgstr "ID" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team____last_update +msgid "Last Modified on" +msgstr "Ultima Modifica il" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__write_uid +msgid "Last Updated by" +msgstr "Ultima Modifica di" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__write_date +msgid "Last Updated on" +msgstr "Ultima Modifica il" + +#. module: mail_activity_team +#: model:ir.model,name:mail_activity_team.model_mail_activity_team +msgid "Mail Activity Team" +msgstr "Team Attività Messaggi" + +#. module: mail_activity_team +#: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_team_view_form +msgid "Members" +msgstr "Membri" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__count_missing_activities +msgid "Missing Activities" +msgstr "Attività Mancanti" + +#. module: mail_activity_team +#: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_view_search +msgid "My Team Activities" +msgstr "Attività del mio Team" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__name +msgid "Name" +msgstr "Nome" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity__team_id +#: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_view_search +msgid "Team" +msgstr "Team" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__user_id +msgid "Team Leader" +msgstr "Capo Team" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__member_ids +msgid "Team Members" +msgstr "Membri Team" + +#. module: mail_activity_team +#: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_view_kanban +msgid "Team:" +msgstr "Team:" + +#. module: mail_activity_team +#: code:addons/mail_activity_team/models/mail_activity.py:0 +#, python-format +msgid "The assigned user is not member of the team." +msgstr "L'utente assegnato non è un membro del team." + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__res_model_ids +msgid "Used models" +msgstr "Modelli usati" + +#. module: mail_activity_team +#: model:ir.model,name:mail_activity_team.model_res_users +msgid "Users" +msgstr "Utenti" diff --git a/mail_activity_team/i18n/mail_activity_team.pot b/mail_activity_team/i18n/mail_activity_team.pot new file mode 100644 index 0000000..7c023b7 --- /dev/null +++ b/mail_activity_team/i18n/mail_activity_team.pot @@ -0,0 +1,182 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_activity_team +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \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_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__active +msgid "Active" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model,name:mail_activity_team.model_mail_activity +msgid "Activity" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model,name:mail_activity_team.model_mail_activity_mixin +msgid "Activity Mixin" +msgstr "" + +#. module: mail_activity_team +#: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_team_view_form +msgid "Activity Team" +msgstr "" + +#. module: mail_activity_team +#: model:ir.actions.act_window,name:mail_activity_team.mail_activity_team_action +#: model:ir.model.fields,field_description:mail_activity_team.field_res_users__activity_team_ids +#: model:ir.ui.menu,name:mail_activity_team.menu_mail_activity_team +msgid "Activity Teams" +msgstr "" + +#. module: mail_activity_team +#: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_team_view_form +msgid "Assign to missing activities" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__create_uid +msgid "Created by" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__create_date +msgid "Created on" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity__display_name +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_mixin__display_name +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__display_name +#: model:ir.model.fields,field_description:mail_activity_team.field_res_users__display_name +msgid "Display Name" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity__id +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_mixin__id +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__id +#: model:ir.model.fields,field_description:mail_activity_team.field_res_users__id +msgid "ID" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity____last_update +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_mixin____last_update +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team____last_update +#: model:ir.model.fields,field_description:mail_activity_team.field_res_users____last_update +msgid "Last Modified on" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__write_date +msgid "Last Updated on" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model,name:mail_activity_team.model_mail_activity_team +msgid "Mail Activity Team" +msgstr "" + +#. module: mail_activity_team +#: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_team_view_form +msgid "Members" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__count_missing_activities +msgid "Missing Activities" +msgstr "" + +#. module: mail_activity_team +#. openerp-web +#: code:addons/mail_activity_team/static/src/xml/systray.xml:0 +#, python-format +msgid "My Activities" +msgstr "" + +#. module: mail_activity_team +#: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_view_search +msgid "My Team Activities" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__name +msgid "Name" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity__team_id +#: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_view_search +msgid "Team" +msgstr "" + +#. module: mail_activity_team +#. openerp-web +#: code:addons/mail_activity_team/static/src/xml/systray.xml:0 +#, python-format +msgid "Team Activities" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__user_id +msgid "Team Leader" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__member_ids +msgid "Team Members" +msgstr "" + +#. module: mail_activity_team +#: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_view_kanban +msgid "Team:" +msgstr "" + +#. module: mail_activity_team +#: code:addons/mail_activity_team/models/mail_activity.py:0 +#, python-format +msgid "The assigned user %s is not member of the team %s." +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__res_model_ids +msgid "Used models" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model,name:mail_activity_team.model_res_users +msgid "Users" +msgstr "" + +#. module: mail_activity_team +#: model:ir.model.fields,field_description:mail_activity_team.field_account_bank_statement_line__activity_team_user_ids +#: model:ir.model.fields,field_description:mail_activity_team.field_account_journal__activity_team_user_ids +#: model:ir.model.fields,field_description:mail_activity_team.field_account_move__activity_team_user_ids +#: model:ir.model.fields,field_description:mail_activity_team.field_account_payment__activity_team_user_ids +#: model:ir.model.fields,field_description:mail_activity_team.field_event_event__activity_team_user_ids +#: model:ir.model.fields,field_description:mail_activity_team.field_event_registration__activity_team_user_ids +#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_mixin__activity_team_user_ids +#: model:ir.model.fields,field_description:mail_activity_team.field_mailing_mailing__activity_team_user_ids +#: model:ir.model.fields,field_description:mail_activity_team.field_product_product__activity_team_user_ids +#: model:ir.model.fields,field_description:mail_activity_team.field_product_template__activity_team_user_ids +#: model:ir.model.fields,field_description:mail_activity_team.field_res_partner__activity_team_user_ids +#: model:ir.model.fields,field_description:mail_activity_team.field_res_users__activity_team_user_ids +msgid "test field" +msgstr "" diff --git a/mail_activity_team/models/__init__.py b/mail_activity_team/models/__init__.py new file mode 100644 index 0000000..a3143d5 --- /dev/null +++ b/mail_activity_team/models/__init__.py @@ -0,0 +1,4 @@ +from . import mail_activity_team +from . import mail_activity +from . import mail_activity_mixin +from . import res_users diff --git a/mail_activity_team/models/mail_activity.py b/mail_activity_team/models/mail_activity.py new file mode 100644 index 0000000..d200d77 --- /dev/null +++ b/mail_activity_team/models/mail_activity.py @@ -0,0 +1,83 @@ +# Copyright 2018-22 ForgeFlow Business and IT Consulting Services, S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import SUPERUSER_ID, _, api, fields, models +from odoo.exceptions import ValidationError + + +class MailActivity(models.Model): + _inherit = "mail.activity" + + def _get_default_team_id(self, user_id=None): + if not user_id: + user_id = self.env.uid + res_model = self.env.context.get("default_res_model") + model = self.sudo().env["ir.model"].search([("model", "=", res_model)], limit=1) + domain = [("member_ids", "in", [user_id])] + if res_model: + domain.extend( + ["|", ("res_model_ids", "=", False), ("res_model_ids", "in", model.ids)] + ) + return self.env["mail.activity.team"].search(domain, limit=1) + + team_id = fields.Many2one( + comodel_name="mail.activity.team", default=lambda s: s._get_default_team_id() + ) + + @api.onchange("user_id") + def _onchange_user_id(self): + res = {"domain": {"team_id": []}} + if not self.user_id: + return res + res["domain"]["team_id"] = [ + "|", + ("res_model_ids", "=", False), + ("res_model_ids", "in", self.res_model_id.ids), + ] + if self.team_id and self.user_id in self.team_id.member_ids: + return res + self.team_id = self.with_context( + default_res_model=self.res_model_id.id + )._get_default_team_id(user_id=self.user_id.id) + return res + + @api.onchange("team_id") + def _onchange_team_id(self): + res = {"domain": {"user_id": []}} + if not self.team_id: + return res + res["domain"]["user_id"] = [("id", "in", self.team_id.member_ids.ids)] + if self.user_id not in self.team_id.member_ids: + if self.team_id.user_id: + self.user_id = self.team_id.user_id + elif len(self.team_id.member_ids) == 1: + self.user_id = self.team_id.member_ids + else: + self.user_id = self.env["res.users"] + return res + + @api.constrains("team_id", "user_id") + def _check_team_and_user(self): + for activity in self: + # SUPERUSER is used to put mail.activity on some objects + # like sale.order coming from stock.picking + # (for example with exception type activity, with no backorder). + # SUPERUSER is inactive and then even if you add it + # to member_ids it's not taken account + # To not be blocked we must add it to constraint condition. + # We must consider also users that could be archived but come from + # an automatic scheduled activity + if ( + activity.user_id.id != SUPERUSER_ID + and activity.team_id + and activity.user_id + and activity.user_id + not in activity.team_id.with_context(active_test=False).member_ids + ): + raise ValidationError( + _( + "The assigned user %(user_name)s is " + "not member of the team %(team_name)s.", + user_name=activity.user_id.name, + team_name=activity.team_id.name, + ) + ) diff --git a/mail_activity_team/models/mail_activity_mixin.py b/mail_activity_team/models/mail_activity_mixin.py new file mode 100644 index 0000000..d9ea56e --- /dev/null +++ b/mail_activity_team/models/mail_activity_mixin.py @@ -0,0 +1,65 @@ +# Copyright 2021 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import api, fields, models + + +class MailActivityMixin(models.AbstractModel): + _inherit = "mail.activity.mixin" + + activity_team_user_ids = fields.Many2many( + comodel_name="res.users", + string="test field", + compute="_compute_activity_team_user_ids", + search="_search_activity_team_user_ids", + ) + + @api.depends("activity_ids") + def _compute_activity_team_user_ids(self): + for rec in self: + rec.activity_team_user_ids = rec.activity_ids.mapped("team_id.member_ids") + + def _search_my_activity_date_deadline(self, operator, operand): + if not self._context.get("team_activities", False): + return super(MailActivityMixin, self)._search_my_activity_date_deadline( + operator, operand + ) + activity_ids = self.env["mail.activity"]._search( + [ + "|", + ("user_id", "=", self.env.user.id), + "&", + ("date_deadline", operator, operand), + ("res_model", "=", self._name), + ] + ) + return [("activity_ids", "in", activity_ids)] + + @api.model + def _search_activity_team_user_ids(self, operator, operand): + return [("activity_ids.team_id.member_ids", operator, operand)] + + def activity_schedule( + self, act_type_xmlid="", date_deadline=None, summary="", note="", **act_values + ): + """With automatic activities, the user onchange won't act so we must + ensure the right group is set and no exceptions are raised due to + user-team missmatch. We can hook onto `act_values` dict as it's passed + to the create activity method. + """ + user_id = act_values.get("user_id") + if user_id: + team = ( + self.env["mail.activity"] + .with_context( + default_res_model=self._name, + ) + ._get_default_team_id(user_id=user_id) + ) + act_values.update({"team_id": team.id}) + return super().activity_schedule( + act_type_xmlid=act_type_xmlid, + date_deadline=date_deadline, + summary=summary, + note=note, + **act_values + ) diff --git a/mail_activity_team/models/mail_activity_team.py b/mail_activity_team/models/mail_activity_team.py new file mode 100644 index 0000000..e595401 --- /dev/null +++ b/mail_activity_team/models/mail_activity_team.py @@ -0,0 +1,69 @@ +# Copyright 2018-22 ForgeFlow Business and IT Consulting Services, S.L. +# Copyright 2021 Sodexis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import api, fields, models + + +class MailActivityTeam(models.Model): + _name = "mail.activity.team" + _description = "Mail Activity Team" + + @api.depends("res_model_ids", "member_ids") + def _compute_missing_activities(self): + activity_model = self.env["mail.activity"] + for team in self: + domain = [("team_id", "=", False)] + if team.member_ids: + domain.append(("user_id", "in", team.member_ids.ids)) + if team.res_model_ids: + domain.append(("res_model_id", "in", team.res_model_ids.ids)) + team.count_missing_activities = activity_model.search(domain, count=True) + + name = fields.Char(required=True, translate=True) + active = fields.Boolean(default=True) + res_model_ids = fields.Many2many( + comodel_name="ir.model", + string="Used models", + domain=lambda self: [ + ( + "model", + "in", + [ + k + for k in self.env.registry + if issubclass( + type(self.env[k]), type(self.env["mail.activity.mixin"]) + ) + and self.env[k]._auto + ], + ) + ], + ) + member_ids = fields.Many2many( + comodel_name="res.users", + relation="mail_activity_team_users_rel", + string="Team Members", + ) + user_id = fields.Many2one(comodel_name="res.users", string="Team Leader") + count_missing_activities = fields.Integer( + string="Missing Activities", compute="_compute_missing_activities", default=0 + ) + + @api.onchange("user_id") + def _onchange_user_id(self): + if self.user_id and self.user_id not in self.member_ids: + members_ids = self.member_ids.ids + members_ids.append(self.user_id.id) + self.member_ids = [(4, member) for member in members_ids] + + def assign_team_to_unassigned_activities(self): + activity_model = self.env["mail.activity"] + for team in self: + domain = [("team_id", "=", False)] + if team.member_ids: + domain.append(("user_id", "in", team.member_ids.ids)) + if team.res_model_ids: + domain.append(("res_model_id", "in", team.res_model_ids.ids)) + missing_activities = activity_model.search(domain) + for missing_activity in missing_activities: + missing_activity.write({"team_id": team.id}) diff --git a/mail_activity_team/models/res_users.py b/mail_activity_team/models/res_users.py new file mode 100644 index 0000000..8493d4f --- /dev/null +++ b/mail_activity_team/models/res_users.py @@ -0,0 +1,69 @@ +# Copyright 2018-22 ForgeFlow Business and IT Consulting Services, S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import api, fields, models, modules + + +class ResUsers(models.Model): + _inherit = "res.users" + + activity_team_ids = fields.Many2many( + comodel_name="mail.activity.team", + relation="mail_activity_team_users_rel", + string="Activity Teams", + ) + + @api.model + def systray_get_activities(self): + if not self._context.get("team_activities", False): + return super().systray_get_activities() + query = """SELECT m.id, count(*), act.res_model as model, + CASE + WHEN %(today)s::date - + act.date_deadline::date = 0 Then 'today' + WHEN %(today)s::date - + act.date_deadline::date > 0 Then 'overdue' + WHEN %(today)s::date - + act.date_deadline::date < 0 Then 'planned' + END AS states, act.user_id as user_id + FROM mail_activity AS act + JOIN ir_model AS m ON act.res_model_id = m.id + WHERE team_id in ( + SELECT mail_activity_team_id + FROM mail_activity_team_users_rel + WHERE res_users_id = %(user_id)s + ) + GROUP BY m.id, states, act.res_model, act.user_id;""" + user = self.env.uid + self.env.cr.execute( + query, + { + "today": fields.Date.context_today(self), + "user_id": user, + }, + ) + activity_data = self.env.cr.dictfetchall() + model_ids = [a["id"] for a in activity_data] + model_names = { + n[0]: n[1] for n in self.env["ir.model"].sudo().browse(model_ids).name_get() + } + user_activities = {} + for activity in activity_data: + if not user_activities.get(activity["model"]): + user_activities[activity["model"]] = { + "name": model_names[activity["id"]], + "model": activity["model"], + "type": "activity", + "icon": modules.module.get_module_icon( + self.env[activity["model"]]._original_module + ), + "total_count": 0, + "today_count": 0, + "overdue_count": 0, + "planned_count": 0, + } + user_activities[activity["model"]][ + "%s_count" % activity["states"] + ] += activity["count"] + if activity["states"] in ("today", "overdue"): + user_activities[activity["model"]]["total_count"] += activity["count"] + return list(user_activities.values()) diff --git a/mail_activity_team/readme/CONTRIBUTORS.rst b/mail_activity_team/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000..977f558 --- /dev/null +++ b/mail_activity_team/readme/CONTRIBUTORS.rst @@ -0,0 +1,9 @@ +* `ForgeFlow `_: + + * Jordi Ballester Alomar (jordi.ballester@eficent.com) + * Miquel Raïch (miquel.raich@eficent.com) + * Bernat Puig Font (bernat.puig@forgeflow.com) +* Pedro Gonzalez (pedro.gonzalez@pesol.es) +* `Tecnativa `_: + + * David Vidal diff --git a/mail_activity_team/readme/DESCRIPTION.rst b/mail_activity_team/readme/DESCRIPTION.rst new file mode 100644 index 0000000..02d863d --- /dev/null +++ b/mail_activity_team/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module adds the possibility to assign teams to activities. diff --git a/mail_activity_team/readme/ROADMAP.rst b/mail_activity_team/readme/ROADMAP.rst new file mode 100644 index 0000000..82a350a --- /dev/null +++ b/mail_activity_team/readme/ROADMAP.rst @@ -0,0 +1 @@ +* In next version systray.esm.js file should be changed as added in comments. diff --git a/mail_activity_team/readme/USAGE.rst b/mail_activity_team/readme/USAGE.rst new file mode 100644 index 0000000..a9b4344 --- /dev/null +++ b/mail_activity_team/readme/USAGE.rst @@ -0,0 +1,17 @@ +To set up new teams: + +#. Go to *Settings / Activate developer mode* +#. Go to *Settings / Technical / Email / Activity Teams* +#. Create a new Team and assign (optionally) the models in which it will + be used, and the members of the team. + +You can also assign a user to Activity teams going to +*Settings / Users & Companies / Users*, and in the *Preferences* tab, field +Activity Teams. + +When you create a new activity the application will propose the user's +assigned team. + +You can report on the activities assigned to a team going to +*Dashboards / Activities*, and then filter by a specific team or group by +teams. diff --git a/mail_activity_team/security/ir.model.access.csv b/mail_activity_team/security/ir.model.access.csv new file mode 100644 index 0000000..0a9918d --- /dev/null +++ b/mail_activity_team/security/ir.model.access.csv @@ -0,0 +1,4 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +access_mail_activity_team_all,mail.activity.team.all,model_mail_activity_team,,1,0,0,0 +access_mail_activity_team_user,mail.activity.team.user,model_mail_activity_team,base.group_user,1,1,0,0 +access_mail_activity_team_system_user,mail.activity.team.system.user,model_mail_activity_team,base.group_system,1,1,1,1 diff --git a/mail_activity_team/security/mail_activity_team_security.xml b/mail_activity_team/security/mail_activity_team_security.xml new file mode 100644 index 0000000..638eb3d --- /dev/null +++ b/mail_activity_team/security/mail_activity_team_security.xml @@ -0,0 +1,17 @@ + + + + + mail.activity: user: my team + + ["|", ('team_id', 'in', user.activity_team_ids.ids), "&", ('team_id', '=', False), ('user_id', '=', user.id)] + + + + + + + + diff --git a/mail_activity_team/static/description/icon.png b/mail_activity_team/static/description/icon.png new file mode 100644 index 0000000..3a0328b Binary files /dev/null and b/mail_activity_team/static/description/icon.png differ diff --git a/mail_activity_team/static/description/index.html b/mail_activity_team/static/description/index.html new file mode 100644 index 0000000..52643f7 --- /dev/null +++ b/mail_activity_team/static/description/index.html @@ -0,0 +1,454 @@ + + + + + + +Mail Activity Team + + + +
+

Mail Activity Team

+ + +

Alpha License: AGPL-3 OCA/social Translate me on Weblate Try me on Runbot

+

This module adds the possibility to assign teams to activities.

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Usage

+

To set up new teams:

+
    +
  1. Go to Settings / Activate developer mode
    2. +
  2. Go to Settings / Technical / Email / Activity Teams
    3. +
  3. Create a new Team and assign (optionally) the models in which it will +be used, and the members of the team.
    4. +
+

You can also assign a user to Activity teams going to +Settings / Users & Companies / Users, and in the Preferences tab, field +Activity Teams.

+

When you create a new activity the application will propose the user’s +assigned team.

+

You can report on the activities assigned to a team going to +Dashboards / Activities, and then filter by a specific team or group by +teams.

+
+
+

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 smashing it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Eficent
    • +
  • Sodexis
    • +
+
+
+

Contributors

+ +
+
+

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.

+

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

+

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

+
+
+
+ + diff --git a/mail_activity_team/static/src/js/systray.esm.js b/mail_activity_team/static/src/js/systray.esm.js new file mode 100644 index 0000000..ea10bf8 --- /dev/null +++ b/mail_activity_team/static/src/js/systray.esm.js @@ -0,0 +1,94 @@ +/** @odoo-module **/ +import ActivityMenu from "@mail/js/systray/systray_activity_menu"; +import {session} from "@web/session"; + +ActivityMenu.include({ + events: _.extend({}, ActivityMenu.prototype.events, { + "click .o_filter_button": "_onClickFilterButton", + }), + start: function () { + this._super.apply(this, arguments); + this.$filter_buttons = this.$(".o_filter_button"); + this.$my_activities = this.$filter_buttons.first(); + this.filter = "my"; + this.user_context = session.user_context; + this.user_context = _.extend({}, session.user_context, { + team_activities: false, + }); + }, + + _updateCounter: function () { + this._super.apply(this, arguments); + this.$(".o_notification_counter").text(this.activityCounter); + }, + + _onClickFilterButton: function (event) { + var self = this; + event.stopPropagation(); + self.$filter_buttons.removeClass("active"); + var $target = $(event.currentTarget); + $target.addClass("active"); + self.filter = $target.data("filter"); + + self.user_context = _.extend({}, session.user_context, { + team_activities: self.filter === "team", + }); + + self._updateActivityPreview(); + }, + _onActivityFilterClick: function (event) { + if (this.filter === "my") { + this._super.apply(this, arguments); + } + if (this.filter === "team") { + var data = _.extend( + {}, + $(event.currentTarget).data(), + $(event.target).data() + ); + var context = {}; + context.team_activities = 1; + if (data.filter === "my") { + context.search_default_activities_overdue = 1; + context.search_default_activities_today = 1; + } else { + context["search_default_activities_" + data.filter] = 1; + } + this.do_action({ + type: "ir.actions.act_window", + name: data.model_name, + res_model: data.res_model, + views: [ + [false, "kanban"], + [false, "form"], + ], + search_view_id: [false], + domain: [["activity_team_user_ids", "in", session.uid]], + context: context, + }); + } + }, + _getActivityData: function () { + var self = this; + + return self + ._rpc({ + model: "res.users", + method: "systray_get_activities", + args: [], + kwargs: {context: self.user_context}, + }) + .then(function (data) { + self._activities = data; + self.activityCounter = _.reduce( + data, + function (total_count, p_data) { + return total_count + p_data.total_count || 0; + }, + 0 + ); + self.$(".o_notification_counter").text(self.activityCounter); + self.$el.toggleClass("o_no_notification", !self.activityCounter); + }); + }, +}); diff --git a/mail_activity_team/static/src/xml/systray.xml b/mail_activity_team/static/src/xml/systray.xml new file mode 100644 index 0000000..dadf02c --- /dev/null +++ b/mail_activity_team/static/src/xml/systray.xml @@ -0,0 +1,25 @@ + + + + + +
+
+ + +
+
+ + + + diff --git a/mail_activity_team/tests/__init__.py b/mail_activity_team/tests/__init__.py new file mode 100644 index 0000000..f4a7f59 --- /dev/null +++ b/mail_activity_team/tests/__init__.py @@ -0,0 +1 @@ +from . import test_mail_activity_team diff --git a/mail_activity_team/tests/test_mail_activity_team.py b/mail_activity_team/tests/test_mail_activity_team.py new file mode 100644 index 0000000..f458323 --- /dev/null +++ b/mail_activity_team/tests/test_mail_activity_team.py @@ -0,0 +1,181 @@ +# Copyright 2018-22 ForgeFlow Business and IT Consulting Services, S.L. +# 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 TestMailActivityTeam(TransactionCase): + def setUp(self): + super(TestMailActivityTeam, self).setUp() + + self.env["mail.activity.team"].search([]).unlink() + + self.employee = self.env["res.users"].create( + { + "company_id": self.env.ref("base.main_company").id, + "name": "Employee", + "login": "csu", + "email": "crmuser@yourcompany.com", + "groups_id": [ + ( + 6, + 0, + [ + self.env.ref("base.group_user").id, + self.env.ref("base.group_partner_manager").id, + ], + ) + ], + } + ) + + self.employee2 = self.env["res.users"].create( + { + "company_id": self.env.ref("base.main_company").id, + "name": "Employee 2", + "login": "csu2", + "email": "crmuser2@yourcompany.com", + "groups_id": [(6, 0, [self.env.ref("base.group_user").id])], + } + ) + + self.partner_ir_model = self.env["ir.model"]._get("res.partner") + + activity_type_model = self.env["mail.activity.type"] + self.activity1 = activity_type_model.create( + { + "name": "Initial Contact", + "delay_count": 5, + "delay_unit": "days", + "summary": "ACT 1 : Presentation, barbecue, ... ", + "res_model": self.partner_ir_model.model, + } + ) + self.activity2 = activity_type_model.create( + { + "name": "Call for Demo", + "delay_count": 6, + "delay_unit": "days", + "summary": "ACT 2 : I want to show you my ERP !", + "res_model": self.partner_ir_model.model, + } + ) + + self.partner_client = self.env.ref("base.res_partner_1") + + self.act1 = ( + self.env["mail.activity"] + .with_user(self.employee) + .create( + { + "activity_type_id": self.activity1.id, + "note": "Partner activity 1.", + "res_id": self.partner_client.id, + "res_model_id": self.partner_ir_model.id, + "user_id": self.employee.id, + } + ) + ) + + self.team1 = ( + self.env["mail.activity.team"] + .sudo() + .create( + { + "name": "Team 1", + "res_model_ids": [(6, 0, [self.partner_ir_model.id])], + "member_ids": [(6, 0, [self.employee.id])], + } + ) + ) + + self.team2 = ( + self.env["mail.activity.team"] + .sudo() + .create( + { + "name": "Team 2", + "res_model_ids": [(6, 0, [self.partner_ir_model.id])], + "member_ids": [(6, 0, [self.employee.id, self.employee2.id])], + } + ) + ) + + self.act2 = ( + self.env["mail.activity"] + .with_user(self.employee) + .create( + { + "activity_type_id": self.activity2.id, + "note": "Partner activity 2.", + "res_id": self.partner_client.id, + "res_model_id": self.partner_ir_model.id, + "user_id": self.employee.id, + } + ) + ) + + self.employee3 = self.env["res.users"].create( + { + "company_id": self.env.ref("base.main_company").id, + "name": "Employee 3", + "login": "csu3", + "email": "crmuser3@yourcompany.com", + "groups_id": [(6, 0, [self.env.ref("base.group_user").id])], + } + ) + + def test_team_and_user_onchange(self): + with self.assertRaises(ValidationError): + self.team1.member_ids = [(3, self.employee.id)] + self.act2.team_id = self.team1 + self.act2.user_id = self.employee + + def test_missing_activities(self): + self.assertFalse(self.act1.team_id, "Error: Activity 1 should not have a team.") + self.assertEqual(self.team1.count_missing_activities, 1) + self.team1.assign_team_to_unassigned_activities() + self.team1._compute_missing_activities() + self.assertEqual(self.team1.count_missing_activities, 0) + self.assertEqual(self.act1.team_id, self.team1) + + def test_leader_onchange(self): + self.team2.user_id = self.employee3 + self.team2._onchange_user_id() + self.assertTrue(self.employee3 in self.team2.member_ids) + + def test_activity_onchanges(self): + self.assertEqual( + self.act2.team_id, self.team1, "Error: Activity 2 should have Team 1." + ) + self.act2._onchange_team_id() + self.assertEqual(self.act2.user_id, self.employee) + self.act2.team_id = self.team2 + self.act2._onchange_team_id() + self.assertEqual(self.act2.user_id, self.employee) + self.act2.user_id = self.employee2 + self.act2._onchange_user_id() + self.assertEqual(self.act2.team_id, self.team2) + with self.assertRaises(ValidationError): + self.act2.write({"user_id": self.employee2.id, "team_id": self.team1.id}) + self.team1.user_id = False + self.act2.user_id = False + self.act2._onchange_user_id() + self.team2.member_ids = [(4, self.employee3.id)] + self.act2.team_id = self.team1 + self.act2.team_id = False + self.act2.user_id = self.employee3 + self.act2._onchange_user_id() + self.act2.team_id = self.team2 + self.team2.member_ids = [(3, self.act2.user_id.id)] + self.act2._onchange_team_id() + + def test_schedule_activity(self): + """Correctly assign teams to auto scheduled activities. Those won't + trigger onchanges and could raise constraints and team missmatches""" + partner_record = self.employee.partner_id.with_user(self.employee.id) + activity = partner_record.activity_schedule( + user_id=self.employee2.id, + activity_type_id=self.env.ref("mail.mail_activity_data_call").id, + ) + self.assertEqual(activity.team_id, self.team2) diff --git a/mail_activity_team/views/mail_activity_team_views.xml b/mail_activity_team/views/mail_activity_team_views.xml new file mode 100644 index 0000000..bdedf23 --- /dev/null +++ b/mail_activity_team/views/mail_activity_team_views.xml @@ -0,0 +1,112 @@ + + + + + + + mail.activity.team.view.form + mail.activity.team + +
+
+ +
+ +
+ +
+ + + + + + + + + + + + + + + +
+ + + + + + + mail.activity.team.view.tree + mail.activity.team + + + + + + + + + + + + mail.activity.team.view.search + mail.activity.team + + + + + + + + + + + + + Activity Teams + mail.activity.team + tree,form + [] + {} + + + + + + + + diff --git a/mail_activity_team/views/mail_activity_views.xml b/mail_activity_team/views/mail_activity_views.xml new file mode 100644 index 0000000..2c0be0c --- /dev/null +++ b/mail_activity_team/views/mail_activity_views.xml @@ -0,0 +1,80 @@ + + + + + mail.activity.view.form.popup + mail.activity + + + + + + + + + + mail.activity.view.tree + mail.activity + + + + + + + + + + mail.activity.view.form + mail.activity + + + + + + + + + + mail.activity.boards.view.kanban + mail.activity + + + + + + +
+
+ Team: +
+ + + + + + + mail.activity.boards.view.search + mail.activity + + + + + + + + + + + + + + + + diff --git a/mail_activity_team/views/res_users_views.xml b/mail_activity_team/views/res_users_views.xml new file mode 100644 index 0000000..544a5a9 --- /dev/null +++ b/mail_activity_team/views/res_users_views.xml @@ -0,0 +1,16 @@ + + + + + res.users.form.activity.team + res.users + + + + + + + + + + diff --git a/setup/mail_activity_team/odoo/addons/mail_activity_team b/setup/mail_activity_team/odoo/addons/mail_activity_team new file mode 120000 index 0000000..5c6ad07 --- /dev/null +++ b/setup/mail_activity_team/odoo/addons/mail_activity_team @@ -0,0 +1 @@ +../../../../mail_activity_team \ No newline at end of file diff --git a/setup/mail_activity_team/setup.py b/setup/mail_activity_team/setup.py new file mode 100644 index 0000000..28c57bb --- /dev/null +++ b/setup/mail_activity_team/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)