diff options
| author | Olivier Dony <odo@openerp.com> | 2014-05-28 17:45:31 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2014-05-28 17:45:31 +0200 |
| commit | e276ac33f614a97655e1b950abd71edae22e217a (patch) | |
| tree | a9516f2a2aef806bd99452b3ce10c4afe9c69f1d /addons/website_mail/controllers/main.py | |
| parent | b4283f027175cf80f83d57a1585cc1a8a3ea3b34 (diff) | |
| parent | bf135ad05798abaff0acc87fc19092cde5fd5c36 (diff) | |
[MERGE] Forward-port saas-4 up to bf135ad
Diffstat (limited to 'addons/website_mail/controllers/main.py')
| -rw-r--r-- | addons/website_mail/controllers/main.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py index de69fba490a..c0592000208 100644 --- a/addons/website_mail/controllers/main.py +++ b/addons/website_mail/controllers/main.py @@ -81,6 +81,7 @@ class WebsiteMail(http.Controller): 'is_user': uid != public_id, 'email': email, 'is_follower': False, + 'alias_name': False, } if not obj: @@ -95,8 +96,5 @@ class WebsiteMail(http.Controller): ('res_id', '=', obj_ids[0]), ('partner_id', '=', partner_id.id) ], context=context)) == 1 - if post.get('fields'): - record = obj.read(cr, SUPERUSER_ID, obj_ids[0], fields=post.get('fields'), context=context) - values.update(record) return values |