Update fixtures

4 files changed, 446 insertions, 47 deletions

diff --git a/archaeological_finds/fixtures/initial_data-fr.json b/archaeological_finds/fixtures/initial_data-fr.json
index b8f233f88..c7f0699b1 100644
--- a/archaeological_finds/fixtures/initial_data-fr.json
+++ b/archaeological_finds/fixtures/initial_data-fr.json
@@ -857,6 +857,21 @@
         }
     }, 
     {
+        "pk": 20, 
+        "model": "archaeological_finds.treatmenttype", 
+        "fields": {
+            "comment": "Remontage virtuel : on sait que les \u00e9l\u00e9ments remontent ensemble, mais il n'y a pas eu de remontage physique p\u00e9renne.", 
+            "available": true, 
+            "downstream_is_many": false, 
+            "parent": null, 
+            "virtual": true, 
+            "label": "Remontage virtuel", 
+            "upstream_is_many": true, 
+            "order": 10, 
+            "txt_idx": "virtual-reassembly"
+        }
+    }, 
+    {
         "pk": 6, 
         "model": "archaeological_finds.treatmentstate", 
         "fields": {
diff --git a/archaeological_operations/fixtures/initial_data-fr.json b/archaeological_operations/fixtures/initial_data-fr.json
index 304f07a38..214ab9cad 100644
--- a/archaeological_operations/fixtures/initial_data-fr.json
+++ b/archaeological_operations/fixtures/initial_data-fr.json
@@ -9,7 +9,9 @@
             "intented_to": "F", 
             "label": "AR : Accus\u00e9 de r\u00e9ception dossier", 
             "indexed": false, 
-            "associated_template": [], 
+            "associated_template": [
+                2
+            ], 
             "txt_idx": "a_receipt"
         }
     }, 
@@ -317,7 +319,9 @@
             "intented_to": "T", 
             "label": "Constat d'\u00e9tat", 
             "indexed": false, 
-            "associated_template": [], 
+            "associated_template": [
+                1
+            ], 
             "txt_idx": "observation_status"
         }
     }, 
@@ -728,6 +732,20 @@
         }
     }, 
     {
+        "pk": 40, 
+        "model": "archaeological_operations.period", 
+        "fields": {
+            "comment": "", 
+            "available": true, 
+            "parent": 39, 
+            "end_date": 0, 
+            "order": 1, 
+            "label": "Antiquit\u00e9 tardive (M\u00e9d.)", 
+            "start_date": 0, 
+            "txt_idx": "late_antiq_med"
+        }
+    }, 
+    {
         "pk": 39, 
         "model": "archaeological_operations.period", 
         "fields": {
@@ -770,20 +788,6 @@
         }
     }, 
     {
-        "pk": 40, 
-        "model": "archaeological_operations.period", 
-        "fields": {
-            "comment": "", 
-            "available": true, 
-            "parent": 39, 
-            "end_date": 0, 
-            "order": 1, 
-            "label": "Antiquit\u00e9 tardive (M\u00e9d.)", 
-            "start_date": 0, 
-            "txt_idx": "late_antiq_med"
-        }
-    }, 
-    {
         "pk": 41, 
         "model": "archaeological_operations.period", 
         "fields": {
@@ -1970,22 +1974,22 @@
         }
     }, 
     {
-        "pk": 221, 
+        "pk": 2, 
         "model": "archaeological_operations.remaintype", 
         "fields": {
-            "comment": null, 
+            "comment": "", 
             "available": true, 
-            "txt_idx": "enclos", 
+            "txt_idx": "enclosure", 
             "label": "enclos"
         }
     }, 
     {
-        "pk": 2, 
+        "pk": 221, 
         "model": "archaeological_operations.remaintype", 
         "fields": {
-            "comment": "", 
+            "comment": null, 
             "available": true, 
-            "txt_idx": "enclosure", 
+            "txt_idx": "enclos", 
             "label": "enclos"
         }
     }, 
@@ -3018,4 +3022,4 @@
             "label": "Rapport inexistant"
         }
     }
-]
+]
\ No newline at end of file
diff --git a/ishtar_common/fixtures/initial_data-fr.json b/ishtar_common/fixtures/initial_data-fr.json
index 9255c604e..7a6880662 100644
--- a/ishtar_common/fixtures/initial_data-fr.json
+++ b/ishtar_common/fixtures/initial_data-fr.json
@@ -212,6 +212,7 @@
                 83, 
                 84, 
                 78, 
