[MERGE]sync with trunk.
authorDarshan Kalola (OpenERP) <dka@tinyerp.com>
Thu, 6 Mar 2014 08:42:24 +0000 (14:12 +0530)
committerDarshan Kalola (OpenERP) <dka@tinyerp.com>
Thu, 6 Mar 2014 08:42:24 +0000 (14:12 +0530)
commitd93f32aa08ed33dea4c243532b5bb1555d5b6e87
tree50df43013835b52c3551a701c433b2f258167c71
parent75b6bbdda0826eea4ef2f695560313c35bb6e4c2
parent4641a23d1448ad7536af03accc5e2de3773abbff
[MERGE]sync with trunk.

bzr revid: dka@tinyerp.com-20140306084224-t04yh1k0upd9uqh9
openerp/addons/base/res/res_partner.py