Correct File model (refs #13)

1 files changed, 11 insertions, 9 deletions

diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py
index 597e16583..9b808f2c7 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -150,21 +150,22 @@ if settings.COUNTRY == 'fr':
             verbose_name_plural = u"Saisines"
 
 class File(HistorizedItem):
-    year = models.IntegerField(_(u"Year"))
-    number = models.IntegerField(_(u"Number"))
-    is_active = models.BooleanField(_(u"Is active?"))
-    reception_date = models.DateField(_(u'Reception date'))
+    year = models.IntegerField(_(u"Year"),
+                               default=lambda:datetime.datetime.now().year)
+    internal_reference = models.CharField(_(u"Internal reference"),
+                                          max_length=60)
     file_type = models.ForeignKey(FileType, verbose_name=_(u"File type"))
     general_contractor = models.ForeignKey(Organization, related_name='+',
-                                           verbose_name=(u"General contractor"))
+               verbose_name=(u"General contractor"), blank=True, null=True)
+    is_active = models.BooleanField(_(u"Is active?"))
     towns = models.ManyToManyField("Town")
+    creation_date = models.DateField(_(u"Creation date"),
+                                     default=datetime.datetime.now)
+    reception_date = models.DateField(_(u'Reception date'))
     if settings.COUNTRY == 'fr':
         saisine_type = models.ForeignKey(SaisineType,
                                          verbose_name= u"Type de saisine")
-        ar_date = models.DateField(u"Date d'envoi du courrier \
-avec accusé réception")
-        ar_signed_by = models.ForeignKey(Person, related_name='+',
-                         verbose_name=u"Signature de l'accusé de réception par")
+        reference_number = models.IntegerField(_(u"Reference number"))
     history = HistoricalRecords()
 
     class Meta:
@@ -202,6 +203,7 @@ class Operation(HistorizedItem):
         code_patriarche = models.IntegerField(u"Code PATRIARCHE")
         code_pat = models.CharField(u"Code PAT", max_length=10)
         code_dracar = models.CharField(u"Code DRACAR", max_length=10)
+    comment = models.TextField(_(u"Comment"))
     history = HistoricalRecords()
 
     class Meta: