Merge lp:~mukunde/unifield-server/US-7624 into lp:unifield-server

[jftempo]

[lp:~mukunde/unifield-server/US-7624]

6241. By Gaël Mukunde on 2022-12-08

MERGE

6242. By Gaël Mukunde on 2022-12-09

US-7624 [FIX] Fix bug when identification is not set

6243. By Gaël Mukunde on 2022-12-12

US-7624 [FIX] Fix bulk write of created/updated rows

6244. By Gaël Mukunde on 2022-12-12

US-7624 [FIX] Modify error message to avoid redundant words when using auto import.

6245. By Gaël Mukunde on 2022-12-12

US-7624 [FIX] Fix count of rejected rows.

6246. By Gaël Mukunde on 2022-12-12

US-7624 [FIX] Add Translation

6247. By Gaël Mukunde on 2022-12-13

US-7624 [FIX] Add translation

=== modified file 'bin/addons/msf_homere_interface/wizard/hr_expat_import.py'
--- bin/addons/msf_homere_interface/wizard/hr_expat_import.py	2022-06-15 08:56:10 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_expat_import.py	2022-12-13 09:31:49 +0000
@@ -72,6 +72,8 @@
             created = 0
             updated = 0
             processed = 0
+            to_update_vals = []
+            to_create_vals = []
             # Check that a file is given
             if not wiz.file:
                 raise osv.except_osv(_('Error'), _('No file given'))
@@ -109,20 +111,17 @@
                             continue  # inserting an invalid date format in the DB would fail
                         else:
                             contract_end_date_str = contract_end_date and contract_end_date.strftime('%Y-%m-%d') or ''
-                code = get_xml_spreadheet_cell_value(1).strip()
+                code = get_xml_spreadheet_cell_value(1) and get_xml_spreadheet_cell_value(1).strip()
                 if not code:
-                    msg = "At least one employee in the import file does not" \
-                        " have an ID number; make sure all employees in the" \
-                        " file have an ID number and run the import again."
+                    msg = _('THE EMPLOYEE DOES NOT HAVE AN ID NUMBER AT LINE %d.') % line_index
                     manage_error(line_index, msg, name, contract_end_date=contract_end_date_str)
                 active_str = get_xml_spreadheet_cell_value(2)
                 if not active_str:
-                    msg = "Active column is missing or empty at line %d" % line_index
+                    msg = _("Active column is missing or empty at line %d") % line_index
                     manage_error(line_index, msg, name, code, contract_end_date=contract_end_date_str)
                 active_str = active_str and active_str.lower() or ''
                 if active_str not in ('active', 'inactive'):
-                    msg = "Active column invalid value line %d" \
-                        " (should be Active/Inactive)" % line_index
+                    msg = _("Active column invalid value line %d  (should be Active/Inactive)") % line_index
                     manage_error(line_index, msg, name, code, active_str, contract_end_date=contract_end_date_str)
                 active = active_str == 'active' or False
 
@@ -142,20 +141,33 @@
                 if handle_contract_end_date:
                     vals.update({'contract_end_date': contract_end_date})
                 if ids:
-                    # Update name of Expat employee
-                    hr_emp_obj.write(cr, uid, [ids[0]], vals, context=context)
+                    # Store name of Expat employee to update
+                    to_update_vals.append(([ids[0]], vals))
                     updated += 1
                 else:
-                    # Create Expat employee
+                    # Store Expat employee to create
                     vals.update(
                         {
                             'type': 'ex',
                             'identification_id': code,
                         }
                     )
-                    hr_emp_obj.create(cr, uid, vals, context=context)
+                    to_create_vals.append(vals)
                     created += 1
                 line_index += 1
+            if not rejected_lines:
+                for vals in to_update_vals:
+                    hr_emp_obj.write(cr, uid, vals[0], vals[1], context=context)
+                for vals in to_create_vals:
+                    hr_emp_obj.create(cr, uid, vals, context=context)
+            else:  # US-7624: To avoid partial import, reject all lines if there is at least one invalid employee line
+                created = 0
+                updated = 0
+                rejected_idx = [i[0] for i in rejected_lines]  # get line number of each rejected line
+                temp = [(t[0], t[1], '') for t in processed_lines if
+                        t[0] not in rejected_idx]  # add an empty error column to valid lines
+                rejected_lines += temp
+                rejected_lines.sort(key=lambda j: j[0])  # sort on line number
 
             context.update({'message': ' ', 'from': 'expat_import'})
 

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-11-23 11:30:06 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-12-13 09:31:49 +0000
@@ -115633,6 +115633,12 @@
 msgid "Cannot update these products, ED/BN attributes have not changed since the KCL creation"
 msgstr "Impossible de mettre à jour ces produits. Les attributs NL/DE n'ont pas changé depuis la création du Kit"
 
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_expat_import.py:114
+#, python-format
+msgid "THE EMPLOYEE DOES NOT HAVE AN ID NUMBER."
+msgstr "L'EMPLOYÉ N'A PAS DE NUMÉRO D'IDENTIFICATION"
+
 #. module: board
 #: report:addons/board/report/integrity.mako:83
 msgid "Filter used: "
@@ -117889,3 +117895,21 @@
 #, python-format
 msgid "Both EoY Revaluation have been done in %s"
 msgstr "Les deux réévaluations de fin d'année ont déjà été faite dans %s"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_expat_import.py:116
+#, python-format
+msgid "THE EMPLOYEE DOES NOT HAVE AN ID NUMBER AT LINE %d."
+msgstr "L'EMPLOYÉ N'A PAS DE NUMÉRO D'IDENTIFICATION À LA LIGNE %d."
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_expat_import.py:124
+#, python-format
+msgid "Active column invalid value line %d  (should be Active/Inactive)"
+msgstr "Valeur invalide dans la colonne statut ligne %d (devrait être active/inactive)"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_expat_import.py:120
+#, python-format
+msgid "Active column is missing or empty at line %d"
+msgstr "Valeur manquante ou vide dans la colonne statut à la ligne %d"

=== modified file 'bin/addons/msf_tools/automated_import_job.py'
--- bin/addons/msf_tools/automated_import_job.py	2022-08-22 09:59:30 +0000
+++ bin/addons/msf_tools/automated_import_job.py	2022-12-13 09:31:49 +0000
@@ -353,7 +353,8 @@
                         nb_processed += self.generate_file_report(cr, uid, job, processed, headers, remote=remote)
 
                     if rejected:
-                        nb_rejected += self.generate_file_report(cr, uid, job, rejected, headers, remote=remote, rejected=True)
+                        nb_rejected = nb_processed  # US-7624 If one row is not correct, all processed rows are rejected
+                        self.generate_file_report(cr, uid, job, rejected, headers, remote=remote, rejected=True)
                         state = 'error'
                         for resjected_line in rejected:
                             line_message = ''