Merge pull request #347 from bogdal/merge-migration

Add merge migration
saleor · Aug 25, 2015 · 95cf1a2 · 95cf1a2
2 parents 98e8534 + 91099c3
commit 95cf1a2
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 0 deletions.
diff --git a/saleor/order/migrations/0003_auto_20150825_1433.py b/saleor/order/migrations/0003_auto_20150825_1433.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import django_prices.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0002_auto_20150820_1955'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='deliverygroup',
+            name='shipping_price',
+            field=django_prices.models.PriceField(verbose_name='shipping price', decimal_places=4, default=0, currency='USD', max_digits=12, editable=False),
+        ),
+        migrations.AlterField(
+            model_name='payment',
+            name='customer_ip_address',
+            field=models.GenericIPAddressField(blank=True, null=True),
+        ),
+    ]
diff --git a/saleor/product/migrations/0004_merge.py b/saleor/product/migrations/0004_merge.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('product', '0003_auto_20150820_1955'),
+        ('product', '0003_auto_20150820_2016'),
+    ]
+
+    operations = [
+    ]
diff --git a/saleor/product/migrations/0005_auto_20150825_1433.py b/saleor/product/migrations/0005_auto_20150825_1433.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import django_prices.models
+import saleor.product.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('product', '0004_merge'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='fixedproductdiscount',
+            name='discount',
+            field=django_prices.models.PriceField(verbose_name='discount value', max_digits=12, decimal_places=2, currency='USD'),
+        ),
+        migrations.AlterField(
+            model_name='product',
+            name='price',
+            field=django_prices.models.PriceField(verbose_name='price', max_digits=12, decimal_places=2, currency='USD'),
+        ),
+        migrations.AlterField(
+            model_name='product',
+            name='weight',
+            field=saleor.product.models.fields.WeightField(verbose_name='weight', max_digits=6, decimal_places=2, unit='lb'),
+        ),
+        migrations.AlterField(
+            model_name='productvariant',
+            name='price_override',
+            field=django_prices.models.PriceField(verbose_name='price override', decimal_places=2, blank=True, currency='USD', max_digits=12, null=True),
+        ),
+        migrations.AlterField(
+            model_name='productvariant',
+            name='weight_override',
+            field=saleor.product.models.fields.WeightField(verbose_name='weight override', decimal_places=2, blank=True, max_digits=6, unit='lb', null=True),
+        ),
+        migrations.AlterField(
+            model_name='stock',
+            name='cost_price',
+            field=django_prices.models.PriceField(verbose_name='cost price', decimal_places=2, blank=True, currency='USD', max_digits=12, null=True),
+        ),
+    ]