CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-08-25 13:12:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Order change interface: Fix taxation edge case

Browse Source
This commit is contained in:
Raphael Michel
2019-06-05 09:18:03 +02:00
parent bd79a93737
commit 55edc8a3d6
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/control/forms/orders.py
+1 -4
View File
@@ -292,10 +292,7 @@ class OrderPositionChangeForm(forms.Form):
instance = kwargs.pop('instance') instance = kwargs.pop('instance')
initial = kwargs.get('initial', {}) initial = kwargs.get('initial', {})
if instance.item.tax_rule and not instance.item.tax_rule.price_includes_tax: initial['price'] = instance.price
initial['price'] = instance.price - instance.tax_value
else:
initial['price'] = instance.price
kwargs['initial'] = initial kwargs['initial'] = initial
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
src/pretix/control/templates/pretixcontrol/order/change.html
+6 -4
View File
@@ -121,11 +121,13 @@
<strong>{% trans "Price" %}</strong> <strong>{% trans "Price" %}</strong>
</div> </div>
<div class="col-sm-5"> <div class="col-sm-5">
{{ position.price|money:request.event.currency }}<br> {{ position.price|money:request.event.currency }}
{% if position.tax_rate %} {% if position.tax_rate %}
<small>{% blocktrans trimmed with rate=position.tax_rate name=position.tax_rule.name %} <br>
<strong>incl.</strong> {{ rate }}% {{ name }} <small>
{% endblocktrans %}</small> ({{ position.net_price|money:request.event.currency }}
+ {{ position.tax_rate }}%)
</small>
{% endif %} {% endif %}
</div> </div>
<div class="col-sm-4 field-container"> <div class="col-sm-4 field-container">