Fix more tests

diff --git a/drafthorse/models/payment.py b/drafthorse/models/payment.py
index 5037733839f0dacf646e18ba490fb61a5373ca1d..3f7c94a1ceac1a1606ba38d99eacb88f23eab47c 100644 (file)
--- a/drafthorse/models/payment.py
+++ b/drafthorse/models/payment.py
@@ -24,11 +24,30 @@ class PayeeFinancialAccount(Element):
         tag = "PayeePartyCreditorFinancialAccount"
 
 
+class PayerFinancialInstitution(Element):
+    bic = StringField(NS_RAM, "BICID")
+
+    class Meta:
+        namespace = NS_RAM
+        tag = "PayerSpecifiedDebtorFinancialInstitution"
+
+
+class PayeeFinancialInstitution(Element):
+    bic = StringField(NS_RAM, "BICID")
+
+    class Meta:
+        namespace = NS_RAM
+        tag = "PayeeSpecifiedCreditorFinancialInstitution"
+
+
 class PaymentMeans(Element):
     type_code = StringField(NS_RAM, "TypeCode", required=False, profile=COMFORT)
     information = MultiStringField(NS_RAM, "Information", required=False, profile=COMFORT)
     payer_account = Field(PayerFinancialAccount)
+    payer_institution = Field(PayerFinancialInstitution)
     payee_account = Field(PayeeFinancialAccount)
+    payee_institution = Field(PayeeFinancialInstitution)
+
 
     class Meta:
         namespace = NS_RAM
@@ -41,11 +60,11 @@ class PaymentPenaltyTerms(Element):
     basis_period_measure = QuantityField(NS_RAM, "BasisPeriodMeasure", required=False,
                                          profile=EXTENDED, _d="Fälligkeitszeitraum")
     basis_amount = DecimalField(NS_RAM, "BasisAmount", required=False,
-                                 profile=EXTENDED, _d="Basisbetrag des Zahlungszuschlags")
+                                profile=EXTENDED, _d="Basisbetrag des Zahlungszuschlags")
     calculation_percent = DecimalField(NS_RAM, "CalculationPercent", required=False,
                                        profile=EXTENDED, _d="Prozentwert des Zahlungszuschlags")
     actual_amount = DecimalField(NS_RAM, "ActualPenaltyAmount", required=False,
-                                  profile=EXTENDED, _d="Betrag des Zahlungszuschlags")
+                                 profile=EXTENDED, _d="Betrag des Zahlungszuschlags")
 
     class Meta:
         namespace = NS_RAM
@@ -58,11 +77,11 @@ class PaymentDiscountTerms(Element):
     basis_period_measure = QuantityField(NS_RAM, "BasisPeriodMeasure", required=False,
                                          profile=EXTENDED, _d="Fälligkeitszeitraum")
     basis_amount = DecimalField(NS_RAM, "BasisAmount", required=False,
-                                 profile=EXTENDED, _d="Basisbetrag des Zahlungsabschlags")
+                                profile=EXTENDED, _d="Basisbetrag des Zahlungsabschlags")
     calculation_percent = DecimalField(NS_RAM, "CalculationPercent", required=False,
                                        profile=EXTENDED, _d="Prozentwert des Zahlungsabschlags")
     actual_amount = DecimalField(NS_RAM, "ActualDiscountAmount", required=False,
-                                  profile=EXTENDED, _d="Betrag des Zahlungsabschlags")
+                                 profile=EXTENDED, _d="Betrag des Zahlungsabschlags")
 
     class Meta:
         namespace = NS_RAM
@@ -75,7 +94,7 @@ class PaymentTerms(Element):
     due = DateTimeField(NS_RAM, "DueDateDateTime", required=False, profile=COMFORT,
                         _d="Fälligkeitsdatum")
     partial_amount = MultiDecimalField(NS_RAM, "PartialPaymentAmount", profile=EXTENDED,
-                                        required=False, _d="Betrag der Teilzahlung")
+                                       required=False, _d="Betrag der Teilzahlung")
     penalty_terms = Field(PaymentPenaltyTerms, required=False, profile=EXTENDED,
                           _d="Detailinformationen zu Zahlungszuschlägen")
     discount_terms = Field(PaymentDiscountTerms, required=False, profile=EXTENDED,

diff --git a/drafthorse/models/references.py b/drafthorse/models/references.py
index a1db67eba9c48ddac071b2f7869c39ec205c855e..d423b3819b1dee04a9b197a3548eef765c16e63f 100644 (file)
--- a/drafthorse/models/references.py
+++ b/drafthorse/models/references.py
@@ -23,11 +23,13 @@ class ContractReferencedDocument(ReferencedDocument):
 
 
 class AdditionalReferencedDocument(Element):
+    issuer_assigned_id = StringField(NS_RAM, "IssuerAssignedID", required=False,
+                                     profile=COMFORT)
+    uri_id = StringField(NS_RAM, "URIID", required=False,
+                                     profile=EXTENDED)
     date_time_string = DirectDateTimeField(NS_RAM, "DateTimeString", required=False,
                                            profile=COMFORT)
     type_code = StringField(NS_RAM, "TypeCode", profile=EXTENDED, required=True)
-    issuer_assigned_id = StringField(NS_RAM, "IssuerAssignedID", required=False,
-                                     profile=COMFORT)
 
     class Meta:
         namespace = NS_RAM
@@ -87,12 +89,12 @@ class LineReceivingAdviceReferencedDocument(ReferencedDocument):
 
 
 class LineAdditionalReferencedDocument(Element):
+    issuer_assigned_id = StringField(NS_RAM, "IssuerAssignedID", required=False,
+                                     profile=COMFORT)
     line_id = StringField(NS_RAM, "LineID", required=False, profile=EXTENDED)
     date_time_string = DirectDateTimeField(NS_RAM, "DateTimeString", required=False,
                                            profile=COMFORT)
     reference_type_code = StringField(NS_RAM, "ReferenceTypeCode", profile=EXTENDED, required=True)
-    issuer_assigned_id = StringField(NS_RAM, "IssuerAssignedID", required=False,
-                                     profile=COMFORT)
 
     class Meta:
         namespace = NS_RAM