Merge branch 'stable'

1 files changed, 495 insertions, 7 deletions

diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index a848b945f..77935731f 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -11,6 +11,28 @@
         }
     }, 
     {
+        "pk": 2, 
+        "model": "ishtar_common.importertype", 
+        "fields": {
+            "users": [], 
+            "is_template": true, 
+            "name": "Bibracte - Parcelles", 
+            "associated_models": "archaeological_operations.models.Parcel", 
+            "description": ""
+        }
+    }, 
+    {
+        "pk": 3, 
+        "model": "ishtar_common.importertype", 
+        "fields": {
+            "users": [], 
+            "is_template": true, 
+            "name": "Bibracte - Documentation", 
+            "associated_models": "archaeological_operations.models.OperationSource", 
+            "description": ""
+        }
+    }, 
+    {
         "pk": 1, 
         "model": "ishtar_common.importerdefault", 
         "fields": {
@@ -19,6 +41,14 @@
         }
     }, 
     {
+        "pk": 2, 
+        "model": "ishtar_common.importerdefault", 
+        "fields": {
+            "importer_type": 3, 
+            "target": "authors"
+        }
+    }, 
+    {
         "pk": 1, 
         "model": "ishtar_common.importerdefaultvalues", 
         "fields": {
@@ -28,6 +58,15 @@
         }
     }, 
     {
+        "pk": 2, 
+        "model": "ishtar_common.importerdefaultvalues", 
+        "fields": {
+            "default_target": 2, 
+            "target": "author_type", 
+            "value": "main_author"
+        }
+    }, 
+    {
         "pk": 1, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
@@ -108,6 +147,176 @@
         }
     }, 
     {
+        "pk": 9, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 1, 
+            "required": true, 
+            "importer_type": 2, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 10, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 2, 
+            "required": true, 
+            "importer_type": 2, 
+            "regexp_pre_filter": 1
+        }
+    }, 
+    {
+        "pk": 11, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 5, 
+            "required": false, 
+            "importer_type": 2, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 12, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 7, 
+            "required": false, 
+            "importer_type": 2, 
+            "regexp_pre_filter": 2
+        }
+    }, 
+    {
+        "pk": 13, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 9, 
+            "required": false, 
+            "importer_type": 2, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 14, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 1, 
+            "required": true, 
+            "importer_type": 3, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 15, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 2, 
+            "required": true, 
+            "importer_type": 3, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "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": {
+            "col_number": 4, 
+            "required": false, 
+            "importer_type": 3, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 18, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 5, 
+            "required": false, 
+            "importer_type": 3, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 19, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 6, 
+            "required": false, 
+            "importer_type": 3, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 20, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 7, 
+            "required": false, 
+            "importer_type": 3, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 21, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 8, 
+            "required": false, 
+            "importer_type": 3, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 22, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 9, 
+            "required": false, 
+            "importer_type": 3, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 23, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 12, 
+            "required": false, 
+            "importer_type": 3, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 24, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 13, 
+            "required": false, 
+            "importer_type": 3, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 25, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 16, 
+            "required": false, 
+            "importer_type": 3, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
         "pk": 1, 
         "model": "ishtar_common.importtarget", 
         "fields": {
@@ -188,6 +397,195 @@
         }
     }, 
     {
+        "pk": 9, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 9, 
+            "formater_type": 1, 
+            "target": "operation__operation_code", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 10, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 10, 
+            "formater_type": 7, 
+            "target": "section", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 11, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 10, 
+            "formater_type": 8, 
+            "target": "parcel_number", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 12, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 11, 
+            "formater_type": 9, 
+            "target": "year", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 13, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 12, 
+            "formater_type": 8, 
+            "target": "town__numero_insee", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 14, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 13, 
+            "formater_type": 10, 
+            "target": "address", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 15, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 14, 
+            "formater_type": 1, 
+            "target": "operation__operation_code", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 16, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 15, 
+            "formater_type": 11, 
+            "target": "external_id", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 17, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 16, 
+            "formater_type": 12, 
+            "target": "source_type", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 18, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 17, 
+            "formater_type": 13, 
+            "target": "support_type", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 19, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 18, 
+            "formater_type": 1, 
+            "target": "item_number", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 20, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 19, 
+            "formater_type": 4, 
+            "target": "authors__person__raw_name", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 21, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 20, 
+            "formater_type": 14, 
+            "target": "creation_date", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 22, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 21, 
+            "formater_type": 15, 
+            "target": "format_type", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 23, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 22, 
+            "formater_type": 16, 
+            "target": "description", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 24, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 23, 
+            "formater_type": 16, 
+            "target": "comment", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 25, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 24, 
+            "formater_type": 17, 
+            "target": "scale", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 26, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 25, 
+            "formater_type": 16, 
+            "target": "additional_information", 
+            "regexp_filter": null
+        }
+    }, 
+    {
+        "pk": 5, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "DateFormater", 
+            "many_split": "", 
+            "options": "%Y/%m/%d"
+        }
+    }, 
+    {
         "pk": 1, 
         "model": "ishtar_common.formatertype", 
         "fields": {
@@ -206,6 +604,60 @@
         }
     }, 
     {
+        "pk": 6, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "TypeFormater", 
+            "many_split": "&", 
+            "options": "archaeological_operations.models.Period"
+        }
+    }, 
+    {
+        "pk": 15, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "TypeFormater", 
+            "many_split": "", 
+            "options": "Format"
+        }
+    }, 
+    {
+        "pk": 12, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "TypeFormater", 
+            "many_split": "", 
+            "options": "SourceType"
+        }
+    }, 
+    {
+        "pk": 13, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "TypeFormater", 
+            "many_split": "", 
+            "options": "SupportType"
+        }
+    }, 
+    {
+        "pk": 16, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "UnicodeFormater", 
+            "many_split": "", 
+            "options": "1000"
+        }
+    }, 
+    {
+        "pk": 11, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "UnicodeFormater", 
+            "many_split": "", 
+            "options": "12"
+        }
+    }, 
+    {
         "pk": 3, 
         "model": "ishtar_common.formatertype", 
         "fields": {
@@ -215,6 +667,15 @@
         }
     }, 
     {
+        "pk": 17, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "UnicodeFormater", 
+            "many_split": "", 
+            "options": "30"
+        }
+    }, 
+    {
         "pk": 4, 
         "model": "ishtar_common.formatertype", 
         "fields": {
@@ -224,21 +685,48 @@
         }
     }, 
     {
-        "pk": 5, 
+        "pk": 7, 
         "model": "ishtar_common.formatertype", 
         "fields": {
-            "formater_type": "DateFormater", 
+            "formater_type": "UnicodeFormater", 
             "many_split": "", 
-            "options": "%Y/%m/%d"
+            "options": "4"
         }
     }, 
     {
-        "pk": 6, 
+        "pk": 10, 
         "model": "ishtar_common.formatertype", 
         "fields": {
-            "formater_type": "TypeFormater", 
-            "many_split": "&", 
-            "options": "archaeological_operations.models.Period"
+            "formater_type": "UnicodeFormater", 
+            "many_split": "", 
+            "options": "500"
+        }
+    }, 
+    {
+        "pk": 8, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "UnicodeFormater", 
+            "many_split": "", 
+            "options": "6"
+        }
+    }, 
+    {
+        "pk": 9, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "YearFormater", 
+            "many_split": "", 
+            "options": ""
+        }
+    }, 
+    {
+        "pk": 14, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "YearFormater", 
+            "many_split": "", 
+            "options": "%Y"
         }
     }
 ]
\ No newline at end of file