Operation closing (closes #441)

1 files changed, 8 insertions, 6 deletions

diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py
index 9bbb8bf2d..db8773ad4 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -590,16 +590,18 @@ class Operation(BaseHistorizedItem, OwnPerms):
         return Q(in_charge=user.person)|Q(history_modifier=user)\
                & Q(end_date__isnull=True)
 
-    """
+    def is_active(self):
+        return not bool(self.end_date)
+
     def closing(self):
-        if self.is_active:
+        if self.is_active():
             return
         for item in self.history.all():
-            if item.is_active():
+            if not item.end_date:
                 break
-            closing_item = item
-        return {'date':item.history_date, 'user':item.history_modifier}
-"""
+        return {'date':item.history_date,
+                'user':IshtarUser.objects.get(pk=item.history_modifier_id)}
+
 class Parcel(LightHistorizedItem):
     associated_file = models.ForeignKey(File, related_name='parcels',
                                 blank=True, null=True, verbose_name=_(u"File"))