1 files changed, 7 insertions, 6 deletions
diff --git a/app/dispatch/models.py b/app/dispatch/models.py
index 21c06e0..fe0cdb3 100644
--- a/app/dispatch/models.py
+++ b/app/dispatch/models.py
@@ -2,15 +2,16 @@ from django.db import models
 from django.conf import settings
 from auditlog.registry import auditlog
 from auditlog.models import AuditlogHistoryField
-from django.contrib.auth.models import User
+# from django.contrib.auth import get_user_model
 from datetime import datetime
 from django.core.exceptions import ObjectDoesNotExist
 from .misc import get_week_dates, paperwork_user_directory_path
-
-from . import monkey_patch
+from django.core.urlresolvers import reverse
 
 # Create your models here.
 
+
+
 class Customer(models.Model):
     history         = AuditlogHistoryField()
     name            = models.CharField(max_length=256)
@@ -50,7 +51,7 @@ class Paperwork(models.Model):
 
 
 class Identity(models.Model):
-    user        = models.OneToOneField(User, on_delete=models.CASCADE)
+    user        = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     name        = models.CharField(max_length=256)
     address     = models.CharField(max_length=256)
     city        = models.CharField(max_length=256)
@@ -81,14 +82,14 @@ class Settings(models.Model):
 
 
 class UserInvoiceNumber(models.Model):
-    user        = models.OneToOneField(User, on_delete=models.CASCADE)
+    user        = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     number      = models.IntegerField(default=1200)
 
     def get_absolute_url(self):
         return '/drivers/view/{:d}'.format(self.user.pk)
 
 class Invoice(models.Model):
-    user            = models.ForeignKey(User, on_delete=models.CASCADE)
+    user            = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     owner           = models.ForeignKey(Identity, on_delete=models.CASCADE, related_name="owner")
     bill_to         = models.ForeignKey(Identity, on_delete=models.CASCADE, related_name="bill_to")
     invoice_id      = models.IntegerField()