[MERGE] OPW 35611: fix sorting for object with multilevel inheritance
authorXavier ALT <xal@openerp.com>
Wed, 14 Mar 2012 12:49:12 +0000 (13:49 +0100)
committerXavier ALT <xal@openerp.com>
Wed, 14 Mar 2012 12:49:12 +0000 (13:49 +0100)
bzr revid: xal@openerp.com-20120314124912-1o65aw3ljx0ura3q

1  2 
bin/osv/fields.py
bin/osv/orm.py

Simple merge
diff --cc bin/osv/orm.py
Simple merge