diff options
| author | Raphael Collet <rco@openerp.com> | 2012-02-03 11:12:08 +0100 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-02-03 11:12:08 +0100 |
| commit | 4395b5d7c652a51a6410a75abd1d1b39f6137081 (patch) | |
| tree | 3c0da376204c1d28f5c8b806708873b9b2efceca /addons/plugin/plugin_handler.py | |
| parent | 4f82cd0c51fc88dd0854463e3a751aa3aee68b41 (diff) | |
| parent | e33ce2e84a1b4c0dd295ffd8b649852e8b79487d (diff) | |
[MERGE] from trunk
bzr revid: rco@openerp.com-20120203101208-pjt250tn8yqa26r8
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) |