diff --git a/child_compassion/views/child_compassion_view.xml b/child_compassion/views/child_compassion_view.xml
index ab4a33c41..43b61e381 100644
--- a/child_compassion/views/child_compassion_view.xml
+++ b/child_compassion/views/child_compassion_view.xml
@@ -93,7 +93,7 @@
           />
                 </header>
                 <sheet>
-                    <div class="oe_button_box" name="buttons">
+                    <div class="oe_button_box" name="button_box">
                         <button
               name="get_infos"
               string="Get info"
diff --git a/child_compassion/views/compassion_reservation_view.xml b/child_compassion/views/compassion_reservation_view.xml
index 191230476..2c63644b0 100644
--- a/child_compassion/views/compassion_reservation_view.xml
+++ b/child_compassion/views/compassion_reservation_view.xml
@@ -23,7 +23,7 @@
                     <field name="state" widget="statusbar" />
                 </header>
                 <sheet>
-                    <div class="oe_button_box" name="buttons">
+                    <div class="oe_button_box" name="button_box">
                         <button
               name="show_reserved_children"
               type="object"
diff --git a/child_compassion/views/field_office_disaster_alert_view.xml b/child_compassion/views/field_office_disaster_alert_view.xml
index de158af34..a39c7448d 100644
--- a/child_compassion/views/field_office_disaster_alert_view.xml
+++ b/child_compassion/views/field_office_disaster_alert_view.xml
@@ -16,7 +16,7 @@
                                 <field name="name" />
                             </h1>
                         </div>
-                        <div class="oe_button_box" name="buttons">
+                        <div class="oe_button_box" name="button_box">
                             <button
               name="view_children"
               type="object"
