[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130617095141-74uttqtw60iorl5g

diff --cc addons/mail/mail_thread.py
Simple merge

diff --cc addons/mail/static/src/js/mail.js
Simple merge

diff --cc addons/mail/tests/test_mail_base.py
index 0de2dc3,7ca8b93..b0f9f72
--- 1/addons/mail/tests/test_mail_base.py
--- 2/addons/mail/tests/test_mail_base.py
+++ b/addons/mail/tests/test_mail_base.py
@@@ -69,10 -69,11 +69,11 @@@ class TestMailBase(common.TransactionCa
          self.group_employee_id = group_employee_ref and group_employee_ref[1] or False
  
          # Test users to use through the various tests
+         self.res_users.write(cr, uid, uid, {'name': 'Administrator'})
          self.user_raoul_id = self.res_users.create(cr, uid,
 -            {'name': 'Raoul Grosbedon', 'signature': 'SignRaoul', 'email': 'raoul@raoul.fr', 'login': 'raoul', 'groups_id': [(6, 0, [self.group_employee_id])]})
 +            {'name': 'Raoul Grosbedon', 'signature': 'SignRaoul', 'email': 'raoul@raoul.fr', 'login': 'raoul', 'alias_name': 'raoul', 'groups_id': [(6, 0, [self.group_employee_id])]})
          self.user_bert_id = self.res_users.create(cr, uid,
 -            {'name': 'Bert Tartignole', 'signature': 'SignBert', 'email': 'bert@bert.fr', 'login': 'bert', 'groups_id': [(6, 0, [])]})
 +            {'name': 'Bert Tartignole', 'signature': 'SignBert', 'email': 'bert@bert.fr', 'login': 'bert', 'alias_name': 'bert', 'groups_id': [(6, 0, [])]})
          self.user_raoul = self.res_users.browse(cr, uid, self.user_raoul_id)
          self.user_bert = self.res_users.browse(cr, uid, self.user_bert_id)
          self.user_admin = self.res_users.browse(cr, uid, uid)

diff --cc addons/mail/tests/test_mail_features.py
Simple merge

diff --cc addons/mail/tests/test_mail_gateway.py
Simple merge

diff --cc addons/project/project_view.xml
Simple merge

diff --cc addons/project_issue/project_issue_view.xml
Simple merge