diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-03-31 20:06:35 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-03-31 20:06:35 +0200 |
| commit | 975e2fca91aa37774b604d38a3e424b01e74236a (patch) | |
| tree | a8164dde6a40e805d8eae117c7383271e1944e52 | |
| parent | 0632d859b858a78d76426dc2a341e2545db5a953 (diff) | |
| download | Ishtar-975e2fca91aa37774b604d38a3e424b01e74236a.tar.bz2 Ishtar-975e2fca91aa37774b604d38a3e424b01e74236a.zip | |
Add of "surface" field to operations (closes #271)
| -rw-r--r-- | ishtar/furnitures/forms.py | 1 | ||||
| -rw-r--r-- | ishtar/furnitures/models.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py index a9519266f..334a93a58 100644 --- a/ishtar/furnitures/forms.py +++ b/ishtar/furnitures/forms.py @@ -1501,6 +1501,7 @@ class OperationFormGeneral(forms.Form): choices=models.OperationType.get_types()) start_date = forms.DateField(label=_(u"Start date"), required=False, widget=widgets.JQueryDate) + surface = forms.IntegerField(label=_(u"Surface"), required=False,) year = forms.IntegerField(label=_("Year"), initial=lambda:datetime.datetime.now().year, validators=[validators.MinValueValidator(1900), diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index cd901af32..6b586decf 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -428,7 +428,6 @@ class Operation(BaseHistorizedItem, OwnPerms): 'remains', 'towns', 'associated_file', 'start_date'] start_date = models.DateField(_(u"Start date"), null=True, blank=True) end_date = models.DateField(_(u"Closing date"), null=True, blank=True) - begin_operation = models.DateField(_(u"Start date"), null=True, blank=True) in_charge = models.ForeignKey('Person', related_name='+', null=True, blank=True, verbose_name=_(u"In charge")) year = models.IntegerField(_(u"Year")) @@ -437,6 +436,7 @@ class Operation(BaseHistorizedItem, OwnPerms): verbose_name=_(u"File"), blank=True, null=True) operation_type = models.ForeignKey(OperationType, related_name='+', verbose_name=_(u"Operation type")) + surface = models.IntegerField(_(u"Surface (m²)"), blank=True, null=True) remains = models.ManyToManyField("RemainType", verbose_name=_(u'Remains')) towns = models.ManyToManyField("Town", verbose_name=_(u"Towns")) cost = models.IntegerField(_(u"Cost"), blank=True, null=True) |