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

[jftempo]

[lp:~jfb-tempo-consulting/unifield-server/US-9119]

6120. By jftempo on 2023-07-13

US-11689 [FIX] Deleted object on py3: replace method

6121. By jftempo on 2023-07-13

US-7008 [FIX] Full report: error if register has draft entries (no sequence_for_reference)

6122. By jftempo on 2023-08-11

US-11778 [FIX] malformed_xml_spreadsheet: "growing nodeset hit limit" on big file

6123. By jftempo on 2023-08-11

[MERGE] UF30.0rc1

6124. By jftempo on 2023-08-17

[MERGE] UF30.0rc2

6125. By jftempo on 2023-08-17

US-10787 [FIX] Signature follow-up domain on open doc

6126. By jftempo on 2023-08-17

US-3612 [FIX] Adv. return wizard: employee with AD on the return line raises error

6127. By jftempo on 2023-08-29

[MERGE] UF30.0

6128. By jftempo on 2023-08-29

[IMP] Product Attributes Data: do not update data

6129. By jftempo on 2023-08-29

Python win lib: do not force version

6130. By jftempo on 2023-08-29

Python win lib: freeze pip version

6131. By jftempo on 2023-08-29

Release UF30.0py3

6132. By jftempo on 2023-09-21

[MERGE] UF30.1rc1

6133. By jftempo on 2023-09-21

US-2645 [FIX] PO line sorted by supplier code: py3 lmf

6134. By jftempo on 2023-09-21

[FIX] Expiry quantities: lmf on sort by location

6135. By jftempo on 2023-09-21

US-4242 [FIX] PO Import wizard: double click on import button: lmf

6136. By jftempo on 2023-09-21

[MERGE] UF30.1rc1

6137. By jftempo on 2023-09-21

Release UF30.1rc1py3

6138. By jftempo on 2023-09-25

US-12011 [MERGE] PO Confirmation with MML non-conform product

6139. By jftempo on 2023-09-26

[MERGE] UF30.1

6140. By jftempo on 2023-09-26

Release UF30.1

6141. By jftempo on 2023-10-02

US-5946 [FIX] Import expact
     - allow integer as Indentifier
     - end date: issue depending on server locale (fr_MF)
     - Tools > Import : allow to import file with or without end date

6142. By jftempo on 2023-10-03

US-12041 [FIX] Import payroll: lmf if envoi.ini is ISO-8859 encoded with special char

6143. By jftempo on 2023-10-23

US-12130 [FIX] JI / JI Selector: pink screen if Display HQ Code is enabled on Company configuration

6144. By jftempo on 2023-10-24

US-12069 [IMP] OCP Webservice to update res.currency.table

6145. By jftempo on 2023-10-26

US-US-5912 [FIX] Export PO f/up: too many lines, replace Lmf by a warning message

6146. By jftempo on 2023-10-26

US-5376 [FIX] HQ entries import: allow B/S account

6147. By jftempo on 2023-10-26

US-6516 [FIX] OCG VI Finance: py3 error on itekeys

6148. By jftempo on 2023-11-03

[MERGE] UF31.0rc0

6149. By jftempo on 2023-11-06

[MERGE] UF31.0rc1

6150. By jftempo on 2023-11-06

[FIX] UF30.1 py3 migration

6151. By jftempo on 2023-11-06

[FIX] Asset py3: int, long

6152. By jftempo on 2023-11-10

US-12185 |FIX] PI import with ED date 11-2222 nothing happens
   - dateutil.parser.parse does not raise a ValueError
   - Exception.message no longer exists in py3

6153. By jftempo on 2023-11-10

Exception has no more message attribute

6154. By jftempo on 2023-11-16

[MERGE] UF31.0rc2

6155. By jftempo on 2023-11-20

US-11950 [FIX] Product asset sync down state

6156. By jftempo on 2023-11-21

[IMP] RB: create asset data

6157. By jftempo on 2023-11-22

Upgrade python lib

6158. By jftempo on 2023-11-22

Upgrade python lib

6159. By jftempo on 2023-11-22

Upgrade python lib

6160. By jftempo on 2023-11-22

upgrade from pip-audit

6161. By jftempo on 2023-11-22

Upgrade lib from safety tool

6162. By jftempo on 2023-11-22

[IMP] replace deprecated currentThread() / isDaemon() by current_thread() / daemon

6163. By jftempo on 2023-11-23

[FIX] Py3 Pillow 10: getsize replaced by getbbox

6164. By jftempo on 2023-11-23

US-12244 [FIX] Periodical forecast: fixed date check for dates in the future

6165. By jftempo on 2023-11-23

US-6144-py3 [FIX] Sourcing: fixed name filtering for python 3 during creation/modification

lp:~dorian-kemps/unifield-server/US-6144-py3

6166. By jftempo on 2023-11-30

[FIX] Generate translation file to py3

6167. By jftempo on 2023-12-01

Release UF31.0py3

6168. By jftempo on 2023-12-14

[MERGE] UF31.1

