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

[jftempo]

=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2018-06-21 13:48:36 +0000
+++ bin/addons/account_override/account.py	2018-07-25 16:11:11 +0000
@@ -1133,6 +1133,10 @@
                         raise osv.except_osv(_('Warning'),
                                              _('Account: %s - %s. The journal used for the internal transfer must be different from the '
                                                'Journal Entry Journal.') % (ml.account_id.code, ml.account_id.name))
+                    # Only Donation accounts are allowed with an ODX journal
+                    if m.journal_id.type == 'extra' and ml.account_id.type_for_register != 'donation':
+                        raise osv.except_osv(_('Warning'), _('The account %s - %s is not compatible with the '
+                                                             'journal %s.') % (ml.account_id.code, ml.account_id.name, m.journal_id.code))
                     if not prev_currency_id:
                         prev_currency_id = curr_aml.id
                         continue

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-07-17 14:12:28 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-07-25 16:11:11 +0000
@@ -101332,3 +101332,9 @@
 #, python-format
 msgid "Line %s. Please fill in either a Booking Debit or a Booking Credit value."
 msgstr "Ligne %s. Veuillez renseigner une valeur en devise d'enregistrement, soit en débit soit en crédit."
+
+#. module: account_override
+#: code:addons/account_override/account.py:1138
+#, python-format
+msgid "The account %s - %s is not compatible with the journal %s."
+msgstr "Le compte %s - %s n'est pas compatible avec le journal %s."