Order bulk action: Remove nonsensical <form action> attribute

The old code relied on the `Voucher.redeemed` value obtained *before*
the lock was taken, not afterwards.

The change in services/orders.py is functionally pointless, but it makes
the pattern of "fill availability only after lock" clearer and might
avoid introducing similar bugs in the future.

Dockerfile

@@ -31,6 +31,7 @@ RUN apt-get update && \
     mkdir /etc/pretix && \
     mkdir /data && \
     useradd -ms /bin/bash -d /pretix -u 15371 pretixuser && \
+    chmod 0755 /pretix && \
     echo 'pretixuser ALL=(ALL) NOPASSWD:SETENV: /usr/bin/supervisord' >> /etc/sudoers && \
     mkdir /static && \
     mkdir /etc/supervisord

doc/api/resources/item_program_times.rst

@@ -16,6 +16,7 @@ Field                                 Type                       Description
 id                                    integer                    Internal ID of the program time
 start                                 datetime                   The start date time for this program time slot.
 end                                   datetime                   The end date time for this program time slot.
+location                              multi-lingual string       The program time slot's location (or ``null``)
 ===================================== ========================== =======================================================
 
 .. versionchanged:: TODO
@@ -54,17 +55,20 @@ Endpoints
             {
                "id": 2,
                "start": "2025-08-14T22:00:00Z",
-               "end": "2025-08-15T00:00:00Z"
+               "end": "2025-08-15T00:00:00Z",
+               "location": null
             },
             {
                "id": 3,
                "start": "2025-08-12T22:00:00Z",
-               "end": "2025-08-13T22:00:00Z"
+               "end": "2025-08-13T22:00:00Z",
+               "location": null
             },
             {
                "id": 14,
                "start": "2025-08-15T22:00:00Z",
-               "end": "2025-08-17T22:00:00Z"
+               "end": "2025-08-17T22:00:00Z",
+               "location": null
             }
         ]
       }
@@ -99,7 +103,8 @@ Endpoints
       {
          "id": 1,
          "start": "2025-08-15T22:00:00Z",
-         "end": "2025-10-27T23:00:00Z"
+         "end": "2025-10-27T23:00:00Z",
+         "location": null
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -125,7 +130,8 @@ Endpoints
 
       {
         "start": "2025-08-15T10:00:00Z",
-        "end": "2025-08-15T22:00:00Z"
+        "end": "2025-08-15T22:00:00Z",
+        "location": null
       }
 
    **Example response**:
@@ -139,7 +145,8 @@ Endpoints
       {
         "id": 17,
         "start": "2025-08-15T10:00:00Z",
-        "end": "2025-08-15T22:00:00Z"
+        "end": "2025-08-15T22:00:00Z",
+        "location": null
       }
 
    :param organizer: The ``slug`` field of the organizer of the event/item to create a program time for

src/pretix/__init__.py

@@ -19,4 +19,4 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-__version__ = "2026.4.0.dev0"
+__version__ = "2026.5.0.dev0"

src/pretix/api/serializers/item.py

@@ -191,7 +191,7 @@ class InlineItemAddOnSerializer(serializers.ModelSerializer):
 class InlineItemProgramTimeSerializer(serializers.ModelSerializer):
     class Meta:
         model = ItemProgramTime
-        fields = ('start', 'end')
+        fields = ('start', 'end', 'location')
 
 
 class ItemBundleSerializer(serializers.ModelSerializer):
@@ -222,7 +222,7 @@ class ItemBundleSerializer(serializers.ModelSerializer):
 class ItemProgramTimeSerializer(serializers.ModelSerializer):
     class Meta:
         model = ItemProgramTime
-        fields = ('id', 'start', 'end')
+        fields = ('id', 'start', 'end', 'location')
 
     def validate(self, data):
         data = super().validate(data)

src/pretix/api/serializers/order.py

@@ -1416,6 +1416,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         qa = QuotaAvailability()
         qa.queue(*[q for q, d in quota_diff_for_locking.items() if d > 0])
         qa.compute()
+        v_avail = {}
 
         # These are not technically correct as diff use due to the time offset applied above, so let's prevent accidental
         # use further down
@@ -1445,11 +1446,13 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
 
                 voucher_usage[v] += 1
                 if voucher_usage[v] > 0:
-                    redeemed_in_carts = CartPosition.objects.filter(
-                        Q(voucher=pos_data['voucher']) & Q(event=self.context['event']) & Q(expires__gte=now_dt)
-                    ).exclude(pk__in=[cp.pk for cp in delete_cps])
-                    v_avail = v.max_usages - v.redeemed - redeemed_in_carts.count()
-                    if v_avail < voucher_usage[v]:
+                    if v not in v_avail:
+                        v.refresh_from_db(fields=['redeemed'])
+                        redeemed_in_carts = CartPosition.objects.filter(
+                            Q(voucher=v) & Q(event=self.context['event']) & Q(expires__gte=now_dt)
+                        ).exclude(pk__in=[cp.pk for cp in delete_cps])
+                        v_avail[v] = v.max_usages - v.redeemed - redeemed_in_carts.count()
+                    if v_avail[v] < voucher_usage[v]:
                         errs[i]['voucher'] = [
                             'The voucher has already been used the maximum number of times.'
                         ]

src/pretix/base/migrations/0299_itemprogramtime_location.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.27 on 2026-01-21 12:06
+
+import i18nfield.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("pretixbase", "0298_pluggable_permissions"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="itemprogramtime",
+            name="location",
+            field=i18nfield.fields.I18nTextField(max_length=200, null=True),
+        )
+    ]

src/pretix/base/models/items.py

