Minor changes on the models (refs #13)

1 files changed, 5 insertions, 5 deletions

diff --git a/ishtar/materials/models.py b/ishtar/materials/models.py
index 1b791eb8b..37bc62f16 100644
--- a/ishtar/materials/models.py
+++ b/ishtar/materials/models.py
@@ -79,9 +79,9 @@ class File(models.Model) :
     creation_date = models.DateField(_(u"Creation date"))
     modification_date = models.DateField(_(u"Modification date"))
     folder_type = models.ForeignKey(FileType, verbose_name=_(u"File type"))
-    creation_person = models.ForeignKey(Person,
-                                        verbose_name=(u"Creation person"))
-    AMENAGEUR_ID_ID_PERSONNE = models.IntegerField()
+    creator = models.ForeignKey(Person, verbose_name=(u"Creator"))
+    general_contractor = models.ForeignKey(Person,
+                                           verbose_name=(u"General contractor"))
     if settings.COUNTRY == 'fr':
         ar_date = models.DateField(u"Date d'envoi du courrier \
 avec accusé réception")
@@ -89,7 +89,7 @@ avec accusé réception")
 l'accusé de réception par")
 
     def __unicode__(self):
-      return u""
+      return u"%d - %d" % (self.year, self.number)
 
 class HistoryFile(models.Model):
     person = models.ForeignKey('Person', verbose_name=_(u"Person"))
@@ -104,7 +104,7 @@ class Operation(models.Model):
     end_date = models.DateField(_(u"End date"))
     name = models.CharField(_(u"Name"))
     in_charge = models.ForeignKey('Person', verbose_name=_(u"In charge"))
-    CODE_OPERATION = models.CharField('VIDE'::character varying)
+    operation_code = models.CharField(_(u"Operation code"), )
     DOSSIER = models.CharField('VIDE'::character varying)
     TYPE = models.IntegerField('VIDE'::character varying)
     if settings.COUNTRY == 'fr':