6 files changed, 4 insertions, 96 deletions
diff --git a/ctrack/users/migrations/0001_initial.py b/ctrack/users/migrations/0001_initial.py
index 2f760c2..df3cd12 100644
--- a/ctrack/users/migrations/0001_initial.py
+++ b/ctrack/users/migrations/0001_initial.py
@@ -1,8 +1,9 @@
-# Generated by Django 2.2.9 on 2020-04-03 14:07
+# Generated by Django 2.2.12 on 2020-08-27 12:44
 
 import django.contrib.auth.models
 import django.contrib.auth.validators
 from django.db import migrations, models
+import django.db.models.deletion
 import django.utils.timezone
 
 
@@ -11,6 +12,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('organisations', '0001_initial'),
         ('auth', '0011_update_proxy_permissions'),
     ]
 
@@ -31,6 +33,7 @@ class Migration(migrations.Migration):
                 ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
                 ('name', models.CharField(blank=True, max_length=255, verbose_name='Name of User')),
                 ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
+                ('stakeholder', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organisations.Stakeholder')),
                 ('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={
diff --git a/ctrack/users/migrations/0002_user_is_person.py b/ctrack/users/migrations/0002_user_is_person.py
deleted file mode 100644
index 2223429..0000000
--- a/ctrack/users/migrations/0002_user_is_person.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.0.5 on 2020-05-22 15:19
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='is_person',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/ctrack/users/migrations/0003_auto_20200522_1527.py b/ctrack/users/migrations/0003_auto_20200522_1527.py
deleted file mode 100644
index dc4f7c1..0000000
--- a/ctrack/users/migrations/0003_auto_20200522_1527.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.0.5 on 2020-05-22 15:27
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0002_user_is_person'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='user',
-            old_name='is_person',
-            new_name='oes_user',
-        ),
-    ]
diff --git a/ctrack/users/migrations/0004_auto_20200524_1945.py b/ctrack/users/migrations/0004_auto_20200524_1945.py
deleted file mode 100644
index 8839fd2..0000000
--- a/ctrack/users/migrations/0004_auto_20200524_1945.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 3.0.5 on 2020-05-24 19:45
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0003_auto_20200522_1527'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='UserProfile',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-            ],
-        ),
-        migrations.RemoveField(
-            model_name='user',
-            name='oes_user',
-        ),
-    ]
diff --git a/ctrack/users/migrations/0005_delete_userprofile.py b/ctrack/users/migrations/0005_delete_userprofile.py
deleted file mode 100644
index 42f62bb..0000000
--- a/ctrack/users/migrations/0005_delete_userprofile.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated by Django 3.0.5 on 2020-05-25 14:41
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0004_auto_20200524_1945'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='UserProfile',
-        ),
-    ]
diff --git a/ctrack/users/migrations/0006_user_stakeholder.py b/ctrack/users/migrations/0006_user_stakeholder.py
deleted file mode 100644
index d8a3089..0000000
--- a/ctrack/users/migrations/0006_user_stakeholder.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 3.0.5 on 2020-05-25 15:02
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organisations', '0005_auto_20200525_1502'),
-        ('users', '0005_delete_userprofile'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='stakeholder',
-            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organisations.Stakeholder'),
-        ),
-    ]