Exports: specific configuration to manage ambiguous column (refs #3446)

1 files changed, 8 insertions, 0 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 53f0871f5..5b21a9a49 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1831,6 +1831,9 @@ class ImporterType(models.Model):
                 for field in column.duplicate_fields.all()]
             formater_kwargs['required'] = column.required
             formater_kwargs['force_new'] = force_news
+            if column.export_field_name:
+                formater_kwargs['export_field_name'] = [
+                    column.export_field_name]
             formater = ImportFormater(targets, formater_types,
                                       **formater_kwargs)
             LINE_FORMAT.append(formater)
@@ -1952,6 +1955,11 @@ class ImporterColumn(models.Model):
     description = models.TextField(_("Description"), blank=True, null=True)
     regexp_pre_filter = models.ForeignKey("Regexp", blank=True, null=True)
     required = models.BooleanField(_(u"Required"), default=False)
+    export_field_name = models.CharField(
+        _(u"Export field name"), blank=True, null=True, max_length=200,
+        help_text=_(u"Fill this field if the field name is ambiguous for "
+                    u"export. For instance: concatenated fields.")
+    )
 
     class Meta:
         verbose_name = _(u"Importer - Column")