CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-04 15:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1395 -- Incorrect data in tax list exporter if an order contains multiple tax rates

Browse Source
This commit is contained in:
Raphael Michel
2019-09-10 14:41:49 +02:00
parent 5e3876ddde
commit ba555f956e
1 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,7 +378,7 @@ class OrderTaxListReportPDF(Report):
tdata = [
[
_('Order code'), _('Order date'), _('Status'), _('Payment date'), _('Order total'),
] + sum(([str(t) + ' %', ''] for t in tax_rates), []),
] + sum(([localize(t) + ' %', ''] for t in tax_rates), []),
[
'', '', '', '', ''
] + sum(([_('Gross'), _('Tax')] for t in tax_rates), []),
@@ -423,34 +423,40 @@ class OrderTaxListReportPDF(Report):
date_format(op['order__datetime'].astimezone(tz), "SHORT_DATE_FORMAT"),
status_labels[op['order__status']],
date_format(op['payment_date'], "SHORT_DATE_FORMAT") if op['payment_date'] else '',
localize(round_decimal(op['order__total'], self.event.currency))
op['order__total']
] + sum((['', ''] for t in tax_rates), []),
)
last_order_code = op['order__code']
for i, rate in enumerate(tax_rates):
odata = fee_sum_cache.get((op['order__id'], rate))
if odata:
tdata[-1][5 + 2 * i] = str(odata['grosssum'] or 0)
tdata[-1][6 + 2 * i] = str(odata['taxsum'] or 0)
tax_sums[rate] += odata['taxsum'] or 0
price_sums[rate] += odata['grosssum'] or 0
tdata[-1][5 + 2 * i] = odata['grosssum'] or Decimal('0.00')
tdata[-1][6 + 2 * i] = odata['taxsum'] or Decimal('0.00')
tax_sums[rate] += odata['taxsum'] or Decimal('0.00')
price_sums[rate] += odata['grosssum'] or Decimal('0.00')
i = tax_rates.index(op['tax_rate'])
tdata[-1][5 + 2 * i] = localize(
round_decimal(Decimal(tdata[-1][5 + 2 * i] or '0') + op['prices'], self.event.currency))
tdata[-1][6 + 2 * i] = localize(
round_decimal(Decimal(tdata[-1][6 + 2 * i] or '0') + op['tax_values'], self.event.currency))
tax_sums[op['tax_rate']] += op['tax_values']
price_sums[op['tax_rate']] += op['prices']
i = tax_rates.index(op['tax_rate'])
tdata[-1][5 + 2 * i] = (tdata[-1][5 + 2 * i] or Decimal('0.00')) + op['prices']
tdata[-1][6 + 2 * i] = (tdata[-1][6 + 2 * i] or Decimal('0.00')) + op['tax_values']
tax_sums[op['tax_rate']] += op['tax_values']
price_sums[op['tax_rate']] += op['prices']
tdata.append(
[
_('Total'), '', '', '', ''
] + sum(([
localize(round_decimal(price_sums.get(t) or Decimal('0.00'), self.event.currency)),
localize(round_decimal(tax_sums.get(t) or Decimal('0.00'), self.event.currency))
price_sums.get(t) or Decimal('0.00'),
tax_sums.get(t) or Decimal('0.00')
] for t in tax_rates), []),
)
tdata = [
[
localize(round_decimal(c, self.event.currency))
if isinstance(c, (Decimal, int, float))
else c
for c in row
] for row in tdata
]
table = Table(tdata, colWidths=colwidths, repeatRows=2)
table.setStyle(TableStyle(tstyledata))
@@ -542,8 +548,12 @@ class OrderTaxListReport(ListExporter):
tax_sums = defaultdict(Decimal)
price_sums = defaultdict(Decimal)
status_labels = dict(Order.STATUS_CHOICE)
row = None
for op in qs:
if op['order__code'] != last_order_code:
if row:
yield row
row = None
row = [
op['order__code'],
date_format(op['order__datetime'].astimezone(tz), "SHORT_DATE_FORMAT"),
@@ -560,16 +570,17 @@ class OrderTaxListReport(ListExporter):
tax_sums[rate] += odata['taxsum'] or 0
price_sums[rate] += odata['grosssum'] or 0
i = tax_rates.index(op['tax_rate'])
row[5 + 2 * i] = round_decimal(row[5 + 2 * i] + op['prices'], self.event.currency)
row[6 + 2 * i] = round_decimal(row[6 + 2 * i] + op['tax_values'], self.event.currency)
tax_sums[op['tax_rate']] += op['tax_values']
price_sums[op['tax_rate']] += op['prices']
yield row
i = tax_rates.index(op['tax_rate'])
row[5 + 2 * i] = round_decimal(row[5 + 2 * i] + op['prices'], self.event.currency)
row[6 + 2 * i] = round_decimal(row[6 + 2 * i] + op['tax_values'], self.event.currency)
tax_sums[op['tax_rate']] += op['tax_values']
price_sums[op['tax_rate']] += op['prices']
if row:
yield row
yield [
_('Total'), '', '', '', ''
] + sum(([
localize(round_decimal(price_sums.get(t) or Decimal('0.00'), self.event.currency)),
localize(round_decimal(tax_sums.get(t) or Decimal('0.00'), self.event.currency))
round_decimal(price_sums.get(t) or Decimal('0.00'), self.event.currency),
round_decimal(tax_sums.get(t) or Decimal('0.00'), self.event.currency)
] for t in tax_rates), [])