[FIX] share: move inheritance from res.user before the one from res.groups because res.groups need the change on res.users in its init() function.

[FIX] share: call parent init() if present in res.groups

bzr revid: chs@openerp.com-20140403153129-jq9zc7ityoy25c73

1 files changed, 11 insertions, 10 deletions

diff --git a/addons/share/res_users.py b/addons/share/res_users.py
index 9f0a47c6674..fb0dd163b6e 100644
--- a/addons/share/res_users.py
+++ b/addons/share/res_users.py
@@ -21,6 +21,14 @@
 from openerp.osv import fields, osv
 from openerp import SUPERUSER_ID
 
+class res_users(osv.osv):
+    _name = 'res.users'
+    _inherit = 'res.users'
+    _columns = {
+        'share': fields.boolean('Share User', readonly=True,
+                    help="External user with limited access, created only for the purpose of sharing data.")
+     }
+
 class res_groups(osv.osv):
     _name = "res.groups"
     _inherit = 'res.groups'
@@ -32,6 +40,9 @@ class res_groups(osv.osv):
     def init(self, cr):
         # force re-generation of the user groups view without the shared groups
         self.update_user_groups_view(cr, SUPERUSER_ID)
+        parent_class = super(res_groups, self)
+        if hasattr(parent_class, 'init'):
+            parent_class.init(cr)
 
     def get_application_groups(self, cr, uid, domain=None, context=None):
         if domain is None:
@@ -39,15 +50,5 @@ class res_groups(osv.osv):
         domain.append(('share', '=', False))
         return super(res_groups, self).get_application_groups(cr, uid, domain=domain, context=context)
 
-res_groups()
-
-class res_users(osv.osv):
-    _name = 'res.users'
-    _inherit = 'res.users'
-    _columns = {
-        'share': fields.boolean('Share User', readonly=True,
-                    help="External user with limited access, created only for the purpose of sharing data.")
-     }
-res_users()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: