Handle conflicting offer migrations

Both the master branch and Django 1.7 branch introduced a South
migration for offers. It's been addressed by dropping the one introduced
on the Django 1.7 branch, and re-creating it.

The native migrations have been completely recreated.

docs/source/releases/v0.8.rst

@@ -551,6 +551,7 @@ Migrations
 * Offer:
 
     - ``0033`` - Use an ``AutoSlug`` field for ``Range`` models
+    - ``0034`` - Add moved ``RangedProductFileUpload`` model.
 
 * Order:
 

oscar/apps/catalogue/migrations/0001_initial.py

@@ -89,7 +89,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('structure', models.CharField(default=b'standalone', max_length=10, verbose_name='Product structure', choices=[(b'standalone', 'Stand-alone product'), (b'parent', 'Parent product'), (b'child', 'Child product')])),
                 ('upc', oscar.models.fields.NullCharField(max_length=64, help_text='Universal Product Code (UPC) is an identifier for a product which is not specific to a particular  supplier. Eg an ISBN for a book.', unique=True, verbose_name='UPC')),
-                ('title', models.CharField(max_length=255, verbose_name='Product title', blank=True)),
+                ('title', models.CharField(max_length=255, verbose_name='Title', blank=True)),
                 ('slug', models.SlugField(max_length=255, verbose_name='Slug')),
                 ('description', models.TextField(verbose_name='Description', blank=True)),
                 ('rating', models.FloatField(verbose_name='Rating', null=True, editable=False)),

oscar/apps/offer/migrations/0001_initial.py

@@ -81,7 +81,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('name', models.CharField(unique=True, max_length=128, verbose_name='Name')),
-                ('slug', models.SlugField(max_length=128, unique=True, null=True, verbose_name='Slug')),
+                ('slug', oscar.models.fields.autoslugfield.AutoSlugField(populate_from=b'name', editable=False, max_length=128, blank=True, unique=True, verbose_name='Slug')),
                 ('description', models.TextField(blank=True)),
                 ('is_public', models.BooleanField(default=False, help_text='Public ranges have a customer-facing page', verbose_name='Is public?')),
                 ('includes_all_products', models.BooleanField(default=False, verbose_name='Includes all products?')),

oscar/apps/offer/south_migrations/0033_auto__add_rangeproductfileupload.py → oscar/apps/offer/south_migrations/0034_auto__add_rangeproductfileupload.py

@@ -221,7 +221,7 @@ class Migration(SchemaMigration):
             'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
             'proxy_class': ('oscar.models.fields.NullCharField', [], {'default': 'None', 'max_length': '255', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'unique': 'True', 'null': 'True'})
+            'slug': ('oscar.models.fields.autoslugfield.AutoSlugField', [], {'allow_duplicates': 'False', 'max_length': '128', 'separator': "u'-'", 'blank': 'True', 'unique': 'True', 'populate_from': "'name'", 'overwrite': 'False'})
         },
         'offer.rangeproduct': {
             'Meta': {'unique_together': "(('range', 'product'),)", 'object_name': 'RangeProduct'},