Merge lp:~unifield-team/unifield-server/us-1659 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_batch.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_batch.py	2016-08-15 11:49:05 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_batch.py	2016-09-06 09:22:09 +0000
@@ -161,6 +161,12 @@
                 save_error(errors)
                 continue
 
+            if all(not x for x in line_data):
+                save_warnings(
+                    _('Line seemed empty, so this line was ignored')
+                )
+                continue
+
             # Product
             product_id = None
             try:
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-08-18 14:36:26 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-09-06 09:22:09 +0000
@@ -74416,3 +74416,9 @@
 #, python-format
 msgid "The column '%s' is not present in the file."
 msgstr "La colonne '%s' n'est pas présente dans le fichier."
+
+#. module: msf_doc_import                                                                                                                                       
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:166                                                                                                 
+#, python-format                                                                                                                                                
+msgid "Line seemed empty, so this line was ignored"                                                                                                             
+msgstr "La ligne semblait vide, donc cette ligne a été ignorée"