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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/purchase_order.py'
--- bin/addons/msf_doc_import/purchase_order.py	2019-09-03 09:22:54 +0000
+++ bin/addons/msf_doc_import/purchase_order.py	2019-10-09 13:13:17 +0000
@@ -390,7 +390,9 @@
             context.update({'po_not_found': True})
 
         processed, rejected = [], []
-        for index, po_id in enumerate(po_ids):
+        cr.execute('select id from purchase_order where id in %s for update skip locked', (tuple(po_ids),))
+        index = 0
+        for po_id, in cr.fetchall():
             # generate report:
             report_name = 'validated.purchase.order_xls' if export_wiz.export_format == 'excel' else 'validated.purchase.order_xml'
             datas = {'ids': [po_id]}
@@ -453,6 +455,7 @@
             self.write(cr, uid, [po_id], {'auto_exported_ok': True}, context=context)
             processed.append((index, [po_id, po_name]))
             self.infolog(cr, uid, _('%s successfully exported') % po_name)
+            index += 1
 
         return processed, rejected, ['PO id', 'PO name']
 

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-10-03 14:01:19 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-10-09 13:13:17 +0000
@@ -107550,3 +107550,20 @@
 #, python-format
 msgid "No Analytic Journal %s found for the Proprietary Instance %s."
 msgstr "Aucun Journal Analytique %s trouvé pour l'Instance Propriétaire %s."
+
+#. module: sync_client
+#: field:sync.version.instance.monitor,nb_late_vi:0
+msgid "# late VI jobs"
+msgstr "# tâches VI en retard"
+
+
+#. module: sync_client
+#: field:sync.version.instance.monitor,vi_details:0
+msgid "Last exec VI job"
+msgstr "Tâche VI dernière exec"
+
+#. module: sync_client
+#: view:sync.version.instance.monitor:0
+msgid "Late jobs"
+msgstr "Tâches en retard"
+

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2019-09-06 13:45:52 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2019-10-09 13:13:17 +0000
@@ -146,7 +146,7 @@
 msf_sync_data_server.button_access_rules2,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('is_remote_wh', '=', False)]","['active', 'comment', 'group_ids/id', 'group_names', 'label', 'model_id/id', 'name', 'type', 'view_id/id', 'xmlname', 'bar_type']",OC,msf_button_access_rights.button_access_rule,,Button Access Rules,Valid,,715
 msf_sync_data_server.window_actions,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('res_model','!=','audittrail.log.line'), ('is_remote_wh', '=', False)]",['groups_id/id'],OC,ir.actions.act_window,,Window Action groups,Valid,,706
 msf_sync_data.sync_monitor,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('status', '=', 'ok'),('instance_id', '!=', False)]","['instance_id/id', 'nb_msg_pull', 'nb_data_pull', 'nb_msg_push', 'nb_data_push', 'nb_msg_not_run', 'nb_data_not_run', 'start', 'end', 'destination_instance_id/id']",OC,sync.monitor,destination_instance_id,Sync Monitor,Valid,,720
-msf_sync_data.sync_version_instance_monitor,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,[],"['backup_date', 'backup_path', 'backup_size', 'instance_id/id', 'version', 'postgresql_disk_space', 'unifield_disk_space', 'cloud_date', 'cloud_backup', 'cloud_size']",OC,sync.version.instance.monitor,,Sync Version Instance Monitor,Valid,,725
+msf_sync_data.sync_version_instance_monitor,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,[],"['backup_date', 'backup_path', 'backup_size', 'instance_id/id', 'version', 'postgresql_disk_space', 'unifield_disk_space', 'cloud_date', 'cloud_backup', 'cloud_size', 'nb_late_vi', 'vi_details']",OC,sync.version.instance.monitor,,Sync Version Instance Monitor,Valid,,725
 msf_sync_data_server.trigger_something,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Down,"[]","['name']",OC,sync.trigger.something,,Trigger Something,Valid,,11
 msf_sync_data.msf_instance_cloud,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['cloud_url', 'cloud_login', 'cloud_password', 'cloud_schedule_time', 'instance', 'cloud_retry_from', 'cloud_retry_to']",OC,msf.instance.cloud,instance,Cloud backup config,Valid,,728
 msf_sync_data_server.ir_translation,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Down,"[('res_id', '!=', 0), ('src', '!=', False), ('xml_id', '!=', False), ('lang', '!=', 'en_US'), ('type', '=', 'model'), ('name', 'in', ['res.partner.category,name','product.uom,name','product.template,description_purchase','product.template,description','product.template,description_sale','product.uom.categ,name','product.pricelist,name','product.category,name','product.nomenclature,name','product.product,form_value','product.product,function_value','product.product,fit_value','res.currency,currency_name','res.country,name','product.ul,name','product.price.type,name','product.pricelist.type,name','product.pricelist.version,name','account.analytic.account,name','account.fiscal.position,note','hr.employee.marital.status,name','account.period,name','account.tax.code,name','account.journal,name','account.tax,name','account.analytic.journal,name','account.account,name','stock.reason.type,name','product.template,name','product.justification.code,code'])]","['lang', 'src', 'name', 'value', 'type', 'xml_id']",OC,ir.translation,,Translations,Valid,,730

=== modified file 'bin/addons/sync_client/hq_monitor_view.xml'
--- bin/addons/sync_client/hq_monitor_view.xml	2018-05-04 09:58:02 +0000
+++ bin/addons/sync_client/hq_monitor_view.xml	2019-10-09 13:13:17 +0000
@@ -69,6 +69,8 @@
                     <field name="postgresql_disk_space" />
                     <field name="unifield_disk_space" />
                     <field name="instance_state" />