diff --git a/partner_communication/README.rst b/partner_communication/README.rst
new file mode 100644
index 000000000..f2618dcf0
--- /dev/null
+++ b/partner_communication/README.rst
@@ -0,0 +1,58 @@
+=====================
+Partner Communication
+=====================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:4ab6ac3d709e050b5b05223900a63985bf3602dd9f6d83da92ff0df0feab456b
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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-CompassionCH%2Fcompassion--modules-lightgray.png?logo=github
+    :target: https://github.com/CompassionCH/compassion-modules/tree/17.0/partner_communication
+    :alt: CompassionCH/compassion-modules
+
+|badge1| |badge2| |badge3|
+
+The Partner Communication module is designed to facilitate the sending
+of emails and printing communications within your Odoo system. This
+module ensures that communication processes are streamlined and
+efficient.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/CompassionCH/compassion-modules/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/CompassionCH/compassion-modules/issues/new?body=module:%20partner_communication%0Aversion:%2017.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
+-------
+
+* Compassion Switzerland
+
+Maintainers
+-----------
+
+This module is part of the `CompassionCH/compassion-modules <https://github.com/CompassionCH/compassion-modules/tree/17.0/partner_communication>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/partner_communication/__manifest__.py b/partner_communication/__manifest__.py
index 79e353e32..f022b2715 100644
--- a/partner_communication/__manifest__.py
+++ b/partner_communication/__manifest__.py
@@ -30,7 +30,7 @@
 # pylint: disable=C8101
 {
     "name": "Partner Communication",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "category": "Other",
     "author": "Compassion Switzerland",
     "license": "AGPL-3",
@@ -39,9 +39,10 @@
         "base_report_to_printer",  # OCA/report-print-send
         "contacts",
         "queue_job",  # OCA/queue
-        "mass_mailing_sms",  # OCA/queue
+        "mass_mailing_sms",
         "utm",
         "mail",
+        "phone_validation",
     ],
     "external_dependencies": {"python": ["wand"]},
     "data": [
@@ -61,7 +62,6 @@
         "views/communication_snippet_view.xml",
         "data/default_communication.xml",
         "data/queue_job.xml",
-        # "data/assets_backend.xml",
     ],
     "qweb": [],
     "demo": ["demo/demo_data.xml"],
diff --git a/partner_communication/data/default_communication.xml b/partner_communication/data/default_communication.xml
index c9e392ea2..7c68c5761 100644
--- a/partner_communication/data/default_communication.xml
+++ b/partner_communication/data/default_communication.xml
@@ -2,6 +2,9 @@
     <record id="default_communication_template" model="mail.template">
         <field name="name">Default communication</field>
         <field name="model_id" ref="model_partner_communication_job" />
+        <field name="email_from">{{ object.user_id.email_formatted }}</field>
+        <field name="use_default_to" eval="True" />
+        <field name="reply_to">{{ object.user_id.email_formatted }}</field>
     </record>
 
     <record id="default_communication" model="partner.communication.config">
@@ -14,13 +17,4 @@
         <field name="report_id" ref="report_a4_communication" />
         <field name="email_template_id" ref="default_communication_template" />
     </record>
-
-    <record id="phonecall_communication" model="partner.communication.config">
-        <field name="name">Phonecall</field>
-        <field name="model_id" ref="model_res_partner" />
-        <field name="send_mode">partner_preference</field>
-        <field
-      name="send_mode_pref_field"
-    >global_communication_delivery_preference</field>
-    </record>
 </odoo>
diff --git a/partner_communication/models/__init__.py b/partner_communication/models/__init__.py
index 9c7409c6c..970f6f744 100644
--- a/partner_communication/models/__init__.py
+++ b/partner_communication/models/__init__.py
@@ -14,11 +14,9 @@
     communication_config,
     communication_job,
     communication_snippet,
-    email,
     ir_actions,
     ir_attachment,
     mail_mail,
-    mail_template,
     queue_job,
     res_partner,
 )
diff --git a/partner_communication/models/communication_attachment.py b/partner_communication/models/communication_attachment.py
index a55d938ee..ed9889a73 100644
--- a/partner_communication/models/communication_attachment.py
+++ b/partner_communication/models/communication_attachment.py
@@ -28,12 +28,10 @@ class CommunicationAttachment(models.Model):
         "Communication",
         required=True,
         ondelete="cascade",
-        readonly=False,
     )
     report_id = fields.Many2one(
         "ir.actions.report",
         string="ID of report used by the attachment",
-        readonly=False,
     )
     report_name = fields.Char(
         required=True, help="Identifier of the report used to print"
@@ -42,7 +40,6 @@ class CommunicationAttachment(models.Model):
         "ir.attachment",
         string="Attachments",
         required=True,
-        readonly=False,
         ondelete="cascade",
     )
     data = fields.Binary(compute="_compute_data")
diff --git a/partner_communication/models/communication_config.py b/partner_communication/models/communication_config.py
index e997369f1..2f8637d58 100644
--- a/partner_communication/models/communication_config.py
+++ b/partner_communication/models/communication_config.py
@@ -34,7 +34,6 @@ class CommunicationDefaults(models.AbstractModel):
         "ir.actions.report",
         "Print report",
         domain=[("model", "=", "partner.communication.job")],
-        readonly=False,
     )
     printer_input_tray_id = fields.Many2one("printing.tray.input", "Paper Source")
     printer_output_tray_id = fields.Many2one("printing.tray.output", "Output Bin")
@@ -90,14 +89,16 @@ class CommunicationConfig(models.Model):
     #                                 FIELDS                                 #
     ##########################################################################
     source_id = fields.Many2one(
-        "utm.source", "UTM Source", required=True, ondelete="restrict", readonly=False
+        "utm.source",
+        "UTM Source",
+        required=True,
+        ondelete="restrict",
     )
     model_id = fields.Many2one(
         "ir.model",
         "Applies to",
         required=True,
         help="The kind of document with this communication can be used",
-        readonly=False,
         ondelete="cascade",
     )
     model = fields.Char(related="model_id.model", store=True, readonly=True)
@@ -115,7 +116,6 @@ class CommunicationConfig(models.Model):
             ("model", "=", "partner.communication.job"),
             ("model", "=", "crm.claim"),
         ],
-        readonly=False,
     )
     attachments_function = fields.Char(
         help="Define a function in the communication_job model that will "
@@ -259,7 +259,7 @@ def build_inform_mode(
                     "digital_only" in partner_mode or "digital_only" in comm_mode
                 )
         else:
-            send_mode = getattr(partner, send_mode_pref_field, "none")
+            send_mode = getattr(partner, send_mode_pref_field, "none") or "none"
             auto_mode = "auto" in send_mode or send_mode == "both"
             digital_only = "digital_only" in send_mode
 
diff --git a/partner_communication/models/communication_job.py b/partner_communication/models/communication_job.py
index a2f9d0c8f..636776e21 100644
--- a/partner_communication/models/communication_job.py
+++ b/partner_communication/models/communication_job.py
@@ -10,24 +10,18 @@
 import base64
 import logging
 import re
-import threading
 from collections import defaultdict
 from html.parser import HTMLParser
 from io import BytesIO
 
-from jinja2 import TemplateSyntaxError
-
-from odoo import _, api, fields, models, tools
-from odoo.exceptions import MissingError, QWebException, UserError
-
-from odoo.addons.phone_validation.tools import phone_validation
+from odoo import Command, _, api, fields, models, tools
+from odoo.exceptions import UserError
 
 _logger = logging.getLogger(__name__)
 testing = tools.config.get("test_enable")
 
 try:
     from PyPDF2 import PdfFileReader
-    from PyPDF2.utils import PdfReadError
 except ImportError:
     _logger.warning(
         "Please install PyPDF2 for generating print versions of communications."
@@ -80,7 +74,6 @@ class CommunicationJob(models.Model):
         "partner.communication.defaults",
         "mail.activity.mixin",
         "mail.thread",
-        "phone.validation.mixin",
     ]
 
     ##########################################################################
@@ -91,8 +84,8 @@ class CommunicationJob(models.Model):
         "Type",
         required=True,
         default=lambda s: s.env.ref("partner_communication.default_communication"),
-        readonly=False,
         index=True,
+        ondelete="cascade",
     )
     model = fields.Char(related="config_id.model_id.model", store=True, index=True)
     partner_id = fields.Many2one(
@@ -100,18 +93,21 @@ class CommunicationJob(models.Model):
         "Send to",
         required=True,
         ondelete="cascade",
-        readonly=False,
         index=True,
         check_company=True,
     )
     company_id = fields.Many2one(
         "res.company", compute="_compute_company", store=True, index=True
     )
-    country_id = fields.Many2one(related="partner_id.country_id", readonly=False)
+    country_id = fields.Many2one(
+        related="partner_id.country_id",
+        readonly=False,
+        search="_search_country_id",
+    )
     parent_id = fields.Many2one(related="partner_id.parent_id", readonly=False)
     object_ids = fields.Char("Resource ids", required=True)
     date = fields.Datetime(default=fields.Datetime.now, index=True)
-    sent_date = fields.Datetime(readonly=True, copy=False, index=True)
+    sent_date = fields.Datetime(copy=False, index=True)
     state = fields.Selection(
         [
             ("pending", _("Pending")),
@@ -141,9 +137,11 @@ class CommunicationJob(models.Model):
     email_id = fields.Many2one(
         "mail.mail", "Generated e-mail", readonly=True, index=True, copy=False
     )
-    body_html = fields.Html(sanitize=False)
+    body_html = fields.Html(sanitize=False, compute="_compute_content", store=True)
     pdf_page_count = fields.Integer("Page count", readonly=True)
-    subject = fields.Char()
+    subject = fields.Char(compute="_compute_content", store=True)
+    email_from = fields.Char(compute="_compute_content", store=True)
+    reply_to = fields.Char(compute="_compute_content", store=True)
     attachment_ids = fields.One2many(
         "partner.communication.attachment",
         "communication_id",
@@ -180,10 +178,30 @@ def _compute_ir_attachments(self):
         for job in self:
             job.ir_attachment_ids = job.mapped("attachment_ids.attachment_id")
 
+    @api.depends("config_id", "object_ids")
+    def _compute_content(self):
+        for job in self:
+            template_vals = {}
+            template = job.email_template_id
+            if template:
+                template_vals = template.with_context(
+                    lang=job.partner_id.lang
+                )._generate_template(
+                    job.ids, ["body_html", "subject", "email_from", "reply_to"]
+                )
+            if job.id in template_vals:
+                job.body_html = template_vals[job.id]["body_html"]
+                job.subject = template_vals[job.id]["subject"]
+                job.email_from = template_vals[job.id]["email_from"]
+                job.reply_to = template_vals[job.id]["reply_to"]
+            else:
+                job.body_html = job.body_html
+                job.subject = job.subject
+                job.email_from = job.email_from
+                job.reply_to = job.reply_to
+
     def count_pdf_page(self):
-        skip_count = self.env.context.get(
-            "skip_pdf_count", getattr(threading.currentThread(), "testing", False)
-        )
+        skip_count = self.env.context.get("skip_pdf_count")
         if not skip_count:
             for record in self.filtered("report_id"):
                 if record.send_mode == "physical":
@@ -194,12 +212,7 @@ def count_pdf_page(self):
                         pdf_str = report.sudo()._render_qweb_pdf(record.ids)
                         pdf = PdfFileReader(BytesIO(pdf_str[0]))
                         record.pdf_page_count = pdf.getNumPages()
-                    except (
-                        UserError,
-                        PdfReadError,
-                        QWebException,
-                        TemplateSyntaxError,
-                    ):
+                    except Exception:
                         self.env.clear()
                         record.pdf_page_count = 0
 
@@ -227,7 +240,7 @@ def _inverse_ir_attachments(self):
                     )
             # Remove deleted attachments
             job.attachment_ids.filtered(
-                lambda a, job=job: a.attachment_id not in job.ir_attachment_ids
+                lambda a, _job=job: a.attachment_id not in _job.ir_attachment_ids
             ).unlink()
 
     def _compute_void(self):
@@ -250,6 +263,9 @@ def _inverse_ir_attachment_tmp(self):
             ]
             self._inverse_ir_attachments()
 
+    def _search_country_id(self, operator, value):
+        return [("partner_id.country_id", operator, value)]
+
     @api.depends("partner_id", "object_ids")
     def _compute_company(self):
         """
@@ -269,11 +285,6 @@ def _compute_company(self):
                 and first_object.company_id
             ):
                 company = first_object.company_id
-            if not company and job.partner_id.country_id:
-                company = self.env["res.company"].search(
-                    [("partner_id.country_id", "=", job.partner_id.country_id.id)],
-                    limit=1,
-                )
             if not company:
                 company = self._fallback_company()
             job.company_id = company
@@ -350,19 +361,15 @@ def create(self, vals):
         ):
             job.auto_send = send_mode[1]
 
-        if not job.body_html or not strip_tags(job.body_html):
-            job.refresh_text()
-        else:
-            job.set_attachments()
-
-        if job.body_html or job.send_mode == "physical":
+        job.set_attachments()
+        if job.send_mode in ("both", "physical"):
             job.count_pdf_page()
 
         # Difference between send_mode of partner and send_mode of job
         if send_mode[0] != job.send_mode:
             if "only" in job.partner_id.global_communication_delivery_preference:
                 # Send_mode chosen by the employee is not compatible with the partner
-                # So we remove it and an employee must set it manually afterwards
+                # So we remove it and an employee must set it manually afterward
                 job.send_mode = ""
 
         if job.need_call == "before_sending":
@@ -371,12 +378,6 @@ def create(self, vals):
             job.send()
         return job
 
-    def copy(self, vals=None):
-        if vals is None:
-            vals = {}
-        vals["auto_send"] = False
-        return super().copy(vals)
-
     @api.model
     def _get_default_vals(self, vals, default_vals=None):
         """
@@ -418,10 +419,11 @@ def _get_default_vals(self, vals, default_vals=None):
                 user_id = config.user_id.id
             vals["user_id"] = user_id
 
-        # if not vals.get("printer_output_tray_id"):
-        #     if printer_config.printer_output_tray_id:
-        #         vals["printer_output_tray_id"] = \
-        #             printer_config.printer_output_tray_id.id
+        if not vals.get("printer_output_tray_id"):
+            if default_config.printer_output_tray_id:
+                vals[
+                    "printer_output_tray_id"
+                ] = default_config.printer_output_tray_id.id
 
         # Check all default_vals fields
         for default_val in default_vals:
@@ -486,20 +488,7 @@ def send(self):
             if origin == "both_print" and job.send_mode == "both":
                 job.send_mode = "digital"
                 return job._print_report()
-
-            state = job._send_mail()
-            if job.send_mode != "both":
-                job.write(
-                    {
-                        "state": state,
-                        "sent_date": state != "pending" and fields.Datetime.now(),
-                    }
-                )
-            else:
-                # Job was sent by e-mail and must now be printed
-                job.send_mode = "physical"
-                job.refresh_text()
-
+            job._send_mail()
             # if the call must be done after the sending, an activity is scheduled
             if job.need_call == "after_sending":
                 job.with_user(job.user_id.id).schedule_call()
@@ -547,33 +536,25 @@ def send_by_sms(self):
         ):
             sms_text = job.convert_html_for_sms(link_pattern, sms_medium_id)
             sms_texts.append(sms_text)
-            sanitize_res = phone_validation.phone_sanitize_numbers_w_record(
-                [job.partner_id.mobile], job.partner_id
-            )
-            sanitized_numbers = [
-                info["sanitized"] for info in sanitize_res.values() if info["sanitized"]
-            ]
-            invalid_numbers = [
-                number for number, info in sanitize_res.items() if info["code"]
-            ]
-            if invalid_numbers:
-                raise UserError(
-                    _("Invalid phone numbers: %s") % ", ".join(invalid_numbers)
-                )
-            self.env["sms.sms"].create(
-                {
-                    "number": sanitized_numbers[0],
-                    "body": sms_text,
-                    "partner_id": job.partner_id.id,
-                }
-            ).send()
-            job.write(
-                {
-                    "state": "done",
-                    "sent_date": fields.Datetime.now(),
-                }
-            )
-            _logger.debug("SMS length: %s", len(sms_text))
+            try:
+                with self.env.cr.savepoint():
+                    self.env["sms.sms"].create(
+                        {
+                            "number": job.partner_id.mobile,
+                            "body": sms_text,
+                            "partner_id": job.partner_id.id,
+                        }
+                    ).send(raise_exception=True)
+                    job.write(
+                        {
+                            "state": "done",
+                            "sent_date": fields.Datetime.now(),
+                        }
+                    )
+                    _logger.debug("SMS length: %s", len(sms_text))
+            except Exception as e:
+                self.env.cr.rollback()
+                job.write({"state": "failure", "body_html": str(e)})
         return sms_texts
 
     def convert_html_for_sms(self, link_pattern, sms_medium_id):
@@ -602,11 +583,6 @@ def _replace_link(match):
                 short_link = self.env["link.tracker"].create(
                     {
                         "url": full_link,
-                        "campaign_id": self.utm_campaign_id.id
-                        or self.env.ref(
-                            "partner_communication_compassion."
-                            "utm_campaign_communication"
-                        ).id,
                         "medium_id": sms_medium_id,
                         "source_id": source_id,
                     }
@@ -626,44 +602,7 @@ def _replace_link(match):
     def refresh_text(self):
         self.mapped("attachment_ids").unlink()
         failed = self.set_attachments()
-        for job in self - failed:
-            lang = self.env.context.get("lang_preview", job.partner_id.lang)
-            template_id = job.email_template_id
-
-            if not template_id and job.config_id:
-                template_id = job.config_id.email_template_id
-                job.write({"email_template_id": template_id})
-
-            if template_id and job.object_ids:
-                try:
-                    fields = template_id.with_context(
-                        template_preview_lang=lang
-                    ).generate_email(job.ids, ["body_html", "subject"])
-                    job.write(
-                        {
-                            "body_html": fields[job.id]["body_html"],
-                            "subject": fields[job.id]["subject"],
-                            "state": job.state if job.state != "failure" else "pending",
-                        }
-                    )
-                except (
-                    MissingError,
-                    UserError,
-                    QWebException,
-                    TemplateSyntaxError,
-                ) as e:
-                    _logger.error(
-                        f"Failed to generate communication {str(e)}",
-                        exc_info=True,
-                    )
-                    job.env.clear()
-                    if job.state == "pending":
-                        job.write(
-                            {
-                                "state": "failure",
-                                "body_html": f"{str(type(e))} {str(e)}",
-                            }
-                        )
+        (self - failed)._compute_content()
         return True
 
     def quick_refresh(self):
@@ -676,7 +615,7 @@ def quick_refresh(self):
         values = template.with_context(template_preview_lang=lang).generate_email(
             jobs.ids, ["body_html", "subject"]
         )
-        for job, vals in zip(jobs, values.values()):
+        for job, vals in zip(jobs, values.values(), strict=True):
             job.write(
                 {
                     "body_html": vals["body_html"],
@@ -687,19 +626,19 @@ def quick_refresh(self):
 
     @api.onchange("config_id", "partner_id")
     def onchange_config_id(self):
-        if self.config_id and self.partner_id:
-            send_mode = self.config_id.get_inform_mode(self.partner_id)
-            self.send_mode = send_mode[0]
-            # set default fields
-            partner_id = None
-            if self.partner_id:
-                partner_id = self.partner_id.id
-            default_vals = {"config_id": self.config_id.id, "partner_id": partner_id}
-            self._get_default_vals(default_vals)
-            for key, val in list(default_vals.items()):
-                if key.endswith("_id"):
-                    val = getattr(self, key).browse(val)
-                setattr(self, key, val)
+        self.user_id = self.config_id.user_id or self.env.user
+        send_mode = self.config_id.get_inform_mode(self.partner_id)
+        self.send_mode = send_mode[0]
+        # set default fields
+        partner_id = None
+        if self.partner_id:
+            partner_id = self.partner_id.id
+        default_vals = {"config_id": self.config_id.id, "partner_id": partner_id}
+        self._get_default_vals(default_vals)
+        for key, val in list(default_vals.items()):
+            if key.endswith("_id"):
+                val = getattr(self, key).browse(val)
+            setattr(self, key, val)
 
     def open_related(self):
         object_ids = list(map(int, self.object_ids.split(",")))
@@ -821,7 +760,7 @@ def get_snippet(self, snippet_name):
     def _send_mail(self):
         """
         Called for sending the communication by e-mail.
-        :return: state of the communication depending if the e-mail was
+        :return: state of the communication depending on if the e-mail was
                  successfully sent or not.
         """
         self.ensure_one()
@@ -830,40 +769,46 @@ def _send_mail(self):
         email = self.email_id
         if not email:
             email_vals = {
-                "recipient_ids": [(4, partner.id)],
+                "recipient_ids": [Command.link(partner.id)],
                 "communication_config_id": self.config_id.id,
+                "body": self.body_html,
                 "body_html": self.body_html,
                 "subject": self.subject,
                 "attachment_ids": [(6, 0, self.ir_attachment_ids.ids)],
                 "auto_delete": False,
+                "model": self._name,
+                "res_id": self.id,
+                "email_from": self.user_id.email_formatted,
             }
             if "default_email_vals" in self.env.context:
                 email_vals.update(self.env.context["default_email_vals"])
 
-            email = (
-                self.env["mail.compose.message"]
-                .with_context(lang=partner.lang)
-                .create_emails(self.email_template_id, [self.id], email_vals)
-            )
+            email = self.env["mail.mail"].create(email_vals)
             self.email_id = email
-
-            try:
-                with self.env.cr.savepoint():
-                    email.send()
-            except Exception:
-                _logger.error(
-                    "Error while sending communication by email to %s ",
-                    partner.email,
-                    exc_info=True,
-                )
-                return "failure"
-
+        try:
+            with self.env.cr.savepoint():
+                if email.state != "sent":
+                    email.send(raise_exception=True)
+                if self.send_mode != "both":
+                    self.write(
+                        {
+                            "state": "done",
+                            "sent_date": fields.Datetime.now(),
+                        }
+                    )
+                else:
+                    # Job was sent by e-mail and must now be printed
+                    self.send_mode = "physical"
+                    with self.env.cr.savepoint():
+                        self.refresh_text()
+        except Exception as e:
+            _logger.error("Couldn't refresh the communication for printing")
+            self.env.cr.rollback()
+            self.write({"state": "failure", "body_html": str(e)})
             # Subscribe author to thread, so that the reply
             # notifies the author.
             self.message_subscribe(self.user_id.partner_id.ids)
 
-        return "done"
-
     def _print_report(self):
         name = self.env.user.name
         origin = self.env.context.get("origin")
@@ -911,7 +856,7 @@ def _notify_get_reply_to(
     ):
         res = dict.fromkeys(self.ids)
         for job in self:
-            res[job.id] = job.email_template_id.reply_to
+            res[job.id] = job.reply_to
         return res
 
     def print_letter(self, print_name, **print_options):
@@ -966,7 +911,7 @@ def get_first(source):
             (config_lang.printer_input_tray_id.system_name, behaviour["input_tray"])
         )
 
-        to_print = report._render_qweb_pdf(self.ids)
+        to_print = report._render_qweb_pdf(report.xml_id, res_ids=self.ids)
         printer = behaviour["printer"].with_context(lang=lang)
         if behaviour["action"] == "server" and printer:
             # Get pdf should directly send it to the printer
diff --git a/partner_communication/models/email.py b/partner_communication/models/email.py
deleted file mode 100644
index 6ce6cff01..000000000
--- a/partner_communication/models/email.py
+++ /dev/null
@@ -1,61 +0,0 @@
-##############################################################################
-#
-#    Copyright (C) 2016 Compassion CH (http://www.compassion.ch)
-#    Releasing children from poverty in Jesus' name
-#    @author: Emanuel Cino <ecino@compassion.ch>
-#
-#    The licence is in the file __manifest__.py
-#
-##############################################################################
-from functools import reduce
-
-from odoo import fields, models
-
-
-class Email(models.Model):
-    """Add relation to communication configuration to track generated
-    e-mails.
-    """
-
-    _inherit = "mail.mail"
-
-    ##########################################################################
-    #                                 FIELDS                                 #
-    ##########################################################################
-    communication_config_id = fields.Many2one(
-        "partner.communication.config", readonly=False
-    )
-
-    def send(self, auto_commit=False, raise_exception=False):
-        """Create communication for partner, if not already existing."""
-        comm_obj = (
-            self.env["partner.communication.job"]
-            .with_context({})
-            .with_context(no_print=True)
-        )
-        config = self.env.ref("partner_communication.default_communication")
-        for email in self.exists().filtered(
-            lambda e: e.mail_message_id.model != "partner.communication.job"
-        ):
-            communication = comm_obj.search([("email_id", "=", email.id)])
-            if not communication:
-                for partner in email.recipient_ids.filtered(
-                    lambda p: not p.user_ids
-                    or reduce(lambda u1, u2: u1 and u2, p.user_ids.mapped("share"))
-                ):
-                    comm_obj.create(
-                        {
-                            "config_id": config.id,
-                            "partner_id": partner.id,
-                            "user_id": email.author_id.user_ids.id,
-                            "object_ids": email.recipient_ids.ids,
-                            "state": "done",
-                            "auto_send": False,
-                            "email_id": email.id,
-                            "sent_date": fields.Datetime.now(),
-                            "body_html": email.body_html,
-                            "subject": email.subject,
-                            "ir_attachment_ids": [(6, 0, email.attachment_ids.ids)],
-                        }
-                    )
-        return super().send(auto_commit, raise_exception)
diff --git a/partner_communication/models/ir_actions.py b/partner_communication/models/ir_actions.py
index 465889bcb..fc0751240 100644
--- a/partner_communication/models/ir_actions.py
+++ b/partner_communication/models/ir_actions.py
@@ -21,7 +21,6 @@ class IrActionsServer(models.Model):
     config_id = fields.Many2one(
         "partner.communication.config",
         "Communication type",
-        readonly=False,
         domain="[('model_id', '=', model_id)]",
     )
     partner_field = fields.Char("Partner field name", help="'self' for record itself")
diff --git a/partner_communication/models/ir_attachment.py b/partner_communication/models/ir_attachment.py
index f5748991b..dd386d013 100644
--- a/partner_communication/models/ir_attachment.py
+++ b/partner_communication/models/ir_attachment.py
@@ -18,7 +18,6 @@ class IrAttachment(models.Model):
     report_id = fields.Many2one(
         "ir.actions.report",
         "Print configuration",
-        readonly=False,
     )
     enable_omr = fields.Boolean(
         string="Enable OMR",
diff --git a/partner_communication/models/mail_mail.py b/partner_communication/models/mail_mail.py
index c2518cb1e..cdd7b81a7 100644
--- a/partner_communication/models/mail_mail.py
+++ b/partner_communication/models/mail_mail.py
@@ -9,8 +9,9 @@
 ##############################################################################
 import re
 from email.header import Header
+from functools import reduce
 
-from odoo import api, models
+from odoo import api, fields, models
 
 
 def _sanitize_subject(subject):
@@ -43,6 +44,45 @@ class MailMail(models.Model):
 
     _inherit = "mail.mail"
 
+    communication_config_id = fields.Many2one(
+        "partner.communication.config",
+        "Communication type",
+    )
+
+    def send(self, auto_commit=False, raise_exception=False):
+        """Create communication for partner, if not already existing."""
+        comm_obj = (
+            self.env["partner.communication.job"]
+            .with_context({})
+            .with_context(no_print=True)
+        )
+        config = self.env.ref("partner_communication.default_communication")
+        for email in self.exists().filtered(
+            lambda e: e.mail_message_id.model != "partner.communication.job"
+        ):
+            communication = comm_obj.search([("email_id", "=", email.id)])
+            if not communication:
+                for partner in email.recipient_ids.filtered(
+                    lambda p: not p.user_ids
+                    or reduce(lambda u1, u2: u1 and u2, p.user_ids.mapped("share"))
+                ):
+                    comm_obj.create(
+                        {
+                            "config_id": config.id,
+                            "partner_id": partner.id,
+                            "user_id": email.author_id.user_ids.id,
+                            "object_ids": email.recipient_ids.ids,
+                            "state": "done",
+                            "auto_send": False,
+                            "email_id": email.id,
+                            "sent_date": fields.Datetime.now(),
+                            "body_html": email.body_html,
+                            "subject": email.subject,
+                            "ir_attachment_ids": [(6, 0, email.attachment_ids.ids)],
+                        }
+                    )
+        return super().send(auto_commit, raise_exception)
+
     @api.model_create_multi
     def create(self, values_list):
         for values in values_list:
diff --git a/partner_communication/models/mail_template.py b/partner_communication/models/mail_template.py
deleted file mode 100644
index c7ed9357f..000000000
--- a/partner_communication/models/mail_template.py
+++ /dev/null
@@ -1,25 +0,0 @@
-##############################################################################
-#
-#    Copyright (C) 2019 Compassion CH (http://www.compassion.ch)
-#    Releasing children from poverty in Jesus' name
-#    @author: Joel Vaucher <jvaucher@compassion.ch>
-#
-#    The licence is in the file __manifest__.py
-#
-##############################################################################
-
-from odoo import models
-
-
-class MailTemplate(models.Model):
-    """change generate_email to can be call with res_ids
-    not only an id but with a record, this is use for the change
-    of email_preview.template res_id selection to reference field"""
-
-    _inherit = "mail.template"
-
-    def generate_email(self, res_ids, fields=None):
-        if isinstance(res_ids, models.BaseModel):
-            res_ids = res_ids.id
-
-        return super().generate_email(res_ids, fields)
diff --git a/partner_communication/readme/DESCRIPTION.md b/partner_communication/readme/DESCRIPTION.md
new file mode 100644
index 000000000..7b6646eee
--- /dev/null
+++ b/partner_communication/readme/DESCRIPTION.md
@@ -0,0 +1 @@
+The Partner Communication module is designed to facilitate the sending of emails and printing communications within your Odoo system. This module ensures that communication processes are streamlined and efficient.
\ No newline at end of file
diff --git a/partner_communication/static/description/index.html b/partner_communication/static/description/index.html
new file mode 100644
index 000000000..764f4ea0f
--- /dev/null
+++ b/partner_communication/static/description/index.html
@@ -0,0 +1,412 @@
+<!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>Partner Communication</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="partner-communication">
+<h1 class="title">Partner Communication</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:4ab6ac3d709e050b5b05223900a63985bf3602dd9f6d83da92ff0df0feab456b
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<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/CompassionCH/compassion-modules/tree/17.0/partner_communication"><img alt="CompassionCH/compassion-modules" src="https://img.shields.io/badge/github-CompassionCH%2Fcompassion--modules-lightgray.png?logo=github" /></a></p>
+<p>The Partner Communication module is designed to facilitate the sending
+of emails and printing communications within your Odoo system. This
+module ensures that communication processes are streamlined and
+efficient.</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="#maintainers" id="toc-entry-4">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/CompassionCH/compassion-modules/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/CompassionCH/compassion-modules/issues/new?body=module:%20partner_communication%0Aversion:%2017.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>Compassion Switzerland</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-4">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/CompassionCH/compassion-modules/tree/17.0/partner_communication">CompassionCH/compassion-modules</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/partner_communication/views/change_text_wizard_view.xml b/partner_communication/views/change_text_wizard_view.xml
index 41a781f64..0f9488e07 100644
--- a/partner_communication/views/change_text_wizard_view.xml
+++ b/partner_communication/views/change_text_wizard_view.xml
@@ -5,7 +5,7 @@
         <field name="arch" type="xml">
             <form>
                 <field name="state" invisible="1" />
-                <div states="edit">
+                <div invisible="state != 'edit'">
                     <button
             name="get_preview"
             string="Preview"
@@ -16,7 +16,7 @@
                     <separator />
                     <field name="template_text" />
                 </div>
-                <div states="preview">
+                <div invisible="state != 'preview'">
                     <button
             name="edit"
             string="Edit"
diff --git a/partner_communication/views/communication_config_view.xml b/partner_communication/views/communication_config_view.xml
index 37dcd3084..63a9f3c61 100644
--- a/partner_communication/views/communication_config_view.xml
+++ b/partner_communication/views/communication_config_view.xml
@@ -11,7 +11,7 @@
               name="web_ribbon"
               title="Archived"
               bg_color="bg-danger"
-              attrs="{'invisible': [('active', '=', True)]}"
+              invisible="active"
             />
                     </div>
                     <group string="General configuration" name="general_config">
@@ -34,7 +34,7 @@
                     <separator string="Custom configuration" />
                     <field
             name="default_config_ids"
-            context="{'default_config_id': active_id}"
+            context="{'default_config_id': id}"
           />
                 </sheet>
             </form>
diff --git a/partner_communication/views/communication_job_view.xml b/partner_communication/views/communication_job_view.xml
index c1286f645..a0ec72a4e 100644
--- a/partner_communication/views/communication_job_view.xml
+++ b/partner_communication/views/communication_job_view.xml
@@ -17,7 +17,7 @@
             icon="fa-envelope"
             type="object"
             class="oe_highlight"
-            attrs="{'invisible':['|',('send_mode', '!=', 'digital'),('state', '!=', 'pending')]}"
+            invisible="send_mode != 'digital' or state != 'pending' or not id"
           />
                     <button
             name="send"
@@ -25,7 +25,7 @@
             icon="fa-envelope"
             type="object"
             class="oe_highlight"
-            attrs="{'invisible':['|',('send_mode', '!=', 'both'),('state', '!=', 'pending')]}"
+            invisible="send_mode != 'both' or state != 'pending' or not id"
             context="{'origin': 'both_email'}"
           />
                     <button
@@ -34,7 +34,7 @@
             icon="fa-print"
             type="object"
             class="oe_highlight"
-            attrs="{'invisible':['|',('send_mode', '!=', 'physical'),('state', '!=', 'pending')]}"
+            invisible="send_mode != 'physical' or state != 'pending' or not id"
           />
                     <button
             name="send"
@@ -42,7 +42,7 @@
             icon="fa-print"
             type="object"
             class="oe_highlight"
-            attrs="{'invisible':['|',('send_mode', '!=', 'both'),('state', '!=', 'pending')]}"
+            invisible="send_mode != 'both' or state != 'pending' or not id"
             context="{'origin': 'both_print'}"
           />
                     <button
@@ -50,29 +50,38 @@
             string="Download printed file"
             type="object"
             icon="fa-download"
-            attrs="{'invisible': [('printed_pdf_data', '=', False)]}"
+            invisible="not printed_pdf_data"
           />
                     <button
             name="reset"
             string="Retry"
             type="object"
-            states='done,cancel'
+            invisible="state not in ('done', 'cancel')"
           />
                     <button
             name="cancel"
             string="Cancel"
             type="object"
-            states='pending'
+            invisible="state != 'pending' or not id"
           />
                 </header>
                 <sheet>
-                    <div class="oe_button_box" name="buttons">
+                    <div class="oe_button_box" name="button_box">
+                        <button
+              name="refresh_text"
+              string="Refresh"
+              type="object"
+              icon="fa-refresh"
+              class="oe_stat_button"
+              invisible="not id"
+            />
                         <button
               name="preview_pdf"
               string="Preview"
               type="object"
               icon="fa-search-plus"
               class="oe_stat_button"
+              invisible="send_mode != 'physical' or not id"
             />
                         <button
               name="open_related"
@@ -80,6 +89,7 @@
               type="object"
               icon="fa-folder-open-o"
               class="oe_stat_button"
+              invisible="not id"
             />
                     </div>
                     <group>
@@ -88,64 +98,101 @@
                             <field
                 name="config_id"
                 domain="[('model', '=', model)]"
+                readonly="state == 'done'"
+              />
+                            <field name="user_id" readonly="state == 'done'" />
+                            <field
+                name="partner_id"
+                readonly="state == 'done'"
               />
-                            <field name="user_id" />
-                            <field name="partner_id" />
                             <field name="company_id" invisible="1" />
                         </group>
                         <group>
                             <field name="sent_date" readonly="1" />
-                            <field name="send_mode" required="1" />
+                            <field
+                name="send_mode"
+                required="1"
+                readonly="state == 'done'"
+              />
+                            <field
+                name="email_id"
+                readonly="1"
+                invisible="not email_id"
+              />
                             <field
                 name="pdf_page_count"
-                attrs="{'invisible': [('send_mode', '!=', 'physical')]}"
+                invisible="send_mode != 'physical'"
               />
                         </group>
                     </group>
-                    <a
-            class="btn btn-sm btn-light fa fa-plus"
-            icon="fa-gear"
-            data-toggle="collapse"
-            href=".config"
-            role="button"
-            aria-expanded="false"
-            aria-controls="advancedConfig"
-          >
-                        <span>Advanced options</span>
-                    </a>
-                    <notebook class="collapse config" id="advancedConfig">
-                        <page string="Various">
+                    <notebook>
+                        <page string="Content">
+                            <group class="mb-4">
+                                <group>
+                                    <field
+                    name="subject"
+                    readonly="state == 'done' or not id"
+                  />
+                                    <field
+                    name="email_from"
+                    readonly="state == 'done' or not id"
+                    invisible="send_mode not in ('both', 'digital')"
+                  />
+                                </group>
+                                <group>
+                                    <field
+                    name="reply_to"
+                    readonly="state == 'done' or not id"
+                    invisible="send_mode not in ('both', 'digital')"
+                  />
+                                </group>
+                                <field
+                  name="body_html"
+                  widget="html"
+                  readonly="state == 'done' or not id"
+                />
+                            </group>
+                                <field
+                name="ir_attachment_tmp"
+                widget="many2many_binary"
+                class="oe_edit_only"
+                nolabel="1"
+                readonly="state == 'done'"
+              />
+                                <field
+                name="ir_attachment_ids"
+                context="{'default_res_model': 'partner.communication.job', 'default_res_id': id}"
+                readonly="state == 'done'"
+              >
+                                    <tree create="false" editable="bottom">
+                                        <field name="name" />
+                                        <field name="report_id" />
+                                        <field name="datas" />
+                                        <field name="create_uid" />
+                                        <field name="create_date" />
+                                    </tree>
+                                </field>
+                        </page>
+                        <page string="Configuration">
                             <group>
                                 <group>
-                                    <field name="need_call" />
-                                    <field name="report_id" />
-                                    <field name="auto_send" />
+                                    <field
+                    name="need_call"
+                    readonly="state == 'done'"
+                  />
+                                    <field
+                    name="report_id"
+                    readonly="state == 'done'"
+                  />
+                                    <field
+                    name="auto_send"
+                    readonly="state == 'done'"
+                  />
                                 </group>
                             </group>
                         </page>
                     </notebook>
-                    <group>
-                        <field name="subject" />
-                        <field name="body_html" widget="html" />
-                    </group>
-                    <group>
-                        <field
-              name="email_id"
-              readonly="1"
-              attrs="{'invisible': ['|', ('send_mode', '!=', 'digital'), ('send_mode', '!=', 'both')]}"
-            />
-                        <field
-              name="ir_attachment_ids"
-              context="{'default_res_model': 'partner.communication.job', 'default_res_id': active_id}"
-              mode="kanban"
-            />
-                        <field
-              name="ir_attachment_tmp"
-              widget="many2many_binary"
-              string=' '
-              class="oe_edit_only"
-            />
-                    </group>
+
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" />
@@ -172,29 +219,29 @@
                 <field name="subject" />
                 <field name="user_id" />
                 <field name="state" />
-                <field name="need_call" optional="true" />
+                <field name="need_call" optional="hide" />
                 <field name="sent_date" />
-                <field name="activity_ids" invisible="1" />
+                <field name="activity_ids" column_invisible="1" />
                 <button
           name="send"
           string="Send Now"
           type="object"
           icon="fa-paper-plane-o"
-          states='pending'
+          invisible="state != 'pending'"
         />
                 <button
           name="reset"
           string="Retry"
           type="object"
           icon="fa-undo"
-          states='done,cancel'
+          invisible="state not in ('done', 'cancel')"
         />
                 <button
           name="cancel"
           string="Cancel"
           type="object"
           icon="fa-ban"
-          states='pending'
+          invisible="state != 'pending'"
         />
             </tree>
         </field>
@@ -283,7 +330,7 @@
         <field name="res_model">partner.communication.job</field>
         <field name="view_mode">tree,form</field>
         <field name="context">{'default_user_id': uid}</field>
-        <field name="domain">[('partner_id', '=', active_id)]</field>
+        <field name="domain">[('partner_id', '=', id)]</field>
     </record>
 
     <!-- Send communication actions -->
@@ -291,6 +338,7 @@
         <field name="name">Send communication</field>
         <field name="model_id" ref="model_partner_communication_job" />
         <field name="binding_model_id" ref="model_partner_communication_job" />
+        <field name="binding_view_types">list</field>
         <field name="state">code</field>
         <field name="code">action = records.send()</field>
     </record>
@@ -300,6 +348,7 @@
         <field name="name">Refresh communication</field>
         <field name="model_id" ref="model_partner_communication_job" />
         <field name="binding_model_id" ref="model_partner_communication_job" />
+        <field name="binding_view_types">list</field>
         <field name="state">code</field>
         <field name="code">records.refresh_text()</field>
     </record>
diff --git a/partner_communication/views/generate_communication_wizard_view.xml b/partner_communication/views/generate_communication_wizard_view.xml
index 64beba79d..26179d0cb 100644
--- a/partner_communication/views/generate_communication_wizard_view.xml
+++ b/partner_communication/views/generate_communication_wizard_view.xml
@@ -6,11 +6,11 @@
             <form>
                 <field name="state" invisible="1" />
                 <sheet>
-                    <group states="edit" name="template">
+                    <group invisible="state != 'edit'" name="template">
                         <field name="model_id" />
                     </group>
                     <group
-            states="edit"
+            invisible="state != 'edit'"
             name="selection"
             string="Partner Selection"
           >
@@ -22,19 +22,23 @@
             />
                         <field name="partner_ids" invisible="1" />
                     </group>
-                    <group states="edit" string="Options" name="options">
+                    <group
+            invisible="state != 'edit'"
+            string="Options"
+            name="options"
+          >
                         <field name="customize_template" />
                         <field
               name="send_mode"
-              attrs="{'invisible': [('customize_template', '=', False)]}"
+              invisible="not customize_template"
             />
                         <field
               name="force_language"
-              attrs="{'invisible': [('customize_template', '=', False)]}"
+              invisible="not customize_template"
             />
                         <field name="scheduled_date" />
                     </group>
-                    <div states="generation">
+                    <div invisible="state != 'generation'">
                         <p
             >The communications are being generated! You can track here the progress by clicking the reload button, or close the wizard.</p>
                         <br />
@@ -48,7 +52,7 @@
             type="object"
             class="oe_highlight"
             icon="fa-cog"
-            states="edit"
+            invisible="state != 'edit'"
           />
                     <button
             name="reload"
@@ -56,15 +60,19 @@
             type="object"
             class="oe_highlight"
             icon="fa-refresh"
-            states="generation"
+            invisible="state != 'generation'"
           />
                     <button
             name="close"
             string="Close"
             type="object"
-            states="generation"
+            invisible="state != 'generation'"
+          />
+                    <button
+            string="Cancel"
+            special="cancel"
+            invisible="state != 'edit'"
           />
-                    <button string="Cancel" special="cancel" states="edit" />
                 </footer>
             </form>
         </field>
diff --git a/partner_communication/views/ir_actions_view.xml b/partner_communication/views/ir_actions_view.xml
index 49574991a..9e205b246 100644
--- a/partner_communication/views/ir_actions_view.xml
+++ b/partner_communication/views/ir_actions_view.xml
@@ -8,22 +8,16 @@
             <field name="link_field_id" position="after">
                 <field
           name="config_id"
-          attrs="{'invisible': [('state', '!=', 'communication')],
-                            'required': [('state', '=', 'communication')]}"
+          invisible="state != 'communication'"
+          required="state == 'communication'"
         />
                 <field
           name="partner_field"
-          attrs="{'invisible': [('state', '!=', 'communication')],
-                            'required': [('state', '=', 'communication')]}"
-        />
-                <field
-          name="send_mode"
-          attrs="{'invisible': [('state', '!=', 'communication')]}"
-        />
-                <field
-          name="auto_send"
-          attrs="{'invisible': [('state', '!=', 'communication')]}"
+          invisible="state != 'communication'"
+          required="state == 'communication'"
         />
+                <field name="send_mode" invisible="state != 'communication'" />
+                <field name="auto_send" invisible="state != 'communication'" />
             </field>
         </field>
     </record>
diff --git a/partner_communication/views/pdf_wizard_view.xml b/partner_communication/views/pdf_wizard_view.xml
index c9832c8c2..fbcd32a1a 100644
--- a/partner_communication/views/pdf_wizard_view.xml
+++ b/partner_communication/views/pdf_wizard_view.xml
@@ -5,10 +5,10 @@
         <field name="arch" type="xml">
             <form>
                 <field name="state" invisible="1" />
-                <group states="physical,both">
+                <group invisible="state not in ('physical', 'both')">
                     <field name="preview" widget="image" width="500" />
                 </group>
-                <div states="digital,both">
+                <div invisible="state not in ('digital', 'both')">
                     <field name="body_html" />
                 </div>
                 <footer>
@@ -19,7 +19,7 @@
             icon="fa-envelope"
             type="object"
             class="oe_highlight"
-            attrs="{'invisible':['|',('state', '=', 'physical'),('send_state', 'not in', 'pending')]}"
+            invisible="state == 'physical' or send_state != 'pending'"
           />
                     <button
             name="send"
@@ -27,7 +27,7 @@
             icon="fa-print"
             type="object"
             class="oe_highlight"
-            attrs="{'invisible':['|',('state', '=', 'digital'),('send_state', 'not in', 'pending')]}"
+            invisible="state == 'digital' or send_state != 'pending'"
           />
                 </footer>
             </form>
diff --git a/partner_communication/views/res_partner_view.xml b/partner_communication/views/res_partner_view.xml
index 9b9db76c7..745fa28bf 100644
--- a/partner_communication/views/res_partner_view.xml
+++ b/partner_communication/views/res_partner_view.xml
@@ -9,7 +9,7 @@
             <xpath expr="//div[@name='button_box']">
                 <button
           name="%(partner_communication.action_communication_job_partner)d"
-          context="{'default_partner_id': active_id, 'search_default_partner_id': active_id, 'search_default_pending': 1}"
+          context="{'default_partner_id': id, 'search_default_partner_id': id, 'search_default_pending': 1}"
           type="action"
           class="oe_stat_button oe_inline"
           icon="fa-file-text-o"
diff --git a/partner_communication/views/settings_view.xml b/partner_communication/views/settings_view.xml
index 6705e51f9..a580f316a 100644
--- a/partner_communication/views/settings_view.xml
+++ b/partner_communication/views/settings_view.xml
@@ -3,54 +3,33 @@
         <field name="name">compassion.settings.form</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="100" />
-        <field name="inherit_id" ref="base.res_config_settings_view_form" />
+        <field
+      name="inherit_id"
+      ref="base_setup.res_config_settings_view_form"
+    />
         <field name="arch" type="xml">
-            <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div
+            <xpath expr="//div[@id='contacts_settings']" position="after">
+                <block
           name="communication_settings"
-          class="app_settings_block"
-          data-string="Partner communication"
-          string="Partner communication"
-          data-key="partner_communication"
+          title="Partner communication"
         >
                     <h2>Features</h2>
-                    <div class="row mt16 o_settings_container" name="features">
-                        <div
-              class="col-xs-12 col-md-6 o_setting_box"
-              name="left_group"
-            >
-                            <div class="o_setting_left_pane">
-                                <field
-                  name="module_partner_communication_crm_phone"
-                />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label
-                  for="module_partner_communication_crm_phone"
-                />
-                                <div
-                  class="text-muted"
-                >Link communications with CRM phonecalls</div>
-                            </div>
-                        </div>
-                        <div
-              name="right_group"
-              class="col-xs-12 col-md-6 o_setting_box"
-            >
-                            <div class="o_setting_left_pane">
-                                <field
-                  name="module_partner_communication_omr"
-                />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_partner_communication_omr" />
-                                <div
-                  class="text-muted"
-                >Add marks to printed communications for using folding machines.</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+                    <setting
+            string="Phonecall Plugin"
+            help="Link communications with CRM phonecalls"
+            documentation=""
+          >
+                        <field name="module_partner_communication_crm_phone" />
+                    </setting>
+                    <setting
+            string="OMR Plugin"
+            help="Add marks to printed communications for using folding machines."
+            documentation=""
+          >
+                        <field name="module_partner_communication_omr" />
+                    </setting>
+
+                </block>
             </xpath>
         </field>
     </record>
@@ -62,7 +41,9 @@
         <field name="view_id" ref="communication_settings_view" />
         <field name="view_mode">form</field>
         <field name="target">inline</field>
-        <field name="context">{'module' : 'partner_communication'}</field>
+        <field
+      name="context"
+    >{'module' : 'partner_communication', 'bin_size': False}</field>
     </record>
 
     <menuitem
diff --git a/partner_communication/wizards/__init__.py b/partner_communication/wizards/__init__.py
index b4a2b1c23..90817a975 100644
--- a/partner_communication/wizards/__init__.py
+++ b/partner_communication/wizards/__init__.py
@@ -13,7 +13,6 @@
     download_print_job_wizard,
     email_template_preview_view,
     generate_communication_wizard,
-    mail_compose_message,
     pdf_wizard,
     settings,
 )
diff --git a/partner_communication/wizards/mail_compose_message.py b/partner_communication/wizards/mail_compose_message.py
deleted file mode 100644
index 0330a55e6..000000000
--- a/partner_communication/wizards/mail_compose_message.py
+++ /dev/null
@@ -1,90 +0,0 @@
-##############################################################################
-#
-#    Copyright (C) 2016 Compassion CH (http://www.compassion.ch)
-#    Releasing children from poverty in Jesus' name
-#    @author: Emanuel Cino <ecino@compassion.ch>
-#
-#    The licence is in the file __manifest__.py
-#
-##############################################################################
-
-from odoo import api, models
-
-
-class EmailComposeMessage(models.TransientModel):
-    _inherit = "mail.compose.message"
-
-    @api.model
-    def create_emails(self, template, res_ids, default_mail_values=None):
-        """Helper to generate a new e-mail given a template and objects.
-
-        :param int template: mail.template record
-        :param res_ids: ids of the resource objects
-        :return: browse records of created e-mails (one per resource object)
-        """
-        all_mail_values = self._get_mail_values(template, res_ids)
-        email_obj = self.env["mail.mail"]
-        emails = email_obj
-        for res_id in res_ids:
-            mail_values = all_mail_values[res_id]
-            if default_mail_values:
-                mail_values.update(default_mail_values)
-
-            if mail_values.get("body_html"):
-                mail_values["body"] = mail_values["body_html"]
-            emails += email_obj.create(mail_values)
-        return emails
-
-    @api.model
-    def get_generated_fields(self, template, res_ids):
-        """Helper to retrieve generated html given a template and objects.
-
-        :param int template: mail.template record
-        :param res_ids: ids of the resource objects
-        :return: html code generated for the e-mail (list if len(res_ids)>1)
-        """
-        all_mail_values = self._get_mail_values(template, res_ids)
-        email_fields = list()
-        for res_id in res_ids:
-            email_fields.append(all_mail_values[res_id])
-        if len(email_fields) == 1:
-            email_fields = email_fields[0]
-        return email_fields
-
-    def _get_mail_values(self, template, res_ids):
-        """Helper to get e-mail values given a template and objects.
-
-        :param int template: mail.template record
-        :param res_ids: ids of the resource objects
-        :return: list of dictionaries containing e-mail values
-        """
-        if not isinstance(res_ids, list):
-            res_ids = [res_ids]
-        wizard = (
-            self.sudo()
-            .with_context(active_ids=res_ids)
-            .create(
-                {
-                    "template_id": template.id,
-                    "composition_mode": "mass_mail",
-                    "model": template.model,
-                    "author_id": self.env.user.partner_id.id,
-                }
-            )
-        )
-
-        # Fetch template values.
-        write_data = wizard.onchange_template_id(
-            template.id, "mass_mail", False, False
-        )["value"]
-
-        # Body would be sanitized if we write it now, breaking any embedded code and
-        # causing an error.
-        # Only usage is create_emails above and it overrides it just after.
-        # We write it just after getting the mail values.
-        mail_body = write_data.pop("body")
-        wizard.write(write_data)
-        values = wizard.get_mail_values(res_ids)
-        wizard.write({"body": mail_body})
-
-        return values
diff --git a/sbc_compassion/models/__init__.py b/sbc_compassion/models/__init__.py
index 595a5fbc9..990e75429 100644
--- a/sbc_compassion/models/__init__.py
+++ b/sbc_compassion/models/__init__.py
@@ -10,7 +10,6 @@
 from . import correspondence_metadata  # isort:skip
 from . import (
     contracts,
-    contracts_report,
     correspondence,
     correspondence_page,
     correspondence_paragraph,
diff --git a/sbc_compassion/models/contracts_report.py b/sbc_compassion/models/contracts_report.py
deleted file mode 100644
index 7d165e513..000000000
--- a/sbc_compassion/models/contracts_report.py
+++ /dev/null
@@ -1,56 +0,0 @@
-##############################################################################
-#
-#    Copyright (C) 2018 Compassion CH (http://www.compassion.ch)
-#    @author: Stephane Eicher <seicher@compassion.ch>
-#
-#    The licence is in the file __manifest__.py
-#
-##############################################################################
-from odoo import fields, models
-
-
-class PartnerSponsorshipReport(models.Model):
-    _inherit = "res.partner"
-
-    sr_nb_b2s_letter = fields.Integer(
-        "Number of letters to sponsor", compute="_compute_b2s_letter"
-    )
-    sr_nb_s2b_letter = fields.Integer(
-        "Number of letters to beneficiary", compute="_compute_s2b_letter"
-    )
-
-    def _compute_s2b_letter(self):
-        def get_nb_letter(_partner):
-            return self.env["correspondence"].search_count(
-                [
-                    ("partner_id", "=", _partner.id),
-                    ("direction", "=", "Supporter To Beneficiary"),
-                    ("scanned_date", ">", _partner.start_period),
-                    ("scanned_date", "<=", _partner.end_period),
-                ]
-            )
-
-        for partner in self:
-            nb_letter = get_nb_letter(partner)
-            if partner.is_church:
-                for member in partner.member_ids:
-                    nb_letter += get_nb_letter(member)
-            partner.sr_nb_s2b_letter = nb_letter
-
-    def _compute_b2s_letter(self):
-        def get_nb_letter(_partner):
-            return self.env["correspondence"].search_count(
-                [
-                    ("partner_id", "=", _partner.id),
-                    ("direction", "=", "Beneficiary To Supporter"),
-                    ("scanned_date", ">", _partner.start_period),
-                    ("scanned_date", "<=", _partner.end_period),
-                ]
-            )
-
-        for partner in self:
-            nb_letter = get_nb_letter(partner)
-            if partner.is_church:
-                for member in partner.member_ids:
-                    nb_letter += get_nb_letter(member)
-            partner.sr_nb_b2s_letter = nb_letter
diff --git a/sbc_compassion/models/partner_compassion.py b/sbc_compassion/models/partner_compassion.py
index 087ff70a8..795347dac 100644
--- a/sbc_compassion/models/partner_compassion.py
+++ b/sbc_compassion/models/partner_compassion.py
@@ -31,6 +31,48 @@ class ResPartner(models.Model):
         compute="_compute_nb_letters", groups="child_compassion.group_sponsorship"
     )
     last_writing_date = fields.Date(compute="_compute_last_writing_date")
+    sr_nb_b2s_letter = fields.Integer(
+        "Number of letters to sponsor", compute="_compute_b2s_letter"
+    )
+    sr_nb_s2b_letter = fields.Integer(
+        "Number of letters to beneficiary", compute="_compute_s2b_letter"
+    )
+
+    def _compute_s2b_letter(self):
+        def get_nb_letter(_partner):
+            return self.env["correspondence"].search_count(
+                [
+                    ("partner_id", "=", _partner.id),
+                    ("direction", "=", "Supporter To Beneficiary"),
+                    ("scanned_date", ">", _partner.start_period),
+                    ("scanned_date", "<=", _partner.end_period),
+                ]
+            )
+
+        for partner in self:
+            nb_letter = get_nb_letter(partner)
+            if partner.is_church:
+                for member in partner.member_ids:
+                    nb_letter += get_nb_letter(member)
+            partner.sr_nb_s2b_letter = nb_letter
+
+    def _compute_b2s_letter(self):
+        def get_nb_letter(_partner):
+            return self.env["correspondence"].search_count(
+                [
+                    ("partner_id", "=", _partner.id),
+                    ("direction", "=", "Beneficiary To Supporter"),
+                    ("scanned_date", ">", _partner.start_period),
+                    ("scanned_date", "<=", _partner.end_period),
+                ]
+            )
+
+        for partner in self:
+            nb_letter = get_nb_letter(partner)
+            if partner.is_church:
+                for member in partner.member_ids:
+                    nb_letter += get_nb_letter(member)
+            partner.sr_nb_b2s_letter = nb_letter
 
     def _compute_nb_letters(self):
         for partner in self: