diff --git a/CHANGELOG.rst b/CHANGELOG.rst index cbcb92e91de9a5e3faa1d28b63990e623c496469..dc6e4a79e9c92d4f693062c4292cf6304c84e458 100644 --- a/CHANGELOG.rst +++ b/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 --------------------- diff --git a/aleksis/apps/tezor/locale/de_DE/LC_MESSAGES/django.po b/aleksis/apps/tezor/locale/de_DE/LC_MESSAGES/django.po index 33247d9233b08b360a0a765a898f3f87e88e289f..fae5821cf5ba0f9b9fd0d46fc0020ec585372284 100644 --- a/aleksis/apps/tezor/locale/de_DE/LC_MESSAGES/django.po +++ b/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" diff --git a/aleksis/apps/tezor/migrations/0003_manual_invoicing.py b/aleksis/apps/tezor/migrations/0003_manual_invoicing.py index efff727e2f683d26d8b2872211a14da2924f353a..90b7100ced2bcb58c6016004b88dcc38d15e5ee9 100644 --- a/aleksis/apps/tezor/migrations/0003_manual_invoicing.py +++ b/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')), ], diff --git a/aleksis/apps/tezor/models/invoice.py b/aleksis/apps/tezor/models/invoice.py index 03978c83b39081ca4886364def28653949ad2fff..b870dafea19a5b74644264bfa91c8d58db2f5918 100644 --- a/aleksis/apps/tezor/models/invoice.py +++ b/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( diff --git a/aleksis/apps/tezor/tables.py b/aleksis/apps/tezor/tables.py index f1d1c233ca6992aac38b462ee0437f8875a4b891..b9f2f412b1e2640e4e2ed25f003f4f9f091601e5 100644 --- a/aleksis/apps/tezor/tables.py +++ b/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"}}, )