diff --git a/src/pretix/base/models/checkin.py b/src/pretix/base/models/checkin.py index 2a66b2d3c5..4a90dcd3a1 100644 --- a/src/pretix/base/models/checkin.py +++ b/src/pretix/base/models/checkin.py @@ -55,7 +55,12 @@ class CheckinList(LoggedModel): all_products = models.BooleanField(default=True, verbose_name=_("All products (including newly created ones)")) limit_products = models.ManyToManyField('Item', verbose_name=_("Limit to products"), blank=True) subevent = models.ForeignKey('SubEvent', null=True, blank=True, - verbose_name=pgettext_lazy('subevent', 'Date'), on_delete=models.CASCADE) + verbose_name=pgettext_lazy('subevent', 'Date'), + on_delete=models.CASCADE, + help_text=_('If you choose "all dates", tickets will be considered part of this list ' + 'and valid for check-in regardless of which date they are purchased for. ' + 'You can limit their validity through the advanced check-in rules, ' + 'though.')) include_pending = models.BooleanField(verbose_name=pgettext_lazy('checkin', 'Include pending orders'), default=False, help_text=_('With this option, people will be able to check in even if the ' diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py index c2f2062fa6..c489250686 100644 --- a/src/pretix/base/models/orders.py +++ b/src/pretix/base/models/orders.py @@ -985,7 +985,7 @@ class Order(LockModel, LoggedModel): context: Dict[str, Any]=None, log_entry_type: str='pretix.event.order.email.sent', user: User=None, headers: dict=None, sender: str=None, invoices: list=None, auth=None, attach_tickets=False, position: 'OrderPosition'=None, auto_email=True, - attach_ical=False, attach_cached_files: list=None, attach_other_files: list=None): + attach_ical=False, attach_other_files: list=None, attach_cached_files: list=None): """ Sends an email to the user that placed this order. Basically, this method does two things: diff --git a/src/pretix/control/templates/pretixcontrol/subevents/bulk.html b/src/pretix/control/templates/pretixcontrol/subevents/bulk.html index 6b58feb5a8..9430373c54 100644 --- a/src/pretix/control/templates/pretixcontrol/subevents/bulk.html +++ b/src/pretix/control/templates/pretixcontrol/subevents/bulk.html @@ -515,6 +515,16 @@