Browse Source

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

Conflicts:
	web_debranding/README.rst
pull/2/head
Ivan Yelizariev 9 years ago
parent
commit
37c48e0125
  1. 2
      __openerp__.py
  2. 5
      doc/changelog.rst
  3. 2
      mail_move_message_models.py

2
__openerp__.py

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

5
doc/changelog.rst

@ -3,6 +3,11 @@
Changelog 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` `1.0.2`
------- -------

2
mail_move_message_models.py

@ -37,7 +37,7 @@ class wizard(models.TransientModel):
parts = email_split(email_from.replace(' ',',')) parts = email_split(email_from.replace(' ',','))
if parts: if parts:
email = parts[0] 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: else:
name, email = email_from name, email = email_from
res['message_name_from'] = name res['message_name_from'] = name

Loading…
Cancel
Save