diff options
Diffstat (limited to 'ishtar/furnitures/models.py')
| -rw-r--r-- | ishtar/furnitures/models.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index 6afdee470..5069df262 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -718,8 +718,8 @@ class Warehouse(Address, OwnPerms): warehouse_type = models.ForeignKey(WarehouseType, verbose_name=_(u"Warehouse type")) person_in_charge = models.ForeignKey(Person, - verbose_name=_(u"Person in charge")) - comment = models.TextField(_(u"Comment")) + verbose_name=_(u"Person in charge"), null=True, blank=True) + comment = models.TextField(_(u"Comment"), null=True, blank=True) class Meta: verbose_name = _(u"Warehouse") @@ -732,7 +732,7 @@ class Warehouse(Address, OwnPerms): ) def __unicode__(self): - return unicode(self.warehouse_type) + return u"%s (%s)" % (self.name, unicode(self.warehouse_type)) class ActType(GeneralType): TYPE = (('F', _(u'Archaelogical file')), @@ -795,7 +795,6 @@ class ContainerType(GeneralType): verbose_name_plural = _(u"Container types") class Container(LightHistorizedItem): - reference = models.CharField(_(u"Reference"), max_length=15) location = models.ForeignKey(Warehouse, verbose_name=_(u"Location")) container_type = models.ForeignKey(ContainerType, verbose_name=_("Container type")) @@ -853,13 +852,17 @@ class TreatmentType(GeneralType): verbose_name_plural = _(u"Treatment types") class Treatment(BaseHistorizedItem, OwnPerms): - container = models.ForeignKey(Container, verbose_name=_(u"Container")) + container = models.ForeignKey(Container, verbose_name=_(u"Container"), + blank=True, null=True) + description = models.TextField(_(u"Description"), blank=True, null=True) treatment_type = models.ForeignKey(TreatmentType, verbose_name=_(u"Treatment type")) - location = models.ForeignKey(Warehouse, verbose_name=_(u"Location")) - person = models.ForeignKey(Person, verbose_name=_(u'Person')) - start_date = models.DateField(_(u"Start date")) - end_date = models.DateField(_(u"End date")) + location = models.ForeignKey(Warehouse, verbose_name=_(u"Location"), + blank=True, null=True) + person = models.ForeignKey(Person, verbose_name=_(u"Person"), + blank=True, null=True) + start_date = models.DateField(_(u"Start date"), blank=True, null=True) + end_date = models.DateField(_(u"End date"), blank=True, null=True) history = HistoricalRecords() class Meta: @@ -872,9 +875,6 @@ class Treatment(BaseHistorizedItem, OwnPerms): ("delete_own_treatment", ugettext(u"Can delete own Treatment")), ) - def __unicode__(self): - return self.item - class AuthorType(GeneralType): class Meta: verbose_name = _(u"Author type") |