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

[Quentin THEURET @Amaris]

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2016-06-30 20:39:20 +0000
+++ bin/addons/msf_profile/msf_profile.py	2016-07-18 14:07:23 +0000
@@ -31,6 +31,7 @@
 
 class patch_scripts(osv.osv):
     _name = 'patch.scripts'
+    _logger = logging.getLogger('patch_scripts')
 
     _columns = {
         'model': fields.text(string='Model', required=True),
@@ -48,8 +49,16 @@
         for ps in ps_obj.read(cr, uid, ps_ids, ['model', 'method']):
             method = ps['method']
             model_obj = self.pool.get(ps['model'])
-            getattr(model_obj, method)(cr, uid, *a, **b)
-            self.write(cr, uid, [ps['id']], {'run': True})
+            try:
+                getattr(model_obj, method)(cr, uid, *a, **b)
+                self.write(cr, uid, [ps['id']], {'run': True})
+            except Exception as e:
+                err_msg = 'Error with the patch scripts %s.%s :: %s' % (ps['model'], ps['method'], e)
+                self._logger.error(err_msg)
+                raise osv.except_osv(
+                    'Error',
+                    err_msg,
+                )
 
     def us_993_patch(self, cr, uid, *a, **b):
         # set no_update to True on USB group_type not to delete it on
@@ -653,8 +662,9 @@
         if setup_br:
             sale_percent = 1 + (setup_br.sale_price/100.00)
 
+
         sql = """UPDATE product_template SET standard_price = 1.00, list_price = %s WHERE standard_price = 0.00"""
-        cr.execute(sql, (sale_percent,))
+        cr.execute(sql, (sale_percent, ))
         return True
 
 patch_scripts()
 
=== modified file 'bin/service/security.py'
--- bin/service/security.py	2016-05-25 09:01:14 +0000
+++ bin/service/security.py	2016-07-18 14:07:23 +0000
@@ -54,6 +54,8 @@
 def login(db, login, password):
     cr = pooler.get_db_only(db).cursor()
     nb = _get_number_modules(cr, testlogin=True)
+    cr.execute("SELECT count(id) FROM patch_scripts WHERE run = \'f\'")
+    patch_failed = cr.fetchone()
     to_update = False
     if not nb:
         to_update = updater.test_do_upgrade(cr)
@@ -63,9 +65,16 @@
                 kwargs={'threaded': True})
         s.start()
         raise Exception("ServerUpdate: Server is updating modules ...")
+
+
     pool = pooler.get_pool(db)
     user_obj = pool.get('res.users')
-    return user_obj.login(db, login, password)
+    user_res = user_obj.login(db, login, password)
+
+    if user_res != 1 and patch_failed[0]:
+        raise Exception("PatchFailed: A script during upgrade has failed. Login is forbidden. Please contact your administrator")
+
+    return user_res
 
 def check_super(passwd):
     if passwd == tools.config['admin_passwd']: