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

[jftempo]

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

6258. By Gaël Mukunde on 2022-06-28

US-10124 [IMP] Write payroll entries dispite AD errors but block employee AD update with erroneous distribution + translation

6259. By Gaël Mukunde on 2022-06-28

US-10124 [IMP] Code fix to only block the update of erroneous Emp AD instead of blocking all the Emp AD update

6260. By Gaël Mukunde on 2022-06-29

US-10124 [IMP] Do AD checks in proceed state also to simplify code

6261. By Gaël Mukunde on 2022-09-19

US-10124 [MERGE] Merge with Trunk

=== modified file 'bin/addons/msf_homere_interface/hr_payroll_wizard.xml'
--- bin/addons/msf_homere_interface/hr_payroll_wizard.xml	2022-06-16 14:59:26 +0000
+++ bin/addons/msf_homere_interface/hr_payroll_wizard.xml	2022-09-19 12:45:05 +0000
@@ -126,7 +126,7 @@
                             </p>
                         </html>
                     </group>
-                    <field name="error_line_ids" nolabel="1" colspan="4">
+                    <field name="error_line_ids" nolabel="1" colspan="4" attrs="{'invisible': [('state', '=', 'payroll')]}">
                         <tree string="Error List">
                             <field name="msg"/>
                         </tree>
@@ -173,10 +173,9 @@
                     <field name="file" filename="filename"/>
                     <field name="filename" invisible="1"/>
                     <field name="date_format"/>
-                    <field name="blocked" invisible="1" />
                     <newline/>
                     <group colspan="4" col="2"
-                        attrs="{'invisible': [('blocked', '=', False), ('state', '=', 'simu')]}">
+                        attrs="{'invisible': [('state', '=', 'simu')]}">
                         <field name="msg" colspan="4"/>
                     </group>
                     <group colspan="4" col="2"

=== modified file 'bin/addons/msf_homere_interface/wizard/hr_payroll_import.py'
--- bin/addons/msf_homere_interface/wizard/hr_payroll_import.py	2022-06-16 14:59:26 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_payroll_import.py	2022-09-19 12:45:05 +0000
@@ -73,7 +73,6 @@
         'filename': fields.char(string="Imported filename", size=256),
         'date_format': fields.selection([('%d/%m/%Y', 'dd/mm/yyyy'), ('%m-%d-%Y', 'mm-dd-yyyy'), ('%d-%m-%y', 'dd-mm-yy'), ('%d-%m-%Y', 'dd-mm-yyyy'), ('%d/%m/%y', 'dd/mm/yy'), ('%d.%m.%Y', 'dd.mm.yyyy')], "Date format", required=True, help="This is the date format used in the Homère file in order to recognize them."),
         'msg': fields.text(string='Message'),
-        'blocked': fields.boolean('Is import blocked'),
     }
 
     _defaults = {
@@ -132,7 +131,7 @@
         created = 0
         vals = {}
         error_message = ""
-        blocking_message = []
+        ad_errors_message = []
         # verify that some data exists
         if not data:
             return False, res_amount, created, vals, "", error_message, bs_only
@@ -335,27 +334,27 @@
                 'free1_id': employee_data and employee_data.get('free1_id', False) and employee_data.get('free1_id')[0] or False,
                 'free2_id': employee_data and employee_data.get('free2_id', False) and employee_data.get('free2_id')[0] or False,
             })
-            if wiz_state == 'simu' and to_update_employee:
+            if to_update_employee:
                 #check cc compat on (cost_center_id, destination_id, employee_data.funding_pool_id)
                 if cost_center_id and destination_id and not ad_obj.check_dest_cc_compatibility(cr, uid, destination_id, cost_center_id, context=context):
-                    blocking_message.append(_('Employee %s: the Cost Center %s is not compatible with the Destination %s.') % (employee_data['name_resource'], cost_center_code, destination_code))
+                    ad_errors_message.append(_('Employee %s: the Cost Center %s is not compatible with the Destination %s.') % (employee_data['name_resource'], cost_center_code, destination_code))
                 fp_id = employee_data.get('funding_pool_id', False) and employee_data.get('funding_pool_id')[0]
                 if fp_id and cost_center_id and not ad_obj.check_fp_cc_compatibility(cr, uid, fp_id, cost_center_id, context=context):
-                    blocking_message.append(_('Employee %s: the Cost Center %s is not compatible with the Funding Pool %s.') % (employee_data['name_resource'], cost_center_code, employee_data.get('funding_pool_id')[1]))
+                    ad_errors_message.append(_('Employee %s: the Cost Center %s is not compatible with the Funding Pool %s.') % (employee_data['name_resource'], cost_center_code, employee_data.get('funding_pool_id')[1]))
         # Write payroll entry
         if wiz_state != 'simu':
             #US-671: In the process mode, update the employee cost center and destination, and use also this one for the payroll object.
             ############################ UPDATE THE EMPLOYEE! AND PREPARE THE LOG FILE WITH WARNING!
