[MERGE] forward port of branch 7.0 up to revid 5148 mat@openerp.com-20131125125008...
authorChristophe Simonis <chs@openerp.com>
Mon, 25 Nov 2013 15:10:17 +0000 (16:10 +0100)
committerChristophe Simonis <chs@openerp.com>
Mon, 25 Nov 2013 15:10:17 +0000 (16:10 +0100)
commit3211a29d9b79f4809e77cb072f8a23ab26fec460
treeb836eb96043741308547ec43927c957801976190
parent043fe6c2d5a75ef5301f66a70e038ca16b7441df
parent9635119fc10fed19ec65160cd45868d98de4bef8
[MERGE] forward port of branch 7.0 up to revid 5148 mat@openerp.com-20131125125008-wmpssjk5vygdcc0w

bzr revid: chs@openerp.com-20131125151017-lmj53bxg1pfrr4a7
openerp/osv/fields.py
openerp/osv/orm.py
openerp/tools/misc.py