diff options
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/models/mail_message.py | 2 | ||||
| -rw-r--r-- | addons/mail/models/mail_template.py | 2 | ||||
| -rw-r--r-- | addons/mail/models/mail_thread.py | 9 | ||||
| -rw-r--r-- | addons/mail/models/res_partner.py | 2 | ||||
| -rw-r--r-- | addons/mail/models/res_users.py | 2 | ||||
| -rw-r--r-- | addons/mail/wizard/invite.py | 2 | ||||
| -rw-r--r-- | addons/mail/wizard/mail_compose_message.py | 2 |
7 files changed, 10 insertions, 11 deletions
diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py index cc3bc3d886b..fd3b15e409d 100644 --- a/addons/mail/models/mail_message.py +++ b/addons/mail/models/mail_message.py @@ -656,7 +656,7 @@ class Message(models.Model): SUPERUSER_ID, to be sure to have the record name correctly stored. """ model = values.get('model', self.env.context.get('default_model')) res_id = values.get('res_id', self.env.context.get('default_res_id')) - if not model or not res_id or model not in self.pool: + if not model or not res_id or model not in self.env: return False return self.env[model].sudo().browse(res_id).name_get()[0][1] diff --git a/addons/mail/models/mail_template.py b/addons/mail/models/mail_template.py index 6e6f03e2797..e44f0b3ed59 100644 --- a/addons/mail/models/mail_template.py +++ b/addons/mail/models/mail_template.py @@ -497,7 +497,7 @@ class MailTemplate(models.Model): report_service = report.report_name if report.report_type in ['qweb-html', 'qweb-pdf']: - result, format = self.pool['report'].get_pdf(self._cr, self._uid, [res_id], report_service, context=Template._context), 'pdf' + result, format = Template.env['report'].get_pdf([res_id], report_service), 'pdf' else: result, format = odoo_report.render_report(self._cr, self._uid, [res_id], report_service, {'model': template.model}, Template._context) diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index e88024b17fc..3980ebd4b3f 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -786,8 +786,7 @@ class MailThread(models.AbstractModel): def message_capable_models(self): """ Used by the plugin addon, based for plugin_outlook and others. """ ret_dict = {} - for model_name in self.pool.obj_list(): - model = self.pool[model_name] + for model_name, model in self.env.iteritems(): if hasattr(model, "message_process") and hasattr(model, "message_post"): ret_dict[model_name] = model._description return ret_dict @@ -846,9 +845,9 @@ class MailThread(models.AbstractModel): message_id, route, message) # Wrong model - if model and model not in self.pool: + if model and model not in self.env: if assert_model: - assert model in self.pool, 'Routing: unknown target model %s' % model + assert model in self.env, 'Routing: unknown target model %s' % model _warn('unknown target model %s' % model) return () @@ -1025,7 +1024,7 @@ class MailThread(models.AbstractModel): # do not match forwarded emails from another OpenERP system (thread_id collision!) if local_hostname == reply_hostname: thread_id, model = reply_thread_id, reply_model - if thread_id and model in self.pool: + if thread_id and model in self.env: record = self.env[model].browse(thread_id) compat_mail_msg_ids = MailMessage.search([ ('message_id', '=', False), diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py index 6d624ed0517..2e47dacc1dc 100644 --- a/addons/mail/models/res_partner.py +++ b/addons/mail/models/res_partner.py @@ -96,7 +96,7 @@ class Partner(models.Model): # custom values custom_values = dict() - if message.model and message.res_id and self.pool.get(message.model) and hasattr(self.pool[message.model], 'message_get_email_values'): + if message.res_id and message.model in self.env and hasattr(self.env[message.model], 'message_get_email_values'): custom_values = self.env[message.model].browse(message.res_id).message_get_email_values(message) mail_values = { diff --git a/addons/mail/models/res_users.py b/addons/mail/models/res_users.py index e188b9f9e75..9e4294df3cd 100644 --- a/addons/mail/models/res_users.py +++ b/addons/mail/models/res_users.py @@ -115,7 +115,7 @@ class Users(models.Model): @api.multi def message_partner_info_from_emails(self, emails, link_mail=False): - return self.pool.get('mail.thread').message_partner_info_from_emails(emails, link_mail=link_mail) + return self.env['mail.thread'].message_partner_info_from_emails(emails, link_mail=link_mail) @api.multi def message_get_suggested_recipients(self): diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py index a70b98f53e0..2069f887895 100644 --- a/addons/mail/wizard/invite.py +++ b/addons/mail/wizard/invite.py @@ -18,7 +18,7 @@ class Invite(models.TransientModel): if self._context.get('mail_invite_follower_channel_only'): result['send_mail'] = False if 'message' in fields and model and res_id: - model_name = self.env['ir.model'].search([('model', '=', self.pool[model]._name)]).name_get()[0][1] + model_name = self.env['ir.model'].search([('model', '=', model)]).name_get()[0][1] document_name = self.env[model].browse(res_id).name_get()[0][1] message = _('<div><p>Hello,</p><p>%s invited you to follow %s document: %s.</p></div>') % (user_name, model_name, document_name) result['message'] = message diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index e60ac5db4e7..585d1128a7a 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -65,7 +65,7 @@ class MailComposer(models.TransientModel): result['model'] = result.get('model', self._context.get('active_model')) result['res_id'] = result.get('res_id', self._context.get('active_id')) result['parent_id'] = result.get('parent_id', self._context.get('message_id')) - if 'no_auto_thread' not in result and (not result['model'] or not result['model'] in self.pool or not hasattr(self.env[result['model']], 'message_post')): + if 'no_auto_thread' not in result and (result['model'] not in self.env or not hasattr(self.env[result['model']], 'message_post')): result['no_auto_thread'] = True # default values according to composition mode - NOTE: reply is deprecated, fall back on comment |