diff --git a/Interfaces/Interfaces.vbproj b/Interfaces/Interfaces.vbproj
index 5b3cd28d..27e501ce 100644
--- a/Interfaces/Interfaces.vbproj
+++ b/Interfaces/Interfaces.vbproj
@@ -245,8 +245,8 @@
True
-
-
+
+
diff --git a/Interfaces/ZUGFeRDInterface.vb b/Interfaces/ZUGFeRDInterface.vb
index 4562123d..2e076ec6 100644
--- a/Interfaces/ZUGFeRDInterface.vb
+++ b/Interfaces/ZUGFeRDInterface.vb
@@ -1,10 +1,8 @@
Imports System.IO
-Imports System.Reflection
Imports System.Xml
Imports System.Xml.Serialization
Imports DigitalData.Modules.Interfaces.Exceptions
Imports DigitalData.Modules.Interfaces.PDFEmbeds
-Imports DigitalData.Modules.Interfaces.Peppol
Imports DigitalData.Modules.Interfaces.ZUGFeRD
Imports DigitalData.Modules.Logging
Imports GdPicture14
@@ -21,8 +19,8 @@ Public Class ZUGFeRDInterface
Public Const ZUGFERD_SPEC_DEFAULT = "DEFAULT"
Public Const ZUGFERD_SPEC_10 = "ZUGFERD_10"
Public Const ZUGFERD_SPEC_2x = "ZUGFERD_2x"
- Public Const PEPPOL_SPEC_3x_INVOICE = "PEPPOL_BISBILL_3x"
- Public Const PEPPOL_SPEC_3x_CREDITNOTE = "PEPPOL_BISBILL_3x"
+
+ Public Const UBL_SPEC_21 = "UBL_21"
Public Const XMLSCHEMA_ZUGFERD_10 = "Version1_0"
Public Const XMLSCHEMA_ZUGFERD_20 = "Version2_0"
@@ -30,8 +28,8 @@ Public Class ZUGFeRDInterface
Public Const XMLSCHEMA_ZUGFERD_22 = "Version2_2_FacturX"
Public Const XMLSCHEMA_ZUGFERD_23 = "Version2_3_FacturX"
Public Const XMLSCHEMA_ZUGFERD_233 = "Version2_3_3_FacturX"
- Public Const XMLSCHEMA_PEPPOL_3017_INVOICE = "Version3017_INVOICE"
- Public Const XMLSCHEMA_PEPPOL_3017_CREDITNOTE = "Version3017_CREDITNOTE"
+ Public Const XMLSCHEMA_UBL_21_INVOICE = "UBL2_1_INVOICE"
+ Public Const XMLSCHEMA_UBL_21_CREDITNOTE = "UBL2_1_CREDITNOTE"
Public Const RECEIPT_TYPE_XML = "XML"
Public Const RECEIPT_TYPE_PDF = "PDF"
@@ -393,14 +391,14 @@ Public Class ZUGFeRDInterface
If _Options.AllowPeppol_3_x_Schema Then
oAllowedTypes.AddRange(New List(Of AllowedType) From {
New AllowedType With {
- .SchemaType = GetType(BISBilling30Invoice.InvoiceType),
- .Specification = PEPPOL_SPEC_3x_INVOICE,
- .XMLSchema = XMLSCHEMA_PEPPOL_3017_INVOICE
+ .SchemaType = GetType(UBL_21_Invoice.InvoiceType),
+ .Specification = UBL_SPEC_21,
+ .XMLSchema = XMLSCHEMA_UBL_21_INVOICE
},
New AllowedType With {
- .SchemaType = GetType(BISBilling30CreditNote.CreditNoteType),
- .Specification = PEPPOL_SPEC_3x_CREDITNOTE,
- .XMLSchema = XMLSCHEMA_PEPPOL_3017_CREDITNOTE
+ .SchemaType = GetType(UBL_21_CreditNote.CreditNoteType),
+ .Specification = UBL_SPEC_21,
+ .XMLSchema = XMLSCHEMA_UBL_21_CREDITNOTE
}
})
End If
diff --git a/Interfaces/ZUGFeRDInterface/Peppol_BIS_Billing3017/CreditNoteType.vb b/Interfaces/ZUGFeRDInterface/Peppol_UBL2.1/CreditNoteType.vb
similarity index 80%
rename from Interfaces/ZUGFeRDInterface/Peppol_BIS_Billing3017/CreditNoteType.vb
rename to Interfaces/ZUGFeRDInterface/Peppol_UBL2.1/CreditNoteType.vb
index f623f018..b6226d41 100644
--- a/Interfaces/ZUGFeRDInterface/Peppol_BIS_Billing3017/CreditNoteType.vb
+++ b/Interfaces/ZUGFeRDInterface/Peppol_UBL2.1/CreditNoteType.vb
@@ -16,43 +16,43 @@ Imports System.Xml.Serialization
'
'Dieser Quellcode wurde automatisch generiert von xsd, Version=4.8.3928.0.
'
-Namespace Peppol.BISBilling30CreditNote
-
+Namespace UBL_21_CreditNote
+
'''
- _
+
Partial Public Class TransportEventType
-
+
Private identificationIDField As IdentificationIDType
-
+
Private occurrenceDateField As OccurrenceDateType
-
+
Private occurrenceTimeField As OccurrenceTimeType
-
+
Private transportEventTypeCodeField As TransportEventTypeCodeType
-
+
Private descriptionField() As DescriptionType
-
+
Private completionIndicatorField As CompletionIndicatorType
-
+
Private reportedShipmentField As ShipmentType
-
+
Private currentStatusField() As StatusType
-
+
Private contactField() As ContactType
-
+
Private locationField As LocationType1
-
+
Private signatureField As SignatureType
-
+
Private periodField() As PeriodType
-
+
'''
- _
+
Public Property IdentificationID() As IdentificationIDType
Get
Return Me.identificationIDField
@@ -61,9 +61,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.identificationIDField = value
End Set
End Property
-
+
'''
- _
+
Public Property OccurrenceDate() As OccurrenceDateType
Get
Return Me.occurrenceDateField
@@ -72,9 +72,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.occurrenceDateField = value
End Set
End Property
-
+
'''
- _
+
Public Property OccurrenceTime() As OccurrenceTimeType
Get
Return Me.occurrenceTimeField
@@ -83,9 +83,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.occurrenceTimeField = value
End Set
End Property
-
+
'''
- _
+
Public Property TransportEventTypeCode() As TransportEventTypeCodeType
Get
Return Me.transportEventTypeCodeField
@@ -94,9 +94,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.transportEventTypeCodeField = value
End Set
End Property
-
+
'''
- _
+
Public Property Description() As DescriptionType()
Get
Return Me.descriptionField
@@ -105,9 +105,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.descriptionField = value
End Set
End Property
-
+
'''
- _
+
Public Property CompletionIndicator() As CompletionIndicatorType
Get
Return Me.completionIndicatorField
@@ -116,7 +116,7 @@ Namespace Peppol.BISBilling30CreditNote
Me.completionIndicatorField = value
End Set
End Property
-
+
'''
Public Property ReportedShipment() As ShipmentType
Get
@@ -126,9 +126,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.reportedShipmentField = value
End Set
End Property
-
+
'''
- _
+
Public Property CurrentStatus() As StatusType()
Get
Return Me.currentStatusField
@@ -137,9 +137,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.currentStatusField = value
End Set
End Property
-
+
'''
- _
+
Public Property Contact() As ContactType()
Get
Return Me.contactField
@@ -148,7 +148,7 @@ Namespace Peppol.BISBilling30CreditNote
Me.contactField = value
End Set
End Property
-
+
'''
Public Property Location() As LocationType1
Get
@@ -158,7 +158,7 @@ Namespace Peppol.BISBilling30CreditNote
Me.locationField = value
End Set
End Property
-
+
'''
Public Property Signature() As SignatureType
Get
@@ -168,9 +168,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.signatureField = value
End Set
End Property
-
+
'''
- _
+
Public Property Period() As PeriodType()
Get
Return Me.periodField
@@ -180,279 +180,279 @@ Namespace Peppol.BISBilling30CreditNote
End Set
End Property
End Class
-
+
'''
- _
+
Partial Public Class IdentificationIDType
Inherits IdentifierType1
End Class
-
+
'''
- _
+
Partial Public Class IdentifierType1
Inherits IdentifierType
End Class
-
+
'''
- _
+
Partial Public Class IdentifierType
-
+
Private schemeIDField As String
-
+
Private schemeNameField As String
-
+
Private schemeAgencyIDField As String
-
+
Private schemeAgencyNameField As String
-
+
Private schemeVersionIDField As String
-
+
Private schemeDataURIField As String
-
+
Private schemeURIField As String
-
+
Private valueField As String
-
+
'''
- _
+
Public Property schemeID() As String
Get
Return Me.schemeIDField
@@ -461,9 +461,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.schemeIDField = value
End Set
End Property
-
+
'''
- _
+
Public Property schemeName() As String
Get
Return Me.schemeNameField
@@ -472,9 +472,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.schemeNameField = value
End Set
End Property
-
+
'''
- _
+
Public Property schemeAgencyID() As String
Get
Return Me.schemeAgencyIDField
@@ -483,9 +483,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.schemeAgencyIDField = value
End Set
End Property
-
+
'''
- _
+
Public Property schemeAgencyName() As String
Get
Return Me.schemeAgencyNameField
@@ -494,9 +494,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.schemeAgencyNameField = value
End Set
End Property
-
+
'''
- _
+
Public Property schemeVersionID() As String
Get
Return Me.schemeVersionIDField
@@ -505,9 +505,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.schemeVersionIDField = value
End Set
End Property
-
+
'''
- _
+
Public Property schemeDataURI() As String
Get
Return Me.schemeDataURIField
@@ -516,9 +516,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.schemeDataURIField = value
End Set
End Property
-
+
'''
- _
+
Public Property schemeURI() As String
Get
Return Me.schemeURIField
@@ -527,9 +527,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.schemeURIField = value
End Set
End Property
-
+
'''
- _
+
Public Property Value() As String
Get
Return Me.valueField
@@ -539,37 +539,37 @@ Namespace Peppol.BISBilling30CreditNote
End Set
End Property
End Class
-
+
'''
- _
+
Partial Public Class BinaryObjectType
-
+
Private formatField As String
-
+
Private mimeCodeField As String
-
+
Private encodingCodeField As String
-
+
Private characterSetCodeField As String
-
+
Private uriField As String
-
+
Private filenameField As String
-
+
Private valueField() As Byte
-
+
'''
- _
+
Public Property format() As String
Get
Return Me.formatField
@@ -578,9 +578,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.formatField = value
End Set
End Property
-
+
'''
- _
+
Public Property mimeCode() As String
Get
Return Me.mimeCodeField
@@ -589,9 +589,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.mimeCodeField = value
End Set
End Property
-
+
'''
- _
+
Public Property encodingCode() As String
Get
Return Me.encodingCodeField
@@ -600,9 +600,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.encodingCodeField = value
End Set
End Property
-
+
'''
- _
+
Public Property characterSetCode() As String
Get
Return Me.characterSetCodeField
@@ -611,9 +611,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.characterSetCodeField = value
End Set
End Property
-
+
'''
- _
+
Public Property uri() As String
Get
Return Me.uriField
@@ -622,9 +622,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.uriField = value
End Set
End Property
-
+
'''
- _
+
Public Property filename() As String
Get
Return Me.filenameField
@@ -633,9 +633,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.filenameField = value
End Set
End Property
-
+
'''
- _
+
Public Property Value() As Byte()
Get
Return Me.valueField
@@ -645,124 +645,124 @@ Namespace Peppol.BISBilling30CreditNote
End Set
End Property
End Class
-
+
'''
- _
+
Partial Public Class VideoType
Inherits BinaryObjectType
End Class
-
+
'''
- _
+
Partial Public Class SoundType
Inherits BinaryObjectType
End Class
-
+
'''
- _
+
Partial Public Class PictureType
Inherits BinaryObjectType
End Class
-
+
'''
- _
+
Partial Public Class GraphicType
Inherits BinaryObjectType
End Class
-
+
'''
- _
+
Partial Public Class BinaryObjectType1
Inherits BinaryObjectType
End Class
-
+
'''
- _
+
Partial Public Class EmbeddedDocumentBinaryObjectType
Inherits BinaryObjectType1
End Class
-
+
'''
- _
+
Partial Public Class NumericType
-
+
Private formatField As String
-
+
Private valueField As Decimal
-
+
'''
- _
+
Public Property format() As String
Get
Return Me.formatField
@@ -771,9 +771,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.formatField = value
End Set
End Property
-
+
'''
- _
+
Public Property Value() As Decimal
Get
Return Me.valueField
@@ -783,576 +783,576 @@ Namespace Peppol.BISBilling30CreditNote
End Set
End Property
End Class
-
+
'''
- _
+
Partial Public Class RateType
Inherits NumericType
End Class
-
+
'''
- _
+
Partial Public Class TargetCurrencyBaseRateType
Inherits RateType
End Class
-
+
'''
- _
+
Partial Public Class SourceCurrencyBaseRateType
Inherits RateType
End Class
-
+
'''
- _
+
Partial Public Class RateType1
Inherits RateType
End Class
-
+
'''
- _
+
Partial Public Class OrderableUnitFactorRateType
Inherits RateType
End Class
-
+
'''
- _
+
Partial Public Class CalculationRateType
Inherits RateType
End Class
-
+
'''
- _
+
Partial Public Class AmountRateType
Inherits RateType
End Class
-
+
'''
- _
+
Partial Public Class PercentType
Inherits NumericType
End Class
-
+
'''
- _
+
Partial Public Class TierRatePercentType
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class TargetServicePercentType
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class SettlementDiscountPercentType
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class ReliabilityPercentType
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class ProgressPercentType
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class PercentType1
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class PenaltySurchargePercentType
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class PaymentPercentType
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class ParticipationPercentType
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class PartecipationPercentType
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class MinimumPercentType
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class MaximumPercentType
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class HumidityPercentType
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class AirFlowPercentType
Inherits PercentType
End Class
-
+
'''
- _
+
Partial Public Class ValueType1
Inherits NumericType
End Class
-
+
'''
- _
+
Partial Public Class NumericType1
Inherits NumericType
End Class
-
+
'''
- _
+
Partial Public Class WeightNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class SequenceNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class ResidentOccupantsNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class ReminderSequenceNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class PackSizeNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class OrderQuantityIncrementNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class OrderIntervalDaysNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class MultiplierFactorNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class MinimumNumberNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class MaximumPaymentInstructionsNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class MaximumNumberNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class MaximumCopiesNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class LineNumberNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class LineCountNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class FrozenPeriodDaysNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class CalculationSequenceNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class BudgetYearNumericType
Inherits NumericType1
End Class
-
+
'''
- _
+
Partial Public Class AmountType
-
+
Private currencyIDField As String
-
+
Private currencyCodeListVersionIDField As String
-
+
Private valueField As Decimal
-
+
'''
- _
+
Public Property currencyID() As String
Get
Return Me.currencyIDField
@@ -1361,9 +1361,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.currencyIDField = value
End Set
End Property
-
+
'''
- _
+
Public Property currencyCodeListVersionID() As String
Get
Return Me.currencyCodeListVersionIDField
@@ -1372,9 +1372,9 @@ Namespace Peppol.BISBilling30CreditNote
Me.currencyCodeListVersionIDField = value
End Set
End Property
-
+
'''
- _
+
Public Property Value() As Decimal
Get
Return Me.valueField
@@ -1384,919 +1384,919 @@ Namespace Peppol.BISBilling30CreditNote
End Set
End Property
End Class
-
+
'''
- _
+
Partial Public Class AmountType1
Inherits AmountType
End Class
-
+
'''
- _
+
Partial Public Class ValueAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TransactionCurrencyTaxAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TotalTaxAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TotalTaskAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TotalPaymentAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TotalInvoiceAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TotalDebitAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TotalCreditAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TotalBalanceAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TotalAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class ThresholdAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TaxableAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TaxInclusiveAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TaxExclusiveAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TaxEnergyOnAccountAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TaxEnergyBalanceAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TaxEnergyAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class TaxAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class SettlementDiscountAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class RoundingAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class RequiredFeeAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class PriceAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class PrepaidAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class PerUnitAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class PenaltyAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class PayableRoundingAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class PayableAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class PayableAlternativeAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class PartyCapacityAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class PaidAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class MinimumAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class MaximumPaidAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class MaximumAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class MaximumAdvertisementAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class MarketValueAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class LowerTenderAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class LineExtensionAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class LiabilityAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class InventoryValueAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class InsuranceValueAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class InsurancePremiumAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+
Partial Public Class HigherTenderAmountType
Inherits AmountType1
End Class
-
+
'''
- _
+