Skip to content

Commit

Permalink
[MIG] mail_composer_cc_bcc: Migration to 18.0
Browse files Browse the repository at this point in the history
  • Loading branch information
trisdoan committed Nov 12, 2024
1 parent 1bea117 commit 03adcab
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 30 deletions.
28 changes: 14 additions & 14 deletions mail_composer_cc_bcc/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ Email CC and BCC
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github
:target: https://github.com/OCA/social/tree/18.0/mail_composer_cc_bcc
:alt: OCA/social
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmail-lightgray.png?logo=github
:target: https://github.com/OCA/mail/tree/18.0/mail_composer_cc_bcc
:alt: OCA/mail
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/social-18-0/social-18-0-mail_composer_cc_bcc
:target: https://translation.odoo-community.org/projects/mail-18-0/mail-18-0-mail_composer_cc_bcc
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/social&target_branch=18.0
:target: https://runboat.odoo-community.org/builds?repo=OCA/mail&target_branch=18.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|
Expand Down Expand Up @@ -68,8 +68,8 @@ In template form there are two fields to set cc and bcc emails.

|email_template_form_cc_bcc|

.. |res_company_form_default_cc_bcc| image:: https://raw.githubusercontent.com/OCA/social/18.0/mail_composer_cc_bcc/static/img/res_company_form_default_cc_bcc.png
.. |email_template_form_cc_bcc| image:: https://raw.githubusercontent.com/OCA/social/18.0/mail_composer_cc_bcc/static/img/email_template_form_cc_bcc.png
.. |res_company_form_default_cc_bcc| image:: https://raw.githubusercontent.com/OCA/mail/18.0/mail_composer_cc_bcc/static/img/res_company_form_default_cc_bcc.png
.. |email_template_form_cc_bcc| image:: https://raw.githubusercontent.com/OCA/mail/18.0/mail_composer_cc_bcc/static/img/email_template_form_cc_bcc.png

Usage
=====
Expand All @@ -85,16 +85,16 @@ corresponding mail composer's fields.

|image1|

.. |image| image:: https://raw.githubusercontent.com/OCA/social/18.0/mail_composer_cc_bcc/static/img/mail_compose_message_default_cc_bcc.png
.. |image1| image:: https://raw.githubusercontent.com/OCA/social/18.0/mail_composer_cc_bcc/static/img/mail_compose_message_template_cc_bcc.png
.. |image| image:: https://raw.githubusercontent.com/OCA/mail/18.0/mail_composer_cc_bcc/static/img/mail_compose_message_default_cc_bcc.png
.. |image1| image:: https://raw.githubusercontent.com/OCA/mail/18.0/mail_composer_cc_bcc/static/img/mail_compose_message_template_cc_bcc.png

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/social/issues>`_.
Bugs are tracked on `GitHub Issues <https://github.com/OCA/mail/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/social/issues/new?body=module:%20mail_composer_cc_bcc%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/mail/issues/new?body=module:%20mail_composer_cc_bcc%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.

Expand All @@ -118,8 +118,8 @@ Contributors
Other credits
-------------

The creation and migration from 16.0 to 17.0 of this module were
financially supported by Camptocamp.
The creation and migration of this module from 16.0 to 17.0, and then
17.0 to 18.0 were financially supported by Camptocamp.

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

|maintainer-trisdoan|

This module is part of the `OCA/social <https://github.com/OCA/social/tree/18.0/mail_composer_cc_bcc>`_ project on GitHub.
This module is part of the `OCA/mail <https://github.com/OCA/mail/tree/18.0/mail_composer_cc_bcc>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
4 changes: 2 additions & 2 deletions mail_composer_cc_bcc/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
{
"name": "Email CC and BCC",
"summary": "This module enables sending mail to CC and BCC partners in mail composer form.", # noqa: E501
"version": "17.0.1.0.0",
"version": "18.0.1.0.0",
"development_status": "Alpha",
"category": "Social",
"website": "https://github.com/OCA/social",
"website": "https://github.com/OCA/mail",
"author": "Camptocamp, Odoo Community Association (OCA)",
"maintainers": ["trisdoan"],
"license": "AGPL-3",
Expand Down
7 changes: 5 additions & 2 deletions mail_composer_cc_bcc/models/mail_mail.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@ class MailMail(models.Model):

email_bcc = fields.Char("Bcc", help="Blind Cc message recipients")

def _prepare_outgoing_list(self, recipients_follower_status=None):
def _prepare_outgoing_list(
self, mail_server=False, recipients_follower_status=None
):
# First, return if we're not coming from the Mail Composer
res = super()._prepare_outgoing_list(
recipients_follower_status=recipients_follower_status
mail_server=mail_server,
recipients_follower_status=recipients_follower_status,
)
is_out_of_scope = len(self.ids) > 1
is_from_composer = self.env.context.get("is_from_composer", False)
Expand Down
1 change: 1 addition & 0 deletions mail_composer_cc_bcc/models/mail_thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ def _notify_get_recipients(self, message, msg_vals, **kwargs):
"notif": data.get("notif") and data.get("notif") or notif,
"type": msg_type,
"is_follower": data.get("is_follower"),
"uid": False,
}
rdata.append(pdata)
return rdata
Expand Down
3 changes: 1 addition & 2 deletions mail_composer_cc_bcc/readme/CREDITS.md
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
The creation and migration from 16.0 to 17.0 of this module were
financially supported by Camptocamp.
The creation and migration of this module from 16.0 to 17.0, and then 17.0 to 18.0 were financially supported by Camptocamp.
20 changes: 10 additions & 10 deletions mail_composer_cc_bcc/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ <h1 class="title">Email CC and BCC</h1>
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:74b49ed221c9dcabf5962c9efa43cc1b8dff0b08074da5a2ec9b685adbb5868f
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/social/tree/18.0/mail_composer_cc_bcc"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/social-18-0/social-18-0-mail_composer_cc_bcc"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/social&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.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/mail/tree/18.0/mail_composer_cc_bcc"><img alt="OCA/mail" src="https://img.shields.io/badge/github-OCA%2Fmail-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/mail-18-0/mail-18-0-mail_composer_cc_bcc"><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/mail&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>Odoo native does not support defining a Cc field in the Mail Composer by
default; instead, it only has a unique Recipients fields, which is
confusing for a lot of end users.</p>
Expand Down Expand Up @@ -405,29 +405,29 @@ <h1>Features</h1>
<h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
<p>In company form there are two fields to set default cc and bcc partners.</p>
<blockquote>
<img alt="res_company_form_default_cc_bcc" src="https://raw.githubusercontent.com/OCA/social/18.0/mail_composer_cc_bcc/static/img/res_company_form_default_cc_bcc.png" /></blockquote>
<img alt="res_company_form_default_cc_bcc" src="https://raw.githubusercontent.com/OCA/mail/18.0/mail_composer_cc_bcc/static/img/res_company_form_default_cc_bcc.png" /></blockquote>
<p>In template form there are two fields to set cc and bcc emails.</p>
<blockquote>
<img alt="email_template_form_cc_bcc" src="https://raw.githubusercontent.com/OCA/social/18.0/mail_composer_cc_bcc/static/img/email_template_form_cc_bcc.png" /></blockquote>
<img alt="email_template_form_cc_bcc" src="https://raw.githubusercontent.com/OCA/mail/18.0/mail_composer_cc_bcc/static/img/email_template_form_cc_bcc.png" /></blockquote>
</div>
<div class="section" id="usage">
<h2><a class="toc-backref" href="#toc-entry-2">Usage</a></h2>
<p>The partners cc and bcc from company form will be used to fill in mail
composer form.</p>
<blockquote>
<img alt="image" src="https://raw.githubusercontent.com/OCA/social/18.0/mail_composer_cc_bcc/static/img/mail_compose_message_default_cc_bcc.png" /></blockquote>
<img alt="image" src="https://raw.githubusercontent.com/OCA/mail/18.0/mail_composer_cc_bcc/static/img/mail_compose_message_default_cc_bcc.png" /></blockquote>
<p>When select a template that has cc and/or bcc emails, the emails will be
used to lookup partners then found partners will be added to
corresponding mail composer’s fields.</p>
<blockquote>
<img alt="image1" src="https://raw.githubusercontent.com/OCA/social/18.0/mail_composer_cc_bcc/static/img/mail_compose_message_template_cc_bcc.png" /></blockquote>
<img alt="image1" src="https://raw.githubusercontent.com/OCA/mail/18.0/mail_composer_cc_bcc/static/img/mail_compose_message_template_cc_bcc.png" /></blockquote>
</div>
<div class="section" id="bug-tracker">
<h2><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h2>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/social/issues">GitHub Issues</a>.
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/mail/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20mail_composer_cc_bcc%0Aversion:%2018.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/mail/issues/new?body=module:%20mail_composer_cc_bcc%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
Expand Down Expand Up @@ -456,8 +456,8 @@ <h1>Contributors</h1>
</div>
<div class="section" id="other-credits">
<h1>Other credits</h1>
<p>The creation and migration from 16.0 to 17.0 of this module were
financially supported by Camptocamp.</p>
<p>The creation and migration of this module from 16.0 to 17.0, and then
17.0 to 18.0 were financially supported by Camptocamp.</p>
</div>
<div class="section" id="maintainers">
<h1>Maintainers</h1>
Expand All @@ -470,7 +470,7 @@ <h1>Maintainers</h1>
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/trisdoan"><img alt="trisdoan" src="https://github.com/trisdoan.png?size=40px" /></a></p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/18.0/mail_composer_cc_bcc">OCA/social</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/mail/tree/18.0/mail_composer_cc_bcc">OCA/mail</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

0 comments on commit 03adcab

Please sign in to comment.