6169. By jftempo on 2023-12-14

unifield-version.txt: typo in version

6170. By jftempo on 2023-12-15

[MERGE] US-9119 + UF31.1py3

6171. By jftempo on 2024-01-02

Homere employee update: if duplicate uuid , add id_staff

6172. By jftempo on 2024-01-02

id_staff match

6173. By jftempo on 2024-01-02

Search view: add homere uuid

6174. By jftempo on 2024-01-02

id_staff match

6175. By jftempo on 2024-01-03

Translation

6176. By jftempo on 2024-01-25

Lmf when staff.csv is incomplete

Unmerged revisions

6176. By jftempo on 2024-01-25

Lmf when staff.csv is incomplete

6175. By jftempo on 2024-01-03

Translation

6174. By jftempo on 2024-01-02

id_staff match

6173. By jftempo on 2024-01-02

Search view: add homere uuid

6172. By jftempo on 2024-01-02

id_staff match

6171. By jftempo on 2024-01-02

Homere employee update: if duplicate uuid , add id_staff

6170. By jftempo on 2023-12-15

[MERGE] US-9119 + UF31.1py3

=== modified file 'bin/addons/hr/hr_view.xml'
--- bin/addons/hr/hr_view.xml	2023-08-16 13:46:02 +0000
+++ bin/addons/hr/hr_view.xml	2024-01-25 08:44:54 +0000
@@ -110,6 +110,7 @@
                     <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="identification_id"/>
+                    <field name="homere_uuid_key" />
                     <field name="job_name"/>
                     <newline/>
                     <group>

=== modified file 'bin/addons/msf_homere_interface/hr.py'
--- bin/addons/msf_homere_interface/hr.py	2023-11-03 15:04:29 +0000
+++ bin/addons/msf_homere_interface/hr.py	2024-01-25 08:44:54 +0000
@@ -139,7 +139,7 @@
         'homere_codeterrain': fields.char(string='Homere field: codeterrain', size=20, readonly=True, required=False),
         'homere_id_staff': fields.integer(string='Homere field: id_staff', size=10, readonly=True, required=False),
         'homere_id_unique': fields.char(string='Homere field: id_unique', size=42, readonly=True, required=False),
-        'homere_uuid_key': fields.char(string='Homere field: UUID_key', size=64, readonly=True, required=False),
+        'homere_uuid_key': fields.char(string='Homere field: UUID_key', size=64, readonly=True, required=False, select=1),
         'gender': fields.selection([('male', 'Male'),('female', 'Female'), ('unknown', 'Unknown')], 'Gender'),
         'private_phone': fields.char(string='Private Phone', size=32),
         'name_resource': fields.related('resource_id', 'name', string="Name", type='char', size=128, store=True, write_relate=False),
@@ -160,6 +160,7 @@
         'homere_id_unique': lambda *a: '',
         'gender': lambda *a: 'unknown',
         'ex_allow_edition': lambda *a: True,
+        'homere_uuid_key': False,
     }
 
     def _set_sync_update_as_run(self, cr, uid, data, sdref, context=None):
@@ -211,6 +212,7 @@
         (_check_unicity, "Another employee has the same Identification No.", ['identification_id']),
     ]
 
