Skip to content

Commit

Permalink
[16.0][MIG] outgoing_email_by_model: Migration to 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
emiliesoutiras committed Dec 16, 2024
1 parent 79014f3 commit b1a4e0d
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 11 deletions.
11 changes: 6 additions & 5 deletions outgoing_email_by_model/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ Outgoing Email by Model
: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/15.0/outgoing_email_by_model
:target: https://github.com/OCA/social/tree/16.0/outgoing_email_by_model
:alt: OCA/social
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/social-15-0/social-15-0-outgoing_email_by_model
:target: https://translation.odoo-community.org/projects/social-16-0/social-16-0-outgoing_email_by_model
: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=15.0
:target: https://runboat.odoo-community.org/builds?repo=OCA/social&target_branch=16.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|
Expand Down Expand Up @@ -51,7 +51,7 @@ 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:%20outgoing_email_by_model%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/social/issues/new?body=module:%20outgoing_email_by_model%0Aversion:%2016.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.

Expand All @@ -67,6 +67,7 @@ Contributors
~~~~~~~~~~~~

* Matthieu Méquignon <[email protected]>
* Emilie SOUTIRAS <[email protected]>

Maintainers
~~~~~~~~~~~
Expand All @@ -89,6 +90,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:

|maintainer-mmequignon|

This module is part of the `OCA/social <https://github.com/OCA/social/tree/15.0/outgoing_email_by_model>`_ project on GitHub.
This module is part of the `OCA/social <https://github.com/OCA/social/tree/16.0/outgoing_email_by_model>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
2 changes: 1 addition & 1 deletion outgoing_email_by_model/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{
"name": "Outgoing Email by Model",
"version": "15.0.1.0.0",
"version": "16.0.1.0.0",
"category": "Social",
"website": "https://github.com/OCA/social",
"author": "Camptocamp, Odoo Community Association (OCA)",
Expand Down
8 changes: 6 additions & 2 deletions outgoing_email_by_model/models/mail_thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@
class MailThread(models.AbstractModel):
_inherit = "mail.thread"

def _notify_by_email_add_values(self, base_values):
res = super()._notify_by_email_add_values(base_values)
def _notify_by_email_get_final_mail_values(
self, recipient_ids, base_mail_values, additional_values=None
):
res = super()._notify_by_email_get_final_mail_values(
recipient_ids, base_mail_values, additional_values=additional_values
)
model = self.env["ir.model"].sudo().search([("model", "=", self._name)])
custom_mailserver = model.outgoing_mailserver_id
if custom_mailserver:
Expand Down
1 change: 1 addition & 0 deletions outgoing_email_by_model/readme/CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
* Matthieu Méquignon <[email protected]>
* Emilie SOUTIRAS <[email protected]>
7 changes: 4 additions & 3 deletions outgoing_email_by_model/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ <h1 class="title">Outgoing Email by Model</h1>
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:0de5a293f68d4c9a7b9b358dbbd1c678a8278e1fadcf1b0876b521d4dba266dc
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/15.0/outgoing_email_by_model"><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-15-0/social-15-0-outgoing_email_by_model"><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=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<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/16.0/outgoing_email_by_model"><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-16-0/social-16-0-outgoing_email_by_model"><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=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>Allow to select an outgoing mail parameters per model, such as email_from, or mail_server_id.</p>
<p>To make it work, the model must inherit <cite>mail.thread</cite>.</p>
<p><strong>Table of contents</strong></p>
Expand Down Expand Up @@ -398,7 +398,7 @@ <h1><a class="toc-backref" href="#toc-entry-2">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:%20outgoing_email_by_model%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20outgoing_email_by_model%0Aversion:%2016.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">
Expand All @@ -413,6 +413,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<ul class="simple">
<li>Matthieu Méquignon &lt;<a class="reference external" href="mailto:matthieu.mequignon&#64;camptocamp.com">matthieu.mequignon&#64;camptocamp.com</a>&gt;</li>
<li>Emilie SOUTIRAS &lt;<a class="reference external" href="mailto:emilie.soutiras&#64;groupevoltaire.com">emilie.soutiras&#64;groupevoltaire.com</a>&gt;</li>
</ul>
</div>
<div class="section" id="maintainers">
Expand All @@ -426,7 +427,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
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/mmequignon"><img alt="mmequignon" src="https://github.com/mmequignon.png?size=40px" /></a></p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/15.0/outgoing_email_by_model">OCA/social</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/16.0/outgoing_email_by_model">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>
Expand Down
2 changes: 2 additions & 0 deletions outgoing_email_by_model/views/ir_model.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
<field name="is_mail_blacklist" position="after">
<field
name="outgoing_mailserver_id"
groups="base.group_no_one"
attrs="{'invisible': [('is_mail_thread', '=', False)], 'readonly': [('is_mail_thread', '=', False)]}"
/>
<field
name="outgoing_email"
groups="base.group_no_one"
attrs="{'invisible': [('is_mail_thread', '=', False)], 'readonly': [('is_mail_thread', '=', False)]}"
/>
</field>
Expand Down

0 comments on commit b1a4e0d

Please sign in to comment.