[IMP] base: remove postmaster-odoo default bounce
Coming from odoo/odoo@a4597fe34f . 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) <tde@openerp.com>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user