Merge lp:~jfb-tempo-consulting/unifield-server/US-3697 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2017-11-25 16:09:54 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2018-04-17 09:12:13 +0000
@@ -55,7 +55,7 @@
 HEADER_COLUMNS = [
     (1, _('Freight'), 'optionnal'),
     (2, _('Picking Reference'), 'optionnal'),
-    (1, _('Origin'), 'optionnal'),
+    (1, _('Origin'), 'mandatory'),
     (4, _('Supplier'), 'optionnal'),
     (5, _('Transport mode'), 'optionnal'),
     (6, _('Notes'), 'optionnal'),
@@ -441,8 +441,6 @@
                         error.append(_('Line %s, column %s, value %s is mandatory') % (index, nb+1, x[0]))
                     if row.cells[nb].data and x[3] == 'int':
                         try:
-                            if row.cells[nb].type == 'float':
-                                raise
                             int(row.cells[nb].data)
                         except:
                             error.append(_('Line %s, column %s, integer expected, found %s') % (index, nb+1, row.cells[nb].data))
@@ -622,9 +620,16 @@
 
                 # Line 3: Origin
                 origin = values.get(3, ['', ''])[1]
+                if origin != wiz.origin:
+                    message = _("Import aborted, the Origin (%s) is not the same as in the Incoming Shipment %s (%s).") \
+                              % (origin, wiz.picking_id.name, wiz.origin)
+                    self.write(cr, uid, [wiz.id], {'message': message, 'state': 'error'}, context)
+                    res = self.go_to_simulation(cr, uid, [wiz.id], context=context)
+                    cr.commit()
+                    cr.close(True)
+                    return res
                 header_values['imp_origin'] = origin
 
-
                 # Line 5: Transport mode
                 transport_mode = values.get(5, ['', ''])[1]
                 header_values['imp_transport_mode'] = transport_mode

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-03-20 10:40:57 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-04-17 09:12:13 +0000
@@ -107519,3 +107519,9 @@
 #, python-format
 msgid "You have to load the template first."
 msgstr "Vous devez d'abord charger le modèle."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:625
+#, python-format
+msgid "Import aborted, the Origin (%s) is not the same as in the Incoming Shipment %s (%s)."
+msgstr "Import interrompu, l'Origine (%s) n'est pas la même que dans la Livraison Entrante %s (%s)."