Merge lp:~unifield-team/unifield-web/us-1497 into lp:unifield-web

[Quentin THEURET @Amaris]

=== modified file 'addons/openerp/controllers/utils.py'
--- addons/openerp/controllers/utils.py	2015-07-13 13:49:40 +0000
+++ addons/openerp/controllers/utils.py	2016-07-18 14:07:16 +0000
@@ -150,6 +150,9 @@
                 nb_mod = rpc.session.number_update_modules(db) or ''
                 return login(cherrypy.request.path_info, message=_('The server is updating %s modules, please wait ...') % (nb_mod,),
                     db=db, user=user, action=action, origArgs=get_orig_args(kw))
+            if action == 'login' and login_ret == -4:
+                return login(cherrypy.request.path_info, message=_('A script during patch failed! Login is forbidden for the moment. Please contact your administrator'),
+                    db=db, user=user, action=action, origArgs=get_orig_args(kw))
             elif login_ret <= 0:
                 # Bad login attempt
                 if action == 'login':

=== modified file 'addons/openerp/utils/rpc.py'
--- addons/openerp/utils/rpc.py	2016-03-04 15:34:25 +0000
+++ addons/openerp/utils/rpc.py	2016-07-18 14:07:16 +0000
@@ -134,6 +134,8 @@
                 common.error('updater.py', err.code)
             elif err.code.startswith('ServerUpdate'):
                 common.error('ServerUpdate', err.code)
+            elif err.code.startswith('PatchFailed'):
+                common.error('PatchFailed', err.code)
             elif err.code.startswith('AccessDenied'):
                 raise openobject.errors.AccessDenied(err.code, _('Access Denied'))
             else:
@@ -308,6 +310,8 @@
                 return -2
             elif e.title == 'ServerUpdate':
                 return -3
+            elif e.title == 'PatchFailed':
+                return -4
             return -1
 
         if uid <= 0: