Change delivery date handling (#9)

* Change delivery date handling * Update pretix_zugferd/migrations/0001_initial.py
pretix · Feb 5, 2025 · 37de058 · 37de058
1 parent 1b6bdc0
commit 37de058
Show file tree

Hide file tree

Showing 14 changed files with 83 additions and 10 deletions.
diff --git a/pretix_zugferd/invoice.py b/pretix_zugferd/invoice.py
@@ -235,6 +235,10 @@ def _zugferd_generate_document(self, invoice):
             ]
             if ds:
                 doc.trade.delivery.event.occurrence = max(ds)
+            else:
+                doc.trade.delivery.event.occurrence = invoice.date
+        else:
+            doc.trade.delivery.event.occurrence = invoice.date
 
         note = IncludedNote()
         note.content.add(_("Order code: {code}").format(code=invoice.order.full_code))

diff --git a/pretix_zugferd/migrations/0001_initial.py b/pretix_zugferd/migrations/0001_initial.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.17 on 2025-01-31 18:29
+from django.core.cache import cache
+from django.db import migrations
+
+
+def keep_old_default(apps, schema_editor):
+    Event = apps.get_model("pretixbase", "Event")
+    EventSettingsStore = apps.get_model("pretixbase", "Event_SettingsStore")
+
+    for e in Event.objects.filter(plugins__contains="pretix_zugferd"):
+        EventSettingsStore.objects.get_or_create(
+            object=e, key="zugferd_include_delivery_date", defaults={"value": "False"}
+        )
+        cache.delete("hierarkey_{}_{}".format("event", e.pk))
+
+
+class Migration(migrations.Migration):
+    dependencies = [("pretixbase", "0246_bigint")]
+
+    operations = [migrations.RunPython(keep_old_default, migrations.RunPython.noop)]
diff --git a/pretix_zugferd/migrations/__init__.py b/pretix_zugferd/migrations/__init__.py
diff --git a/pretix_zugferd/signals.py b/pretix_zugferd/signals.py
@@ -52,3 +52,6 @@ def navbar_info(sender, request, **kwargs):
 
 
 settings_hierarkey.add_default("zugferd_hide_label", "True", default_type=bool)
