[MERGE] Merge trunk-social-tde branch.

bzr revid: bth@tinyerp.com-20120319060832-pa890xvvtdw0tfht
This commit is contained in:
Bhumi Thakkar (Open ERP)
2012-03-19 11:38:32 +05:30
+2 -1
View File
@@ -73,7 +73,8 @@ class mail_thread(osv.osv):
# OpenSocial: message_ids_social is a dummy field that should not be used
_columns = {
'message_ids_social': fields.function(_get_message_ids, method=True,
type='one2many', obj='mail.message', string='Temp messages'),
type='one2many', obj='mail.message', string='Temp messages',
_fields_id = 'res_id'),
}
#------------------------------------------------------