Merge lp:~jfb-tempo-consulting/unifield-server/US-6718-6712-6684 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/base/ir/ir.xml'
--- bin/addons/base/ir/ir.xml	2019-06-18 13:53:48 +0000
+++ bin/addons/base/ir/ir.xml	2020-01-27 10:41:32 +0000
@@ -1576,7 +1576,8 @@
             <field name="arch" type="xml">
                 <form string="Scheduled Actions">
                     <field name="name"/>
-                    <field name="active"/>
+                    <field name="active" attrs="{'readonly': [('manual_activation', '=', False)]}"/>
+                    <field name="manual_activation" invisible="1" />
                     <field name="user_id" />
                     <field name="priority" />
                     <notebook colspan="4">

=== modified file 'bin/addons/base/ir/ir_cron.py'
--- bin/addons/base/ir/ir_cron.py	2019-07-19 07:33:28 +0000
+++ bin/addons/base/ir/ir_cron.py	2020-01-27 10:41:32 +0000
@@ -60,7 +60,8 @@
         'model': fields.char('Object', size=64, help="Name of object whose function will be called when this scheduler will run. e.g. 'res.partener'"),
         'function': fields.char('Function', size=64, help="Name of the method to be called on the object when this scheduler is executed."),
         'args': fields.text('Arguments', help="Arguments to be passed to the method. e.g. (uid,)"),
-        'priority': fields.integer('Priority', help='0=Very Urgent\n10=Not urgent')
+        'priority': fields.integer('Priority', help='0=Very Urgent\n10=Not urgent'),
+        'manual_activation': fields.boolean('Manual Activation', internal=1, readonly=1, help='Used to set active as RO'),
     }
 
     _defaults = {
@@ -71,7 +72,8 @@
         'interval_type' : lambda *a: 'months',
         'numbercall' : lambda *a: 1,
         'active' : lambda *a: 1,
-        'doall' : lambda *a: 0
+        'doall' : lambda *a: 0,
+        'manual_activation': True
     }
 
     def _check_args(self, cr, uid, ids, context=None):

=== modified file 'bin/addons/base/res/res_currency.py'
--- bin/addons/base/res/res_currency.py	2019-10-31 14:53:19 +0000
+++ bin/addons/base/res/res_currency.py	2020-01-27 10:41:32 +0000
@@ -329,7 +329,7 @@
                 partner_list = ' / '.join(x.res_id.name for x in properties)
                 raise osv.except_osv(_('Error !'),
                                      _('You cannot uncheck the ESC checkbox because this currency is used on these \'ESC\' partners : \
-                                      %s' % partner_list))
+                                      %s') % partner_list)
 
         if 'active' in values and not values.get('currency_table_id', False) and pricelist_obj:
             if values['active'] == False:
@@ -501,7 +501,7 @@
                             date = line[0]
                         elif line[0] != date:
                             raise osv.except_osv(_('Error'),
-                                                 _("All dates should be equal for all lines in file %s." % file_to_import))
+                                                 _("All dates should be equal for all lines in file %s.") % file_to_import)
                 line_number += 1
 
             # check that this date is a real date

=== modified file 'bin/addons/msf_instance/data/instance_data.xml'
--- bin/addons/msf_instance/data/instance_data.xml	2018-02-22 14:23:17 +0000
+++ bin/addons/msf_instance/data/instance_data.xml	2020-01-27 10:41:32 +0000
@@ -15,18 +15,5 @@
             <field name="instance_id" ref="instance_section" />
         </record>
 
-        <record id="ir_cron_remote_backup" model="ir.cron" forcecreate="1">
-            <field name="function">send_backup</field>
-            <field name="user_id">1</field>
-            <field name="name">Send Remote Backup</field>
-            <field name="interval_type">days</field>
-            <field eval="-1" name="numbercall"/>
-            <field eval="5" name="priority"/>
-            <field eval="0" name="doall"/>
-            <field eval="0" name="active"/>
-            <field eval="1" name="interval_number"/>
-            <field name="model">msf.instance</field>
-        </record>
-
     </data>
 </openerp>

