OLD 8.0 2015 09 08

Conflict:

diff --cc openerp/addons/base/res/res_users.py
index 4b96200,e5c24bb..0000000
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@@ -32,9 -32,9 +32,10 @@@ from openerp import SUPERUSER_ID, model
  from openerp import tools
  import openerp.exceptions
  from openerp.osv import fields, osv, expression
+ from openerp.service.security import check_super
  from openerp.tools.translate import _
  from openerp.http import request
 +from openerp.service.security import check_super
  
  _logger = logging.getLogger(__name__)
  
@@@ -427,7 -427,7 +428,11 @@@ class res_users(osv.osv)
          return dataobj.browse(cr, uid, data_id, context=context).res_id
  
      def check_super(self, passwd):
++<<<<<<< HEAD
 +        check_super(passwd)
++=======
+         return check_super(passwd)
++>>>>>>> odoo/8.0
  
      def check_credentials(self, cr, uid, password):
          """ Override this method to plug additional authentication methods"""

resolved by

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 4b96200..e5c24bb 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -32,9 +32,9 @@ from openerp import SUPERUSER_ID, models
 from openerp import tools
 import openerp.exceptions
 from openerp.osv import fields, osv, expression
+from openerp.service.security import check_super
 from openerp.tools.translate import _
 from openerp.http import request
-from openerp.service.security import check_super
 
 _logger = logging.getLogger(__name__)
 
@@ -427,7 +427,7 @@ class res_users(osv.osv):
         return dataobj.browse(cr, uid, data_id, context=context).res_id
 
     def check_super(self, passwd):
-        check_super(passwd)
+        return check_super(passwd)
 
     def check_credentials(self, cr, uid, password):
         """ Override this method to plug additional authentication methods"""

(which is letting https://github.com/odoo/odoo/commit/20f69bbc win against https://github.com/OCA/OCB/commit/a1345ab)

in https://github.com/OCA/OCB/commit/d49b099 by @hbrunn