* Relax some constraints on the state and country and rebuild migrati…

…ons.

django_kala/accounts/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2017-04-06 03:52
+# Generated by Django 1.11 on 2017-04-10 06:02
 from __future__ import unicode_literals
 
 import django.contrib.auth.models
@@ -53,8 +53,8 @@ class Migration(migrations.Migration):
                 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
             ],
             options={
-                'ordering': ['first_name', 'last_name'],
                 'db_table': 'kala_person',
+                'ordering': ['first_name', 'last_name'],
             },
             managers=[
                 ('objects', django.contrib.auth.models.UserManager()),

django_kala/companies/migrations/0001_initial.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2017-04-06 03:52
+# Generated by Django 1.11 on 2017-04-10 06:02
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-import django_countries.fields
 import django_localflavor_us.models
 import timezone_field.fields
 import uuid
@@ -26,9 +25,9 @@ class Migration(migrations.Migration):
                 ('address', models.CharField(blank=True, max_length=255, null=True)),
                 ('address1', models.CharField(blank=True, max_length=255, null=True)),
                 ('city', models.CharField(blank=True, max_length=255, null=True)),
-                ('state', django_localflavor_us.models.USStateField(blank=True, choices=[('AL', 'Alabama'), ('AK', 'Alaska'), ('AS', 'American Samoa'), ('AZ', 'Arizona'), ('AR', 'Arkansas'), ('AA', 'Armed Forces Americas'), ('AE', 'Armed Forces Europe'), ('AP', 'Armed Forces Pacific'), ('CA', 'California'), ('CO', 'Colorado'), ('CT', 'Connecticut'), ('DE', 'Delaware'), ('DC', 'District of Columbia'), ('FL', 'Florida'), ('GA', 'Georgia'), ('GU', 'Guam'), ('HI', 'Hawaii'), ('ID', 'Idaho'), ('IL', 'Illinois'), ('IN', 'Indiana'), ('IA', 'Iowa'), ('KS', 'Kansas'), ('KY', 'Kentucky'), ('LA', 'Louisiana'), ('ME', 'Maine'), ('MD', 'Maryland'), ('MA', 'Massachusetts'), ('MI', 'Michigan'), ('MN', 'Minnesota'), ('MS', 'Mississippi'), ('MO', 'Missouri'), ('MT', 'Montana'), ('NE', 'Nebraska'), ('NV', 'Nevada'), ('NH', 'New Hampshire'), ('NJ', 'New Jersey'), ('NM', 'New Mexico'), ('NY', 'New York'), ('NC', 'North Carolina'), ('ND', 'North Dakota'), ('MP', 'Northern Mariana Islands'), ('OH', 'Ohio'), ('OK', 'Oklahoma'), ('OR', 'Oregon'), ('PA', 'Pennsylvania'), ('PR', 'Puerto Rico'), ('RI', 'Rhode Island'), ('SC', 'South Carolina'), ('SD', 'South Dakota'), ('TN', 'Tennessee'), ('TX', 'Texas'), ('UT', 'Utah'), ('VT', 'Vermont'), ('VI', 'Virgin Islands'), ('VA', 'Virginia'), ('WA', 'Washington'), ('WV', 'West Virginia'), ('WI', 'Wisconsin'), ('WY', 'Wyoming')], max_length=2, null=True)),
+                ('state', models.CharField(blank=True, max_length=80, null=True)),
                 ('zip', models.CharField(blank=True, max_length=25, null=True)),
-                ('country', django_countries.fields.CountryField(default='US', max_length=2)),
+                ('country', models.CharField(blank=True, default='US', max_length=80, null=True)),
                 ('fax', django_localflavor_us.models.PhoneNumberField(blank=True, max_length=20, null=True)),
                 ('phone', django_localflavor_us.models.PhoneNumberField(blank=True, max_length=20, null=True)),
                 ('locale', models.CharField(blank=True, default='en', max_length=2, null=True)),
@@ -38,8 +37,8 @@ class Migration(migrations.Migration):
                 ('is_active', models.BooleanField(default=True)),
             ],
             options={
-                'ordering': ['name'],
                 'db_table': 'kala_companies',
+                'ordering': ['name'],
             },
         ),
     ]

django_kala/companies/models.py

@@ -25,9 +25,9 @@ class Company(models.Model):
     address = models.CharField(max_length=255, null=True, blank=True)
     address1 = models.CharField(max_length=255, null=True, blank=True)
     city = models.CharField(max_length=255, null=True, blank=True)
-    state = USStateField(null=True, blank=True)
+    state = models.CharField(null=True, blank=True, max_length=80)
     zip = models.CharField(max_length=25, null=True, blank=True)
-    country = CountryField(default='US')
+    country = models.CharField(default='US', null=True, blank=True, max_length=80)
     fax = PhoneNumberField(null=True, blank=True)
     phone = PhoneNumberField(null=True, blank=True)
     locale = models.CharField(max_length=2, null=True, blank=True, default='en')

django_kala/documents/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2017-04-06 03:52
+# Generated by Django 1.11 on 2017-04-10 06:02
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -31,8 +31,8 @@ class Migration(migrations.Migration):
                 ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='projects.Project')),
             ],
             options={
-                'ordering': ['-date', 'name'],
                 'db_table': 'kala_documents',
+                'ordering': ['-date', 'name'],
             },
         ),
         migrations.CreateModel(
@@ -52,8 +52,8 @@ class Migration(migrations.Migration):
             ],
             options={
                 'db_table': 'kala_document_version',
-                'ordering': ['name', 'created'],
                 'get_latest_by': 'created',
+                'ordering': ['name', 'created'],
             },
         ),
     ]

django_kala/projects/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2017-04-06 03:52
+# Generated by Django 1.11 on 2017-04-10 06:02
 from __future__ import unicode_literals
 
 from django.conf import settings