Skip to content

Commit

Permalink
[FIX] mail_composer_cc_bcc: adapt to changes from upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
trisdoan authored and hbrunn committed Dec 16, 2024
1 parent 376ad8d commit 5d8a39c
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions mail_composer_cc_bcc/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ Contributors

* Hai N. Le <[email protected]>
* Son Ho <[email protected]>
* Tris Doan <[email protected]>

* `Therp BV <https://therp.nl>`_:

Expand Down
4 changes: 2 additions & 2 deletions mail_composer_cc_bcc/models/mail_mail.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def _send( # noqa: max-complexity: 4
success_pids = []
failure_type = None
# ===== Same with native Odoo =====
# https://github.com/odoo/odoo/blob/2baa481e14ca705f4c6d3d4d900daf24442a4aa5
# https://github.com/odoo/odoo/blob/55c165dc8777514afa4f1476b82ef6b50b8a7651
# /addons/mail/models/mail_mail.py#L463
try:
if mail.state != "outgoing":
Expand All @@ -81,7 +81,7 @@ def _send( # noqa: max-complexity: 4
email = mail._send_prepare_values()
# ===== Same with native Odoo =====
# headers
headers = {}
headers = {"X-Odoo-Message-Id": mail.message_id}
bounce_alias = ICP.get_param("mail.bounce.alias")
catchall_domain = ICP.get_param("mail.catchall.domain")
if bounce_alias and catchall_domain:
Expand Down
1 change: 1 addition & 0 deletions mail_composer_cc_bcc/readme/CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

* Hai N. Le <[email protected]>
* Son Ho <[email protected]>
* Tris Doan <[email protected]>

* `Therp BV <https://therp.nl>`_:

Expand Down
1 change: 1 addition & 0 deletions mail_composer_cc_bcc/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,7 @@ <h1>Contributors</h1>
<ul class="simple">
<li>Hai N. Le &lt;<a class="reference external" href="mailto:hailn&#64;trobz.com">hailn&#64;trobz.com</a>&gt;</li>
<li>Son Ho &lt;<a class="reference external" href="mailto:sonhd&#64;trobz.com">sonhd&#64;trobz.com</a>&gt;</li>
<li>Tris Doan &lt;<a class="reference external" href="mailto:tridm&#64;trobz.com">tridm&#64;trobz.com</a>&gt;</li>
</ul>
</blockquote>
</li>
Expand Down
1 change: 1 addition & 0 deletions mail_composer_cc_bcc/tests/test_mail_cc_bcc.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"461467cd5b356072fc054468c75f6e26",
"5d1ab352416f5074e131f35f20098d5b",
"46172c91183f2cb50b22a6b3b5e3869b",
"8f26c4084cc7fc300e64d19ccdc944fe",
]


Expand Down

0 comments on commit 5d8a39c

Please sign in to comment.