[MERGE]sync with trunk.
authorDarshan Kalola (OpenERP) <dka@tinyerp.com>
Fri, 7 Feb 2014 04:54:17 +0000 (10:24 +0530)
committerDarshan Kalola (OpenERP) <dka@tinyerp.com>
Fri, 7 Feb 2014 04:54:17 +0000 (10:24 +0530)
commit75b6bbdda0826eea4ef2f695560313c35bb6e4c2
tree7a87d0331afe7c92d9fc6674e953cb208ad54188
parent8c29e64c0c2147f3a79154576eb48bae3591a4e7
parent9289a2608d04afb68ef8371e39271a74f7c4c382
[MERGE]sync with trunk.

bzr revid: dka@tinyerp.com-20140207045417-8chx8psmp9ipp4na
openerp/addons/base/res/res_partner.py
openerp/addons/base/res/res_partner_view.xml