Imports: use the first formater for duplicates fields

1 files changed, 4 insertions, 4 deletions

diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index d64b8441c..4170ea1e2 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -206,7 +206,7 @@ class ImporterType(models.Model):
             force_news = []
             concat_str = []
             concat = []
-            for target in column.targets.all():
+            for target in column.targets.order_by("pk").all():
                 ft = target.formater_type.get_formater_type(
                     target, import_instance=import_instance)
                 if not ft:
@@ -444,11 +444,11 @@ class ImporterColumn(models.Model):
         return self.importer_type.slug, self.col_number
 
     def targets_lbl(self):
-        return u', '.join([target.target for target in self.targets.all()])
+        return ', '.join([target.target for target in self.targets.all()])
 
     def duplicate_fields_lbl(self):
-        return u', '.join([dp.field_name or u""
-                           for dp in self.duplicate_fields.all()])
+        return ', '.join([dp.field_name or ""
+                          for dp in self.duplicate_fields.all()])
 
 
 class ImporterDuplicateFieldManager(models.Manager):