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

[jftempo]

=== modified file 'bin/addons/msf_homere_interface/wizard/hr_payroll_import.py'
--- bin/addons/msf_homere_interface/wizard/hr_payroll_import.py	2018-01-11 16:01:54 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_payroll_import.py	2018-12-06 08:13:38 +0000
@@ -38,7 +38,6 @@
 UF_SIDE_ROUNDING_LINE = {
     'account_code': '67000',
     'name': _('UF Payroll rounding'),
-    'destination_code': 'SUP',
 
     'eur_gap_limit': 1.,  # EUR amount gap limit to not reach
 
@@ -422,18 +421,12 @@
         if not account_ids:
             err_account(account_code=account_code)
 
-        # get default AD values
-        # destination: from code
-        dest_ids = self.pool.get('account.analytic.account').search(cr, uid, [
-            ('category', '=', 'DEST'),
-            ('code', '=', UF_SIDE_ROUNDING_LINE['destination_code']),
-        ], context=context)
-        if not dest_ids:
-            msg = _("%s: No default destination found '%s'") % (
-                UF_SIDE_ROUNDING_LINE['name'],
-                UF_SIDE_ROUNDING_LINE['destination_code'],
-            )
-            raise osv.except_osv(_('Error'), msg)
+        # get the default Destination to use
+        acc_fields = ['default_destination_id', 'code', 'name']
+        acc = self.pool.get('account.account').browse(cr, uid, account_ids[0], fields_to_fetch=acc_fields, context=context)
+        if not acc.default_destination_id:
+            raise osv.except_osv(_('Error'), _('The account %s - %s has no Default Destination.') % (acc.code, acc.name))
+        dest = acc.default_destination_id
 
         # cost center: 1st FX gain loss of instance
         instance = self.pool.get('res.users').browse(cr, uid, [uid],
@@ -466,7 +459,7 @@
 
             # AD
             'cost_center_id': cc_ids[0],
-            'destination_id': dest_ids[0],
+            'destination_id': dest.id,
             #'funding_pool_id':  # default is PF
         }, context=context)
 

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-11-30 14:47:43 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-12-06 08:13:38 +0000
@@ -46907,12 +46907,6 @@
 msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
-#. module: msf_homere_interface
-#: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:432
-#, python-format
-msgid "%s: No default destination found '%s'"
-msgstr "%s: No default destination found '%s'"
-
 #. module: msf_partner
 #: code:addons/msf_partner/partner.py:573
 #, python-format
@@ -103778,3 +103772,9 @@
 #, python-format
 msgid "Source Location %s is inactive"
 msgstr "La Zone Source %s est inactive"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:428
+#, python-format
+msgid "The account %s - %s has no Default Destination."
+msgstr "Le compte %s - %s n'a pas de Destination par défaut."