Merge lp:~julie-w/unifield-server/US-6753 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/register_accounting/wizard/wizard_register_import.py'
--- bin/addons/register_accounting/wizard/wizard_register_import.py	2019-10-30 16:33:21 +0000
+++ bin/addons/register_accounting/wizard/wizard_register_import.py	2020-02-04 10:20:33 +0000
@@ -471,7 +471,8 @@
                         if line[cols['third_party']]:
                             # Type Operational Advance ==> EMPLOYEE required
                             if type_for_register == 'advance':
-                                tp_ids = employee_obj.search(cr, uid, [('name', '=', line[cols['third_party']])], context=context)
+                                tp_ids = employee_obj.search(cr, uid, [('name', '=', line[cols['third_party']])],
+                                                             order='active desc, id', limit=1, context=context)
                                 partner_type = 'employee'
                             # Type Internal transfer ==> JOURNAL required
                             elif type_for_register in ['transfer', 'transfer_same']:
@@ -497,7 +498,8 @@
                                 if tp_ids:
                                     partner_type = 'partner'
                                 else:
-                                    tp_ids = employee_obj.search(cr, uid, [('name', '=', line[cols['third_party']])], context=context)
+                                    tp_ids = employee_obj.search(cr, uid, [('name', '=', line[cols['third_party']])],
+                                                                 order='active desc, id', limit=1, context=context)
                                     partner_type = 'employee'
                         # Any type for Spec. Treatment listed above ==> EMPTY partner NOT allowed
                         if not tp_ids:
@@ -512,7 +514,8 @@
                         tp_ids = partner_obj.search(cr, uid, [('name', '=', line[cols['third_party']])], context=context)
                         partner_type = 'partner'
                         if not tp_ids:
-                            tp_ids = employee_obj.search(cr, uid, [('name', '=', line[cols['third_party']])], context=context)
+                            tp_ids = employee_obj.search(cr, uid, [('name', '=', line[cols['third_party']])],
+                                                         order='active desc, id', limit=1, context=context)
                             partner_type = 'employee'
                         if not tp_ids:
                             errors.append(_('Line %s. Third party not found: %s') % (current_line_num, line[cols['third_party']],))