+                    <field name="nb_late_vi"/>
+                    <field name="vi_details" />
                 </tree>
             </field>
         </record>
@@ -91,10 +93,25 @@
                     <field name="postgresql_disk_space"/>
                     <field name="unifield_disk_space"/>
                     <field name="instance_state"/>
+                    <field name="nb_late_vi"/>
+                    <field name="vi_details" colspan="4" />
                 </form>
             </field>
         </record>
 
+        <record id="sync_hq_instance_version_search" model="ir.ui.view">
+            <field name="name">sync.vestion.monitor.search</field>
+            <field name="model">sync.version.instance.monitor</field>
+            <field name="type">search</field>
+            <field name="priority" eval="210" />
+            <field name="arch" type="xml">
+                <search>
+                    <filter string="Late jobs"  icon="terp-gnome-cpu-frequency-applet+" domain="[('nb_late_vi', '>', 0)]"/>
+                    <field name="instance_id"/>
+                </search>
+            </field>
+        </record>
+
         <record model="ir.actions.act_window" id="sync_hq_instance_version_action">
             <field name="name">Version Instances Monitor</field>
             <field name="res_model">sync.version.instance.monitor</field>
@@ -102,6 +119,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('instance_id', '!=', False)]</field>
             <field name="view_id" ref="sync_hq_instance_version_tree" />
+            <field name="search_view_id" ref="sync_hq_instance_version_search" />
         </record>
 
         <menuitem id="sync_hq_instance_version_menu" name="Version Instances Monitor"

=== modified file 'bin/addons/sync_client/monitor.py'
--- bin/addons/sync_client/monitor.py	2018-10-04 11:59:07 +0000
+++ bin/addons/sync_client/monitor.py	2019-10-09 13:13:17 +0000
@@ -379,6 +379,8 @@
         'cloud_backup': fields.char('Cloud Dump', size=256, readonly=True),
         'cloud_error': fields.text('Cloud last error', readonly=True),
         'cloud_size': fields.integer('Cloud Size Zipped', readonly=True),
+        'nb_late_vi': fields.integer('# late VI jobs'),
+        'vi_details': fields.text('Last exec VI job'),
     }
 
     _defaults = {

=== modified file 'bin/addons/sync_client/sync_client.py'
--- bin/addons/sync_client/sync_client.py	2019-09-10 09:07:56 +0000
+++ bin/addons/sync_client/sync_client.py	2019-10-09 13:13:17 +0000
@@ -31,7 +31,7 @@
 import os
 import math
 import hashlib
-
+import time
 from random import random
 
 from psycopg2 import OperationalError
@@ -1248,21 +1248,56 @@
         self._logger.info("Start synchronization")
 
         version_instance_module = self.pool.get('sync.version.instance.monitor')
+        version_data = {}
         try:
             version = self.pool.get('backup.config').get_server_version(cr, uid, context=context)
             postgres_disk_space = version_instance_module._get_default_postgresql_disk_space(cr, uid)
             unifield_disk_space = version_instance_module._get_default_unifield_disk_space(cr, uid)
-            version_instance_module.create(cr, uid, {
+            version_data = {
                 'version': version,
                 'postgresql_disk_space': postgres_disk_space,
                 'unifield_disk_space': unifield_disk_space,
-            }, context=context)
+            }
+
 
         except Exception:
             cr.rollback()
             logging.getLogger('version.instance.monitor').exception('Cannot generate instance monitor data')
             # do not block sync
             pass
+
+        try:
+            # list VI jobs
+            job_details = []
+            nb_late = 0
+            now = time.strftime('%Y-%m-%d %H:%M:%S')
+
+            dt_format = '%d/%b/%Y %H:%M'
+            for auto_job in ['automated.export', 'automated.import']:
+                job_obj = self.pool.get(auto_job)
+                job_ids = job_obj.search(cr, uid, [('active', '=', True), ('cron_id', '!=', False)], context=context)
+                if job_ids:
+                    end_time_by_job = {}
+                    job_field = "%s_id" % auto_job.split('.')[-1]
+                    cr.execute("select "+job_field+", max(end_time) from "+auto_job.replace('.', '_')+"_job where "+job_field+" in %s and state in ('done', 'error') group by "+job_field, (tuple(job_ids), )) # not_a_user_entry
+                    for end in cr.fetchall():
+                        end_time_by_job[end[0]] = end[1] and time.strftime(dt_format, time.strptime(end[1], '%Y-%m-%d %H:%M:%S'))
+
+                    for job in job_obj.browse(cr, uid, job_ids, fields_to_fetch=['name', 'cron_id', 'last_exec'], context=context):
+                        if job.cron_id.nextcall < now:
+                            nb_late += 1
+                            job_name = '%s*' % job.name
+                        else:
+                            job_name = job.name
+
+                        job_details.append('%s: %s' % (job_name, end_time_by_job.get(job.id, 'never')))
+
+            version_data['nb_late_vi'] = nb_late
+            version_data['vi_details'] = "\n".join(job_details)
+            version_instance_module.create(cr, uid, version_data, context=context)
+        except Exception:
+            cr.rollback()
+            logging.getLogger('version.instance.monitor').exception('Cannot generate instance monitor data')
         self.check_user_rights(cr, uid, context=context)
         self.set_rules(cr, uid, context=context)
         self.pull_update(cr, uid, context=context)