From 81e782250a19821feb3fb528f80e84d98527162b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 8 Feb 2022 16:25:16 +0000 Subject: [PATCH] [IMP] base: remove postmaster-odoo default bounce Coming from odoo/odoo@a4597fe34fcfa8dae28b156410080346bb33af33 . This code is not necessary anymore since we better handle From, SMTP-From, as well as allowing mail server filtering. We can now use standard aliases and servers instead of relying on hardcoded value "postmaster-odoo". Task-2784996 closes odoo/odoo#85837 Signed-off-by: Thibault Delavallee (tde) --- odoo/addons/base/models/ir_mail_server.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/odoo/addons/base/models/ir_mail_server.py b/odoo/addons/base/models/ir_mail_server.py index 79b678c6605..5fe2af31701 100644 --- a/odoo/addons/base/models/ir_mail_server.py +++ b/odoo/addons/base/models/ir_mail_server.py @@ -440,11 +440,11 @@ class IrMailServer(models.Model): If "mail.catchall.domain" is not set, return None. ''' - get_param = self.env['ir.config_parameter'].sudo().get_param - postmaster = get_param('mail.bounce.alias', default='postmaster-odoo') - domain = get_param('mail.catchall.domain') - if postmaster and domain: - return '%s@%s' % (postmaster, domain) + ICP = self.env['ir.config_parameter'].sudo() + bounce_alias = ICP.get_param('mail.bounce.alias') + domain = ICP.get_param('mail.catchall.domain') + if bounce_alias and domain: + return '%s@%s' % (bounce_alias, domain) return @api.model