From 4b432d169d5967c8547a633db55e971e2a79bec8 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 3 Apr 2017 14:36:27 +0200 Subject: [PATCH] [FIX] base: the doctstring is a lie --- odoo/addons/base/ir/ir_mail_server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/odoo/addons/base/ir/ir_mail_server.py b/odoo/addons/base/ir/ir_mail_server.py index 37a8126aaac..2cd8ce7e99e 100644 --- a/odoo/addons/base/ir/ir_mail_server.py +++ b/odoo/addons/base/ir/ir_mail_server.py @@ -375,10 +375,10 @@ class IrMailServer(models.Model): The default bounce address is used to set the envelop address if no envelop address is provided in the message. It is formed by properly - joining the parameters "mail.catchall.alias" and + joining the parameters "mail.bounce.alias" and "mail.catchall.domain". - If "mail.catchall.alias" is not set it defaults to "postmaster-odoo". + If "mail.bounce.alias" is not set it defaults to "postmaster-odoo". If "mail.catchall.domain" is not set, return None.