Merge branch 'master' into v0.9

Conflicts:
	ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py

1 files changed, 8 insertions, 1 deletions

diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py
index 84f8269c7..030bc1624 100644
--- a/archaeological_files/tests.py
+++ b/archaeological_files/tests.py
@@ -27,7 +27,7 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.test import TestCase
 
-from ishtar_common.models import PersonType, Town
+from ishtar_common.models import PersonType, Town, IshtarSiteProfile
 from archaeological_files import models
 from archaeological_operations.models import Parcel, ParcelOwner
 from archaeological_operations.tests import OperationInitTest
@@ -77,8 +77,15 @@ class FileTest(TestCase, FileInit):
     model = models.File
 
     def setUp(self):
+        IshtarSiteProfile.objects.create()
         self.create_file()
 
+    def testExternalID(self):
+        self.assertEqual(
+            self.item.external_id,
+            u"{}{}-{}".format(settings.ISHTAR_LOCAL_PREFIX, self.item.year,
+                              self.item.numeric_reference))
+
     def testAddAndGetHistorized(self):
         """
         Test correct new version and correct access to history