+
     def _check_employee_cc_compatibility(self, cr, uid, employee_id, context=None):
         """
         Raises an error in case the employee "Destination and Cost Center" or "Funding Pool and Cost Center" are not compatible.

=== modified file 'bin/addons/msf_homere_interface/hr_view.xml'
--- bin/addons/msf_homere_interface/hr_view.xml	2023-08-16 13:46:02 +0000
+++ bin/addons/msf_homere_interface/hr_view.xml	2024-01-25 08:44:54 +0000
@@ -174,6 +174,7 @@
                 <separator orientation="vertical" />
                 <field name="name"/>
                 <field name="identification_id"/>
+                <field name="homere_uuid_key" />
                 <field name="job_name"/>
                 <newline/>
                 <group>

=== modified file 'bin/addons/msf_homere_interface/wizard/hr_payroll_employee_import.py'
--- bin/addons/msf_homere_interface/wizard/hr_payroll_employee_import.py	2023-12-13 13:18:06 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_payroll_employee_import.py	2024-01-25 08:44:54 +0000
@@ -224,125 +224,6 @@
             for err in errors[wiz_id]:
                 error_obj.create(cr, uid, {'wizard_id': wiz_id, 'msg': err}, context=context)
 
-    def update_employee_check(self, cr, uid,
-                              staffcode=False, missioncode=False, staff_id=False, uniq_id=False,
-                              wizard_id=None, employee_name=False, registered_keys=None, homere_fields=None, errors=None):
-        """
-        Check that:
-        - no more than 1 employee exist for "missioncode + staff_id + uniq_id"
-        - only one employee have this staffcode
-        :return (ok, what_changed)
-        :rtype tuple
-        """
-
-        if homere_fields is None:
-            homere_fields = {}
-
-        def changed(mission1, mission2, staff1, staff2, unique1, unique2):
-            res = None
-            if mission1 != mission2:
-                res = 'mission'
-            elif staff1 != staff2:
-                res = 'staff'
-            elif unique1 != unique2:
-                res = 'unique'
-            return res
-
-        res = False
-        what_changed = None
-
-        # Checks
-        if not staffcode or not missioncode or not staff_id or not uniq_id:
-            name = employee_name or _('Nonamed Employee')
-            message = _('Unknown error for employee %s') % name
-            if not staffcode:
-                message = _('No "code_staff" found for employee %s!') % (name,)
-            elif not missioncode:
-                message = _('No "code_terrain" found for employee %s!') % (name,)
-            elif not staff_id:
-                message = _('No "id_staff" found for employee %s!') % (name,)
-            elif not uniq_id:
-                message = _('No "id_unique" found for employee %s!') % (name,)
-            self.store_error(errors, wizard_id, message)
-            return (res, what_changed)
-
-        # Check employees
-
-        # US-1404: check duplicates on the import files itself
-        # => as not already in db
-        check_key = missioncode + staff_id + uniq_id
-        if check_key in registered_keys:
-            # if check_key is in homere_fields BUT its value is empty, the related msg has already been created => skip the msg creation part
-            if check_key not in homere_fields or homere_fields.get(check_key):
-                # if possible list all the duplicated employees
-                if homere_fields.get(check_key):
-                    list_duplicates = ['%s (%s)' % (empl, _('Import File')) for empl in homere_fields[check_key]]
-                    # empty the list so that the msg with all employees is displayed only once (and not once per duplicated employee)
-                    homere_fields[check_key] = []
-                # if not possible only the current employee name will be displayed
-                else:
-                    list_duplicates = ['%s (%s)' % (employee_name, _('Import File'))]
-                self.store_error(errors, wizard_id,
-                                 _('Several employees have the same combination key codeterrain/id_staff/(id_unique) "%s / %s / (%s)": %s') %
-                                  (missioncode, staff_id, uniq_id, ' ; '.join(list_duplicates))
-                                 )
-            return (res, what_changed)
-
-        # check duplicates already in db
-        search_ids = self.pool.get('hr.employee').search(cr, uid, [('homere_codeterrain', '=', missioncode), ('homere_id_staff', '=', staff_id), ('homere_id_unique', '=', uniq_id)])
-        if search_ids and len(search_ids) > 1:
-            emp_duplicates = self.pool.get('hr.employee').browse(cr, uid, search_ids, fields_to_fetch=['name'])
-            # create a list with the employee from the file...
-            name_duplicates = ['%s (%s)' % (employee_name, _('Import File'))]
-            # ... and the duplicates already in UniField
-            name_duplicates.extend(['%s (UniField)' % emp.name for emp in emp_duplicates if emp.name])
-            self.store_error(errors, wizard_id,
-                             _('Several employees have the same combination key codeterrain/id_staff/(id_unique) "%s / %s / (%s)": %s') %
-                              (missioncode, staff_id, uniq_id, ' ; '.join(name_duplicates))
-                             )
-            return (res, what_changed)
-
-        # Check staffcode
-        staffcode_ids = self.pool.get('hr.employee').search(cr, uid, [('identification_id', '=', staffcode)])
-        if staffcode_ids:
-            employee_error_list = []
-            # UTP-1098: Do not make an error if the employee have the same code staff and the same name
-            for employee in self.pool.get('hr.employee').browse(cr, uid, staffcode_ids):
-                what_changed = changed(employee.homere_codeterrain, missioncode, str(employee.homere_id_staff), staff_id, employee.homere_id_unique, uniq_id)
-                if employee.name == employee_name:
-                    continue
-                if what_changed != None:
-                    # duplicated employees in UniField
-                    employee_error_list.append("%s (UniField)" % (employee.name,))
-            if employee_error_list:
-                # add the duplicated employee from Import File
-                message = _('Several employees have the same Identification No "%s": %s') % \
-                    (staffcode, ' ; '.join(["%s (%s)" % (employee_name, _('Import File'))] + employee_error_list))
-                self.store_error(errors, wizard_id, message)
-                return (res, what_changed)
-
-        res = True
-        return (res, what_changed)
-
-    def _check_identification_id_duplication(self, cr, uid, vals, employee_check, what_changed, current_id=None, context=None):
-        """
-        Method used to check if the Identification No to be used for the employee about to be created/edited doesn't
-        already exist for another employee in UniField.
-        Returns False if there is a duplication AND we are in the use case where the related and detailed error has
-        already been stored in the list of errors to display (but the process wasn't blocked earlier since "what_changed" had a value).
-        Otherwise returns True => the generic create/write checks will then apply (i.e. a generic error msg will be displayed)
-        """
-        if context is None:
-            context = {}
-        employee_obj = self.pool.get('hr.employee')
-        if not employee_check and what_changed and vals.get('identification_id'):
-            employee_dom = [('identification_id', '=', vals['identification_id'])]
-            if current_id is not None:
-                employee_dom.append(('id', '!=', current_id))
-            if employee_obj.search_exist(cr, uid, employee_dom, context=context):
-                return False
-        return True
-
     def read_employee_infos(self, cr, uid, line='', context=None):
         """
         Read each line to extract infos (code, name and surname)
@@ -356,39 +237,46 @@
         return res
 
     def update_employee_infos(self, cr, uid, employee_data='', wizard_id=None,
-                              line_number=None, registered_keys=None, homere_fields=None, errors=None, context=None):
+                              line_number=None, errors=None, context=None):
         """
         Get employee infos and set them to DB.
+            return (status (True/False), is_new (0/1), is_update (0/1))
+
+        if status is False: full import is blocked
+
         """