=== modified file 'bin/addons/msf_instance/data/remote_backup.xml'
--- bin/addons/msf_instance/data/remote_backup.xml	2019-07-19 07:33:28 +0000
+++ bin/addons/msf_instance/data/remote_backup.xml	2020-01-27 10:41:32 +0000
@@ -12,6 +12,7 @@
             <field eval="0" name="active"/>
             <field eval="1" name="interval_number"/>
             <field name="model">msf.instance.cloud</field>
+            <field name="manual_activation" eval="False" />
         </record>
 
     </data>

=== modified file 'bin/addons/msf_instance/msf_instance.py'
--- bin/addons/msf_instance/msf_instance.py	2019-07-30 10:04:51 +0000
+++ bin/addons/msf_instance/msf_instance.py	2020-01-27 10:41:32 +0000
@@ -680,7 +680,8 @@
                 to_write['active'] = False
             elif to_activate:
                 if not cron_data.active:
-                    to_write['active'] = True
+                    if self.pool.get('backup.config').search(cr, uid, [('backup_type', '=', 'sharepoint')]):
+                        to_write['active'] = True
 
                 next_cron = DateTime.strptime(cron_data.nextcall, '%Y-%m-%d %H:%M:%S')
                 if not cron_data.active or abs(round(next_cron.hour + next_cron.minute/60.,2) - round(myself['cloud_schedule_time'],2)) > 0.001:
@@ -707,6 +708,17 @@
         return now_dt >= start_dt or now_dt <= end_dt
 
     def send_backup_bg(self, cr, uid, progress=False, context=None):
+        if not self.pool.get('backup.config').search(cr, uid, [('backup_type', '=', 'sharepoint')]):
+            self._logger.warn('SharePoint push: the cron task is active but the backup configuration is set to Cont. Backup')
+            return True
+        local_instance = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.instance_id
+        if not local_instance:
+            return True
+        info = self._get_cloud_info(cr, uid, local_instance.id)
+        for data in ['url', 'login', 'password']:
+            if not info[data]:
+                self.pool.get('sync.version.instance.monitor').create(cr, uid, {'cloud_error': 'SharePoint indentifiers not set.'}, context=context)
+                return True
         thread = threading.Thread(target=self.send_backup_run, args=(cr.dbname, uid, progress, context))
         thread.start()
         return True
@@ -739,7 +751,7 @@
         progress_obj = False
 
         try:
-            if not config.get('send_to_onedrive') and not misc.use_prod_sync(cr):
+            if not config.get('send_to_onedrive') and not misc.use_prod_sync(cr, uid, self.pool):
                 raise osv.except_osv(_('Warning'), _('Only production instances are allowed !'))
 
             if not local_instance:

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2020-01-14 16:49:14 +0000
+++ bin/addons/msf_profile/data/patches.xml	2020-01-27 10:41:32 +0000
@@ -477,6 +477,7 @@
             <field name="method">us_6768_trigger_FP_sync</field>
         </record>
 
+<<<<<<< TREE
         <!-- UF15.1 -->
         <record id="us_6930_gen_unreconcile" model="patch.scripts">
             <field name="method">us_6930_gen_unreconcile</field>
@@ -490,5 +491,11 @@
             <field name="method">rec_entries_uf14_1_uf15</field>
         </record>
 
+=======
+        <record id="us_6684_push_backup" model="patch.scripts">
+            <field name="method">us_6684_push_backup</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-11-21 16:33:04 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-01-27 10:41:32 +0000
@@ -106296,17 +106296,13 @@
 msgstr "%s non trouvé"
 
 #. module: sync_client
-#: field:backup.config,continuous_backup_enabled:0
-msgid "Activate continuous backup"
-msgstr "Activer la sauvegarde continue"
-
-#. module: sync_client
 #: field:backup.config,basebackup_error:0
 msgid "Base backup error"
 msgstr "Erreur Sauvegarde Base"
 
 #. module: sync_client
 #: view:backup.config:0
+#: selection:backup.config,backup_type:0
 msgid "Continuous Backup"
 msgstr "Sauvegarde Continue"
 
