From fed0cb41ab85950c8e90055edf926d6f0b4ad5ce Mon Sep 17 00:00:00 2001 From: Kev-Roche Date: Wed, 22 Dec 2021 11:30:53 +0100 Subject: [PATCH 01/18] [ADD] mail_filter_adressee_by_contacts --- mail_filter_adressee_by_contact/__init__.py | 1 + .../__manifest__.py | 18 ++++ .../models/__init__.py | 1 + .../models/mail_compose_message.py | 87 +++++++++++++++++++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 6 ++ 6 files changed, 114 insertions(+) create mode 100644 mail_filter_adressee_by_contact/__init__.py create mode 100644 mail_filter_adressee_by_contact/__manifest__.py create mode 100644 mail_filter_adressee_by_contact/models/__init__.py create mode 100644 mail_filter_adressee_by_contact/models/mail_compose_message.py create mode 100644 mail_filter_adressee_by_contact/readme/CONTRIBUTORS.rst create mode 100644 mail_filter_adressee_by_contact/readme/DESCRIPTION.rst diff --git a/mail_filter_adressee_by_contact/__init__.py b/mail_filter_adressee_by_contact/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/mail_filter_adressee_by_contact/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/mail_filter_adressee_by_contact/__manifest__.py b/mail_filter_adressee_by_contact/__manifest__.py new file mode 100644 index 0000000000..760e4dca08 --- /dev/null +++ b/mail_filter_adressee_by_contact/__manifest__.py @@ -0,0 +1,18 @@ +# Copyright 2021 Akretion (https://www.akretion.com). +# @author Kévin Roche +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Mail filter adressee by partner contacts and users", + "summary": "Adresses filter by partner contacts and users", + "version": "14.0.1.0.0", + "category": "Social Network", + "website": "https://github.com/OCA/social", + "author": "Akretion, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": [ + "mail", + ], +} diff --git a/mail_filter_adressee_by_contact/models/__init__.py b/mail_filter_adressee_by_contact/models/__init__.py new file mode 100644 index 0000000000..b528d997d1 --- /dev/null +++ b/mail_filter_adressee_by_contact/models/__init__.py @@ -0,0 +1 @@ +from . import mail_compose_message diff --git a/mail_filter_adressee_by_contact/models/mail_compose_message.py b/mail_filter_adressee_by_contact/models/mail_compose_message.py new file mode 100644 index 0000000000..5ba08a7995 --- /dev/null +++ b/mail_filter_adressee_by_contact/models/mail_compose_message.py @@ -0,0 +1,87 @@ +# Copyright (C) 2021 Akretion (). +# @author Kévin Roche +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + +FILTERED_MODEL = [ + "account.move", + "sale.order", + "purchase.order", + "stock.picking", +] + + +class MailComposer(models.TransientModel): + _inherit = "mail.compose.message" + + partner_ids = fields.Many2many( + "res.partner", + "mail_compose_message_res_partner_rel", + "wizard_id", + "partner_id", + "Additional Contacts", + domain=lambda self: self._get_partner_ids_domain(), + ) + + def _get_partner_ids_domain(self): + domain = [("type", "!=", "private")] + model = self._context.get("active_model") + if model in FILTERED_MODEL: + domain.insert(0, "&") + records = self.env[self._context["active_model"]].browse( + self._context.get("active_ids") + ) + partners = getattr(self, f"_get_domain_for_{model.replace('.', '_')}")( + records + ) + domain += partners + return domain + + def _get_domain_for_sale_order(self, records): + return [ + "|", + "|", + "|", + "|", + "|", + ("user_ids", "!=", False), + ("id", "child_of", records.partner_id.ids), + ("id", "child_of", records.partner_invoice_id.ids), + ("id", "child_of", records.partner_shipping_id.ids), + ("id", "child_of", records.commercial_partner_id.ids), + ("id", "in", records.message_partner_ids.ids), + ] + + def _get_domain_for_account_move(self, records): + return [ + "|", + "|", + "|", + "|", + ("user_ids", "!=", False), + ("id", "child_of", records.partner_id.ids), + ("id", "child_of", records.commercial_partner_id.ids), + ("id", "child_of", records.partner_shipping_id.ids), + ("id", "in", records.message_partner_ids.ids), + ] + + def _get_domain_for_purchase_order(self, records): + return [ + "|", + "|", + "|", + ("user_ids", "!=", False), + ("id", "child_of", records.partner_id.ids), + ("id", "child_of", records.delivery_partner_id.ids), + ("id", "in", records.message_partner_ids.ids), + ] + + def _get_domain_for_stock_picking(self, records): + return [ + "|", + "|", + ("user_ids", "!=", False), + ("id", "child_of", records.partner_id.ids), + ("id", "in", records.message_partner_ids.ids), + ] diff --git a/mail_filter_adressee_by_contact/readme/CONTRIBUTORS.rst b/mail_filter_adressee_by_contact/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..45780ad589 --- /dev/null +++ b/mail_filter_adressee_by_contact/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +Kévin Roche diff --git a/mail_filter_adressee_by_contact/readme/DESCRIPTION.rst b/mail_filter_adressee_by_contact/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..2a0a4a25b4 --- /dev/null +++ b/mail_filter_adressee_by_contact/readme/DESCRIPTION.rst @@ -0,0 +1,6 @@ +Filter adresses by partner contacts and users. +It will be applied on mails from the following models : +- account.move +- sale.order +- purchase.order +- stock.picking From cd69ae9a7423b20c75aedc721d02b20f8c890e6d Mon Sep 17 00:00:00 2001 From: Kev-Roche Date: Mon, 3 Jan 2022 22:13:43 +0100 Subject: [PATCH 02/18] [IMP] active / unactive mail adresses filter --- mail_filter_adressee_by_contact/__manifest__.py | 5 +++++ .../models/mail_compose_message.py | 16 ++++++---------- .../views/mail_compose_message_view.xml | 15 +++++++++++++++ .../views/mail_invoice_send_view.xml | 13 +++++++++++++ 4 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 mail_filter_adressee_by_contact/views/mail_compose_message_view.xml create mode 100644 mail_filter_adressee_by_contact/views/mail_invoice_send_view.xml diff --git a/mail_filter_adressee_by_contact/__manifest__.py b/mail_filter_adressee_by_contact/__manifest__.py index 760e4dca08..5870eb1ace 100644 --- a/mail_filter_adressee_by_contact/__manifest__.py +++ b/mail_filter_adressee_by_contact/__manifest__.py @@ -14,5 +14,10 @@ "installable": True, "depends": [ "mail", + "account", + ], + "data": [ + "views/mail_compose_message_view.xml", + "views/mail_invoice_send_view.xml", ], } diff --git a/mail_filter_adressee_by_contact/models/mail_compose_message.py b/mail_filter_adressee_by_contact/models/mail_compose_message.py index 5ba08a7995..5946ca574a 100644 --- a/mail_filter_adressee_by_contact/models/mail_compose_message.py +++ b/mail_filter_adressee_by_contact/models/mail_compose_message.py @@ -2,7 +2,7 @@ # @author Kévin Roche # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import fields, models +from odoo import api, fields, models FILTERED_MODEL = [ "account.move", @@ -21,13 +21,15 @@ class MailComposer(models.TransientModel): "wizard_id", "partner_id", "Additional Contacts", - domain=lambda self: self._get_partner_ids_domain(), ) + apply_filter = fields.Boolean(default=True, string="Filtering relevant adressees") + + @api.onchange("apply_filter") def _get_partner_ids_domain(self): domain = [("type", "!=", "private")] model = self._context.get("active_model") - if model in FILTERED_MODEL: + if model in FILTERED_MODEL and self.apply_filter: domain.insert(0, "&") records = self.env[self._context["active_model"]].browse( self._context.get("active_ids") @@ -36,7 +38,7 @@ def _get_partner_ids_domain(self): records ) domain += partners - return domain + return {"domain": {"partner_ids": domain}} def _get_domain_for_sale_order(self, records): return [ @@ -44,12 +46,10 @@ def _get_domain_for_sale_order(self, records): "|", "|", "|", - "|", ("user_ids", "!=", False), ("id", "child_of", records.partner_id.ids), ("id", "child_of", records.partner_invoice_id.ids), ("id", "child_of", records.partner_shipping_id.ids), - ("id", "child_of", records.commercial_partner_id.ids), ("id", "in", records.message_partner_ids.ids), ] @@ -58,22 +58,18 @@ def _get_domain_for_account_move(self, records): "|", "|", "|", - "|", ("user_ids", "!=", False), ("id", "child_of", records.partner_id.ids), - ("id", "child_of", records.commercial_partner_id.ids), ("id", "child_of", records.partner_shipping_id.ids), ("id", "in", records.message_partner_ids.ids), ] def _get_domain_for_purchase_order(self, records): return [ - "|", "|", "|", ("user_ids", "!=", False), ("id", "child_of", records.partner_id.ids), - ("id", "child_of", records.delivery_partner_id.ids), ("id", "in", records.message_partner_ids.ids), ] diff --git a/mail_filter_adressee_by_contact/views/mail_compose_message_view.xml b/mail_filter_adressee_by_contact/views/mail_compose_message_view.xml new file mode 100644 index 0000000000..5652f1112e --- /dev/null +++ b/mail_filter_adressee_by_contact/views/mail_compose_message_view.xml @@ -0,0 +1,15 @@ + + + + mail.compose.message.form + mail.compose.message + + + + + + + + diff --git a/mail_filter_adressee_by_contact/views/mail_invoice_send_view.xml b/mail_filter_adressee_by_contact/views/mail_invoice_send_view.xml new file mode 100644 index 0000000000..c3e8466565 --- /dev/null +++ b/mail_filter_adressee_by_contact/views/mail_invoice_send_view.xml @@ -0,0 +1,13 @@ + + + + Send Invoice + account.invoice.send + + + + + + + + From 0518dde4a44ae06777fa636c167f1ed748504148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20BEAU?= Date: Wed, 2 Feb 2022 11:35:56 +0100 Subject: [PATCH 03/18] [IMP] improve UI --- .../views/mail_compose_message_view.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mail_filter_adressee_by_contact/views/mail_compose_message_view.xml b/mail_filter_adressee_by_contact/views/mail_compose_message_view.xml index 5652f1112e..7fdc06a6f4 100644 --- a/mail_filter_adressee_by_contact/views/mail_compose_message_view.xml +++ b/mail_filter_adressee_by_contact/views/mail_compose_message_view.xml @@ -1,15 +1,16 @@ - mail.compose.message.form + mail.compose.message.form mail.compose.message - - - + +
+ + Filter Email +
+ From 03f419560564264208fa7a838c195dd4592a717c Mon Sep 17 00:00:00 2001 From: oca-travis Date: Sun, 13 Mar 2022 21:57:17 +0000 Subject: [PATCH 04/18] [UPD] Update mail_filter_adressee_by_contact.pot --- .../i18n/mail_filter_adressee_by_contact.pot | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 mail_filter_adressee_by_contact/i18n/mail_filter_adressee_by_contact.pot diff --git a/mail_filter_adressee_by_contact/i18n/mail_filter_adressee_by_contact.pot b/mail_filter_adressee_by_contact/i18n/mail_filter_adressee_by_contact.pot new file mode 100644 index 0000000000..60b7a0655b --- /dev/null +++ b/mail_filter_adressee_by_contact/i18n/mail_filter_adressee_by_contact.pot @@ -0,0 +1,53 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_filter_adressee_by_contact +# +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_filter_adressee_by_contact +#: model_terms:ir.ui.view,arch_db:mail_filter_adressee_by_contact.email_compose_message_wizard_inherit_form +msgid "Filter Email" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send__partner_ids +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_tour_upload_bill__partner_ids +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message__partner_ids +msgid "Additional Contacts" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message__display_name +msgid "Display Name" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model,name:mail_filter_adressee_by_contact.model_mail_compose_message +msgid "Email composition wizard" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send__apply_filter +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_tour_upload_bill__apply_filter +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message__apply_filter +msgid "Filtering relevant adressees" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message__id +msgid "ID" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message____last_update +msgid "Last Modified on" +msgstr "" From 78bd8560a8336ca1ecb9a1b3a2a85db97b4f19f3 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sun, 13 Mar 2022 22:06:26 +0000 Subject: [PATCH 05/18] [UPD] README.rst --- mail_filter_adressee_by_contact/README.rst | 78 ++++ .../static/description/index.html | 422 ++++++++++++++++++ 2 files changed, 500 insertions(+) create mode 100644 mail_filter_adressee_by_contact/README.rst create mode 100644 mail_filter_adressee_by_contact/static/description/index.html diff --git a/mail_filter_adressee_by_contact/README.rst b/mail_filter_adressee_by_contact/README.rst new file mode 100644 index 0000000000..d9d6029d42 --- /dev/null +++ b/mail_filter_adressee_by_contact/README.rst @@ -0,0 +1,78 @@ +================================================== +Mail filter adressee by partner contacts and users +================================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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%2Fsocial-lightgray.png?logo=github + :target: https://github.com/OCA/social/tree/14.0/mail_filter_adressee_by_contact + :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_filter_adressee_by_contact + :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| + +Filter adresses by partner contacts and users. +It will be applied on mails from the following models : +- account.move +- sale.order +- purchase.order +- stock.picking + +**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 +~~~~~~~ + +* Akretion + +Contributors +~~~~~~~~~~~~ + +Kévin Roche + +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_filter_adressee_by_contact/static/description/index.html b/mail_filter_adressee_by_contact/static/description/index.html new file mode 100644 index 0000000000..8ea6bac661 --- /dev/null +++ b/mail_filter_adressee_by_contact/static/description/index.html @@ -0,0 +1,422 @@ + + + + + + +Mail filter adressee by partner contacts and users + + + +
+

