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

[jftempo]

=== modified file 'bin/addons/analytic_distribution/account_move_line.py'
--- bin/addons/analytic_distribution/account_move_line.py	2017-08-18 13:37:32 +0000
+++ bin/addons/analytic_distribution/account_move_line.py	2017-10-09 15:58:53 +0000
@@ -398,7 +398,7 @@
                         vals.update({'destination_id': l.account_id.default_destination_id.id})
                 if l.employee_id.funding_pool_id:
                     vals.update({'analytic_id': l.employee_id.funding_pool_id.id})
-                    if vals.get('cost_center_id') not in l.employee_id.funding_pool_id.cost_center_ids:
+                    if vals.get('cost_center_id') not in [cc.id for cc in l.employee_id.funding_pool_id.cost_center_ids]:
                         # Fetch default funding pool: MSF Private Fund
                         try:
                             msf_fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
 
=== modified file 'bin/addons/msf_doc_import/account.py'
--- bin/addons/msf_doc_import/account.py	2017-08-18 13:25:59 +0000
+++ bin/addons/msf_doc_import/account.py	2017-10-09 15:58:53 +0000
@@ -345,7 +345,8 @@
                         else:
                             r_partner = tp_ids[0]
                     if line[cols['Employee']]:
-                        tp_ids = self.pool.get('hr.employee').search(cr, uid, [('name', '=', line[cols['Employee']])])
+                        tp_ids = self.pool.get('hr.employee').search(cr, uid, [('name', '=', line[cols['Employee']])],
+                                                                     order='active desc, id', limit=1)
                         if not tp_ids:
                             tp_label = _('Employee')
                             tp_content = line[cols['Employee']]