@@ -106395,11 +106391,8 @@
 
 #. module: sync_client
 #: view:backup.config:0
-msgid ""
-"Replace the 3 occurences of \"C:\\\\WAL\\\\\" with the path to the local WAL"
-" Archive directory."
-msgstr "Remplacer les 3 occurrences de  \"C:\\\\WAL\\\\\" par votre répertoire local"
-" des archives WAL"
+msgid "Replace the 3 occurences of \"C:\\\\WAL\\\\\" with the path to the local WAL Archive directory."
+msgstr "Remplacer les 3 occurrences de  \"C:\\\\WAL\\\\\" par votre répertoire local des archives WAL"
 
 #. module: sync_client
 #: view:backup.config:0
@@ -106586,3 +106579,32 @@
 msgid "Funding Pool not found."
 msgstr "Funding Pool non trouvé."
 
+#. module: sync_client
+#: field:backup.config,backup_type:0
+msgid "Backup Type"
+msgstr "Type de Sauvegarde"
+
+#. module: sync_client
+#: selection:backup.config,backup_type:0
+msgid "Direct push to Sharepoint"
+msgstr "Envoi direct sur Sharepoint"
+
+#. module: sync_client
+#: field:sync.client.entity,previous_hw:0
+msgid "Last HW successfully used"
+msgstr "Dernier HW validé"
+
+#. module: base
+#: field:ir.cron,manual_activation:0
+msgid "Manual Activation"
+msgstr "Activation Manuelle"
+
+#. module: sync_client
+#: view:backup.config:0
+msgid "Type of Backup"
+msgstr "Type de Sauvegarde"
+
+#. module: base
+#: help:ir.cron,manual_activation:0
+msgid "Used to set active as RO"
+msgstr "Utilisé pour passer le champ Actif en lecture seule"

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2020-01-17 13:25:56 +0000
+++ bin/addons/msf_profile/msf_profile.py	2020-01-27 10:41:32 +0000
@@ -52,6 +52,7 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+<<<<<<< TREE
     # UF15.2
     def rec_entries_uf14_1_uf15(self, cr, uid, *a, **b):
         current_instance = self.pool.get('res.users').browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
@@ -130,6 +131,22 @@
 
         return True
 
