From: Ben Dangelmayr <dangelmayr@rami.io>
Date: Wed, 18 May 2022 13:08:39 +0000 (+0200)
Subject: zugferd v2.2 partial update
X-Git-Tag: 2.2.0~1^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4e6b2afc23f5ce0b4f56d294c07372c7934eec6;p=thirdparty%2Fpython-drafthorse.git

zugferd v2.2 partial update
---

diff --git a/drafthorse/models/accounting.py b/drafthorse/models/accounting.py
index 893dbcf..85d8e77 100644
--- a/drafthorse/models/accounting.py
+++ b/drafthorse/models/accounting.py
@@ -2,11 +2,25 @@
 from . import BASIC, COMFORT, EXTENDED, NS_RAM
 from .elements import Element
 from .fields import (
-    CurrencyField, DateTimeField, DecimalField, IndicatorField, MultiField,
-    QuantityField, StringField,
+    CurrencyField, Field, DateTimeField, DecimalField, IndicatorField, MultiField,
+    QuantityField, StringField, IDField
 )
 
+class BillingSpecifiedPeriod(Element):
+    description = StringField(NS_RAM, "Description", required=True, profile=COMFORT,
+                              _d="Freitext der Zahlungsbedingungen")
+    start = DateTimeField(NS_RAM, "StartDateTime", required=True, profile=COMFORT)
+    end = DateTimeField(NS_RAM, "EndDateTime", required=True, profile=COMFORT)
 
+    class Meta:
+        namespace = NS_RAM
+        tag = "BillingSpecifiedPeriod"
+class SellerOrderReferencedDocument(Element):
+    issuer_ID = IDField(NS_RAM, "IssuerAssignedID", profile=COMFORT)
+    issue_date_time = DateTimeField(NS_RAM, "FormattedIssueDateTime", required=True, profile=EXTENDED)
+    class Meta:
+        namespace = NS_RAM
+        tag = "SellerOrderReferencedDocument"
 class LineApplicableTradeTax(Element):
     calculated_amount = DecimalField(NS_RAM, "CalculatedAmount", required=True,
                                      profile=BASIC, _d="Steuerbetrag")
@@ -18,7 +32,6 @@ class LineApplicableTradeTax(Element):
                                 profile=COMFORT, _d="Steuerkategorie (Wert)")
     applicable_percent = DecimalField(NS_RAM, "ApplicablePercent",
                                       required=True, profile=BASIC)
-
     class Meta:
         namespace = NS_RAM
         tag = "ApplicableTradeTax"
@@ -45,7 +58,6 @@ class ApplicableTradeTax(Element):
                                 profile=COMFORT, _d="Steuerkategorie (Wert)")
     rate_applicable_percent = DecimalField(NS_RAM, "RateApplicablePercent",
                                            required=True, profile=BASIC)
-
     class Meta:
         namespace = NS_RAM
         tag = "ApplicableTradeTax"
@@ -90,15 +102,6 @@ class MonetarySummation(Element):
         tag = "SpecifiedTradeSettlementHeaderMonetarySummation"
 
 
-class BillingSpecifiedPeriod(Element):
-    start = DateTimeField(NS_RAM, "StartDateTime", required=True, profile=COMFORT)
-    end = DateTimeField(NS_RAM, "EndDateTime", required=True, profile=COMFORT)
-
-    class Meta:
-        namespace = NS_RAM
-        tag = "BillingSpecifiedPeriod"
-
-
 class AppliedTradeTax(Element):
     type_code = StringField(NS_RAM, "TypeCode", required=True, profile=COMFORT)
     category_code = StringField(NS_RAM, "CategoryCode", required=True, profile=COMFORT)
diff --git a/drafthorse/models/party.py b/drafthorse/models/party.py
index b4d4e2f..19fdbbf 100644
--- a/drafthorse/models/party.py
+++ b/drafthorse/models/party.py
@@ -14,6 +14,12 @@ class PostalTradeAddress(Element):
         namespace = NS_RAM
         tag = "PostalTradeAddress"
 
+class URIUniversalCommunication(Element):
+    uri_ID = IDField(NS_RAM, "URIID", required=False, profile=BASIC)
+
+    class Meta:
+        namespace = NS_RAM
+        tag = "URIUniversalCommunication"
 
 class TaxRegistration(Element):
     id = IDField(NS_RAM, "ID")
@@ -22,7 +28,6 @@ class TaxRegistration(Element):
         namespace = NS_RAM
         tag = "SpecifiedTaxRegistration"
 
-
 class PhoneNumber(Element):
     number = StringField(NS_RAM, "CompleteNumber", required=False,
                          profile=EXTENDED)
@@ -75,7 +80,14 @@ class TradeParty(Element):
     address = Field(PostalTradeAddress, required=False, profile=BASIC,
                     _d="Anschrift des Käufers")
     tax_registrations = MultiField(TaxRegistration, required=False, profile=BASIC)
+    electronic_adress = MultiField(URIUniversalCommunication, required=False, profile=BASIC)
+    description = StringField(NS_RAM, "Description", required=True, profile=COMFORT,
+                              _d="Freitext der Zahlungsbedingungen")
 
+class SellerTaxRepresentativeTradeParty(TradeParty):
+    class Meta:
+        namespace = NS_RAM
+        tag = "SellerTaxRepresentativeTradeParty"
 
 class PayeeTradeParty(TradeParty):
     class Meta:
diff --git a/drafthorse/models/payment.py b/drafthorse/models/payment.py
index 3f7c94a..9d1f695 100644
--- a/drafthorse/models/payment.py
+++ b/drafthorse/models/payment.py
@@ -103,3 +103,4 @@ class PaymentTerms(Element):
     class Meta:
         namespace = NS_RAM
         tag = "SpecifiedTradePaymentTerms"
+
diff --git a/drafthorse/models/references.py b/drafthorse/models/references.py
index d423b38..6e3ca2b 100644
--- a/drafthorse/models/references.py
+++ b/drafthorse/models/references.py
@@ -1,14 +1,24 @@
 from . import COMFORT, EXTENDED, NS_RAM
 from .elements import Element
-from .fields import DirectDateTimeField, StringField
+from .fields import DirectDateTimeField, StringField, Field
 