+settings_hierarkey.add_default(
+    "zugferd_include_delivery_date", "True", default_type=bool
+)
diff --git a/pretix_zugferd/views.py b/pretix_zugferd/views.py
@@ -29,6 +29,10 @@ class ZugferdSettingsForm(SettingsForm):
     zugferd_include_delivery_date = forms.BooleanField(
         label=_("Include event date as delivery date"),
         required=False,
+        help_text=_(
+            "Invoices must contain a delivery date. If this option is unselected, the invoice date is set as "
+            "the delivery date."
+        ),
     )
     zugferd_hide_label = forms.BooleanField(
         label=_("Hide label that advertises the included XRechnung"),

diff --git a/tests/results/cancellation.xml b/tests/results/cancellation.xml
@@ -105,7 +105,13 @@ Attendee: Peter</ram:Description>
                 </ram:SpecifiedTaxRegistration>
             </ram:BuyerTradeParty>
         </ram:ApplicableHeaderTradeAgreement>
-        <ram:ApplicableHeaderTradeDelivery/>
+        <ram:ApplicableHeaderTradeDelivery>
+            <ram:ActualDeliverySupplyChainEvent>
+                <ram:OccurrenceDateTime>
+                    <udt:DateTimeString format="102">20171227</udt:DateTimeString>
+                </ram:OccurrenceDateTime>
+            </ram:ActualDeliverySupplyChainEvent>
+        </ram:ApplicableHeaderTradeDelivery>
         <ram:ApplicableHeaderTradeSettlement>
             <ram:PaymentReference>DUMMY-FOO</ram:PaymentReference>
             <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>

diff --git a/tests/results/default.xml b/tests/results/default.xml
@@ -105,7 +105,13 @@ Attendee: Peter</ram:Description>
                 </ram:SpecifiedTaxRegistration>
             </ram:BuyerTradeParty>
         </ram:ApplicableHeaderTradeAgreement>
-        <ram:ApplicableHeaderTradeDelivery/>
+        <ram:ApplicableHeaderTradeDelivery>
+            <ram:ActualDeliverySupplyChainEvent>
+                <ram:OccurrenceDateTime>
+                    <udt:DateTimeString format="102">20171227</udt:DateTimeString>
+                </ram:OccurrenceDateTime>
+            </ram:ActualDeliverySupplyChainEvent>
+        </ram:ApplicableHeaderTradeDelivery>
         <ram:ApplicableHeaderTradeSettlement>
             <ram:PaymentReference>DUMMY-FOO</ram:PaymentReference>
             <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>

diff --git a/tests/results/delivery_dates.xml → tests/results/delivery_date_off.xml b/tests/results/delivery_dates.xml → tests/results/delivery_date_off.xml
@@ -108,7 +108,7 @@ Attendee: Peter</ram:Description>
         <ram:ApplicableHeaderTradeDelivery>
             <ram:ActualDeliverySupplyChainEvent>
                 <ram:OccurrenceDateTime>
-                    <udt:DateTimeString format="102">20171227</udt:DateTimeString>
+                    <udt:DateTimeString format="102">20241214</udt:DateTimeString>
                 </ram:OccurrenceDateTime>
             </ram:ActualDeliverySupplyChainEvent>
         </ram:ApplicableHeaderTradeDelivery>

diff --git a/tests/results/paid.xml b/tests/results/paid.xml
@@ -105,7 +105,13 @@ Attendee: Peter</ram:Description>
                 </ram:SpecifiedTaxRegistration>
             </ram:BuyerTradeParty>
         </ram:ApplicableHeaderTradeAgreement>
-        <ram:ApplicableHeaderTradeDelivery/>
+        <ram:ApplicableHeaderTradeDelivery>
+            <ram:ActualDeliverySupplyChainEvent>
+                <ram:OccurrenceDateTime>
+                    <udt:DateTimeString format="102">20171227</udt:DateTimeString>
+                </ram:OccurrenceDateTime>
+            </ram:ActualDeliverySupplyChainEvent>
+        </ram:ApplicableHeaderTradeDelivery>
         <ram:ApplicableHeaderTradeSettlement>
             <ram:PaymentReference>DUMMY-FOO</ram:PaymentReference>
             <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>

diff --git a/tests/results/tax_code_exempt.xml b/tests/results/tax_code_exempt.xml
@@ -105,7 +105,13 @@ Attendee: Peter</ram:Description>
                 </ram:SpecifiedTaxRegistration>
             </ram:BuyerTradeParty>
         </ram:ApplicableHeaderTradeAgreement>
-        <ram:ApplicableHeaderTradeDelivery/>
+        <ram:ApplicableHeaderTradeDelivery>
+            <ram:ActualDeliverySupplyChainEvent>
+                <ram:OccurrenceDateTime>
+                    <udt:DateTimeString format="102">20171227</udt:DateTimeString>
+                </ram:OccurrenceDateTime>
+            </ram:ActualDeliverySupplyChainEvent>
+        </ram:ApplicableHeaderTradeDelivery>
         <ram:ApplicableHeaderTradeSettlement>
             <ram:PaymentReference>DUMMY-FOO</ram:PaymentReference>
             <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>

diff --git a/tests/results/tax_code_guess_AU.xml b/tests/results/tax_code_guess_AU.xml
@@ -105,7 +105,13 @@ Attendee: Peter</ram:Description>
                 </ram:SpecifiedTaxRegistration>
             </ram:BuyerTradeParty>
         </ram:ApplicableHeaderTradeAgreement>
-        <ram:ApplicableHeaderTradeDelivery/>
+        <ram:ApplicableHeaderTradeDelivery>
+            <ram:ActualDeliverySupplyChainEvent>
+                <ram:OccurrenceDateTime>
+                    <udt:DateTimeString format="102">20171227</udt:DateTimeString>
+                </ram:OccurrenceDateTime>
+            </ram:ActualDeliverySupplyChainEvent>
+        </ram:ApplicableHeaderTradeDelivery>
         <ram:ApplicableHeaderTradeSettlement>
             <ram:PaymentReference>DUMMY-FOO</ram:PaymentReference>
             <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>

diff --git a/tests/results/tax_code_reverse_charge.xml b/tests/results/tax_code_reverse_charge.xml
@@ -105,7 +105,13 @@ Attendee: Peter</ram:Description>
                 </ram:SpecifiedTaxRegistration>
             </ram:BuyerTradeParty>
         </ram:ApplicableHeaderTradeAgreement>
-        <ram:ApplicableHeaderTradeDelivery/>
+        <ram:ApplicableHeaderTradeDelivery>
+            <ram:ActualDeliverySupplyChainEvent>
+                <ram:OccurrenceDateTime>
+                    <udt:DateTimeString format="102">20171227</udt:DateTimeString>
+                </ram:OccurrenceDateTime>
+            </ram:ActualDeliverySupplyChainEvent>
+        </ram:ApplicableHeaderTradeDelivery>
         <ram:ApplicableHeaderTradeSettlement>
             <ram:PaymentReference>DUMMY-FOO</ram:PaymentReference>
             <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>

diff --git a/tests/results/xrechnung.xml b/tests/results/xrechnung.xml
@@ -115,7 +115,13 @@ Attendee: Peter</ram:Description>
                 </ram:SpecifiedTaxRegistration>
             </ram:BuyerTradeParty>
         </ram:ApplicableHeaderTradeAgreement>
-        <ram:ApplicableHeaderTradeDelivery/>
+        <ram:ApplicableHeaderTradeDelivery>
+            <ram:ActualDeliverySupplyChainEvent>
+                <ram:OccurrenceDateTime>
+                    <udt:DateTimeString format="102">20171227</udt:DateTimeString>
+                </ram:OccurrenceDateTime>
+            </ram:ActualDeliverySupplyChainEvent>
+        </ram:ApplicableHeaderTradeDelivery>
         <ram:ApplicableHeaderTradeSettlement>
             <ram:PaymentReference>DUMMY-FOO</ram:PaymentReference>
             <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>

diff --git a/tests/test_invoice.py b/tests/test_invoice.py
@@ -164,15 +164,15 @@ def test_guess_tax_code(event, order, tax_rule):
 @scopes_disabled()
 @freeze_time("2024-12-14 12:00:00+01:00")
 def test_delivery_date(event, order, tax_rule):
-    event.settings.zugferd_include_delivery_date = True
+    event.settings.zugferd_include_delivery_date = False
     event.settings.invoice_renderer = "modern1_zugferd"
     i = generate_invoice(order)
     invoice_pdf_task(i.pk)
     i.refresh_from_db()
     reader = PdfReader(i.file)
     xml = reader.attachments["factur-x.xml"][0]
 
-    compare(xml, r("delivery_dates.xml"), schema="FACTUR-X_EXTENDED")
+    compare(xml, r("delivery_date_off.xml"), schema="FACTUR-X_EXTENDED")
 
 
 @pytest.mark.django_db