diff options
| author | Rifakat Haradwala (Open ERP) <rha@tinyerp.com> | 2011-04-04 15:15:52 +0530 |
|---|---|---|
| committer | Rifakat Haradwala (Open ERP) <rha@tinyerp.com> | 2011-04-04 15:15:52 +0530 |
| commit | 47a85e9f8f0fadf16d679a2f1fdbef0ef1c59440 (patch) | |
| tree | 32bf79e1e9b0a587856135710d4ce60f7a6373d9 /addons/fetchmail | |
| parent | faa13b7332e5a8917c028474c1fdbc47921d622c (diff) | |
[IMP] mail: rename module email to mail because of parsing error
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
Diffstat (limited to 'addons/fetchmail')
| -rw-r--r-- | addons/fetchmail/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail.py | 6 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py index acef441b882..b955ab013fb 100644 --- a/addons/fetchmail/__openerp__.py +++ b/addons/fetchmail/__openerp__.py @@ -24,7 +24,7 @@ { "name" : "Fetchmail Server", "version" : "1.0", - "depends" : ["base", 'email'], + "depends" : ["base", 'mail'], "author" : "OpenERP SA", "category": 'Tools', "description": """ diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 7e514141fea..5749fd423ca 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -146,7 +146,7 @@ class email_server(osv.osv): if context.get('get_server',False): return ret_server except Exception, e: - logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (e)) + logger.notifyChannel(server.type, netsvc.LOG_ERROR, '%s' % (e)) return True def button_fetch_mail(self, cr, uid, ids, context=None): @@ -183,7 +183,7 @@ class email_server(osv.osv): logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch/process %s email(s) from %s' % (count, server.name)) except Exception, e: - logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e))) + logger.notifyChannel(server.type, netsvc.LOG_ERROR, '%s' % (tools.ustr(e))) finally: if imap_server: imap_server.close() @@ -203,7 +203,7 @@ class email_server(osv.osv): pop_server.dele(num) logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name)) except Exception, e: - logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e))) + logger.notifyChannel(server.type, netsvc.LOG_ERROR, '%s' % (tools.ustr(e))) finally: if pop_server: pop_server.quit() diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 2bbe251856a..785cec55c5d 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -102,7 +102,7 @@ </record> <menuitem - parent="email.menu_config_email" + parent="mail.menu_config_email" id="menu_action_fetchmail_server_tree" action="action_email_server_tree" name="Incomming Servers" @@ -112,7 +112,7 @@ <field name="name">email.message.tree</field> <field name="model">email.message</field> <field name="type">tree</field> - <field name="inherit_id" ref="email.view_email_message_tree"/> + <field name="inherit_id" ref="mail.view_email_message_tree"/> <field name="arch" type="xml"> <field name="user_id" position="after"> <field name="server_id" select="1"/> @@ -124,7 +124,7 @@ <field name="name">email.message.inherit.search</field> <field name="model">email.message</field> <field name="type">search</field> - <field name="inherit_id" ref="email.view_email_message_search"/> + <field name="inherit_id" ref="mail.view_email_message_search"/> <field name="arch" type="xml"> <xpath expr="/search/group/filter[@string='Thread']" position="before"> <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/> @@ -141,7 +141,7 @@ <field name="search_view_id" ref="email_message_search_view"/> </record> - <act_window + <act_window context="{'search_default_server_id': [active_id], 'default_server_id': active_id}" id="act_server_history" name="Emails" res_model="email.message" src_model="email.server"/> |