diff options
| author | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-12-28 18:37:48 +0530 |
|---|---|---|
| committer | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-12-28 18:37:48 +0530 |
| commit | 5740ac50bda231dcf8dd9ceb7074411129fd7cff (patch) | |
| tree | 0a4061d18e95076c08d0d5e68a40053c905700a8 /addons/plugin/plugin_handler.py | |
| parent | 82dd48691ba5ea5c6062d68763c3be2e81fc750a (diff) | |
| parent | 76fa5eda36abd38b62f8efef5b9a9fcc260bf1e1 (diff) | |
[MERGE]: Merge with latest trunk addons
bzr revid: rpa@tinyerp.com-20111228130748-kss1ptv0z8l0lz57
Diffstat (limited to 'addons/plugin/plugin_handler.py')
| -rw-r--r-- | addons/plugin/plugin_handler.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py index 1fccae814b2..ef990170e64 100644 --- a/addons/plugin/plugin_handler.py +++ b/addons/plugin/plugin_handler.py @@ -39,9 +39,9 @@ class plugin_handler(osv.osv_memory): (model_name, res_id, url, name_get) """ mail_message_obj = self.pool.get('mail.message') - model = False + model = "" res_id = 0 - url = False + url = "" name = "" msg = mail_message_obj.parse_message(email) references = [msg.get('message-id')] @@ -93,6 +93,7 @@ class plugin_handler(osv.osv_memory): msg = mail_message.parse_message(email) message_id = msg.get('message-id') mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)]) + if message_id and mail_ids : mail_record = mail_message.browse(cr, uid, mail_ids)[0] res_id = mail_record.res_id @@ -104,8 +105,12 @@ class plugin_handler(osv.osv_memory): res_id = model_obj.message_new(cr, uid, msg) notify = "Mail succefully pushed, a new %s has been created " % model else: - model_obj.message_append_dict(cr, uid, [res_id], msg) + if model == 'res.partner': + model_obj = self.pool.get('mail.thread') + res = self.pool.get(model).browse(cr, uid, [res_id]) + model_obj.message_append_dict(cr, uid, res, msg) notify = "Mail succefully pushed" + url = self._make_url(cr, uid, res_id, model) return (model, res_id, url, notify) |