Merge migrations

2 files changed, 68 insertions, 8 deletions

diff --git a/ishtar_common/migrations/0030_auto__del_unique_targetkey_target_value__add_unique_targetkey_target_k.py b/ishtar_common/migrations/0031_auto__del_unique_targetkey_target_value__add_unique_targetkey_target_k.py
index 7fddc0fca..7fddc0fca 100644
--- a/ishtar_common/migrations/0030_auto__del_unique_targetkey_target_value__add_unique_targetkey_target_k.py
+++ b/ishtar_common/migrations/0031_auto__del_unique_targetkey_target_value__add_unique_targetkey_target_k.py
diff --git a/ishtar_common/migrations/0031_auto__add_field_importercolumn_description.py b/ishtar_common/migrations/0032_auto__add_state__chg_field_sourcetype_txt_idx__chg_field_authortype_tx.py
index b4d26bf9c..87b218cb3 100644
--- a/ishtar_common/migrations/0031_auto__add_field_importercolumn_description.py
+++ b/ishtar_common/migrations/0032_auto__add_state__chg_field_sourcetype_txt_idx__chg_field_authortype_tx.py
@@ -8,17 +8,70 @@ from django.db import models
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
+        # Adding model 'State'
+        db.create_table('ishtar_common_state', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('label', self.gf('django.db.models.fields.CharField')(max_length=30)),
+            ('number', self.gf('django.db.models.fields.CharField')(unique=True, max_length=3)),
+        ))
+        db.send_create_signal('ishtar_common', ['State'])
+
+
+        # Changing field 'SourceType.txt_idx'
+        db.alter_column('ishtar_common_sourcetype', 'txt_idx', self.gf('django.db.models.fields.CharField')(unique=True, max_length=100))
+
+        # Changing field 'AuthorType.txt_idx'
+        db.alter_column('ishtar_common_authortype', 'txt_idx', self.gf('django.db.models.fields.CharField')(unique=True, max_length=100))
+
+        # Changing field 'PersonType.txt_idx'
+        db.alter_column('ishtar_common_persontype', 'txt_idx', self.gf('django.db.models.fields.CharField')(unique=True, max_length=100))
+        # Adding field 'Department.state'
+        db.add_column('ishtar_common_department', 'state',
+                      self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ishtar_common.State'], null=True, blank=True),
+                      keep_default=False)
+
+
+        # Changing field 'OrganizationType.txt_idx'
+        db.alter_column('ishtar_common_organizationtype', 'txt_idx', self.gf('django.db.models.fields.CharField')(unique=True, max_length=100))
         # Adding field 'ImporterColumn.description'
         db.add_column('ishtar_common_importercolumn', 'description',
                       self.gf('django.db.models.fields.TextField')(null=True, blank=True),
                       keep_default=False)
 
+        # Changing field 'SupportType.txt_idx'
+        db.alter_column('ishtar_common_supporttype', 'txt_idx', self.gf('django.db.models.fields.CharField')(unique=True, max_length=100))
 
+        # Changing field 'Format.txt_idx'
+        db.alter_column('ishtar_common_format', 'txt_idx', self.gf('django.db.models.fields.CharField')(unique=True, max_length=100))
     def backwards(self, orm):
+        # Deleting model 'State'
+        db.delete_table('ishtar_common_state')
+
+
+        # Changing field 'SourceType.txt_idx'
+        db.alter_column('ishtar_common_sourcetype', 'txt_idx', self.gf('django.db.models.fields.CharField')(max_length=30, unique=True))
+
+        # Changing field 'AuthorType.txt_idx'
+        db.alter_column('ishtar_common_authortype', 'txt_idx', self.gf('django.db.models.fields.CharField')(max_length=30, unique=True))
+
+        # Changing field 'PersonType.txt_idx'
+        db.alter_column('ishtar_common_persontype', 'txt_idx', self.gf('django.db.models.fields.CharField')(max_length=30, unique=True))
+        # Deleting field 'Department.state'
+        db.delete_column('ishtar_common_department', 'state_id')
+
+
+        # Changing field 'OrganizationType.txt_idx'
+        db.alter_column('ishtar_common_organizationtype', 'txt_idx', self.gf('django.db.models.fields.CharField')(max_length=30, unique=True))
         # Deleting field 'ImporterColumn.description'
         db.delete_column('ishtar_common_importercolumn', 'description')
 
 
+        # Changing field 'SupportType.txt_idx'
+        db.alter_column('ishtar_common_supporttype', 'txt_idx', self.gf('django.db.models.fields.CharField')(max_length=30, unique=True))
+
+        # Changing field 'Format.txt_idx'
+        db.alter_column('ishtar_common_format', 'txt_idx', self.gf('django.db.models.fields.CharField')(max_length=30, unique=True))
+
     models = {
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -74,7 +127,7 @@ class Migration(SchemaMigration):
             'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
         },
         'ishtar_common.canton': {
             'Meta': {'object_name': 'Canton'},
@@ -86,7 +139,8 @@ class Migration(SchemaMigration):
             'Meta': {'ordering': "['number']", 'object_name': 'Department'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
-            'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'})
+            'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'}),
+            'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.State']", 'null': 'True', 'blank': 'True'})
         },
         'ishtar_common.documenttemplate': {
             'Meta': {'ordering': "['associated_object_name', 'name']", 'object_name': 'DocumentTemplate'},
@@ -102,7 +156,7 @@ class Migration(SchemaMigration):
             'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
         },
         'ishtar_common.formatertype': {
             'Meta': {'ordering': "('formater_type', 'options')", 'unique_together': "(('formater_type', 'options', 'many_split'),)", 'object_name': 'FormaterType'},
@@ -237,7 +291,7 @@ class Migration(SchemaMigration):
             'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
         },
         'ishtar_common.person': {
             'Meta': {'object_name': 'Person'},
@@ -270,7 +324,7 @@ class Migration(SchemaMigration):
             'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
         },
         'ishtar_common.regexp': {
             'Meta': {'object_name': 'Regexp'},
@@ -285,7 +339,13 @@ class Migration(SchemaMigration):
             'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'ishtar_common.state': {
+            'Meta': {'ordering': "['number']", 'object_name': 'State'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'})
         },
         'ishtar_common.supporttype': {
             'Meta': {'object_name': 'SupportType'},
@@ -293,7 +353,7 @@ class Migration(SchemaMigration):
             'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
         },
         'ishtar_common.targetkey': {
             'Meta': {'unique_together': "(('target', 'key'),)", 'object_name': 'TargetKey'},
@@ -315,4 +375,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['ishtar_common']
\ No newline at end of file
+    complete_apps = ['ishtar_common']