Quellcode durchsuchen

Make migrations work with custom user model

master
Sebastian Vetter vor 12 Jahren
Ursprung
Commit
cb0ccac6ca
44 geänderte Dateien mit 263 neuen und 211 gelöschten Zeilen
  1. 5
    4
      oscar/apps/address/migrations/0001_initial.py
  2. 5
    4
      oscar/apps/address/migrations/0002_auto__chg_field_useraddress_postcode.py
  3. 5
    4
      oscar/apps/address/migrations/0003_auto__add_field_country_display_order.py
  4. 4
    3
      oscar/apps/address/migrations/0004_convert_is_highlighted.py
  5. 5
    4
      oscar/apps/address/migrations/0005_auto__del_field_country_is_highlighted.py
  6. 5
    4
      oscar/apps/address/migrations/0006_auto__add_unique_useraddress_hash_user.py
  7. 5
    4
      oscar/apps/address/migrations/0007_auto__chg_field_useraddress_postcode.py
  8. 9
    8
      oscar/apps/analytics/migrations/0001_initial.py
  9. 5
    4
      oscar/apps/basket/migrations/0001_initial.py
  10. 4
    3
      oscar/apps/basket/migrations/0002_auto__add_field_line_price_incl_tax.py
  11. 4
    3
      oscar/apps/basket/migrations/0003_auto__add_field_line_price_excl_tax.py
  12. 8
    6
      oscar/apps/customer/migrations/0001_initial.py
  13. 9
    7
      oscar/apps/customer/migrations/0002_auto__add_notification.py
  14. 9
    7
      oscar/apps/customer/migrations/0003_auto__add_productalert.py
  15. 9
    6
      oscar/apps/customer/migrations/0004_auto__chg_field_communicationeventtype_email_subject_template.py
  16. 5
    4
      oscar/apps/dashboard/ranges/migrations/0001_initial.py
  17. 5
    4
      oscar/apps/dashboard/ranges/migrations/0002_auto__chg_field_rangeproductfileupload_error_message.py
  18. 8
    7
      oscar/apps/order/migrations/0001_initial.py
  19. 6
    5
      oscar/apps/order/migrations/0002_auto__add_field_order_guest_email.py
  20. 6
    5
      oscar/apps/order/migrations/0003_auto__del_field_ordernote_date__add_field_ordernote_date_created__add_.py
  21. 6
    5
      oscar/apps/order/migrations/0004_auto__add_field_line_upc.py
  22. 6
    5
      oscar/apps/order/migrations/0005_auto__add_field_orderdiscount_offer_name.py
  23. 6
    5
      oscar/apps/order/migrations/0006_update_offer_name_field.py
  24. 7
    6
      oscar/apps/order/migrations/0007_auto__add_field_orderdiscount_frequency.py
  25. 7
    6
      oscar/apps/order/migrations/0008_auto__add_field_orderdiscount_category.py
  26. 7
    6
      oscar/apps/order/migrations/0009_auto__add_field_orderdiscount_message.py
  27. 7
    6
      oscar/apps/order/migrations/0010_auto__chg_field_billingaddress_postcode__chg_field_shippingaddress_pos.py
  28. 6
    5
      oscar/apps/order/migrations/0011_auto__del_field_paymentevent_date__add_field_paymentevent_date_created.py
  29. 7
    6
      oscar/apps/order/migrations/0012_auto__add_field_paymentevent_reference.py
  30. 7
    6
      oscar/apps/order/migrations/0013_auto__add_field_paymentevent_shipping_event.py
  31. 7
    6
      oscar/apps/order/migrations/0014_auto__chg_field_billingaddress_postcode__chg_field_shippingaddress_pos.py
  32. 5
    4
      oscar/apps/order/migrations/0015_auto__del_field_shippingeventtype_is_required__del_field_shippingevent.py
  33. 5
    4
      oscar/apps/partner/migrations/0001_initial.py
  34. 4
    3
      oscar/apps/partner/migrations/0002_auto__add_stockalert__add_abstractstockalert__add_field_stockrecord_lo.py
  35. 4
    3
      oscar/apps/partner/migrations/0003_auto__add_unique_stockrecord_partner_partner_sku.py
  36. 5
    4
      oscar/apps/partner/migrations/0004_auto__add_field_partner_code.py
  37. 4
    3
      oscar/apps/partner/migrations/0005_populate_slugs.py
  38. 5
    4
      oscar/apps/partner/migrations/0006_auto__add_unique_partner_code.py
  39. 5
    4
      oscar/apps/partner/migrations/0007_auto__chg_field_partner_name__del_unique_partner_name.py
  40. 4
    3
      oscar/apps/partner/migrations/0008_auto__del_abstractstockalert__del_field_stockalert_abstractstockalert_.py
  41. 3
    2
      oscar/apps/partner/migrations/0009_auto__add_partneraddress.py
  42. 9
    6
      oscar/apps/payment/migrations/0001_initial.py
  43. 7
    5
      oscar/apps/payment/migrations/0002_auto__chg_field_source_reference__chg_field_source_label__chg_field_tr.py
  44. 9
    8
      oscar/apps/voucher/migrations/0001_initial.py

+ 5
- 4
oscar/apps/address/migrations/0001_initial.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(SchemaMigration):
8 9
 
@@ -24,7 +25,7 @@ class Migration(SchemaMigration):
24 25
             ('search_text', self.gf('django.db.models.fields.CharField')(max_length=1000)),
25 26
             ('phone_number', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
26 27
             ('notes', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
27
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='addresses', to=orm['auth.User'])),
28
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='addresses', to=orm[AUTH_USER_MODEL])),
28 29
             ('is_default_for_shipping', self.gf('django.db.models.fields.BooleanField')(default=False)),
29 30
             ('is_default_for_billing', self.gf('django.db.models.fields.BooleanField')(default=False)),
30 31
             ('num_orders', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
@@ -87,7 +88,7 @@ class Migration(SchemaMigration):
87 88
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
88 89
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
89 90
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
90
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['auth.User']"})
91
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
91 92
         },
92 93
         'auth.group': {
93 94
             'Meta': {'object_name': 'Group'},
@@ -102,8 +103,8 @@ class Migration(SchemaMigration):
102 103
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
103 104
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
104 105
         },
105
-        'auth.user': {
106
-            'Meta': {'object_name': 'User'},
106
+        AUTH_USER_MODEL: {
107
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
107 108
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
108 109
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
109 110
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),

+ 5
- 4
oscar/apps/address/migrations/0002_auto__chg_field_useraddress_postcode.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -49,7 +50,7 @@ class Migration(SchemaMigration):
49 50
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
50 51
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
51 52
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
52
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['auth.User']"})
53
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
53 54
         },
54 55
         'auth.group': {
55 56
             'Meta': {'object_name': 'Group'},
@@ -64,8 +65,8 @@ class Migration(SchemaMigration):
64 65
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
65 66
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
66 67
         },
67
-        'auth.user': {
68
-            'Meta': {'object_name': 'User'},
68
+        AUTH_USER_MODEL: {
69
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
69 70
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
70 71
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
71 72
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -89,4 +90,4 @@ class Migration(SchemaMigration):
89 90
         }
90 91
     }
91 92
 
92
-    complete_apps = ['address']
93
+    complete_apps = ['address']

+ 5
- 4
oscar/apps/address/migrations/0003_auto__add_field_country_display_order.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -52,7 +53,7 @@ class Migration(SchemaMigration):
52 53
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
53 54
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
54 55
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
55
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['auth.User']"})
56
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
56 57
         },
57 58
         'auth.group': {
58 59
             'Meta': {'object_name': 'Group'},
@@ -67,8 +68,8 @@ class Migration(SchemaMigration):
67 68
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
68 69
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
69 70
         },
70
-        'auth.user': {
71
-            'Meta': {'object_name': 'User'},
71
+        AUTH_USER_MODEL: {
72
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
72 73
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
73 74
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
74 75
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -92,4 +93,4 @@ class Migration(SchemaMigration):
92 93
         }
93 94
     }
94 95
 
95
-    complete_apps = ['address']
96
+    complete_apps = ['address']

+ 4
- 3
oscar/apps/address/migrations/0004_convert_is_highlighted.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import DataMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(DataMigration):
8 9
 
@@ -49,7 +50,7 @@ class Migration(DataMigration):
49 50
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
50 51
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
51 52
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
52
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['auth.User']"})
53
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
53 54
         },
54 55
         'auth.group': {
55 56
             'Meta': {'object_name': 'Group'},
@@ -64,8 +65,8 @@ class Migration(DataMigration):
64 65
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
65 66
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
66 67
         },
67
-        'auth.user': {
68
-            'Meta': {'object_name': 'User'},
68
+        AUTH_USER_MODEL: {
69
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
69 70
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
70 71
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
71 72
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),

+ 5
- 4
oscar/apps/address/migrations/0005_auto__del_field_country_is_highlighted.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -51,7 +52,7 @@ class Migration(SchemaMigration):
51 52
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
52 53
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
53 54
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
54
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['auth.User']"})
55
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
55 56
         },
56 57
         'auth.group': {
57 58
             'Meta': {'object_name': 'Group'},
@@ -66,8 +67,8 @@ class Migration(SchemaMigration):
66 67
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
67 68
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
68 69
         },
69
-        'auth.user': {
70
-            'Meta': {'object_name': 'User'},
70
+        AUTH_USER_MODEL: {
71
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
71 72
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
72 73
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
73 74
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -91,4 +92,4 @@ class Migration(SchemaMigration):
91 92
         }
92 93
     }
93 94
 
94
-    complete_apps = ['address']
95
+    complete_apps = ['address']

+ 5
- 4
oscar/apps/address/migrations/0006_auto__add_unique_useraddress_hash_user.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -49,7 +50,7 @@ class Migration(SchemaMigration):
49 50
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
50 51
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
51 52
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
52
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['auth.User']"})
53
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
53 54
         },
54 55
         'auth.group': {
55 56
             'Meta': {'object_name': 'Group'},
@@ -64,8 +65,8 @@ class Migration(SchemaMigration):
64 65
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
65 66
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
66 67
         },
67
-        'auth.user': {
68
-            'Meta': {'object_name': 'User'},
68
+        AUTH_USER_MODEL: {
69
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
69 70
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
70 71
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
71 72
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -89,4 +90,4 @@ class Migration(SchemaMigration):
89 90
         }
90 91
     }
91 92
 
92
-    complete_apps = ['address']
93
+    complete_apps = ['address']

+ 5
- 4
oscar/apps/address/migrations/0007_auto__chg_field_useraddress_postcode.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -49,7 +50,7 @@ class Migration(SchemaMigration):
49 50
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
50 51
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
51 52
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
52
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': u"orm['auth.User']"})
53
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': u"orm['{0}']".format(AUTH_USER_MODEL)})
53 54
         },
54 55
         u'auth.group': {
55 56
             'Meta': {'object_name': 'Group'},
@@ -64,8 +65,8 @@ class Migration(SchemaMigration):
64 65
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
65 66
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
66 67
         },
67
-        u'auth.user': {
68
-            'Meta': {'object_name': 'User'},
68
+        AUTH_USER_MODEL: {
69
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
69 70
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
70 71
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
71 72
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -89,4 +90,4 @@ class Migration(SchemaMigration):
89 90
         }
90 91
     }
91 92
 
92
-    complete_apps = ['address']
93
+    complete_apps = ['address']

+ 9
- 8
oscar/apps/analytics/migrations/0001_initial.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(SchemaMigration):
8 9
     depends_on = (
@@ -26,7 +27,7 @@ class Migration(SchemaMigration):
26 27
         # Adding model 'UserRecord'
27 28
         db.create_table('analytics_userrecord', (
28 29
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
29
-            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)),
30
+            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm[AUTH_USER_MODEL], unique=True)),
30 31
             ('num_product_views', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
31 32
             ('num_basket_additions', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
32 33
             ('num_orders', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
@@ -40,7 +41,7 @@ class Migration(SchemaMigration):
40 41
         # Adding model 'UserProductView'
41 42
         db.create_table('analytics_userproductview', (
42 43
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
43
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
44
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[AUTH_USER_MODEL])),
44 45
             ('product', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Product'])),
45 46
             ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
46 47
         ))
@@ -49,7 +50,7 @@ class Migration(SchemaMigration):
49 50
         # Adding model 'UserSearch'
50 51
         db.create_table('analytics_usersearch', (
51 52
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
52
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
53
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[AUTH_USER_MODEL])),
53 54
             ('query', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
54 55
             ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
55 56
         ))
@@ -86,7 +87,7 @@ class Migration(SchemaMigration):
86 87
             'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
87 88
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
88 89
             'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
89
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
90
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL)})
90 91
         },
91 92
         'analytics.userrecord': {
92 93
             'Meta': {'object_name': 'UserRecord'},
@@ -98,14 +99,14 @@ class Migration(SchemaMigration):
98 99
             'num_orders': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'}),
99 100
             'num_product_views': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
100 101
             'total_spent': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '12', 'decimal_places': '2'}),
101
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
102
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'unique': 'True'})
102 103
         },
103 104
         'analytics.usersearch': {
104 105
             'Meta': {'object_name': 'UserSearch'},
105 106
             'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
106 107
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
107 108
             'query': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
108
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
109
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL)})
109 110
         },
110 111
         'auth.group': {
111 112
             'Meta': {'object_name': 'Group'},
@@ -120,8 +121,8 @@ class Migration(SchemaMigration):
120 121
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
121 122
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
122 123
         },
123
-        'auth.user': {
124
-            'Meta': {'object_name': 'User'},
124
+        AUTH_USER_MODEL: {
125
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
125 126
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
126 127
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
127 128
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),

+ 5
- 4
oscar/apps/basket/migrations/0001_initial.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(SchemaMigration):
8 9
     depends_on = (
@@ -16,7 +17,7 @@ class Migration(SchemaMigration):
16 17
         # Adding model 'Basket'
17 18
         db.create_table('basket_basket', (
18 19
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
19
-            ('owner', self.gf('django.db.models.fields.related.ForeignKey')(related_name='baskets', null=True, to=orm['auth.User'])),
20
+            ('owner', self.gf('django.db.models.fields.related.ForeignKey')(related_name='baskets', null=True, to=orm[AUTH_USER_MODEL])),
20 21
             ('status', self.gf('django.db.models.fields.CharField')(default='Open', max_length=128)),
21 22
             ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
22 23
             ('date_merged', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
@@ -88,8 +89,8 @@ class Migration(SchemaMigration):
88 89
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
89 90
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
90 91
         },
91
-        'auth.user': {
92
-            'Meta': {'object_name': 'User'},
92
+        AUTH_USER_MODEL: {
93
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
93 94
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
94 95
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
95 96
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -110,7 +111,7 @@ class Migration(SchemaMigration):
110 111
             'date_merged': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
111 112
             'date_submitted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
112 113
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
113
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'baskets'", 'null': 'True', 'to': "orm['auth.User']"}),
114
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'baskets'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)}),
114 115
             'status': ('django.db.models.fields.CharField', [], {'default': "'Open'", 'max_length': '128'}),
115 116
             'vouchers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['voucher.Voucher']", 'null': 'True', 'symmetrical': 'False'})
116 117
         },

+ 4
- 3
oscar/apps/basket/migrations/0002_auto__add_field_line_price_incl_tax.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(SchemaMigration):
8 9
 
@@ -32,8 +33,8 @@ class Migration(SchemaMigration):
32 33
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
33 34
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
34 35
         },
35
-        'auth.user': {
36
-            'Meta': {'object_name': 'User'},
36
+        AUTH_USER_MODEL: {
37
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
37 38
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
38 39
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
39 40
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -54,7 +55,7 @@ class Migration(SchemaMigration):
54 55
             'date_merged': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
55 56
             'date_submitted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
56 57
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
57
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'baskets'", 'null': 'True', 'to': "orm['auth.User']"}),
58
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'baskets'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)}),
58 59
             'status': ('django.db.models.fields.CharField', [], {'default': "'Open'", 'max_length': '128'}),
59 60
             'vouchers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['voucher.Voucher']", 'null': 'True', 'symmetrical': 'False'})
60 61
         },

+ 4
- 3
oscar/apps/basket/migrations/0003_auto__add_field_line_price_excl_tax.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(SchemaMigration):
8 9
 
