New beta version - fix merge

1 files changed, 0 insertions, 22 deletions

diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index fdde06a7f..66386113b 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -663,28 +663,6 @@ post_save.connect(post_save_cache, sender=ContainerType)
 post_delete.connect(post_save_cache, sender=ContainerType)
 
 
-class ContainerType(GeneralType):
-    stationary = models.BooleanField(
-        _("Stationary"), default=False,
-        help_text=_("Container that usually will not be moved. Ex: building, "
-                    "room."))
-    length = models.IntegerField(_(u"Length (mm)"), blank=True, null=True)
-    width = models.IntegerField(_(u"Width (mm)"), blank=True, null=True)
-    height = models.IntegerField(_(u"Height (mm)"), blank=True, null=True)
-    volume = models.FloatField(_(u"Volume (l)"), blank=True, null=True)
-    reference = models.CharField(_(u"Ref."), max_length=300, blank=True,
-                                 null=True)
-
-    class Meta:
-        verbose_name = _(u"Container type")
-        verbose_name_plural = _(u"Container types")
-        ordering = ('label',)
-
-
-post_save.connect(post_save_cache, sender=ContainerType)
-post_delete.connect(post_save_cache, sender=ContainerType)
-
-
 class WarehouseDivisionLink(models.Model):
     RELATED_SET_NAME = "divisions"
     RELATED_ATTRS = ["order", "container_type"]