diff --git a/mail_filter_adressee_by_contact/README.rst b/mail_filter_adressee_by_contact/README.rst
new file mode 100644
index 0000000000..4975a63fa7
--- /dev/null
+++ b/mail_filter_adressee_by_contact/README.rst
@@ -0,0 +1,86 @@
+==================================================
+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
+    :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/18.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-18-0/social-18-0-mail_filter_adressee_by_contact
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/social&target_branch=18.0
+    :alt: Try me on Runboat
+
+|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 <https://github.com/OCA/social/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/social/issues/new?body=module:%20mail_filter_adressee_by_contact%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* Akretion
+
+Contributors
+------------
+
+Kévin Roche <kevin.roche@akretion.com>
+
+Maintainers
+-----------
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+.. |maintainer-Kev-Roche| image:: https://github.com/Kev-Roche.png?size=40px
+    :target: https://github.com/Kev-Roche
+    :alt: Kev-Roche
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-Kev-Roche| 
+
+This module is part of the `OCA/social <https://github.com/OCA/social/tree/18.0/mail_filter_adressee_by_contact>`_ 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/__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..1e69ff8c2b
--- /dev/null
+++ b/mail_filter_adressee_by_contact/__manifest__.py
@@ -0,0 +1,25 @@
+# Copyright 2021 Akretion (https://www.akretion.com).
+# @author Kévin Roche <kevin.roche@akretion.com>
+# 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": "18.0.1.1.0",
+    "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",
+        # "views/mail_invoice_send_view.xml",
+    ],
+}
diff --git a/mail_filter_adressee_by_contact/i18n/es.po b/mail_filter_adressee_by_contact/i18n/es.po
new file mode 100644
index 0000000000..6d61e99551
--- /dev/null
+++ b/mail_filter_adressee_by_contact/i18n/es.po
@@ -0,0 +1,74 @@
+# 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"
+"PO-Revision-Date: 2024-01-26 19:33+0000\n"
+"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
+"Language-Team: none\n"
+"Language: es\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.17\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 "Cuenta de Envío de Factura"
+
+#. 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 "Contactos Adicionales"
+
+#. 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 "Todos/as"
+
+#. 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 "Contactos"
+
+#. 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 "Mostrar Nombre"
+
+#. module: mail_filter_adressee_by_contact
+#: model:ir.model,name:mail_filter_adressee_by_contact.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Asistente de redacción de correo electrónico"
+
+#. 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 "Filtrar los destinatarios pertinentes"
+
+#. 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 "ID"
+
+#. 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 "Última Modificación el"
+
+#. 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 "Usuarios"
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..608944313f
--- /dev/null
+++ b/mail_filter_adressee_by_contact/i18n/fr.po
@@ -0,0 +1,74 @@
+# 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"
+"PO-Revision-Date: 2022-07-04 15:05+0000\n"
+"Last-Translator: Kévin Roche <kevin.roche@akretion.com>\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 "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 "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 "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 "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 "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 "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 "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
+#: 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 "Utilisateurs"
diff --git a/mail_filter_adressee_by_contact/i18n/it.po b/mail_filter_adressee_by_contact/i18n/it.po
new file mode 100644
index 0000000000..9cfecdeedb
--- /dev/null
+++ b/mail_filter_adressee_by_contact/i18n/it.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: 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"
+
+#. 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 ""
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..b7b457c974
--- /dev/null
+++ b/mail_filter_adressee_by_contact/i18n/mail_filter_adressee_by_contact.pot
@@ -0,0 +1,71 @@
+# 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: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 ""
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..1e7bdb0d63
--- /dev/null
+++ b/mail_filter_adressee_by_contact/models/__init__.py
@@ -0,0 +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 (<http://www.akretion.com>).
+# @author Kévin Roche <kevin.roche@akretion.com>
+# 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
new file mode 100644
index 0000000000..f1cd2c8e03
--- /dev/null
+++ b/mail_filter_adressee_by_contact/models/mail_compose_message.py
@@ -0,0 +1,91 @@
+# Copyright (C) 2021 Akretion (<http://www.akretion.com>).
+# @author Kévin Roche <kevin.roche@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+from odoo.osv import expression
+
+
+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",
+    )
+
+    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):
+        domain = [("type", "!=", "private")]
+        model = self._context.get("active_model")
+        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)],
+                ]
+            )
+        return {"domain": {"partner_ids": domain}}
+
+    def _get_domain_for_sale_order(self, records):
+        return [
+            "|",
+            "|",
+            "|",
+            ("id", "child_of", records.partner_id.ids),
+            ("id", "child_of", records.partner_invoice_id.ids),
+            ("id", "child_of", records.partner_shipping_id.ids),
+            ("id", "in", records.message_partner_ids.ids),
+        ]
+
+    def _get_domain_for_account_move(self, records):
+        return [
+            "|",
+            "|",
+            ("id", "child_of", records.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 [
+            "|",
+            ("id", "child_of", records.partner_id.ids),
+            ("id", "in", records.message_partner_ids.ids),
+        ]
+
+    def _get_domain_for_stock_picking(self, records):
+        return [
+            "|",
+            ("id", "child_of", records.partner_id.ids),
+            ("id", "in", records.message_partner_ids.ids),
+        ]
diff --git a/mail_filter_adressee_by_contact/pyproject.toml b/mail_filter_adressee_by_contact/pyproject.toml
new file mode 100644
index 0000000000..4231d0cccb
--- /dev/null
+++ b/mail_filter_adressee_by_contact/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/mail_filter_adressee_by_contact/readme/CONTRIBUTORS.md b/mail_filter_adressee_by_contact/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000000..f47dc4ed41
--- /dev/null
+++ b/mail_filter_adressee_by_contact/readme/CONTRIBUTORS.md
@@ -0,0 +1 @@
+Kévin Roche \<kevin.roche@akretion.com\>
diff --git a/mail_filter_adressee_by_contact/readme/DESCRIPTION.md b/mail_filter_adressee_by_contact/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..4419fefb93
--- /dev/null
+++ b/mail_filter_adressee_by_contact/readme/DESCRIPTION.md
@@ -0,0 +1,3 @@
+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
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 0000000000..3a0328b516
Binary files /dev/null and b/mail_filter_adressee_by_contact/static/description/icon.png differ
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..3f75626d2a
--- /dev/null
+++ b/mail_filter_adressee_by_contact/static/description/index.html
@@ -0,0 +1,425 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>Mail filter adressee by partner contacts and users</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="mail-filter-adressee-by-partner-contacts-and-users">
+<h1 class="title">Mail filter adressee by partner contacts and users</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:ef3e4593746f5854be3d1411efd707c0c8a7dbca426411dd1865e260f9e83735
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/social/tree/18.0/mail_filter_adressee_by_contact"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/social-18-0/social-18-0-mail_filter_adressee_by_contact"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/social&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>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</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/social/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20mail_filter_adressee_by_contact%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>Akretion</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<p>Kévin Roche &lt;<a class="reference external" href="mailto:kevin.roche&#64;akretion.com">kevin.roche&#64;akretion.com</a>&gt;</p>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
+<p>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.</p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
+<p><a class="reference external image-reference" href="https://github.com/Kev-Roche"><img alt="Kev-Roche" src="https://github.com/Kev-Roche.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/18.0/mail_filter_adressee_by_contact">OCA/social</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
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..5cf9e97ac5
--- /dev/null
+++ b/mail_filter_adressee_by_contact/views/mail_compose_message_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record model="ir.ui.view" id="email_compose_message_wizard_inherit_form">
+        <field name="name">mail.compose.message.form</field>
+        <field name="model">mail.compose.message</field>
+        <field name="inherit_id" ref="mail.email_compose_message_wizard_form" />
+        <field name="arch" type="xml">
+            <field name="partner_ids" position="before">
+                <div>
+                    <field
+                        name="apply_filter"
+                        widget="radio"
+                        options="{'horizontal': True}"
+                    />
+                </div>
+            </field>
+        </field>
+    </record>
+</odoo>
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..7162f952ea
--- /dev/null
+++ b/mail_filter_adressee_by_contact/views/mail_invoice_send_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="account_invoice_send_wizard_form" model="ir.ui.view">
+        <field name="name">Send Invoice</field>
+        <field name="model">account.invoice.send</field>
+        <field name="inherit_id" ref="account.account_invoice_send_wizard_form" />
+        <field name="arch" type="xml">
+            <field name="partner_ids" position="before">
+                <div>
+                    <field
+                        name="apply_filter"
+                        widget="radio"
+                        options="{'horizontal': True}"
+                    />
+                </div>
+            </field>
+        </field>
+    </record>
+</odoo>