@@ -32,8 +33,8 @@ class Migration(SchemaMigration):
32 33
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
33 34
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
34 35
         },
35
-        'auth.user': {
36
-            'Meta': {'object_name': 'User'},
36
+        AUTH_USER_MODEL: {
37
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
37 38
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
38 39
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
39 40
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -54,7 +55,7 @@ class Migration(SchemaMigration):
54 55
             'date_merged': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
55 56
             'date_submitted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
56 57
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
57
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'baskets'", 'null': 'True', 'to': "orm['auth.User']"}),
58
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'baskets'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)}),
58 59
             'status': ('django.db.models.fields.CharField', [], {'default': "'Open'", 'max_length': '128'}),
59 60
             'vouchers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['voucher.Voucher']", 'null': 'True', 'symmetrical': 'False'})
60 61
         },

+ 8
- 6
oscar/apps/customer/migrations/0001_initial.py Datei anzeigen

@@ -4,14 +4,16 @@ from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6 6
 
7
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
8
+
7 9
 class Migration(SchemaMigration):
8 10
 
9 11
     def forwards(self, orm):
10
-        
12
+
11 13
         # Adding model 'Email'
12 14
         db.create_table('customer_email', (
13 15
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
14
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='emails', to=orm['auth.User'])),
16
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='emails', to=orm[AUTH_USER_MODEL])),
15 17
             ('subject', self.gf('django.db.models.fields.TextField')(max_length=255)),
16 18
             ('body_text', self.gf('django.db.models.fields.TextField')()),
17 19
             ('body_html', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
@@ -36,7 +38,7 @@ class Migration(SchemaMigration):
36 38
 
37 39
 
38 40
     def backwards(self, orm):
39
-        
41
+
40 42
         # Deleting model 'Email'
41 43
         db.delete_table('customer_email')
42 44
 
@@ -58,8 +60,8 @@ class Migration(SchemaMigration):
58 60
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
59 61
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
60 62
         },
61
-        'auth.user': {
62
-            'Meta': {'object_name': 'User'},
63
+        AUTH_USER_MODEL: {
64
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
63 65
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
64 66
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
65 67
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -101,7 +103,7 @@ class Migration(SchemaMigration):
101 103
             'date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
102 104
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
103 105
             'subject': ('django.db.models.fields.TextField', [], {'max_length': '255'}),
104
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'to': "orm['auth.User']"})
106
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
105 107
         }
106 108
     }
107 109
 

+ 9
- 7
oscar/apps/customer/migrations/0002_auto__add_notification.py Datei anzeigen

@@ -3,6 +3,8 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
7
+
6 8
 
7 9
 class Migration(SchemaMigration):
8 10
 
@@ -11,8 +13,8 @@ class Migration(SchemaMigration):
11 13
         # Adding model 'Notification'
12 14
         db.create_table('customer_notification', (
13 15
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
14
-            ('recipient', self.gf('django.db.models.fields.related.ForeignKey')(related_name='notifications', to=orm['auth.User'])),
15
-            ('sender', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True)),
16
+            ('recipient', self.gf('django.db.models.fields.related.ForeignKey')(related_name='notifications', to=orm[AUTH_USER_MODEL])),
17
+            ('sender', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[AUTH_USER_MODEL], null=True)),
16 18
             ('subject', self.gf('django.db.models.fields.CharField')(max_length=255)),
17 19
             ('body', self.gf('django.db.models.fields.TextField')()),
18 20
             ('category', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)),
@@ -43,8 +45,8 @@ class Migration(SchemaMigration):
43 45
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
44 46
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
45 47
         },
46
-        'auth.user': {
47
-            'Meta': {'object_name': 'User'},
48
+        AUTH_USER_MODEL: {
49
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
48 50
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 14, 11, 35, 23, 997732)'}),
49 51
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
50 52
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -86,7 +88,7 @@ class Migration(SchemaMigration):
86 88
             'date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
87 89
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
88 90
             'subject': ('django.db.models.fields.TextField', [], {'max_length': '255'}),
89
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'to': "orm['auth.User']"})
91
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
90 92
         },
91 93
         'customer.notification': {
92 94
             'Meta': {'ordering': "('-date_sent',)", 'object_name': 'Notification'},
@@ -96,8 +98,8 @@ class Migration(SchemaMigration):
96 98
             'date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
97 99
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
98 100
             'location': ('django.db.models.fields.CharField', [], {'default': "'Inbox'", 'max_length': '32'}),
99
-            'recipient': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notifications'", 'to': "orm['auth.User']"}),
100
-            'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}),
101
+            'recipient': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notifications'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)}),
102
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'}),
101 103
             'subject': ('django.db.models.fields.CharField', [], {'max_length': '255'})
102 104
         }
103 105
     }

+ 9
- 7
oscar/apps/customer/migrations/0003_auto__add_productalert.py Datei anzeigen

@@ -3,6 +3,8 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
7
+
6 8
 
7 9
 class Migration(SchemaMigration):
8 10
 
@@ -16,7 +18,7 @@ class Migration(SchemaMigration):
16 18
         db.create_table('customer_productalert', (
17 19
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
18 20
             ('product', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Product'])),
19
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='alerts', null=True, to=orm['auth.User'])),
21
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='alerts', null=True, to=orm[AUTH_USER_MODEL])),
20 22
             ('email', self.gf('django.db.models.fields.EmailField')(db_index=True, max_length=75, null=True, blank=True)),
21 23
             ('key', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, db_index=True)),
22 24
             ('status', self.gf('django.db.models.fields.CharField')(default='Active', max_length=20)),
@@ -48,8 +50,8 @@ class Migration(SchemaMigration):
48 50
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
49 51
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
50 52
         },
51
-        'auth.user': {
52
-            'Meta': {'object_name': 'User'},
53
+        AUTH_USER_MODEL: {
54
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
53 55
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 26, 13, 49, 39, 401244)'}),
54 56
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
55 57
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -202,7 +204,7 @@ class Migration(SchemaMigration):
202 204
             'date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
203 205
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
204 206
             'subject': ('django.db.models.fields.TextField', [], {'max_length': '255'}),
205
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'to': "orm['auth.User']"})
207
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
206 208
         },
207 209
         'customer.notification': {
208 210
             'Meta': {'ordering': "('-date_sent',)", 'object_name': 'Notification'},
@@ -212,8 +214,8 @@ class Migration(SchemaMigration):
212 214
             'date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
213 215
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
214 216
             'location': ('django.db.models.fields.CharField', [], {'default': "'Inbox'", 'max_length': '32'}),
215
-            'recipient': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notifications'", 'to': "orm['auth.User']"}),
216
-            'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}),
217
+            'recipient': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notifications'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)}),
218
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'}),
217 219
             'subject': ('django.db.models.fields.CharField', [], {'max_length': '255'})
218 220
         },
219 221
         'customer.productalert': {
@@ -227,7 +229,7 @@ class Migration(SchemaMigration):
227 229
             'key': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'db_index': 'True'}),
228 230
             'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
229 231
             'status': ('django.db.models.fields.CharField', [], {'default': "'Active'", 'max_length': '20'}),
230
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'alerts'", 'null': 'True', 'to': "orm['auth.User']"})
232
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'alerts'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
231 233
         }
232 234
     }
233 235
 

+ 9
- 6
oscar/apps/customer/migrations/0004_auto__chg_field_communicationeventtype_email_subject_template.py Datei anzeigen

@@ -4,6 +4,9 @@ from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6 6
 
7
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
8
+
9
+
7 10
 class Migration(SchemaMigration):
8 11
 
9 12
     def forwards(self, orm):
@@ -32,8 +35,8 @@ class Migration(SchemaMigration):
32 35
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
33 36
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
34 37
         },
35
-        'auth.user': {
36
-            'Meta': {'object_name': 'User'},
38
+        AUTH_USER_MODEL: {
39
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
37 40
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 10, 15, 17, 40, 13, 532212)'}),
38 41
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
39 42
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -186,7 +189,7 @@ class Migration(SchemaMigration):
186 189
             'date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
187 190
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
188 191
             'subject': ('django.db.models.fields.TextField', [], {'max_length': '255'}),
189
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'to': "orm['auth.User']"})
192
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
190 193
         },
