Merge branch 'stable'

3 files changed, 620 insertions, 238 deletions

diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index e96b7ef13..1e59b574f 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -440,7 +440,7 @@ class StrToBoolean(Formater, ChoiceChecker):
             for missing in self.missings:
                 try:
                     q = {'target':self.db_target, 'key':missing}
-                    models.TargetKey.objects.create(**q)
+                    TargetKey.objects.create(**q)
                 except IntegrityError:
                     pass
             self.new_keys[value] = unicode(self.dct[value])
@@ -837,7 +837,10 @@ class Importer(object):
                                     cls._meta.get_field_by_name(attribute)
                 if m2m:
                     val = data.pop(attribute)
-                    model = field_object.rel.to
+                    if hasattr(field_object, 'rel'):
+                        model = field_object.rel.to
+                    elif hasattr(field_object, 'to'):
+                        model = field_object.to
                     if val.__class__ == model:
                         m2ms.append((attribute, val))
                     elif val.__class__ != model and type(val) == dict:
@@ -914,7 +917,7 @@ class Importer(object):
                 try:
                     dct = create_dict.copy()
                     dct['defaults'] = defaults
-                    obj, created = cls.objects.get_or_create(**create_dict)
+                    obj, created = cls.objects.get_or_create(**dct)
                     if self.import_instance and hasattr(obj, 'imports'):
                         obj.imports.add(self.import_instance)
                 except IntegrityError as e:
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index cd8e2e611..4cb490128 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -44,6 +44,17 @@
         }
     }, 
     {
+        "pk": 5, 
+        "model": "ishtar_common.importertype", 
+        "fields": {
+            "users": [], 
+            "is_template": true, 
+            "name": "MCC - Mobilier", 
+            "associated_models": "archaeological_finds.models.BaseFind", 
+            "description": ""
+        }
+    }, 
+    {
         "pk": 1, 
         "model": "ishtar_common.regexp", 
         "fields": {
@@ -96,79 +107,134 @@
         }
     }, 
     {
-        "pk": 2, 
+        "pk": 44, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 3, 
-            "required": true, 
-            "importer_type": 1, 
-            "description": null, 
+            "col_number": 14, 
+            "required": false, 
+            "importer_type": 5, 
+            "description": "Date de d\u00e9couverte", 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 3, 
+        "pk": 45, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 4, 
-            "required": true, 
-            "importer_type": 1, 
-            "description": null, 
+            "col_number": 16, 
+            "required": false, 
+            "importer_type": 5, 
+            "description": "\u00c9tat de conservation", 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 8, 
+        "pk": 46, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 9, 
+            "col_number": 17, 
             "required": false, 
-            "importer_type": 1, 
-            "description": null, 
+            "importer_type": 5, 
+            "description": "Mesure de conservation", 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 4, 
+        "pk": 47, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 5, 
+            "col_number": 18, 
+            "required": false, 
+            "importer_type": 5, 
+            "description": "Commentaire", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 48, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 20, 
+            "required": false, 
+            "importer_type": 5, 
+            "description": "Localisation topogaphique", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 49, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 21, 
+            "required": false, 
+            "importer_type": 5, 
+            "description": "Int\u00e9r\u00eat sp\u00e9cifique", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 50, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 22, 
+            "required": false, 
+            "importer_type": 5, 
+            "description": "Description", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 9, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 1, 
             "required": true, 
-            "importer_type": 1, 
-            "description": null, 
+            "importer_type": 2, 
+            "description": "Code patriarche de l'op\u00e9ration associ\u00e9e", 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 6, 
+        "pk": 36, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 7, 
+            "col_number": 1, 
             "required": true, 
-            "importer_type": 1, 
-            "description": null, 
+            "importer_type": 5, 
+            "description": "Code patriarche de l'op\u00e9ration associ\u00e9e", 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 7, 
+        "pk": 14, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 8, 
+            "col_number": 1, 
+            "required": true, 
+            "importer_type": 3, 
+            "description": "Code patriarche de l'op\u00e9ration associ\u00e9e", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 1, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 1, 
             "required": true, 
             "importer_type": 1, 
-            "description": null, 
+            "description": "Code patriarche", 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 9, 
+        "pk": 26, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
             "col_number": 1, 
             "required": true, 
-            "importer_type": 2, 
-            "description": null, 
+            "importer_type": 4, 
+            "description": "Code patriarche de l'op\u00e9ration associ\u00e9e", 
             "regexp_pre_filter": null
         }
     }, 
@@ -179,7 +245,7 @@
             "col_number": 2, 
             "required": true, 
             "importer_type": 2, 