@@ -2306,10 +2306,17 @@ class ItemProgramTime(models.Model):
     :type start: datetime
     :param end: The date and time this program time ends
     :type end: datetime
+    :param location: venue
+    :type location: str
     """
     item = models.ForeignKey('Item', related_name='program_times', on_delete=models.CASCADE)
     start = models.DateTimeField(verbose_name=_("Start"))
     end = models.DateTimeField(verbose_name=_("End"))
+    location = I18nTextField(
+        null=True, blank=True,
+        max_length=200,
+        verbose_name=_("Location"),
+    )
 
     def clean(self):
         if hasattr(self, 'item') and self.item and self.item.event.has_subevents:

src/pretix/base/pdf.py

@@ -498,9 +498,9 @@ DEFAULT_VARIABLES = OrderedDict((
         ) if op.valid_until else ""
     }),
     ("program_times", {
-        "label": _("Program times: date and time"),
+        "label": _("Program times"),
         "editor_sample": _(
-            "2017-05-31 10:00 – 12:00\n2017-05-31 14:00 – 16:00\n2017-05-31 14:00 – 2017-06-01 14:00"),
+            "2017-05-31 10:00 – 12:00, Room 1\n2017-05-31 14:00 – 16:00, Room 2\n2017-05-31 14:00 – 2017-06-01 14:00, Building A"),
         "evaluate": lambda op, order, ev: get_program_times(op, ev)
     }),
     ("medium_identifier", {
@@ -748,13 +748,19 @@ def get_seat(op: OrderPosition):
 
 
 def get_program_times(op: OrderPosition, ev: Event):
-    return '\n'.join([
-        datetimerange(
-            pt.start.astimezone(ev.timezone),
-            pt.end.astimezone(ev.timezone),
-            as_html=False
-        ) for pt in op.item.program_times.all()
-    ])
+    ptstr = []
+    for pt in op.item.program_times.all():
+        ptstr.append([
+            datetimerange(
+                pt.start.astimezone(ev.timezone),
+                pt.end.astimezone(ev.timezone),
+                as_html=False
+            ),
+            (', ' + ', '.join(
+                l.strip() for l in str(pt.location).splitlines() if l.strip())
+             ) if str(pt.location).strip() else ''
+        ])
+    return '\n'.join(''.join(l) for l in ptstr)
 
 
 def generate_compressed_addon_list(op, order, event, only_checked_in=False):
@@ -923,7 +929,7 @@ class Renderer:
 
             # We do not use str.format like in emails so we (a) can evaluate lazily and (b) can re-implement this
             # 1:1 on other platforms that render PDFs through our API (libpretixprint)
-            return re.sub(r'\{([a-zA-Z0-9:_]+)\}', replace, text)
+            return re.sub(r'\{([-a-zA-Z0-9:_]+)\}', replace, text)
 
         elif o['content'].startswith('itemmeta:'):
             if op.variation_id:

src/pretix/base/services/orders.py

@@ -727,8 +727,6 @@ def _check_positions(event: Event, now_dt: datetime, time_machine_now_dt: dateti
     _check_date(event, time_machine_now_dt)
 
     products_seen = Counter()
-    q_avail = Counter()
-    v_avail = Counter()
     v_usages = Counter()
     v_budget = {}
     deleted_positions = set()
@@ -793,6 +791,9 @@ def _check_positions(event: Event, now_dt: datetime, time_machine_now_dt: dateti
                 shared_lock_objects=[event]
             )
 
+    q_avail = Counter()
+    v_avail = Counter()
+
     # Check maximum order size
     limit = min(int(event.settings.max_items_per_order), settings.PRETIX_MAX_ORDER_SIZE)
     if sum(1 for cp in sorted_positions if not cp.addon_to) > limit:

src/pretix/control/forms/item.py

@@ -574,7 +574,7 @@ class ItemCreateForm(I18nModelForm):
                 instance.bundles.create(bundled_item=b.bundled_item, bundled_variation=b.bundled_variation,
                                         count=b.count, designated_price=b.designated_price)
             for pt in self.cleaned_data['copy_from'].program_times.all():
-                instance.program_times.create(start=pt.start, end=pt.end)
+                instance.program_times.create(start=pt.start, end=pt.end, location=pt.location)
 
             item_copy_data.send(sender=self.event, source=self.cleaned_data['copy_from'], target=instance)
 
@@ -1354,6 +1354,10 @@ class ItemProgramTimeForm(I18nModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['end'].widget.attrs['data-date-after'] = '#id_{prefix}-start_0'.format(prefix=self.prefix)
+        self.fields['location'].widget.attrs['rows'] = '3'
+        self.fields['location'].widget.attrs['placeholder'] = _(
+            'Sample Conference Center, Heidelberg, Germany'
+        )
 
     class Meta:
         model = ItemProgramTime
@@ -1361,6 +1365,7 @@ class ItemProgramTimeForm(I18nModelForm):
         fields = [
             'start',
             'end',
+            'location'
         ]
         field_classes = {
             'start': forms.SplitDateTimeField,

src/pretix/control/templates/pretixcontrol/item/include_program_times.html

@@ -34,6 +34,7 @@
                     {% bootstrap_form_errors form %}
                     {% bootstrap_field form.start layout="control" %}
                     {% bootstrap_field form.end layout="control" %}
+                    {% bootstrap_field form.location layout="control" %}
                 </div>
             </div>
         {% endfor %}
@@ -59,6 +60,7 @@
                 <div class="panel-body form-horizontal">
                     {% bootstrap_field formset.empty_form.start layout="control" %}
                     {% bootstrap_field formset.empty_form.end layout="control" %}
+                    {% bootstrap_field formset.empty_form.location layout="control" %}
                 </div>
             </div>
         {% endescapescript %}

src/pretix/control/templates/pretixcontrol/orders/index.html

@@ -108,7 +108,7 @@
                 </a>
             </p>
         {% endif %}
-        <form action="{% url "control:organizer.device.bulk_edit" organizer=request.organizer.slug %}" method="post">
+        <form action="#will-be-overridden" method="post">
             {% csrf_token %}
             {% for field in filter_form %}
                 {{ field.as_hidden }}

src/pretix/helpers/thumb.py

@@ -173,6 +173,7 @@ def create_thumbnail(source, size, formats=None):
     # filesystem path, this only works because _open() uses safe_join, which accepts absolute paths if they match the
     # expected base dir. For NanoCDN Files, this works because source.name is set to the storage path.
     source_rb = default_storage.open(source_name, mode='rb')
+    source_ext = os.path.splitext(source_name)[1].lower()
 
     image = Image.open(BytesIO(source_rb.read()), formats=formats or settings.PILLOW_FORMATS_QUESTIONS_IMAGE)
     try:
@@ -183,11 +184,14 @@ def create_thumbnail(source, size, formats=None):
     frames = []
     durations = []
     for f in ImageSequence.Iterator(image):
+        if f.mode in ("P", "PA") and source_ext == '.png':
+            f = f.convert('RGBA')
+        if f.mode not in ("1", "L", "RGB", "RGBA"):
+            f = f.convert('RGB')
         durations.append(f.info.get("duration", 1000))
         frames.append(resize_image(f, size))
     image_out = frames[0]
     save_kwargs = {}
-    source_ext = os.path.splitext(source_name)[1].lower()
 
     if source_ext == '.jpg' or source_ext == '.jpeg':
         # Yields better file sizes for photos
@@ -211,10 +215,6 @@ def create_thumbnail(source, size, formats=None):
     checksum = hashlib.md5(image.tobytes()).hexdigest()
     name = checksum + '.' + size.replace('^', 'c') + '.' + target_ext
     buffer = BytesIO()
-    if image_out.mode == "P" and source_ext == '.png':
-        image_out = image_out.convert('RGBA')
-    if image_out.mode not in ("1", "L", "RGB", "RGBA"):
-        image_out = image_out.convert('RGB')
     image_out.save(fp=buffer, format=target_ext.upper(), quality=quality, **save_kwargs)
     imgfile = ContentFile(buffer.getvalue())
 

src/pretix/locale/de/LC_MESSAGES/django.po

@@ -5,16 +5,16 @@ msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-04-28 09:03+0000\n"
-"PO-Revision-Date: 2026-03-30 11:50+0000\n"
+"PO-Revision-Date: 2026-04-28 09:22+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
-"Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix/de/"
-">\n"
+"Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix/"
+"de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.16.2\n"
+"X-Generator: Weblate 5.17\n"
 "X-Poedit-Bookmarks: -1,-1,904,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: pretix/_base_settings.py:87
@@ -8226,10 +8226,8 @@ msgstr ""
 "2x Workshop 2"
 
 #: pretix/base/pdf.py:383
-#, fuzzy
-#| msgid "List of Add-Ons"
 msgid "List of Checked-In Add-Ons"
-msgstr "Liste der Zusatz-Produkte"
+msgstr "Liste der eingecheckten Zusatzprodukte"
 
 #: pretix/base/pdf.py:390 pretix/control/forms/filter.py:1537
 #: pretix/control/forms/filter.py:1539
@@ -9236,10 +9234,8 @@ msgid "Czech National Bank"
 msgstr "Tschechische Nationalbank"
 
 #: pretix/base/services/currencies.py:41
-#, fuzzy
-#| msgid "Czech National Bank"
 msgid "National Bank of Poland"
-msgstr "Tschechische Nationalbank"
+msgstr "Nationalbank von Polen"
 
 #: pretix/base/services/export.py:95 pretix/base/services/export.py:155
 msgid ""
@@ -10330,16 +10326,12 @@ msgstr ""
 "Rechnungsbetrag nicht in CZK ist."
 
 #: pretix/base/settings.py:577 pretix/base/settings.py:586
-#, fuzzy
-#| msgid ""
-#| "Based on Czech National Bank daily rates, whenever the invoice amount is "
-#| "not in CZK."
 msgid ""
 "Based on National Bank of Poland daily rates, whenever the invoice amount is "
 "not in PLN."
 msgstr ""
-"Basierend auf den Kursen der Tschechischen Nationalbank, immer wenn der "
-"Rechnungsbetrag nicht in CZK ist."
+"Basierend auf den Kursen der Nationalbank von Polen, immer wenn der "
+"Rechnungsbetrag nicht in PLN ist."
 
 #: pretix/base/settings.py:597
 msgid "Require invoice address"
@@ -16440,10 +16432,8 @@ msgid "Allow to overbook quotas when performing this operation"
 msgstr "Überbuchen von Kontingenten bei dieser Aktion erlauben"
 
 #: pretix/control/forms/orders.py:335
-#, fuzzy
-#| msgid "Number of orders"
 msgid "Number of products to add"
-msgstr "Anzahl Bestellungen"
+msgstr "Anzahl hinzuzufügender Produkt"
 
 #: pretix/control/forms/orders.py:344
 msgid "Add-on to"
@@ -16475,10 +16465,10 @@ msgstr ""
 "Produktes."
 
 #: pretix/control/forms/orders.py:441
-#, fuzzy
-#| msgid "You can not select the same seat multiple times."
 msgid "You can not choose a seat when adding multiple products at once."
-msgstr "Sie können den gleichen Sitzplatz nicht mehrfach auswählen."
+msgstr ""
+"Sie können keinen Sitzplatz auswählen, wenn mehrere Produkte auf einmal "
+"hinzugefügt werden."
 
 #: pretix/control/forms/orders.py:478 pretix/control/forms/orders.py:482
 #: pretix/control/forms/orders.py:510 pretix/control/forms/orders.py:552
@@ -17097,7 +17087,7 @@ msgstr "Wochenendtag"
 #: pretix/control/forms/subevents.py:106
 msgctxt "subevent"
 msgid "Skip dates that overlap with any existing date"
-msgstr ""
+msgstr "Überspringe Termine, die mit einem bestehenden Termin überlappen"
 
 #: pretix/control/forms/subevents.py:109
 msgctxt "subevent"
@@ -17107,6 +17097,10 @@ msgid ""
 "This respects even inactive dates and works best if all dates have both a "
 "start and end time."
 msgstr ""
+"Dies kann nützlich sein, wenn alle Termine am selben Ort stattfinden und "
+"wiederholte Termine nicht in Konflikt mit existierenden Sonderterminen "
+"geraten sollen. Dies berücksichtigt auch inaktive Termine und funktioniert "
+"am besten, wenn alle Termine eine Start- und Endzeit haben."
 
 #: pretix/control/forms/subevents.py:128
 msgid "Keep the current values"
@@ -30276,6 +30270,8 @@ msgstr "Bitte erstelle maximal 100.000 Termine auf einmal."
 #: pretix/control/views/subevents.py:966
 msgid "All dates would be skipped because they conflict with existing dates."
 msgstr ""
+"Alle Termine würden übersprungen werden, weil sie mit existierenden Terminen "
+"überlappen."
 
 #: pretix/control/views/subevents.py:1102
 #, python-brace-format

src/pretix/locale/de_Informal/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-04-28 09:03+0000\n"
-"PO-Revision-Date: 2026-03-30 11:50+0000\n"
+"PO-Revision-Date: 2026-04-28 09:22+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German (informal) <https://translate.pretix.eu/projects/"
 "pretix/pretix/de_Informal/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.16.2\n"
+"X-Generator: Weblate 5.17\n"
 
 #: pretix/_base_settings.py:87
 msgid "English"
@@ -8219,10 +8219,8 @@ msgstr ""
 "2x Workshop 2"
 
 #: pretix/base/pdf.py:383
-#, fuzzy
-#| msgid "List of Add-Ons"
 msgid "List of Checked-In Add-Ons"
-msgstr "Liste der Zusatz-Produkte"
+msgstr "Liste der eingecheckten Zusatzprodukte"
 
 #: pretix/base/pdf.py:390 pretix/control/forms/filter.py:1537
 #: pretix/control/forms/filter.py:1539
@@ -9226,10 +9224,8 @@ msgid "Czech National Bank"
 msgstr "Tschechische Nationalbank"
 
 #: pretix/base/services/currencies.py:41
-#, fuzzy
-#| msgid "Czech National Bank"
 msgid "National Bank of Poland"
-msgstr "Tschechische Nationalbank"
+msgstr "Nationalbank von Polen"
 
 #: pretix/base/services/export.py:95 pretix/base/services/export.py:155
 msgid ""
@@ -10318,16 +10314,12 @@ msgstr ""
 "Rechnungsbetrag nicht in CZK ist."
 
 #: pretix/base/settings.py:577 pretix/base/settings.py:586
-#, fuzzy
-#| msgid ""
-#| "Based on Czech National Bank daily rates, whenever the invoice amount is "
-#| "not in CZK."
 msgid ""
 "Based on National Bank of Poland daily rates, whenever the invoice amount is "
 "not in PLN."
 msgstr ""
-"Basierend auf den Kursen der Tschechischen Nationalbank, immer wenn der "
-"Rechnungsbetrag nicht in CZK ist."
+"Basierend auf den Kursen der Nationalbank von Polen, immer wenn der "
+"Rechnungsbetrag nicht in PLN ist."
 
 #: pretix/base/settings.py:597
 msgid "Require invoice address"
@@ -16417,10 +16409,8 @@ msgid "Allow to overbook quotas when performing this operation"
 msgstr "Überbuchen von Kontingenten bei dieser Aktion erlauben"
 
 #: pretix/control/forms/orders.py:335
-#, fuzzy
-#| msgid "Number of orders"
 msgid "Number of products to add"
-msgstr "Anzahl Bestellungen"
+msgstr "Anzahl hinzuzufügender Produkt"
 
 #: pretix/control/forms/orders.py:344
 msgid "Add-on to"
@@ -16452,10 +16442,10 @@ msgstr ""
 "Produktes."
 
 #: pretix/control/forms/orders.py:441
-#, fuzzy
-#| msgid "You can not select the same seat multiple times."
 msgid "You can not choose a seat when adding multiple products at once."
-msgstr "Du kannst den gleichen Sitzplatz nicht mehrfach auswählen."
+msgstr ""
+"Du kannst keinen Sitzplatz auswählen, wenn mehrere Produkte auf einmal "
+"hinzugefügt werden."
 
 #: pretix/control/forms/orders.py:478 pretix/control/forms/orders.py:482
 #: pretix/control/forms/orders.py:510 pretix/control/forms/orders.py:552
@@ -17075,7 +17065,7 @@ msgstr "Wochenendtag"
 #: pretix/control/forms/subevents.py:106
 msgctxt "subevent"
 msgid "Skip dates that overlap with any existing date"
-msgstr ""
+msgstr "Überspringe Termine, die mit einem bestehenden Termin überlappen"
 
 #: pretix/control/forms/subevents.py:109
 msgctxt "subevent"
@@ -17085,6 +17075,10 @@ msgid ""
 "This respects even inactive dates and works best if all dates have both a "
 "start and end time."
 msgstr ""
+"Dies kann nützlich sein, wenn alle Termine am selben Ort stattfinden und "
+"wiederholte Termine nicht in Konflikt mit existierenden Sonderterminen "
+"geraten sollen. Dies berücksichtigt auch inaktive Termine und funktioniert "
+"am besten, wenn alle Termine eine Start- und Endzeit haben."
 
 #: pretix/control/forms/subevents.py:128
 msgid "Keep the current values"
@@ -30232,6 +30226,8 @@ msgstr "Bitte erstelle maximal 100.000 Termine auf einmal."
 #: pretix/control/views/subevents.py:966
 msgid "All dates would be skipped because they conflict with existing dates."
 msgstr ""
+"Alle Termine würden übersprungen werden, weil sie mit existierenden Terminen "
+"überlappen."
 
 #: pretix/control/views/subevents.py:1102
 #, python-brace-format

src/pretix/plugins/badges/exporters.py

@@ -57,7 +57,7 @@ from django.utils.translation import gettext as _, gettext_lazy, pgettext_lazy
 from pypdf import PageObject, PdfReader, PdfWriter, Transformation
 from pypdf.generic import RectangleObject
 from reportlab.lib import pagesizes
-from reportlab.lib.units import mm
+from reportlab.lib.units import inch, mm
 from reportlab.pdfgen import canvas
 
 from pretix.base.exporter import BaseExporter
@@ -133,6 +133,14 @@ OPTIONS = OrderedDict([
         'offsets': [66.1 * mm, 29.6 * mm],
         'pagesize': pagesizes.A4,
     }),
+    ('avery_4inx3in', {
+        'name': 'Avery 4" x 3" (74459)',
+        'cols': 2,
+        'rows': 3,
+        'margins': [1 * inch, .25 * inch, 1 * inch, .25 * inch],
+        'offsets': [4 * inch, 3 * inch],
+        'pagesize': pagesizes.LETTER,
+    }),
     ('avery_80x50', {
         'name': 'Avery Zweckform 80 x 50 mm (L4785)',
         'cols': 2,

src/pretix/plugins/badges/templates.py

@@ -22,7 +22,7 @@
 from django.utils.text import format_lazy
 from django.utils.translation import gettext_lazy as _
 from reportlab.lib import pagesizes
-from reportlab.lib.units import mm
+from reportlab.lib.units import inch, mm
 
 
 def _simple_template(w, h):
@@ -261,4 +261,9 @@ TEMPLATES = {
         "pagesize": (88.9 * mm, 33.87 * mm),
         "layout": _simple_template(88.9 * mm, 33.87 * mm),
     },
+    "4inx3in": {
+        "label": format_lazy(_("{width} x {height} inch label"), width=4, height=3),
+        "pagesize": (4 * inch, 3 * inch),
+        "layout": _simple_template(4 * inch, 3 * inch),
+    },
 }

src/pretix/presale/checkoutflow.py

@@ -37,6 +37,7 @@ import uuid
 from collections import defaultdict
 from decimal import Decimal
 
+from django import forms
 from django.conf import settings
 from django.contrib import messages
 from django.core.cache import caches
@@ -69,6 +70,7 @@ from pretix.base.services.cart import (
 from pretix.base.services.cross_selling import CrossSellingService
 from pretix.base.services.memberships import validate_memberships_in_order
 from pretix.base.services.orders import perform_order
+from pretix.base.services.pricing import get_price
 from pretix.base.services.tasks import EventTask
 from pretix.base.settings import PERSON_NAME_SCHEMES
 from pretix.base.signals import validate_cart_addons
@@ -529,6 +531,48 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
         self._completed = True
         return True
 
+    def _get_initial_val_price(self, current_addon_products, cartpos, item, variation):
+        val = None
+        price = None
+
+        if self.request.POST:
+            if variation:
+                field = f'cp_{cartpos.pk}_variation_{item.pk}_{variation.pk}'
+            else:
+                field = f'cp_{cartpos.pk}_item_{item.pk}'
+
+            try:
+                val = int(self.request.POST.get(field) or '0')
+            except ValueError:
+                pass
+            if val and item.free_price:
+                custom_price = forms.DecimalField(localize=True).to_python(self.request.POST.get(f'{field}_price') or '0')
+                price = get_price(
+                    item, variation, voucher=cartpos.voucher, custom_price=custom_price, subevent=cartpos.subevent,
+                    custom_price_is_net=self.event.settings.display_net_prices,
+                    invoice_address=self.invoice_address,
+                )
+            else:
+                price = variation.suggested_price if variation else item.suggested_price
+
+        else:
+            current_products = current_addon_products[item.pk, variation.pk if variation else None]
+            val = len(current_products)
+            if current_products and item.free_price:
+                a = current_products[0]
+                price = TaxedPrice(
+                    net=a.price - a.tax_value,
+                    gross=a.price,
+                    tax=a.tax_value,
+                    name=a.item.tax_rule.name if a.item.tax_rule else "",
+                    rate=a.tax_rate,
+                    code=a.item.tax_rule.code if a.item.tax_rule else None,
+                )
+            else:
+                price = variation.suggested_price if variation else item.suggested_price
+
+        return val, price
+
     @cached_property
     def forms(self):
         """
