Merge branch 'master' into v0.9

3 files changed, 22 insertions, 23 deletions

diff --git a/archaeological_operations/fixtures/initial_data-fr.json b/archaeological_operations/fixtures/initial_data-fr.json
index 9f514a097..304f07a38 100644
--- a/archaeological_operations/fixtures/initial_data-fr.json
+++ b/archaeological_operations/fixtures/initial_data-fr.json
@@ -1970,22 +1970,22 @@
         }
     }, 
     {
-        "pk": 2, 
+        "pk": 221, 
         "model": "archaeological_operations.remaintype", 
         "fields": {
-            "comment": "", 
+            "comment": null, 
             "available": true, 
-            "txt_idx": "enclosure", 
+            "txt_idx": "enclos", 
             "label": "enclos"
         }
     }, 
     {
-        "pk": 221, 
+        "pk": 2, 
         "model": "archaeological_operations.remaintype", 
         "fields": {
-            "comment": null, 
+            "comment": "", 
             "available": true, 
-            "txt_idx": "enclos", 
+            "txt_idx": "enclosure", 
             "label": "enclos"
         }
     }, 
@@ -2914,31 +2914,31 @@
         }
     }, 
     {
-        "pk": 3, 
+        "pk": 2, 
         "model": "archaeological_operations.relationtype", 
         "fields": {
             "comment": "", 
             "available": true, 
             "tiny_label": "", 
-            "label": "En relation diffuse avec", 
-            "symmetrical": true, 
-            "inverse_relation": null, 
+            "label": "Comprise dans", 
+            "symmetrical": false, 
+            "inverse_relation": 1, 
             "order": 1, 
-            "txt_idx": "fuzzy_relation"
+            "txt_idx": "is_in"
         }
     }, 
     {
-        "pk": 2, 
+        "pk": 3, 
         "model": "archaeological_operations.relationtype", 
         "fields": {
             "comment": "", 
             "available": true, 
-            "tiny_label": null, 
-            "label": "Est compris dans", 
-            "symmetrical": false, 
-            "inverse_relation": 1, 
+            "tiny_label": "", 
+            "label": "Relation diffuse", 
+            "symmetrical": true, 
+            "inverse_relation": null, 
             "order": 1, 
-            "txt_idx": "is_in"
+            "txt_idx": "fuzzy_relation"
         }
     }, 
     {
@@ -2992,7 +2992,7 @@
             "comment": "Le rapport (unique) a \u00e9t\u00e9 re\u00e7u et d\u00e9pouill\u00e9.", 
             "available": true, 
             "txt_idx": "one_report_received_and_processed", 
-            "order": 4, 
+            "order": 5, 
             "label": "Re\u00e7u et d\u00e9pouill\u00e9"
         }
     }, 
@@ -3003,7 +3003,7 @@
             "comment": "Tous les rapports ont \u00e9t\u00e9 re\u00e7us mais n'ont pas \u00e9t\u00e9 encore d\u00e9pouill\u00e9s.", 
             "available": true, 
             "txt_idx": "received_and_processed", 
-            "order": 4, 
+            "order": 6, 
             "label": "Re\u00e7us et d\u00e9pouill\u00e9s"
         }
     }, 
@@ -3014,8 +3014,8 @@
             "comment": "Il n'existe pas de rapport pour cette op\u00e9ration.", 
             "available": true, 
             "txt_idx": "no-report", 
-            "order": 4, 
+            "order": 7, 
             "label": "Rapport inexistant"
         }
     }
-]
\ No newline at end of file
+]
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 67f9454fa..183a2f682 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -142,7 +142,7 @@ class ImportTest(object):
         hc = Unit.objects.get(txt_idx='not_in_context').pk
         self.set_target_key('unit', 'hc', hc, imp=imp)
         self.set_target_key('unit', 'hors-contexte', hc, imp=imp)
-        layer = Unit.objects.get(txt_idx='layer').pk
+        layer = Unit.objects.get(txt_idx='negative').pk
         self.set_target_key('unit', 'couche', layer, imp=imp)
 
     def init_context_record(self):
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index c132c24be..07206cc18 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -278,7 +278,6 @@ class OperationModificationWizard(OperationWizard):
     def get_form_kwargs(self, step, **kwargs):
         kwargs = super(OperationModificationWizard, self).get_form_kwargs(
             step, **kwargs)
-        print(step)
         if step != "relations-operation_modification":
             return kwargs
         kwargs["left_record"] = self.get_current_object()