TaxRules: Add internal_name and keep_gross_if_rate_changes (#2422)

Co-authored-by: ser8phin <eva.wolkwitz@gmx.de>
This commit is contained in:
Raphael Michel
2022-01-21 15:39:27 +01:00
committed by GitHub
parent c1344422a5
commit 6f0da5c2ca
16 changed files with 591 additions and 18 deletions

View File

@@ -1249,7 +1249,7 @@ TaxRuleLineFormSet = formset_factory(
class TaxRuleForm(I18nModelForm):
class Meta:
model = TaxRule
fields = ['name', 'rate', 'price_includes_tax', 'eu_reverse_charge', 'home_country']
fields = ['name', 'rate', 'price_includes_tax', 'eu_reverse_charge', 'home_country', 'internal_name', 'keep_gross_if_rate_changes']
class WidgetCodeForm(forms.Form):

View File

@@ -452,7 +452,7 @@ class OrderPositionChangeForm(forms.Form):
@staticmethod
def taxrule_label_from_instance(obj):
return f"{obj.name} ({obj.rate} %)"
return f"{obj.internal_name or obj.name} ({obj.rate} %)"
def __init__(self, *args, **kwargs):
instance = kwargs.pop('instance')

View File

@@ -24,6 +24,7 @@
<fieldset>
<legend>{% trans "General" %}</legend>
{% bootstrap_field form.name layout="control" %}
{% bootstrap_field form.internal_name layout="control" %}
{% bootstrap_field form.rate addon_after="%" layout="control" %}
{% bootstrap_field form.price_includes_tax layout="control" %}
</fieldset>
@@ -39,6 +40,7 @@
</div>
{% bootstrap_field form.eu_reverse_charge layout="control" %}
{% bootstrap_field form.home_country layout="control" %}
{% bootstrap_field form.keep_gross_if_rate_changes layout="control" %}
<h3>{% trans "Custom taxation rules" %}</h3>
<div class="alert alert-warning">
{% blocktrans trimmed %}

View File

@@ -33,7 +33,7 @@
<tr>
<td>
<strong><a href="{% url "control:event.settings.tax.edit" organizer=request.event.organizer.slug event=request.event.slug rule=tr.id %}">
{{ tr.name }}
{{ tr.internal_name|default:tr.name }}
</a></strong>
</td>
<td>

View File

@@ -145,7 +145,12 @@
<strong>{% trans "Tax rule" %}</strong>
</div>
<div class="col-sm-5">
{{ position.tax_rule.name }} ({{ position.tax_rule.rate }} %)
{% if position.tax_rule.internal_name %}
{{ position.tax_rule.internal_name }}
{% else %}
{{ position.tax_rule.name }}
{% endif %}
({{ position.tax_rule.rate }} %)
</div>
<div class="col-sm-4 field-container">
{% bootstrap_field position.form.tax_rule layout='inline' %}