From 0da4de6962f5777b42d608a83888acf02bd4a04c Mon Sep 17 00:00:00 2001 From: Jan Suhr Date: Mon, 11 May 2026 11:25:49 +0200 Subject: [PATCH 1/3] fix email_from --- website_mass_mailing_double_opt_in/controllers/main.py | 2 +- website_mass_mailing_double_opt_in/data/mail_template.xml | 1 + .../controllers/main.py | 3 +-- .../data/mail_template.xml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/website_mass_mailing_double_opt_in/controllers/main.py b/website_mass_mailing_double_opt_in/controllers/main.py index 65ce275c..629df137 100644 --- a/website_mass_mailing_double_opt_in/controllers/main.py +++ b/website_mass_mailing_double_opt_in/controllers/main.py @@ -96,7 +96,7 @@ def _prepare_mail_content(self, mailing_list_contact, language):

{best_regards}
{team}

""", - "email_from": request.env.user.partner_id.email, + "email_from": request.env.company.sudo().email, "email_to": mailing_list_contact.contact_id.email, "state": "outgoing", } diff --git a/website_mass_mailing_double_opt_in/data/mail_template.xml b/website_mass_mailing_double_opt_in/data/mail_template.xml index 8320d85c..7c03753e 100644 --- a/website_mass_mailing_double_opt_in/data/mail_template.xml +++ b/website_mass_mailing_double_opt_in/data/mail_template.xml @@ -5,6 +5,7 @@ Newsletter Subscription Confirm your newsletter subscription + {{ object.env.company.email }} {{ object.contact_id.email }}
diff --git a/website_mass_mailing_double_opt_in_nitrokey/controllers/main.py b/website_mass_mailing_double_opt_in_nitrokey/controllers/main.py index 9a9f29bf..784ef0fd 100644 --- a/website_mass_mailing_double_opt_in_nitrokey/controllers/main.py +++ b/website_mass_mailing_double_opt_in_nitrokey/controllers/main.py @@ -21,8 +21,7 @@ def _prepare_mail_content(self, mailing_list_contact, language): """Newsletter Subscribed email template content""" res = super()._prepare_mail_content(mailing_list_contact, language) # Get company information - user = request.env.user - company = user.company_id or request.env.company + company = request.env.company.sudo() if language == "de_DE": # Update subject res["subject"] = "Sie haben den Nitrokey Newsletter abonniert" diff --git a/website_mass_mailing_double_opt_in_nitrokey/data/mail_template.xml b/website_mass_mailing_double_opt_in_nitrokey/data/mail_template.xml index b6c599ff..a2f2bf7d 100644 --- a/website_mass_mailing_double_opt_in_nitrokey/data/mail_template.xml +++ b/website_mass_mailing_double_opt_in_nitrokey/data/mail_template.xml @@ -7,6 +7,7 @@ [Nitrokey Shop] Newsletter Subscription Confirm your newsletter subscription + {{ object.env.company.email }} {{ object.contact_id.email }}
From 40f24ff1d021331ff25a8c725360532d6178b811 Mon Sep 17 00:00:00 2001 From: Jan Suhr Date: Mon, 11 May 2026 12:33:13 +0200 Subject: [PATCH 2/3] default_from_email or partner_id.email --- website_mass_mailing_double_opt_in/controllers/main.py | 3 ++- website_mass_mailing_double_opt_in/data/mail_template.xml | 2 +- .../data/mail_template.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/website_mass_mailing_double_opt_in/controllers/main.py b/website_mass_mailing_double_opt_in/controllers/main.py index 629df137..c1260bc1 100644 --- a/website_mass_mailing_double_opt_in/controllers/main.py +++ b/website_mass_mailing_double_opt_in/controllers/main.py @@ -96,7 +96,8 @@ def _prepare_mail_content(self, mailing_list_contact, language):

{best_regards}
{team}

""", - "email_from": request.env.company.sudo().email, + "email_from": request.env.company.sudo().default_from_email + or request.env.company.sudo().partner_id.email, "email_to": mailing_list_contact.contact_id.email, "state": "outgoing", } diff --git a/website_mass_mailing_double_opt_in/data/mail_template.xml b/website_mass_mailing_double_opt_in/data/mail_template.xml index 7c03753e..2dff42b2 100644 --- a/website_mass_mailing_double_opt_in/data/mail_template.xml +++ b/website_mass_mailing_double_opt_in/data/mail_template.xml @@ -5,7 +5,7 @@ Newsletter Subscription Confirm your newsletter subscription - {{ object.env.company.email }} + {{ object.env.company.default_from_email or object.env.company.partner_id.email }} {{ object.contact_id.email }}
diff --git a/website_mass_mailing_double_opt_in_nitrokey/data/mail_template.xml b/website_mass_mailing_double_opt_in_nitrokey/data/mail_template.xml index a2f2bf7d..19a7eea1 100644 --- a/website_mass_mailing_double_opt_in_nitrokey/data/mail_template.xml +++ b/website_mass_mailing_double_opt_in_nitrokey/data/mail_template.xml @@ -7,7 +7,7 @@ [Nitrokey Shop] Newsletter Subscription Confirm your newsletter subscription - {{ object.env.company.email }} + {{ object.env.company.default_from_email or object.env.company.partner_id.email }} {{ object.contact_id.email }}
From 743da5a8622ade5899547408327e73e0c16d07fe Mon Sep 17 00:00:00 2001 From: Jan Suhr Date: Mon, 11 May 2026 12:37:15 +0200 Subject: [PATCH 3/3] fix syntax --- website_mass_mailing_double_opt_in/data/mail_template.xml | 4 +++- .../data/mail_template.xml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/website_mass_mailing_double_opt_in/data/mail_template.xml b/website_mass_mailing_double_opt_in/data/mail_template.xml index 2dff42b2..09ceb8d2 100644 --- a/website_mass_mailing_double_opt_in/data/mail_template.xml +++ b/website_mass_mailing_double_opt_in/data/mail_template.xml @@ -5,7 +5,9 @@ Newsletter Subscription Confirm your newsletter subscription - {{ object.env.company.default_from_email or object.env.company.partner_id.email }} + {{ object.env.company.default_from_email or object.env.company.partner_id.email }} {{ object.contact_id.email }}
diff --git a/website_mass_mailing_double_opt_in_nitrokey/data/mail_template.xml b/website_mass_mailing_double_opt_in_nitrokey/data/mail_template.xml index 19a7eea1..becf36c0 100644 --- a/website_mass_mailing_double_opt_in_nitrokey/data/mail_template.xml +++ b/website_mass_mailing_double_opt_in_nitrokey/data/mail_template.xml @@ -7,7 +7,9 @@ [Nitrokey Shop] Newsletter Subscription Confirm your newsletter subscription - {{ object.env.company.default_from_email or object.env.company.partner_id.email }} + {{ object.env.company.default_from_email or object.env.company.partner_id.email }} {{ object.contact_id.email }}