[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 4912 rev-id: odo@openerp...
authorOlivier Dony <odo@openerp.com>
Wed, 16 Oct 2013 11:18:00 +0000 (13:18 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 16 Oct 2013 11:18:00 +0000 (13:18 +0200)
commit54f740960ef64f157842eee74dbd037c821d0dbc
treeb4d58ce92bdfecd5e9a11714d584ced48f80774e
parent3a16a8ac1746db4ac0590eff6433873d767c21d5
parent77caeeeba56d404a2dab1ac6c67a3a7f6419fb3a
[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 4912 rev-id: odo@openerp.com-20131016110621-36vvlpn8dgsabyt1

bzr revid: odo@openerp.com-20131016111800-jjybreg62bwz61zn
openerp/addons/base/ir/ir_attachment.py
openerp/addons/base/ir/ir_model.py
openerp/addons/base/ir/ir_translation.py
openerp/modules/registry.py
openerp/osv/fields.py
openerp/osv/orm.py