[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 5 Apr 2013 13:32:37 +0000 (15:32 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 5 Apr 2013 13:32:37 +0000 (15:32 +0200)
commit2ab15ddeaf8769bb6cd4d8b4d8ba549d6202b5a4
treed7c3f054b973004cd25f3d5eca34dc7b4d701ea0
parentbef293af4b585cbf8701c5d72fe59f1cf1b9c9f2
parent58ccbfc1845e0b4991a7a040237d3a1804ed6f20
[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20130405110750-1dd4y02xz3wb6ill
bzr revid: tde@openerp.com-20130405133237-n7k66b3w0b3a17o3
openerp/addons/base/ir/ir_actions.py
openerp/addons/base/res/res_partner_view.xml
openerp/osv/orm.py