Fix migrations

6 files changed, 15 insertions, 2 deletions

diff --git a/archaeological_warehouse/migrations/0014_auto__add_collection.py b/archaeological_warehouse/migrations/0013_auto__add_collection.py
index 52c7e841e..52c7e841e 100644
--- a/archaeological_warehouse/migrations/0014_auto__add_collection.py
+++ b/archaeological_warehouse/migrations/0013_auto__add_collection.py
diff --git a/archaeological_warehouse/migrations/0015_auto__add_field_container_cached_location__add_field_container_index.py b/archaeological_warehouse/migrations/0014_auto__add_field_container_cached_location__add_field_container_index.py
index 4e267e1ac..4e267e1ac 100644
--- a/archaeological_warehouse/migrations/0015_auto__add_field_container_cached_location__add_field_container_index.py
+++ b/archaeological_warehouse/migrations/0014_auto__add_field_container_cached_location__add_field_container_index.py
diff --git a/archaeological_warehouse/migrations/0016_auto_increment_existing_indexes.py b/archaeological_warehouse/migrations/0015_auto_increment_existing_indexes.py
index 138c2165d..138c2165d 100644
--- a/archaeological_warehouse/migrations/0016_auto_increment_existing_indexes.py
+++ b/archaeological_warehouse/migrations/0015_auto_increment_existing_indexes.py
diff --git a/archaeological_warehouse/migrations/0017_auto__add_unique_container_index_location.py b/archaeological_warehouse/migrations/0016_auto__add_unique_container_index_location.py
index 055497078..055497078 100644
--- a/archaeological_warehouse/migrations/0017_auto__add_unique_container_index_location.py
+++ b/archaeological_warehouse/migrations/0016_auto__add_unique_container_index_location.py
diff --git a/archaeological_warehouse/migrations/0018_auto__chg_field_container_comment.py b/archaeological_warehouse/migrations/0017_auto__chg_field_container_comment.py
index bb6d2585e..bb6d2585e 100644
--- a/archaeological_warehouse/migrations/0018_auto__chg_field_container_comment.py
+++ b/archaeological_warehouse/migrations/0017_auto__chg_field_container_comment.py
diff --git a/archaeological_warehouse/migrations/0013_generate_cache_lbl_for_containers.py b/archaeological_warehouse/migrations/0018_generate_cache_lbl_for_containers.py
index 3386c85ec..78eefad52 100644
--- a/archaeological_warehouse/migrations/0013_generate_cache_lbl_for_containers.py
+++ b/archaeological_warehouse/migrations/0018_generate_cache_lbl_for_containers.py
@@ -18,16 +18,29 @@ class Migration(SchemaMigration):
         pass
 
     models = {
+        'archaeological_warehouse.collection': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Collection'},
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_warehouse_collection'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'warehouse': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'collections'", 'to': "orm['archaeological_warehouse.Warehouse']"})
+        },
         'archaeological_warehouse.container': {
-            'Meta': {'ordering': "('cached_label',)", 'object_name': 'Container'},
+            'Meta': {'ordering': "('cached_label',)", 'unique_together': "(('index', 'location'),)", 'object_name': 'Container'},
             'cached_label': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}),
-            'comment': ('django.db.models.fields.TextField', [], {}),
+            'cached_location': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
             'container_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.ContainerType']"}),
             'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
             'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_warehouse_container'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+            'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
             'location': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'containers'", 'to': "orm['archaeological_warehouse.Warehouse']"}),
             'reference': ('django.db.models.fields.CharField', [], {'max_length': '40'})
         },