[MERGE] Sync with trunk

bzr revid: ypa@tinyerp.com-20140404114223-zalha5tvp2l0ov8f
bzr revid: rim@openerp.com-20140414091137-icatnn1humn7kisc

diff --cc openerp/addons/base/res/res_partner.py
index 722d022,896f455..6ed0a84
--- 1/openerp/addons/base/res/res_partner.py
--- 2/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@@ -228,12 -229,12 +229,12 @@@ class res_partner(osv.osv, format_addre
      _order = "display_name"
      _columns = {
          'name': fields.char('Name', size=128, required=True, select=True),
-         'display_name': fields.function(_display_name, type='char', string='Name', store=_display_name_store_triggers),
+         'display_name': fields.function(_display_name, type='char', string='Name', store=_display_name_store_triggers, select=True),
          'date': fields.date('Date', select=1),
          'title': fields.many2one('res.partner.title', 'Title'),
-         'parent_id': fields.many2one('res.partner', 'Related Company'),
+         'parent_id': fields.many2one('res.partner', 'Related Company', select=True),
          'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts', domain=[('active','=',True)]), # force "active_test" domain to bypass _search() override
 -        'ref': fields.char('Reference', size=64, select=1),
 +        'ref': fields.char('Contact Reference', size=64, select=1),
          'lang': fields.selection(_lang_get, 'Language',
              help="If the selected language is loaded in the system, all documents related to this contact will be printed in this language. If not, it will be English."),
          'tz': fields.selection(_tz_get,  'Timezone', size=64,