-            if to_update_employee and employee_id:
+            # US-10124: Only update AD of Employees without AD errors in payroll file
+            if to_update_employee and employee_id and not ad_errors_message and not error_message:
                 self.pool.get('hr.employee').write(cr, uid, [employee_id], {'cost_center_id': cost_center_id, 'destination_id': destination_id,}, context)
 
-            res = self.pool.get('hr.payroll.msf').create(cr, uid, vals,
-                                                         context={'from': 'import'})
+            res = self.pool.get('hr.payroll.msf').create(cr, uid, vals, context={'from': 'import'})
             if res:
                 created += 1
         else:
             created += 1
-        return True, amount, created, vals, currency[0], error_message, blocking_message, bs_only
+        return True, amount, created, vals, currency[0], error_message, ad_errors_message, bs_only
 
     def _get_homere_password(self, cr, uid, pass_type='payroll'):
         ##### UPDATE HOMERE.CONF FILE #####
@@ -524,7 +523,7 @@
 
         filename = ""
         error_msg = ""
-        blocking_msg = []
+        ad_errors_msg = []
         wiz_state = False
         # Browse all given wizard
         for wiz in self.browse(cr, uid, ids):
@@ -587,14 +586,14 @@
                     for line in reader:
                         num_line += 1
                         processed += 1
-                        update, amount, nb_created, vals, ccy, msg, blocking_message, bs_only = self.update_payroll_entries(
+                        update, amount, nb_created, vals, ccy, msg, ad_errors_message, bs_only = self.update_payroll_entries(
                             cr, uid, data=line, field=field,
                             date_format=wiz.date_format,
                             wiz_state=wiz.state,
                             bs_only=bs_only)
                         res_amount += round(amount, 2)
-                        for block in blocking_message:
-                            blocking_msg.append(_("Line %s: %s") % (str(num_line), block))
+                        for block in ad_errors_message:
+                            ad_errors_msg.append(_("Line %s: %s") % (str(num_line), block))
                         if not update:
                             res = False
                         if num_line == 2:  # the first line containing data
@@ -666,20 +665,16 @@
         if wiz_state == 'simu' and ids:
             # US_201: if check raise no error, change state to process
             # US-671: Show message in the wizard if there was warning or not.
-            wiz_state = 'proceed'
-            blocked = False
-            if blocking_msg:
-                error_msg = '%s:\n--------------------\n%s' % (_('Please correct following employee analytic distribution errors to allow Import to be processed'), "\n".join(blocking_msg))
-                wiz_state = 'simu'
-                blocked = True
+            if ad_errors_msg:
+                error_msg = '%s\n--------------------\n%s' % (_('Import can be processed but with the warnings below. \n'
+                                                                 '(If analytic distribution in payroll is invalid, employee analytic distribution will remain untouched).'), "\n".join(ad_errors_msg))
             elif error_msg:
                 error_msg = _("Import can be processed but with the following warnings:\n-------------------- \n") + error_msg
             else:
                 error_msg = _("No warning found for this file. Import can be now processed.")
 
-            self.write(cr, uid, [wiz.id], {'state': wiz_state, 'msg': error_msg, 'blocked': blocked})
-            view_id = self.pool.get('ir.model.data').get_object_reference(cr,
-                                                                          uid, 'msf_homere_interface', 'payroll_import_wizard')
+            self.write(cr, uid, [wiz.id], {'state': 'proceed', 'msg': error_msg})
+            view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'msf_homere_interface', 'payroll_import_wizard')
             view_id = view_id and view_id[1] or False
 
             return {
@@ -704,7 +699,9 @@
         # This is to redirect to Payroll Tree View
         context.update({'from': 'payroll_import'})
 
-        res_id = self.pool.get('hr.payroll.import.confirmation').create(cr, uid, {'filename': filename,'created': created, 'total': processed, 'state': 'payroll',}, context=context)
+        res_id = self.pool.get('hr.payroll.import.confirmation')\
+            .create(cr, uid, {'filename': filename,'created': created, 'total': processed, 'state': 'payroll'},
+                    context=context)
 
         return {
             'name': 'Payroll Import Confirmation',

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-08-23 13:15:58 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-09-19 12:45:05 +0000
@@ -115505,6 +115505,14 @@
 msgid "Import error for account \"%s\" : Listing both Accounts/Destinations and G/L Accounts is not allowed"
 msgstr "Erreur lors de l'import du compte \"%s\" : Lister à la fois les Comptes/Destinations et les Comptes Grand Livre n'est pas permis"
 
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:672
+#, python-format
+msgid "Import can be processed but with the warnings below. \n"
+"(If analytic distribution in payroll is invalid, employee analytic distribution will remain untouched)."
+msgstr "L'import peut passer mais avec les alertes listées ci-bas. \n"
+"(Si la distribution analytique dans les fichiers de Paie est invalide, la distribution analytique de l'employé correspondant ne sera pas touchée)."
+
 #. module: account
 #: model:ir.model,name:account.model_account_common_employee_report
 msgid "Account Common Employee Report"