diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index d8a79dd98e0..7226daf57ed 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -27,6 +27,7 @@ from openerp.osv import fields, osv
from openerp.tools import ustr
from openerp.modules.registry import RegistryManager
from openerp import SUPERUSER_ID
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
@@ -129,16 +130,18 @@ class mail_alias(osv.Model):
]
def name_get(self, cr, uid, ids, context=None):
- """Return the mail alias display alias_name, inclusing the implicit
- mail catchall domain from config.
- e.g. `jobs@openerp.my.openerp.com` or `sales@openerp.my.openerp.com`
+ """Return the mail alias display alias_name, including the implicit
+ mail catchall domain if exists from config otherwise "New Alias".
+ e.g. `jobs@openerp.my.openerp.com` or `jobs` or 'New Alias'
"""
res = []
for record in self.browse(cr, uid, ids, context=context):
if record.alias_name and record.alias_domain:
res.append((record['id'], "%s@%s" % (record.alias_name, record.alias_domain)))
+ elif record.alias_name:
+ res.append((record['id'], "%s" % (record.alias_name)))
else:
- res.append((record['id'], False))
+ res.append((record['id'], _("Inactive Alias")))
return res
def _find_unique(self, cr, uid, name, context=None):
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 92e041bdc4c..76a12bc564d 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -41,6 +41,7 @@ class mail_mail(osv.Model):
_description = 'Outgoing Mails'
_inherits = {'mail.message': 'mail_message_id'}
_order = 'id desc'
+ _rec_name = 'subject'
_columns = {
'mail_message_id': fields.many2one('mail.message', 'Message', required=True, ondelete='cascade'),
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index 52a8d2beadf..1eec45843c3 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -10,13 +10,14 @@
+
- by on
+ by on
@@ -38,7 +39,6 @@
-
diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml
index da47e6f1642..0fa9480f080 100644
--- a/addons/report_webkit/header_view.xml
+++ b/addons/report_webkit/header_view.xml
@@ -5,12 +5,12 @@
ir.header_img