diff options
| author | Olivier Dony <odo@openerp.com> | 2011-10-13 19:03:27 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2011-10-13 19:03:27 +0200 |
| commit | 3bffe65b2ca8bc50ece644e7947ad2bbd5c9341a (patch) | |
| tree | b307874680dbdce7b2f5109b7b696ea38e679e20 /addons/mail | |
| parent | a93ca01b5b1365f92e191e3c429ef655e751b455 (diff) | |
| parent | 8a7c61cb96a541a9aaca51ffe3ee903407b26360 (diff) | |
[MERGE] sync with latest trunk
bzr revid: odo@openerp.com-20111013170327-9rvfdkbgj01hdgxb
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/mail/mail_installer.xml | 4 | ||||
| -rw-r--r-- | addons/mail/static/scripts/__init__.py (renamed from addons/mail/scripts/__init__.py) | 0 | ||||
| -rwxr-xr-x | addons/mail/static/scripts/openerp_mailgate.py (renamed from addons/mail/scripts/openerp_mailgate/openerp_mailgate.py) | 0 | ||||
| -rw-r--r-- | addons/mail/static/scripts/openerp_mailgate/__init__.py (renamed from addons/mail/scripts/openerp_mailgate/__init__.py) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index 08473cad102..47d731aa4e5 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -22,7 +22,7 @@ { 'name': 'Email Subsystem', 'version': '1.0', - 'category': 'Tools', + 'category': 'Hidden', 'complexity': "easy", 'description': """ A generic email subsystem with message storage and queuing diff --git a/addons/mail/mail_installer.xml b/addons/mail/mail_installer.xml index 3faf5fad630..022bff6e53b 100644 --- a/addons/mail/mail_installer.xml +++ b/addons/mail/mail_installer.xml @@ -2,11 +2,11 @@ <openerp> <data> <record model="ir.actions.act_window" id="action_configure_email_server"> - <field name="name">Configure Email Server</field> + <field name="name">Configure Email Servers</field> <field name="type">ir.actions.act_window</field> <field name="res_model">ir.mail_server</field> <field name="view_type">form</field> - <field name="view_mode">form</field> + <field name="view_mode">tree,form</field> </record> <record model="ir.actions.todo" id="config_wizard_action_configure_email_server"> diff --git a/addons/mail/scripts/__init__.py b/addons/mail/static/scripts/__init__.py index 3b6a8c7e4b0..3b6a8c7e4b0 100644 --- a/addons/mail/scripts/__init__.py +++ b/addons/mail/static/scripts/__init__.py diff --git a/addons/mail/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail/static/scripts/openerp_mailgate.py index 68ae20d35e3..68ae20d35e3 100755 --- a/addons/mail/scripts/openerp_mailgate/openerp_mailgate.py +++ b/addons/mail/static/scripts/openerp_mailgate.py diff --git a/addons/mail/scripts/openerp_mailgate/__init__.py b/addons/mail/static/scripts/openerp_mailgate/__init__.py index de2e2bf390d..de2e2bf390d 100644 --- a/addons/mail/scripts/openerp_mailgate/__init__.py +++ b/addons/mail/static/scripts/openerp_mailgate/__init__.py |