+                54, 
                 58, 
                 59, 
                 60, 
@@ -337,26 +338,27 @@
             "txt_idx": "head_scientist", 
             "groups": [
                 1, 
+                40, 
+                41, 
+                42, 
+                46, 
+                47, 
+                48, 
                 50, 
+                54, 
+                58, 
+                59, 
+                60, 
+                63, 
                 70, 
                 71, 
                 72, 
-                41, 
                 74, 
                 77, 
-                46, 
-                47, 
-                48, 
-                40, 
+                78, 
                 82, 
                 83, 
-                84, 
-                78, 
-                58, 
-                59, 
-                60, 
-                42, 
-                63
+                84
             ], 
             "label": "Responsable scientifique"
         }
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index 115f6a985..3b43f0003 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -150,6 +150,23 @@
         }
     }, 
     {
+        "pk": 23, 
+        "model": "ishtar_common.importertype", 
+        "fields": {
+            "description": "Importeur de mobilier + parcelles et UE", 
+            "created_models": [
+                9, 
+                7
+            ], 
+            "is_template": true, 
+            "unicity_keys": "external_id", 
+            "users": [], 
+            "slug": "ishtar_finds_parcels_and_cr", 
+            "associated_models": 12, 
+            "name": "Ishtar - Mobilier_COMBO"
+        }
+    }, 
+    {
         "pk": 17, 
         "model": "ishtar_common.importertype", 
         "fields": {
@@ -305,14 +322,6 @@
         }
     }, 
     {
-        "pk": 20, 
-        "model": "ishtar_common.importerdefault", 
-        "fields": {
-            "importer_type": 3, 
-            "target": "authors"
-        }
-    }, 
-    {
         "pk": 1, 
         "model": "ishtar_common.importerdefault", 
         "fields": {
@@ -354,11 +363,10 @@
     }, 
     {
         "pk": 26, 
-        "model": "ishtar_common.importerdefaultvalues", 
+        "model": "ishtar_common.importerdefault", 
         "fields": {
-            "default_target": 20, 
-            "target": "author_type", 
-            "value": "main_author"
+            "importer_type": 19, 
+            "target": "public_domain"
         }
     }, 
     {
@@ -407,6 +415,15 @@
         }
     }, 
     {
+        "pk": 32, 
+        "model": "ishtar_common.importerdefaultvalues", 
+        "fields": {
+            "default_target": 26, 
+            "target": "public_domain", 
+            "value": "False"
+        }
+    }, 
+    {
         "pk": 336, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
@@ -888,6 +905,84 @@
         }
     }, 
     {
+        "pk": 391, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 1, 
+            "description": "Code PATRIARCHE ou code num\u00e9rique (entier) UNIQUE pour une op\u00e9ration.", 
+            "regexp_pre_filter": null, 
+            "required": true, 
+            "label": "Code op\u00e9ration", 
+            "importer_type": 23, 
+            "export_field_name": "base_finds__context_record__operation__code_patriarche"
+        }
+    }, 
+    {
+        "pk": 392, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 2, 
+            "description": "Commune (via num\u00e9ro INSEE).", 
+            "regexp_pre_filter": null, 
+            "required": true, 
+            "label": "INSEE", 
+            "importer_type": 23, 
+            "export_field_name": "base_finds__context_record__parcel__town__numero_insee"
+        }
+    }, 
+    {
+        "pk": 393, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 3, 
+            "description": "Section (identifiant externe), soit des lettres formant la section . Exemple : \"ZA\".", 
+            "regexp_pre_filter": null, 
+            "required": true, 
+            "label": "Section de parcellaire", 
+            "importer_type": 23, 
+            "export_field_name": "base_finds__context_record__parcel__section"
+        }
+    }, 
+    {
+        "pk": 394, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 4, 
+            "description": "Num\u00e9ro de la parcelle, soit des chiffres sans espaces. Exemple : \"253\".", 
+            "regexp_pre_filter": null, 
+            "required": true, 
+            "label": "Num\u00e9ro de parcelle", 
+            "importer_type": 23, 
+            "export_field_name": "base_finds__context_record__parcel__parcel_number"
+        }
+    }, 
+    {
+        "pk": 395, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 5, 
+            "description": "Label / Identifiant (externe) de l'UE. Exemple : \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\", etc. Doit \u00eatre unique pour une parcelle donn\u00e9e.", 
+            "regexp_pre_filter": null, 
+            "required": true, 
+            "label": "Label UE", 
+            "importer_type": 23, 
+            "export_field_name": "base_finds__context_record__label"
+        }
+    }, 
+    {
+        "pk": 396, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 6, 
+            "description": "Identifiant libre pour le mobilier. Exemple : \"12\", \"Lot 24\", \"Sac vert\", etc.\r\nDoit \u00eatre unique \u00e0 l'\u00e9chelle de l'UE associ\u00e9e.", 
+            "regexp_pre_filter": null, 
+            "required": true, 
+            "label": "Label mobilier", 
+            "importer_type": 23, 
+            "export_field_name": "label"
+        }
+    }, 
+    {
         "pk": 265, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
@@ -4676,6 +4771,76 @@
         }
     }, 
     {
+        "pk": 417, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "base_finds__context_record__external_id", 
+            "column": 392, 
+            "formater_type": 28, 
+            "concat_str": "-", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 421, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "base_finds__label", 
+            "column": 396, 
+            "formater_type": 3, 
+            "concat_str": "", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 419, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "base_finds__context_record__external_id", 
+            "column": 394, 
+            "formater_type": 35, 
+            "concat_str": "-", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 423, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "base_finds__context_record__parcel__section", 
+            "column": 393, 
+            "formater_type": 7, 
+            "concat_str": "", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 425, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "base_finds__context_record__parcel__town__numero_insee", 
+            "column": 337, 
+            "formater_type": 28, 
+            "concat_str": "", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
         "pk": 396, 
         "model": "ishtar_common.importtarget", 
         "fields": {
@@ -5082,6 +5247,20 @@
         }
     }, 
     {
+        "pk": 416, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "base_finds__context_record__external_id", 
+            "column": 391, 
+            "formater_type": 11, 
+            "concat_str": "", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
         "pk": 310, 
         "model": "ishtar_common.importtarget", 
         "fields": {
@@ -5250,6 +5429,34 @@
         }
     }, 
     {
+        "pk": 418, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "base_finds__context_record__external_id", 
+            "column": 393, 
+            "formater_type": 35, 
+            "concat_str": "-", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 420, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "base_finds__context_record__external_id", 
+            "column": 395, 
+            "formater_type": 3, 
+            "concat_str": "-", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
         "pk": 355, 
         "model": "ishtar_common.importtarget", 
         "fields": {
@@ -5278,6 +5485,34 @@
         }
     }, 
     {
+        "pk": 422, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "base_finds__context_record__parcel__town__numero_insee", 
+            "column": 392, 
+            "formater_type": 11, 
+            "concat_str": "", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 424, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "base_finds__context_record__parcel__parcel_number", 
+            "column": 394, 
+            "formater_type": 8, 
+            "concat_str": "", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
         "pk": 352, 
         "model": "ishtar_common.importtarget", 
         "fields": {
@@ -6258,5 +6493,148 @@
             "concat": false, 
             "force_new": false
         }
+    }, 
+    {
+        "pk": 54, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 391, 
+            "concat_str": "-", 
+            "field_name": "base_finds__external_id", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 55, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 391, 
+            "concat_str": "-", 
+            "field_name": "external_id", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 56, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 392, 
+            "concat_str": "-", 
+            "field_name": "base_finds__external_id", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 57, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 392, 
+            "concat_str": "-", 
+            "field_name": "external_id", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 58, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 393, 
+            "concat_str": "-", 
+            "field_name": "base_finds__external_id", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 59, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 393, 
+            "concat_str": "-", 
+            "field_name": "external_id", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 62, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 395, 
+            "concat_str": "-", 
+            "field_name": "base_finds__external_id", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 63, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 395, 
+            "concat_str": "-", 
+            "field_name": "external_id", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 64, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 396, 
+            "concat_str": "", 
+            "field_name": "label", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 65, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 396, 
+            "concat_str": "-", 
+            "field_name": "base_finds__external_id", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 66, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 396, 
+            "concat_str": "-", 
+            "field_name": "external_id", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 60, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 394, 
+            "concat_str": "-", 
+            "field_name": "base_finds__external_id", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 61, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 394, 
+            "concat_str": "-", 
+            "field_name": "external_id", 
+            "concat": false, 
+            "force_new": false
+        }
     }
 ]
\ No newline at end of file