@@ -587,34 +631,10 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
 
                     if i.has_variations:
                         for v in i.available_variations:
-                            v.initial = len(current_addon_products[i.pk, v.pk])
-                            if v.initial and i.free_price:
-                                a = current_addon_products[i.pk, v.pk][0]
-                                v.initial_price = TaxedPrice(
-                                    net=a.price - a.tax_value,
-                                    gross=a.price,
-                                    tax=a.tax_value,
-                                    name=a.item.tax_rule.name if a.item.tax_rule else "",
-                                    rate=a.tax_rate,
-                                    code=a.item.tax_rule.code if a.item.tax_rule else None,
-                                )
-                            else:
-                                v.initial_price = v.suggested_price
+                            v.initial, v.initial_price = self._get_initial_val_price(current_addon_products, cartpos, i, v)
                         i.expand = any(v.initial for v in i.available_variations)
                     else:
-                        i.initial = len(current_addon_products[i.pk, None])
-                        if i.initial and i.free_price:
-                            a = current_addon_products[i.pk, None][0]
-                            i.initial_price = TaxedPrice(
-                                net=a.price - a.tax_value,
-                                gross=a.price,
-                                tax=a.tax_value,
-                                name=a.item.tax_rule.name if a.item.tax_rule else "",
-                                rate=a.tax_rate,
-                                code=a.item.tax_rule.code if a.item.tax_rule else None,
-                            )
-                        else:
-                            i.initial_price = i.suggested_price
+                        i.initial, i.initial_price = self._get_initial_val_price(current_addon_products, cartpos, i, None)
 
                 if items:
                     formsetentry['categories'].append({

src/pretix/presale/ical.py

@@ -153,7 +153,7 @@ def get_private_icals(event, positions):
                     # Actual ical organizer field is not useful since it will cause "your invitation was accepted" emails to the organizer
                     descr.append(_('Organizer: {organizer}').format(organizer=event.organizer.name))
                     description = '\n'.join(descr)
-                location = None
+                location = ", ".join(l.strip() for l in str(pt.location).splitlines() if l.strip())
                 dtstart = pt.start.astimezone(tz)
                 dtend = pt.end.astimezone(tz)
                 uid = 'pretix-{}-{}-{}-{}@{}'.format(

src/pretix/presale/templates/pretixpresale/event/fragment_addon_choice.html

@@ -95,17 +95,17 @@
                         <div class="col-md-2 col-sm-3 col-xs-6 availability-box">
                             {% if not event.settings.show_variations_expanded %}
                                 <button type="button" data-toggle="variations" class="btn btn-default btn-block js-only"
-                                        data-label-alt="{% trans "Hide variants" %}"
-                                        aria-expanded="false" aria-controls="cp-{{ form.pos.pk }}-item-{{ item.pk }}-variations"
+                                        data-label-alt="{% if item.expand %}{% trans "Show variants" %}{% else %}{% trans "Hide variants" %}{% endif %}"
+                                        aria-expanded="{{ item.expand|yesno:"true,false" }}" aria-controls="cp-{{ form.pos.pk }}-item-{{ item.pk }}-variations"
                                         aria-describedby="cp-{{ form.pos.pk }}-item-{{ item.pk }}-legend">
                                     <i class="fa fa-angle-down collapse-indicator" aria-hidden="true"></i>
-                                    <span>{% trans "Show variants" %}</span>
+                                    <span>{% if item.expand %}{% trans "Hide variants" %}{% else %}{% trans "Show variants" %}{% endif %}</span>
                                 </button>
                             {% endif %}
                         </div>
                         <div class="clearfix"></div>
                     </div>
-                    <div class="variations {% if not event.settings.show_variations_expanded %}variations-collapsed{% endif %}" id="cp-{{ form.pos.pk }}-item-{{ item.pk }}-variations">
+                    <div class="variations {% if not event.settings.show_variations_expanded and not item.expand %}variations-collapsed{% endif %}" id="cp-{{ form.pos.pk }}-item-{{ item.pk }}-variations">
                         {% for var in item.available_variations %}
                             <article aria-labelledby="cp-{{ form.pos.pk }}-item-{{ item.pk }}-{{ var.pk }}-legend"{% if var.description %} aria-describedby="cp-{{ form.pos.pk }}-item-{{ item.pk }}-{{ var.pk }}-description"{% endif %} class="row-fluid product-row variation"
                             {% if not item.free_price %}

src/pretix/settings.py

@@ -265,7 +265,7 @@ EMAIL_USE_TLS = config.getboolean('mail', 'tls', fallback=False)
 EMAIL_USE_SSL = config.getboolean('mail', 'ssl', fallback=False)
 EMAIL_SUBJECT_PREFIX = '[pretix] '
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_CUSTOM_SMTP_BACKEND = 'pretixbase.email.CheckPrivateNetworkSmtpBackend'
+EMAIL_CUSTOM_SMTP_BACKEND = 'pretix.base.email.CheckPrivateNetworkSmtpBackend'
 EMAIL_TIMEOUT = 60
 
 ADMINS = [('Admin', n) for n in config.get('mail', 'admins', fallback='').split(",") if n]

src/tests/api/test_items.py

@@ -530,6 +530,7 @@ def test_item_detail_program_times(token_client, organizer, event, team, item, c
     res["program_times"] = [{
         "start": "2017-12-27T00:00:00Z",
         "end": "2017-12-28T00:00:00Z",
+        "location": None
     }]
     resp = token_client.get('/api/v1/organizers/{}/events/{}/items/{}/'.format(organizer.slug, event.slug,
                                                                                item.pk))
@@ -1972,32 +1973,54 @@ def program_time2(item, category):
                                      end=datetime(2017, 12, 30, 0, 0, 0, tzinfo=timezone.utc))
 
 
+@pytest.fixture
+def program_time3(item, category):
+    return item.program_times.create(start=datetime(2017, 12, 30, 0, 0, 0, tzinfo=timezone.utc),
+                                     end=datetime(2017, 12, 31, 0, 0, 0, tzinfo=timezone.utc),
+                                     location='Testlocation')
+
+
 TEST_PROGRAM_TIMES_RES = {
     0: {
         "start": "2017-12-27T00:00:00Z",
         "end": "2017-12-28T00:00:00Z",
+        "location": None,
     },
     1: {
         "start": "2017-12-29T00:00:00Z",
         "end": "2017-12-30T00:00:00Z",
+        "location": None,
+    },
+    2: {
+        "start": "2017-12-30T00:00:00Z",
+        "end": "2017-12-31T00:00:00Z",
+        "location": {"en": "Testlocation"},
     }
 }
 
 
 @pytest.mark.django_db
-def test_program_times_list(token_client, organizer, event, item, program_time, program_time2):
+def test_program_times_list(token_client, organizer, event, item, program_time, program_time2, program_time3):
     res = dict(TEST_PROGRAM_TIMES_RES)
     res[0]["id"] = program_time.pk
     res[1]["id"] = program_time2.pk
+    res[2]["id"] = program_time3.pk
     resp = token_client.get('/api/v1/organizers/{}/events/{}/items/{}/program_times/'.format(organizer.slug, event.slug,
                                                                                              item.pk))
     assert resp.status_code == 200
     assert res[0]['start'] == resp.data['results'][0]['start']
     assert res[0]['end'] == resp.data['results'][0]['end']
     assert res[0]['id'] == resp.data['results'][0]['id']
+    assert res[0] == resp.data['results'][0]
     assert res[1]['start'] == resp.data['results'][1]['start']
     assert res[1]['end'] == resp.data['results'][1]['end']
     assert res[1]['id'] == resp.data['results'][1]['id']
+    assert res[1] == resp.data['results'][1]
+    assert res[2]['start'] == resp.data['results'][2]['start']
+    assert res[2]['end'] == resp.data['results'][2]['end']
+    assert res[2]['location'] == resp.data['results'][2]['location']
+    assert res[2]['id'] == resp.data['results'][2]['id']
+    assert res[2] == resp.data['results'][2]
 
 
 @pytest.mark.django_db
@@ -2039,6 +2062,59 @@ def test_program_times_create(token_client, organizer, event, item):
     assert resp.content.decode() == '{"non_field_errors":["The program end must not be before the program start."]}'
 
 
+@pytest.mark.django_db
+def test_program_times_create_location(token_client, organizer, event, item):
+    resp = token_client.post(
+        '/api/v1/organizers/{}/events/{}/items/{}/program_times/'.format(organizer.slug, event.slug, item.pk),
+        {
+            "start": "2017-12-27T00:00:00Z",
+            "end": "2017-12-28T00:00:00Z",
+            "location": {
+                "en": "Testlocation",
+                "de": "Testort"
+            }
+        },
+        format='json'
+    )
+    assert resp.status_code == 201
+    with scopes_disabled():
+        program_time = ItemProgramTime.objects.get(pk=resp.data['id'])
+    assert "Testlocation" == program_time.location.localize("en")
+    assert "Testort" == program_time.location.localize("de")
+
+
+@pytest.mark.django_db
+def test_program_times_create_without_location(token_client, organizer, event, item):
+    resp = token_client.post(
+        '/api/v1/organizers/{}/events/{}/items/{}/program_times/'.format(organizer.slug, event.slug, item.pk),
+        {
+            "start": "2017-12-27T00:00:00Z",
+            "end": "2017-12-28T00:00:00Z"
+        },
+        format='json'
+    )
+    assert resp.status_code == 201
+    assert resp.data['location'] is None
+    with scopes_disabled():
+        program_time = ItemProgramTime.objects.get(pk=resp.data['id'])
+    assert str(program_time.location) == ""
+
+    resp = token_client.post(
+        '/api/v1/organizers/{}/events/{}/items/{}/program_times/'.format(organizer.slug, event.slug, item.pk),
+        {
+            "start": "2017-12-27T00:00:00Z",
+            "end": "2017-12-28T00:00:00Z",
+            "location": None
+        },
+        format='json'
+    )
+    assert resp.status_code == 201
+    assert resp.data['location'] is None
+    with scopes_disabled():
+        program_time = ItemProgramTime.objects.get(pk=resp.data['id'])
+    assert str(program_time.location) == ""
+
+
 @pytest.mark.django_db
 def test_program_times_update(token_client, organizer, event, item, program_time):
     resp = token_client.patch(

src/tests/base/test_event_clone.py

@@ -82,7 +82,11 @@ def test_full_clone_same_organizer():
     assert item1.meta_data
     ItemProgramTime.objects.create(item=item1,
                                    start=datetime.datetime(2017, 12, 27, 0, 0, 0, tzinfo=datetime.timezone.utc),
-                                   end=datetime.datetime(2017, 12, 28, 0, 0, 0, tzinfo=datetime.timezone.utc))
+                                   end=datetime.datetime(2017, 12, 28, 0, 0, 0, tzinfo=datetime.timezone.utc),
+                                   location={
+                                       "en": "Testlocation",
+                                       "de": "Testort"
+                                   })
     assert item1.program_times
     item2 = event.items.create(category=category, tax_rule=tax_rule, name="T-shirt", default_price=15,
                                hidden_if_item_available=item1)
@@ -169,6 +173,7 @@ def test_full_clone_same_organizer():
     assert copied_item1.meta_data == item1.meta_data
     assert copied_item1.program_times.first().start == item1.program_times.first().start
     assert copied_item1.program_times.first().end == item1.program_times.first().end
+    assert copied_item1.program_times.first().location == item1.program_times.first().location
     assert copied_item2.variations.get().meta_data == item2v.meta_data
     assert copied_item1.hidden_if_available == copied_q2
     assert copied_item1.grant_membership_type == membership_type

src/tests/control/test_items.py

@@ -692,7 +692,8 @@ class ItemsTest(ItemFormTest):
         self.item2.program_times.create(start=datetime.datetime(2017, 12, 27, 0, 0, 0,
                                                                 tzinfo=datetime.timezone.utc),
                                         end=datetime.datetime(2017, 12, 28, 0, 0, 0,
-                                                              tzinfo=datetime.timezone.utc))
+                                                              tzinfo=datetime.timezone.utc),
+                                        location={"en": "Testlocation", "de": "Testort"})
 
         doc = self.get_doc('/control/event/%s/%s/items/add?copy_from=%d' % (self.orga1.slug, self.event1.slug, self.item2.pk))
         data = extract_form_fields(doc.select("form")[0])
@@ -723,6 +724,7 @@ class ItemsTest(ItemFormTest):
             assert set([str(v.value) for v in i_new.variations.all()]) == set([str(v.value) for v in i_old.variations.all()])
             assert i_old.program_times.first().start == i_new.program_times.first().start
             assert i_old.program_times.first().end == i_new.program_times.first().end
+            assert i_old.program_times.first().location == i_new.program_times.first().location
 
     def test_add_to_existing_quota(self):
         with scopes_disabled():

src/tests/presale/test_checkout.py

@@ -99,6 +99,15 @@ class BaseCheckoutTestCase:
         self.workshopquota.variations.add(self.workshop2a)
         self.workshopquota.variations.add(self.workshop2b)
 
+        self.parkingcat = ItemCategory.objects.create(name="Parking", is_addon=True, event=self.event)
+        self.parkingquota = Quota.objects.create(event=self.event, name='Parking', size=5)
+        self.parking1 = Item.objects.create(event=self.event, name='Premium Parking',
+                                            category=self.parkingcat, default_price=Decimal('15.00'))
+        self.parking2 = Item.objects.create(event=self.event, name='Standard Parking',
+                                            category=self.parkingcat, default_price=Decimal('5.00'))
+        self.parkingquota.items.add(self.parking1)
+        self.parkingquota.items.add(self.parking2)
+
     def _set_session(self, key, value):
         session = self.client.session
         session['carts'][get_cart_session_key(self.client, self.event)][key] = value
@@ -4202,6 +4211,58 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
         assert '35.29' in response.content.decode()
         assert '10.08' in response.content.decode()
 
+    def test_set_addons_invalid_initial(self):
+        self.event.settings.locales = ['de', 'en']
+        self.event.settings.locale = 'de'
+        with scopes_disabled():
+            ItemAddOn.objects.create(base_item=self.ticket, addon_category=self.workshopcat, min_count=1)
+            ItemAddOn.objects.create(base_item=self.ticket, addon_category=self.parkingcat, min_count=1)
+            cp1 = CartPosition.objects.create(
+                event=self.event, cart_id=self.session_key, item=self.ticket,
+                price=23, expires=now() - timedelta(minutes=10)
+            )
+            self.workshop1.free_price = True
+            self.workshop1.save()
+            self.workshop2.free_price = True
+            self.workshop2.save()
+
+        ws1_val = 'cp_{}_item_{}'.format(cp1.pk, self.workshop1.pk)
+        ws1_price = 'cp_{}_item_{}_price'.format(cp1.pk, self.workshop1.pk)
+        ws2a_val = 'cp_{}_variation_{}_{}'.format(cp1.pk, self.workshop2.pk, self.workshop2a.pk)
+        ws2a_price = 'cp_{}_variation_{}_{}_price'.format(cp1.pk, self.workshop2.pk, self.workshop2a.pk)
+        p1_val = 'cp_{}_item_{}'.format(cp1.pk, self.parking1.pk)
+        p2_val = 'cp_{}_item_{}'.format(cp1.pk, self.parking2.pk)
+
+        response = self.client.post('/%s/%s/checkout/addons/' % (self.orga.slug, self.event.slug), {
+            ws1_val: '1',
+            ws2a_val: '1',
+        })
+        assert response.status_code == 200
+        with scopes_disabled():
+            assert cp1.addons.count() == 0
+        doc = BeautifulSoup(response.text, 'lxml')
+        assert doc.find('input', {'name': ws1_val}).attrs.get('checked')
+        assert doc.find('input', {'name': ws2a_val}).attrs.get('checked')
+        assert not doc.find('input', {'name': p1_val}).attrs.get('checked')
+        assert not doc.find('input', {'name': p2_val}).attrs.get('checked')
+
+        response = self.client.post('/%s/%s/checkout/addons/' % (self.orga.slug, self.event.slug), {
+            ws1_val: '1',
+            ws1_price: '222,22',
+            ws2a_val: '1',
+            ws2a_price: '333.33',
+        })
+        assert response.status_code == 200
+        with scopes_disabled():
+            assert cp1.addons.count() == 0
+        doc = BeautifulSoup(response.text, 'lxml')
+        assert doc.find('input', {'name': ws1_val}).attrs.get('checked')
+        assert doc.find('input', {'name': ws1_price}).attrs.get('value') in ['222.22', '222,22']
+        assert doc.find('input', {'name': ws2a_val}).attrs.get('checked')
+        assert doc.find('input', {'name': ws2a_price}).attrs.get('value') in ['333.33', '333,33']
+        assert not doc.find('input', {'name': p1_val}).attrs.get('checked')
+        assert not doc.find('input', {'name': p2_val}).attrs.get('checked')
+
     def test_confirm_subevent_presale_not_yet(self):
         with scopes_disabled():
             self.event.has_subevents = True