-        # Some verifications
-        created = 0
-        updated = 0
-        if homere_fields is None:
-            homere_fields = {}
 
         if context is None:
             context = {}
+
         if line_number is not None:
             line_number = line_number + 2  # cf. the count starts at "1" and the header line is ignored
+<<<<<<< TREE
+=======
+
+        payment_method_obj = self.pool.get('hr.payment.method')
+>>>>>>> MERGE-SOURCE
         if not employee_data or not wizard_id:
             message = _('No data found for this line: %s.') % line_number
             self.store_error(errors, wizard_id, message)
-            return False, created, updated
+            return False, 0, 0
+
         # Prepare some values
         vals = {}
         # Extract information
         try:
-            code_staff = employee_data.get('code_staff', False)
+            code_staff = employee_data.get('code_staff', False) # UF identification_id
             codeterrain = employee_data.get('codeterrain', False)
             decede = employee_data.get('decede', False)
             id_staff = employee_data.get('id_staff', False)
             id_unique = employee_data.get('id_unique', False)
-            uuid_key = employee_data.get('uuid_key', False)
+            uuid_key = employee_data.get('uuid_key', False) # UF home_uuid_key
             nom = employee_data.get('nom', False)
             prenom = employee_data.get('prenom', False)
         except ValueError as e:
             raise osv.except_osv(_('Error'), _('The given file is probably corrupted!\n%s') % (e))
-        # Process data
+
+        # check max uuid size
         uuid_field = self.pool.get('hr.employee')._columns.get('homere_uuid_key')
         if uuid_key and uuid_field:
             uuid_key = ustr(uuid_key)
@@ -396,11 +284,13 @@
             if len(uuid_key) > uuid_field_size:
                 message = _('Line %s. The UUID_key has more than %d characters.') % (line_number, uuid_field_size)
                 self.store_error(errors, wizard_id, message)
-                return False, created, updated
+                return False, 0, 0
+
         # Due to UF-1742, if no id_unique, we fill it with "empty"
         uniq_id = id_unique or False
         if not id_unique:
             uniq_id = 'empty'
+<<<<<<< TREE
         if codeterrain and id_staff and code_staff:
             # Employee name
             nom = nom and nom.strip() or ''
@@ -465,23 +355,140 @@
             # Desactivate employee if no current contract
             if not current_contract:
                 vals.update({'active': False})
+=======
+
+        if not codeterrain or not id_staff or not code_staff:
+            message = _('Line %s. One of this column is missing: code_terrain, id_unique or id_staff. This often happens when the line is empty.') % (line_number, )
+            self.store_error(errors, wizard_id, message)
+            return False, 0, 0
+
+        if not uuid_key:
+            self.store_error(errors, wizard_id, _('Line %s. Required Homere uuid_key field is missing in the file.') % (line_number, ))
+            return False, 0, 0
+
+        # Employee name
+        nom = nom and nom.strip() or ''
+        prenom = prenom and prenom.strip() or ''
+        employee_name = (nom and prenom and ustr(nom) + ', ' + ustr(prenom)) or (nom and ustr(nom)) or (prenom and ustr(prenom)) or False
+
+
+        # employee by uuid_key
+        e_ids = self.pool.get('hr.employee').search(cr, uid, [('homere_uuid_key', '=', uuid_key)])
+        if len(e_ids) > 1:
+            with_id_staff_ids = self.pool.get('hr.employee').search(cr, uid, [('homere_uuid_key', '=', uuid_key), ('homere_id_staff', '=', id_staff)])
+            if len(with_id_staff_ids) == 1:
+                e_ids = with_id_staff_ids
+            else:
+                dups = self.pool.get('hr.employee').browse(cr, uid, e_ids, fields_to_fetch=['name', 'homere_id_staff'])
+                if len(with_id_staff_ids) > 1:
+                    self.store_error(errors, wizard_id, _('Homere uuid_key %s is duplicated in the UF database, Homere id_staff: %s, number of records: %d: %s') % (uuid_key, id_staff, len(with_id_staff_ids), '; '.join([x.name for x in dups])))
+                    return False, 0, 0
+                else:
+                    self.store_error(errors, wizard_id, _('Homere uuid_key %s is duplicated in the UF database, but no match with id_staff %s, number of records: %d: %s') % (uuid_key, id_staff, len(e_ids), '; '.join(['%s %s'%(x.name, x.homere_id_staff) for x in dups])))
+                    return False, 0, 0
+        if not e_ids:
+            # else no uuid, same name, same identification_id
+            e_ids = self.pool.get('hr.employee').search(cr, uid, [('identification_id','=', code_staff), ('name', '=', employee_name), ('homere_uuid_key', '=', False)])
+            if len(e_ids) > 1:
+                self.store_error(errors, wizard_id,
+                                 _('%d employees in the db have the same combination identification_id/name/empty uuid "%s / %s "') %
+                                 (len(e_ids), code_staff, employee_name)
+                                 )
+                return False, 0, 0
+
+>>>>>>> MERGE-SOURCE
             if not e_ids:
-                if not self._check_identification_id_duplication(cr, uid, vals, employee_check, what_changed, context=context):
-                    return False, created, updated
-                res = self.pool.get('hr.employee').create(cr, uid, vals, {'from': 'import'})
-                if res:
-                    created += 1
+                # Search employee regarding a unique trio: codeterrain, id_staff, id_unique
+                e_ids = self.pool.get('hr.employee').search(cr, uid, [('homere_codeterrain', '=', codeterrain), ('homere_id_staff', '=', id_staff), ('homere_id_unique', '=', uniq_id), ('homere_uuid_key', '=', False)])
+                if len(e_ids) > 1:
+                    dups = self.pool.get('hr.employee').browse(cr, uid, e_ids, fields_to_fetch=['name'])
+                    self.store_error(errors, wizard_id,
+                                     _('Several employees in the db have the same combination codeterrain/id_staff/(id_unique)/empty uuid "%s / %s / (%s)": %s') %
+                                     (codeterrain, id_staff, uniq_id, ' ; '.join([x.name for x in dups]))
+                                     )
+                    return False, 0, 0
+
+        if code_staff:
+            employee_dom = [('identification_id', '=', code_staff)]
+            if e_ids:
+                employee_dom.append(('id', '!=', e_ids[0]))
+            dup_ids = self.pool.get('hr.employee').search(cr, uid, employee_dom, context=context)
+            if dup_ids:
+                dups = self.pool.get('hr.employee').browse(cr, uid, dup_ids, fields_to_fetch=['name'])
+                self.store_error(errors, wizard_id,
+                                 _('Several employees have the same identification_id %s: %s (Import file), %s') %
+                                 (code_staff, employee_name, ','.join(['%s (UniField)' % x.name for x in dups]))
+                                 )
+                return False, 0, 0
+
+        vals = {
+            'active': True,
+            'employee_type': 'local',
+            'homere_codeterrain': codeterrain,
+            'homere_id_staff': id_staff,
+            'homere_id_unique': uniq_id,
+            'homere_uuid_key': uuid_key,
+            'photo': False,
+            'identification_id': code_staff or False,
+            'name': employee_name,
+            'bank_name': bqnom,
+            'bank_account_number': bqnumerocompte,
+        }
+
+
+        # Update the payment method
+        payment_method_id = False
+        if bqmodereglement:
+            payment_method_ids = payment_method_obj.search(cr, uid, [('name', '=', bqmodereglement)], limit=1, context=context)
+            if payment_method_ids:
+                payment_method_id = payment_method_ids[0]
             else:
-                if not self._check_identification_id_duplication(cr, uid, vals, employee_check, what_changed, current_id=e_ids[0], context=context):
-                    return False, created, updated
-                res = self.pool.get('hr.employee').write(cr, uid, e_ids, vals, {'from': 'import'})
-                if res:
-                    updated += 1
-            registered_keys[codeterrain + id_staff + uniq_id] = True
+                message = _('Payment Method %s not found for line: %s. Please fix Homere configuration or request a new Payment Method to the HQ.') % (ustr(bqmodereglement), line_number)
+                self.store_error(errors, wizard_id, message)
+                return False, 0, 0
+
+        vals.update({'payment_method_id': payment_method_id})
+
+        # In case of death, desactivate employee
+        if decede and decede == 'Y':
+            vals.update({'active': False})
+        # Desactivate employee if:
+        # - no contract line found
+        # - end of current contract exists and is inferior to current date
+        # - no contract line found with current = True
+
+        # sort contract: get current one, then by start date
+        contract_ids = self.pool.get('hr.contract.msf').search(cr, uid, [('homere_codeterrain', '=', codeterrain), ('homere_id_staff', '=', id_staff)], order='current desc,date_start desc')
+        if not contract_ids:
+            vals.update({'active': False})
+        current_contract = False
+        if contract_ids:
+            contract = self.pool.get('hr.contract.msf').browse(cr, uid, contract_ids[0])
+            # Check current contract
+            if contract.current:
+                current_contract = True
+                if contract.date_end and contract.date_end < strftime('%Y-%m-%d'):
+                    vals.update({'active': False})
+                # Check job
+                if contract.job_name:
+                    vals.update({'job_name': contract.job_name})
+            # Check the contract dates
+            vals.update({'contract_start_date': contract.date_start or False})
+            vals.update({'contract_end_date': contract.date_end or False})
+        # Desactivate employee if no current contract
+        if not current_contract:
+            vals.update({'active': False})
+
+        created = 0
+        updated = 0
+
+        if not e_ids:
+            self.pool.get('hr.employee').create(cr, uid, vals, {'from': 'import'})
+            created = 1
         else:
