Merge branch 'master' of https://vcs.digitaldata.works/AppStd/Modules
This commit is contained in:
@@ -301,6 +301,7 @@
|
|||||||
<Compile Include="ZUGFeRDInterface\Version2.3_3_FacturX\CrossIndustryInvoiceType.vb" />
|
<Compile Include="ZUGFeRDInterface\Version2.3_3_FacturX\CrossIndustryInvoiceType.vb" />
|
||||||
<Compile Include="ZUGFeRDInterface\Version2.3_FacturX\CrossIndustryInvoiceType.vb" />
|
<Compile Include="ZUGFeRDInterface\Version2.3_FacturX\CrossIndustryInvoiceType.vb" />
|
||||||
<Compile Include="ZUGFeRDInterface\Version2.4_FacturX\CrossIndustryInvoiceType.vb" />
|
<Compile Include="ZUGFeRDInterface\Version2.4_FacturX\CrossIndustryInvoiceType.vb" />
|
||||||
|
<Compile Include="ZUGFeRDInterface\Version2.5_2_FacturX\CrossIndustryInvoiceType.vb" />
|
||||||
<Compile Include="ZUGFeRDInterface\Version2.5_FacturX\CrossIndustryInvoiceType.vb" />
|
<Compile Include="ZUGFeRDInterface\Version2.5_FacturX\CrossIndustryInvoiceType.vb" />
|
||||||
<Compile Include="ZUGFeRDInterface\XmlItemProperty.vb" />
|
<Compile Include="ZUGFeRDInterface\XmlItemProperty.vb" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
|
|||||||
<Assembly: AssemblyCompany("Digital Data")>
|
<Assembly: AssemblyCompany("Digital Data")>
|
||||||
<Assembly: AssemblyProduct("Modules.Interfaces")>
|
<Assembly: AssemblyProduct("Modules.Interfaces")>
|
||||||
<Assembly: AssemblyCopyright("Copyright © 2026")>
|
<Assembly: AssemblyCopyright("Copyright © 2026")>
|
||||||
<Assembly: AssemblyTrademark("2.5.0.0")>
|
<Assembly: AssemblyTrademark("2.5.1.0")>
|
||||||
|
|
||||||
<Assembly: ComVisible(False)>
|
<Assembly: ComVisible(False)>
|
||||||
|
|
||||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("2.5.0.0")>
|
<Assembly: AssemblyVersion("2.5.1.0")>
|
||||||
<Assembly: AssemblyFileVersion("2.5.0.0")>
|
<Assembly: AssemblyFileVersion("2.5.1.0")>
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ Public Class ZUGFeRDInterface
|
|||||||
Public Const XMLSCHEMA_ZUGFERD_233 = "Version2_3_3_FacturX"
|
Public Const XMLSCHEMA_ZUGFERD_233 = "Version2_3_3_FacturX"
|
||||||
Public Const XMLSCHEMA_ZUGFERD_24 = "Version2_4_FacturX"
|
Public Const XMLSCHEMA_ZUGFERD_24 = "Version2_4_FacturX"
|
||||||
Public Const XMLSCHEMA_ZUGFERD_25 = "Version2_5_FacturX"
|
Public Const XMLSCHEMA_ZUGFERD_25 = "Version2_5_FacturX"
|
||||||
|
Public Const XMLSCHEMA_ZUGFERD_252 = "Version2_5_2_FacturX"
|
||||||
|
|
||||||
Public Const UBL_SPEC_21 = "UBL_21"
|
Public Const UBL_SPEC_21 = "UBL_21"
|
||||||
Public Const XMLSCHEMA_UBL_21_INVOICE = "UBL2_1_INVOICE"
|
Public Const XMLSCHEMA_UBL_21_INVOICE = "UBL2_1_INVOICE"
|
||||||
@@ -67,9 +68,9 @@ Public Class ZUGFeRDInterface
|
|||||||
Public Class ZugferdOptions
|
Public Class ZugferdOptions
|
||||||
Public Property AllowFacturX_Filename As Boolean = True
|
Public Property AllowFacturX_Filename As Boolean = True
|
||||||
Public Property AllowXRechnung_Filename As Boolean = True
|
Public Property AllowXRechnung_Filename As Boolean = True
|
||||||
Public Property AllowZugferd_1_0_Schema As Boolean = True
|
Public Property AllowZugferd_1_0_Schema As Boolean = False
|
||||||
Public Property AllowZugferd_2_x_Schema As Boolean = True
|
Public Property AllowZugferd_2_x_Schema As Boolean = False
|
||||||
Public Property AllowZugferd_2_3_x_Schema As Boolean = True
|
Public Property AllowZugferd_2_3_x_Schema As Boolean = False
|
||||||
Public Property AllowPeppol_3_x_Schema As Boolean = False
|
Public Property AllowPeppol_3_x_Schema As Boolean = False
|
||||||
Public Property AllowEBInterface_Schema As Boolean = False
|
Public Property AllowEBInterface_Schema As Boolean = False
|
||||||
End Class
|
End Class
|
||||||
@@ -110,6 +111,7 @@ Public Class ZUGFeRDInterface
|
|||||||
_Options = New ZugferdOptions()
|
_Options = New ZugferdOptions()
|
||||||
Else
|
Else
|
||||||
_Options = pOptions
|
_Options = pOptions
|
||||||
|
LogSpecificationOptions(_Options)
|
||||||
End If
|
End If
|
||||||
|
|
||||||
ApplyFilenameOptions(_Options)
|
ApplyFilenameOptions(_Options)
|
||||||
@@ -126,6 +128,16 @@ Public Class ZUGFeRDInterface
|
|||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Private Sub LogSpecificationOptions(options As ZugferdOptions)
|
||||||
|
_logger.Debug("AllowFacturX_Filename has Value [{0}]",options.AllowFacturX_Filename)
|
||||||
|
_logger.Debug("AllowXRechnung_Filename has Value [{0}]",options.AllowXRechnung_Filename)
|
||||||
|
_logger.Debug("AllowZugferd_1_0_Schema has Value [{0}]",options.AllowZugferd_1_0_Schema)
|
||||||
|
_logger.Debug("AllowZugferd_2_x_Schema has Value [{0}]",options.AllowZugferd_2_x_Schema)
|
||||||
|
_logger.Debug("AllowZugferd_2_3_x_Schema has Value [{0}]",options.AllowZugferd_2_3_x_Schema)
|
||||||
|
_logger.Debug("AllowPeppol_3_x_Schema has Value [{0}]",options.AllowPeppol_3_x_Schema)
|
||||||
|
_logger.Debug("AllowEBInterface_Schema has Value [{0}]", options.AllowEBInterface_Schema)
|
||||||
|
End Sub
|
||||||
|
|
||||||
Private Sub ApplyFilenameOptions(pOptions As ZugferdOptions)
|
Private Sub ApplyFilenameOptions(pOptions As ZugferdOptions)
|
||||||
Dim oAllowedFilenames As List(Of String) = ValidFilenames
|
Dim oAllowedFilenames As List(Of String) = ValidFilenames
|
||||||
|
|
||||||
@@ -457,6 +469,11 @@ Public Class ZUGFeRDInterface
|
|||||||
'' Reihenfolge ab 2.3 geändert. Neuste Version immer zuerst bzw. oben
|
'' Reihenfolge ab 2.3 geändert. Neuste Version immer zuerst bzw. oben
|
||||||
If _Options.AllowZugferd_2_3_x_Schema Then
|
If _Options.AllowZugferd_2_3_x_Schema Then
|
||||||
oAllowedTypes.AddRange(New List(Of AllowedType) From {
|
oAllowedTypes.AddRange(New List(Of AllowedType) From {
|
||||||
|
New AllowedType With {
|
||||||
|
.SchemaType = GetType(Version2_5_2_FacturX.CrossIndustryInvoiceType),
|
||||||
|
.Specification = ZUGFERD_SPEC_2_3x,
|
||||||
|
.XMLSchema = XMLSCHEMA_ZUGFERD_252
|
||||||
|
},
|
||||||
New AllowedType With {
|
New AllowedType With {
|
||||||
.SchemaType = GetType(Version2_5_FacturX.CrossIndustryInvoiceType),
|
.SchemaType = GetType(Version2_5_FacturX.CrossIndustryInvoiceType),
|
||||||
.Specification = ZUGFERD_SPEC_2_3x,
|
.Specification = ZUGFERD_SPEC_2_3x,
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -124,6 +124,9 @@ Public Class ImportZUGFeRDFiles
|
|||||||
_zugferd = New ZUGFeRDInterface(_logConfig, _gdpictureLicenseKey, New ZUGFeRDInterface.ZugferdOptions() With {
|
_zugferd = New ZUGFeRDInterface(_logConfig, _gdpictureLicenseKey, New ZUGFeRDInterface.ZugferdOptions() With {
|
||||||
.AllowFacturX_Filename = oArgs.AllowFacturX,
|
.AllowFacturX_Filename = oArgs.AllowFacturX,
|
||||||
.AllowXRechnung_Filename = oArgs.AllowXRechnung,
|
.AllowXRechnung_Filename = oArgs.AllowXRechnung,
|
||||||
|
.AllowZugferd_1_0_Schema = oArgs.AllowZugferd10,
|
||||||
|
.AllowZugferd_2_x_Schema = oArgs.AllowZugferd2x,
|
||||||
|
.AllowZugferd_2_3_x_Schema = oArgs.AllowZugferd23x,
|
||||||
.AllowPeppol_3_x_Schema = oArgs.AllowPeppolBISBill3x,
|
.AllowPeppol_3_x_Schema = oArgs.AllowPeppolBISBill3x,
|
||||||
.AllowEBInterface_Schema = oArgs.AllowEBInterface
|
.AllowEBInterface_Schema = oArgs.AllowEBInterface
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ Public Class WorkerArgs
|
|||||||
' Feature Flags
|
' Feature Flags
|
||||||
Public AllowFacturX As Boolean = True
|
Public AllowFacturX As Boolean = True
|
||||||
Public AllowXRechnung As Boolean = True
|
Public AllowXRechnung As Boolean = True
|
||||||
Public AllowZugferd10 As Boolean = True
|
Public AllowZugferd10 As Boolean = False
|
||||||
Public AllowZugferd2x As Boolean = True
|
Public AllowZugferd2x As Boolean = False
|
||||||
Public AllowZugferd23x As Boolean = True
|
Public AllowZugferd23x As Boolean = False
|
||||||
Public AllowPeppolBISBill3x As Boolean = False
|
Public AllowPeppolBISBill3x As Boolean = False
|
||||||
Public AllowEBInterface As Boolean = False
|
Public AllowEBInterface As Boolean = False
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user