From 91f7d177abdc6370df6c08d8d71479b27e7662c1 Mon Sep 17 00:00:00 2001 From: Veronika Kotovich Date: Thu, 10 Sep 2015 17:01:43 +0300 Subject: [PATCH 1/2] [IMP] Check 'filter by partner' checkbox after partner created --- static/src/js/mail_move_message.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/static/src/js/mail_move_message.js b/static/src/js/mail_move_message.js index acd3b13..a655407 100644 --- a/static/src/js/mail_move_message.js +++ b/static/src/js/mail_move_message.js @@ -76,6 +76,9 @@ openerp.mail_move_message = function (session) { }); pop.on('create_completed', self, function(id) { related_field.set_value(id); + if(self.field_manager.fields['filter_by_partner']) { + self.field_manager.fields['filter_by_partner'].set_value(true); + } }); }); } From f29da0171af9099cd070232bdff02ca24499ca3c Mon Sep 17 00:00:00 2001 From: Veronika Date: Tue, 15 Sep 2015 02:07:56 -0700 Subject: [PATCH 2/2] [IMP] mail_move_message: Move message from inbox and link with first message of record --- mail_move_message_models.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mail_move_message_models.py b/mail_move_message_models.py index 2b61289..2f78936 100644 --- a/mail_move_message_models.py +++ b/mail_move_message_models.py @@ -154,14 +154,17 @@ class wizard(models.TransientModel): 'target': 'new', 'context': {'default_message_id': message_id}, } + @api.multi def move(self): for r in self: r.check_access() - if r.parent_id: - if not (r.parent_id.model == r.model and - r.parent_id.res_id == r.res_id): - r.parent_id = None + if not r.parent_id or not (r.parent_id.model == r.model and + r.parent_id.res_id == r.res_id): + #link with the first message of record + parent = self.env['mail.message'].search([('model','=',r.model), ('res_id','=',r.res_id)], order='id', limit=1) + r.parent_id = parent.id or None + r.message_id.move(r.parent_id.id, r.res_id, r.model, r.move_back) if not ( r.model and r.res_id ):