191 194
         'customer.notification': {
192 195
             'Meta': {'ordering': "('-date_sent',)", 'object_name': 'Notification'},
@@ -196,8 +199,8 @@ class Migration(SchemaMigration):
196 199
             'date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
197 200
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
198 201
             'location': ('django.db.models.fields.CharField', [], {'default': "'Inbox'", 'max_length': '32'}),
199
-            'recipient': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notifications'", 'to': "orm['auth.User']"}),
200
-            'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}),
202
+            'recipient': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notifications'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)}),
203
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'}),
201 204
             'subject': ('django.db.models.fields.CharField', [], {'max_length': '255'})
202 205
         },
203 206
         'customer.productalert': {
@@ -211,7 +214,7 @@ class Migration(SchemaMigration):
211 214
             'key': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'db_index': 'True'}),
212 215
             'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
213 216
             'status': ('django.db.models.fields.CharField', [], {'default': "'Active'", 'max_length': '20'}),
214
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'alerts'", 'null': 'True', 'to': "orm['auth.User']"})
217
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'alerts'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
215 218
         }
216 219
     }
217 220
 

+ 5
- 4
oscar/apps/dashboard/ranges/migrations/0001_initial.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(SchemaMigration):
8 9
 
@@ -19,7 +20,7 @@ class Migration(SchemaMigration):
19 20
             ('range', self.gf('django.db.models.fields.related.ForeignKey')(related_name='file_uploads', to=orm['offer.Range'])),
20 21
             ('filepath', self.gf('django.db.models.fields.CharField')(max_length=255)),
21 22
             ('size', self.gf('django.db.models.fields.PositiveIntegerField')()),
22
-            ('uploaded_by', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
23
+            ('uploaded_by', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[AUTH_USER_MODEL])),
23 24
             ('date_uploaded', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
24 25
             ('status', self.gf('django.db.models.fields.CharField')(default='Pending', max_length=32)),
25 26
             ('error_message', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)),
@@ -51,8 +52,8 @@ class Migration(SchemaMigration):
51 52
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
52 53
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
53 54
         },
54
-        'auth.user': {
55
-            'Meta': {'object_name': 'User'},
55
+        AUTH_USER_MODEL: {
56
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
56 57
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
57 58
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
58 59
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -206,7 +207,7 @@ class Migration(SchemaMigration):
206 207
             'range': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'file_uploads'", 'to': "orm['offer.Range']"}),
207 208
             'size': ('django.db.models.fields.PositiveIntegerField', [], {}),
208 209
             'status': ('django.db.models.fields.CharField', [], {'default': "'Pending'", 'max_length': '32'}),
209
-            'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
210
+            'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL)})
210 211
         }
211 212
     }
212 213
 

+ 5
- 4
oscar/apps/dashboard/ranges/migrations/0002_auto__chg_field_rangeproductfileupload_error_message.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -31,8 +32,8 @@ class Migration(SchemaMigration):
31 32
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
32 33
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
33 34
         },
34
-        'auth.user': {
35
-            'Meta': {'object_name': 'User'},
35
+        AUTH_USER_MODEL: {
36
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
36 37
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
37 38
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
38 39
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -191,8 +192,8 @@ class Migration(SchemaMigration):
191 192
             'range': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'file_uploads'", 'to': "orm['offer.Range']"}),
192 193
             'size': ('django.db.models.fields.PositiveIntegerField', [], {}),
193 194
             'status': ('django.db.models.fields.CharField', [], {'default': "'Pending'", 'max_length': '32'}),
194
-            'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
195
+            'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL)})
195 196
         }
196 197
     }
197 198
 
198
-    complete_apps = ['ranges']
199
+    complete_apps = ['ranges']

+ 8
- 7
oscar/apps/order/migrations/0001_initial.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(SchemaMigration):
8 9
     depends_on = (
@@ -38,7 +39,7 @@ class Migration(SchemaMigration):
38 39
             ('number', self.gf('django.db.models.fields.CharField')(max_length=128, db_index=True)),
39 40
             ('site', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['sites.Site'])),
40 41
             ('basket_id', self.gf('django.db.models.fields.PositiveIntegerField')(null=True, blank=True)),
41
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='orders', null=True, to=orm['auth.User'])),
42
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='orders', null=True, to=orm[AUTH_USER_MODEL])),
42 43
             ('billing_address', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['order.BillingAddress'], null=True, blank=True)),
43 44
             ('total_incl_tax', self.gf('django.db.models.fields.DecimalField')(max_digits=12, decimal_places=2)),
44 45
             ('total_excl_tax', self.gf('django.db.models.fields.DecimalField')(max_digits=12, decimal_places=2)),
@@ -55,7 +56,7 @@ class Migration(SchemaMigration):
55 56
         db.create_table('order_ordernote', (
56 57
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
57 58
             ('order', self.gf('django.db.models.fields.related.ForeignKey')(related_name='notes', to=orm['order.Order'])),
58
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True)),
59
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[AUTH_USER_MODEL], null=True)),
59 60
             ('note_type', self.gf('django.db.models.fields.CharField')(max_length=128, null=True)),
60 61
             ('message', self.gf('django.db.models.fields.TextField')()),
61 62
             ('date', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
@@ -278,8 +279,8 @@ class Migration(SchemaMigration):
278 279
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
279 280
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
280 281
         },
281
-        'auth.user': {
282
-            'Meta': {'object_name': 'User'},
282
+        AUTH_USER_MODEL: {
283
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
283 284
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
284 285
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
285 286
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -501,7 +502,7 @@ class Migration(SchemaMigration):
501 502
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
502 503
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
503 504
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
504
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
505
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
505 506
         },
506 507
         'order.orderdiscount': {
507 508
             'Meta': {'object_name': 'OrderDiscount'},
@@ -519,7 +520,7 @@ class Migration(SchemaMigration):
519 520
             'message': ('django.db.models.fields.TextField', [], {}),
520 521
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
521 522
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['order.Order']"}),
522
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
523
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
523 524
         },
524 525
         'order.paymentevent': {
525 526
             'Meta': {'object_name': 'PaymentEvent'},
@@ -589,7 +590,7 @@ class Migration(SchemaMigration):
589 590
             'Meta': {'object_name': 'Partner'},
590 591
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
591 592
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
592
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
593
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
593 594
         },
594 595
         'sites.site': {
595 596
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},

+ 6
- 5
oscar/apps/order/migrations/0002_auto__add_field_order_guest_email.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(SchemaMigration):
8 9
 
@@ -42,8 +43,8 @@ class Migration(SchemaMigration):
42 43
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
43 44
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
44 45
         },
45
-        'auth.user': {
46
-            'Meta': {'object_name': 'User'},
46
+        AUTH_USER_MODEL: {
47
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
47 48
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
48 49
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
49 50
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -266,7 +267,7 @@ class Migration(SchemaMigration):
266 267
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
267 268
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
268 269
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
269
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
270
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
270 271
         },
271 272
         'order.orderdiscount': {
272 273
             'Meta': {'object_name': 'OrderDiscount'},
@@ -284,7 +285,7 @@ class Migration(SchemaMigration):
284 285
             'message': ('django.db.models.fields.TextField', [], {}),
285 286
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
286 287
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['order.Order']"}),
287
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
288
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
288 289
         },
289 290
         'order.paymentevent': {
290 291
             'Meta': {'object_name': 'PaymentEvent'},
@@ -354,7 +355,7 @@ class Migration(SchemaMigration):
354 355
             'Meta': {'object_name': 'Partner'},
355 356
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
356 357
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
357
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
358
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
358 359
         },
359 360
         'sites.site': {
360 361
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},

+ 6
- 5
oscar/apps/order/migrations/0003_auto__del_field_ordernote_date__add_field_ordernote_date_created__add_.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 from django.utils.timezone import now
7 8
 
8 9
 
@@ -48,8 +49,8 @@ class Migration(SchemaMigration):
48 49
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
49 50
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
50 51
         },
