Merge branch 'stable'

Conflicts:
	ishtar_common/data_importer.py

1 files changed, 3 insertions, 1 deletions

diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index c7e75da1b..ccb67cc03 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -86,7 +86,8 @@ class ImportOperationTest(TestCase):
         # doing manualy connections
         tg = TargetKey.objects.filter(target__target='operation_type'
                                       ).order_by('-pk').all()[0]
-        tg.value = models.OperationType.objects.get(txt_idx='prog_excavation').pk
+        tg.value = models.OperationType.objects.get(
+                                      txt_idx='prog_excavation').pk
         tg.is_set = True
         tg.save()
 
@@ -110,6 +111,7 @@ class ImportOperationTest(TestCase):
         self.assertTrue(current_ope_nb == (first_ope_nb + 1))
         # and well imported
         last_ope = models.Operation.objects.order_by('-pk').all()[0]
+        self.assertEqual(last_ope.name, u"Oppìdum de Paris")
         self.assertTrue(last_ope.code_patriarche == 4200)
         self.assertTrue(last_ope.operation_type.txt_idx == 'prog_excavation')
         self.assertEqual(last_ope.periods.count(), 2)