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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-06-02 14:41:41 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-06-18 09:49:33 +0000
@@ -110325,3 +110325,8 @@
 msgid "Handling Lead Time (days) :"
 msgstr "Délai de traitement (jours) :"
 
+#. module: register_accounting
+#: code:addons/register_accounting/wizard/wizard_register_import.py:495
+#, python-format
+msgid "Line %s. The journal third party used for the internal transfer must be different from the journal of the register."
+msgstr "Ligne %s. Le tiers de type journal utilisé pour le transfert interne doit être différent du journal du registre."
 
=== modified file 'bin/addons/register_accounting/wizard/wizard_register_import.py'
--- bin/addons/register_accounting/wizard/wizard_register_import.py	2020-02-27 16:28:21 +0000
+++ bin/addons/register_accounting/wizard/wizard_register_import.py	2020-06-18 09:49:33 +0000
@@ -491,6 +491,10 @@
                                         if tp_journal.currency.id != register_currency:
                                             errors.append(_('Line %s. A Transfer Same Journal must have the same currency as the register.') % (current_line_num,))
                                             continue
+                                        if tp_journal.id == wiz.register_id.journal_id.id:
+                                            errors.append(_('Line %s. The journal third party used for the internal transfer '
+                                                            'must be different from the journal of the register.') % (current_line_num,))
+                                            continue
                             # Type DP ==> PARTNER required
                             elif type_for_register == 'down_payment':
                                 tp_ids = partner_obj.search(cr, uid, [('name', '=', line[cols['third_party']])], context=context)