+class ProcuringProjectType(Element):
+    id = StringField(NS_RAM, "ID")
+    name = StringField(NS_RAM, "Name")
+    class Meta:
+        namespace = NS_RAM
+        tag = "ProcuringProjectType"
 
 class ReferencedDocument(Element):
     date_time_string = DirectDateTimeField(NS_RAM, "DateTimeString", required=False,
                                            profile=COMFORT)
     issuer_assigned_id = StringField(NS_RAM, "IssuerAssignedID", required=False,
                                      profile=COMFORT)
-
+class AttachmentBinaryObject(Element):
+    name = StringField(NS_RAM, "filename", profile=EXTENDED)
+    class Meta:
+        namespace = NS_RAM
+        tag = "AttachmentBinaryObject"
 
 class BuyerOrderReferencedDocument(ReferencedDocument):
     class Meta:
@@ -30,11 +40,25 @@ class AdditionalReferencedDocument(Element):
     date_time_string = DirectDateTimeField(NS_RAM, "DateTimeString", required=False,
                                            profile=COMFORT)
     type_code = StringField(NS_RAM, "TypeCode", profile=EXTENDED, required=True)
-
+    name = StringField(NS_RAM, "Name", profile=COMFORT, required=False)
+    attached_object = Field(AttachmentBinaryObject, required=False, profile=EXTENDED)
     class Meta:
         namespace = NS_RAM
         tag = "AdditionalReferencedDocument"
 
+class InvoiceReferencedDocument(Element):
+    issuer_assigned_id = StringField(NS_RAM, "IssuerAssignedID", required=False,
+                                     profile=COMFORT)
+
+    date_time_string = DirectDateTimeField(NS_RAM, "DateTimeString", required=True,
+                                           profile=COMFORT)
+    type_code = StringField(NS_RAM, "TypeCode", profile=EXTENDED, required=False)
+
+
+    class Meta:
+        namespace = NS_RAM
+        tag = "InvoiceReferencedDocument"
+
 
 class UltimateCustomerOrderReferencedDocument(ReferencedDocument):
     class Meta:
diff --git a/drafthorse/models/trade.py b/drafthorse/models/trade.py
index c299606..ef30cef 100644
--- a/drafthorse/models/trade.py
+++ b/drafthorse/models/trade.py
@@ -1,23 +1,22 @@
 from . import BASIC, COMFORT, EXTENDED, NS_RAM, NS_RSM
 from .accounting import (
-    ApplicableTradeTax, AppliedTradeTax, BillingSpecifiedPeriod,
-    MonetarySummation, ReceivableAccountingAccount, TradeAllowanceCharge,
+    ApplicableTradeTax, AppliedTradeTax,
+    MonetarySummation, ReceivableAccountingAccount, TradeAllowanceCharge, BillingSpecifiedPeriod, SellerOrderReferencedDocument
 )
 from .delivery import TradeDelivery
 from .elements import Element
-from .fields import DecimalField, Field, MultiField, StringField
+from .fields import DecimalField, Field, MultiField, StringField, IDField
 from .party import (
     BuyerTradeParty, EndUserTradeParty, InvoiceeTradeParty, PayeeTradeParty,
-    SellerTradeParty,
+    SellerTradeParty, SellerTaxRepresentativeTradeParty,
 )
 from .payment import PaymentMeans, PaymentTerms
 from .references import (
     AdditionalReferencedDocument, BuyerOrderReferencedDocument,
-    ContractReferencedDocument, UltimateCustomerOrderReferencedDocument,
+    ContractReferencedDocument, UltimateCustomerOrderReferencedDocument, ProcuringProjectType, InvoiceReferencedDocument
 )
 from .tradelines import LineItem
 
-
 class DeliveryTerms(Element):
     type_code = StringField(NS_RAM, "DeliveryTypeCode", required=False,
                             profile=EXTENDED, _d="Lieferbedingung (Code)")
@@ -39,7 +38,11 @@ class TradeAgreement(Element):
     contract = Field(ContractReferencedDocument, required=False, profile=COMFORT)
     additional_references = MultiField(AdditionalReferencedDocument, required=False,
                                        profile=COMFORT)
-
+    description = StringField(NS_RAM, "Description", required=False,
+                                  profile=COMFORT)
+    seller_tax_representative_party = Field(SellerTaxRepresentativeTradeParty, required=False)
+    order_document = Field(SellerOrderReferencedDocument, required=False)
+    procuring_project_type = Field(ProcuringProjectType, required=False)
     class Meta:
         namespace = NS_RAM
         tag = "ApplicableHeaderTradeAgreement"
@@ -74,7 +77,10 @@ class TradeSettlement(Element):
                                _d="Detailinformation zu Belegsummen")
     accounting_account = Field(ReceivableAccountingAccount, required=False, profile=EXTENDED,
                                _d="Detailinformationen zur Buchungsreferenz")
-
+    creditor_reference_ID = IDField(NS_RAM, "CreditorReferenceID")
+    period = Field(BillingSpecifiedPeriod, required=False, profile=BASIC)
+    tax_currency_code = StringField(NS_RAM, "TaxCurrencyCode", required=False, profile=COMFORT)
+    invoice_referenced_document = Field(InvoiceReferencedDocument, required=False, profile=BASIC)
     class Meta:
         namespace = NS_RAM
         tag = "ApplicableHeaderTradeSettlement"
diff --git a/drafthorse/models/tradelines.py b/drafthorse/models/tradelines.py
index 9ba88fb..dfda603 100644
--- a/drafthorse/models/tradelines.py
+++ b/drafthorse/models/tradelines.py
@@ -1,7 +1,7 @@
 from . import BASIC, COMFORT, EXTENDED, NS_RAM
 from .accounting import (
     AccountingAccount, ApplicableTradeTax, BillingSpecifiedPeriod,
-    TradeAllowanceCharge,
+    TradeAllowanceCharge, ReceivableAccountingAccount
 )
 from .delivery import SupplyChainEvent
 from .elements import Element
@@ -15,7 +15,7 @@ from .references import (
     LineAdditionalReferencedDocument, LineBuyerOrderReferencedDocument,
     LineContractReferencedDocument, LineUltimateCustomerOrderReferencedDocument,
     LineDeliveryNoteReferencedDocument, LineDespatchAdviceReferencedDocument,
-    LineReceivingAdviceReferencedDocument,
+    LineReceivingAdviceReferencedDocument, InvoiceReferencedDocument
 )
 
 
@@ -106,11 +106,15 @@ class LineSummation(Element):
 
 class LineSettlement(Element):
     trade_tax = Field(ApplicableTradeTax, required=False, profile=COMFORT)
