[MERGE] forward port of branch saas-3 up to f7a76cb

[odoo/odoo.git] / openerp / addons / base / ir / ir_mail_server.py

diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index 30d9d88..638eb38 100644 (file)
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -149,10 +149,14 @@ def encode_rfc2822_address_header(header_text):
     addresses = getaddresses([tools.ustr(header_text).encode('utf-8')])
     return COMMASPACE.join(map(encode_addr, addresses))
 
+
 class ir_mail_server(osv.osv):
     """Represents an SMTP server, able to send outgoing emails, with SSL and TLS capabilities."""
     _name = "ir.mail_server"
 
+    NO_VALID_RECIPIENT = ("At least one valid recipient address should be "
+                          "specified for outgoing emails (To/Cc/Bcc)")
+
     _columns = {
         'name': fields.char('Description', required=True, select=True),
         'smtp_host': fields.char('SMTP Server', required=True, help="Hostname or IP of SMTP server"),
@@ -400,7 +404,7 @@ class ir_mail_server(osv.osv):
         email_bcc = message['Bcc']
         
         smtp_to_list = filter(None, tools.flatten(map(extract_rfc2822_addresses,[email_to, email_cc, email_bcc])))
-        assert smtp_to_list, "At least one valid recipient address should be specified for outgoing emails (To/Cc/Bcc)"
+        assert smtp_to_list, self.NO_VALID_RECIPIENT
 
         x_forge_to = message['X-Forge-To']
         if x_forge_to: