Manage administrative acts (refs #16)

1 files changed, 5 insertions, 3 deletions

diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py
index f0e58bb9f..bc299e132 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -275,7 +275,7 @@ class File(BaseHistorizedItem, OwnPerms):
                                   verbose_name=_(u"Person in charge"))
     general_contractor = models.ForeignKey(Person, related_name='+',
                verbose_name=_(u"General contractor"), blank=True, null=True)
-    is_active = models.BooleanField(_(u"Is active?"))
+    is_active = models.BooleanField(_(u"Is active?"), default=True)
     towns = models.ManyToManyField("Town")
     creation_date = models.DateField(_(u"Creation date"),
                                      default=datetime.datetime.now)
@@ -319,7 +319,7 @@ class File(BaseHistorizedItem, OwnPerms):
 
     @classmethod
     def get_query_owns(cls, user):
-        return Q(history_modifier=user)
+        return Q(history_modifier=user) & Q(is_active=True)
 
 class OperationType(GeneralType):
     class Meta:
@@ -333,7 +333,7 @@ class RemainType(GeneralType):
 
 class Operation(BaseHistorizedItem, OwnPerms):
     start_date = models.DateField(_(u"Start date"), null=True, blank=True)
-    end_date = models.DateField(_(u"End date"), null=True, blank=True)
+    end_date = models.DateField(_(u"Closing date"), null=True, blank=True)
     in_charge = models.ForeignKey('Person', related_name='+',
                                   verbose_name=_(u"In charge"))
     year = models.IntegerField(_(u"Year"))
@@ -593,6 +593,8 @@ related_name='+', verbose_name=_(u"Person in charge of the scientific part"))
                     related_name='+', verbose_name=_(u"Signatory"))
     operation = models.ForeignKey(Operation, blank=True, null=True,
                     related_name='+', verbose_name=_(u"Operation"))
+    associated_file = models.ForeignKey(File, blank=True, null=True,
+                    related_name='+', verbose_name=_(u"Archaelogical file"))
     signature_date = models.DateField(_(u"Signature date"))
     act_object = models.CharField(_(u"Object"), max_length=200)
     if settings.COUNTRY == 'fr':