Bump version

The boxes vor adding and editing vouchers were switched for new users.

src/pretix/__init__.py

@@ -1 +1 @@
-__version__ = "1.2.0"
+__version__ = "1.2.1"

src/pretix/control/templates/pretixcontrol/event/permissions.html

@@ -72,8 +72,8 @@
                             <td>{{ add_form.can_view_orders }}</td>
                             <td>{{ add_form.can_change_orders }}</td>
                             <td>{{ add_form.can_change_permissions }}</td>
-                            <td>{{ add_form.can_change_vouchers }}</td>
                             <td>{{ add_form.can_view_vouchers }}</td>
+                            <td>{{ add_form.can_change_vouchers }}</td>
                         </tr>
                     </tfoot>
                 </table>

src/pretix/plugins/reports/exporters.py

@@ -7,7 +7,7 @@ from django import forms
 from django.conf import settings
 from django.contrib.staticfiles import finders
 from django.db.models import Sum
-from django.utils.formats import date_format
+from django.utils.formats import date_format, localize
 from django.utils.timezone import now
 from django.utils.translation import ugettext as _
 
@@ -187,43 +187,43 @@ class OverviewReport(Report):
                 tstyledata.append(('FONTNAME', (0, len(tdata)), (-1, len(tdata)), 'OpenSansBd'))
                 tdata.append([
                     tup[0].name,
-                    str(tup[0].num_canceled[0]), str(tup[0].num_canceled[1]),
-                    str(tup[0].num_refunded[0]), str(tup[0].num_refunded[1]),
-                    str(tup[0].num_expired[0]), str(tup[0].num_expired[1]),
-                    str(tup[0].num_pending[0]), str(tup[0].num_pending[1]),
-                    str(tup[0].num_paid[0]), str(tup[0].num_paid[1]),
-                    str(tup[0].num_total[0]), str(tup[0].num_total[1]),
+                    str(tup[0].num_canceled[0]), localize(tup[0].num_canceled[1]),
+                    str(tup[0].num_refunded[0]), localize(tup[0].num_refunded[1]),
+                    str(tup[0].num_expired[0]), localize(tup[0].num_expired[1]),
+                    str(tup[0].num_pending[0]), localize(tup[0].num_pending[1]),
+                    str(tup[0].num_paid[0]), localize(tup[0].num_paid[1]),
+                    str(tup[0].num_total[0]), localize(tup[0].num_total[1]),
                 ])
             for item in tup[1]:
                 tdata.append([
                     "     " + str(item.name),
-                    str(item.num_canceled[0]), str(item.num_canceled[1]),
-                    str(item.num_refunded[0]), str(item.num_refunded[1]),
-                    str(item.num_expired[0]), str(item.num_expired[1]),
-                    str(item.num_pending[0]), str(item.num_pending[1]),
-                    str(item.num_paid[0]), str(item.num_paid[1]),
-                    str(item.num_total[0]), str(item.num_total[1]),
+                    str(item.num_canceled[0]), localize(item.num_canceled[1]),
+                    str(item.num_refunded[0]), localize(item.num_refunded[1]),
+                    str(item.num_expired[0]), localize(item.num_expired[1]),
+                    str(item.num_pending[0]), localize(item.num_pending[1]),
+                    str(item.num_paid[0]), localize(item.num_paid[1]),
+                    str(item.num_total[0]), localize(item.num_total[1]),
                 ])
                 if item.has_variations:
                     for var in item.all_variations:
                         tdata.append([
                             "          " + str(var),
-                            str(var.num_canceled[0]), str(var.num_canceled[1]),
-                            str(var.num_refunded[0]), str(var.num_refunded[1]),
-                            str(var.num_expired[0]), str(var.num_expired[1]),
-                            str(var.num_pending[0]), str(var.num_pending[1]),
-                            str(var.num_paid[0]), str(var.num_paid[1]),
-                            str(var.num_total[0]), str(var.num_total[1]),
+                            str(var.num_canceled[0]), localize(var.num_canceled[1]),
+                            str(var.num_refunded[0]), localize(var.num_refunded[1]),
+                            str(var.num_expired[0]), localize(var.num_expired[1]),
+                            str(var.num_pending[0]), localize(var.num_pending[1]),
+                            str(var.num_paid[0]), localize(var.num_paid[1]),
+                            str(var.num_total[0]), localize(var.num_total[1]),
                         ])
 
         tdata.append([
             _("Total"),
-            str(total['num_canceled'][0]), str(total['num_canceled'][1]),
-            str(total['num_refunded'][0]), str(total['num_refunded'][1]),
-            str(total['num_expired'][0]), str(total['num_expired'][1]),
-            str(total['num_pending'][0]), str(total['num_pending'][1]),
-            str(total['num_paid'][0]), str(total['num_paid'][1]),
-            str(total['num_total'][0]), str(total['num_total'][1]),
+            str(total['num_canceled'][0]), localize(total['num_canceled'][1]),
+            str(total['num_refunded'][0]), localize(total['num_refunded'][1]),
+            str(total['num_expired'][0]), localize(total['num_expired'][1]),
+            str(total['num_pending'][0]), localize(total['num_pending'][1]),
+            str(total['num_paid'][0]), localize(total['num_paid'][1]),
+            str(total['num_total'][0]), localize(total['num_total'][1]),
         ])
 
         table = Table(tdata, colWidths=colwidths, repeatRows=3)

src/requirements/production.txt

@@ -1,5 +1,5 @@
 # Functional requirements
-Django==1.10.*
+Django>=1.10.7,<1.11
 python-dateutil
 pytz
 django-bootstrap3==8.0.*