Merge lp:~jfb-tempo-consulting/unifield-server/US-6032 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/base/module/instance_auto_creation.py'
--- bin/addons/base/module/instance_auto_creation.py	2019-02-21 09:35:10 +0000
+++ bin/addons/base/module/instance_auto_creation.py	2019-07-30 10:04:55 +0000
@@ -30,7 +30,8 @@
 import threading
 from tools.translate import _
 from osv import fields, osv
-
+from mx import DateTime
+import logging
 
 TRUE_LIST = (True, 'True', 'true', 'TRUE', 'Yes', 'YES', 'yes')
 
@@ -430,16 +431,19 @@
                     'beforepatching': config_dict['backup'].get('auto_bck_beforepatching') in TRUE_LIST,
                     'beforeautomaticsync': config_dict['backup'].get('auto_bck_beforeautomaticsync') in TRUE_LIST,
                     'afterautomaticsync': config_dict['backup'].get('auto_bck_afterautomaticsync') in TRUE_LIST,
-                    'scheduledbackup': config_dict['backup'].get('auto_bck_scheduledbackup') in TRUE_LIST,
+                    'scheduledbackup': config_dict['backup'].get('auto_bck_scheduledbackup', True) in TRUE_LIST,
                 }
                 backup_obj.write(cr, uid, backup_id, backup_vals, context=context)
 
                 # update automatic backup cron job
                 vals = {
-                    'active': True,
+                    'active': config_dict['backup'].get('auto_bck_scheduledbackup', True) in TRUE_LIST,
                     'interval_number': config_dict['backup'].get('auto_bck_interval_nb'),
                     'interval_type': config_dict['backup'].get('auto_bck_interval_unit'),
                 }
+                if config_dict['backup'].get('auto_bck_next_exec_date'):
+                    vals['nextcall'] = config_dict['backup'].get('auto_bck_next_exec_date')
+
                 auto_backup = self.pool.get('ir.model.data').get_object(cr, uid, 'sync_client', 'ir_cron_automaticsyncbackup')
                 cron_obj = self.pool.get('ir.cron')
                 if auto_backup:
@@ -569,13 +573,61 @@
                 self.write(cr, 1, creation_id,
                            {'state': 'reconfigure_done'}, context=context)
 
+            if config_dict.get('autosync'):
+                auto_sync_cron = self.pool.get('ir.model.data').get_object(cr, uid, 'sync_client', 'ir_cron_automaticsynchronization0')
+                if auto_sync_cron:
+                    auto_sync_data = {
+                        'active': config_dict['autosync'].get('active', True) in TRUE_LIST,
+                        'interval_number': config_dict['autosync'].get('interval_nb'),
+                        'interval_type': config_dict['autosync'].get('interval_unit'),
+                    }
+                    if config_dict['autosync'].get('next_exec_date'):
+                        auto_sync_data['nextcall'] = config_dict['autosync'].get('next_exec_date')
+                    self.pool.get('ir.cron').write(cr, uid, auto_sync_cron.id, auto_sync_data, context=context)
+
+            if config_dict.get('stockmission'):
+                cron_id = self.pool.get('ir.model.data').get_object(cr, uid, 'mission_stock', 'ir_cron_stock_mission_update_action')
+                if cron_id:
+                    scheduler_data = {
+                        'active': config_dict['stockmission'].get('active', True) in TRUE_LIST,
+                        'interval_number': config_dict['stockmission'].get('interval_nb'),
+                        'interval_type': config_dict['stockmission'].get('interval_unit'),
+                    }
+                    if config_dict['stockmission'].get('next_exec_date'):
+                        scheduler_data['nextcall'] = config_dict['stockmission'].get('next_exec_date')
+                    self.pool.get('ir.cron').write(cr, uid, cron_id.id, scheduler_data, context=context)
+
+            if config_dict.get('silentupgrade') and config_dict['silentupgrade'].get('hour_from') and config_dict['silentupgrade'].get('hour_to'):
+                synchro_serv = pool.get('sync.client.sync_server_connection')
+                ids = synchro_serv.search(cr, uid, [])
+                if ids:
+                    from_mx = DateTime.strptime(config_dict['silentupgrade']['hour_from'], '%H:%M')
+                    to_mx = DateTime.strptime(config_dict['silentupgrade']['hour_to'], '%H:%M')
+                    sync_vals = {
+                        'automatic_patching_hour_from': from_mx.hour + from_mx.minute/60.,
+                        'automatic_patching_hour_to': to_mx.hour + to_mx.minute/60.,
+                        'automatic_patching': config_dict['silentupgrade'].get('active', True) in TRUE_LIST
+                    }
+                    try:
+                        cr.commit()
+                        synchro_serv.write(cr, uid, ids, sync_vals)
+                    except:
+                        cr.rollback()
+                        logging.getLogger('autoinstall').warn('Unable to set Silent Upgrade, please check the silent upgrade and auto sync times')
+
             if not skip_import_files:
                 self.write(cr, 1, creation_id,
                            {'state': 'import_files'}, context=context)
                 import_path = os.path.join(tools.config['root_path'], '..', 'UFautoInstall', 'import')
