diff --git a/template/XRechnung-2.2/XRechnung_invoice.xml b/template/XRechnung-2.2/XRechnung_invoice.xml
index f12fad3..14453c0 100644
--- a/template/XRechnung-2.2/XRechnung_invoice.xml
+++ b/template/XRechnung-2.2/XRechnung_invoice.xml
@@ -90,7 +90,7 @@
   <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.1</cbc:CustomizationID>
   <cbc:ID>${this.invoice.number}</cbc:ID>
   <cbc:IssueDate>${this.invoice.invoice_date.isoformat()}</cbc:IssueDate>
-  <cbc:DueDate>${(this.invoice.payment_term_date or this.invoice.invoice_date).isoformat()}</cbc:DueDate>
+  <cbc:DueDate>${this.invoice.invoice_date.isoformat()}</cbc:DueDate>
   <cbc:InvoiceTypeCode>${this.type_code}</cbc:InvoiceTypeCode>
   <cbc:Note py:if="this.invoice_note()">${this.invoice_note()}</cbc:Note>
   <cbc:DocumentCurrencyCode>${this.invoice.currency.code}</cbc:DocumentCurrencyCode>
diff --git a/template/XRechnung-2.3/XRechnung_invoice.xml b/template/XRechnung-2.3/XRechnung_invoice.xml
index f347217..2f3da3e 100644
--- a/template/XRechnung-2.3/XRechnung_invoice.xml
+++ b/template/XRechnung-2.3/XRechnung_invoice.xml
@@ -90,7 +90,7 @@
   <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.3</cbc:CustomizationID>
   <cbc:ID>${this.invoice.number}</cbc:ID>
   <cbc:IssueDate>${this.invoice.invoice_date.isoformat()}</cbc:IssueDate>
-  <cbc:DueDate>${(this.invoice.payment_term_date or this.invoice.invoice_date).isoformat()}</cbc:DueDate>
+  <cbc:DueDate>${this.invoice.invoice_date.isoformat()}</cbc:DueDate>
   <cbc:InvoiceTypeCode>${this.type_code}</cbc:InvoiceTypeCode>
   <cbc:Note py:if="this.invoice_note()">${this.invoice_note()}</cbc:Note>
   <cbc:DocumentCurrencyCode>${this.invoice.currency.code}</cbc:DocumentCurrencyCode>
diff --git a/template/XRechnung-3.0/XRechnung_invoice.xml b/template/XRechnung-3.0/XRechnung_invoice.xml
index cf09403..382e321 100644
--- a/template/XRechnung-3.0/XRechnung_invoice.xml
+++ b/template/XRechnung-3.0/XRechnung_invoice.xml
@@ -90,7 +90,7 @@
   <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_3.0</cbc:CustomizationID>
   <cbc:ID>${this.invoice.number}</cbc:ID>
   <cbc:IssueDate>${this.invoice.invoice_date.isoformat()}</cbc:IssueDate>
-  <cbc:DueDate>${(this.invoice.payment_term_date or this.invoice.invoice_date).isoformat()}</cbc:DueDate>
+  <cbc:DueDate>${this.invoice.invoice_date.isoformat()}</cbc:DueDate>
   <cbc:InvoiceTypeCode>${this.type_code}</cbc:InvoiceTypeCode>
   <cbc:Note py:if="this.invoice_note()">${this.invoice_note()}</cbc:Note>
   <cbc:DocumentCurrencyCode>${this.invoice.currency.code}</cbc:DocumentCurrencyCode>
diff --git a/tests/test_edocument.py b/tests/test_edocument.py
index 401959f..05280bf 100644
--- a/tests/test_edocument.py
+++ b/tests/test_edocument.py
@@ -108,7 +108,6 @@ class EdocTestCase(ModuleTestCase):
         BankNumber = pool.get('bank.account.number')
 
         invoice = get_invoice()
-        invoice.payment_term_date = date.today()
         invoice.party.get_xrechnung_route_id = Mock(
             return_value='xrechn-route-id-123')
         invoice.company.party.bank_accounts = [
@@ -154,7 +153,6 @@ class EdocTestCase(ModuleTestCase):
         BankNumber = pool.get('bank.account.number')
 
         invoice = get_invoice()
-        invoice.payment_term_date = date.today()
         invoice.party.get_xrechnung_route_id = Mock(
             return_value='xrechn-route-id-123')
         invoice.company.party.bank_accounts = [
diff --git a/versiondep.txt b/versiondep.txt
index 34baa08..646c039 100644
--- a/versiondep.txt
+++ b/versiondep.txt
@@ -1 +1,2 @@
 tryton6_backport;5.0.3;5.0.999;mds
+edocument_uncefact;5.0.6;5.0.999;mds