Mail filter adressee by partner contacts and users

+ + +

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

+

Filter adresses by partner contacts and users. +It will be applied on mails from the following models : +- account.move +- sale.order +- purchase.order +- stock.picking

+

Table of contents

+ +
+

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

+
    +
  • Akretion
    • +
+
+ +
+

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.

+
+
+
+ + From 6e6b66e74d17caa621172731f8647aa11451f50f Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sun, 13 Mar 2022 22:06:26 +0000 Subject: [PATCH 06/18] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 mail_filter_adressee_by_contact/static/description/icon.png diff --git a/mail_filter_adressee_by_contact/static/description/icon.png b/mail_filter_adressee_by_contact/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 From 81349eaa913d4959166fa66ffe62efd79ef6b8d9 Mon Sep 17 00:00:00 2001 From: Kev-Roche Date: Mon, 21 Mar 2022 16:04:56 +0100 Subject: [PATCH 07/18] [IMP] differenciate users and partners in mail filter --- .../__manifest__.py | 2 + .../models/__init__.py | 1 + .../models/account_invoice_send.py | 13 +++++ .../models/mail_compose_message.py | 58 +++++++++++-------- .../views/mail_compose_message_view.xml | 7 ++- .../views/mail_invoice_send_view.xml | 12 +++- 6 files changed, 63 insertions(+), 30 deletions(-) create mode 100644 mail_filter_adressee_by_contact/models/account_invoice_send.py diff --git a/mail_filter_adressee_by_contact/__manifest__.py b/mail_filter_adressee_by_contact/__manifest__.py index 5870eb1ace..f80715ec49 100644 --- a/mail_filter_adressee_by_contact/__manifest__.py +++ b/mail_filter_adressee_by_contact/__manifest__.py @@ -9,12 +9,14 @@ "category": "Social Network", "website": "https://github.com/OCA/social", "author": "Akretion, Odoo Community Association (OCA)", + "maintainers": ["Kev-Roche"], "license": "AGPL-3", "application": False, "installable": True, "depends": [ "mail", "account", + "sale", ], "data": [ "views/mail_compose_message_view.xml", diff --git a/mail_filter_adressee_by_contact/models/__init__.py b/mail_filter_adressee_by_contact/models/__init__.py index b528d997d1..a839657f8f 100644 --- a/mail_filter_adressee_by_contact/models/__init__.py +++ b/mail_filter_adressee_by_contact/models/__init__.py @@ -1 +1,2 @@ from . import mail_compose_message +from . import account_invoice_send diff --git a/mail_filter_adressee_by_contact/models/account_invoice_send.py b/mail_filter_adressee_by_contact/models/account_invoice_send.py new file mode 100644 index 0000000000..8691d1c12a --- /dev/null +++ b/mail_filter_adressee_by_contact/models/account_invoice_send.py @@ -0,0 +1,13 @@ +# Copyright (C) 2022 Akretion (). +# @author Kévin Roche +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, models + + +class AccountInvoiceSend(models.TransientModel): + _inherit = "account.invoice.send" + + @api.onchange("apply_filter") + def _onchange_apply_filter(self): + return self.composer_id.get_partner_ids_domain() diff --git a/mail_filter_adressee_by_contact/models/mail_compose_message.py b/mail_filter_adressee_by_contact/models/mail_compose_message.py index 5946ca574a..f1cd2c8e03 100644 --- a/mail_filter_adressee_by_contact/models/mail_compose_message.py +++ b/mail_filter_adressee_by_contact/models/mail_compose_message.py @@ -3,13 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import api, fields, models - -FILTERED_MODEL = [ - "account.move", - "sale.order", - "purchase.order", - "stock.picking", -] +from odoo.osv import expression class MailComposer(models.TransientModel): @@ -23,21 +17,43 @@ class MailComposer(models.TransientModel): "Additional Contacts", ) - apply_filter = fields.Boolean(default=True, string="Filtering relevant adressees") + apply_filter = fields.Selection( + ( + [ + ("contacts", "Contacts"), + ("users", "Users"), + ("all", "All"), + ] + ), + string="Filtering relevant adressees", + default="contacts", + required=True, + ) @api.onchange("apply_filter") - def _get_partner_ids_domain(self): + def get_partner_ids_domain(self): domain = [("type", "!=", "private")] model = self._context.get("active_model") - if model in FILTERED_MODEL and self.apply_filter: - domain.insert(0, "&") - records = self.env[self._context["active_model"]].browse( - self._context.get("active_ids") + if model and self.apply_filter == "contacts": + method_name = f"_get_domain_for_{model.replace('.', '_')}" + if hasattr(self, method_name): + records = self.env[self._context["active_model"]].browse( + self._context.get("active_ids") + ) + partners = getattr(self, method_name)(records) + domain = expression.AND( + [ + domain, + partners, + ] + ) + if self.apply_filter == "users": + domain = expression.AND( + [ + domain, + [("user_ids", "!=", False)], + ] ) - partners = getattr(self, f"_get_domain_for_{model.replace('.', '_')}")( - records - ) - domain += partners return {"domain": {"partner_ids": domain}} def _get_domain_for_sale_order(self, records): @@ -45,8 +61,6 @@ def _get_domain_for_sale_order(self, records): "|", "|", "|", - "|", - ("user_ids", "!=", False), ("id", "child_of", records.partner_id.ids), ("id", "child_of", records.partner_invoice_id.ids), ("id", "child_of", records.partner_shipping_id.ids), @@ -57,8 +71,6 @@ def _get_domain_for_account_move(self, records): return [ "|", "|", - "|", - ("user_ids", "!=", False), ("id", "child_of", records.partner_id.ids), ("id", "child_of", records.partner_shipping_id.ids), ("id", "in", records.message_partner_ids.ids), @@ -67,8 +79,6 @@ def _get_domain_for_account_move(self, records): def _get_domain_for_purchase_order(self, records): return [ "|", - "|", - ("user_ids", "!=", False), ("id", "child_of", records.partner_id.ids), ("id", "in", records.message_partner_ids.ids), ] @@ -76,8 +86,6 @@ def _get_domain_for_purchase_order(self, records): def _get_domain_for_stock_picking(self, records): return [ "|", - "|", - ("user_ids", "!=", False), ("id", "child_of", records.partner_id.ids), ("id", "in", records.message_partner_ids.ids), ] diff --git a/mail_filter_adressee_by_contact/views/mail_compose_message_view.xml b/mail_filter_adressee_by_contact/views/mail_compose_message_view.xml index 7fdc06a6f4..5cf9e97ac5 100644 --- a/mail_filter_adressee_by_contact/views/mail_compose_message_view.xml +++ b/mail_filter_adressee_by_contact/views/mail_compose_message_view.xml @@ -7,8 +7,11 @@
- - Filter Email +
diff --git a/mail_filter_adressee_by_contact/views/mail_invoice_send_view.xml b/mail_filter_adressee_by_contact/views/mail_invoice_send_view.xml index c3e8466565..7162f952ea 100644 --- a/mail_filter_adressee_by_contact/views/mail_invoice_send_view.xml +++ b/mail_filter_adressee_by_contact/views/mail_invoice_send_view.xml @@ -5,9 +5,15 @@ account.invoice.send - - - + +
+ +
+ From aa068cc88918f729bf26f0974e1a78e0ea500c3c Mon Sep 17 00:00:00 2001 From: oca-travis Date: Tue, 29 Mar 2022 08:33:09 +0000 Subject: [PATCH 08/18] [UPD] Update mail_filter_adressee_by_contact.pot --- .../i18n/mail_filter_adressee_by_contact.pot | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/mail_filter_adressee_by_contact/i18n/mail_filter_adressee_by_contact.pot b/mail_filter_adressee_by_contact/i18n/mail_filter_adressee_by_contact.pot index 60b7a0655b..b7b457c974 100644 --- a/mail_filter_adressee_by_contact/i18n/mail_filter_adressee_by_contact.pot +++ b/mail_filter_adressee_by_contact/i18n/mail_filter_adressee_by_contact.pot @@ -14,8 +14,8 @@ msgstr "" "Plural-Forms: \n" #. module: mail_filter_adressee_by_contact -#: model_terms:ir.ui.view,arch_db:mail_filter_adressee_by_contact.email_compose_message_wizard_inherit_form -msgid "Filter Email" +#: model:ir.model,name:mail_filter_adressee_by_contact.model_account_invoice_send +msgid "Account Invoice Send" msgstr "" #. module: mail_filter_adressee_by_contact @@ -26,6 +26,17 @@ msgid "Additional Contacts" msgstr "" #. module: mail_filter_adressee_by_contact +#: model:ir.model.fields.selection,name:mail_filter_adressee_by_contact.selection__mail_compose_message__apply_filter__all +msgid "All" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields.selection,name:mail_filter_adressee_by_contact.selection__mail_compose_message__apply_filter__contacts +msgid "Contacts" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send__display_name #: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message__display_name msgid "Display Name" msgstr "" @@ -43,11 +54,18 @@ msgid "Filtering relevant adressees" msgstr "" #. module: mail_filter_adressee_by_contact +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send__id #: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message__id msgid "ID" msgstr "" #. module: mail_filter_adressee_by_contact +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send____last_update #: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message____last_update msgid "Last Modified on" msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields.selection,name:mail_filter_adressee_by_contact.selection__mail_compose_message__apply_filter__users +msgid "Users" +msgstr "" From a7f377fd3f1c41478776b0d9d0a01dc01c04378d Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 29 Mar 2022 08:42:04 +0000 Subject: [PATCH 09/18] [UPD] README.rst --- mail_filter_adressee_by_contact/README.rst | 8 ++++++++ .../static/description/index.html | 2 ++ 2 files changed, 10 insertions(+) diff --git a/mail_filter_adressee_by_contact/README.rst b/mail_filter_adressee_by_contact/README.rst index d9d6029d42..5891223acc 100644 --- a/mail_filter_adressee_by_contact/README.rst +++ b/mail_filter_adressee_by_contact/README.rst @@ -73,6 +73,14 @@ 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-Kev-Roche| image:: https://github.com/Kev-Roche.png?size=40px + :target: https://github.com/Kev-Roche + :alt: Kev-Roche + +Current `maintainer `__: + +|maintainer-Kev-Roche| + 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_filter_adressee_by_contact/static/description/index.html b/mail_filter_adressee_by_contact/static/description/index.html index 8ea6bac661..9f2a9ac3ea 100644 --- a/mail_filter_adressee_by_contact/static/description/index.html +++ b/mail_filter_adressee_by_contact/static/description/index.html @@ -413,6 +413,8 @@

Maintainers

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:

+

Kev-Roche

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.

From a2f69733808ab816606c0ed2840c7eb77e1f0da1 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 29 Mar 2022 08:42:05 +0000 Subject: [PATCH 10/18] mail_filter_adressee_by_contact 14.0.1.1.0 --- mail_filter_adressee_by_contact/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail_filter_adressee_by_contact/__manifest__.py b/mail_filter_adressee_by_contact/__manifest__.py index f80715ec49..99d02af41b 100644 --- a/mail_filter_adressee_by_contact/__manifest__.py +++ b/mail_filter_adressee_by_contact/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Mail filter adressee by partner contacts and users", "summary": "Adresses filter by partner contacts and users", - "version": "14.0.1.0.0", + "version": "14.0.1.1.0", "category": "Social Network", "website": "https://github.com/OCA/social", "author": "Akretion, Odoo Community Association (OCA)", From 1083cb86b347cade9456aee5a17f65fee3dac644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Roche?= Date: Mon, 4 Jul 2022 12:29:57 +0000 Subject: [PATCH 11/18] Added translation using Weblate (French) --- mail_filter_adressee_by_contact/i18n/fr.po | 72 ++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 mail_filter_adressee_by_contact/i18n/fr.po diff --git a/mail_filter_adressee_by_contact/i18n/fr.po b/mail_filter_adressee_by_contact/i18n/fr.po new file mode 100644 index 0000000000..18397aad6b --- /dev/null +++ b/mail_filter_adressee_by_contact/i18n/fr.po @@ -0,0 +1,72 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_filter_adressee_by_contact +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: fr\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" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model,name:mail_filter_adressee_by_contact.model_account_invoice_send +msgid "Account Invoice Send" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send__partner_ids +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_tour_upload_bill__partner_ids +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message__partner_ids +msgid "Additional Contacts" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields.selection,name:mail_filter_adressee_by_contact.selection__mail_compose_message__apply_filter__all +msgid "All" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields.selection,name:mail_filter_adressee_by_contact.selection__mail_compose_message__apply_filter__contacts +msgid "Contacts" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send__display_name +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message__display_name +msgid "Display Name" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model,name:mail_filter_adressee_by_contact.model_mail_compose_message +msgid "Email composition wizard" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send__apply_filter +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_tour_upload_bill__apply_filter +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message__apply_filter +msgid "Filtering relevant adressees" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send__id +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message__id +msgid "ID" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send____last_update +#: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message____last_update +msgid "Last Modified on" +msgstr "" + +#. module: mail_filter_adressee_by_contact +#: model:ir.model.fields.selection,name:mail_filter_adressee_by_contact.selection__mail_compose_message__apply_filter__users +msgid "Users" +msgstr "" From 266f213eeb6a1b6b8783426d3c027db711cf3576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Roche?= Date: Mon, 4 Jul 2022 12:31:26 +0000 Subject: [PATCH 12/18] Translated using Weblate (French) Currently translated at 80.0% (8 of 10 strings) Translation: social-14.0/social-14.0-mail_filter_adressee_by_contact Translate-URL: https://translation.odoo-community.org/projects/social-14-0/social-14-0-mail_filter_adressee_by_contact/fr/ --- mail_filter_adressee_by_contact/i18n/fr.po | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/mail_filter_adressee_by_contact/i18n/fr.po b/mail_filter_adressee_by_contact/i18n/fr.po index 18397aad6b..608944313f 100644 --- a/mail_filter_adressee_by_contact/i18n/fr.po +++ b/mail_filter_adressee_by_contact/i18n/fr.po @@ -6,53 +6,55 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2022-07-04 15:05+0000\n" +"Last-Translator: Kévin Roche \n" "Language-Team: none\n" "Language: fr\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 4.3.2\n" #. module: mail_filter_adressee_by_contact #: model:ir.model,name:mail_filter_adressee_by_contact.model_account_invoice_send msgid "Account Invoice Send" -msgstr "" +msgstr "Facture envoyée" #. module: mail_filter_adressee_by_contact #: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send__partner_ids #: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_tour_upload_bill__partner_ids #: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message__partner_ids msgid "Additional Contacts" -msgstr "" +msgstr "Contacts supplémentaires" #. module: mail_filter_adressee_by_contact #: model:ir.model.fields.selection,name:mail_filter_adressee_by_contact.selection__mail_compose_message__apply_filter__all msgid "All" -msgstr "" +msgstr "Tous" #. module: mail_filter_adressee_by_contact #: model:ir.model.fields.selection,name:mail_filter_adressee_by_contact.selection__mail_compose_message__apply_filter__contacts msgid "Contacts" -msgstr "" +msgstr "Contacts" #. module: mail_filter_adressee_by_contact #: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send__display_name #: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message__display_name msgid "Display Name" -msgstr "" +msgstr "Nom affiché" #. module: mail_filter_adressee_by_contact #: model:ir.model,name:mail_filter_adressee_by_contact.model_mail_compose_message msgid "Email composition wizard" -msgstr "" +msgstr "Assistant de composition de courriel" #. module: mail_filter_adressee_by_contact #: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send__apply_filter #: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_tour_upload_bill__apply_filter #: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_mail_compose_message__apply_filter msgid "Filtering relevant adressees" -msgstr "" +msgstr "Filtrage des destinataires" #. module: mail_filter_adressee_by_contact #: model:ir.model.fields,field_description:mail_filter_adressee_by_contact.field_account_invoice_send__id @@ -69,4 +71,4 @@ msgstr "" #. module: mail_filter_adressee_by_contact #: model:ir.model.fields.selection,name:mail_filter_adressee_by_contact.selection__mail_compose_message__apply_filter__users msgid "Users" -msgstr "" +msgstr "Utilisateurs" From f554c918b47e3a4cb22a225e9459713942e46101 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sun, 3 Sep 2023 17:00:45 +0000 Subject: [PATCH 13/18] [UPD] README.rst --- mail_filter_adressee_by_contact/README.rst | 15 ++++---- .../static/description/index.html | 36 ++++++++++--------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/mail_filter_adressee_by_contact/README.rst b/mail_filter_adressee_by_contact/README.rst index 5891223acc..63d09e67a1 100644 --- a/mail_filter_adressee_by_contact/README.rst +++ b/mail_filter_adressee_by_contact/README.rst @@ -2,10 +2,13 @@ Mail filter adressee by partner contacts and users ================================================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:ef3e4593746f5854be3d1411efd707c0c8a7dbca426411dd1865e260f9e83735 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -19,11 +22,11 @@ Mail filter adressee by partner contacts and users .. |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_filter_adressee_by_contact :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 +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/social&target_branch=14.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| Filter adresses by partner contacts and users. It will be applied on mails from the following models : @@ -42,7 +45,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed +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. diff --git a/mail_filter_adressee_by_contact/static/description/index.html b/mail_filter_adressee_by_contact/static/description/index.html index 9f2a9ac3ea..cd0fb86ff5 100644 --- a/mail_filter_adressee_by_contact/static/description/index.html +++ b/mail_filter_adressee_by_contact/static/description/index.html @@ -1,20 +1,20 @@ - + - + Mail filter adressee by partner contacts and users