diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-14 19:27:16 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-14 19:27:16 +0200 |
| commit | f9072c789d85e8c97e68325c02b46686f52d5bc3 (patch) | |
| tree | 8f0773df41de3e97459fc07c36e836ae3c84373c /addons/mail/models/mail_thread.py | |
| parent | 89f424dd2819966581894ade2ff6d71d4906ba7e (diff) | |
| parent | bfbe2d6e6d181da3877acebfee1a701cbd6493fc (diff) | |
[MERGE] forward port of branch 9.0 up to bfbe2d6
# Conflicts:
# addons/marketing/i18n/es_PE.po
# addons/marketing/i18n/hu.po
Diffstat (limited to 'addons/mail/models/mail_thread.py')
| -rw-r--r-- | addons/mail/models/mail_thread.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index fb2b5cbf846..373c0c95562 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -4,6 +4,7 @@ import base64 import datetime import dateutil import email +import json import lxml from lxml import etree import logging @@ -560,7 +561,7 @@ class MailThread(models.AbstractModel): link = '/mail/workflow?%s' % url_encode(params) elif link_type == 'method': method = kwargs.pop('method') - params = dict(base_params, method=method, params=kwargs) + params = dict(base_params, method=method, params=json.dumps(kwargs)) link = '/mail/method?%s' % url_encode(params) elif link_type == 'new': params = dict(base_params, action_id=kwargs.get('action_id')) |