fix

bzr revid: fp@tinyerp.com-20120610120614-oe3plgxr1364um0q

openerp/addons/base/ir/ir_ui_view.py

@@ -78,8 +78,7 @@ class view(osv.osv):
             if not record.inherit_id:
                 return record
             else:
-                parent = self.browse(cr, uid, record.inherit_id.id, context)
-                return root_view(parent)
+                return root_view(record.inherit_id)
         def call_view(record):
             try:
                 root = root_view(record)
@@ -124,26 +123,13 @@ class view(osv.osv):
            :rtype: list of tuples
            :return: [(view_arch,view_id), ...]
         """
-        if self.pool._init:
-            cr.execute("""SELECT
-                    arch, id
-                FROM
-                    ir_ui_view
-                WHERE
-                    inherit_id=%s AND model=%s
-                ORDER BY priority""", (view_id, model))
-        else:
-            cr.execute("""SELECT
-                    v.arch, v.id
-                FROM
-                    ir_ui_view v
-                LEFT JOIN
-                    ir_model_data d ON (d.res_id=v.id AND d.model='ir.ui.view')
-                LEFT JOIN
-                    ir_module_module m ON (m.state='installed' AND m.name=d.module)
-                WHERE
-                    inherit_id=%s AND model=%s
-                ORDER BY priority""", (view_id, model))
+        cr.execute("""SELECT
+                arch, id
+            FROM
+                ir_ui_view
+            WHERE
+                inherit_id=%s AND model=%s
+            ORDER BY priority""", (view_id, model))
         return cr.fetchall()
 
     def write(self, cr, uid, ids, vals, context=None):

openerp/modules/db.py

@@ -68,7 +68,7 @@ def initialize(cr):
         category_id = create_categories(cr, categories)
 
         if info['installable']:
-            if info['auto_install'] and not info['depends']:
+            if info['auto_install']:
                 state = 'to install'
             else:
                 state = 'uninstalled'