diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:40:59 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:40:59 +0200 |
| commit | baf494c67ba7ecba331b24bcfa5eed9bde8a16da (patch) | |
| tree | 3b2c9ec3cacabcf0a5b0fb78a667d5e1b27505dc /addons/mail/models | |
| parent | 133490b4d0e347d75bab20da8e5e0ad1f95d3a2d (diff) | |
| parent | 1d81bb06a47b1aee1b7a0dcdaa03084ddedf8b7b (diff) | |
[MERGE] forward port of branch saas-9 up to 1d81bb0
# Conflicts:
# addons/account_extra_reports/i18n/ca.po
# addons/account_extra_reports/i18n/fi.po
# addons/account_extra_reports/i18n/pl.po
# addons/account_extra_reports/i18n/te.po
# addons/account_extra_reports/i18n/zh_CN.po
# addons/account_full_reconcile/i18n/hu.po
# addons/account_full_reconcile/i18n/pl.po
# addons/crm/crm_lead_menu.xml
# addons/crm_claim/i18n/es_PE.po
# addons/crm_claim/i18n/hu.po
# addons/crm_claim/i18n/ja.po
# addons/crm_claim/i18n/pl.po
# addons/delivery/views/delivery_view.xml
# addons/product/product_view.xml
# addons/project_timesheet/i18n/es_PE.po
# addons/stock/stock_view.xml
Diffstat (limited to 'addons/mail/models')
| -rw-r--r-- | addons/mail/models/mail_message.py | 1 | ||||
| -rw-r--r-- | addons/mail/models/mail_thread.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py index 70b88d544d3..0962bd8c111 100644 --- a/addons/mail/models/mail_message.py +++ b/addons/mail/models/mail_message.py @@ -304,6 +304,7 @@ class Message(models.Model): 'changed_field': tracking.field_desc, 'old_value': tracking.get_old_display_value()[0], 'new_value': tracking.get_new_display_value()[0], + 'field_type': tracking.field_type, }) for tracking in trackings) # 4. Update message dictionaries diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index a09e41af0b6..022eb147ad0 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 @@ -601,7 +602,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')) |