+=======
+    # UF16.0
+    def us_6684_push_backup(self, cr, uid, *a, **b):
+        backup_obj = self.pool.get('backup.config')
+        if backup_obj:
+            cr.execute("update ir_cron set manual_activation='f' where function='send_backup_bg' and model='msf.instance.cloud'")
+            cr.execute("update ir_cron set name='Send Continuous Backup', manual_activation='f' where function='sent_continuous_backup_bg' and model='backup.config'")
+            if cr.column_exists('backup_config', 'continuous_backup_enabled'):
+                cr.execute("update backup_config set backup_type='cont_back' where continuous_backup_enabled='t'")
+
+            # update active field on cron
+            bck_ids = backup_obj.search(cr, uid, [])
+            backup_obj.write(cr, uid, bck_ids, {})
+        return True
+
+>>>>>>> MERGE-SOURCE
     # UF15.0
     def us_6768_trigger_FP_sync(self, cr, uid, *a, **b):
         """

=== modified file 'bin/addons/sync_client/backup.py'
--- bin/addons/sync_client/backup.py	2019-09-27 15:05:56 +0000
+++ bin/addons/sync_client/backup.py	2020-01-27 10:41:32 +0000
@@ -77,7 +77,6 @@
         'backup_path': fields.function(_get_bck_info, type='char', string='Last Backup', method=True, multi='cloud'),
         'backup_size': fields.function(_get_bck_info, type='float', string='Backup Size', method=True, multi='cloud'),
 
-        'continuous_backup_enabled': fields.boolean('Activate continuous backup'),
         'wal_directory': fields.char('Local Path to WAL Archive Dir', help='Must be set in postgresql.conf', size=256),
         'remote_user': fields.char('Remote User', help='Keep empty to use default value', size=256),
         'remote_host': fields.char('Remote Host', help='Keep empty to use default value', size=256),
@@ -88,19 +87,40 @@
         'rsync_date': fields.datetime('Date of last rsync', readonly=1),
         'rsync_error': fields.text('Rsync error', readonly=1),
         'help_wal': fields.function(tools.misc.get_fake, type='boolean', string='Display steps to set Continuous Backup', method=True),
+        'backup_type': fields.selection([('cont_back', 'Continuous Backup'), ('sharepoint', 'Direct push to Sharepoint')], 'Backup Type', required=True),
     }
 
     _defaults = {
+        'backup_type': 'sharepoint',
         'name' : 'c:\\backup\\',
         'beforemanualsync' : True,
         'beforeautomaticsync' : True,
         'aftermanualsync' : True,
         'afterautomaticsync' : True,
         'beforepatching': True,
-        'continuous_backup_enabled': False,
         'ssh_config_dir': 'C:\\Program Files (x86)\\msf\\SSH_CONFIG',
     }
 
+    def _activate_push_cron(self, cr, uid, ids, context=None):
+        ir_cron = self.pool.get('ir.cron')
+
+        for bck in self.read(cr, uid, ids, ['backup_type'], context=context):
+            od_active =  bck['backup_type'] == 'sharepoint'
+
+        od_task = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'msf_instance', 'ir_cron_remote_backup')
+        if not ir_cron.search(cr, uid, [('id', '=', od_task[1]), ('active', '=', od_active)]):
+            ir_cron.write(cr, uid, od_task[1], {'active': od_active})
+
+        wal_task = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sync_client', 'ir_cron_wal')
+        if not ir_cron.search(cr, uid, [('id', '=', wal_task[1]), ('active', '=', not od_active)]):
+            ir_cron.write(cr, uid, wal_task[1], {'active': not od_active})
+
+        return True
+
+    _constraints = [
+        (_activate_push_cron, '', [])
+    ]
+
     def button_basebackup(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'basebackup_error': _('In progress')}, context=context)
         new_thread = threading.Thread(
@@ -121,7 +141,7 @@
             else:
                 cr = old_cr
             bk = self.browse(cr, uid, ids[0], context)
-            if not bk.continuous_backup_enabled:
+            if bk.backup_type != 'cont_back':
                 raise Exception(_('Continuous Backup is disabled'))
             if not bk.wal_directory:
                 raise Exception(_('"Path to WAL Dir" is empty'))
@@ -155,20 +175,25 @@
 
     def sent_continuous_backup(self, old_cr, uid, context=None):
         try:
+            if context is None:
+                context = {}
             cr = pooler.get_db(old_cr.dbname).cursor()
-            ids = self.search(cr, uid, [], context)
-            bk = self.read(cr, uid, ids[0], ['continuous_backup_enabled', 'basebackup_date'], context=context)
-            if not bk['continuous_backup_enabled']:
+            ids = self.search(cr, uid, [], context=context)
+            bk = self.read(cr, uid, ids[0], ['backup_type', 'basebackup_date'], context=context)
+            if bk['backup_type'] != 'cont_back':
                 self._logger.info(_('Continuous backup disabled'))
                 return True
             if not bk['basebackup_date']:
+                if context.get('sync_type'):
+                    self._logger.info('Base Backup disabled after sync')
+                    return True
                 self.generate_basebackup_bg(cr, uid, ids, context=context, new_cr=False)
             self.sent_to_remote_bg(cr, uid, ids, context=context, new_cr=False)
             return True
 
-        except Exception, e:
+        except Exception:
             cr.rollback()
-            raise e
+            raise
         finally:
             cr.commit()
             cr.close(True)
@@ -193,15 +218,16 @@
             else:
                 cr = old_cr
 
-            if not tools.config.get('send_to_onedrive') and not tools.misc.use_prod_sync(cr):
+            if not tools.config.get('send_to_onedrive') and not tools.misc.use_prod_sync(cr, uid, self.pool):
                 raise Exception(_('Only production instances are allowed !'))
 
             dbname = cr.dbname
             bk = self.browse(cr, uid, ids[0], context)
-            if not bk.continuous_backup_enabled:
+            if bk.backup_type != 'cont_back':
                 raise Exception('Continuous Backup is disabled')
             if not bk.wal_directory:
                 raise Exception('"Path to WAL Dir" is empty')
+            tools.misc.force_wal_generation(cr, bk.wal_directory)
             tools.misc.sent_to_remote(bk.wal_directory, config_dir=bk.ssh_config_dir, remote_user=bk.remote_user, remote_host=bk.remote_host, remote_dir=dbname)
             self.write(cr, uid, [bk.id], {'rsync_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'rsync_error': False}, context=ctx_no_write)
             return True
@@ -305,6 +331,8 @@
         elif state.startswith('after'):
             suffix = '-A'
 
+        if state.startswith('after'):
+            self.sent_continuous_backup_bg(cr, uid, context)
         if bkp_ids:
             if logger:
                 logger.append("Database %s backup started.." % state)

=== modified file 'bin/addons/sync_client/backup_view.xml'
--- bin/addons/sync_client/backup_view.xml	2019-09-27 15:29:25 +0000
+++ bin/addons/sync_client/backup_view.xml	2020-01-27 10:41:32 +0000
@@ -36,7 +36,6 @@
             <field name="scheduledbackup"/>
             </group>
             <button type="object" string="Backup" name="button_exp_dump" icon="db_dump.png" />
-            <button type="object" string="Send Last Backup to remote" name="send_to_cloud" icon="cloud.png"/>
             <group colspan="6">
                 <html>
                     <br /><br />
@@ -52,21 +51,26 @@
                     <br /><br />
                 </html>
             </group>
-            <separator colspan="6" string="Cloud" />
+            <separator colspan="6" string="Type of Backup" />
+            <field name="backup_type" />
+
+            <group colspan="6" col="6" attrs="{'invisible': [('backup_type', '!=', 'sharepoint')]}">
             <field name="cloud_url" widget="url" colspan="6"/>
             <newline />
             <field name="cloud_date" />
             <field name="cloud_backup" />
-            <field name="cloud_size" widget="human_size"/>
-            <button colspan="2" icon="monitor.png" name="test_cloud" string="Test Cloud" type="object" />
+            <field name="cloud_size" widget="human_size" />
+            <button type="object" string="Test Cloud"  name="test_cloud" icon="monitor.png" colspan="3"/>
+            <button type="object" string="Send Last Backup to remote" name="send_to_cloud" icon="cloud.png" colspan="3"/>
             <group colspan="6">
                 <html>
                     <br /><br />
                 </html>
             </group>
             <field name="cloud_error" colspan="6" widget="full_text"/>
+            </group>
 
-            <separator colspan="6" string="Continuous Backup" />
+            <group colspan="6" attrs="{'invisible': [('backup_type', '!=', 'cont_back')]}">
             <field name="help_wal" readonly="0"/>
             <group colspan="6" attrs="{'invisible': [('help_wal', '=', False)]}">
             <html>
@@ -102,20 +106,18 @@
             <br />
             </html>
             </group>
-            <field name="continuous_backup_enabled" />
-            <group colspan="6" attrs="{'invisible': [('continuous_backup_enabled', '=', False)]}">
-                <field name="wal_directory" attrs="{'required': [('continuous_backup_enabled', '=', True)]}" colspan="3"/>
-                <field name="ssh_config_dir"  attrs="{'required': [('continuous_backup_enabled', '=', True)]}" colspan="3"/>
-                <newline />
-                <field name="remote_user" />
-                <field name="remote_host" />
-                <button type="object" string="Generate Base Backup" name="button_basebackup" icon="db_dump.png" colspan="2"/>
-                <button type="object" string="Send WAL/Base backup to remote" name="button_rsync" icon="cloud.png" colspan="2"/>
+            <field name="wal_directory" attrs="{'required': [('backup_type', '=', 'cont_back')]}" colspan="3"/>
+            <field name="ssh_config_dir"  attrs="{'required': [('backup_type', '=', 'cont_back')]}" colspan="3"/>
+            <newline />
+            <field name="remote_user" />
+            <field name="remote_host" />
+            <button type="object" string="Generate Base Backup" name="button_basebackup" icon="db_dump.png" colspan="2"/>
+            <button type="object" string="Send WAL/Base backup to remote" name="button_rsync" icon="cloud.png" colspan="2"/>
 
-                <field name="basebackup_date" />
-                <field name="rsync_date" />
-                <field name="basebackup_error" colspan="6" attrs="{'invisible': [('basebackup_error', '=', False)]}"/>
-                <field name="rsync_error" colspan="6" attrs="{'invisible': [('rsync_error', '=', False)]}"/>
+            <field name="basebackup_date" />
+            <field name="rsync_date" />
+            <field name="basebackup_error" colspan="6" attrs="{'invisible': [('basebackup_error', '=', False)]}"/>
+            <field name="rsync_error" colspan="6" attrs="{'invisible': [('rsync_error', '=', False)]}"/>
             </group>
         </group>
         </form>

=== modified file 'bin/addons/sync_client/data/cron.xml'
--- bin/addons/sync_client/data/cron.xml	2019-09-05 15:33:40 +0000
+++ bin/addons/sync_client/data/cron.xml	2020-01-27 10:41:32 +0000
@@ -31,13 +31,14 @@
         <record id="ir_cron_wal" model="ir.cron">
             <field name="function">sent_continuous_backup_bg</field>
             <field name="user_id">1</field>
-            <field name="name">Sent Continuous Backup</field>
+            <field name="name">Send Continuous Backup</field>
             <field name="interval_type">days</field>
             <field eval="-1" name="numbercall"/>
             <field eval="5" name="priority"/>
             <field eval="0" name="doall"/>
             <field eval="1" name="active"/>
             <field eval="1" name="interval_number"/>
+            <field name="manual_activation" eval="False" />
             <field name="model">backup.config</field>
         </record>
 

=== modified file 'bin/addons/sync_client/sync_client.py'
--- bin/addons/sync_client/sync_client.py	2019-11-07 16:10:38 +0000
+++ bin/addons/sync_client/sync_client.py	2020-01-27 10:41:32 +0000
@@ -492,7 +492,7 @@
         'max_update' : fields.integer('Max Update Sequence', readonly=True),
         'message_to_send' : fields.function(_get_nb_message_send, method=True, string='Nb message to send', type='integer', readonly=True),
         'update_to_send' : fields.function(_get_nb_update_send, method=True, string='Nb update to send', type='integer', readonly=True),
-
+        'previous_hw': fields.char('Last HW successfully used', size=128, select=True),
         # used to determine which sync rules to use
         # UF-2531: moved this from the RW module to the general sync module
         'usb_instance_type': fields.selection((('',''),('central_platform','Central Platform'),('remote_warehouse','Remote Warehouse')), string='USB Instance Type'),
@@ -762,6 +762,8 @@
         res = proxy.get_model_to_sync(entity.identifier, self._hardware_id)
         if not res[0]:
             raise Exception, res[1]
+
+        entity.write({'previous_hw': self._hardware_id}, context=context)
         check_md5(res[2], res[1], _('method set_rules'))
         self.pool.get('sync.client.rule').save(cr, uid, res[1], context=context)
 

=== modified file 'bin/tools/misc.py'
--- bin/tools/misc.py	2019-09-24 14:34:16 +0000
+++ bin/tools/misc.py	2020-01-27 10:41:32 +0000
@@ -33,6 +33,7 @@
 import socket
 import sys
 import threading
+
 import time
 import warnings
 import zipfile
@@ -71,6 +72,7 @@
 # We include the *Base ones just in case, currently they seem to be subclasses of the _* ones.
 SKIPPED_ELEMENT_TYPES = (etree._Comment, etree._ProcessingInstruction, etree.CommentBase, etree.PIBase)
 
+rsync_lock = threading.RLock()
 
 # initialize a database with base/base.sql
 def init_db(cr):
@@ -161,6 +163,23 @@
         new_path = '%s/' % new_path
     return new_path
 
+def force_wal_generation(cr, wal_path):
+    cr.execute('select * from pg_xlogfile_name_offset(pg_switch_xlog())')
+    file_name, offset = cr.fetchone()
+    _logger.warn('WAL generation forced %s %s' % (file_name, offset))
+    if not offset or not file_name:
+        return True
+    zip_new_wal = os.path.join(wal_path, '%s.7z' % file_name)
+    wait = 0
+    while True:
+        if os.path.exists(zip_new_wal):
+            return True
+        wait += 1
+        if wait > 30:
+            _logger.warn('7z Wal %s not found' % zip_new_wal)
+            return False
+        time.sleep(2)
+
 def sent_to_remote(local_path, config_dir=False, remote_user=False, remote_host=False, remote_dir=False):
 
     exe_dir = os.path.join(os.path.normcase(os.path.abspath(config['root_path'])), 'rsync')
@@ -187,11 +206,12 @@
 
     remote_path = '%s/' % remote_dir
     try:
-        command = [sync, '--remove-source-files', '--partial-dir=.rsync-partial', '-a', '-e', '"%s" -F "%s"'%(ssh, sshconfig), '--include=*/', '--include=*7z', '--exclude=*', path_to_cygwin(local_path), "%s@%s:%s" % (remote_user, remote_host, remote_path)]
-        _logger.info(' '.join(command))
-        subprocess.check_output(command, stderr=subprocess.STDOUT)
-        _logger.info('Rsync ends')
-        return True
+        with rsync_lock:
+            command = [sync, '--remove-source-files', '--partial-dir=.rsync-partial', '-a', '-e', '"%s" -F "%s"'%(ssh, sshconfig), '--include=*/', '--include=*7z', '--exclude=*', path_to_cygwin(local_path), "%s@%s:%s" % (remote_user, remote_host, remote_path)]
+            _logger.info(' '.join(command))
+            subprocess.check_output(command, stderr=subprocess.STDOUT)
+            _logger.info('Rsync ends')
+            return True
     except subprocess.CalledProcessError, e:
         _logger.error('rsync %s' % e.output)
         raise Exception(e.output)
@@ -1861,14 +1881,28 @@
         self.path = path
         self.delete = delete
 
-def use_prod_sync(cr):
+def use_prod_sync(cr, uid=False, pool=False):
     cr.execute('''SELECT host, database
             FROM sync_client_sync_server_connection''')
     host, database = cr.fetchone()
 
     if host and database and database.strip() == 'SYNC_SERVER' and \
             ('sync.unifield.net' in host.lower() or '212.95.73.129' in host):
-        return True
+        if uid and pool:
+            connection = pool.get('sync.client.sync_server_connection')
+            entity_obj = pool.get('sync.client.entity')
+            if not connection or not entity_obj:
+                return False
+            entity = entity_obj.get_entity(cr, uid)
+            if connection.is_connected:
+                # check HW on the sync server
+                proxy = pool.get("sync.client.sync_server_connection").get_connection(cr, uid, "sync.server.entity")
+                res = proxy.get_entity(entity.identifier, entity._hardware_id)
+                if res and res[0]:
+                    return True
+            return entity._hardware_id == entity.previous_hw
+        else:
+            return True
 
     return False
 

=== modified file 'bin/unifield-version.txt'
--- bin/unifield-version.txt	2020-01-21 11:12:03 +0000
+++ bin/unifield-version.txt	2020-01-27 10:41:32 +0000
@@ -72,5 +72,9 @@
 1c581f08bd22b9eced1e56a2579c493c 2019-09-13 10:00:00 UF14.0
 ef09c0d9b821cd261751160f19c14fe4 2019-10-08 11:00:00 UF14.1
 915fa0cc07178db7ac7ea9b26d4e2099 2019-12-06 11:00:00 UF15.0
+<<<<<<< TREE
 23667883c71ea98cb25fa79e00ac1a49 2020-01-13 16:00:00 UF15.1
 856a56ee10ded2cc9a2aba457ff199a1 2020-01-21 12:00:00 UF15.2
+=======
+915fa0cc07178db7ac7ea9b26d4e2088 2019-12-30 11:00:00 UF16cont.0
+>>>>>>> MERGE-SOURCE