51
-        'auth.user': {
52
-            'Meta': {'object_name': 'User'},
52
+        AUTH_USER_MODEL: {
53
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
53 54
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
54 55
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
55 56
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -272,7 +273,7 @@ class Migration(SchemaMigration):
272 273
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
273 274
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
274 275
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
275
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
276
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
276 277
         },
277 278
         'order.orderdiscount': {
278 279
             'Meta': {'object_name': 'OrderDiscount'},
@@ -291,7 +292,7 @@ class Migration(SchemaMigration):
291 292
             'message': ('django.db.models.fields.TextField', [], {}),
292 293
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
293 294
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['order.Order']"}),
294
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
295
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
295 296
         },
296 297
         'order.paymentevent': {
297 298
             'Meta': {'object_name': 'PaymentEvent'},
@@ -361,7 +362,7 @@ class Migration(SchemaMigration):
361 362
             'Meta': {'object_name': 'Partner'},
362 363
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
363 364
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
364
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
365
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
365 366
         },
366 367
         'sites.site': {
367 368
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},

+ 6
- 5
oscar/apps/order/migrations/0004_auto__add_field_line_upc.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(SchemaMigration):
8 9
 
@@ -42,8 +43,8 @@ class Migration(SchemaMigration):
42 43
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
43 44
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
44 45
         },
45
-        'auth.user': {
46
-            'Meta': {'object_name': 'User'},
46
+        AUTH_USER_MODEL: {
47
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
47 48
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
48 49
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
49 50
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -267,7 +268,7 @@ class Migration(SchemaMigration):
267 268
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
268 269
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
269 270
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
270
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
271
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
271 272
         },
272 273
         'order.orderdiscount': {
273 274
             'Meta': {'object_name': 'OrderDiscount'},
@@ -286,7 +287,7 @@ class Migration(SchemaMigration):
286 287
             'message': ('django.db.models.fields.TextField', [], {}),
287 288
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
288 289
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['order.Order']"}),
289
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
290
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
290 291
         },
291 292
         'order.paymentevent': {
292 293
             'Meta': {'object_name': 'PaymentEvent'},
@@ -356,7 +357,7 @@ class Migration(SchemaMigration):
356 357
             'Meta': {'object_name': 'Partner'},
357 358
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
358 359
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
359
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
360
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
360 361
         },
361 362
         'sites.site': {
362 363
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},

+ 6
- 5
oscar/apps/order/migrations/0005_auto__add_field_orderdiscount_offer_name.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(SchemaMigration):
8 9
 
@@ -42,8 +43,8 @@ class Migration(SchemaMigration):
42 43
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
43 44
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
44 45
         },
45
-        'auth.user': {
46
-            'Meta': {'object_name': 'User'},
46
+        AUTH_USER_MODEL: {
47
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
47 48
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 10, 11, 14, 42, 12, 984329)'}),
48 49
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
49 50
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -270,7 +271,7 @@ class Migration(SchemaMigration):
270 271
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
271 272
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
272 273
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
273
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
274
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
274 275
         },
275 276
         'order.orderdiscount': {
276 277
             'Meta': {'object_name': 'OrderDiscount'},
@@ -290,7 +291,7 @@ class Migration(SchemaMigration):
290 291
             'message': ('django.db.models.fields.TextField', [], {}),
291 292
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
292 293
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['order.Order']"}),
293
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
294
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
294 295
         },
295 296
         'order.paymentevent': {
296 297
             'Meta': {'object_name': 'PaymentEvent'},
@@ -360,7 +361,7 @@ class Migration(SchemaMigration):
360 361
             'Meta': {'object_name': 'Partner'},
361 362
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
362 363
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
363
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
364
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
364 365
         },
365 366
         'sites.site': {
366 367
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},

+ 6
- 5
oscar/apps/order/migrations/0006_update_offer_name_field.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import DataMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(DataMigration):
@@ -51,8 +52,8 @@ class Migration(DataMigration):
51 52
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
52 53
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
53 54
         },
54
-        'auth.user': {
55
-            'Meta': {'object_name': 'User'},
55
+        AUTH_USER_MODEL: {
56
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
56 57
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
57 58
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
58 59
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -279,7 +280,7 @@ class Migration(DataMigration):
279 280
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
280 281
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
281 282
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
282
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
283
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
283 284
         },
284 285
         'order.orderdiscount': {
285 286
             'Meta': {'object_name': 'OrderDiscount'},
@@ -299,7 +300,7 @@ class Migration(DataMigration):
299 300
             'message': ('django.db.models.fields.TextField', [], {}),
300 301
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
301 302
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['order.Order']"}),
302
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
303
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
303 304
         },
304 305
         'order.paymentevent': {
305 306
             'Meta': {'object_name': 'PaymentEvent'},
@@ -369,7 +370,7 @@ class Migration(DataMigration):
369 370
             'Meta': {'object_name': 'Partner'},
370 371
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
371 372
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
372
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
373
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
373 374
         },
374 375
         'sites.site': {
375 376
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},

+ 7
- 6
oscar/apps/order/migrations/0007_auto__add_field_orderdiscount_frequency.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -43,8 +44,8 @@ class Migration(SchemaMigration):
43 44
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
44 45
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
45 46
         },
46
-        'auth.user': {
47
-            'Meta': {'object_name': 'User'},
47
+        AUTH_USER_MODEL: {
48
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
48 49
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
49 50
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
50 51
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -271,7 +272,7 @@ class Migration(SchemaMigration):
271 272
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
272 273
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
273 274
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
274
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
275
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
275 276
         },
276 277
         'order.orderdiscount': {
277 278
             'Meta': {'object_name': 'OrderDiscount'},
@@ -292,7 +293,7 @@ class Migration(SchemaMigration):
292 293
             'message': ('django.db.models.fields.TextField', [], {}),
293 294
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
294 295
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['order.Order']"}),
295
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
296
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
296 297
         },
297 298
         'order.paymentevent': {
298 299
             'Meta': {'object_name': 'PaymentEvent'},
@@ -362,7 +363,7 @@ class Migration(SchemaMigration):
362 363
             'Meta': {'object_name': 'Partner'},
363 364
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
364 365
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
365
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
366
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
366 367
         },
367 368
         'sites.site': {
368 369
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},
@@ -372,4 +373,4 @@ class Migration(SchemaMigration):
372 373
         }
373 374
     }
374 375
 
375
-    complete_apps = ['order']
376
+    complete_apps = ['order']

+ 7
- 6
oscar/apps/order/migrations/0008_auto__add_field_orderdiscount_category.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -43,8 +44,8 @@ class Migration(SchemaMigration):
43 44
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
44 45
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
45 46
         },
46
-        'auth.user': {
47
-            'Meta': {'object_name': 'User'},
47
+        AUTH_USER_MODEL: {
48
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
48 49
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
49 50
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
50 51
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -271,7 +272,7 @@ class Migration(SchemaMigration):
271 272
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
272 273
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
273 274
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
274
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
275
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
275 276
         },
276 277
         'order.orderdiscount': {
277 278
             'Meta': {'object_name': 'OrderDiscount'},
@@ -293,7 +294,7 @@ class Migration(SchemaMigration):
293 294
             'message': ('django.db.models.fields.TextField', [], {}),
294 295
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
295 296
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['order.Order']"}),
296
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
297
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
297 298
         },
298 299
         'order.paymentevent': {
299 300
             'Meta': {'object_name': 'PaymentEvent'},
@@ -364,7 +365,7 @@ class Migration(SchemaMigration):
364 365
             'code': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128'}),
365 366
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
366 367
             'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
367
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
368
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
368 369
         },
369 370
         'sites.site': {
370 371
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},
@@ -374,4 +375,4 @@ class Migration(SchemaMigration):
374 375
         }
375 376
     }
376 377
 
377
-    complete_apps = ['order']
378
+    complete_apps = ['order']

+ 7
- 6
oscar/apps/order/migrations/0009_auto__add_field_orderdiscount_message.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -43,8 +44,8 @@ class Migration(SchemaMigration):
43 44
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
44 45
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
45 46
         },
