Remove all old migrations and start fresh. Re-arranged models to better fit Invoice model

9 files changed, 82 insertions, 196 deletions

diff --git a/app/dispatch/migrations/0001_initial.py b/app/dispatch/migrations/0001_initial.py
index 500e6ea..05c6c7d 100644
--- a/app/dispatch/migrations/0001_initial.py
+++ b/app/dispatch/migrations/0001_initial.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-10-20 00:51
+# Generated by Django 1.11.5 on 2017-10-24 22:53
 from __future__ import unicode_literals
 
-import dispatch.models
+import dispatch.misc
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
@@ -29,6 +29,42 @@ class Migration(migrations.Migration):
             ],
         ),
         migrations.CreateModel(
+            name='Identity',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=256)),
+                ('address', models.CharField(max_length=256)),
+                ('city', models.CharField(max_length=256)),
+                ('state', models.CharField(max_length=256)),
+                ('zip_code', models.CharField(max_length=256)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, unique=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Invoice',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('invoice_id', models.IntegerField()),
+                ('invoice_date', models.DateField()),
+                ('due_date', models.DateField()),
+                ('paid', models.BooleanField(default=False)),
+                ('bill_to', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bill_to', to='dispatch.Identity')),
+                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='owner', to='dispatch.Identity')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='InvoiceItem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateField()),
+                ('description', models.CharField(max_length=256)),
+                ('quantity', models.IntegerField()),
+                ('amount', models.DecimalField(decimal_places=2, max_digits=19)),
+                ('invoice', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Invoice')),
+            ],
+        ),
+        migrations.CreateModel(
             name='Load',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
@@ -45,8 +81,24 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('description', models.CharField(max_length=256)),
-                ('document', models.FileField(upload_to=dispatch.models.paperwork_user_directory_path)),
+                ('document', models.FileField(upload_to=dispatch.misc.paperwork_user_directory_path)),
                 ('load', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Load')),
             ],
         ),
+        migrations.CreateModel(
+            name='Settings',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('key', models.CharField(max_length=256)),
+                ('value', models.CharField(max_length=256)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='UserInvoiceNumber',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('number', models.IntegerField(default=1200)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, unique=True)),
+            ],
+        ),
     ]
diff --git a/app/dispatch/migrations/0002_auto_20171024_2255.py b/app/dispatch/migrations/0002_auto_20171024_2255.py
new file mode 100644
index 0000000..bbf96d4
--- /dev/null
+++ b/app/dispatch/migrations/0002_auto_20171024_2255.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-10-24 22:55
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dispatch', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='identity',
+            name='user',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='userinvoicenumber',
+            name='user',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/app/dispatch/migrations/0002_owner.py b/app/dispatch/migrations/0002_owner.py
deleted file mode 100644
index 689ca6b..0000000
--- a/app/dispatch/migrations/0002_owner.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-10-23 19:14
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dispatch', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Owner',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=256)),
-                ('address', models.CharField(max_length=256)),
-                ('city', models.CharField(max_length=256)),
-                ('state', models.CharField(max_length=256)),
-                ('zip_code', models.CharField(max_length=256)),
-            ],
-        ),
-    ]
diff --git a/app/dispatch/migrations/0003_settings.py b/app/dispatch/migrations/0003_settings.py
deleted file mode 100644
index 3043e2d..0000000
--- a/app/dispatch/migrations/0003_settings.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-10-23 19:19
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dispatch', '0002_owner'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Settings',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('key', models.CharField(max_length=256)),
-                ('value', models.CharField(max_length=256)),
-            ],
-        ),
-    ]
diff --git a/app/dispatch/migrations/0004_auto_20171023_2032.py b/app/dispatch/migrations/0004_auto_20171023_2032.py
deleted file mode 100644
index 59219bc..0000000
--- a/app/dispatch/migrations/0004_auto_20171023_2032.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-10-23 20:32
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('dispatch', '0003_settings'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Invoice',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='InvoiceItem',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('description', models.CharField(max_length=256)),
-                ('quantity', models.IntegerField()),
-                ('amount', models.DecimalField(decimal_places=2, max_digits=19)),
-                ('invoice', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Invoice')),
-            ],
-        ),
-        migrations.RenameModel(
-            old_name='Owner',
-            new_name='Identity',
-        ),
-        migrations.AddField(
-            model_name='invoice',
-            name='bill_to',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bill_to', to='dispatch.Identity'),
-        ),
-        migrations.AddField(
-            model_name='invoice',
-            name='owner',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='owner', to='dispatch.Identity'),
-        ),
-        migrations.AddField(
-            model_name='invoice',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/app/dispatch/migrations/0005_invoice_invoice_id.py b/app/dispatch/migrations/0005_invoice_invoice_id.py
deleted file mode 100644
index 23b7c49..0000000
--- a/app/dispatch/migrations/0005_invoice_invoice_id.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-10-23 20:36
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dispatch', '0004_auto_20171023_2032'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='invoice',
-            name='invoice_id',
-            field=models.IntegerField(default=0),
-            preserve_default=False,
-        ),
-    ]
diff --git a/app/dispatch/migrations/0006_auto_20171023_2049.py b/app/dispatch/migrations/0006_auto_20171023_2049.py
deleted file mode 100644
index 04668ff..0000000
--- a/app/dispatch/migrations/0006_auto_20171023_2049.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-10-23 20:49
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dispatch', '0005_invoice_invoice_id'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='invoice',
-            name='due_date',
-            field=models.DateField(default=django.utils.timezone.now),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='invoice',
-            name='invoice_date',
-            field=models.DateField(default=django.utils.timezone.now),
-            preserve_default=False,
-        ),
-    ]
diff --git a/app/dispatch/migrations/0007_invoice_paid.py b/app/dispatch/migrations/0007_invoice_paid.py
deleted file mode 100644
index d8fcd81..0000000
--- a/app/dispatch/migrations/0007_invoice_paid.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-10-24 14:20
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dispatch', '0006_auto_20171023_2049'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='invoice',
-            name='paid',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/app/dispatch/migrations/0008_invoiceitem_date.py b/app/dispatch/migrations/0008_invoiceitem_date.py
deleted file mode 100644
index 892adfe..0000000
--- a/app/dispatch/migrations/0008_invoiceitem_date.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-10-24 15:02
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dispatch', '0007_invoice_paid'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='invoiceitem',
-            name='date',
-            field=models.DateField(default=django.utils.timezone.now),
-            preserve_default=False,
-        ),
-    ]