Expect purchased items to list net prices

CHANGELOG.rst

@@ -19,6 +19,11 @@ Fixed
 
 * Add a missing dependency for Sofort payments
 
+Changed
+~~~~~~~
+
+* Purchased items are expected to list net prices
+
 `1.0.2`_ - 2022-03-14
 ---------------------
 

aleksis/apps/tezor/locale/de_DE/LC_MESSAGES/django.po

@@ -88,8 +88,8 @@ msgid "Can send invoice by email"
 msgstr "Kann Rechnung als E-Mail versenden"
 
 #: aleksis/apps/tezor/models/invoice.py:150
-msgid "Included VAT {} %"
-msgstr "Enthaltene MwSt {} %"
+msgid "VAT {} %"
+msgstr "MWSt. {} %"
 
 #: aleksis/apps/tezor/models/invoice.py:158
 msgid "Gross total"
@@ -104,8 +104,8 @@ msgid "Purchased item"
 msgstr "Gekaufter Artikel"
 
 #: aleksis/apps/tezor/models/invoice.py:180
-msgid "Item gross price"
-msgstr "Artikel Bruttopreis"
+msgid "Item net price"
+msgstr "Artikel-Nettopreis"
 
 #: aleksis/apps/tezor/models/invoice.py:182
 msgid "Currency"

aleksis/apps/tezor/migrations/0003_manual_invoicing.py

@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
                 ('extended_data', models.JSONField(default=dict, editable=False)),
                 ('sku', models.CharField(blank=True, max_length=255, verbose_name='Article no.')),
                 ('description', models.CharField(max_length=255, verbose_name='Purchased item')),
-                ('price', models.DecimalField(decimal_places=2, default='0.0', max_digits=9, verbose_name='Item gross price')),
+                ('price', models.DecimalField(decimal_places=2, default='0.0', max_digits=9, verbose_name='Item net price')),
                 ('currency', models.CharField(max_length=10, verbose_name='Currency')),
                 ('tax_rate', models.DecimalField(decimal_places=1, default='0.0', max_digits=4, verbose_name='Tax rate')),
             ],

aleksis/apps/tezor/models/invoice.py

@@ -168,13 +168,13 @@ class Invoice(BasePayment, PureDjangoModel):
         tax_amounts = {}
         for item in self.get_purchased_items():
             tax_amounts.setdefault(item.tax_rate, 0)
-            tax_amounts[item.tax_rate] += item.price / (item.tax_rate + 100) * item.tax_rate
+            tax_amounts[item.tax_rate] += item.price * item.tax_rate
 
         values = []
         for tax_rate, total in tax_amounts.items():
             values.append(
                 {
-                    "name": _("Included VAT {} %").format(tax_rate),
+                    "name": _("VAT {} %").format(tax_rate),
                     "value": total,
                     "currency": self.currency,
                 }
@@ -204,7 +204,7 @@ class InvoiceItem(ExtensibleModel):
     sku = models.CharField(max_length=255, verbose_name=_("Article no."), blank=True)
     description = models.CharField(max_length=255, verbose_name=_("Purchased item"))
     price = models.DecimalField(
-        verbose_name=_("Item gross price"), max_digits=9, decimal_places=2, default="0.0"
+        verbose_name=_("Item net price"), max_digits=9, decimal_places=2, default="0.0"
     )
     currency = models.CharField(max_length=10, verbose_name=_("Currency"))
     tax_rate = models.DecimalField(

aleksis/apps/tezor/tables.py

@@ -14,7 +14,7 @@ class PurchasedItemsTable(tables.Table):
     )
     quantity = tables.Column(verbose_name=_("Qty."), attrs={"td": {"class": "right-align"}})
     price = tables.TemplateColumn(
-        verbose_name=_("Gross"),
+        verbose_name=_("Net"),
         template_code="{{value|floatformat:2}} {{record.currency}}",
         attrs={"td": {"class": "right-align"}},
     )