Merge remote-tracking branch 'origin/8.0' into 9.0-dev

Conflicts:
	web_debranding/README.rst

__openerp__.py

@@ -1,6 +1,6 @@
 {
     'name' : 'Mail relocation',
-    'version' : '1.0.2',
+    'version' : '1.0.3',
     'author' : 'IT-Projects LLC, Ivan Yelizariev',
     'license': 'LGPL-3',
     'category' : 'Social Network',

doc/changelog.rst

@@ -3,6 +3,11 @@
 Changelog
 =========
 
+`1.0.3`
+-------
+
+- FIX email_from parsing. There was an error with specific email_from value (e.g. '"name @ example" <name@example.com>')
+
 `1.0.2`
 -------
 

mail_move_message_models.py

@@ -37,7 +37,7 @@ class wizard(models.TransientModel):
             parts = email_split(email_from.replace(' ',','))
             if parts:
                 email = parts[0]
-                name = email_from[:email_from.index(email)].replace('"', '').replace('<', '').strip() or email_from
+                name = email_from.find(email) != -1 and email_from[:email_from.index(email)].replace('"', '').replace('<', '').strip() or email_from
             else:
                 name, email = email_from
             res['message_name_from'] = name