Merge branch 'decoupage'

Conflicts:
	archaeological_operations/admin.py
	archaeological_operations/models.py

1 files changed, 5 insertions, 1 deletions

diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index 47b577215..a7e19e0ed 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -29,10 +29,13 @@ from ishtar_common.models import GeneralType, ImageModel, BaseHistorizedItem, \
 
 from archaeological_operations.models import AdministrativeAct
 from archaeological_context_records.models import ContextRecord, Dating
+
 WAREHOUSE_AVAILABLE = 'archaeological_warehouse' in settings.INSTALLED_APPS
 if WAREHOUSE_AVAILABLE:
     from archaeological_warehouse.models import Warehouse, Container
 
+FILES_AVAILABLE = 'archaeological_files' in settings.INSTALLED_APPS
+
 class MaterialType(GeneralType):
     code = models.CharField(_(u"Code"), max_length=10, blank=True, null=True)
     recommendation = models.TextField(_(u"Recommendation"))
@@ -387,7 +390,8 @@ class TreatmentSource(Source):
 
 class Property(LightHistorizedItem):
     find = models.ForeignKey(Find, verbose_name=_(u"Find"))
-    administrative_act = models.ForeignKey(AdministrativeAct,
+    if FILES_AVAILABLE:
+        administrative_act = models.ForeignKey(AdministrativeAct,
                                          verbose_name=_(u"Administrative act"))
     person = models.ForeignKey(Person, verbose_name=_(u"Person"),
                                related_name='properties')