Take into account the new 'active' field on ir.model.access.

bzr revid: alexis@via.ecp.fr-20120713173835-azbi8iorq1ps2x35

diff --git a/addons/share/ir_model.py b/addons/share/ir_model.py
index 008dd42..0d90aec 100644 (file)
--- a/addons/share/ir_model.py
+++ b/addons/share/ir_model.py
@@ -40,6 +40,7 @@ class ir_model_access(osv.Model):
                         LEFT JOIN ir_module_category c ON (c.id=g.category_id)
                       WHERE
                         m.model=%s AND
+                        a.active IS true AND
                         (g.share IS NULL or g.share IS false) AND
                         a.perm_''' + access_mode, (model_name,))
         return [('%s/%s' % x) if x[0] else x[1] for x in cr.fetchall()]