Merge branch 'stable'

1 files changed, 4 insertions, 1 deletions

diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index 2a20c245a..992025bbb 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -485,7 +485,7 @@ class Importer(object):
                   u"and encoding are similar to the ones used by the reference "
                   u"file."),
         'too_many_cols':_(u"Too many cols (%(user_col)d) when "
-                         u"maximum is %(ref_col)d"),
+                          u"maximum is %(ref_col)d"),
         'no_data':_(u"No data provided"),
         'value_required':_(u"Value is required"),
         'not_enough_cols':_(u"At least %d columns must be filled"),
@@ -853,6 +853,8 @@ class Importer(object):
                         model = field_object.rel.to
                     elif hasattr(field_object, 'to'):
                         model = field_object.to
+                    elif hasattr(field_object, 'model'):
+                        model = field_object.model
                     if type(many_values) not in (list, tuple):
                         many_values = [many_values]
                     for val in many_values:
@@ -867,6 +869,7 @@ class Importer(object):
                             for key in val.keys():
                                 if type(val[key]) not in (list, tuple):
                                     default_dict[key] = val[key]
+                            vals.append(default_dict.copy())
                             ## manage multiple values
                             for key in val.keys():
                                 if type(val[key]) in (list, tuple):