-            "description": null, 
+            "description": "Section et num\u00e9ro de parcelle", 
             "regexp_pre_filter": 1
         }
     }, 
@@ -190,7 +256,84 @@
             "col_number": 5, 
             "required": false, 
             "importer_type": 2, 
-            "description": null, 
+            "description": "Ann\u00e9e", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 13, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 9, 
+            "required": false, 
+            "importer_type": 2, 
+            "description": "Lieu dit / adresse", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 27, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 2, 
+            "required": true, 
+            "importer_type": 4, 
+            "description": "Identifiant externe", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 28, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 3, 
+            "required": false, 
+            "importer_type": 4, 
+            "description": "Type", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 29, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 4, 
+            "required": false, 
+            "importer_type": 4, 
+            "description": "Description", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 30, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 5, 
+            "required": false, 
+            "importer_type": 4, 
+            "description": "Interpr\u00e9tation", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 31, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 6, 
+            "required": false, 
+            "importer_type": 4, 
+            "description": "Date d'ouverture", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 32, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 7, 
+            "required": false, 
+            "importer_type": 4, 
+            "description": "Date de fermeture", 
             "regexp_pre_filter": null
         }
     }, 
@@ -201,28 +344,105 @@
             "col_number": 7, 
             "required": false, 
             "importer_type": 2, 
-            "description": null, 
+            "description": "Commune (via num\u00e9ro INSEE)", 
             "regexp_pre_filter": 2
         }
     }, 
     {
-        "pk": 13, 
+        "pk": 33, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 8, 
+            "required": false, 
+            "importer_type": 4, 
+            "description": "Parcelle (identifiant externe)", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 35, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 11, 
+            "required": false, 
+            "importer_type": 4, 
+            "description": "Chronologie (plusieurs possibles s\u00e9par\u00e9es par &)", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 34, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 10, 
+            "required": false, 
+            "importer_type": 4, 
+            "description": "Commentaire", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 2, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 3, 
+            "required": true, 
+            "importer_type": 1, 
+            "description": null, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 3, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 4, 
+            "required": true, 
+            "importer_type": 1, 
+            "description": null, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 8, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
             "col_number": 9, 
             "required": false, 
-            "importer_type": 2, 
+            "importer_type": 1, 
             "description": null, 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 14, 
+        "pk": 4, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 1, 
+            "col_number": 5, 
             "required": true, 
-            "importer_type": 3, 
+            "importer_type": 1, 
+            "description": null, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 6, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 7, 
+            "required": true, 
+            "importer_type": 1, 
+            "description": null, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 7, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 8, 
+            "required": true, 
+            "importer_type": 1, 
             "description": null, 
             "regexp_pre_filter": null
         }
