[MERGE]forward port of latest 7.0 bugfixes, up to rev 5017
authorDenis Ledoux <dle@openerp.com>
Thu, 27 Jun 2013 12:03:42 +0000 (14:03 +0200)
committerDenis Ledoux <dle@openerp.com>
Thu, 27 Jun 2013 12:03:42 +0000 (14:03 +0200)
commit9f4397fc85f74177a6423d14fa858785c684271d
treecae8c58a3dd0edd63feb52129aa849cc27e6f431
parentc0115e75975e205b2673880ad81623ce83210582
parent107df4be7370bdff83e0a6f33b43e4df6c240766
[MERGE]forward port of latest 7.0 bugfixes, up to rev 5017

rev 5017 = launchpad_translations_on_behalf_of_openerp-20130626061833-drxvzosffezp089g

bzr revid: dle@openerp.com-20130627120342-znttbs00q5bkf4ov
openerp/osv/fields.py
openerp/osv/orm.py