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

[jftempo]

=== modified file 'bin/addons/msf_tools/automated_export.py'
--- bin/addons/msf_tools/automated_export.py	2020-09-18 13:38:52 +0000
+++ bin/addons/msf_tools/automated_export.py	2021-04-20 08:23:07 +0000
@@ -109,10 +109,12 @@
         'ftp_dest_ok': fields.boolean(string='on FTP server', help='Is given path is located on FTP server ?'),
         'ftp_dest_fail_ok': fields.boolean(string='on FTP server', help='Is given path is located on FTP server ?'),
         'ftp_report_ok': fields.boolean(string='on FTP server', help='Is given path is located on FTP server ?'),
+        'pause': fields.integer('Pause between generation and transfer (in seconds)'),
 
     }
 
     _defaults = {
+        'pause': 120,
         'interval': lambda *a: 1,
         'interval_unit': lambda *a: 'hours',
         'active': lambda *a: False,
 
=== modified file 'bin/addons/msf_tools/views/automated_export_view.xml'
--- bin/addons/msf_tools/views/automated_export_view.xml	2020-09-18 10:39:31 +0000
+++ bin/addons/msf_tools/views/automated_export_view.xml	2021-04-20 08:23:07 +0000
@@ -41,6 +41,7 @@
                     <field name="function_id" widget="selection" on_change="change_function_id(function_id)"/>
                     <field name="active" />
                     <field name="export_format" attrs="{'invisible': [('disable_cron', '=', True)]}"/>
+                    <field name="pause" attrs="{'invisible': [('disable_cron', '=', False)]}"/>
                     <button name="run_job_manually" string="Run job manually" colspan="2" type="object" icon="gtk-execute" />
                     <button name="sent_to_remote" string="Manually send to FTP" colspan="2" type="object" icon="cloud.png" attrs="{'invisible': ['|', ('disable_cron', '=', False), ('ftp_ok', '=', False)]}" />
 
 
=== modified file 'bin/addons/vertical_integration/wizard/wizard_hq_report_oca.py'
--- bin/addons/vertical_integration/wizard/wizard_hq_report_oca.py	2020-09-25 09:57:42 +0000
+++ bin/addons/vertical_integration/wizard/wizard_hq_report_oca.py	2021-04-20 08:23:07 +0000
@@ -132,13 +132,17 @@
                 p_state_obj.write(cr, uid, period_state_ids, {'auto_export_vi': True}, context=context)
 
 
+        if nb_ok and export_wiz.pause:
+            msg.append('[%s] pause for %s seconds' % (time.strftime('%Y-%m-%d %H:%M:%S'), export_wiz.pause))
+            time.sleep(export_wiz.pause)
+
         if export_wiz.ftp_dest_ok:
             # send all reports (old + and new) to remote
             for filename in os.listdir(export_wiz.destination_local_path):
                 fullfilename = os.path.join(export_wiz.destination_local_path, filename)
-                msg.append('[%s] sending %s to %s' % (time.strftime('%Y-%m-%d %H:%M:%S'), fullfilename, export_wiz.dest_path))
                 try:
                     if os.path.isfile(fullfilename):
+                        msg.append('[%s] sending %s to %s' % (time.strftime('%Y-%m-%d %H:%M:%S'), fullfilename, export_wiz.dest_path))
                         export_job_obj.send_file(cr, uid, export_wiz, remote_con, fullfilename, export_wiz.dest_path, delete=True, context=context)
                         if disable_generation:
                             nb_ok += 1
@@ -152,9 +156,9 @@
             current_report_path = export_wiz.report_local_path
             for filename in os.listdir(export_wiz.report_local_path):
                 fullfilename = os.path.join(export_wiz.report_local_path, filename)
-                msg.append('[%s] sending %s to %s' % (time.strftime('%Y-%m-%d %H:%M:%S'), fullfilename, export_wiz.report_path))
                 try:
                     if os.path.isfile(fullfilename):
+                        msg.append('[%s] sending %s to %s' % (time.strftime('%Y-%m-%d %H:%M:%S'), fullfilename, export_wiz.report_path))
                         export_job_obj.send_file(cr, uid, export_wiz, remote_con, fullfilename, export_wiz.report_path, delete=True, context=context)
                         if disable_generation:
                             nb_ok += 1