-    period = Field(BillingSpecifiedPeriod, required=False, profile=EXTENDED)
     accounting_account = Field(AccountingAccount, required=False, profile=EXTENDED,
                                _d="Kostenstelle")
     monetary_summation = Field(LineSummation, required=False, profile=COMFORT)
-
+    period = Field(BillingSpecifiedPeriod, required=False, profile=COMFORT)
+    allowance_charge = MultiField(TradeAllowanceCharge, required=False, profile=COMFORT,
+                                  _d="Schalter für Zu-/Abschlag")
+    invoice_referenced_document = Field(InvoiceReferencedDocument, required=False, profile=EXTENDED)
+    accounting_account = Field(ReceivableAccountingAccount, required=False, profile=EXTENDED,
+                               _d="Detailinformationen zur Buchungsreferenz")
     class Meta:
         namespace = NS_RAM
         tag = "SpecifiedLineTradeSettlement"
diff --git a/drafthorse/schema/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/drafthorse/schema/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
index 4803b82..1e0277d 100644
--- a/drafthorse/schema/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
+++ b/drafthorse/schema/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
@@ -458,6 +458,7 @@
       <xs:enumeration value="VU"/>
       <xs:enumeration value="WF"/>
       <xs:enumeration value="WS"/>
+      <xs:enumeration value="XI"/>
       <xs:enumeration value="YE"/>
       <xs:enumeration value="YT"/>
       <xs:enumeration value="ZA"/>
@@ -701,6 +702,9 @@
       <xs:enumeration value="633"/>
       <xs:enumeration value="751"/>
       <xs:enumeration value="780"/>
+      <xs:enumeration value="875"/>
+      <xs:enumeration value="876"/>
+      <xs:enumeration value="877"/>
       <xs:enumeration value="935"/>
     </xs:restriction>
   </xs:simpleType>
diff --git a/drafthorse/schema/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/drafthorse/schema/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
index dac9f9c..66f338a 100644
--- a/drafthorse/schema/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
+++ b/drafthorse/schema/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
@@ -20,12 +20,13 @@
   </xs:complexType>
   <xs:complexType name="DocumentContextParameterType">
     <xs:sequence>
-      <xs:element name="ID" type="udt:IDType" minOccurs="0"/>
+      <xs:element name="ID" type="udt:IDType"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="DocumentLineDocumentType">
     <xs:sequence>
       <xs:element name="LineID" type="udt:IDType"/>
+      <xs:element name="IncludedNote" type="ram:NoteType" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="ExchangedDocumentContextType">
@@ -63,9 +64,10 @@
     <xs:sequence>
       <xs:element name="CreditorReferenceID" type="udt:IDType" minOccurs="0"/>
       <xs:element name="PaymentReference" type="udt:TextType" minOccurs="0"/>
+      <xs:element name="TaxCurrencyCode" type="qdt:CurrencyCodeType" minOccurs="0"/>
       <xs:element name="InvoiceCurrencyCode" type="qdt:CurrencyCodeType"/>
       <xs:element name="PayeeTradeParty" type="ram:TradePartyType" minOccurs="0"/>
-      <xs:element name="SpecifiedTradeSettlementPaymentMeans" type="ram:TradeSettlementPaymentMeansType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="SpecifiedTradeSettlementPaymentMeans" type="ram:TradeSettlementPaymentMeansType" minOccurs="0"/>
       <xs:element name="ApplicableTradeTax" type="ram:TradeTaxType" maxOccurs="unbounded"/>
       <xs:element name="BillingSpecifiedPeriod" type="ram:SpecifiedPeriodType" minOccurs="0"/>
       <xs:element name="SpecifiedTradeAllowanceCharge" type="ram:TradeAllowanceChargeType" minOccurs="0" maxOccurs="unbounded"/>
@@ -83,6 +85,7 @@
   </xs:complexType>
   <xs:complexType name="LineTradeAgreementType">
     <xs:sequence>
+      <xs:element name="GrossPriceProductTradePrice" type="ram:TradePriceType" minOccurs="0"/>
       <xs:element name="NetPriceProductTradePrice" type="ram:TradePriceType"/>
     </xs:sequence>
   </xs:complexType>
@@ -94,6 +97,7 @@
   <xs:complexType name="LineTradeSettlementType">
     <xs:sequence>
       <xs:element name="ApplicableTradeTax" type="ram:TradeTaxType"/>
+      <xs:element name="BillingSpecifiedPeriod" type="ram:SpecifiedPeriodType" minOccurs="0"/>
       <xs:element name="SpecifiedTradeAllowanceCharge" type="ram:TradeAllowanceChargeType" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="SpecifiedTradeSettlementLineMonetarySummation" type="ram:TradeSettlementLineMonetarySummationType"/>
     </xs:sequence>
@@ -118,7 +122,7 @@
   </xs:complexType>
   <xs:complexType name="SupplyChainEventType">
     <xs:sequence>
-      <xs:element name="OccurrenceDateTime" type="udt:DateTimeType" minOccurs="0"/>
+      <xs:element name="OccurrenceDateTime" type="udt:DateTimeType"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="SupplyChainTradeLineItemType">
@@ -126,7 +130,7 @@
       <xs:element name="AssociatedDocumentLineDocument" type="ram:DocumentLineDocumentType"/>
       <xs:element name="SpecifiedTradeProduct" type="ram:TradeProductType"/>
       <xs:element name="SpecifiedLineTradeAgreement" type="ram:LineTradeAgreementType"/>
-      <xs:element name="SpecifiedLineTradeDelivery" type="ram:LineTradeDeliveryType" minOccurs="0"/>
+      <xs:element name="SpecifiedLineTradeDelivery" type="ram:LineTradeDeliveryType"/>
       <xs:element name="SpecifiedLineTradeSettlement" type="ram:LineTradeSettlementType"/>
     </xs:sequence>
   </xs:complexType>
@@ -156,11 +160,12 @@
       <xs:element name="LineThree" type="udt:TextType" minOccurs="0"/>
       <xs:element name="CityName" type="udt:TextType" minOccurs="0"/>
       <xs:element name="CountryID" type="qdt:CountryIDType"/>
+      <xs:element name="CountrySubDivisionName" type="udt:TextType" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="TradeAllowanceChargeType">
     <xs:sequence>