46
-        'auth.user': {
47
-            'Meta': {'object_name': 'User'},
47
+        AUTH_USER_MODEL: {
48
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
48 49
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
49 50
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
50 51
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -271,7 +272,7 @@ class Migration(SchemaMigration):
271 272
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
272 273
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
273 274
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
274
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
275
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
275 276
         },
276 277
         'order.orderdiscount': {
277 278
             'Meta': {'object_name': 'OrderDiscount'},
@@ -294,7 +295,7 @@ class Migration(SchemaMigration):
294 295
             'message': ('django.db.models.fields.TextField', [], {}),
295 296
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
296 297
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['order.Order']"}),
297
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
298
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
298 299
         },
299 300
         'order.paymentevent': {
300 301
             'Meta': {'object_name': 'PaymentEvent'},
@@ -365,7 +366,7 @@ class Migration(SchemaMigration):
365 366
             'code': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128'}),
366 367
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
367 368
             'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
368
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
369
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
369 370
         },
370 371
         'sites.site': {
371 372
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},
@@ -375,4 +376,4 @@ class Migration(SchemaMigration):
375 376
         }
376 377
     }
377 378
 
378
-    complete_apps = ['order']
379
+    complete_apps = ['order']

+ 7
- 6
oscar/apps/order/migrations/0010_auto__chg_field_billingaddress_postcode__chg_field_shippingaddress_pos.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -47,8 +48,8 @@ class Migration(SchemaMigration):
47 48
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
48 49
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
49 50
         },
50
-        'auth.user': {
51
-            'Meta': {'object_name': 'User'},
51
+        AUTH_USER_MODEL: {
52
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
52 53
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
53 54
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
54 55
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -276,7 +277,7 @@ class Migration(SchemaMigration):
276 277
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
277 278
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
278 279
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
279
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
280
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
280 281
         },
281 282
         'order.orderdiscount': {
282 283
             'Meta': {'object_name': 'OrderDiscount'},
@@ -299,7 +300,7 @@ class Migration(SchemaMigration):
299 300
             'message': ('django.db.models.fields.TextField', [], {}),
300 301
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
301 302
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['order.Order']"}),
302
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
303
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
303 304
         },
304 305
         'order.paymentevent': {
305 306
             'Meta': {'object_name': 'PaymentEvent'},
@@ -370,7 +371,7 @@ class Migration(SchemaMigration):
370 371
             'code': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128'}),
371 372
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
372 373
             'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
373
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
374
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
374 375
         },
375 376
         'sites.site': {
376 377
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},
@@ -380,4 +381,4 @@ class Migration(SchemaMigration):
380 381
         }
381 382
     }
382 383
 
383
-    complete_apps = ['order']
384
+    complete_apps = ['order']

+ 6
- 5
oscar/apps/order/migrations/0011_auto__del_field_paymentevent_date__add_field_paymentevent_date_created.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -41,8 +42,8 @@ class Migration(SchemaMigration):
41 42
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
42 43
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
43 44
         },
44
-        'auth.user': {
45
-            'Meta': {'object_name': 'User'},
45
+        AUTH_USER_MODEL: {
46
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
46 47
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
47 48
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
48 49
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -270,7 +271,7 @@ class Migration(SchemaMigration):
270 271
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
271 272
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
272 273
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
273
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
274
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
274 275
         },
275 276
         'order.orderdiscount': {
276 277
             'Meta': {'object_name': 'OrderDiscount'},
@@ -293,7 +294,7 @@ class Migration(SchemaMigration):
293 294
             'message': ('django.db.models.fields.TextField', [], {}),
294 295
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
295 296
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['order.Order']"}),
296
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
297
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
297 298
         },
298 299
         'order.paymentevent': {
299 300
             'Meta': {'ordering': "['-date_created']", 'object_name': 'PaymentEvent'},
@@ -364,7 +365,7 @@ class Migration(SchemaMigration):
364 365
             'code': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128'}),
365 366
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
366 367
             'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
367
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
368
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
368 369
         },
369 370
         'sites.site': {
370 371
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},

+ 7
- 6
oscar/apps/order/migrations/0012_auto__add_field_paymentevent_reference.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -43,8 +44,8 @@ class Migration(SchemaMigration):
43 44
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
44 45
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
45 46
         },
46
-        'auth.user': {
47
-            'Meta': {'object_name': 'User'},
47
+        AUTH_USER_MODEL: {
48
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
48 49
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
49 50
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
50 51
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -272,7 +273,7 @@ class Migration(SchemaMigration):
272 273
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
273 274
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
274 275
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
275
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
276
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
276 277
         },
277 278
         'order.orderdiscount': {
278 279
             'Meta': {'object_name': 'OrderDiscount'},
@@ -295,7 +296,7 @@ class Migration(SchemaMigration):
295 296
             'message': ('django.db.models.fields.TextField', [], {}),
296 297
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
297 298
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['order.Order']"}),
298
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
299
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
299 300
         },
300 301
         'order.paymentevent': {
301 302
             'Meta': {'ordering': "['-date_created']", 'object_name': 'PaymentEvent'},
@@ -367,7 +368,7 @@ class Migration(SchemaMigration):
367 368
             'code': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128'}),
368 369
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
369 370
             'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
370
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
371
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
371 372
         },
372 373
         'sites.site': {
373 374
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},
@@ -377,4 +378,4 @@ class Migration(SchemaMigration):
377 378
         }
378 379
     }
379 380
 
380
-    complete_apps = ['order']
381
+    complete_apps = ['order']

+ 7
- 6
oscar/apps/order/migrations/0013_auto__add_field_paymentevent_shipping_event.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -43,8 +44,8 @@ class Migration(SchemaMigration):
43 44
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
44 45
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
45 46
         },
46
-        'auth.user': {
47
-            'Meta': {'object_name': 'User'},
47
+        AUTH_USER_MODEL: {
48
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
48 49
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
49 50
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
50 51
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -272,7 +273,7 @@ class Migration(SchemaMigration):
272 273
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
273 274
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
274 275
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
275
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
276
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
276 277
         },
277 278
         'order.orderdiscount': {
278 279
             'Meta': {'object_name': 'OrderDiscount'},
@@ -295,7 +296,7 @@ class Migration(SchemaMigration):
295 296
             'message': ('django.db.models.fields.TextField', [], {}),
296 297
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
297 298
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['order.Order']"}),
298
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
299
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
299 300
         },
300 301
         'order.paymentevent': {
301 302
             'Meta': {'ordering': "['-date_created']", 'object_name': 'PaymentEvent'},
@@ -368,7 +369,7 @@ class Migration(SchemaMigration):
368 369
             'code': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128'}),
369 370
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
370 371
             'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
371
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
372
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
372 373
         },
373 374
         'sites.site': {
374 375
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},
@@ -378,4 +379,4 @@ class Migration(SchemaMigration):
378 379
         }
379 380
     }
380 381
 
381
-    complete_apps = ['order']
382
+    complete_apps = ['order']

+ 7
- 6
oscar/apps/order/migrations/0014_auto__chg_field_billingaddress_postcode__chg_field_shippingaddress_pos.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -47,8 +48,8 @@ class Migration(SchemaMigration):
47 48
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
48 49
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
49 50
         },
50
-        u'auth.user': {
51
-            'Meta': {'object_name': 'User'},
51
+        AUTH_USER_MODEL: {
52
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
52 53
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
53 54
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
54 55
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -276,7 +277,7 @@ class Migration(SchemaMigration):
276 277
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
277 278
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
278 279
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
279
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': u"orm['auth.User']"})
280
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': u"orm['{0}']".format(AUTH_USER_MODEL)})
280 281
         },
281 282
         u'order.orderdiscount': {
282 283
             'Meta': {'object_name': 'OrderDiscount'},
@@ -299,7 +300,7 @@ class Migration(SchemaMigration):
299 300
             'message': ('django.db.models.fields.TextField', [], {}),
300 301
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
301 302
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': u"orm['order.Order']"}),
302
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True'})
303
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
303 304
         },
304 305
         u'order.paymentevent': {
305 306
             'Meta': {'ordering': "['-date_created']", 'object_name': 'PaymentEvent'},
@@ -372,7 +373,7 @@ class Migration(SchemaMigration):
372 373
             'code': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128'}),
373 374
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
374 375
             'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
375
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['auth.User']"})
376
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['{0}']".format(AUTH_USER_MODEL)})
376 377
         },
377 378
         u'sites.site': {
378 379
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},
@@ -382,4 +383,4 @@ class Migration(SchemaMigration):
382 383
         }
383 384
     }
384 385
 
385
-    complete_apps = ['order']
386
+    complete_apps = ['order']

