summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-01-20 02:11:01 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-01-20 02:11:01 +0100
commit160762406c34a3d2b08ccefaace1952f54b3fc30 (patch)
tree7b4cdcbb850e7e0f248940f34ef3dd34f9ba793a
parentfef2d0beb899afdbab48b3c2d6eff697a4d345c4 (diff)
downloadIshtar-160762406c34a3d2b08ccefaace1952f54b3fc30.tar.bz2
Ishtar-160762406c34a3d2b08ccefaace1952f54b3fc30.zip
Correct the model (refs #76, closes #104)
-rw-r--r--ishtar/furnitures/models.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py
index f2fa8837a..f7cc8288c 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -256,6 +256,10 @@ class FileType(GeneralType):
except ObjectDoesNotExist:
return False
+class PermitType(GeneralType):
+ class Meta:
+ verbose_name = _(u"Permit type")
+ verbose_name_plural = _(u"Permit types")
if settings.COUNTRY == 'fr':
class SaisineType(GeneralType):
@@ -275,6 +279,12 @@ class File(BaseHistorizedItem, OwnPerms):
verbose_name=_(u"Person in charge"))
general_contractor = models.ForeignKey(Person, related_name='+',
verbose_name=_(u"General contractor"), blank=True, null=True)
+ town_planning_service = models.ForeignKey(Organization, related_name='+',
+ verbose_name=_(u"Town planning service"), blank=True, null=True)
+ permit_type = models.ForeignKey(PermitType, verbose_name=_(u"Permit type"),
+ blank=True, null=True)
+ permit_reference = models.CharField(_(u"Permit reference"),
+ max_length=60, blank=True, null=True)
is_active = models.BooleanField(_(u"Is active?"), default=True)
towns = models.ManyToManyField("Town")
creation_date = models.DateField(_(u"Creation date"),
@@ -577,6 +587,11 @@ class Warehouse(Address, OwnPerms):
return unicode(self.warehouse_type)
class ActType(GeneralType):
+ TYPE = (('F', _(u'Archaelogical file')),
+ ('O', _(u'Operation')),
+ )
+ intented_to = models.CharField(_(u"Intended to"), max_length=1,
+ choices=TYPE)
class Meta:
verbose_name = _(u"Act type")
verbose_name_plural = _(u"Act types")