-      <xs:element name="ChargeIndicator" type="udt:IndicatorType" minOccurs="0"/>
+      <xs:element name="ChargeIndicator" type="udt:IndicatorType"/>
       <xs:element name="CalculationPercent" type="udt:PercentType" minOccurs="0"/>
       <xs:element name="BasisAmount" type="udt:AmountType" minOccurs="0"/>
       <xs:element name="ActualAmount" type="udt:AmountType"/>
@@ -177,11 +182,12 @@
       <xs:element name="SpecifiedLegalOrganization" type="ram:LegalOrganizationType" minOccurs="0"/>
       <xs:element name="PostalTradeAddress" type="ram:TradeAddressType" minOccurs="0"/>
       <xs:element name="URIUniversalCommunication" type="ram:UniversalCommunicationType" minOccurs="0"/>
-      <xs:element name="SpecifiedTaxRegistration" type="ram:TaxRegistrationType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="SpecifiedTaxRegistration" type="ram:TaxRegistrationType" minOccurs="0" maxOccurs="2"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="TradePaymentTermsType">
     <xs:sequence>
+      <xs:element name="Description" type="udt:TextType" minOccurs="0"/>
       <xs:element name="DueDateDateTime" type="udt:DateTimeType" minOccurs="0"/>
       <xs:element name="DirectDebitMandateID" type="udt:IDType" minOccurs="0"/>
     </xs:sequence>
@@ -190,6 +196,7 @@
     <xs:sequence>
       <xs:element name="ChargeAmount" type="udt:AmountType"/>
       <xs:element name="BasisQuantity" type="udt:QuantityType" minOccurs="0"/>
+      <xs:element name="AppliedTradeAllowanceCharge" type="ram:TradeAllowanceChargeType" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="TradeProductType">
@@ -204,7 +211,7 @@
       <xs:element name="ChargeTotalAmount" type="udt:AmountType" minOccurs="0"/>
       <xs:element name="AllowanceTotalAmount" type="udt:AmountType" minOccurs="0"/>
       <xs:element name="TaxBasisTotalAmount" type="udt:AmountType"/>
-      <xs:element name="TaxTotalAmount" type="udt:AmountType" minOccurs="0"/>
+      <xs:element name="TaxTotalAmount" type="udt:AmountType" minOccurs="0" maxOccurs="2"/>
       <xs:element name="GrandTotalAmount" type="udt:AmountType"/>
       <xs:element name="TotalPrepaidAmount" type="udt:AmountType" minOccurs="0"/>
       <xs:element name="DuePayableAmount" type="udt:AmountType"/>
diff --git a/drafthorse/schema/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/drafthorse/schema/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
index 20085d5..f9cd7dd 100644
--- a/drafthorse/schema/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
+++ b/drafthorse/schema/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
@@ -49,7 +49,7 @@
   <xs:complexType name="QuantityType">
     <xs:simpleContent>
       <xs:extension base="xs:decimal">
-        <xs:attribute name="unitCode" type="xs:token" use="required"/>
+        <xs:attribute name="unitCode" type="xs:token" use="optional"/>
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
diff --git a/drafthorse/schema/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/drafthorse/schema/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
index 0aa4b17..aaa78d2 100644
--- a/drafthorse/schema/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
+++ b/drafthorse/schema/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
@@ -458,6 +458,7 @@
       <xs:enumeration value="VU"/>
       <xs:enumeration value="WF"/>
       <xs:enumeration value="WS"/>
+      <xs:enumeration value="XI"/>
       <xs:enumeration value="YE"/>
       <xs:enumeration value="YT"/>
       <xs:enumeration value="ZA"/>
@@ -702,6 +703,9 @@
       <xs:enumeration value="633"/>
       <xs:enumeration value="751"/>
       <xs:enumeration value="780"/>
+      <xs:enumeration value="875"/>
+      <xs:enumeration value="876"/>
+      <xs:enumeration value="877"/>
       <xs:enumeration value="916"/>
       <xs:enumeration value="935"/>
     </xs:restriction>
diff --git a/drafthorse/schema/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/drafthorse/schema/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
index 24fe52f..be4a4b0 100644
--- a/drafthorse/schema/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
+++ b/drafthorse/schema/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
@@ -26,7 +26,7 @@
   </xs:complexType>
   <xs:complexType name="DocumentContextParameterType">
     <xs:sequence>
-      <xs:element name="ID" type="udt:IDType" minOccurs="0"/>
+      <xs:element name="ID" type="udt:IDType"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="DocumentLineDocumentType">
@@ -77,7 +77,7 @@
       <xs:element name="TaxCurrencyCode" type="qdt:CurrencyCodeType" minOccurs="0"/>
       <xs:element name="InvoiceCurrencyCode" type="qdt:CurrencyCodeType"/>
       <xs:element name="PayeeTradeParty" type="ram:TradePartyType" minOccurs="0"/>
-      <xs:element name="SpecifiedTradeSettlementPaymentMeans" type="ram:TradeSettlementPaymentMeansType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="SpecifiedTradeSettlementPaymentMeans" type="ram:TradeSettlementPaymentMeansType" minOccurs="0"/>
       <xs:element name="ApplicableTradeTax" type="ram:TradeTaxType" maxOccurs="unbounded"/>
       <xs:element name="BillingSpecifiedPeriod" type="ram:SpecifiedPeriodType" minOccurs="0"/>
       <xs:element name="SpecifiedTradeAllowanceCharge" type="ram:TradeAllowanceChargeType" minOccurs="0" maxOccurs="unbounded"/>
@@ -135,7 +135,7 @@
   </xs:complexType>
   <xs:complexType name="ProductClassificationType">
     <xs:sequence>
-      <xs:element name="ClassCode" type="udt:CodeType"/>
+      <xs:element name="ClassCode" type="udt:CodeType" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="ReferencedDocumentType">
@@ -158,7 +158,7 @@
   </xs:complexType>
   <xs:complexType name="SupplyChainEventType">
     <xs:sequence>
-      <xs:element name="OccurrenceDateTime" type="udt:DateTimeType" minOccurs="0"/>
+      <xs:element name="OccurrenceDateTime" type="udt:DateTimeType"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="SupplyChainTradeLineItemType">
@@ -166,7 +166,7 @@
       <xs:element name="AssociatedDocumentLineDocument" type="ram:DocumentLineDocumentType"/>
       <xs:element name="SpecifiedTradeProduct" type="ram:TradeProductType"/>
       <xs:element name="SpecifiedLineTradeAgreement" type="ram:LineTradeAgreementType"/>
-      <xs:element name="SpecifiedLineTradeDelivery" type="ram:LineTradeDeliveryType" minOccurs="0"/>
+      <xs:element name="SpecifiedLineTradeDelivery" type="ram:LineTradeDeliveryType"/>
       <xs:element name="SpecifiedLineTradeSettlement" type="ram:LineTradeSettlementType"/>
     </xs:sequence>
   </xs:complexType>
@@ -201,7 +201,7 @@
   </xs:complexType>
   <xs:complexType name="TradeAllowanceChargeType">
     <xs:sequence>
-      <xs:element name="ChargeIndicator" type="udt:IndicatorType" minOccurs="0"/>
+      <xs:element name="ChargeIndicator" type="udt:IndicatorType"/>
       <xs:element name="CalculationPercent" type="udt:PercentType" minOccurs="0"/>
       <xs:element name="BasisAmount" type="udt:AmountType" minOccurs="0"/>
       <xs:element name="ActualAmount" type="udt:AmountType"/>
@@ -220,7 +220,7 @@
   </xs:complexType>
   <xs:complexType name="TradeCountryType">
     <xs:sequence>
-      <xs:element name="ID" type="qdt:CountryIDType"/>
+      <xs:element name="ID" type="qdt:CountryIDType" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="TradePartyType">
@@ -233,7 +233,7 @@
       <xs:element name="DefinedTradeContact" type="ram:TradeContactType" minOccurs="0"/>
       <xs:element name="PostalTradeAddress" type="ram:TradeAddressType" minOccurs="0"/>
       <xs:element name="URIUniversalCommunication" type="ram:UniversalCommunicationType" minOccurs="0"/>
-      <xs:element name="SpecifiedTaxRegistration" type="ram:TaxRegistrationType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="SpecifiedTaxRegistration" type="ram:TaxRegistrationType" minOccurs="0" maxOccurs="2"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="TradePaymentTermsType">
diff --git a/drafthorse/schema/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/drafthorse/schema/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
index b318b17..3aa4d00 100644
--- a/drafthorse/schema/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
+++ b/drafthorse/schema/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
@@ -73,7 +73,7 @@
   <xs:complexType name="QuantityType">
     <xs:simpleContent>
       <xs:extension base="xs:decimal">
-        <xs:attribute name="unitCode" type="xs:token" use="required"/>
+        <xs:attribute name="unitCode" type="xs:token" use="optional"/>
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
diff --git a/drafthorse/schema/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/drafthorse/schema/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
index 5c88319..1deda10 100644
--- a/drafthorse/schema/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
+++ b/drafthorse/schema/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
@@ -227,6 +227,14 @@
       <xs:extension base="qdt:AllowanceChargeReasonCodeContentType"/>
     </xs:simpleContent>
   </xs:complexType>
+  <xs:simpleType name="ContactTypeCodeContentType">
+    <xs:restriction base="xs:token"/>
+  </xs:simpleType>
+  <xs:complexType name="ContactTypeCodeType">
+    <xs:simpleContent>
+      <xs:extension base="qdt:ContactTypeCodeContentType"/>
+    </xs:simpleContent>
+  </xs:complexType>
   <xs:simpleType name="CountryIDContentType">
     <xs:restriction base="xs:token">
       <xs:enumeration value="1A"/>
@@ -474,6 +482,7 @@
       <xs:enumeration value="VU"/>
       <xs:enumeration value="WF"/>
       <xs:enumeration value="WS"/>
+      <xs:enumeration value="XI"/>
       <xs:enumeration value="YE"/>
       <xs:enumeration value="YT"/>
       <xs:enumeration value="ZA"/>
@@ -1318,14 +1327,34 @@
       <xs:enumeration value="749"/>
       <xs:enumeration value="750"/>
       <xs:enumeration value="751"/>
+      <xs:enumeration value="752"/>
+      <xs:enumeration value="753"/>
+      <xs:enumeration value="754"/>
+      <xs:enumeration value="755"/>
+      <xs:enumeration value="756"/>
+      <xs:enumeration value="757"/>
+      <xs:enumeration value="758"/>
+      <xs:enumeration value="759"/>
       <xs:enumeration value="760"/>
       <xs:enumeration value="761"/>
+      <xs:enumeration value="762"/>
       <xs:enumeration value="763"/>
       <xs:enumeration value="764"/>
       <xs:enumeration value="765"/>
       <xs:enumeration value="766"/>
+      <xs:enumeration value="767"/>
+      <xs:enumeration value="768"/>
+      <xs:enumeration value="769"/>
       <xs:enumeration value="770"/>
+      <xs:enumeration value="771"/>
+      <xs:enumeration value="772"/>
+      <xs:enumeration value="773"/>
+      <xs:enumeration value="774"/>
       <xs:enumeration value="775"/>
+      <xs:enumeration value="776"/>
+      <xs:enumeration value="777"/>
+      <xs:enumeration value="778"/>
+      <xs:enumeration value="779"/>
       <xs:enumeration value="780"/>
       <xs:enumeration value="781"/>
       <xs:enumeration value="782"/>
@@ -1349,30 +1378,78 @@
       <xs:enumeration value="810"/>
       <xs:enumeration value="811"/>
       <xs:enumeration value="812"/>
+      <xs:enumeration value="813"/>
+      <xs:enumeration value="814"/>
+      <xs:enumeration value="815"/>
+      <xs:enumeration value="816"/>
+      <xs:enumeration value="817"/>
+      <xs:enumeration value="818"/>
+      <xs:enumeration value="819"/>
       <xs:enumeration value="820"/>
       <xs:enumeration value="821"/>
       <xs:enumeration value="822"/>
       <xs:enumeration value="823"/>
       <xs:enumeration value="824"/>
       <xs:enumeration value="825"/>
+      <xs:enumeration value="826"/>
+      <xs:enumeration value="827"/>
+      <xs:enumeration value="828"/>
+      <xs:enumeration value="829"/>
       <xs:enumeration value="830"/>
+      <xs:enumeration value="831"/>
+      <xs:enumeration value="832"/>
       <xs:enumeration value="833"/>
+      <xs:enumeration value="834"/>
+      <xs:enumeration value="835"/>
+      <xs:enumeration value="836"/>
+      <xs:enumeration value="837"/>
+      <xs:enumeration value="838"/>
+      <xs:enumeration value="839"/>
       <xs:enumeration value="840"/>
       <xs:enumeration value="841"/>
