[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Thu, 23 May 2013 13:33:00 +0000 (15:33 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 23 May 2013 13:33:00 +0000 (15:33 +0200)
commit4de42dc5a867a5b76a524791bc0d44829582f1a1
treed44e935c59232b948a2f985fda518580e68d9d48
parenta1f1782cc061c05d277ff6860ef92dc77b9b5feb
parent6a3ace331d93610ed0d93e45be6994ca6267fe69
[MERGE] Sync with trunk

bzr revid: chm@openerp.com-20130415133654-l5b7zvga6mrv8bs3
bzr revid: tde@openerp.com-20130515082426-93tdl16rtm2kfz3a
bzr revid: tde@openerp.com-20130523133300-1el48hf8sotnvz62
openerp/addons/base/res/res_company.py
openerp/addons/base/res/res_partner_view.xml
openerp/addons/base/res/res_users.py