diff --git a/src/pretix/control/templates/pretixcontrol/items/index.html b/src/pretix/control/templates/pretixcontrol/items/index.html index fa309a0d8..52bc17f01 100644 --- a/src/pretix/control/templates/pretixcontrol/items/index.html +++ b/src/pretix/control/templates/pretixcontrol/items/index.html @@ -136,9 +136,15 @@ {% if i.tax_rule and i.default_price %}
- {% blocktrans trimmed with rate=i.tax_rule.rate|floatformat:-2 taxname=i.tax_rule.name|default:s_taxes %} - incl. {{ rate }}% {{ taxname }} - {% endblocktrans %} + {% if not i.tax_rule.price_includes_tax %} + {% blocktrans trimmed with rate=i.tax_rule.rate|floatformat:-2 taxname=i.tax_rule.name %} + plus {{ rate }}% {{ taxname }} + {% endblocktrans %} + {% else %} + {% blocktrans trimmed with rate=i.tax_rule.rate|floatformat:-2 taxname=i.tax_rule.name|default:s_taxes %} + incl. {{ rate }}% {{ taxname }} + {% endblocktrans %} + {% endif %} {% endif %} diff --git a/src/pretix/control/views/item.py b/src/pretix/control/views/item.py index c6810ce58..c7ef713fd 100644 --- a/src/pretix/control/views/item.py +++ b/src/pretix/control/views/item.py @@ -103,7 +103,7 @@ class ItemList(ListView): def get_queryset(self): return Item.objects.filter( event=self.request.event - ).annotate( + ).select_related("tax_rule").annotate( var_count=Count('variations') ).prefetch_related("category", "limit_sales_channels").order_by( F('category__position').asc(nulls_first=True),