+      <xs:enumeration value="842"/>
+      <xs:enumeration value="843"/>
+      <xs:enumeration value="844"/>
+      <xs:enumeration value="845"/>
+      <xs:enumeration value="846"/>
+      <xs:enumeration value="847"/>
+      <xs:enumeration value="848"/>
+      <xs:enumeration value="849"/>
       <xs:enumeration value="850"/>
       <xs:enumeration value="851"/>
       <xs:enumeration value="852"/>
       <xs:enumeration value="853"/>
+      <xs:enumeration value="854"/>
       <xs:enumeration value="855"/>
       <xs:enumeration value="856"/>
+      <xs:enumeration value="857"/>
+      <xs:enumeration value="858"/>
+      <xs:enumeration value="859"/>
       <xs:enumeration value="860"/>
       <xs:enumeration value="861"/>
       <xs:enumeration value="862"/>
       <xs:enumeration value="863"/>
       <xs:enumeration value="864"/>
       <xs:enumeration value="865"/>
+      <xs:enumeration value="866"/>
+      <xs:enumeration value="867"/>
+      <xs:enumeration value="868"/>
+      <xs:enumeration value="869"/>
       <xs:enumeration value="870"/>
+      <xs:enumeration value="871"/>
+      <xs:enumeration value="872"/>
+      <xs:enumeration value="873"/>
+      <xs:enumeration value="874"/>
+      <xs:enumeration value="875"/>
+      <xs:enumeration value="876"/>
+      <xs:enumeration value="877"/>
+      <xs:enumeration value="878"/>
+      <xs:enumeration value="879"/>
       <xs:enumeration value="890"/>
+      <xs:enumeration value="891"/>
+      <xs:enumeration value="892"/>
+      <xs:enumeration value="893"/>
+      <xs:enumeration value="894"/>
       <xs:enumeration value="895"/>
       <xs:enumeration value="896"/>
       <xs:enumeration value="901"/>
@@ -1456,6 +1533,14 @@
       <xs:extension base="qdt:LineStatusCodeContentType"/>
     </xs:simpleContent>
   </xs:complexType>
+  <xs:simpleType name="PartyRoleCodeContentType">
+    <xs:restriction base="xs:token"/>
+  </xs:simpleType>
+  <xs:complexType name="PartyRoleCodeType">
+    <xs:simpleContent>
+      <xs:extension base="qdt:PartyRoleCodeContentType"/>
+    </xs:simpleContent>
+  </xs:complexType>
   <xs:simpleType name="PaymentMeansCodeContentType">
     <xs:restriction base="xs:token">
       <xs:enumeration value="1"/>
diff --git a/drafthorse/schema/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/drafthorse/schema/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
index 81bc460..8198576 100644
--- a/drafthorse/schema/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
+++ b/drafthorse/schema/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
@@ -33,12 +33,13 @@
   </xs:complexType>
   <xs:complexType name="DocumentContextParameterType">
     <xs:sequence>
-      <xs:element name="ID" type="udt:IDType" minOccurs="0"/>
+      <xs:element name="ID" type="udt:IDType"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="DocumentLineDocumentType">
     <xs:sequence>
       <xs:element name="LineID" type="udt:IDType"/>
+      <xs:element name="ParentLineID" type="udt:IDType" minOccurs="0"/>
       <xs:element name="LineStatusCode" type="qdt:LineStatusCodeType" minOccurs="0"/>
       <xs:element name="LineStatusReasonCode" type="udt:CodeType" minOccurs="0"/>
       <xs:element name="IncludedNote" type="ram:NoteType" minOccurs="0" maxOccurs="unbounded"/>
@@ -68,13 +69,17 @@
       <xs:element name="BuyerReference" type="udt:TextType" minOccurs="0"/>
       <xs:element name="SellerTradeParty" type="ram:TradePartyType"/>
       <xs:element name="BuyerTradeParty" type="ram:TradePartyType"/>
+      <xs:element name="SalesAgentTradeParty" type="ram:TradePartyType" minOccurs="0"/>
+      <xs:element name="BuyerTaxRepresentativeTradeParty" type="ram:TradePartyType" minOccurs="0"/>
       <xs:element name="SellerTaxRepresentativeTradeParty" type="ram:TradePartyType" minOccurs="0"/>
       <xs:element name="ProductEndUserTradeParty" type="ram:TradePartyType" minOccurs="0"/>
       <xs:element name="ApplicableTradeDeliveryTerms" type="ram:TradeDeliveryTermsType" minOccurs="0"/>
       <xs:element name="SellerOrderReferencedDocument" type="ram:ReferencedDocumentType" minOccurs="0"/>
       <xs:element name="BuyerOrderReferencedDocument" type="ram:ReferencedDocumentType" minOccurs="0"/>
+      <xs:element name="QuotationReferencedDocument" type="ram:ReferencedDocumentType" minOccurs="0"/>
       <xs:element name="ContractReferencedDocument" type="ram:ReferencedDocumentType" minOccurs="0"/>
       <xs:element name="AdditionalReferencedDocument" type="ram:ReferencedDocumentType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="BuyerAgentTradeParty" type="ram:TradePartyType" minOccurs="0"/>
       <xs:element name="SpecifiedProcuringProject" type="ram:ProcuringProjectType" minOccurs="0"/>
       <xs:element name="UltimateCustomerOrderReferencedDocument" type="ram:ReferencedDocumentType" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
@@ -101,6 +106,7 @@
       <xs:element name="InvoicerTradeParty" type="ram:TradePartyType" minOccurs="0"/>
       <xs:element name="InvoiceeTradeParty" type="ram:TradePartyType" minOccurs="0"/>
       <xs:element name="PayeeTradeParty" type="ram:TradePartyType" minOccurs="0"/>
+      <xs:element name="PayerTradeParty" type="ram:TradePartyType" minOccurs="0"/>
       <xs:element name="TaxApplicableTradeCurrencyExchange" type="ram:TradeCurrencyExchangeType" minOccurs="0"/>
       <xs:element name="SpecifiedTradeSettlementPaymentMeans" type="ram:TradeSettlementPaymentMeansType" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="ApplicableTradeTax" type="ram:TradeTaxType" maxOccurs="unbounded"/>
@@ -124,6 +130,7 @@
   <xs:complexType name="LineTradeAgreementType">
     <xs:sequence>
       <xs:element name="BuyerOrderReferencedDocument" type="ram:ReferencedDocumentType" minOccurs="0"/>
