[MERGE] forward port of branch 7.0 up to revid 5274 chs@openerp.com-20140404141611...
authorChristophe Simonis <chs@openerp.com>
Fri, 4 Apr 2014 15:58:58 +0000 (17:58 +0200)
committerChristophe Simonis <chs@openerp.com>
Fri, 4 Apr 2014 15:58:58 +0000 (17:58 +0200)
commit120342d53730babb37f97c2aaab2453526289e22
tree50640bec9487c01f7692c7f2083f3aa1caef008d
parent4335ff0712e4b7da4f78c708b348c5442aa774da
parent53d8055cd8ad38e0fd135ae58afb713b7c16f48f
[MERGE] forward port of branch 7.0 up to revid 5274 chs@openerp.com-20140404141611-qi1yagltvkd9q8ji

bzr revid: chs@openerp.com-20140404155858-mvupqmuvi8ime2tl
openerp/addons/base/res/res_partner.py
openerp/osv/expression.py