@@ -338,275 +558,371 @@
         }
     }, 
     {
-        "pk": 26, 
+        "pk": 16, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 1, 
+            "col_number": 3, 
             "required": true, 
-            "importer_type": 4, 
+            "importer_type": 3, 
             "description": null, 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 27, 
+        "pk": 5, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 2, 
+            "col_number": 6, 
             "required": true, 
-            "importer_type": 4, 
+            "importer_type": 1, 
             "description": null, 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 28, 
+        "pk": 37, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 3, 
-            "required": false, 
-            "importer_type": 4, 
-            "description": null, 
+            "col_number": 2, 
+            "required": true, 
+            "importer_type": 5, 
+            "description": "identifiant externe", 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 29, 
+        "pk": 38, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 4, 
+            "col_number": 3, 
             "required": false, 
-            "importer_type": 4, 
-            "description": null, 
+            "importer_type": 5, 
+            "description": "Isol\u00e9 ou non", 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 30, 
+        "pk": 39, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 5, 
+            "col_number": 7, 
             "required": false, 
-            "importer_type": 4, 
-            "description": null, 
+            "importer_type": 5, 
+            "description": "Sous classe de mat\u00e9riaux", 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 31, 
+        "pk": 40, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 6, 
+            "col_number": 10, 
             "required": false, 
-            "importer_type": 4, 
-            "description": null, 
+            "importer_type": 5, 
+            "description": "Nombre d'\u00e9l\u00e9ments", 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 32, 
+        "pk": 41, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 7, 
+            "col_number": 11, 
             "required": false, 
-            "importer_type": 4, 
-            "description": null, 
+            "importer_type": 5, 
+            "description": "Poids", 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 33, 
+        "pk": 42, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 9, 
+            "col_number": 12, 
             "required": false, 
-            "importer_type": 4, 
-            "description": null, 
+            "importer_type": 5, 
+            "description": "Unit\u00e9 de poids", 
             "regexp_pre_filter": null
         }
     }, 
     {
-        "pk": 34, 
+        "pk": 43, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
-            "col_number": 10, 
-            "required": false, 
-            "importer_type": 4, 
-            "description": null, 
+            "col_number": 13, 
+            "required": true, 
+            "importer_type": 5, 
+            "description": "Lien avec l'UE", 
             "regexp_pre_filter": null
         }
     }, 
     {
+        "pk": 26, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 25, 
+            "formater_type": 16, 
+            "target": "additional_information", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 28, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 27, 
+            "formater_type": 3, 
+            "target": "external_id", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 29, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 28, 
+            "formater_type": 18, 
+            "target": "unit", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 30, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 29, 
+            "formater_type": 16, 
+            "target": "description", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 31, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 30, 
+            "formater_type": 16, 
+            "target": "interpretation", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 32, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 31, 
+            "formater_type": 5, 
+            "target": "opening_date", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 33, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 32, 
+            "formater_type": 5, 
+            "target": "closing_date", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 34, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 33, 
+            "formater_type": 11, 
+            "target": "parcel__external_id", 
+            "regexp_filter": null
+        }
+    }, 
+    {
         "pk": 35, 
-        "model": "ishtar_common.importercolumn", 
+        "model": "ishtar_common.importtarget", 
         "fields": {
-            "col_number": 11, 
-            "required": false, 
-            "importer_type": 4, 
-            "description": null, 
-            "regexp_pre_filter": null
+            "column": 34, 
+            "formater_type": 16, 
+            "target": "comment", 
+            "regexp_filter": null
         }
     }, 
     {
-        "pk": 16, 
-        "model": "ishtar_common.importercolumn", 
+        "pk": 36, 
+        "model": "ishtar_common.importtarget", 
         "fields": {
-            "col_number": 3, 
-            "required": true, 
-            "importer_type": 3, 
-            "description": null, 
-            "regexp_pre_filter": null
+            "column": 35, 
+            "formater_type": 6, 
+            "target": "datings__period", 
+            "regexp_filter": null
         }
     }, 
     {
         "pk": 1, 
-        "model": "ishtar_common.importercolumn", 
+        "model": "ishtar_common.importtarget", 
         "fields": {
-            "col_number": 1, 
-            "required": true, 
-            "importer_type": 1, 
-            "description": null, 
-            "regexp_pre_filter": null
+            "column": 1, 
+            "formater_type": 1, 
+            "target": "code_patriarche", 
+            "regexp_filter": null
         }
     }, 
     {
-        "pk": 5, 
-        "model": "ishtar_common.importercolumn", 
+        "pk": 37, 
+        "model": "ishtar_common.importtarget", 
         "fields": {
-            "col_number": 6, 
-            "required": true, 
-            "importer_type": 1, 
-            "description": null, 
-            "regexp_pre_filter": null
+            "column": 36, 
+            "formater_type": 1, 
+            "target": "context_record__operation__code_patriarche", 
+            "regexp_filter": null
         }
     }, 
     {
-        "pk": 2, 
+        "pk": 38, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 2, 
-            "formater_type": 2, 
-            "target": "operation_type", 
+            "column": 37, 
+            "formater_type": 3, 
+            "target": "external_id", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 3, 
+        "pk": 39, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 3, 
-            "formater_type": 3, 
-            "target": "common_name", 
+            "column": 38, 
+            "formater_type": 19, 
+            "target": "is_isolated", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 4, 
+        "pk": 40, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 4, 
-            "formater_type": 3, 
-            "target": "operator__name", 
+            "column": 39, 
+            "formater_type": 20, 
+            "target": "find__material_type", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 5, 
+        "pk": 41, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 5, 
-            "formater_type": 4, 
-            "target": "in_charge__raw_name", 
+            "column": 40, 
+            "formater_type": 1, 
+            "target": "find__find_number", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 6, 
+        "pk": 42, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 6, 
-            "formater_type": 5, 
-            "target": "start_date", 
+            "column": 41, 
+            "formater_type": 21, 
+            "target": "find__weight", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 7, 
+        "pk": 43, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 7, 
+            "column": 42, 
+            "formater_type": 7, 
+            "target": "find__weight_unit", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 44, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 43, 
+            "formater_type": 3, 
+            "target": "context_record__external_id", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 45, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 44, 
             "formater_type": 5, 
-            "target": "excavation_end_date", 
+            "target": "discovery_date", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 8, 
+        "pk": 46, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 8, 
-            "formater_type": 6, 
-            "target": "periods", 
+            "column": 45, 
+            "formater_type": 22, 
+            "target": "find__conservatory_state", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 9, 
+        "pk": 47, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 9, 
-            "formater_type": 1, 
-            "target": "operation__operation_code", 
+            "column": 46, 
+            "formater_type": 23, 
+            "target": "find__preservation_to_consider", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 10, 
+        "pk": 48, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 10, 
-            "formater_type": 7, 
-            "target": "section", 
+            "column": 47, 
+            "formater_type": 16, 
+            "target": "comment", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 11, 
+        "pk": 49, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 10, 
-            "formater_type": 8, 
-            "target": "parcel_number", 
+            "column": 48, 
+            "formater_type": 3, 
+            "target": "topographic_localisation", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 12, 
+        "pk": 50, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 11, 
-            "formater_type": 9, 
-            "target": "year", 
+            "column": 49, 
+            "formater_type": 3, 
+            "target": "special_interest", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 13, 
+        "pk": 51, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 12, 
-            "formater_type": 8, 
-            "target": "town__numero_insee", 
+            "column": 50, 
+            "formater_type": 16, 
+            "target": "description", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 14, 
+        "pk": 9, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 13, 
-            "formater_type": 10, 
-            "target": "address", 
+            "column": 9, 
+            "formater_type": 1, 
+            "target": "operation__code_patriarche", 
             "regexp_filter": null
         }
     }, 
@@ -616,227 +932,237 @@
         "fields": {
             "column": 14, 
             "formater_type": 1, 
-            "target": "operation__operation_code", 
+            "target": "operation__code_patriarche", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 16, 
+        "pk": 27, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 15, 
+            "column": 26, 
+            "formater_type": 1, 
+            "target": "operation__code_patriarche", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 13, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 12, 
             "formater_type": 11, 
-            "target": "external_id", 
+            "target": "town__numero_insee", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 17, 
+        "pk": 2, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 16, 
-            "formater_type": 12, 
-            "target": "source_type", 
+            "column": 2, 
+            "formater_type": 2, 
+            "target": "operation_type", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 18, 
+        "pk": 3, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 17, 
-            "formater_type": 13, 
-            "target": "support_type", 
+            "column": 3, 
+            "formater_type": 3, 
+            "target": "common_name", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 19, 
+        "pk": 4, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 18, 
-            "formater_type": 1, 
-            "target": "item_number", 
+            "column": 4, 
+            "formater_type": 3, 
+            "target": "operator__name", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 20, 
+        "pk": 5, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 19, 
+            "column": 5, 
             "formater_type": 4, 
-            "target": "authors__person__raw_name", 
+            "target": "in_charge__raw_name", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 21, 
+        "pk": 6, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 20, 
-            "formater_type": 14, 
-            "target": "creation_date", 
+            "column": 6, 
+            "formater_type": 5, 
+            "target": "start_date", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 22, 
+        "pk": 7, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 21, 
-            "formater_type": 15, 
-            "target": "format_type", 
+            "column": 7, 
+            "formater_type": 5, 
+            "target": "excavation_end_date", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 23, 
+        "pk": 8, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 22, 
-            "formater_type": 16, 
-            "target": "description", 
+            "column": 8, 
+            "formater_type": 6, 
+            "target": "periods", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 24, 
+        "pk": 10, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 23, 
-            "formater_type": 16, 
-            "target": "comment", 
+            "column": 10, 
+            "formater_type": 7, 
+            "target": "section", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 25, 
+        "pk": 11, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 24, 
-            "formater_type": 17, 
-            "target": "scale", 
+            "column": 10, 
+            "formater_type": 8, 
+            "target": "parcel_number", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 26, 
+        "pk": 12, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 25, 
-            "formater_type": 16, 
-            "target": "additional_information", 
+            "column": 11, 
+            "formater_type": 9, 
+            "target": "year", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 27, 
+        "pk": 14, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 26, 
-            "formater_type": 1, 
-            "target": "operation__operation_code", 
+            "column": 13, 
+            "formater_type": 10, 
+            "target": "address", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 28, 
+        "pk": 16, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 27, 
-            "formater_type": 3, 
+            "column": 15, 
+            "formater_type": 11, 
             "target": "external_id", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 29, 
+        "pk": 17, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 28, 
-            "formater_type": 18, 
-            "target": "unit", 
+            "column": 16, 
+            "formater_type": 12, 
+            "target": "source_type", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 30, 
+        "pk": 18, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 29, 
-            "formater_type": 16, 
-            "target": "description", 
+            "column": 17, 
+            "formater_type": 13, 
+            "target": "support_type", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 31, 
+        "pk": 19, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 30, 
-            "formater_type": 16, 
-            "target": "interpretation", 
+            "column": 18, 
+            "formater_type": 1, 
+            "target": "item_number", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 32, 
+        "pk": 20, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 31, 
-            "formater_type": 5, 
-            "target": "opening_date", 
+            "column": 19, 
+            "formater_type": 4, 
+            "target": "authors__person__raw_name", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 33, 
+        "pk": 21, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 32, 
-            "formater_type": 5, 
-            "target": "closing_date", 
+            "column": 20, 
+            "formater_type": 14, 
+            "target": "creation_date", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 34, 
+        "pk": 22, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 33, 
-            "formater_type": 11, 
-            "target": "parcel__external_id", 
+            "column": 21, 
+            "formater_type": 15, 
+            "target": "format_type", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 35, 
+        "pk": 23, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 34, 
+            "column": 22, 
             "formater_type": 16, 
-            "target": "comment", 
+            "target": "description", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 36, 
+        "pk": 24, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 35, 
-            "formater_type": 6, 
-            "target": "datings__period", 
+            "column": 23, 
+            "formater_type": 16, 
+            "target": "comment", 
             "regexp_filter": null
         }
     }, 
     {
-        "pk": 1, 
+        "pk": 25, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "column": 1, 
-            "formater_type": 1, 
-            "target": "code_patriarche", 
+            "column": 24, 
+            "formater_type": 17, 
+            "target": "scale", 
             "regexp_filter": null
         }
     }, 
