Merge branch 'stable'

1 files changed, 233 insertions, 13 deletions

diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index 1d33a49fd..238636de4 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -5,7 +5,7 @@
         "fields": {
             "users": [], 
             "is_template": true, 
-            "name": "Bibracte - Op\u00e9rations", 
+            "name": "MCC - Op\u00e9rations", 
             "associated_models": "archaeological_operations.models.Operation", 
             "description": ""
         }
@@ -16,7 +16,7 @@
         "fields": {
             "users": [], 
             "is_template": true, 
-            "name": "Bibracte - Parcelles", 
+            "name": "MCC - Parcelles", 
             "associated_models": "archaeological_operations.models.Parcel", 
             "description": ""
         }
@@ -27,12 +27,23 @@
         "fields": {
             "users": [], 
             "is_template": true, 
-            "name": "Bibracte - Documentation", 
+            "name": "MCC - Documentation", 
             "associated_models": "archaeological_operations.models.OperationSource", 
             "description": ""
         }
     }, 
     {
+        "pk": 4, 
+        "model": "ishtar_common.importertype", 
+        "fields": {
+            "users": [], 
+            "is_template": true, 
+            "name": "MCC - UE", 
+            "associated_models": "archaeological_context_records.models.ContextRecord", 
+            "description": ""
+        }
+    }, 
+    {
         "pk": 1, 
         "model": "ishtar_common.regexp", 
         "fields": {
@@ -235,16 +246,6 @@
         }
     }, 
     {
-        "pk": 16, 
-        "model": "ishtar_common.importercolumn", 
-        "fields": {
-            "col_number": 3, 
-            "required": false, 
-            "importer_type": 3, 
-            "regexp_pre_filter": null
-        }
-    }, 
-    {
         "pk": 17, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
@@ -335,6 +336,116 @@
         }
     }, 
     {
+        "pk": 26, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 1, 
+            "required": true, 
+            "importer_type": 4, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 27, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 2, 
+            "required": true, 
+            "importer_type": 4, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 28, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 3, 
+            "required": false, 
+            "importer_type": 4, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 29, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 4, 
+            "required": false, 
+            "importer_type": 4, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 30, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 5, 
+            "required": false, 
+            "importer_type": 4, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 31, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 6, 
+            "required": false, 
+            "importer_type": 4, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 32, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 7, 
+            "required": false, 
+            "importer_type": 4, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 33, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 9, 
+            "required": false, 
+            "importer_type": 4, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 34, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 10, 
+            "required": false, 
+            "importer_type": 4, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 35, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 11, 
+            "required": false, 
+            "importer_type": 4, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 16, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 3, 
+            "required": true, 
+            "importer_type": 3, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
         "pk": 1, 
         "model": "ishtar_common.importtarget", 
         "fields": {
@@ -595,6 +706,106 @@
         }
     }, 
     {
+        "pk": 27, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 26, 
+            "formater_type": 1, 
+            "target": "operation__operation_code", 
+            "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.importtarget", 
+        "fields": {
+            "column": 34, 
+            "formater_type": 16, 
+            "target": "comment", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 36, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 35, 
+            "formater_type": 6, 
+            "target": "datings__period", 
+            "regexp_filter": null
+        }
+    }, 
+    {
         "pk": 5, 
         "model": "ishtar_common.formatertype", 
         "fields": {
@@ -613,6 +824,15 @@
         }
     }, 
     {
+        "pk": 18, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "TypeFormater", 
+            "many_split": "", 
+            "options": "archaeological_context_records.models.Unit"
+        }
+    }, 
+    {
         "pk": 2, 
         "model": "ishtar_common.formatertype", 
         "fields": {