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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-07-09 09:51:23 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-07-13 15:36:44 +0000
@@ -101265,6 +101265,7 @@
 msgid "Not Invoice"
 msgstr "Pas de Facture"
 
+<<<<<<< TREE
 #. module: analytic_distribution
 #: view:mass.reallocation.wizard:0
 msgid "- Items booked on accounts set as \"Prevent correction on analytic accounts\""
@@ -101293,3 +101294,10 @@
 #, python-format
 msgid "The account \"%s - %s\" is only compatible with a Partner or an Employee Third Party."
 msgstr "Le compte \"%s - %s\" n'est compatible qu'avec un Tiers de type Partenaire ou Employé."
+=======
+#. module: register_accounting
+#: code:addons/register_accounting/wizard/import_cheque_on_bank_registers.py:166
+#, python-format
+msgid "The Cheque %s has already been imported."
+msgstr "Le Chèque %s a déjà été importé."
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/register_accounting/wizard/import_cheque_on_bank_registers.py'
--- bin/addons/register_accounting/wizard/import_cheque_on_bank_registers.py	2017-05-26 08:40:07 +0000
+++ bin/addons/register_accounting/wizard/import_cheque_on_bank_registers.py	2018-07-13 15:36:44 +0000
@@ -161,6 +161,8 @@
         absl_lines = []
         for imported_line in wizard.imported_lines_ids:
             line = imported_line.line_id
+            if absl_obj.search_exist(cr, uid, [('from_import_cheque_id', '=', line.id)], context=context):
+                raise osv.except_osv(_('Warning'), _('The Cheque %s has already been imported.') % line.cheque_number or line.name or line.ref or '')
             total = line.amount_currency
             if not imported_line.document_date:
                 raise osv.except_osv(_('Warning'), _('Please add a Document Date on imported lines.'))
@@ -186,6 +188,8 @@
 
         if not len(absl_lines):
             raise osv.except_osv(_('Warning'), _('No line created!'))
+        # set the wizard to "is_imported" at the end of the process only
+        # (the user must be able to re-click on OK after having fixed the potential errors displayed)
         self.write(cr, uid, ids, {'is_imported': True}, context=context)
         return { 'type': 'ir.actions.act_window_close', 'st_line_ids': absl_lines, 'o2m_refresh': 'line_ids'}