diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-01-07 02:20:09 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-01-07 02:20:09 +0100 |
| commit | 67d9315db7656319322f38e31bc7bd44d0dbe9b9 (patch) | |
| tree | d2ae727ef94647ca502cb61e3032ab5bd7f53c7b /ishtar/furnitures/models.py | |
| parent | ac07856860b811d27e5cd4265cf85a2523f87a41 (diff) | |
| download | Ishtar-67d9315db7656319322f38e31bc7bd44d0dbe9b9.tar.bz2 Ishtar-67d9315db7656319322f38e31bc7bd44d0dbe9b9.zip | |
Save of parcels (refs #14)
Diffstat (limited to 'ishtar/furnitures/models.py')
| -rw-r--r-- | ishtar/furnitures/models.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index 6e623d321..65307e15a 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -301,9 +301,9 @@ class Operation(BaseHistorizedItem, OwnPerms): class Parcel(LightHistorizedItem) : - associated_file = models.ForeignKey(File, related_name='+', blank=True, + associated_file = models.ForeignKey(File, related_name='parcel', blank=True, null=True, verbose_name=_(u"File")) - operation = models.ForeignKey(Operation, related_name='+', blank=True, + operation = models.ForeignKey(Operation, related_name='parcel', blank=True, null=True, verbose_name=_(u"Operation")) year = models.IntegerField(_(u"Year"), default=lambda:datetime.datetime.now().year) @@ -317,7 +317,8 @@ class Parcel(LightHistorizedItem) : def __unicode__(self): return u" - ".join([unicode(item) for item in \ - [self.operation, self.section, self.parcel_number]]) + [self.associated_file, self.operation, self.section, self.parcel_number] + if item]) class Period(GeneralType) : order = models.IntegerField(_(u"Order")) |