-            message = _('Line %s. One of this column is missing: code_terrain, id_unique or id_staff. This often happens when the line is empty.') % (line_number)
-            self.store_error(errors, wizard_id, message)
-            return False, created, updated
+            self.pool.get('hr.employee').write(cr, uid, e_ids, vals, {'from': 'import'})
+            updated = 1
+
 
         return True, created, updated
 
@@ -614,7 +621,6 @@
         updated = 0
         processed = 0
         filename = ""
-        registered_keys = {}
         errors = {}
         for wiz in self.browse(cr, uid, ids):
             if not wiz.file:
@@ -640,10 +646,17 @@
                 contract_ids = self.update_contract(cr, uid, ids, contract_reader, context=context)
             # UF-2472: Read all lines to check employee's code before importing
             staff_data = []
-            staff_codes = []
-            duplicates = []
             staff_seen = []
-            homere_fields = {}
+
+            staff_codes_seen = {}
+            staff_codes_duplicated = {}
+
+            codeterrain_id_staff_seen = {}
+            codeterrain_id_staff_duplicated = {}
+
+            uuid_seen = {}
+            uuid_duplicated = {}
+
             for line in staff_reader:
                 staff_seen.append(line)
                 data = self.read_employee_infos(cr, uid, line)
@@ -651,28 +664,26 @@
                 if data: # to avoid False value in staff_data list
                     staff_data.append(data)
                     code = data[0]
-                    if code in staff_codes:
-                        duplicates.append(code)
-                    staff_codes.append(code)
-                # store the Homere fields combination for all employees
-                if line.get('nom'):
-                    # "no id_unique" is replaced by the string "empty"
-                    homere_fields_key = "%s%s%s" % (line.get('codeterrain', ''), line.get('id_staff', ''), line.get('id_unique') or 'empty')
-                    if homere_fields_key not in homere_fields:
-                        homere_fields[homere_fields_key] = []
-                    homere_fields[homere_fields_key].append(line['nom'])
-            # Delete duplicates of… duplicates!
-            duplicates = list(set(duplicates))
-            details = {}
-            for employee_infos in staff_data:
-                employee_code = employee_infos[0]
-                if employee_code in duplicates:
-                    # add (Import File) after the employee info so that it is clearer for the user that the duplicates are inside the file itself
-                    if employee_code not in details:
-                        details[employee_code] = []
-                    details[employee_code].append(','.join([ustr(employee_infos[1]), "%s (%s)" % (ustr(employee_infos[2]), _('Import File'))]))
+
+                    # code_staff (uf identification_id) unicity
+                    if code in staff_codes_seen:
+                        staff_codes_duplicated[code] =True
+                    staff_codes_seen.setdefault(code, []).append('%s, %s (%s)' % (ustr(data[1]), ustr(data[2]),_('Import File')))
+
+
+                    if line.get('codeterrain') and line.get('id_staff'): # if not, error will be raised later
+                        codeterrain_id_staff_key = (line['codeterrain'], line['id_staff'])
+                        if codeterrain_id_staff_key in codeterrain_id_staff_seen:
+                            codeterrain_id_staff_duplicated[codeterrain_id_staff_key] = True
+                        codeterrain_id_staff_seen.setdefault(codeterrain_id_staff_key, []).append('%s, %s (%s)' % (ustr(data[1]), ustr(data[2]),_('Import File')))
+
+                    if line.get('uuid_key'): # if not, error raised later
+                        if line['uuid_key'] in uuid_seen:
+                            uuid_duplicated[line['uuid_key']] = True
+                        uuid_seen.setdefault(line['uuid_key'], []).append('%s, %s (%s)' % (ustr(data[1]), ustr(data[2]), _('Import File')))
+
             res = True
-            if not details:
+            if not staff_codes_duplicated and not codeterrain_id_staff_duplicated and not uuid_duplicated:
                 created = 0
                 processed = 0
                 updated = 0
@@ -681,7 +692,7 @@
                 for i, employee_data in enumerate(staff_seen):
                     update, nb_created, nb_updated = self.update_employee_infos(
                         cr, uid, employee_data, wiz.id, i,
-                        registered_keys=registered_keys, homere_fields=homere_fields, errors=errors, context=context)
+                        errors=errors, context=context)
                     if not update:
                         res = False
                     created += nb_created
@@ -690,9 +701,16 @@
             else:
                 res = False
                 # create a different error line for each employee code being duplicated
