[wip] Add location

src/pretix/api/serializers/item.py

@@ -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/base/migrations/0297_itemprogramtime_location.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.27 on 2026-01-21 12:06
+
+from django.db import migrations, models
+import i18nfield.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("pretixbase", "0296_invoice_invoice_from_state"),
+    ]
+
+    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/services/stats.py

@@ -112,8 +112,7 @@ def dictsum(*dicts) -> dict:
 
 def order_overview(
         event: Event, subevent: SubEvent=None, date_filter='', date_from=None, date_until=None, fees=False,
-        admission_only=False, base_qs=None, base_fees_qs=None, subevent_date_from=None, subevent_date_until=None,
-        skip_empty_lines=False,
+        admission_only=False, base_qs=None, base_fees_qs=None, subevent_date_from=None, subevent_date_until=None
 ) -> Tuple[List[Tuple[ItemCategory, List[Item]]], Dict[str, Tuple[Decimal, Decimal]]]:
     items = event.items.all().select_related(
         'category',  # for re-grouping
@@ -206,21 +205,13 @@ def order_overview(
                 for l in states.keys():
                     var.num[l] = num[l].get((item.id, variid), (0, 0, 0))
                 var.num['total'] = num['total'].get((item.id, variid), (0, 0, 0))
-                var._skip = all(v[0] == 0 for v in var.num.values())
             for l in states.keys():
                 item.num[l] = tuplesum(var.num[l] for var in item.all_variations)
             item.num['total'] = tuplesum(var.num['total'] for var in item.all_variations)
-            if skip_empty_lines:
-                item.all_variations = [v for v in item.all_variations if not v._skip]
-                item._skip = not item.all_variations
         else:
             for l in states.keys():
                 item.num[l] = num[l].get((item.id, None), (0, 0, 0))
             item.num['total'] = num['total'].get((item.id, None), (0, 0, 0))
-            item._skip = all(v[0] == 0 for v in item.num.values())
-
-    if skip_empty_lines:
-        items = [i for i in items if not i._skip]
 
     nonecat = ItemCategory(name=_('Uncategorized'))
     # Regroup those by category

src/pretix/control/forms/item.py

@@ -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'] = '1'
+        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/plugins/reports/exporters.py

@@ -337,8 +337,7 @@ class OverviewReport(Report):
             date_until=d_end,
             subevent_date_from=sd_start,
             subevent_date_until=sd_end,
-            fees=True,
-            skip_empty_lines=form_data.get("skip_empty_lines")
+            fees=True
         )
 
     def _table_story(self, doc, form_data, net=False):
@@ -479,10 +478,6 @@ class OverviewReport(Report):
                 'Use the "Accounting report" in the export section instead.'
             ))
         )
-        f.fields['skip_empty_lines'] = forms.BooleanField(
-            label=_("Skip empty lines"),
-            required=False,
-        )
         return f.fields
 
 

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/tests/api/test_items.py

@@ -1964,6 +1964,13 @@ 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",
@@ -1972,24 +1979,37 @@ TEST_PROGRAM_TIMES_RES = {
     1: {
         "start": "2017-12-29T00:00:00Z",
         "end": "2017-12-30T00:00:00Z",
+    },
+    2: {
+        "start": "2017-12-30T00:00:00Z",
+        "end": "2017-12-31T00:00:00Z",
+        "location": "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