+      <xs:element name="QuotationReferencedDocument" type="ram:ReferencedDocumentType" minOccurs="0"/>
       <xs:element name="ContractReferencedDocument" type="ram:ReferencedDocumentType" minOccurs="0"/>
       <xs:element name="AdditionalReferencedDocument" type="ram:ReferencedDocumentType" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="GrossPriceProductTradePrice" type="ram:TradePriceType" minOccurs="0"/>
@@ -150,8 +157,9 @@
       <xs:element name="BillingSpecifiedPeriod" type="ram:SpecifiedPeriodType" minOccurs="0"/>
       <xs:element name="SpecifiedTradeAllowanceCharge" type="ram:TradeAllowanceChargeType" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="SpecifiedTradeSettlementLineMonetarySummation" type="ram:TradeSettlementLineMonetarySummationType"/>
+      <xs:element name="InvoiceReferencedDocument" type="ram:ReferencedDocumentType" minOccurs="0"/>
       <xs:element name="AdditionalReferencedDocument" type="ram:ReferencedDocumentType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="ReceivableSpecifiedTradeAccountingAccount" type="ram:TradeAccountingAccountType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="ReceivableSpecifiedTradeAccountingAccount" type="ram:TradeAccountingAccountType" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="LogisticsServiceChargeType">
@@ -189,7 +197,7 @@
   </xs:complexType>
   <xs:complexType name="ProductClassificationType">
     <xs:sequence>
-      <xs:element name="ClassCode" type="udt:CodeType"/>
+      <xs:element name="ClassCode" type="udt:CodeType" minOccurs="0"/>
       <xs:element name="ClassName" type="udt:TextType" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
@@ -207,9 +215,11 @@
   </xs:complexType>
   <xs:complexType name="ReferencedProductType">
     <xs:sequence>
-      <xs:element name="GlobalID" type="udt:IDType" minOccurs="0"/>
+      <xs:element name="ID" type="udt:IDType" minOccurs="0"/>
+      <xs:element name="GlobalID" type="udt:IDType" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="SellerAssignedID" type="udt:IDType" minOccurs="0"/>
       <xs:element name="BuyerAssignedID" type="udt:IDType" minOccurs="0"/>
+      <xs:element name="IndustryAssignedID" type="udt:IDType" minOccurs="0"/>
       <xs:element name="Name" type="udt:TextType"/>
       <xs:element name="Description" type="udt:TextType" minOccurs="0"/>
       <xs:element name="UnitQuantity" type="udt:QuantityType" minOccurs="0"/>
@@ -230,7 +240,7 @@
   </xs:complexType>
   <xs:complexType name="SupplyChainEventType">
     <xs:sequence>
-      <xs:element name="OccurrenceDateTime" type="udt:DateTimeType" minOccurs="0"/>
+      <xs:element name="OccurrenceDateTime" type="udt:DateTimeType"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="SupplyChainTradeLineItemType">
@@ -238,7 +248,7 @@
       <xs:element name="AssociatedDocumentLineDocument" type="ram:DocumentLineDocumentType"/>
       <xs:element name="SpecifiedTradeProduct" type="ram:TradeProductType"/>
       <xs:element name="SpecifiedLineTradeAgreement" type="ram:LineTradeAgreementType"/>
-      <xs:element name="SpecifiedLineTradeDelivery" type="ram:LineTradeDeliveryType" minOccurs="0"/>
+      <xs:element name="SpecifiedLineTradeDelivery" type="ram:LineTradeDeliveryType"/>
       <xs:element name="SpecifiedLineTradeSettlement" type="ram:LineTradeSettlementType"/>
     </xs:sequence>
   </xs:complexType>
@@ -274,7 +284,7 @@
   </xs:complexType>
   <xs:complexType name="TradeAllowanceChargeType">
     <xs:sequence>
-      <xs:element name="ChargeIndicator" type="udt:IndicatorType" minOccurs="0"/>
+      <xs:element name="ChargeIndicator" type="udt:IndicatorType"/>
       <xs:element name="SequenceNumeric" type="udt:NumericType" minOccurs="0"/>
       <xs:element name="CalculationPercent" type="udt:PercentType" minOccurs="0"/>
       <xs:element name="BasisAmount" type="udt:AmountType" minOccurs="0"/>
@@ -289,6 +299,7 @@
     <xs:sequence>
       <xs:element name="PersonName" type="udt:TextType" minOccurs="0"/>
       <xs:element name="DepartmentName" type="udt:TextType" minOccurs="0"/>
+      <xs:element name="TypeCode" type="qdt:ContactTypeCodeType" minOccurs="0"/>
       <xs:element name="TelephoneUniversalCommunication" type="ram:UniversalCommunicationType" minOccurs="0"/>
       <xs:element name="FaxUniversalCommunication" type="ram:UniversalCommunicationType" minOccurs="0"/>
       <xs:element name="EmailURIUniversalCommunication" type="ram:UniversalCommunicationType" minOccurs="0"/>
@@ -296,7 +307,7 @@
   </xs:complexType>
   <xs:complexType name="TradeCountryType">
     <xs:sequence>
-      <xs:element name="ID" type="qdt:CountryIDType"/>
+      <xs:element name="ID" type="qdt:CountryIDType" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="TradeCurrencyExchangeType">
@@ -309,7 +320,7 @@
   </xs:complexType>
   <xs:complexType name="TradeDeliveryTermsType">
     <xs:sequence>
-      <xs:element name="DeliveryTypeCode" type="qdt:DeliveryTermsCodeType" minOccurs="0"/>
+      <xs:element name="DeliveryTypeCode" type="qdt:DeliveryTermsCodeType"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="TradePartyType">
@@ -317,9 +328,10 @@
       <xs:element name="ID" type="udt:IDType" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="GlobalID" type="udt:IDType" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="Name" type="udt:TextType" minOccurs="0"/>
+      <xs:element name="RoleCode" type="qdt:PartyRoleCodeType" minOccurs="0"/>
       <xs:element name="Description" type="udt:TextType" minOccurs="0"/>
       <xs:element name="SpecifiedLegalOrganization" type="ram:LegalOrganizationType" minOccurs="0"/>
-      <xs:element name="DefinedTradeContact" type="ram:TradeContactType" minOccurs="0"/>
+      <xs:element name="DefinedTradeContact" type="ram:TradeContactType" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="PostalTradeAddress" type="ram:TradeAddressType" minOccurs="0"/>
       <xs:element name="URIUniversalCommunication" type="ram:UniversalCommunicationType" minOccurs="0"/>
       <xs:element name="SpecifiedTaxRegistration" type="ram:TaxRegistrationType" minOccurs="0" maxOccurs="unbounded"/>
