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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-08-04 14:54:20 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-08-09 15:13:26 +0000
@@ -73840,6 +73840,7 @@
 #, python-format
 msgid "The value in the field \"Repeat\" must be greater than 0!"
 msgstr "La valeur dans le champ \"Périodicité\" doit être supérieure à 0 !"
+<<<<<<< TREE
 
 #. modules: account_override, account
 #: code:addons/account_override/account.py:0
@@ -73853,3 +73854,11 @@
 #, python-format
 msgid "The entry must be balanced."
 msgstr "L'écriture doit être équilibrée."
+=======
+
+#. module: sync_client                                                                                                                                          
+#: code:addons/sync_client/sync_client.py:56                                                                                                                    
+#, python-format                                                                                                                                                
+msgid "PatchFailed: A script during upgrade has failed. Synchronization is forbidden. Please contact your administrator"                                        
+msgstr "PatchFailed: Un script a échoué pendant la mise à jour. La synchronizsation est désactivée. Veuillez contacter votre administrateur"
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/sync_client/sync_client.py'
--- bin/addons/sync_client/sync_client.py	2016-08-04 14:38:59 +0000
+++ bin/addons/sync_client/sync_client.py	2016-08-09 15:13:26 +0000
@@ -51,6 +51,13 @@
 MAX_EXECUTED_MESSAGES = 500
 
 
+def check_patch_scripts(cr, uid, context=None):
+    if pooler.get_pool(cr.dbname).get('patch.scripts').search(cr, uid, [('run', '=', False)], limit=1, context=context):
+        return _('PatchFailed: A script during upgrade has failed. Synchronization is forbidden. Please contact your administrator')
+    else:
+        return ''
+
+
 class SkipStep(StandardError):
     pass
 
@@ -67,6 +74,9 @@
             chk_tz_msg = check_tz()
             if chk_tz_msg:
                 raise osv.except_osv(_('Error'), chk_tz_msg)
+            patch_failed = check_patch_scripts(cr, uid, context=context)
+            if patch_failed:
+                raise osv.except_osv(_('Error'), patch_failed)
             entity = pool.get('sync.client.entity')
             # Lookup method to call
             self.call_method = getattr(entity, method)
@@ -134,6 +144,10 @@
                 chk_tz_msg = check_tz()
                 if chk_tz_msg:
                     raise BaseException(chk_tz_msg)
+                patch_failed = check_patch_scripts(cr, uid, context=context)
+                if patch_failed:
+                    raise BaseException(patch_failed)
+
                 res = fn(self, self.sync_cursor, uid, *args, **kwargs)
             except osv.except_osv, e:
                 logger.switch(step, 'failed')
@@ -170,6 +184,9 @@
             chk_tz_msg = check_tz()
             if chk_tz_msg:
                 raise osv.except_osv(_('Error'), chk_tz_msg)
+            patch_failed = check_patch_scripts(cr, uid, context=kwargs.get('context', {}))
+            if patch_failed:
+                raise osv.except_osv(_('Error'), patch_failed)
             # First, check if we can acquire the lock or return False
             sync_lock = self.sync_lock
             if not sync_lock.acquire(blocking=False):