[17.0][MIG] mail_composer_cc_bcc: Migration to 17.0 #1312

trisdoan · 2024-02-21T02:44:23Z

1) Summary of changes in 17.0

mail.template
https://github.com/odoo/odoo/blob/17.0/addons/mail/models/mail_template.py

generate_recipients replaced by _generate_template_recipients

mail.mail:
https://github.com/odoo/odoo/blob/17.0/addons/mail/models/mail_mail.py

new method _prepare_outgoing_list: odoo/odoo@b1d678b
replaces _send_prepare_values
new method _personalize_outgoing_body is also introduced

account.move.send: replaces account_invoice_send

do not inherit mail.compose.message
_action_send_mail replaced by _send_mail
introduce new method _get_mail_move_values

2) Consequences

We don't need to fully replace mail.mail:_send_mail() as we did before, thanks to _prepare_outgoing_list.
override _get_mail_move_values and _send_mail in account.move.send as it does not benefit from mail.compose.message

3) This change

major refactoring:
- roll back to do as odoo: one mail per recipient (will enable compatibility with mail_tracking)
- keep same all headers (To, Cc, Bcc) in all emails
- use a context to define the proper smtp_to for each email
- introduce test_MailTemplate_upstream_file_hash & test_MailComposer_upstream_file_hash to keep track of changes upstream

_compute_partner_ids

remove email_cc from partner_ids to keep consistency with previous versions and create no confusion

_action_send_mail

update context when composition_mode == 'comment'
My colleague Hai is busy on other topics, I will take over as a maintainer of this module from now on.

llabusch93 · 2024-03-08T08:39:02Z

Hello,

Could you clarify why the module depends on the account? I couldn't find any justification for this dependency. Could you either remove it or explain the reasoning behind its inclusion?

Thank you.

nilshamerlinck · 2024-03-08T08:44:10Z

Good catch @llabusch93 !

mail_composer_cc_bcc should not depend on account anymore indeed;
only mail_composer_cc_bcc_account will (to adapt the Invoice Sending wizard).

This will be fixed soon.

trisdoan · 2024-03-11T07:18:06Z

Hi @llabusch93 and @nilshamerlinck, thank you for your review

I updated as you suggested.

llabusch93 · 2024-04-09T13:20:29Z

mail_composer_cc_bcc/wizards/mail_compose_message.py

+                )
+            else:
+                # DIFFERENT FROM ODOO NATIVE:
+                context = {


This change is imperative. Instead of augmenting the context, it's being overwritten. This leads to unintended consequences in the sales module, such as orders not being flagged as sent upon sending the quote, due to the replacement of the context key that the sales module relies on.

hello @llabusch93, I updated as you suggest 🙏

gurneyalex · 2024-04-09T16:16:16Z

/ocabot migration mail_composer_cc_bcc

llabusch93

Looks good to me now.

mmequignon · 2024-05-15T14:56:27Z

mail_composer_cc_bcc_account/wizards/account_move_send.py

+                    self.move_ids, wizard.mail_template_id
+                )
+                wizard.partner_bcc_ids = self._get_default_mail_partner_bcc_ids(
+                    self.move_ids, wizard.mail_template_id


Suggested change

self.move_ids, wizard.mail_template_id

)

wizard.partner_bcc_ids = self._get_default_mail_partner_bcc_ids(

self.move_ids, wizard.mail_template_id

wizard.move_ids, wizard.mail_template_id

)

wizard.partner_bcc_ids = self._get_default_mail_partner_bcc_ids(

wizard.move_ids, wizard.mail_template_id

you are iterating over possibly multiple wizards

mmequignon · 2024-05-15T14:58:15Z

mail_composer_cc_bcc_account/wizards/account_move_send.py

+    def _get_default_mail_partner_cc_ids(self, move, mail_template):
+        partners = self.env["res.partner"].with_company(move.company_id)
+        if mail_template.email_cc:
+            for mail_data in tools.email_split(mail_template.email_cc):
+                partners |= partners.find_or_create(mail_data)
+        return partners
+
+    def _get_default_mail_partner_bcc_ids(self, move, mail_template):
+        partners = self.env["res.partner"].with_company(move.company_id)
+        if mail_template.email_bcc:
+            for mail_data in tools.email_split(mail_template.email_bcc):
+                partners |= partners.find_or_create(mail_data)
+        return partners


You're almost doing twice the same thing here. Would it be possible to factorize this code ?
Also, building a new recordset of partners from a set of partner ids with browse is more efficient than appending records multiple times.

mmequignon · 2024-05-15T15:03:55Z

mail_composer_cc_bcc_account/wizards/account_move_send.py

+        new_message = move.with_context(
+            no_new_invoice=True,
+            mail_notify_author=self.env.user.partner_id.id in partner_ids,
+            is_from_composer=True,
+            partner_cc_ids=self.partner_cc_ids,
+            partner_bcc_ids=self.partner_bcc_ids,
+        ).message_post(
+            message_type="comment",
+            **kwargs,
+            **{
+                "email_layout_xmlid": "mail.mail_notification_layout_with_responsible_signature",  # noqa: E501
+                "email_add_signature": not mail_template,
+                "mail_auto_delete": mail_template.auto_delete,
+                "mail_server_id": mail_template.mail_server_id.id,
+                "reply_to_force_new": False,
+            },
+        )


not blocking, but I would prefer having this in more steps.

Suggested change

new_message = move.with_context(

no_new_invoice=True,

mail_notify_author=self.env.user.partner_id.id in partner_ids,

is_from_composer=True,

partner_cc_ids=self.partner_cc_ids,

partner_bcc_ids=self.partner_bcc_ids,

).message_post(

message_type="comment",

**kwargs,

**{

"email_layout_xmlid": "mail.mail_notification_layout_with_responsible_signature", # noqa: E501

"email_add_signature": not mail_template,

"mail_auto_delete": mail_template.auto_delete,

"mail_server_id": mail_template.mail_server_id.id,

"reply_to_force_new": False,

},

)

move_with_context = move.with_context(

no_new_invoice=True,

mail_notify_author=self.env.user.partner_id.id in partner_ids,

is_from_composer=True,

partner_cc_ids=self.partner_cc_ids,

partner_bcc_ids=self.partner_bcc_ids,

)

extra_args = {

"email_layout_xmlid": "mail.mail_notification_layout_with_responsible_signature",

"email_add_signature": not mail_template,

"mail_auto_delete": mail_template.auto_delete,

"mail_server_id": mail_template.mail_server_id.id,

"reply_to_force_new": False,

"message_type": "comment"

}

kwargs.update(extra_args)

move_with_context.message_post(**kwargs)

gurneyalex · 2024-05-31T06:20:31Z

@trisdoan can you check @mmequignon's comments?

trisdoan · 2024-06-01T04:07:06Z

Hello @mmequignon, @gurneyalex I took your suggestions into account 🙏

trisdoan · 2024-06-24T02:10:28Z

Hello @mmequignon's , how does it look to you?

Currently translated at 83.3% (15 of 18 strings) Translation: social-16.0/social-16.0-mail_composer_cc_bcc Translate-URL: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_composer_cc_bcc/es/

Currently translated at 100.0% (18 of 18 strings) Translation: social-16.0/social-16.0-mail_composer_cc_bcc Translate-URL: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_composer_cc_bcc/es/

Currently translated at 100.0% (18 of 18 strings) Translation: social-16.0/social-16.0-mail_composer_cc_bcc Translate-URL: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_composer_cc_bcc/it/

trisdoan · 2024-07-21T15:13:03Z

Hello @gurneyalex, could you please remerge

hbrunn · 2024-07-22T05:42:39Z

/ocabot merge nobump

OCA-git-bot · 2024-07-22T05:42:46Z

On my way to merge this fine PR!
Prepared branch 17.0-ocabot-merge-pr-1312-by-hbrunn-bump-nobump, awaiting test results.

OCA-git-bot · 2024-07-22T05:48:50Z

Congratulations, your PR was merged at 8270ee8. Thanks a lot for contributing to OCA. ❤️

trisdoan force-pushed the 17.0-mig-mail_composer_cc_bcc branch from a8827f8 to b5b55df Compare February 21, 2024 02:57

trisdoan marked this pull request as draft February 21, 2024 03:11

trisdoan force-pushed the 17.0-mig-mail_composer_cc_bcc branch 3 times, most recently from ac57d71 to 1966425 Compare February 23, 2024 08:37

trisdoan marked this pull request as ready for review February 23, 2024 08:39

trisdoan mentioned this pull request Feb 23, 2024

Migration to version 17.0 #1251

Open

30 tasks

nilshamerlinck mentioned this pull request Mar 4, 2024

[15.0] mail_composer_cc_bcc: Mail tracking fails after installing #1260

Closed

trisdoan force-pushed the 17.0-mig-mail_composer_cc_bcc branch from 1966425 to f964a6a Compare March 11, 2024 07:16

trisdoan force-pushed the 17.0-mig-mail_composer_cc_bcc branch 2 times, most recently from 672de7d to 2772470 Compare March 11, 2024 07:36

llabusch93 reviewed Apr 9, 2024

View reviewed changes

OCA-git-bot added this to the 17.0 milestone Apr 9, 2024

trisdoan force-pushed the 17.0-mig-mail_composer_cc_bcc branch 3 times, most recently from dcbc48f to 38027cc Compare April 21, 2024 06:24

trisdoan requested a review from llabusch93 April 21, 2024 06:26

llabusch93 approved these changes May 11, 2024

View reviewed changes

mmequignon reviewed May 15, 2024

View reviewed changes

trisdoan force-pushed the 17.0-mig-mail_composer_cc_bcc branch from d102f75 to f9826d2 Compare June 1, 2024 04:04

trisdoan requested a review from mmequignon June 24, 2024 02:09

mmequignon approved these changes Jul 19, 2024

View reviewed changes

OCA-git-bot added the approved label Jul 19, 2024

nilshamerlinck and others added 20 commits July 21, 2024 22:04

[FIX] mail_composer_cc_bcc: don't impact mass_mailing

79293ca

[FIX] mail_composer_cc_bcc: changes upstream

d755529

[MIG] mail_composer_cc_bcc: Migrate to version 16.0

08ca935

[UPD] Update mail_composer_cc_bcc.pot

423042b

Added translation using Weblate (Spanish)

9a2adea

Translated using Weblate (Spanish)

a0fde5e

Currently translated at 83.3% (15 of 18 strings) Translation: social-16.0/social-16.0-mail_composer_cc_bcc Translate-URL: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_composer_cc_bcc/es/

Translated using Weblate (Spanish)

2198d5e

Currently translated at 100.0% (18 of 18 strings) Translation: social-16.0/social-16.0-mail_composer_cc_bcc Translate-URL: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_composer_cc_bcc/es/

Added translation using Weblate (Italian)

00c9613

Translated using Weblate (Italian)

742fb42

Currently translated at 100.0% (18 of 18 strings) Translation: social-16.0/social-16.0-mail_composer_cc_bcc Translate-URL: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_composer_cc_bcc/it/

[FIX] mail_composer_cc_bcc: find invoice regardless of the current year

8a1ee50

[BOT] post-merge updates

e7a5b94

[IMP] mail_composer_cc_bcc: pre-commit

c0f4e5c

[MIG] mail_composer_cc_bcc: Migration to 17.0

23c95a7

mail_composer_cc_bcc: fix authorship

154eccd

[IMP] mail_compose_cc_bcc: split off account specific part

921b468

[UPD] Update mail_composer_cc_bcc_account.pot

9e01fd3

[BOT] post-merge updates

192e723

Added translation using Weblate (Italian)

55399ba

[IMP] mail_composer_cc_bcc_account: pre-commit

2f8bea8

[MIG] mail_composer_cc_bcc_account: Migration to 17.0

217a993

trisdoan force-pushed the 17.0-mig-mail_composer_cc_bcc branch from f9826d2 to 217a993 Compare July 21, 2024 15:08

OCA-git-bot added the bot is merging ⏳ label Jul 22, 2024

OCA-git-bot merged commit a7d3b2b into OCA:17.0 Jul 22, 2024
5 of 7 checks passed

OCA-git-bot added merged 🎉 and removed bot is merging ⏳ labels Jul 22, 2024

andrel-exo mentioned this pull request Sep 30, 2024

[17.0][FIX] mail_composer_cc_bcc_account: use _get_partner_ids_from_mail method #1450

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[17.0][MIG] mail_composer_cc_bcc: Migration to 17.0 #1312

[17.0][MIG] mail_composer_cc_bcc: Migration to 17.0 #1312

trisdoan commented Feb 21, 2024 •

edited

Loading

llabusch93 commented Mar 8, 2024

nilshamerlinck commented Mar 8, 2024

trisdoan commented Mar 11, 2024

llabusch93 Apr 9, 2024

trisdoan Apr 21, 2024

gurneyalex commented Apr 9, 2024

llabusch93 left a comment

mmequignon May 15, 2024

mmequignon May 15, 2024

mmequignon May 15, 2024

gurneyalex commented May 31, 2024

trisdoan commented Jun 1, 2024

trisdoan commented Jun 24, 2024

trisdoan commented Jul 21, 2024

hbrunn commented Jul 22, 2024

OCA-git-bot commented Jul 22, 2024

OCA-git-bot commented Jul 22, 2024

[17.0][MIG] mail_composer_cc_bcc: Migration to 17.0 #1312

[17.0][MIG] mail_composer_cc_bcc: Migration to 17.0 #1312

Conversation

trisdoan commented Feb 21, 2024 • edited Loading

1) Summary of changes in 17.0

2) Consequences

3) This change

llabusch93 commented Mar 8, 2024

nilshamerlinck commented Mar 8, 2024

trisdoan commented Mar 11, 2024

llabusch93 Apr 9, 2024

Choose a reason for hiding this comment

trisdoan Apr 21, 2024

Choose a reason for hiding this comment

gurneyalex commented Apr 9, 2024

llabusch93 left a comment

Choose a reason for hiding this comment

mmequignon May 15, 2024

Choose a reason for hiding this comment

mmequignon May 15, 2024

Choose a reason for hiding this comment

mmequignon May 15, 2024

Choose a reason for hiding this comment

gurneyalex commented May 31, 2024

trisdoan commented Jun 1, 2024

trisdoan commented Jun 24, 2024

trisdoan commented Jul 21, 2024

hbrunn commented Jul 22, 2024

OCA-git-bot commented Jul 22, 2024

OCA-git-bot commented Jul 22, 2024

trisdoan commented Feb 21, 2024 •

edited

Loading