@@ -850,6 +1176,15 @@
         }
     }, 
     {
+        "pk": 21, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "FloatFormater", 
+            "many_split": "", 
+            "options": ""
+        }
+    }, 
+    {
         "pk": 1, 
         "model": "ishtar_common.formatertype", 
         "fields": {
@@ -859,6 +1194,15 @@
         }
     }, 
     {
+        "pk": 19, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "StrToBoolean", 
+            "many_split": "", 
+            "options": ""
+        }
+    }, 
+    {
         "pk": 18, 
         "model": "ishtar_common.formatertype", 
         "fields": {
@@ -868,6 +1212,33 @@
         }
     }, 
     {
+        "pk": 22, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "TypeFormater", 
+            "many_split": "", 
+            "options": "archaeological_finds.models.ConservatoryState"
+        }
+    }, 
+    {
+        "pk": 20, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "TypeFormater", 
+            "many_split": "", 
+            "options": "archaeological_finds.models.MaterialType"
+        }
+    }, 
+    {
+        "pk": 23, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "TypeFormater", 
+            "many_split": "", 
+            "options": "archaeological_finds.models.PreservationType"
+        }
+    }, 
+    {
         "pk": 2, 
         "model": "ishtar_common.formatertype", 
         "fields": {
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 14c459ace..57d5a7e5e 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -59,7 +59,7 @@ from ishtar_common.model_merging import merge_model_objects
 from ishtar_common.utils import get_cache
 from ishtar_common.data_importer import Importer, ImportFormater, \
     IntegerFormater, FloatFormater, UnicodeFormater, DateFormater, \
-    TypeFormater, YearFormater
+    TypeFormater, YearFormater, StrToBoolean
 
 def post_save_user(sender, **kwargs):
     user = kwargs['instance']
@@ -992,6 +992,10 @@ if 'archaeological_context_records' in settings.INSTALLED_APPS:
     MODELS = [('archaeological_context_records.models.ContextRecord',
               _(u"Context records")),
              ] + MODELS
+if 'archaeological_finds' in settings.INSTALLED_APPS:
+    MODELS = [('archaeological_finds.models.BaseFind',
+              _(u"Finds")),
+             ] + MODELS
 
 def get_model_fields(model):
     """
@@ -1272,6 +1276,7 @@ IMPORTER_TYPES = (
     ('DateFormater', _(u"Date")),
     ('TypeFormater', _(u"Type")),
     ('YearFormater', _(u"Year")),
+    ('StrToBoolean', _(u"String to boolean")),
 )
 
 IMPORTER_TYPES_DCT = {
@@ -1281,6 +1286,7 @@ IMPORTER_TYPES_DCT = {
     'DateFormater':DateFormater,
     'TypeFormater':TypeFormater,
     'YearFormater':YearFormater,
+    'StrToBoolean':StrToBoolean,
 }
 
 DATE_FORMATS = (
@@ -1337,6 +1343,8 @@ class FormaterType(models.Model):
                 return
         elif self.formater_type == 'DateFormater':
             return DateFormater(self.options, **kwargs)
+        elif self.formater_type == 'StrToBoolean':
+            return StrToBoolean(**kwargs)
         else:
             return IMPORTER_TYPES_DCT[self.formater_type](**kwargs)