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

[Quentin THEURET @Amaris]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_product_list.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_product_list.py	2016-07-22 14:29:06 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_product_list.py	2016-09-28 08:45:35 +0000
@@ -93,7 +93,6 @@
         wiz_common_import = self.pool.get('wiz.common.import')
 
         line_with_error = []
-        vals = {'product_id': []}
 
         for wiz_browse in self.browse(cr, uid, ids, context):
             list_browse = wiz_browse.list_id
@@ -104,6 +103,8 @@
             error_log, message = '', ''
             header_index = context['header_index']
 
+            imp_product_ids = []
+
             file_obj = SpreadsheetXML(xmlstring=base64.decodestring(wiz_browse.file))
             # iterator on rows
             rows = file_obj.getRows()
@@ -175,6 +176,33 @@
                             cr.rollback()
                             continue
 
+                    if to_write.get('product_id'):
+                        exist_line_ids = list_line_obj.search(cr, uid, [
+                            ('list_id', '=', list_browse.id),
+                            ('name', '=', to_write.get('product_id'))
+                        ], limit=1, context=context)
+                        in_list = to_write['product_id'] in imp_product_ids
+                        imp_product_ids.append(to_write['product_id'])
+                        if exist_line_ids or in_list:
+                            prod_brw = product_obj.browse(cr, uid, to_write['product_id'], context=context)
+                            to_write.setdefault('error_list', []).append(
+                                _('Product [%s] %s is already in the product list. Line not imported \n') % (
+                                    prod_brw.default_code,
+                                    prod_brw.name,
+                                )
+                            )
+                            error_log += _("Line %s in the Excel file was added to the file of the lines with errors."
+                                           "Details: Product already in the product list \n") % line_num
+                            line_with_error.append(wiz_common_import.get_line_values(cr, uid, ids, row, cell_nb=False,
+                                                                                     error_list=error_list,
+                                                                                     line_num=line_num,
+                                                                                     context=context))
+                            ignore_lines += 1
+                            line_ignored_num.append(line_num)
+                            percent_completed = float(line_num)/float(total_line_num-1)*100.00
+                            cr.rollback()
+                            continue
+
                     # Cell 2: Comment
                     to_write.update({'comment': row[2]})
 

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-09-13 14:59:08 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-09-28 08:45:35 +0000
@@ -74611,3 +74611,19 @@
 "	Number of columns is not equal to %s"
 msgstr "\n"
 "	Le nombre de colonnes n'est pas égal à %s"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_product_list.py:194
+#, python-format
+msgid "Line %s in the Excel file was added to the file of the lines with errors.Details: Product already in the product list \n"
+""
+msgstr "La ligne %s du fichier Excel a été ajoutée au fichier des lignes avec erreurs. Détails : Le produit est déjà dans la liste de produits.\n"
+""
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_product_list.py:189
+#, python-format
+msgid "Product [%s] %s is already in the product list. Line not imported \n"
+""
+msgstr "Le produit [%s] %s est déjà dans la liste de produits. Ligne non importée \n"
+""
\ No newline at end of file