summaryrefslogtreecommitdiff
path: root/ishtar
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2010-12-08 15:47:10 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2010-12-24 17:39:02 +0100
commitf379c177d1b241a5c95e2d21e780651acf335166 (patch)
tree2d3b244f9e199b5058776a971693ffc139794292 /ishtar
parent6710679433a803ff4b157efe7ef37539fae72a79 (diff)
downloadIshtar-f379c177d1b241a5c95e2d21e780651acf335166.tar.bz2
Ishtar-f379c177d1b241a5c95e2d21e780651acf335166.zip
Minor changes on the models (refs #13)
Diffstat (limited to 'ishtar')
-rw-r--r--ishtar/materials/models.py10
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':