summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2011-09-06 18:52:04 +0200
committerOlivier Dony <odo@openerp.com>2011-09-06 18:52:04 +0200
commit2d87c2b12ec3557ee2cb25b97b0bf963bc3fa211 (patch)
treebe4d5882465a31af2960ecdb74a50271237d7f0d
parent1db8e54425bd72477d67e77c62a160b405370f09 (diff)
[IMP] mail: usability - better labels“
bzr revid: odo@openerp.com-20110906165204-sovbbbmvqrpttg7e
-rw-r--r--addons/mail/mail_data.xml2
-rw-r--r--addons/mail/mail_message.py2
-rw-r--r--addons/mail/mail_message_view.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/addons/mail/mail_data.xml b/addons/mail/mail_data.xml
index f0328bfa779..964552b951a 100644
--- a/addons/mail/mail_data.xml
+++ b/addons/mail/mail_data.xml
@@ -2,7 +2,7 @@
<openerp>
<data noupdate="1">
<record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
- <field name="name">Outgoing emails robot</field>
+ <field name="name">Email Queue Manager</field>
<field name="user_id" ref="base.user_root"/>
<field name="interval_number">1</field>
<field name="interval_type">hours</field>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 9ac983e269d..07d0aabe7cd 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -171,7 +171,7 @@ class mail_message(osv.osv):
('outgoing', 'Outgoing'),
('sent', 'Sent'),
('received', 'Received'),
- ('exception', 'Exception'),
+ ('exception', 'Delivery Failed'),
('cancel', 'Cancelled'),
], 'State', readonly=True),
'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it"),
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 0447590c134..c3ceb0740fa 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -102,7 +102,7 @@
<search string="Email Search">
<filter icon="terp-camera_test" string="Received" domain="[('state','=','received')]"/>
<filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
- <filter icon="terp-gtk-stop" string="Exception" domain="[('state','=','exception')]"/>
+ <filter icon="terp-gtk-stop" string="Failed" domain="[('state','=','exception')]"/>
<field name="email_from"/>
<field name="email_to"/>
<field name="subject"/>