diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-08-03 09:14:54 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-08-03 09:14:54 +0200 |
| commit | 8a408f2ff39059ef87e331e340a8dc125f71eea8 (patch) | |
| tree | 7bb784e5f0910bed151158034c60b78a564673cc /addons/fetchmail | |
| parent | febdd29d765a7936b8777e0e4c492ffe70c4a46f (diff) | |
| parent | 4ccc1b94574bfa1666a0d0987ebaa00252e0ed79 (diff) | |
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120803071454-ictuwjq0y3gri4f8
Diffstat (limited to 'addons/fetchmail')
| -rw-r--r-- | addons/fetchmail/__init__.py | 2 | ||||
| -rw-r--r-- | addons/fetchmail/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/addons/fetchmail/__init__.py b/addons/fetchmail/__init__.py index 7703c4d2f5b..7d666479965 100644 --- a/addons/fetchmail/__init__.py +++ b/addons/fetchmail/__init__.py @@ -3,7 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved -# mga@tinyerp.com +# mga@openerp.com # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py index 35b692990d7..1e8c57a9524 100644 --- a/addons/fetchmail/__openerp__.py +++ b/addons/fetchmail/__openerp__.py @@ -3,7 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved -# mga@tinyerp.com +# mga@openerp.com # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 9567f7746f3..3325ae38c0b 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -80,10 +80,9 @@ <field name="arch" type="xml"> <search string="Search Incoming Mail Servers"> <field name="name" string="Incoming Mail Server"/> - <separator orientation="vertical"/> <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/> <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/> - <separator orientation="vertical"/> + <separator/> <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/> </search> </field> |