diff --git a/src/pretix/base/models/tax.py b/src/pretix/base/models/tax.py index 5827aee9af..871a3695cc 100644 --- a/src/pretix/base/models/tax.py +++ b/src/pretix/base/models/tax.py @@ -125,6 +125,10 @@ class TaxRule(LoggedModel): s += ' ({})'.format(_('reverse charge enabled')) return str(s) + @property + def has_custom_rules(self): + return self.custom_rules and self.custom_rules != '[]' + def tax(self, base_price, base_price_is='auto'): if self.rate == Decimal('0.00'): return TaxedPrice( diff --git a/src/pretix/control/templates/pretixcontrol/event/tax_edit.html b/src/pretix/control/templates/pretixcontrol/event/tax_edit.html index b6379b4c05..1fe7ebf277 100644 --- a/src/pretix/control/templates/pretixcontrol/event/tax_edit.html +++ b/src/pretix/control/templates/pretixcontrol/event/tax_edit.html @@ -20,85 +20,101 @@ {% bootstrap_form_errors form %} {% bootstrap_field form.name layout="control" %} {% bootstrap_field form.rate addon_after="%" layout="control" %} - -
- -
+ {% bootstrap_field form.price_includes_tax layout="control" %} + {% bootstrap_field form.eu_reverse_charge layout="control" %} + {% bootstrap_field form.home_country layout="control" %} + ++ +
+