diff --git a/src/pretixbase/migrations/0002_auto_20150211_2031.py b/src/pretixbase/migrations/0002_auto_20150211_2031.py new file mode 100644 index 0000000000..18d6e6853c --- /dev/null +++ b/src/pretixbase/migrations/0002_auto_20150211_2031.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import pretixbase.models +import versions.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pretixbase', '0001_initial'), + ] + + operations = [ + migrations.AlterModelOptions( + name='itemcategory', + options={'verbose_name_plural': 'Item categories', 'verbose_name': 'Item category', 'ordering': ('position', 'id')}, + ), + migrations.RenameField( + model_name='cartposition', + old_name='total', + new_name='price', + ), + migrations.AlterField( + model_name='event', + name='currency', + field=models.CharField(verbose_name='Default currency', default='EUR', max_length=10), + preserve_default=True, + ), + migrations.AlterField( + model_name='event', + name='locale', + field=models.CharField(verbose_name='Default locale', choices=[('de', 'German'), ('en', 'English')], default='en', max_length=10), + preserve_default=True, + ), + migrations.AlterUniqueTogether( + name='questionanswer', + unique_together=set([]), + ), + ] diff --git a/src/pretixbase/models.py b/src/pretixbase/models.py index 756a99292f..dfecc4b2eb 100644 --- a/src/pretixbase/models.py +++ b/src/pretixbase/models.py @@ -1047,7 +1047,7 @@ class CartPosition(models.Model): null=True, blank=True, verbose_name=_("Variation") ) - total = models.DecimalField( + price = models.DecimalField( decimal_places=2, max_digits=10, verbose_name=_("Price") )