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

[jftempo]

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

6243. By Gaël Mukunde on 2022-08-17

US-9842 [IMP] Remove from identification number leading and trailing whitespaces

6244. By Gaël Mukunde on 2022-08-18

US-9842 [IMP] Reduce code scope to only expat employees

=== modified file 'bin/addons/msf_homere_interface/hr.py'
--- bin/addons/msf_homere_interface/hr.py	2022-06-20 09:31:19 +0000
+++ bin/addons/msf_homere_interface/hr.py	2022-08-18 08:17:35 +0000
@@ -166,14 +166,15 @@
             return False
 
         employee_name = data['name'].strip()
+        employee_id = data['identification_id']
         existing_id = self.find_sd_ref(cr, uid, sdref)
         if not existing_id:
             # never run, but exists with the same id and name => ignore
-            if self.search_exist(cr, uid, [('identification_id', '=', data['identification_id']), ('name', '=', employee_name)]):
+            if self.search_exist(cr, uid, [('identification_id', '=', employee_id), ('name', '=', employee_name)]):
                 return True
 
         else:
-            same_ids = self.search(cr, uid, [('identification_id', '=', data['identification_id']), ('name', '=', employee_name)])
+            same_ids = self.search(cr, uid, [('identification_id', '=', employee_id), ('name', '=', employee_name)])
             if same_ids and existing_id not in same_ids:
                 # Run on the instance but has a different Employee ID (identification_id) than on the one run on the instance
                 return True
@@ -240,6 +241,8 @@
             context = {}
         if vals.get('name'):
             vals['name'] = vals['name'].strip()
+        if vals.get('identification_id', False) and vals.get('employee_type', False) == 'ex':
+            vals['identification_id'] = vals['identification_id'].strip()
         allow_edition = False
         if 'employee_type' in vals and vals.get('employee_type') == 'local':
             # Search Payroll functionnality preference (activated or not)
@@ -278,6 +281,8 @@
         # Prepare some variable for process
         if vals.get('name'):
             vals['name'] = vals['name'].strip()
+        if vals.get('identification_id', False) and vals.get('employee_type', False) == 'ex':
+            vals['identification_id'] = vals['identification_id'].strip()
         if vals.get('employee_type', False):
             if vals.get('employee_type') == 'local':
                 local = True

=== modified file 'bin/addons/msf_homere_interface/wizard/hr_expat_import.py'
--- bin/addons/msf_homere_interface/wizard/hr_expat_import.py	2019-11-08 11:28:13 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_expat_import.py	2022-08-18 08:17:35 +0000
@@ -109,7 +109,7 @@
                             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)
+                code = 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" \

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2022-08-05 15:36:47 +0000
+++ bin/addons/msf_profile/data/patches.xml	2022-08-18 08:17:35 +0000
@@ -787,6 +787,7 @@
             <field name="method">us_5722_update_accruals</field>
         </record>
 
+<<<<<<< TREE
         <!-- UF26.0 -->
         <record id="us_8259_remove_currency_table_wkf" model="patch.scripts">
             <field name="method">us_8259_remove_currency_table_wkf</field>
@@ -811,5 +812,12 @@
         <record id="us_9229_fix_rt" model="patch.scripts">
             <field name="method">us_9229_fix_rt</field>
         </record>
+=======
+        <!-- UF27 -->
+        <record id="us_9842_remove_space" model="patch.scripts">
+            <field name="method">us_9842_remove_space</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2022-08-05 15:36:47 +0000
+++ bin/addons/msf_profile/msf_profile.py	2022-08-18 08:17:35 +0000
@@ -56,6 +56,7 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+<<<<<<< TREE
     # UF26.0
     def fix_us_10163_ocbhq_funct_amount(self, cr, uid, *a, **b):
         ''' OCBHQ: fix amounts on EOY-2021-14020-OCBVE101-VES'''
@@ -187,6 +188,14 @@
 
         return True
 
+=======
+    # UF27
+    def us_9842_remove_space(self, cr, uid, *a, **b):
+        cr.execute('''SELECT id, identification_id FROM hr_employee WHERE employee_type = %s''', 'ex')
+        for x in cr.fetchall():
+            cr.execute('''UPDATE hr_employee SET identification_id = %s WHERE id = %s''', (x[1].strip(), x[0]))
+
+>>>>>>> MERGE-SOURCE
     # UF25.0
     def us_8451_split_rr(self, cr, uid, *a, **b):
         if not cr.column_exists('replenishment_segment_line', 'rr_fmc_1') or not cr.column_exists('replenishment_segment_line', 'rr_max_1'):