summaryrefslogtreecommitdiff
path: root/ishtar/ishtar_base/models.py
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar/ishtar_base/models.py')
-rw-r--r--ishtar/ishtar_base/models.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py
index 90e593131..0cf15f072 100644
--- a/ishtar/ishtar_base/models.py
+++ b/ishtar/ishtar_base/models.py
@@ -1009,6 +1009,8 @@ class Item(BaseHistorizedItem, OwnPerms):
downstream_treatment = models.ForeignKey("Treatment", blank=True, null=True,
related_name='upstream_treatment', verbose_name=_("Downstream treatment"))
dating = models.ForeignKey(Dating, verbose_name=_(u"Dating"))
+ container = models.ForeignKey('Container', verbose_name=_(u"Container"),
+ blank=True, null=True, related_name='items')
history = HistoricalRecords()
def duplicate(self, user):
@@ -1161,7 +1163,8 @@ class ContainerType(GeneralType):
verbose_name_plural = _(u"Container types")
class Container(LightHistorizedItem):
- location = models.ForeignKey(Warehouse, verbose_name=_(u"Location"))
+ TABLE_COLS = ['reference', 'container_type', 'location',]
+ location = models.ForeignKey(Warehouse, verbose_name=_(u"Warehouse"))
container_type = models.ForeignKey(ContainerType,
verbose_name=_("Container type"))
reference = models.CharField(_(u"Reference"), max_length=40)