+ 5
- 4
oscar/apps/order/migrations/0015_auto__del_field_shippingeventtype_is_required__del_field_shippingevent.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -60,7 +61,7 @@ class Migration(SchemaMigration):
60 61
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
61 62
         },
62 63
         u'auth.user': {
63
-            'Meta': {'object_name': 'User'},
64
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
64 65
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
65 66
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
66 67
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -288,7 +289,7 @@ class Migration(SchemaMigration):
288 289
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
289 290
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
290 291
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
291
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': u"orm['auth.User']"})
292
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
292 293
         },
293 294
         u'order.orderdiscount': {
294 295
             'Meta': {'object_name': 'OrderDiscount'},
@@ -311,7 +312,7 @@ class Migration(SchemaMigration):
311 312
             'message': ('django.db.models.fields.TextField', [], {}),
312 313
             'note_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
313 314
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': u"orm['order.Order']"}),
314
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True'})
315
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True'})
315 316
         },
316 317
         u'order.paymentevent': {
317 318
             'Meta': {'ordering': "['-date_created']", 'object_name': 'PaymentEvent'},
@@ -381,7 +382,7 @@ class Migration(SchemaMigration):
381 382
             'code': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128'}),
382 383
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
383 384
             'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
384
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['auth.User']"})
385
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['{0}']".format(AUTH_USER_MODEL)})
385 386
         },
386 387
         u'sites.site': {
387 388
             'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},

+ 5
- 4
oscar/apps/partner/migrations/0001_initial.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(SchemaMigration):
8 9
 
@@ -23,7 +24,7 @@ class Migration(SchemaMigration):
23 24
         db.create_table('partner_partner_users', (
24 25
             ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
25 26
             ('partner', models.ForeignKey(orm['partner.partner'], null=False)),
26
-            ('user', models.ForeignKey(orm['auth.user'], null=False))
27
+            ('user', models.ForeignKey(orm[AUTH_USER_MODEL], null=False))
27 28
         ))
28 29
         db.create_unique('partner_partner_users', ['partner_id', 'user_id'])
29 30
 
@@ -71,8 +72,8 @@ class Migration(SchemaMigration):
71 72
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
72 73
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
73 74
         },
74
-        'auth.user': {
75
-            'Meta': {'object_name': 'User'},
75
+        AUTH_USER_MODEL: {
76
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
76 77
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
77 78
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
78 79
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -203,7 +204,7 @@ class Migration(SchemaMigration):
203 204
             'Meta': {'object_name': 'Partner'},
204 205
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
205 206
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
206
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
207
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
207 208
         },
208 209
         'partner.stockrecord': {
209 210
             'Meta': {'object_name': 'StockRecord'},

+ 4
- 3
oscar/apps/partner/migrations/0002_auto__add_stockalert__add_abstractstockalert__add_field_stockrecord_lo.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(SchemaMigration):
8 9
 
@@ -61,8 +62,8 @@ class Migration(SchemaMigration):
61 62
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
62 63
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
63 64
         },
64
-        'auth.user': {
65
-            'Meta': {'object_name': 'User'},
65
+        AUTH_USER_MODEL: {
66
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
66 67
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
67 68
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
68 69
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -205,7 +206,7 @@ class Migration(SchemaMigration):
205 206
             'Meta': {'object_name': 'Partner'},
206 207
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
207 208
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
208
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
209
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
209 210
         },
210 211
         'partner.stockalert': {
211 212
             'Meta': {'object_name': 'StockAlert', '_ormbases': ['partner.AbstractStockAlert']},

+ 4
- 3
oscar/apps/partner/migrations/0003_auto__add_unique_stockrecord_partner_partner_sku.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 class Migration(SchemaMigration):
8 9
 
@@ -32,8 +33,8 @@ class Migration(SchemaMigration):
32 33
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
33 34
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
34 35
         },
35
-        'auth.user': {
36
-            'Meta': {'object_name': 'User'},
36
+        AUTH_USER_MODEL: {
37
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
37 38
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
38 39
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
39 40
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -176,7 +177,7 @@ class Migration(SchemaMigration):
176 177
             'Meta': {'object_name': 'Partner'},
177 178
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
178 179
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
179
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
180
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
180 181
         },
181 182
         'partner.stockalert': {
182 183
             'Meta': {'ordering': "('-date_created',)", 'object_name': 'StockAlert', '_ormbases': ['partner.AbstractStockAlert']},

+ 5
- 4
oscar/apps/partner/migrations/0004_auto__add_field_partner_code.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -33,8 +34,8 @@ class Migration(SchemaMigration):
33 34
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
34 35
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
35 36
         },
36
-        'auth.user': {
37
-            'Meta': {'object_name': 'User'},
37
+        AUTH_USER_MODEL: {
38
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
38 39
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
39 40
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
40 41
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -181,7 +182,7 @@ class Migration(SchemaMigration):
181 182
             'code': ('django.db.models.fields.SlugField', [], {'max_length': '128'}),
182 183
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
183 184
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
184
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
185
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
185 186
         },
186 187
         'partner.stockalert': {
187 188
             'Meta': {'ordering': "('-date_created',)", 'object_name': 'StockAlert', '_ormbases': ['partner.AbstractStockAlert']},
@@ -205,4 +206,4 @@ class Migration(SchemaMigration):
205 206
         }
206 207
     }
207 208
 
208
-    complete_apps = ['partner']
209
+    complete_apps = ['partner']

+ 4
- 3
oscar/apps/partner/migrations/0005_populate_slugs.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import DataMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 from oscar.core.utils import slugify
7 8
 
8 9
 class Migration(DataMigration):
@@ -32,8 +33,8 @@ class Migration(DataMigration):
32 33
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
33 34
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
34 35
         },
35
-        'auth.user': {
36
-            'Meta': {'object_name': 'User'},
36
+        AUTH_USER_MODEL: {
37
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
37 38
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
38 39
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
39 40
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -180,7 +181,7 @@ class Migration(DataMigration):
180 181
             'code': ('django.db.models.fields.SlugField', [], {'max_length': '128'}),
181 182
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
182 183
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
183
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
184
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
184 185
         },
185 186
         'partner.stockalert': {
186 187
             'Meta': {'ordering': "('-date_created',)", 'object_name': 'StockAlert', '_ormbases': ['partner.AbstractStockAlert']},

+ 5
- 4
oscar/apps/partner/migrations/0006_auto__add_unique_partner_code.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -31,8 +32,8 @@ class Migration(SchemaMigration):
31 32
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
32 33
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
33 34
         },
34
-        'auth.user': {
35
-            'Meta': {'object_name': 'User'},
35
+        AUTH_USER_MODEL: {
36
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
36 37
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
37 38
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
38 39
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -179,7 +180,7 @@ class Migration(SchemaMigration):
179 180
             'code': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128'}),
180 181
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
181 182
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
182
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
183
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
183 184
         },
184 185
         'partner.stockalert': {
185 186
             'Meta': {'ordering': "('-date_created',)", 'object_name': 'StockAlert', '_ormbases': ['partner.AbstractStockAlert']},
@@ -203,4 +204,4 @@ class Migration(SchemaMigration):
203 204
         }
204 205
     }
205 206
 
206
-    complete_apps = ['partner']
207
+    complete_apps = ['partner']

+ 5
- 4
oscar/apps/partner/migrations/0007_auto__chg_field_partner_name__del_unique_partner_name.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -37,8 +38,8 @@ class Migration(SchemaMigration):
37 38
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
38 39
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
39 40
         },
40
-        'auth.user': {
41
-            'Meta': {'object_name': 'User'},
41
+        AUTH_USER_MODEL: {
42
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
42 43
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
43 44
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
44 45
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -185,7 +186,7 @@ class Migration(SchemaMigration):
185 186
             'code': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128'}),
186 187
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
187 188
             'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
188
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
189
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
189 190
         },
190 191
         'partner.stockalert': {
191 192
             'Meta': {'ordering': "('-date_created',)", 'object_name': 'StockAlert', '_ormbases': ['partner.AbstractStockAlert']},
@@ -209,4 +210,4 @@ class Migration(SchemaMigration):
209 210
         }
210 211
     }
211 212
 
212
-    complete_apps = ['partner']
213
+    complete_apps = ['partner']

+ 4
- 3
oscar/apps/partner/migrations/0008_auto__del_abstractstockalert__del_field_stockalert_abstractstockalert_.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -29,8 +30,8 @@ class Migration(SchemaMigration):
29 30
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
30 31
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
31 32
         },
32
-        'auth.user': {
33
-            'Meta': {'object_name': 'User'},
33
+        AUTH_USER_MODEL: {
34
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
34 35
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
35 36
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
36 37
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -169,7 +170,7 @@ class Migration(SchemaMigration):
169 170
             'code': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128'}),
170 171
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
171 172
             'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
172
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"})
173
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
173 174
         },
174 175
         'partner.stockalert': {
175 176
             'Meta': {'ordering': "('-date_created',)", 'object_name': 'StockAlert'},

+ 3
- 2
oscar/apps/partner/migrations/0009_auto__add_partneraddress.py Datei anzeigen

@@ -3,6 +3,7 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
6 7
 
7 8
 
8 9
 class Migration(SchemaMigration):
@@ -57,7 +58,7 @@ class Migration(SchemaMigration):
57 58
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
58 59
         },
59 60
         u'auth.user': {
60
-            'Meta': {'object_name': 'User'},
61
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
61 62
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
62 63
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
63 64
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -196,7 +197,7 @@ class Migration(SchemaMigration):
196 197
             'code': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128'}),
197 198
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
198 199
             'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
199
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['auth.User']"})
200
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'partners'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['{0}']".format(AUTH_USER_MODEL)})
200 201
         },
201 202
         u'partner.partneraddress': {
202 203
             'Meta': {'object_name': 'PartnerAddress'},

+ 9
- 6
oscar/apps/payment/migrations/0001_initial.py Datei anzeigen

@@ -4,6 +4,9 @@ from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6 6
 
7
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
8
+
9
+
7 10
 class Migration(SchemaMigration):
8 11
 
9 12
     depends_on = (
@@ -48,7 +51,7 @@ class Migration(SchemaMigration):
48 51
         # Adding model 'Bankcard'
49 52
         db.create_table('payment_bankcard', (
50 53
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
51
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='bankcards', to=orm['auth.User'])),
54
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='bankcards', to=orm[AUTH_USER_MODEL])),
52 55
             ('card_type', self.gf('django.db.models.fields.CharField')(max_length=128)),
53 56
             ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
54 57
             ('number', self.gf('django.db.models.fields.CharField')(max_length=32)),
@@ -97,8 +100,8 @@ class Migration(SchemaMigration):
97 100
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
98 101
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
99 102
         },
100
-        'auth.user': {
101
-            'Meta': {'object_name': 'User'},
103
+        AUTH_USER_MODEL: {
104
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
102 105
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
103 106
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
104 107
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -119,7 +122,7 @@ class Migration(SchemaMigration):
119 122
             'date_merged': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
120 123
             'date_submitted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
121 124
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
122
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'baskets'", 'null': 'True', 'to': "orm['auth.User']"}),
125
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'baskets'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)}),
123 126
             'status': ('django.db.models.fields.CharField', [], {'default': "'Open'", 'max_length': '128'}),
