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

[jftempo]

=== modified file 'bin/addons/msf_homere_interface/hr_payroll_wizard.xml'
--- bin/addons/msf_homere_interface/hr_payroll_wizard.xml	2020-09-21 12:51:01 +0000
+++ bin/addons/msf_homere_interface/hr_payroll_wizard.xml	2022-06-16 15:00:29 +0000
@@ -173,9 +173,10 @@
                     <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': [('state', '=', 'simu')]}">
+                        attrs="{'invisible': [('blocked', '=', False), ('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-04-08 09:11:56 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_payroll_import.py	2022-06-16 15:00:29 +0000
@@ -73,6 +73,7 @@
         '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 = {
@@ -131,6 +132,7 @@
         created = 0
         vals = {}
         error_message = ""
+        blocking_message = []
         # verify that some data exists
         if not data:
             return False, res_amount, created, vals, "", error_message, bs_only
@@ -143,10 +145,13 @@
         name = ''
         ref = ''
         destination_id = False
+        destination_code = False
         cost_center_id = False
+        cost_center_code = False
         # US-671: This flag is used to indicate whether the DEST and CC of employee needs to be updated
         to_update_employee = False
         partner_obj = self.pool.get('res.partner')
+        ad_obj = self.pool.get('analytic.distribution')
 
         # strip spaces in all columns
         for i in range(len(data)):
@@ -170,6 +175,7 @@
                 cc_ids = aaa_obj.search(cr, uid, condition, context=context)
                 if cc_ids and cc_ids[0]:
                     cost_center_id = cc_ids[0]
+                    cost_center_code = project[0]
                 else:
                     error_message = _("Invalid Cost Center [%s] will be ignored.") % (project[0])
             if axis1 and axis1[0]:
@@ -179,6 +185,7 @@
                 dest_ids = aaa_obj.search(cr, uid, date_args, context=context)
                 if dest_ids and dest_ids[0]:
                     destination_id = dest_ids[0]
+                    destination_code = axis1[0]
                 else:
                     error_message = error_message + _("Invalid Destination [%s] will be ignored.") % (axis1[0])
 
@@ -272,10 +279,12 @@
 
                 if not destination_id and emp.destination_id: # US-671: Only update if the destination from the import is not valid
                     destination_id = emp.destination_id.id
+                    destination_code = emp.destination_id.code
             if not destination_id:
                 if not account.default_destination_id:
                     raise osv.except_osv(_('Warning'), _('No default Destination defined for this account: %s') % (account.code or '',))
                 destination_id = account.default_destination_id and account.default_destination_id.id or False
+                destination_code = account.default_destination_id and account.default_destination_id.code or False
 
         # Fetch description
         if not name:
@@ -312,19 +321,27 @@
         }
         # Retrieve analytic distribution from employee
         if employee_id:
-            employee_data = self.pool.get('hr.employee').read(cr, uid, employee_id, ['cost_center_id', 'funding_pool_id', 'free1_id', 'free2_id'])
+            employee_data = self.pool.get('hr.employee').read(cr, uid, employee_id, ['cost_center_id', 'funding_pool_id', 'free1_id', 'free2_id', 'name_resource'])
             #US-671: use the cost center from the import, if not retrieve from employee
             temp_cc = employee_data and employee_data.get('cost_center_id', False) and employee_data.get('cost_center_id')[0] or False
             if cost_center_id and cost_center_id != temp_cc:
                 to_update_employee =True
             if not cost_center_id:
                 cost_center_id = temp_cc
+                cost_center_code = employee_data.get('cost_center_id') and employee_data.get('cost_center_id')[1] or False
             vals.update({
                 'cost_center_id': cost_center_id,
                 'funding_pool_id': employee_data and employee_data.get('funding_pool_id', False) and employee_data.get('funding_pool_id')[0] or False,
                 '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:
+                #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))
+                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]))
         # 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.
@@ -338,7 +355,7 @@
                 created += 1
         else:
             created += 1
-        return True, amount, created, vals, currency[0], error_message, bs_only
+        return True, amount, created, vals, currency[0], error_message, blocking_message, bs_only
 
     def _get_homere_password(self, cr, uid, pass_type='payroll'):
         ##### UPDATE HOMERE.CONF FILE #####
@@ -507,6 +524,7 @@
 
         filename = ""
         error_msg = ""
+        blocking_msg = []
         wiz_state = False
         # Browse all given wizard
         for wiz in self.browse(cr, uid, ids):
@@ -569,12 +587,14 @@
                     for line in reader:
                         num_line += 1
                         processed += 1
-                        update, amount, nb_created, vals, ccy, msg, bs_only = self.update_payroll_entries(
+                        update, amount, nb_created, vals, ccy, msg, blocking_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))
                         if not update:
                             res = False
                         if num_line == 2:  # the first line containing data
@@ -646,12 +666,18 @@
         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.
-            if error_msg:
+            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
+            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': 'proceed', 'msg': error_msg})
+            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')
             view_id = view_id and view_id[1] or False

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-05-25 14:15:34 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-06-16 15:00:29 +0000
@@ -115048,3 +115048,9 @@
 #, python-format
 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_payroll_import.py:669
+#, python-format
+msgid "Please correct following employee analytic distribution errors to allow Import to be processed"
+msgstr "Veuillez corriger les erreurs suivantes de distribution analytique des employés pour pouvoir finaliser l'import des données:"