diff options
Diffstat (limited to 'addons/fetchmail')
| -rw-r--r-- | addons/fetchmail/fetchmail.py | 11 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 14 |
2 files changed, 12 insertions, 13 deletions
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 3fe296c50bf..f201ff7560d 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -149,7 +149,7 @@ class email_server(osv.osv): def fetch_mail(self, cr, uid, ids, context=None): if context is None: context = {} - thread_pool = self.pool.get('email.thread') + thread_pool = self.pool.get('mail.thread') action_pool = self.pool.get('ir.actions.server') context.update({'get_server': True}) for server in self.browse(cr, uid, ids, context=context): @@ -201,9 +201,9 @@ class email_server(osv.osv): email_server() -class email_message(osv.osv): +class mail_message(osv.osv): - _inherit = "email.message" + _inherit = "mail.message" _columns = { 'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True), @@ -215,7 +215,7 @@ class email_message(osv.osv): server_id = context.get('server_id',False) if server_id: values['server_id'] = server_id - res = super(email_message,self).create(cr, uid, values, context=context) + res = super(mail_message,self).create(cr, uid, values, context=context) return res def write(self, cr, uid, ids, values, context=None): @@ -224,9 +224,8 @@ class email_message(osv.osv): server_id = context.get('server_id',False) if server_id: values['server_id'] = server_id - res = super(email_message,self).write(cr, uid, ids, values, context=context) + res = super(mail_message,self).write(cr, uid, ids, values, context=context) return res -email_message() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index bdf25b40f74..d3470cec6eb 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -109,8 +109,8 @@ /> <record model="ir.ui.view" id="email_message_tree_view"> - <field name="name">email.message.tree</field> - <field name="model">email.message</field> + <field name="name">mail.message.tree</field> + <field name="model">mail.message</field> <field name="type">tree</field> <field name="inherit_id" ref="mail.view_email_message_tree"/> <field name="arch" type="xml"> @@ -121,8 +121,8 @@ </record> <record model="ir.ui.view" id="email_message_search_view"> - <field name="name">email.message.inherit.search</field> - <field name="model">email.message</field> + <field name="name">mail.message.inherit.search</field> + <field name="model">mail.message</field> <field name="type">search</field> <field name="inherit_id" ref="mail.view_email_message_search"/> <field name="arch" type="xml"> @@ -134,7 +134,7 @@ <record id="action_view_mail_message_emails" model="ir.actions.act_window"> <field name="name">Messages</field> - <field name="res_model">email.message</field> + <field name="res_model">mail.message</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> <field name="context">{'search_default_emails': 1}</field> @@ -143,8 +143,8 @@ <act_window context="{'search_default_server_id': [active_id], 'default_server_id': active_id}" - id="act_server_history" name="Messages" domain="[('history', '=', True), ('server_id', '=', active_id)]" - res_model="email.message" src_model="email.server"/> + id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('server_id', '=', active_id)]" + res_model="mail.message" src_model="email.server"/> </data> </openerp> |