From 15d5aa4c0c8843feda8df5f329dc0392c868fdda Mon Sep 17 00:00:00 2001 From: Pablo Paez Date: Mon, 10 Jan 2022 14:52:32 -0300 Subject: [PATCH 1/3] [ADD] mail_partner_forwarding: New module --- mail_partner_forwarding/README.rst | 75 +++++++++++++++++++ mail_partner_forwarding/__init__.py | 1 + mail_partner_forwarding/__manifest__.py | 17 +++++ mail_partner_forwarding/models/__init__.py | 3 + mail_partner_forwarding/models/mail_thread.py | 43 +++++++++++ mail_partner_forwarding/models/res_partner.py | 12 +++ mail_partner_forwarding/models/res_user.py | 16 ++++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 1 + mail_partner_forwarding/readme/HISTORY.rst | 4 + mail_partner_forwarding/readme/USAGE.rst | 5 ++ mail_partner_forwarding/tests/__init__.py | 1 + .../tests/models/__init__.py | 1 + .../tests/models/fake_order.py | 13 ++++ .../tests/test_mail_forwarding.py | 46 ++++++++++++ .../views/res_partner_views.xml | 16 ++++ .../views/res_user_views.xml | 28 +++++++ .../odoo/addons/mail_partner_forwarding | 1 + setup/mail_partner_forwarding/setup.py | 6 ++ 19 files changed, 290 insertions(+) create mode 100644 mail_partner_forwarding/README.rst create mode 100644 mail_partner_forwarding/__init__.py create mode 100644 mail_partner_forwarding/__manifest__.py create mode 100644 mail_partner_forwarding/models/__init__.py create mode 100644 mail_partner_forwarding/models/mail_thread.py create mode 100644 mail_partner_forwarding/models/res_partner.py create mode 100644 mail_partner_forwarding/models/res_user.py create mode 100644 mail_partner_forwarding/readme/CONTRIBUTORS.rst create mode 100644 mail_partner_forwarding/readme/DESCRIPTION.rst create mode 100644 mail_partner_forwarding/readme/HISTORY.rst create mode 100644 mail_partner_forwarding/readme/USAGE.rst create mode 100644 mail_partner_forwarding/tests/__init__.py create mode 100644 mail_partner_forwarding/tests/models/__init__.py create mode 100644 mail_partner_forwarding/tests/models/fake_order.py create mode 100644 mail_partner_forwarding/tests/test_mail_forwarding.py create mode 100644 mail_partner_forwarding/views/res_partner_views.xml create mode 100644 mail_partner_forwarding/views/res_user_views.xml create mode 120000 setup/mail_partner_forwarding/odoo/addons/mail_partner_forwarding create mode 100644 setup/mail_partner_forwarding/setup.py diff --git a/mail_partner_forwarding/README.rst b/mail_partner_forwarding/README.rst new file mode 100644 index 0000000000..6e8ebd11c9 --- /dev/null +++ b/mail_partner_forwarding/README.rst @@ -0,0 +1,75 @@ +======================= +Partner Mail Forwarding +======================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png + :target: https://odoo-community.org/page/development-status + :alt: Production/Stable +.. |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/13.0/mail_debrand + :alt: OCA/social +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/social-13-0/social-13-0-mail_debrand + :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/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to select a related partner (called "Forwarding Partner") in each partner in order to send all the notifications + to the Forwarding Partner. + + +**Table of contents** + +.. contents:: + :local: + +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 +~~~~~~~ + +* AdHoc SA + +Contributors +~~~~~~~~~~~~ + +* Nicolás Mac Rouillon + +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_partner_forwarding/__init__.py b/mail_partner_forwarding/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/mail_partner_forwarding/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/mail_partner_forwarding/__manifest__.py b/mail_partner_forwarding/__manifest__.py new file mode 100644 index 0000000000..4f1a52c03f --- /dev/null +++ b/mail_partner_forwarding/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2022 AdHoc SA - Pablo Paez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + "name": "Partner Mail Forwarding", + "summary": "Forwarding notifications for partners", + "version": "13.0.1.0.0", + "category": "Social Network", + "website": "https://github.com/OCA/social", + "author": "ADHOC SA, Odoo Community Association (OCA)", + "license": "AGPL-3", + "installable": True, + "depends": ["mail"], + "data": ["views/res_user_views.xml", "views/res_partner_views.xml"], + "development_status": "Production/Stable", + "maintainers": [], +} diff --git a/mail_partner_forwarding/models/__init__.py b/mail_partner_forwarding/models/__init__.py new file mode 100644 index 0000000000..8df12c7a1c --- /dev/null +++ b/mail_partner_forwarding/models/__init__.py @@ -0,0 +1,3 @@ +from . import res_partner +from . import res_user +from . import mail_thread diff --git a/mail_partner_forwarding/models/mail_thread.py b/mail_partner_forwarding/models/mail_thread.py new file mode 100644 index 0000000000..e3bd699a08 --- /dev/null +++ b/mail_partner_forwarding/models/mail_thread.py @@ -0,0 +1,43 @@ +from odoo import models + + +class MailThread(models.AbstractModel): + _inherit = "mail.thread" + + def _notify_compute_recipients(self, message, msg_vals): + """ Inherit this method to add in the list of partners to be notify + the forwarding_partner_id of any partners in the list """ + recipient_data = super()._notify_compute_recipients(message, msg_vals) + if not recipient_data.get("partners", False): + return recipient_data + partner_dict = {x.get("id"): x for x in recipient_data.get("partners")} + forwarded_partner_ids = [] + # for each partner being notified we check if it has a + # forwarding_partner_id configured that is not being notified yet + for partner in ( + self.env["res.partner"] + .sudo() + .with_context(prefetch_fields=False) + .browse(partner_dict.keys()) + ): + if ( + partner.forwarding_partner_id + and partner.forwarding_partner_id.id not in partner_dict.keys() + and partner.forwarding_partner_id.id not in forwarded_partner_ids + ): + forwarded_partner_ids.append(partner.forwarding_partner_id.id) + data = partner_dict[partner.id].copy() + notif = ( + partner.forwarding_partner_id.user_ids + and partner.forwarding_partner_id.user_ids[0].notification_type + or "email" + ) + data.update( + { + "id": partner.forwarding_partner_id.id, + "share": partner.partner_share, + "notif": notif, + } + ) + recipient_data["partners"].append(data) + return recipient_data diff --git a/mail_partner_forwarding/models/res_partner.py b/mail_partner_forwarding/models/res_partner.py new file mode 100644 index 0000000000..dd8881fd1b --- /dev/null +++ b/mail_partner_forwarding/models/res_partner.py @@ -0,0 +1,12 @@ +from odoo import fields, models + + +class ResPartner(models.Model): + _inherit = "res.partner" + + forwarding_partner_id = fields.Many2one( + "res.partner", + string="Forwarding Partner", + help="Messages will be forwarded only for partners that are followers but no " + "partners being notify because they belong to channel that is following the thread", + ) diff --git a/mail_partner_forwarding/models/res_user.py b/mail_partner_forwarding/models/res_user.py new file mode 100644 index 0000000000..8ba5bb7ee8 --- /dev/null +++ b/mail_partner_forwarding/models/res_user.py @@ -0,0 +1,16 @@ +from odoo import fields, models + + +class ResUsers(models.Model): + _inherit = "res.users" + + forwarding_partner_id = fields.Many2one( + related="partner_id.forwarding_partner_id", readonly=False + ) + + def __init__(self, pool, cr): + super().__init__(pool, cr) + self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS) + self.SELF_WRITEABLE_FIELDS.append("forwarding_partner_id") + self.SELF_READABLE_FIELDS = list(self.SELF_READABLE_FIELDS) + self.SELF_READABLE_FIELDS.append("forwarding_partner_id") diff --git a/mail_partner_forwarding/readme/CONTRIBUTORS.rst b/mail_partner_forwarding/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..e3895da9dc --- /dev/null +++ b/mail_partner_forwarding/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Nicolás Mac Rouillon diff --git a/mail_partner_forwarding/readme/DESCRIPTION.rst b/mail_partner_forwarding/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..9938e47b81 --- /dev/null +++ b/mail_partner_forwarding/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows to select a related user (called "Forwarding partner") in each partner in order to send all the notifications to the Forwarding partner. diff --git a/mail_partner_forwarding/readme/HISTORY.rst b/mail_partner_forwarding/readme/HISTORY.rst new file mode 100644 index 0000000000..edcc2dae47 --- /dev/null +++ b/mail_partner_forwarding/readme/HISTORY.rst @@ -0,0 +1,4 @@ +13.0.1.0.0 (2022-01-03) +~~~~~~~~~~~~~~~~~~~~~~~ + +* [NEW] Module in v13. diff --git a/mail_partner_forwarding/readme/USAGE.rst b/mail_partner_forwarding/readme/USAGE.rst new file mode 100644 index 0000000000..031e5a1e40 --- /dev/null +++ b/mail_partner_forwarding/readme/USAGE.rst @@ -0,0 +1,5 @@ +To use this module, you need to: + +* Install it. +* Set a Forwarding partner in your partner. +* Your Forwarding partner also will be notify of your notifications diff --git a/mail_partner_forwarding/tests/__init__.py b/mail_partner_forwarding/tests/__init__.py new file mode 100644 index 0000000000..99035941c3 --- /dev/null +++ b/mail_partner_forwarding/tests/__init__.py @@ -0,0 +1 @@ +from . import test_mail_forwarding diff --git a/mail_partner_forwarding/tests/models/__init__.py b/mail_partner_forwarding/tests/models/__init__.py new file mode 100644 index 0000000000..4327a4b6eb --- /dev/null +++ b/mail_partner_forwarding/tests/models/__init__.py @@ -0,0 +1 @@ +from . import fake_order diff --git a/mail_partner_forwarding/tests/models/fake_order.py b/mail_partner_forwarding/tests/models/fake_order.py new file mode 100644 index 0000000000..b14a40f17e --- /dev/null +++ b/mail_partner_forwarding/tests/models/fake_order.py @@ -0,0 +1,13 @@ +# Copyright 2021 Camptocamp (http://www.camptocamp.com). +# @author Iván Todorovich +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class FakeOrder(models.Model): + _name = "fake.order" + _inherit = "mail.thread" + _description = "Fake sale.order like model" + + partner_id = fields.Many2one("res.partner", required=True) diff --git a/mail_partner_forwarding/tests/test_mail_forwarding.py b/mail_partner_forwarding/tests/test_mail_forwarding.py new file mode 100644 index 0000000000..7556acd4fa --- /dev/null +++ b/mail_partner_forwarding/tests/test_mail_forwarding.py @@ -0,0 +1,46 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo_test_helper import FakeModelLoader + +from odoo import _ +from odoo.tests.common import SavepointCase, tagged + + +@tagged("post_install", "-at_install") +class TestMailForwarding(SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + # Setup env + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + # Load fake order model + cls.loader = FakeModelLoader(cls.env, cls.__module__) + cls.loader.backup_registry() + from .models.fake_order import FakeOrder + + cls.loader.update_registry((FakeOrder,)) + cls.fake_order_model = cls.env["ir.model"].search( + [("model", "=", "fake.order")] + ) + # Partner To forward + cls.partner_1 = cls.env.ref("base.user_demo").partner_id + cls.partner_2 = cls.env.ref("base.user_admin").partner_id + + # Configurate in the user setting the user to be forwarding + cls.partner_2.forwarding_partner_id = cls.partner_1 + # Empty fake.order + cls.order = cls.env["fake.order"].create({"partner_id": cls.partner_2.id}) + + @classmethod + def tearDownClass(cls): + cls.loader.restore_registry() + return super().tearDownClass() + + def test_message_post_forwarding(self): + """Test forwarding when send a message for the user""" + self.order.message_post( + body=_("Test"), + message_type="comment", + subtype="mail.mt_comment", + partner_ids=[self.partner_2.id], + ) diff --git a/mail_partner_forwarding/views/res_partner_views.xml b/mail_partner_forwarding/views/res_partner_views.xml new file mode 100644 index 0000000000..3fd5bdae4e --- /dev/null +++ b/mail_partner_forwarding/views/res_partner_views.xml @@ -0,0 +1,16 @@ + + + + + res.partner.form.forwarding + res.partner + + + + + + + + + diff --git a/mail_partner_forwarding/views/res_user_views.xml b/mail_partner_forwarding/views/res_user_views.xml new file mode 100644 index 0000000000..a131bda85f --- /dev/null +++ b/mail_partner_forwarding/views/res_user_views.xml @@ -0,0 +1,28 @@ + + + + + res.users.form.user.forwarding + res.users + + + + + + + + + res.users.form.user.forwarding.preferences + res.users + + + + + + + + + diff --git a/setup/mail_partner_forwarding/odoo/addons/mail_partner_forwarding b/setup/mail_partner_forwarding/odoo/addons/mail_partner_forwarding new file mode 120000 index 0000000000..abd3545ed6 --- /dev/null +++ b/setup/mail_partner_forwarding/odoo/addons/mail_partner_forwarding @@ -0,0 +1 @@ +../../../../mail_partner_forwarding \ No newline at end of file diff --git a/setup/mail_partner_forwarding/setup.py b/setup/mail_partner_forwarding/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/mail_partner_forwarding/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 547008bd412f442a6976f960c4bd1120d6e8473b Mon Sep 17 00:00:00 2001 From: Joel Zilli Date: Wed, 15 Jun 2022 10:59:53 -0300 Subject: [PATCH 2/3] [IMP] mail_partner_forwarding: pre-commit execution --- mail_partner_forwarding/models/mail_thread.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail_partner_forwarding/models/mail_thread.py b/mail_partner_forwarding/models/mail_thread.py index e3bd699a08..f5462692c4 100644 --- a/mail_partner_forwarding/models/mail_thread.py +++ b/mail_partner_forwarding/models/mail_thread.py @@ -5,8 +5,8 @@ class MailThread(models.AbstractModel): _inherit = "mail.thread" def _notify_compute_recipients(self, message, msg_vals): - """ Inherit this method to add in the list of partners to be notify - the forwarding_partner_id of any partners in the list """ + """Inherit this method to add in the list of partners to be notify + the forwarding_partner_id of any partners in the list""" recipient_data = super()._notify_compute_recipients(message, msg_vals) if not recipient_data.get("partners", False): return recipient_data From f5d871c8bf06999e1e62f188370fe3d287e465cf Mon Sep 17 00:00:00 2001 From: Joel Zilli Date: Wed, 15 Jun 2022 10:59:53 -0300 Subject: [PATCH 3/3] [MIG] mail_partner_forwarding: Migration to 15.0 --- mail_partner_forwarding/README.rst | 2 +- mail_partner_forwarding/__manifest__.py | 2 +- mail_partner_forwarding/models/mail_thread.py | 6 +++--- mail_partner_forwarding/models/res_user.py | 13 +++++++------ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/mail_partner_forwarding/README.rst b/mail_partner_forwarding/README.rst index 6e8ebd11c9..ab7a45c5aa 100644 --- a/mail_partner_forwarding/README.rst +++ b/mail_partner_forwarding/README.rst @@ -23,7 +23,7 @@ Partner Mail Forwarding :target: https://runbot.odoo-community.org/runbot/205/13.0 :alt: Try me on Runbot -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module allows to select a related partner (called "Forwarding Partner") in each partner in order to send all the notifications to the Forwarding Partner. diff --git a/mail_partner_forwarding/__manifest__.py b/mail_partner_forwarding/__manifest__.py index 4f1a52c03f..b2e997097b 100644 --- a/mail_partner_forwarding/__manifest__.py +++ b/mail_partner_forwarding/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Partner Mail Forwarding", "summary": "Forwarding notifications for partners", - "version": "13.0.1.0.0", + "version": "15.0.1.0.0", "category": "Social Network", "website": "https://github.com/OCA/social", "author": "ADHOC SA, Odoo Community Association (OCA)", diff --git a/mail_partner_forwarding/models/mail_thread.py b/mail_partner_forwarding/models/mail_thread.py index f5462692c4..69628e0af6 100644 --- a/mail_partner_forwarding/models/mail_thread.py +++ b/mail_partner_forwarding/models/mail_thread.py @@ -8,9 +8,9 @@ def _notify_compute_recipients(self, message, msg_vals): """Inherit this method to add in the list of partners to be notify the forwarding_partner_id of any partners in the list""" recipient_data = super()._notify_compute_recipients(message, msg_vals) - if not recipient_data.get("partners", False): + if not recipient_data: return recipient_data - partner_dict = {x.get("id"): x for x in recipient_data.get("partners")} + partner_dict = {x.get("id"): x for x in recipient_data} forwarded_partner_ids = [] # for each partner being notified we check if it has a # forwarding_partner_id configured that is not being notified yet @@ -39,5 +39,5 @@ def _notify_compute_recipients(self, message, msg_vals): "notif": notif, } ) - recipient_data["partners"].append(data) + recipient_data.append(data) return recipient_data diff --git a/mail_partner_forwarding/models/res_user.py b/mail_partner_forwarding/models/res_user.py index 8ba5bb7ee8..2472b28402 100644 --- a/mail_partner_forwarding/models/res_user.py +++ b/mail_partner_forwarding/models/res_user.py @@ -8,9 +8,10 @@ class ResUsers(models.Model): related="partner_id.forwarding_partner_id", readonly=False ) - def __init__(self, pool, cr): - super().__init__(pool, cr) - self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS) - self.SELF_WRITEABLE_FIELDS.append("forwarding_partner_id") - self.SELF_READABLE_FIELDS = list(self.SELF_READABLE_FIELDS) - self.SELF_READABLE_FIELDS.append("forwarding_partner_id") + @property + def SELF_WRITEABLE_FIELDS(self): + return super().SELF_WRITEABLE_FIELDS + ["forwarding_partner_id"] + + @property + def SELF_READABLE_FIELDS(self): + return super().SELF_READABLE_FIELDS + ["forwarding_partner_id"]