124 127
             'vouchers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['voucher.Voucher']", 'null': 'True', 'symmetrical': 'False'})
125 128
         },
@@ -305,7 +308,7 @@ class Migration(SchemaMigration):
305 308
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
306 309
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
307 310
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
308
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
311
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
309 312
         },
310 313
         'order.shippingaddress': {
311 314
             'Meta': {'object_name': 'ShippingAddress'},
@@ -332,7 +335,7 @@ class Migration(SchemaMigration):
332 335
             'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
333 336
             'number': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
334 337
             'partner_reference': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
335
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bankcards'", 'to': "orm['auth.User']"})
338
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bankcards'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
336 339
         },
337 340
         'payment.source': {
338 341
             'Meta': {'object_name': 'Source'},

+ 7
- 5
oscar/apps/payment/migrations/0002_auto__chg_field_source_reference__chg_field_source_label__chg_field_tr.py Datei anzeigen

@@ -4,6 +4,8 @@ from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6 6
 
7
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
8
+
7 9
 
8 10
 class Migration(SchemaMigration):
9 11
 
@@ -65,8 +67,8 @@ class Migration(SchemaMigration):
65 67
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
66 68
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
67 69
         },
68
-        'auth.user': {
69
-            'Meta': {'object_name': 'User'},
70
+        AUTH_USER_MODEL: {
71
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
70 72
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
71 73
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
72 74
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -119,7 +121,7 @@ class Migration(SchemaMigration):
119 121
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
120 122
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
121 123
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
122
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
124
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
123 125
         },
124 126
         'order.shippingaddress': {
125 127
             'Meta': {'object_name': 'ShippingAddress'},
@@ -146,7 +148,7 @@ class Migration(SchemaMigration):
146 148
             'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
147 149
             'number': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
148 150
             'partner_reference': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
149
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bankcards'", 'to': "orm['auth.User']"})
151
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bankcards'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
150 152
         },
151 153
         'payment.source': {
152 154
             'Meta': {'object_name': 'Source'},
@@ -184,4 +186,4 @@ class Migration(SchemaMigration):
184 186
         }
185 187
     }
186 188
 
187
-    complete_apps = ['payment']
189
+    complete_apps = ['payment']

+ 9
- 8
oscar/apps/voucher/migrations/0001_initial.py Datei anzeigen

@@ -3,6 +3,8 @@ import datetime
3 3
 from south.db import db
4 4
 from south.v2 import SchemaMigration
5 5
 from django.db import models
6
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
7
+
6 8
 
7 9
 class Migration(SchemaMigration):
8 10
     depends_on = (
@@ -11,7 +13,6 @@ class Migration(SchemaMigration):
11 13
     )
12 14
 
13 15
     def forwards(self, orm):
14
-        
15 16
         # Adding model 'Voucher'
16 17
         db.create_table('voucher_voucher', (
17 18
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
@@ -39,7 +40,7 @@ class Migration(SchemaMigration):
39 40
         db.create_table('voucher_voucherapplication', (
40 41
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
41 42
             ('voucher', self.gf('django.db.models.fields.related.ForeignKey')(related_name='applications', to=orm['voucher.Voucher'])),
42
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, blank=True)),
43
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[AUTH_USER_MODEL], null=True, blank=True)),
43 44
             ('order', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['order.Order'])),
44 45
             ('date_created', self.gf('django.db.models.fields.DateField')(auto_now_add=True, blank=True)),
45 46
         ))
@@ -47,7 +48,7 @@ class Migration(SchemaMigration):
47 48
 
48 49
 
49 50
     def backwards(self, orm):
50
-        
51
+
51 52
         # Deleting model 'Voucher'
52 53
         db.delete_table('voucher_voucher')
53 54
 
@@ -82,8 +83,8 @@ class Migration(SchemaMigration):
82 83
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
83 84
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
84 85
         },
85
-        'auth.user': {
86
-            'Meta': {'object_name': 'User'},
86
+        AUTH_USER_MODEL: {
87
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
87 88
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
88 89
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
89 90
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -104,7 +105,7 @@ class Migration(SchemaMigration):
104 105
             'date_merged': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
105 106
             'date_submitted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
106 107
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
107
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'baskets'", 'null': 'True', 'to': "orm['auth.User']"}),
108
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'baskets'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)}),
108 109
             'status': ('django.db.models.fields.CharField', [], {'default': "'Open'", 'max_length': '128'}),
109 110
             'vouchers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['voucher.Voucher']", 'null': 'True', 'symmetrical': 'False'})
110 111
         },
@@ -290,7 +291,7 @@ class Migration(SchemaMigration):
290 291
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
291 292
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
292 293
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
293
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['auth.User']"})
294
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
294 295
         },
295 296
         'order.shippingaddress': {
296 297
             'Meta': {'object_name': 'ShippingAddress'},
@@ -334,7 +335,7 @@ class Migration(SchemaMigration):
334 335
             'date_created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
335 336
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
336 337
             'order': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['order.Order']"}),
337
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
338
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True', 'blank': 'True'}),
338 339
             'voucher': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'applications'", 'to': "orm['voucher.Voucher']"})
339 340
         }
340 341
     }

Laden…
Abbrechen
Speichern