diff options
| author | Le Jeune Yann <lj.yann@gmail.com> | 2011-01-09 01:39:27 +0100 |
|---|---|---|
| committer | Le Jeune Yann <lj.yann@gmail.com> | 2011-01-09 01:39:27 +0100 |
| commit | 2906e1e6b8fab767be4fddb28814f83b31fc783e (patch) | |
| tree | b6cec68237b9ed994fd07d5285e624fe24c03129 /ishtar/furnitures/models.py | |
| parent | bd9a7b9981e0cdd787a6ec774c55bc875fbadb64 (diff) | |
| parent | 09ab8db48f245271991b1bdce281033de7275c80 (diff) | |
| download | Ishtar-2906e1e6b8fab767be4fddb28814f83b31fc783e.tar.bz2 Ishtar-2906e1e6b8fab767be4fddb28814f83b31fc783e.zip | |
Merge branch 'master' of ssh://lysithea.proxience.com/home/proxience/git/ishtar
Diffstat (limited to 'ishtar/furnitures/models.py')
| -rw-r--r-- | ishtar/furnitures/models.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index e75eb9b51..6664adb72 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -245,7 +245,11 @@ class File(BaseHistorizedItem, OwnPerms): total_surface = models.IntegerField(_(u"Total surface")) total_developed_surface = models.IntegerField(_(u"Total developed surface"), blank=True, null=True) - address = models.TextField(_(u"Address")) + address = models.TextField(_(u"Main address"), null=True, blank=True) + address_complement = models.TextField(_(u"Main address - complement"), + null=True, blank=True) + postal_code = models.CharField(_(u"Main address - postal code"), + max_length=10, null=True, blank=True) comment = models.TextField(_(u"Comment")) history = HistoricalRecords() @@ -310,8 +314,8 @@ class Operation(BaseHistorizedItem, OwnPerms): class Parcel(LightHistorizedItem) : - associated_file = models.ForeignKey(File, related_name='parcel', blank=True, - null=True, verbose_name=_(u"File")) + associated_file = models.ForeignKey(File, related_name='parcels', + blank=True, null=True, verbose_name=_(u"File")) operation = models.ForeignKey(Operation, related_name='parcel', blank=True, null=True, verbose_name=_(u"Operation")) year = models.IntegerField(_(u"Year"), |