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

[jftempo]

=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2019-02-06 09:25:31 +0000
+++ bin/addons/account_override/account.py	2019-05-03 09:52:21 +0000
@@ -1173,9 +1173,15 @@
                                              _('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':
+                    if m.journal_id.type == 'extra' and type_for_reg != '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))
+                    # Only Internal transfers are allowed with liquidity journals in manual JE
+                    if m.journal_id.type in ('bank', 'cash', 'cheque') and type_for_reg not in ('transfer', 'transfer_same'):
+                        raise osv.except_osv(_('Warning'), _('The account %s - %s is not allowed.\n'
+                                                             'Only internal transfers (in the same currency or not) '
+                                                             'are allowed in manual journal entries on a liquidity journal.') %
+                                             (ml.account_id.code, ml.account_id.name))
                     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	2019-04-08 09:30:07 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-05-03 09:52:21 +0000
@@ -105388,3 +105388,11 @@
 #, python-format
 msgid "Product %s, BN: %s not enough stock to process quantity %s %s (stock level: %s)"
 msgstr "Produit %s, Lot: %s, pas assez de stock pour traiter la qantité %s %s (quantité en stock: %s)"
+
+#. module: account_override
+#: code:addons/account_override/account.py:1181
+#, python-format
+msgid "The account %s - %s is not allowed.\n"
+"Only internal transfers (in the same currency or not) are allowed in manual journal entries on a liquidity journal."
+msgstr "Le compte %s - %s n'est pas autorisé.\n"
+"Seuls les transferts internes (dans la même devise ou non) sont autorisés dans les écritures comptables manuelles sur un journal de trésorerie."