@@ -351,6 +363,7 @@
       <xs:element name="PartialPaymentAmount" type="udt:AmountType" minOccurs="0"/>
       <xs:element name="ApplicableTradePaymentPenaltyTerms" type="ram:TradePaymentPenaltyTermsType" minOccurs="0"/>
       <xs:element name="ApplicableTradePaymentDiscountTerms" type="ram:TradePaymentDiscountTermsType" minOccurs="0"/>
+      <xs:element name="PayeeTradeParty" type="ram:TradePartyType" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="TradePriceType">
@@ -361,8 +374,15 @@
       <xs:element name="IncludedTradeTax" type="ram:TradeTaxType" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
+  <xs:complexType name="TradeProductInstanceType">
+    <xs:sequence>
+      <xs:element name="BatchID" type="udt:IDType" minOccurs="0"/>
+      <xs:element name="SupplierAssignedSerialID" type="udt:IDType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
   <xs:complexType name="TradeProductType">
     <xs:sequence>
+      <xs:element name="ID" type="udt:IDType" minOccurs="0"/>
       <xs:element name="GlobalID" type="udt:IDType" minOccurs="0"/>
       <xs:element name="SellerAssignedID" type="udt:IDType" minOccurs="0"/>
       <xs:element name="BuyerAssignedID" type="udt:IDType" minOccurs="0"/>
@@ -370,6 +390,7 @@
       <xs:element name="Description" type="udt:TextType" minOccurs="0"/>
       <xs:element name="ApplicableProductCharacteristic" type="ram:ProductCharacteristicType" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="DesignatedProductClassification" type="ram:ProductClassificationType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="IndividualTradeProductInstance" type="ram:TradeProductInstanceType" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="OriginTradeCountry" type="ram:TradeCountryType" minOccurs="0"/>
       <xs:element name="IncludedReferencedProduct" type="ram:ReferencedProductType" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
@@ -396,6 +417,10 @@
   <xs:complexType name="TradeSettlementLineMonetarySummationType">
     <xs:sequence>
       <xs:element name="LineTotalAmount" type="udt:AmountType"/>
+      <xs:element name="ChargeTotalAmount" type="udt:AmountType" minOccurs="0"/>
+      <xs:element name="AllowanceTotalAmount" type="udt:AmountType" minOccurs="0"/>
+      <xs:element name="TaxTotalAmount" type="udt:AmountType" minOccurs="0"/>
+      <xs:element name="GrandTotalAmount" type="udt:AmountType" minOccurs="0"/>
       <xs:element name="TotalAllowanceChargeAmount" type="udt:AmountType" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
@@ -417,7 +442,7 @@
       <xs:element name="BasisAmount" type="udt:AmountType" minOccurs="0"/>
       <xs:element name="LineTotalBasisAmount" type="udt:AmountType" minOccurs="0"/>
       <xs:element name="AllowanceChargeBasisAmount" type="udt:AmountType" minOccurs="0"/>
-      <xs:element name="CategoryCode" type="qdt:TaxCategoryCodeType" minOccurs="0"/>
+      <xs:element name="CategoryCode" type="qdt:TaxCategoryCodeType"/>
       <xs:element name="ExemptionReasonCode" type="udt:CodeType" minOccurs="0"/>
       <xs:element name="TaxPointDate" type="udt:DateType" minOccurs="0"/>
       <xs:element name="DueDateTypeCode" type="qdt:TimeReferenceCodeType" minOccurs="0"/>
diff --git a/drafthorse/schema/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/drafthorse/schema/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
index 5916ec2..a29d4fb 100644
--- a/drafthorse/schema/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
+++ b/drafthorse/schema/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
@@ -38,7 +38,6 @@
           </xs:simpleContent>
         </xs:complexType>
       </xs:element>
-      <xs:element name="DateTime" type="xs:dateTime"/>
     </xs:choice>
   </xs:complexType>
   <xs:complexType name="DateType">
@@ -69,7 +68,7 @@
   <xs:complexType name="MeasureType">
     <xs:simpleContent>
       <xs:extension base="xs:decimal">
-        <xs:attribute name="unitCode" type="xs:token" use="required"/>
+        <xs:attribute name="unitCode" type="xs:token" use="optional"/>
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
@@ -86,7 +85,7 @@
   <xs:complexType name="QuantityType">
     <xs:simpleContent>
       <xs:extension base="xs:decimal">
-        <xs:attribute name="unitCode" type="xs:token" use="required"/>
+        <xs:attribute name="unitCode" type="xs:token" use="optional"/>
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
diff --git a/tests/samples/zugferd_2p1_EXTENDED_InnergemeinschLieferungMehrereBestellungen.xml b/tests/samples/zugferd_2p1_EXTENDED_InnergemeinschLieferungMehrereBestellungen.xml
index 4287ee2..91faaf1 100644
--- a/tests/samples/zugferd_2p1_EXTENDED_InnergemeinschLieferungMehrereBestellungen.xml
+++ b/tests/samples/zugferd_2p1_EXTENDED_InnergemeinschLieferungMehrereBestellungen.xml
@@ -294,14 +294,14 @@ HRB Berlin 13086</ram:Content>
 				<ram:CategoryCode>K</ram:CategoryCode>
 				<ram:RateApplicablePercent>0</ram:RateApplicablePercent>
 			</ram:ApplicableTradeTax>
-				<ram:BillingSpecifiedPeriod>
-					<ram:StartDateTime>
-						<udt:DateTimeString format="102">20181001</udt:DateTimeString>
-					</ram:StartDateTime>
-					<ram:EndDateTime>
-						<udt:DateTimeString format="102">20181031</udt:DateTimeString>
-					</ram:EndDateTime>
-				</ram:BillingSpecifiedPeriod>
+			<ram:BillingSpecifiedPeriod>
+				<ram:StartDateTime>
+					<udt:DateTimeString format="102">20181001</udt:DateTimeString>
+				</ram:StartDateTime>
+				<ram:EndDateTime>
+					<udt:DateTimeString format="102">20181031</udt:DateTimeString>
+				</ram:EndDateTime>
+			</ram:BillingSpecifiedPeriod>
 			<ram:SpecifiedTradePaymentTerms>
 				<ram:DueDateDateTime>
 					<udt:DateTimeString format="102">20181130</udt:DateTimeString>