Merge lp:~dorian-kemps/unifield-server/US-12359 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/purchase_order.py'
--- bin/addons/msf_doc_import/purchase_order.py	2023-09-25 10:09:45 +0000
+++ bin/addons/msf_doc_import/purchase_order.py	2024-05-07 10:16:58 +0000
@@ -412,9 +412,9 @@
             msg = _('No PO to export !')
             self.infolog(cr, uid, msg)
             context.update({'po_not_found': True})
-            return [], [], ['PO id', 'PO name']
+            return [], [], ['PO id', 'PO name'], []
 
-        processed, rejected = [], []
+        processed, rejected, filenames = [], [], []
         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():
@@ -435,6 +435,7 @@
                 'xls' if export_wiz.export_format == 'excel' else 'xml',
             )
             path_to_file = os.path.join(export_wiz.dest_path, filename)
+            filenames.append(filename)
             if export_wiz.ftp_ok and export_wiz.ftp_dest_ok and export_wiz.ftp_protocol == 'ftp':
                 ftp_connec = None
                 context.update({'no_raise_if_ok': True})
@@ -482,7 +483,7 @@
             self.infolog(cr, uid, _('%s successfully exported') % po_name)
             index += 1
 
-        return processed, rejected, ['PO id', 'PO name']
+        return processed, rejected, ['PO id', 'PO name'], filenames
 
     def copy(self, cr, uid, id, defaults=None, context=None):
         '''

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2024-05-02 13:19:58 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2024-05-07 10:16:58 +0000
@@ -2242,7 +2242,7 @@
 #. module: msf_tools
 #: view:automated.import.function:0
 msgid "Automated import function"
-msgstr "Automated import function"
+msgstr "Fonction d'import automatisé"
 
 #. module: register_accounting
 #: model:ir.model,name:register_accounting.model_wizard_hard_posting
@@ -4905,7 +4905,7 @@
 #: model:ir.actions.act_window,name:msf_tools.automated_import_job_action
 #: model:ir.ui.menu,name:msf_tools.automated_import_job_menu
 msgid "Import job reports"
-msgstr "Import job reports"
+msgstr "Rapports d'import"
 
 #. modules: base, base_setup, unifield_setup
 #: selection:res.config.users,context_tz:0
@@ -48516,7 +48516,7 @@
 #: model:ir.actions.act_window,name:msf_tools.automated_export_job_action
 #: model:ir.ui.menu,name:msf_tools.automated_export_job_menu
 msgid "Export job reports"
-msgstr "Rapport d'export"
+msgstr "Rapports d'export"
 
 #. module: analytic_distribution
 #: view:int.commitment.export.wizard:0
@@ -71081,13 +71081,20 @@
 msgid "HQ Entries List"
 msgstr "Liste Ecritures HQ"
 
-#. modules: sync_client, base_report_designer, update_client
+#. modules: sync_client, base_report_designer, update_client, msf_tools
 #: field:base_report_designer.installer,name:0
 #: field:backup.download,name:0
 #: field:sync.client.logs,name:0
+#: view:automated.export.job:0
+#: view:automated.import.job:0
 msgid "File name"
 msgstr "Nom du fichier"
 
+#. module: msf_tools
+#: field:automated.export.job,filenames:0
+msgid "Files Names"
+msgstr "Noms des fichiers"
+
 #. module: sync_client
 #: model:ir.actions.server,name:sync_client.ir_actions_server_opensyncbackup
 msgid "Open Backup cron"
@@ -76018,7 +76025,7 @@
 #. module: msf_tools
 #: view:automated.import.job:0
 msgid "Import job report"
-msgstr "Import job report"
+msgstr "Rapport d'import"
 
 #. module: msf_audittrail
 #: field:audittrail.view.log,to:0
@@ -78961,7 +78968,7 @@
 #: model:ir.actions.act_window,name:msf_tools.automated_import_function_action
 #: model:ir.ui.menu,name:msf_tools.automated_import_function_menu
 msgid "Automated import functions"
-msgstr "Automated import functions"
+msgstr "Fonctions d'import automatisé"
 
 #. module: consumption_calculation
 #: code:addons/consumption_calculation/consumption_calculation.py:629
@@ -84437,7 +84444,7 @@
 #: view:automated.import:0
 #: field:automated.import.job,import_id:0
 msgid "Automated import"
-msgstr "Automated import"
+msgstr "Import automatisé"
 
 #. modules: account_override, account, base, account_mcdb, analytic_distribution
 #: view:account.common.report:0
@@ -121798,6 +121805,11 @@
 msgid "This RfQ contains service and non-service products. This means 2 Purchase Orders will be created: A Direct PO for the Service products and a Regular PO for the non-service products."
 msgstr "Cet DdD contient des produits service et non service. Cela signifie que 2 Bons de Commande seront créés: Un BdC Direct pour les produits Service et un BdC Normal pour les produits non service."
 
+#. module: msf_tools
+#: view:automated.export.job:0
+msgid "Export files"
+msgstr "Fichiers d'export"
+
 #. module: msf_outgoing
 #: code:addons/msf_outgoing/msf_outgoing.py:3490
 #: code:addons/msf_outgoing/msf_outgoing.py:3518

=== modified file 'bin/addons/msf_tools/automated_export_job.py'
--- bin/addons/msf_tools/automated_export_job.py	2022-08-18 14:56:03 +0000
+++ bin/addons/msf_tools/automated_export_job.py	2024-05-07 10:16:58 +0000
@@ -105,6 +105,7 @@
             required=True,
         ),
         'disable_generation': fields.boolean('Do not generate reports, push only to remote'),
+        'filenames': fields.text(string='Files Names', readonly=1),
     }
 
     _defaults = {
@@ -146,12 +147,11 @@
                     sftp = self.pool.get('automated.export').sftp_test_connection(cr, uid, job.export_id.id, context=context)
                 context.pop('no_raise_if_ok')
                 # Process export
-                error_message = []
+                error_message, filenames = [], []
                 state = 'done'
 
-
                 if job.export_id.function_id.model_id.model != 'wizard.hq.report.oca':
-                    processed, rejected, headers = getattr(
+                    processed, rejected, headers, filenames = getattr(
                         self.pool.get(job.export_id.function_id.model_id.model),
                         job.export_id.function_id.method_to_call
                     )(cr, uid, job.export_id, context=context)
@@ -184,6 +184,7 @@
                     'nb_rejected_records': nb_rejected,
                     'comment': '\n'.join(error_message),
                     'state': state,
+                    'filenames': filenames and '; '.join(filenames) or '',
                 }, context=context)
             except Exception as e:
                 self.logger.error('Unable to process export Job %s (%s)' % (job.id, job.name), exc_info=True)
@@ -194,6 +195,7 @@
                     'nb_rejected_records': 0,
                     'comment': str(e),
                     'state': 'error',
+                    'filenames': '',
                 }, context=context)
 
         return {

=== modified file 'bin/addons/msf_tools/views/automated_export_job_view.xml'
--- bin/addons/msf_tools/views/automated_export_job_view.xml	2020-09-18 10:39:31 +0000
+++ bin/addons/msf_tools/views/automated_export_job_view.xml	2024-05-07 10:16:58 +0000
@@ -16,6 +16,7 @@
                     <field name="export_id" />
                     <field name="start_time" />
                     <field name="end_time" />
+                    <field name="filenames" string="File name" />
                 </search>
             </field>
         </record>
@@ -29,6 +30,7 @@
                     <field name="export_id" />
                     <field name="start_time" />
                     <field name="end_time" />
+                    <field name="filenames" truncate="100" />
                     <field name="nb_processed_records" />
                     <field name="nb_rejected_records" />
                     <field name="state" />
@@ -45,6 +47,8 @@
                     <field name="export_id" />
                     <field name="start_time" />
                     <field name="end_time" />
+                    <separator colspan="4" string="Export files" />
+                    <field name="filenames" colspan="4" widget="full_text" />
                     <separator colspan="4" string="Export results" />
                     <field name="nb_processed_records" />
                     <field name="nb_rejected_records" />

=== modified file 'bin/addons/msf_tools/views/automated_import_job_view.xml'
--- bin/addons/msf_tools/views/automated_import_job_view.xml	2022-08-19 12:59:43 +0000
+++ bin/addons/msf_tools/views/automated_import_job_view.xml	2024-05-07 10:16:58 +0000
@@ -16,6 +16,7 @@
                     <field name="import_id" />
                     <field name="start_time" />
                     <field name="end_time" />
+                    <field name="filename" string="File name" />
                 </search>
             </field>
         </record>
@@ -29,6 +30,7 @@
                     <field name="import_id" />
                     <field name="start_time" />
                     <field name="end_time" />
+                    <field name="filename" string="File name" />
                     <field name="nb_processed_records" />
                     <field name="nb_rejected_records" />
                     <field name="state" />
@@ -47,8 +49,8 @@
                     <field name="start_time" />
                     <field name="end_time" />
                     <separator colspan="4" string="Import file" />
+                    <field name="filename" readonly="1" />
                     <field name="file_to_import" readonly="True" filename="filename" />
-                    <field name="filename" invisible="1" />
                     <separator colspan="4" string="Import results" />
                     <field name="nb_processed_records" />
                     <field name="nb_rejected_records" />