diff options
Diffstat (limited to 'addons/fetchmail')
| -rw-r--r-- | addons/fetchmail/fetchmail.py | 16 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 48 |
2 files changed, 32 insertions, 32 deletions
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index a1209492490..3fae834b045 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -110,7 +110,7 @@ class email_server(osv.osv): def set_draft(self, cr, uid, ids, context=None): self.write(cr, uid, ids , {'state':'draft'}) return True - + def button_confirm_login(self, cr, uid, ids, context=None): if context is None: context = {} @@ -127,7 +127,7 @@ class email_server(osv.osv): imap_server.login(server.user, server.password) ret_server = imap_server - + elif server.type == 'pop': pop_server = None if server.is_ssl: @@ -140,7 +140,7 @@ class email_server(osv.osv): pop_server.user(server.user) pop_server.pass_(server.password) ret_server = pop_server - + self.write(cr, uid, [server.id], {'state':'done'}) if context.get('get_server',False): return ret_server @@ -207,9 +207,9 @@ class email_server(osv.osv): email_server() -class mailgate_message(osv.osv): +class email_message(osv.osv): - _inherit = "mailgate.message" + _inherit = "email.message" _columns = { 'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True), @@ -229,7 +229,7 @@ class mailgate_message(osv.osv): values['server_id'] = server_id if server_type: values['server_type'] = server_type - res = super(mailgate_message,self).create(cr, uid, values, context=context) + res = super(email_message,self).create(cr, uid, values, context=context) return res def write(self, cr, uid, ids, values, context=None): @@ -241,9 +241,9 @@ class mailgate_message(osv.osv): values['server_id'] = server_id if server_type: values['server_type'] = server_type - res = super(mailgate_message,self).write(cr, uid, ids, values, context=context) + res = super(email_message,self).write(cr, uid, ids, values, context=context) return res -mailgate_message() +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 7d55f9f5a7a..d029ab5b97a 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <openerp> <data> - + <record model="ir.ui.view" id="view_email_server_tree"> <field name="name">email.server.tree</field> <field name="model">email.server</field> @@ -18,7 +18,7 @@ </tree> </field> </record> - + <record model="ir.ui.view" id="view_email_server_form"> <field name="name">email.server.form</field> <field name="model">email.server</field> @@ -68,7 +68,7 @@ </form> </field> </record> - + <record model="ir.ui.view" id="view_email_server_search"> <field name="name">email.server.search</field> <field name="model">email.server</field> @@ -91,7 +91,7 @@ </search> </field> </record> - + <record model="ir.actions.act_window" id="action_email_server_tree"> <field name="name">Email Servers</field> <field name="res_model">email.server</field> @@ -101,18 +101,18 @@ <field name="search_view_id" ref="view_email_server_search"/> </record> - <menuitem - parent="base.menu_mail_gateway" + <menuitem + parent="base.menu_mail_gateway" id="menu_action_fetchmail_server_tree" - action="action_email_server_tree" + action="action_email_server_tree" name="Email Servers" /> - - <record model="ir.ui.view" id="mailgate_message_tree_view"> - <field name="name">mailgate.message.tree</field> - <field name="model">mailgate.message</field> + + <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="type">tree</field> - <field name="inherit_id" ref="mail_gateway.view_mailgate_message_tree"/> + <field name="inherit_id" ref="email.view_email_message_tree"/> <field name="arch" type="xml"> <field name="user_id" position="after"> <field name="server_id" select="1"/> @@ -120,12 +120,12 @@ </field> </field> </record> - - <record model="ir.ui.view" id="mailgate_message_search_view"> - <field name="name">mailgate.message.inherit.search</field> - <field name="model">mailgate.message</field> + + <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="type">search</field> - <field name="inherit_id" ref="mail_gateway.view_mailgate_message_search"/> + <field name="inherit_id" ref="email.view_email_message_search"/> <field name="arch" type="xml"> <xpath expr="/search/field[@name='name']" position="before"> <filter string="Emails" name="emails" domain="[('server_id','!=',False)]" icon="terp-mail-message-new"/> @@ -136,24 +136,24 @@ </xpath> </field> </record> - + <record id="action_view_mail_message_emails" model="ir.actions.act_window"> <field name="name">Messages</field> - <field name="res_model">mailgate.message</field> + <field name="res_model">email.message</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> <field name="context">{'search_default_emails': 1}</field> - <field name="search_view_id" ref="mailgate_message_search_view"/> + <field name="search_view_id" ref="email_message_search_view"/> </record> - + <menuitem id="base.menu_email_gateway_form" parent="base.menu_mail_gateway" action="action_view_mail_message_emails" /> - <act_window + <act_window context="{'server_id': active_id}" domain="[('server_id', '=', active_id)]" id="act_server_history" name="Emails" - res_model="mailgate.message" src_model="email.server"/> - + res_model="email.message" src_model="email.server"/> + </data> </openerp> |