bugfixes

bzr revid: fp@tinyerp.com-20090117192214-m317lkham92f97ps

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 0aabcb3..e598fd9 100644 (file)
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -261,6 +261,8 @@
                 <form string="Report xml">
                     <field name="name" select="1"/>
                     <field name="type" select="1"/>
+                    <field name="model" select="1"/>
+                    <newline/>
                     <field name="report_name" select="1"/>
                     <field name="report_xsl"/>
                     <field name="report_xml"/>

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 6507d27..61b379f 100644 (file)
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -296,6 +296,7 @@ class orm_template(object):
     _rec_name = 'name'
     _parent_name = 'parent_id'
     _parent_store = False
+    _parent_order = False
     _date_name = 'date'
     _order = 'id'
     _sequence = None
@@ -1365,6 +1366,8 @@ class orm(orm_template):
             where = self._parent_name+'='+str(root)
             if not root:
                 where = self._parent_name+' IS NULL'
+            if self._parent_order:
+                where += ' order by '+self._parent_order
             cr.execute('SELECT id FROM '+self._table+' WHERE '+where)
             pos2 = pos + 1
             childs = cr.fetchall()