CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Upgrade to Django 3.0 and other dependencies (#1568)

Browse Source 
* Upgrade Django to 3.0 and other dependencies to recent versions

* Fix otp version contsraint

* Remove six dependency

* Resolve some warnings

* Fix failing tests

* Update django-countries

* Resolve all RemovedInDjango31Warnings in test suite

* Run isort

* Fix import

* Update PostgreSQL version on travis
This commit is contained in:
Raphael Michel
2020-03-23 15:02:20 +01:00
committed by GitHub
parent 7e9c9beace
commit af23d6e4bf
174 changed files with 380 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/pretix/plugins/reports/exporters.py
View File

@@ -12,7 +12,7 @@ from django.db.models import Max, OuterRef, Subquery, Sum
from django.template.defaultfilters import floatformat
from django.utils.formats import date_format, localize
from django.utils.timezone import get_current_timezone, now
from django.utils.translation import pgettext, ugettext as _, ugettext_lazy
from django.utils.translation import gettext as _, gettext_lazy, pgettext
from reportlab.lib import colors
from pretix.base.decimal import round_decimal
@@ -150,7 +150,7 @@ class Report(ReportlabExportMixin, BaseExporter):
class OverviewReport(Report):
name = "overview"
identifier = 'pdfreport'
verbose_name = ugettext_lazy('Order overview (PDF)')
verbose_name = gettext_lazy('Order overview (PDF)')
@property
def pagesize(self):
@@ -296,7 +296,7 @@ class OverviewReport(Report):
class OrderTaxListReportPDF(Report):
name = "ordertaxlist"
identifier = 'ordertaxes'
verbose_name = ugettext_lazy('List of orders with taxes (PDF)')
verbose_name = gettext_lazy('List of orders with taxes (PDF)')
@property
def export_form_fields(self):
@@ -304,7 +304,7 @@ class OrderTaxListReportPDF(Report):
[
('status',
forms.MultipleChoiceField(
label=ugettext_lazy('Filter by status'),
label=gettext_lazy('Filter by status'),
initial=[Order.STATUS_PAID],
choices=Order.STATUS_CHOICE,
widget=forms.CheckboxSelectMultiple,
@@ -312,11 +312,11 @@ class OrderTaxListReportPDF(Report):
)),
('sort',
forms.ChoiceField(
label=ugettext_lazy('Sort by'),
label=gettext_lazy('Sort by'),
initial='datetime',
choices=(
('datetime', ugettext_lazy('Order date')),
('payment_date', ugettext_lazy('Payment date')),
('datetime', gettext_lazy('Order date')),
('payment_date', gettext_lazy('Payment date')),
),
widget=forms.RadioSelect,
required=False
@@ -467,7 +467,7 @@ class OrderTaxListReportPDF(Report):
class OrderTaxListReport(ListExporter):
identifier = 'ordertaxeslist'
verbose_name = ugettext_lazy('List of orders with taxes')
verbose_name = gettext_lazy('List of orders with taxes')
@property
def export_form_fields(self):
@@ -487,8 +487,8 @@ class OrderTaxListReport(ListExporter):
label=_('Sort by'),
initial='datetime',
choices=(
('datetime', ugettext_lazy('Order date')),
('payment_date', ugettext_lazy('Payment date')),
('datetime', gettext_lazy('Order date')),
('payment_date', gettext_lazy('Payment date')),
),
widget=forms.RadioSelect,
required=False