+                file_to_import = []
                 for file_name in os.listdir(import_path):
                     if not '.csv' in file_name:
                         raise osv.except_osv(_("Error!"), 'Only CSV file can be imported. \'%s\' is not a CSV extension.' % file_name)
+                    if file_name == 'account.analytic.journal.csv':
+                        file_to_import.insert(0, file_name)
+                    else:
+                        file_to_import.append(file_name)
+                for file_name in file_to_import:
                     model_to_import = file_name.split('.csv')[0]
                     model_obj = self.pool.get(model_to_import)
                     model_obj.import_data_from_csv(cr, uid, os.path.join(import_path, file_name))

=== modified file 'bin/addons/sync_client/sync_client.py'
--- bin/addons/sync_client/sync_client.py	2019-03-20 08:31:53 +0000
+++ bin/addons/sync_client/sync_client.py	2019-07-30 10:04:55 +0000
@@ -1533,6 +1533,8 @@
 
         if date is None:
             date = datetime.today()
+        if isinstance(date, basestring):
+            date = datetime.strptime(date, '%Y-%m-%d %H:%M')
 
         if not hour_from:
             hour_from = connection.automatic_patching_hour_from

=== modified file 'tools/UFautoInstall/uf_auto_install.conf'
--- tools/UFautoInstall/uf_auto_install.conf	2019-02-21 09:35:10 +0000
+++ tools/UFautoInstall/uf_auto_install.conf	2019-07-30 10:04:55 +0000
@@ -1,6 +1,6 @@
 [instance]
-rb_prefix = jfb-int_
-#sync_port = 14673
+rb_prefix = jfb-us-6090_
+#sync_port = 8069
 db_name = %(rb_prefix)sHQ1C1P3
 instance_name = %(db_name)s
 prop_instance_code = %(db_name)s
@@ -23,6 +23,7 @@
 auto_bck_interval_nb = 3650
 auto_bck_interval_unit = days
 auto_bck_path = /tmp
+auto_bck_next_exec_date = 2020-01-01 14:50
 auto_bck_beforemanualsync = No
 auto_bkc_aftermanualsync = no
 auto_bck_beforeautomaticsync = No
@@ -30,6 +31,23 @@
 auto_bck_beforepatching = False
 auto_bck_scheduledbackup = False
 
+[autosync]
+active = No
+interval_nb = 1
+interval_unit = days
+next_exec_date = 2020-01-01 22:00
+
+[stockmission]
+active = Yes
+interval_nb = 1
+interval_unit = days
+next_exec_date = 2020-01-01 23:00
+
+[silentupgrade]
+active = No
+hour_from = 20:00
+hour_to = 06:00
+
 [reconfigure]
 address_street = 1A house, street 10
 address_street2 = Quartal 215A