-                for emp_code in details:
-                    message = _('Several employees have the same Identification No "%s": %s') % (emp_code, ' ; '.join(details[emp_code]))
-                    self.store_error(errors, wiz.id, message)
+                for emp_code in staff_codes_duplicated:
+                    message = _('Several employees have the same Identification No "%s": %s') % (emp_code, ' ; '.join(staff_codes_seen[emp_code]))
+                    self.store_error(errors, wiz.id, message)
+                for codeterrain_dup, id_staff_dup in codeterrain_id_staff_duplicated:
+                    message = _('Several employees have the same combination codeterrain %s, id_staff %s : %s') % (codeterrain_dup, id_staff_dup , ' ; '.join(codeterrain_id_staff_seen[(codeterrain_dup, id_staff_dup)]))
+                    self.store_error(errors, wiz.id, message)
+                for uuid_dup in uuid_duplicated:
+                    message = _('Several employees have the same uuid_key %s : %s') % (uuid_dup , ' ; '.join(uuid_seen[uuid_dup]))
+                    self.store_error(errors, wiz.id, message)
+
             # Close Temporary File
             # Delete previous created lines for employee's contracts
             if contract_ids:
@@ -701,7 +719,6 @@
                 to_close.close()
             if tmpdir:
                 shutil.rmtree(tmpdir)
-        del registered_keys
         if res:
             rejected = processed - created - updated
             message = _("Employee import successful.")

=== modified file 'bin/addons/msf_homere_interface/wizard/hr_payroll_import.py'
--- bin/addons/msf_homere_interface/wizard/hr_payroll_import.py	2023-10-03 12:51:21 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_payroll_import.py	2024-01-25 08:44:54 +0000
@@ -92,26 +92,44 @@
         employee_obj = self.pool.get('hr.employee')
         employee_ids = []
         employee_identification_id = ""
+        uuid_used = False
         if third and third[0]:
             # the Third column should contain the exact code of the employee
             employee_identification_id = third[0]
-            employee_ids = employee_obj.search(cr, uid,
-                                               [('identification_id', '=', employee_identification_id)],
-                                               context=context, order='NO_ORDER')
+            employee_ids = employee_obj.search(cr, uid, [('homere_uuid_key', '=', employee_identification_id)], context=context)
+            if not employee_ids:
+                employee_ids = employee_obj.search(cr, uid,
+                                                   [('identification_id', '=', employee_identification_id)],
+                                                   context=context, order='NO_ORDER')
+            else:
+                uuid_used = True
         # check the Secondary description if no employee found (no matter if the Third column is empty or not)
         if not employee_ids and second_description and second_description[0]:
             # Secondary description looks like "John Smith MWNP0001" => extract the employee code MWNP0001
             employee_identification_id = ustr(second_description[0]).split(' ')[-1]
-            employee_ids = employee_obj.search(cr, uid,
-                                               [('identification_id', '=', employee_identification_id)],
-                                               context=context, order='NO_ORDER')
+            employee_ids = employee_obj.search(cr, uid, [('homere_uuid_key', '=', employee_identification_id)], context=context)
+            if not employee_ids:
+                employee_ids = employee_obj.search(cr, uid,
+                                                   [('identification_id', '=', employee_identification_id)],
+                                                   context=context, order='NO_ORDER')
+            else:
+                uuid_used = True
+
         if employee_identification_id and not employee_ids and account.is_analytic_addicted and not is_counterpart:
             raise osv.except_osv(_('Error'), _('No employee found for this code: %s.\nDEBIT: %s.\nCREDIT: %s.') % (
                 employee_identification_id, debit, credit,))
         if employee_ids and len(employee_ids) > 1:
+            if uuid_used:
+                raise osv.except_osv(_('Error'), _('More than one employee have the same uuid: %s') % (
+                    employee_identification_id,))
+
             raise osv.except_osv(_('Error'), _('More than one employee have the same identification ID: %s') % (
                 employee_identification_id,))
         employee_id = employee_ids and employee_ids[0] or False
