Fix locale formatting in PDF exporter

This commit is contained in:
Raphael Michel
2017-04-11 11:38:49 +02:00
parent 03d8cfb401
commit 7dd99f3d18

View File

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