diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-03-28 17:26:50 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-03-28 17:26:50 +0200 |
| commit | 1f7835d2b877913599872a54dc3af0f70d311991 (patch) | |
| tree | 25902073c16464c203b9baaca46f9434f72f7609 | |
| parent | 93e25d60b14018a5a47376644521395bce773eb3 (diff) | |
| download | Ishtar-1f7835d2b877913599872a54dc3af0f70d311991.tar.bz2 Ishtar-1f7835d2b877913599872a54dc3af0f70d311991.zip | |
Not compulsory fields - database (refs #310)
| -rw-r--r-- | ishtar/furnitures/forms.py | 4 | ||||
| -rw-r--r-- | ishtar/furnitures/models.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py index 7ae604f9b..d542e92be 100644 --- a/ishtar/furnitures/forms.py +++ b/ishtar/furnitures/forms.py @@ -1867,10 +1867,10 @@ class DatingForm(forms.Form): choices=models.Period.get_types()) start_date = forms.IntegerField(label=_(u"Start date"), required=False) end_date = forms.IntegerField(label=_(u"End date"), required=False) - dating_type = forms.ChoiceField(label=_("Dating type"), required=False, - choices=models.DatingType.get_types()) quality = forms.ChoiceField(label=_("Quality"), required=False, choices=models.DatingQuality.get_types()) + dating_type = forms.ChoiceField(label=_("Dating type"), required=False, + choices=models.DatingType.get_types()) DatingFormSet = formset_factory(DatingForm, can_delete=True, formset=FormSet) diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index 212794503..b32948709 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -672,12 +672,12 @@ class Item(BaseHistorizedItem, OwnPerms): related_name='item') order = models.IntegerField(_(u"Order")) label = models.CharField(_(u"Label"), max_length=60) - description = models.TextField(_(u"Description")) + description = models.TextField(_(u"Description"), blank=True, null=True) material_type = models.ForeignKey(MaterialType, verbose_name = _(u"Material type")) - volume = models.FloatField(_(u"Volume")) - weight = models.IntegerField(_(u"Weight")) - item_number = models.IntegerField(_("Item number")) + volume = models.FloatField(_(u"Volume"), blank=True, null=True) + weight = models.IntegerField(_(u"Weight"), blank=True, null=True) + item_number = models.IntegerField(_("Item number"), blank=True, null=True) upstream_treatment = models.ForeignKey("Treatment", blank=True, null=True, related_name='downstream_treatment', verbose_name=_("Upstream treatment")) downstream_treatment = models.ForeignKey("Treatment", blank=True, null=True, |