Work on file sheet and odt export (refs #227)

1 files changed, 7 insertions, 2 deletions

diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py
index 3b73baba0..ce94e4042 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -237,7 +237,7 @@ class Person(Address, OwnPerms) :
         return lbl
 
     def full_label(self):
-        return " ".join([getattr(self, attr)
+        return u" ".join([unicode(getattr(self, attr))
                          for attr in ('title', 'surname', 'name', 'attached_to')
                          if getattr(self, attr)])
 
@@ -360,6 +360,11 @@ class File(BaseHistorizedItem, OwnPerms):
         if self.total_developed_surface:
             return self.total_developed_surface/10000.0
 
+    def operation_acts(self):
+        return [act for act in
+                [ope.administrative_act.all() for ope in self.operations.all()]
+               ]
+
     def is_preventive(self):
         return FileType.is_preventive(self.file_type.pk)
 
@@ -391,7 +396,7 @@ class Operation(BaseHistorizedItem, OwnPerms):
                                   blank=True, verbose_name=_(u"In charge"))
     year = models.IntegerField(_(u"Year"))
     operation_code = models.IntegerField(_(u"Operation code"))
-    associated_file = models.ForeignKey(File, related_name='+',
+    associated_file = models.ForeignKey(File, related_name='operations',
                                  verbose_name=_(u"File"), blank=True, null=True)
     operation_type = models.ForeignKey(OperationType, related_name='+',
                                        verbose_name=_(u"Operation type"))