+
+        if employee_id and uuid_used:
+            employee_identification_id = employee_obj.browse(cr, uid, employee_id, fields_to_fetch=['identification_id'], context=context).identification_id
+
         return employee_identification_id, employee_id
 
     def update_payroll_entries(self, cr, uid,

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2024-01-17 13:57:19 +0000
+++ bin/addons/msf_profile/data/patches.xml	2024-01-25 08:44:54 +0000
@@ -1034,5 +1034,8 @@
 
 
 
+        <record id="us_9119_employee_uuid" model="patch.scripts">
+            <field name="method">us_9119_employee_uuid</field>
+        </record>
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2024-01-17 13:57:19 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2024-01-25 08:44:54 +0000
@@ -1301,6 +1301,7 @@
 #: view:hr.job:0
 #: field:hr.contract.msf,job_id:0
 #: view:hr.employee:0
+#: field:hr.contract.msf,job_name:0
 msgid "Job"
 msgstr "Poste"
 
@@ -117257,8 +117258,9 @@
 msgid "number of moves"
 msgstr "nombre de mouvements"
 
-#. module: stock_override
+#. module: stock_override, msf_homere_interface
 #: field:export.report.stock.move.progress,uuid:0
+#: view:hr.employee:0
 msgid "uuid"
 msgstr "uuid"
 
@@ -121489,6 +121491,7 @@
 #, python-format
 msgid "to open and compute"
 msgstr "à ouvrir et générer"
+<<<<<<< TREE
 
 #. module: account_override
 #: model:ir.actions.act_window,name:account_override.action_inkind_donation
@@ -121631,3 +121634,66 @@
 #, python-format
 msgid "This record is not linked to any Picking."
 msgstr "Cet enregistrement n'est lié à aucun Picking. "
+=======
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_employee_import.py:271
+#, python-format
+msgid "Homere uuid_key %s is duplicated in the file: %s / %s"
+msgstr "Homere uuid_key %s est dupliqué dans le fichier: %s / %s"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_employee_import.py:423
+#, python-format
+msgid "Line %s. Required Homere uuid_key field is missing in the file."
+msgstr "Ligne %s. Le champ requis Homere uuid_key est absent du fichier."
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:123
+#, python-format
+msgid "More than one employee have the same uuid: %s"
+msgstr "Plus d'un employé ont le même uuid: %s"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_employee_import.py:318
+#, python-format
+msgid "%d employees in the db have the same combination identification_id/name/empty uuid \"%s / %s \""
+msgstr "%d employés dans la base ont la même combinaison identification_id/name/empty uuid \"%s / %s \""
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_employee_import.py:664
+#, python-format
+msgid "Several employees have the same combination codeterrain %s, id_staff %s : %s"
+msgstr "Plusieurs employés ont la même combinaison codeterrain %s, id_staff %s : %s"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_employee_import.py:342
+#, python-format
+msgid "Several employees have the same identification_id %s: %s (Import file), %s"
+msgstr "Plusieurs employés ont le même identification_id %s: %s (Fichier import), %s"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_employee_import.py:667
+#, python-format
+msgid "Several employees have the same uuid_key %s : %s"
+msgstr "Plusieurs employés ont le même uuid_key %s : %s"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_employee_import.py:329
+#, python-format
+msgid "Several employees in the db have the same combination codeterrain/id_staff/(id_unique)/empty uuid \"%s / %s / (%s)\": %s"
+msgstr "Plusieurs employés de la base ont la même combinaison codeterrain/id_staff/(id_unique)/empty uuid \"%s / %s / (%s)\": %s"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_employee_import.py:318
+#, python-format
+msgid "Homere uuid_key %s is duplicated in the UF database, Homere id_staff: %s, number of records: %d: %s"
+msgstr "Champ Homere uuid_key %s dupliqué dans la base UF, Homere id_staff: %s, nombre d'enregistrements: %d: %s"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_employee_import.py:321
+#, python-format
+msgid "Homere uuid_key %s is duplicated in the UF database, but no match with id_staff %s, number of records: %d: %s"
+msgstr "Champ Homere uuid_key %s dupliqué dans la base UF, aucune correspondance avec id_staff %s, nombre d'enregistrements: %d: %s"
+
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2024-01-17 13:57:19 +0000
+++ bin/addons/msf_profile/msf_profile.py	2024-01-25 08:44:54 +0000
@@ -57,6 +57,7 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+<<<<<<< TREE
     # UF32.0
     def us_12076_remove_po_audittrail_rule_domain(self, cr, uid, *a, **b):
         '''
@@ -112,6 +113,10 @@
         if instance and instance.level == 'section':
             self.pool.get('sync.trigger.something').create(cr, uid, {'name': 'US-12110-Sup_Fin_Read'})
         return True
+=======
+    def us_9119_employee_uuid(self, cr, uid, *a, **b):
+        cr.execute("update hr_employee set homere_uuid_key=NULL where homere_uuid_key=''")
+>>>>>>> MERGE-SOURCE
 
     # python 3
     def us_9321_2_remove_location_colors(self, cr, uid, *a, **b):
@@ -688,6 +693,7 @@
 
         return True
 
+
     def us_10652_chg_partn_property_fields(self, cr, uid, *a, **b):
         '''
         Update the data of the res_partner's fields property_product_pricelist_purchase, property_product_pricelist,

=== modified file 'bin/addons/stock/product.py'
--- bin/addons/stock/product.py	2024-01-17 13:57:19 +0000
+++ bin/addons/stock/product.py	2024-01-25 08:44:54 +0000
@@ -305,13 +305,11 @@
                 cr.execute('''
                     select sum(pol.product_qty) as qty, pol.product_id, pol.product_uom, t.uom_id
                     from
-                      purchase_order_line pol, product_product p, product_template t, purchase_order po
+                      purchase_order_line pol, product_product p, product_template t
                     where
                       p.id = pol.product_id and
                       t.id = p.product_tmpl_id and
-                      po.id = pol.order_id and
                       p.id in %%(product_id)s and
-                      po.order_type != 'direct' and
                       pol.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n') and
                       location_dest_id in %%(location_id)s
                       %s