Modules.Interface: ZUGFeRD 2.4 - Schema-Klasse und Aufruf ergänzt

Vorbereitung BT-Felder-Anzeige

Base/Base.vbproj

@@ -45,6 +45,9 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
@@ -79,6 +82,7 @@
   <ItemGroup>
     <Compile Include="Base\BaseClass.vb" />
     <Compile Include="Base\BaseUtils.vb" />
+    <Compile Include="ECM\ECM.vb" />
     <Compile Include="Encryption\Compression.vb" />
     <Compile Include="Encryption\Encryption.vb" />
     <Compile Include="Encryption\EncryptionLegacy.vb" />
@@ -89,6 +93,7 @@
     <Compile Include="FileWatcher\FileWatcherProperties.vb" />
     <Compile Include="IDB\Constants.vb" />
     <Compile Include="MimeEx.vb" />
+    <Compile Include="StringFunctions.vb" />
     <Compile Include="WindowsEx.vb" />
     <Compile Include="ModuleExtensions.vb" />
     <Compile Include="FileEx.vb" />
@@ -138,12 +143,6 @@
   <ItemGroup>
     <Content Include="README.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>

Base/ECM/ECM.vb

@@ -0,0 +1,8 @@
+Public Class ECM
+    Public Enum Product
+        taskFLOW
+        easyFLOW
+        fileFLOW
+        signFLOW
+    End Enum
+End Class

Base/My Project/AssemblyInfo.vb

@@ -8,12 +8,12 @@ Imports System.Runtime.InteropServices
 
 ' Werte der Assemblyattribute überprüfen
 
-<Assembly: AssemblyTitle("Base")>
+<Assembly: AssemblyTitle("Modules.Base")>
-<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyDescription("basisfunktionalitäten für DigitalData Anwendungen")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyCompany("Digital Data GmbH")>
-<Assembly: AssemblyProduct("Base")>
+<Assembly: AssemblyProduct("Modules.")>
-<Assembly: AssemblyCopyright("Copyright © 2023")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("1.3.6.0")>
+<Assembly: AssemblyTrademark("1.3.9.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.3.6.0")>
+<Assembly: AssemblyVersion("1.3.9.0")>
-<Assembly: AssemblyFileVersion("1.3.6.0")>
+<Assembly: AssemblyFileVersion("1.3.9.0")>

Base/StringFunctions.vb

@@ -0,0 +1,64 @@
+Imports System.Globalization
+Imports DigitalData.Modules.Logging
+
+Public Class StringFunctions
+    Public Shared Function SplitText_Length(ByVal input As String, ByVal maxLength As Integer) As List(Of String)
+        Dim result As New List(Of String)
+
+        For i As Integer = 0 To input.Length - 1 Step maxLength
+            ' Textabschnitt extrahieren
+            Dim chunk As String = input.Substring(i, Math.Min(maxLength, input.Length - i))
+            result.Add(chunk)
+        Next
+
+        Return result
+    End Function
+    Public Shared Function SplitTextByNewLine(text As String) As List(Of String)
+        If String.IsNullOrEmpty(text) Then
+            Return New List(Of String)()
+        End If
+
+        ' Zerlege den Text anhand von Zeilenumbrüchen
+        Dim lines As List(Of String) = text.Split({vbCrLf, vbLf, vbCr}, StringSplitOptions.None).ToList()
+        Return lines
+    End Function
+
+    Public Shared Function DatetimeStringToGermanStringConverter(pDatetimeString As String, pLogger As Logger) As String
+
+        If pDatetimeString.IsNullOrEmpty() = True Then
+            ' Wenn nichts kommt, kommt nichts zurueck
+            Return String.Empty
+        End If
+
+        Dim formatList As List(Of String) = New List(Of String) From {
+                "yyyyMMdd",
+                "MM/dd/yyyy", "M/d/yyyy", "MM/d/yyyy", "M/dd/yyyy",
+                "yyyy-MM-dd", "yyyy-M-d", "yyyy-MM-d", "yyyy-M-dd",
+                "dd.MM.yyyy", "d.M.yyyy", "d.MM.yyyy", "dd.M.yyyy"
+        }
+
+        Dim dateStringResult As Date = Date.MinValue
+        Dim oConvertResult As Boolean = False
+
+        For Each formatStringItem In formatList
+            Try
+                dateStringResult = DateTime.ParseExact(pDatetimeString, formatStringItem, CultureInfo.InvariantCulture)
+                oConvertResult = True
+                Exit For
+            Catch ex As FormatException
+                oConvertResult = False
+                pLogger?.Debug("DatetimeStringToGermanStringConverter() - Could not parse date string {0} ({1})", pDatetimeString, formatStringItem)
+            End Try
+        Next
+
+        If oConvertResult = True Then
+            ' In deutsches Format umwandeln (dd.MM.yyyy)
+            Dim germanDateFormat As String = dateStringResult.ToString("dd.MM.yyyy")
+            Return germanDateFormat
+        Else
+            ' Wenn nichts konvertiert werden konnte, geben wir den ursprünglichen Wert zurück
+            Return pDatetimeString
+        End If
+
+    End Function
+End Class

Base/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NLog" version="5.0.5" targetFramework="net461" />
+  <package id="NuGet.CommandLine" version="6.13.2" targetFramework="net462" developmentDependency="true" />
 </packages>

Config/App.config

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
+  <entityFramework>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+      <provider invariantName="FirebirdSql.Data.FirebirdClient" type="EntityFramework.Firebird.FbProviderServices, EntityFramework.Firebird" />
+    </providers>
+    <defaultConnectionFactory type="EntityFramework.Firebird.FbConnectionFactory, EntityFramework.Firebird" />
+  </entityFramework>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

Config/Config.vbproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
     <MyType>Windows</MyType>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -47,16 +50,40 @@
     <Reference Include="DigitalData.Modules.Base">
       <HintPath>..\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Database">
       <HintPath>..\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
@@ -111,6 +138,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="App.config" />
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
       <LastGenOutput>Application.Designer.vb</LastGenOutput>
@@ -122,18 +150,16 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Encryption\Encryption.vbproj">
-      <Project>{8a8f20fc-c46e-41ac-bee7-218366cfff99}</Project>
-      <Name>Encryption</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
   </PropertyGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+  </Target>
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
 </Project>

Config/My Project/AssemblyInfo.vb

@@ -9,11 +9,11 @@ Imports System.Runtime.InteropServices
 ' Werte der Assemblyattribute überprüfen
 
 <Assembly: AssemblyTitle("Modules.Config")>
-<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyDescription("Stellt Module für die Konfiguration von Produkten bereit")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyCompany("Digital Data GmbH, Heuchelheim")>
 <Assembly: AssemblyProduct("Modules.Config")>
 <Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("1.3.0.0")>
+<Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
 

Config/packages.config

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="EntityFramework" version="6.4.4" targetFramework="net462" />
+  <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
+  <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
+  <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
 </packages>

Database/Adapters/MSSQLServer.vb

@@ -159,6 +159,13 @@ Public Class MSSQLServer
             Return oGDPicture
         End Using
     End Function
+    Public Function GetDDCatalog() As DataTable
+        Using oConnection As SqlConnection = GetSQLConnection()
+            Dim oSQL = Queries.DD_ECM.DD_SELECTS.TBDD_CATALOG
+            Dim oDT_CATALOG As DataTable = GetDatatable(oSQL)
+            Return oDT_CATALOG
+        End Using
+    End Function
     Public Function Get_ConnectionStringforID(pConnectionId As Integer) As String
         Dim oConnectionString As String = String.Empty
 
@@ -645,6 +652,11 @@ Public Class MSSQLServer
             Select(Function(p) $"({p.ParameterName}={p.Value})").
             ToList()
 
-        Return String.Join(",", oList)
+        Dim oParamString = String.Join(",", oList)
+        If oParamString.Length > 1000 Then
+            oParamString = oParamString.Substring(1, 1000)
+        End If
+        Return oParamString
+
     End Function
 End Class

Database/Database.vbproj

@@ -47,6 +47,13 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DigitalData.Modules.Encryption">
+      <HintPath>..\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
@@ -145,16 +152,6 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Encryption\Encryption.vbproj">
-      <Project>{8a8f20fc-c46e-41ac-bee7-218366cfff99}</Project>
-      <Name>Encryption</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -162,11 +159,9 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
-    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets'))" />
   </Target>
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
   <PropertyGroup>
     <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" />
 </Project>

Database/My Project/AssemblyInfo.vb

@@ -9,11 +9,11 @@ Imports System.Runtime.InteropServices
 ' Werte der Assemblyattribute überprüfen
 
 <Assembly: AssemblyTitle("Modules.Database")>
-<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyDescription("Stellt Funktionen für den Datenbankzugriff zur Verfügung")>
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Modules.Database")>
-<Assembly: AssemblyCopyright("Copyright © 2024")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("2.3.4.0")>
+<Assembly: AssemblyTrademark("2.3.6.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.3.5.3")>
+<Assembly: AssemblyVersion("2.3.6.0")>
-<Assembly: AssemblyFileVersion("2.3.5.3")>
+<Assembly: AssemblyFileVersion("2.3.6.0")>

Database/Queries.vb

@@ -4,6 +4,9 @@
             Public Const GdPictureLicense As String = "SELECT COALESCE(MAX(LICENSE),'') FROM TBDD_3RD_PARTY_MODULES WHERE ACTIVE = 1 AND NAME = 'GDPICTURE' AND [VERSION] = '11.2024'"
             Public Const GdPictureLicense_REGULAR As String = "SELECT COALESCE(MAX(LICENSE),'') FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE' AND ACTIVE = 1"
         End Class
+        Public Class DD_SELECTS
+            Public Const TBDD_CATALOG As String = "SELECT * FROM TBDD_CATALOG"
+        End Class
 
         Public Class Connections
             Public Const AllConnections As String = "SELECT * FROM TBDD_CONNECTION AND AKTIV = 1"

Database/packages.config

@@ -3,8 +3,6 @@
   <package id="EntityFramework" version="6.4.4" targetFramework="net461" />
   <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net461" />
   <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net461" />
-  <package id="GdPicture" version="14.2.89" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.2.89" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
   <package id="System.Data.Odbc" version="6.0.1" targetFramework="net461" />
 </packages>

Encryption/Encryption.vbproj

@@ -45,6 +45,10 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
@@ -114,11 +118,5 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

Encryption/My Project/AssemblyInfo.vb

@@ -8,12 +8,12 @@ Imports System.Runtime.InteropServices
 
 ' Werte der Assemblyattribute überprüfen
 
-<Assembly: AssemblyTitle("DDEncryption")>
+<Assembly: AssemblyTitle("DDModules.DDEncryption")>
-<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyDescription("Stellt Funktionen zur Entschlüsselung bereit")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyCompany("Digital Data Gmbh, Heuchelheim")>
-<Assembly: AssemblyProduct("Encryption")>
+<Assembly: AssemblyProduct("DDModules.Encryption")>
 <Assembly: AssemblyCopyright("Copyright ©  2021")>
-<Assembly: AssemblyTrademark("1.2.0.0")>
+<Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.3.0.0")>
+<Assembly: AssemblyVersion("1.3.1.0")>
-<Assembly: AssemblyFileVersion("1.3.0.0")>
+<Assembly: AssemblyFileVersion("1.3.1.0")>

Filesystem/File.vb

@@ -0,0 +1,487 @@
+Imports System.IO
+Imports System.Security.Cryptography
+Imports System.Text
+Imports System.Text.RegularExpressions
+Imports DigitalData.Modules.Logging
+
+''' <module>File</module>
+''' <version>0.0.0.1</version>
+''' <date>11.10.2018</date>
+''' <summary>
+''' Module that provides variouse File operations
+''' </summary>
+''' <dependencies>
+''' NLog, >= 4.5.8
+''' </dependencies>
+''' <params>
+''' LogConfig, DigitalData.Module.Logging.LogConfig
+'''     A LogConfig object               
+''' </params>
+''' <props>
+''' </props>
+''' <example>
+''' </example>
+''' <remarks>
+''' </remarks>
+Public Class File
+    Private ReadOnly _Logger As Logger
+    Private ReadOnly _LogConfig As LogConfig
+
+    Private ReadOnly _invalidFilenameChars As String
+    Private ReadOnly _invalidPathChars As String
+
+    Private Const REGEX_CLEAN_FILENAME As String = "[\\/:""<>|\b\0\r\n\t]"
+    Private Const REGEX_CLEAN_PATH As String = "[""<>|\b\0\r\n\t]"
+
+    ' The limit enforced by windows for filenpaths is 260, 
+    ' so we use a slightly smaller number to have some Error margin.
+    ' 
+    ' Source: https://docs.microsoft.com/de-de/windows/win32/fileio/naming-a-file?redirectedfrom=MSDN#maximum-path-length-limitation
+    Private Const MAX_FILE_PATH_LENGTH = 250
+
+    Private Const FILE_NAME_ACCESS_TEST = "accessTest.txt"
+
+    Public Sub New(LogConfig As LogConfig)
+        _LogConfig = LogConfig
+        _Logger = LogConfig.GetLogger()
+
+        _invalidFilenameChars = String.Join("", Path.GetInvalidFileNameChars())
+        _invalidPathChars = String.Join("", Path.GetInvalidPathChars())
+    End Sub
+
+    Public Function GetCleanFilename(FileName As String) As String
+        _Logger.Debug("Filename before cleaning: [{0}]", FileName)
+
+        Dim oCleanName As String = FileName
+        oCleanName = Regex.Replace(oCleanName, _invalidFilenameChars, String.Empty)
+        oCleanName = Regex.Replace(oCleanName, REGEX_CLEAN_FILENAME, String.Empty, RegexOptions.Singleline)
+        oCleanName = Regex.Replace(oCleanName, "\s{2,}", " ")
+        oCleanName = Regex.Replace(oCleanName, "\.{2,}", ".")
+
+        _Logger.Debug("Filename after cleaning: [{0}]", oCleanName)
+
+        Return oCleanName
+    End Function
+
+    Public Function GetCleanPath(FilePath As String) As String
+        _Logger.Debug("Path before cleaning: [{0}]", FilePath)
+
+        Dim oCleanName As String = FilePath
+        oCleanName = Regex.Replace(oCleanName, _invalidPathChars, String.Empty)
+        oCleanName = Regex.Replace(oCleanName, REGEX_CLEAN_PATH, String.Empty, RegexOptions.Singleline)
+
+        _Logger.Debug("Path after cleaning: [{0}]", oCleanName)
+
+        Return oCleanName
+    End Function
+
+    ''' <summary>
+    ''' Reads the file at `FilePath` and computes a SHA256 Hash from its contents
+    ''' </summary>
+    ''' <param name="FilePath"></param>
+    ''' <returns></returns>
+    Public Function GetChecksum(FilePath As String) As String
+        Try
+            Using oFileStream = IO.File.OpenRead(FilePath)
+                Using oStream As New BufferedStream(oFileStream, 1200000)
+                    Dim oChecksum() As Byte = SHA256.Create.ComputeHash(oStream)
+                    Return FormatHash(oChecksum)
+                End Using
+            End Using
+        Catch ex As Exception
+            _Logger.Error(ex)
+            Return Nothing
+        End Try
+    End Function
+
+    Public Function GetChecksumFromString(pStringToCheck As String) As String
+        Dim oBytes() As Byte = Encoding.UTF8.GetBytes(pStringToCheck)
+        Dim oChecksum() As Byte = SHA256.Create.ComputeHash(oBytes)
+        Return FormatHash(oChecksum)
+    End Function
+
+    Private Function FormatHash(pChecksum)
+        Return BitConverter.
+            ToString(pChecksum).
+            Replace("-", String.Empty)
+    End Function
+
+    ''' <summary>
+    ''' Adds file version string to given filename `Destination` if that file already exists.
+    ''' </summary>
+    ''' <param name="Destination"></param>
+    ''' <returns></returns>
+    Public Function GetVersionedFilename(Destination As String) As String
+        Try
+            Dim oFileName As String = Destination
+            Dim oFinalFileName = oFileName
+
+            Dim oDestinationDir = Path.GetDirectoryName(oFileName)
+            Dim oExtension = Path.GetExtension(oFileName)
+
+            Dim oVersionSeparator As Char = "~"c
+
+            ' Split Filename without extension at version separator to:
+            ' - Check if file is already versioned
+            ' - Get the file version of an already versioned file
+            ' 
+            ' Example: 
+            ' test1.pdf         --> test1           --> ['test1']               --> no fileversion
+            ' test1~2.pdf       --> test1~2         --> ['test1', '2']          --> version 2
+            ' test1~12345~2.pdf --> test1~12345~2   --> ['test1', '12345', '2'] --> still version 2
+            'Dim oFileNameWithoutExtension = Path.GetFileNameWithoutExtension(oFileName)
+            'Dim oSplitFilename = oFileNameWithoutExtension.Split(oVersionSeparator).ToList()
+
+            ' if file is already versioned, extract file version
+            ' else just use the filename and set version to 1
+            'If oSplitFilename.Count > 1 Then
+            '    Dim oVersion As Integer = 1
+            '    Try
+            '        oVersion = Integer.Parse(oSplitFilename.Last())
+            '        oFileNameWithoutExtension = String.Join("", oSplitFilename.Take(oSplitFilename.Count - 1))
+            '    Catch ex As Exception
+            '        ' oFilenameWithoutExtension does NOT change
+            '        oFileNameWithoutExtension = oFileNameWithoutExtension
+            '    Finally
+            '        oFileVersion = oVersion
+            '    End Try
+            'Else
+            '    oFileVersion = 1
+            'End If
+
+            Dim oFileNameWithoutExtension = Path.GetFileNameWithoutExtension(oFileName)
+            Dim oSplitResult = GetVersionedString(oFileNameWithoutExtension, oVersionSeparator)
+
+            oFileNameWithoutExtension = oSplitResult.Item1
+            Dim oFileVersion = oSplitResult.Item2
+
+            ' Shorten the filename (only filename, without extension or version)
+            ' by cutting the length in half. This should work no matter how long the path and/or filename are.
+            If oFileName.Length > MAX_FILE_PATH_LENGTH Then
+                _Logger.Info("Filename is too long. Filename will be cut to prevent further errors.")
+                _Logger.Info("Original Filename is: {0}", oFileNameWithoutExtension)
+                Dim oNewLength As Integer = Math.Round(oFileNameWithoutExtension.Length / 2)
+                Dim oNewFileNameWithoutExtension = oFileNameWithoutExtension.Substring(0, oNewLength)
+                _Logger.Info("New Filename will be: {0}", oNewFileNameWithoutExtension)
+
+                oFileNameWithoutExtension = oNewFileNameWithoutExtension
+            End If
+
+            ' while file exists, increment version    
+            Do
+                oFinalFileName = Path.Combine(oDestinationDir, GetFilenameWithVersion(oFileNameWithoutExtension, oVersionSeparator, oFileVersion, oExtension))
+                _Logger.Debug("Intermediate Filename is {0}", oFinalFileName)
+                _Logger.Debug("File version: {0}", oFileVersion)
+                oFileVersion += 1
+            Loop While (IO.File.Exists(oFinalFileName))
+
+            _Logger.Debug("Final Filename is {0}", oFinalFileName)
+
+            Return oFinalFileName
+        Catch ex As Exception
+            _Logger.Warn("Filename {0} could not be versioned. Original filename will be returned!", Destination)
+            _Logger.Error(ex)
+            Return Destination
+        End Try
+    End Function
+
+    ''' <summary>
+    ''' Split String at version separator to:
+    ''' check if string is already versioned,
+    ''' get the string version of an already versioned string
+    ''' </summary>
+    ''' <example>
+    ''' Examples: 
+    ''' test1.pdf         --> test1           --> ['test1']               --> no fileversion
+    ''' test1~2.pdf       --> test1~2         --> ['test1', '2']          --> version 2
+    ''' test1~12345~2.pdf --> test1~12345~2   --> ['test1', '12345', '2'] --> still version 2
+    ''' somestring~3      --> somestring~3    --> ['somestring', '3']     --> version 3
+    ''' </example>
+    ''' <param name="pString">The string to versioned</param>
+    ''' <param name="pSeparator">The character to split at</param>
+    ''' <returns>Tuple of string and version</returns>
+    Public Function GetVersionedString(pString As String, pSeparator As Char) As Tuple(Of String, Integer)
+        Dim oSplitString = pString.Split(pSeparator).ToList()
+        Dim oStringVersion As Integer
+
+        ' if string is already versioned, extract string version
+        ' else just use the string and set version to 1
+        If oSplitString.Count > 1 Then
+            Dim oVersion As Integer = 1
+            Try
+                oVersion = Integer.Parse(oSplitString.Last())
+                pString = String.Join("", oSplitString.Take(oSplitString.Count - 1))
+            Catch ex As Exception
+                ' pString does NOT change
+                pString = pString
+            Finally
+                oStringVersion = oVersion
+            End Try
+        Else
+            oStringVersion = 1
+        End If
+
+        Return New Tuple(Of String, Integer)(pString, oStringVersion)
+    End Function
+
+    Public Function GetAppDataPath(CompanyName As String, ProductName As String)
+        Dim oLocalAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
+        Return Path.Combine(oLocalAppData, CompanyName, ProductName)
+    End Function
+
+    Private Function GetFilenameWithVersion(FileNameWithoutExtension As String, VersionSeparator As Char, FileVersion As Integer, Extension As String) As String
+        If FileVersion <= 1 Then
+            Return $"{FileNameWithoutExtension}{Extension}"
+        Else
+            Return $"{FileNameWithoutExtension}{VersionSeparator}{FileVersion}{Extension}"
+        End If
+    End Function
+
+    ''' <summary>
+    ''' Removes files in a directory filtered by filename, extension and last write date
+    ''' </summary>
+    ''' <param name="Path">The directory in which files will be deleted</param>
+    ''' <param name="FileKeepTime">Only delete files which are older than x days. Must be between 0 and 1000 days.</param>
+    ''' <param name="FileBaseName">A filename filter which will be checked</param>
+    ''' <param name="FileExtension">A file extension which will be checked</param>
+    ''' <param name="ContinueOnError">Should the function continue with deleting when a file could not be deleted?</param>
+    ''' <returns>True if all files were deleted or if no files were deleted, otherwise false</returns>
+    Public Function RemoveFiles(Path As String, FileKeepTime As Integer, FileBaseName As String, Optional FileExtension As String = "log", Optional ContinueOnError As Boolean = True) As Boolean
+        If Not TestPathIsDirectory(Path) Then
+            Throw New ArgumentException($"Path {Path} is not a directory!")
+        End If
+
+        If Not Directory.Exists(Path) Then
+            Throw New DirectoryNotFoundException($"Path {Path} does not exist!")
+        End If
+
+        If FileKeepTime < 0 Or FileKeepTime > 1000 Then
+            Throw New ArgumentOutOfRangeException("FileKeepTime must be an integer between 0 and 1000!")
+        End If
+
+        Dim oUnableToDeleteCounter = 0
+        Dim oDirectory As New DirectoryInfo(Path)
+        Dim oDateLimit As DateTime = DateTime.Now.AddDays(FileKeepTime)
+        Dim oFiles As List(Of FileInfo) = oDirectory.
+            EnumerateFiles($"*{FileBaseName}*").
+            Where(Function(oFileInfo As FileInfo)
+                      Return oFileInfo.Extension = FileExtension And oFileInfo.LastWriteTime < oDateLimit
+                  End Function).
+                  ToList()
+
+        If oFiles.Count = 0 Then
+            _Logger.Debug("No files found that match the criterias.")
+            Return True
+        End If
+
+        _Logger.Debug("Deleting old files (Found {0}).", oFiles.Count)
+
+        For Each oFile As FileInfo In oFiles
+            Try
+                oFile.Delete()
+            Catch ex As Exception
+                If ContinueOnError = False Then
+                    _Logger.Warn("Deleting files was aborted at file {0}.", oFile.FullName)
+                    Return False
+                End If
+                oUnableToDeleteCounter = oUnableToDeleteCounter + 1
+                _Logger.Warn("File {0} could not be deleted!")
+            End Try
+        Next
+
+        If oUnableToDeleteCounter > 0 Then
+            _Logger.Debug("Old files partially removed. {0} files could not be removed.", oUnableToDeleteCounter)
+        Else
+            _Logger.Debug("Old files removed.")
+        End If
+
+        Return True
+    End Function
+
+    <DebuggerStepThrough>
+    Public Sub MoveTo(FilePath As String, Directory As String)
+        Dim oFileInfo As New FileInfo(FilePath)
+        IO.File.Move(FilePath, Path.Combine(Directory, oFileInfo.Name))
+    End Sub
+
+    <DebuggerStepThrough>
+    Public Sub MoveTo(FilePath As String, NewFileName As String, Directory As String)
+        IO.File.Move(FilePath, Path.Combine(Directory, NewFileName))
+    End Sub
+
+    ''' <summary>
+    ''' Copied from https://docs.microsoft.com/en-us/dotnet/standard/io/how-to-copy-directories
+    ''' </summary>
+    ''' <param name="SourceDirName"></param>
+    ''' <param name="DestDirName"></param>
+    ''' <param name="CopySubDirs"></param>
+    Public Sub CopyDirectory(ByVal SourceDirName As String, ByVal DestDirName As String, ByVal CopySubDirs As Boolean)
+        Dim oDirectory As DirectoryInfo = New DirectoryInfo(SourceDirName)
+
+        If Not oDirectory.Exists Then
+            Throw New DirectoryNotFoundException("Source directory does not exist or could not be found: " & SourceDirName)
+        End If
+
+        Dim oDirectories As DirectoryInfo() = oDirectory.GetDirectories()
+        Directory.CreateDirectory(DestDirName)
+        Dim oFiles As FileInfo() = oDirectory.GetFiles()
+
+        For Each oFile As FileInfo In oFiles
+            Dim tempPath As String = Path.Combine(DestDirName, oFile.Name)
+            oFile.CopyTo(tempPath, False)
+        Next
+
+        If CopySubDirs Then
+            For Each oSubDirectory As DirectoryInfo In oDirectories
+                Dim oTempPath As String = Path.Combine(DestDirName, oSubDirectory.Name)
+                CopyDirectory(oSubDirectory.FullName, oTempPath, CopySubDirs)
+            Next
+        End If
+    End Sub
+
+    ''' <summary>
+    ''' Tries to create a directory and returns its path.
+    ''' Returns a temp path if `DirectoryPath` can not be created or written to.
+    ''' </summary>
+    ''' <param name="DirectoryPath">The directory to create</param>
+    ''' <param name="TestWriteAccess">Should a write access test be performed?</param>
+    ''' <returns>The used path</returns>
+    Public Function CreateDirectory(DirectoryPath As String, Optional TestWriteAccess As Boolean = True) As String
+        Dim oFinalPath As String
+        If Directory.Exists(DirectoryPath) Then
+            _Logger.Debug("Directory {0} already exists. Skipping.", DirectoryPath)
+            oFinalPath = DirectoryPath
+        Else
+            Try
+                Directory.CreateDirectory(DirectoryPath)
+                oFinalPath = DirectoryPath
+            Catch ex As Exception
+                _Logger.Error(ex)
+                _Logger.Warn("Directory {0} could not be created. Temp path will be used instead.", DirectoryPath)
+                oFinalPath = Path.GetTempPath()
+            End Try
+        End If
+
+        If TestWriteAccess AndAlso Not TestPathIsWritable(DirectoryPath) Then
+            _Logger.Warn("Directory {0} is not writable. Temp path will be used instead.", DirectoryPath)
+            oFinalPath = Path.GetTempPath()
+        Else
+            oFinalPath = DirectoryPath
+        End If
+
+        _Logger.Debug("Using path {0}", oFinalPath)
+
+        Return oFinalPath
+    End Function
+
+    Public Function TestPathIsWritable(DirectoryPath As String) As Boolean
+        Try
+            Dim fileAccessPath = Path.Combine(DirectoryPath, FILE_NAME_ACCESS_TEST)
+            Using fs As FileStream = IO.File.Create(fileAccessPath)
+                fs.WriteByte(0)
+            End Using
+
+            IO.File.Delete(fileAccessPath)
+            Return True
+        Catch ex As Exception
+            Return False
+        End Try
+    End Function
+
+    ''' <summary>
+    ''' Checks if a file is locked, ie. in use by another process.
+    ''' </summary>
+    ''' <remarks>
+    ''' https://docs.microsoft.com/en-us/dotnet/standard/io/handling-io-errors
+    ''' https://stackoverflow.com/questions/876473/is-there-a-way-to-check-if-a-file-is-in-use
+    ''' </remarks>
+    Public Function TestFileIsLocked(pFilePath As String) As Boolean
+        Try
+            Using stream As FileStream = IO.File.Open(pFilePath, FileMode.Open, FileAccess.ReadWrite, FileShare.None)
+                stream.Close()
+            End Using
+        Catch ex As Exception When ((ex.HResult And &HFFFF) = 32)
+            Return True
+        Catch ex As Exception
+            Return True
+        End Try
+
+        Return False
+    End Function
+
+    Public Function TestPathIsDirectory(Path As String) As Boolean
+        If Not Directory.Exists(Path) Then
+            Return False
+        End If
+
+        Dim oIsDirectory As Boolean = (System.IO.File.GetAttributes(Path) And FileAttributes.Directory) = FileAttributes.Directory
+        Return oIsDirectory
+    End Function
+
+    Public Function GetDateDirectory(pBaseDirectory As String, pDate As Date) As String
+        Dim oDateDirectory = GetDateString(pDate)
+        Dim oFinalDirectory As String = IO.Path.Combine(pBaseDirectory, oDateDirectory)
+        Return oFinalDirectory
+    End Function
+
+    Public Function GetDateDirectory(pBaseDirectory As String) As String
+        Return GetDateDirectory(pBaseDirectory, Now)
+    End Function
+
+    Public Function CreateDateDirectory(pBaseDirectory As String, pDate As Date) As String
+        Dim oDateDirectory = GetDateString(pDate)
+        Dim oFinalDirectory As String = IO.Path.Combine(pBaseDirectory, oDateDirectory)
+
+        If IO.Directory.Exists(oFinalDirectory) = False Then
+            _Logger.Debug("Path does not exist, creating: [{0}]", oFinalDirectory)
+            Try
+                Directory.CreateDirectory(oFinalDirectory)
+                _Logger.Debug("Created folder [{0}]", oFinalDirectory)
+            Catch ex As Exception
+                _Logger.Warn("Final path [{0}] could not be created!", oFinalDirectory)
+                _Logger.Error(ex)
+            End Try
+        End If
+
+        Return oFinalDirectory
+    End Function
+
+    Public Function CreateDateDirectory(pBaseDirectory As String) As String
+        Return CreateDateDirectory(pBaseDirectory, Now)
+    End Function
+
+    Public Function GetDateString() As String
+        Return $"{Now:yyyy\\MM\\dd}"
+    End Function
+
+    Public Function GetDateString(pDate As Date) As String
+        Return $"{pDate:yyyy\\MM\\dd}"
+    End Function
+
+    Public Function GetDateTimeString() As String
+        Return $"{Now:yyyy-MM-dd_hh-mm-ffff}"
+    End Function
+
+    Public Function GetDateTimeString(pDate As Date) As String
+        Return $"{pDate:yyyy-MM-dd_hh-mm-ffff}"
+    End Function
+
+    Public Function GetFilenameWithSuffix(pFilePath As String, pSuffix As String)
+        Dim oFileInfo = New IO.FileInfo(pFilePath)
+        Return GetFilenameWithSuffix(IO.Path.GetFileNameWithoutExtension(pFilePath), pSuffix, oFileInfo.Extension.Substring(1))
+    End Function
+
+    Public Function GetFilenameWithSuffix(pBaseString As String, pSuffix As String, pExtension As String)
+        Return $"{pBaseString}-{pSuffix}.{pExtension}"
+    End Function
+
+    Public Function GetFilenameWithPrefix(pFilePath As String, pPrefix As String)
+        Dim oFileInfo = New IO.FileInfo(pFilePath)
+        Return GetFilenameWithSuffix(IO.Path.GetFileNameWithoutExtension(pFilePath), pPrefix, oFileInfo.Extension.Substring(1))
+    End Function
+
+    Public Function GetFilenameWithPrefix(pBaseString As String, pPrefix As String, pExtension As String)
+        Return $"{pPrefix}-{pBaseString}.{pExtension}"
+    End Function
+
+End Class

Filesystem/FileContainer/DocumentObject.vb

@@ -0,0 +1,18 @@
+Imports System.Runtime.Serialization
+
+<Serializable>
+Public Class DocumentObject
+
+    <DataMember(Name:="FileName")>
+    Public ReadOnly FileName As String
+    <DataMember(Name:="ContainerId")>
+    Public ReadOnly ContainerId As String
+    <DataMember(Name:="DocumentId")>
+    Public ReadOnly DocumentId As Int64
+
+    Public Sub New(ContainerId As String, DocumentId As Int64, FileName As String)
+        Me.ContainerId = ContainerId
+        Me.DocumentId = DocumentId
+        Me.FileName = FileName
+    End Sub
+End Class

Filesystem/FileContainer/FileContainer.vb

@@ -0,0 +1,193 @@
+Imports System.IO
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Encryption
+Imports ProtoBuf
+
+''' <module>FileContainer</module>
+''' <version>0.0.0.2</version>
+''' <date>21.11.2018</date>
+''' <summary>
+''' File Container for securely saving files
+''' </summary>
+''' <dependencies>
+''' NLog, >= 4.5.8
+''' </dependencies>
+''' <params>
+''' LogConfig, DigitalData.Module.Logging.LogConfig
+'''     A LogConfig object
+''' Password, String
+'''     The Password to Encrypt
+''' Path, String
+'''     The Path to save/load the container
+''' </params>
+''' <example>
+''' dim oContainer = Container.Create(logConfig, "pass", "E:\some.container")
+''' dim oContainer = Container.Load(logConfig, "pass", "E:\some.container")
+''' 
+''' dim oContainer = new Container(logConfig, "pass", "E:\some.container")
+''' oContainer.Save()
+''' 
+''' dim oContainer = new Container(logConfig, "pass", "E:\some.container")
+''' oContainer.Contents = oSomeData
+''' oContainer.Save()
+''' 
+''' dim oContainer = new Container(logConfig, "pass", "E:\some.container")
+''' oContainer.Load()
+''' dim oContents = oContainer.Contents
+''' 
+''' dim oContainer = new Container(logConfig, "pass", "E:\some.container")
+''' oContainer.Load()
+''' oContainer.Contents = oSomeOtherData
+''' oContainer.Save()
+''' oContainer.SaveAs("E:\some2.container")
+''' </example>
+Public Class FileContainer
+    Private _crypto As Encryption.Encryption
+    Private _compression As Compression
+    Private _inner As FileContainerInner
+    Private _logger As Logger
+    Private _logConfig As LogConfig
+    Private _path As String
+
+    Public Property Contents As Byte()
+        Get
+            Return _inner.Contents
+        End Get
+        Set(value As Byte())
+            _inner.Contents = value
+        End Set
+    End Property
+    Public ReadOnly Property ContainerId As String
+        Get
+            Return _inner.FileId
+        End Get
+    End Property
+    Public ReadOnly Property CreatedAt As String
+        Get
+            Return _inner.CreatedAt
+        End Get
+    End Property
+    Public ReadOnly Property UpdatedAt As String
+        Get
+            Return _inner.UpdatedAt
+        End Get
+    End Property
+
+    Public Shared Function Create(LogConfig As LogConfig, Password As String) As FileContainer
+        Dim oContainer = New FileContainer(LogConfig, Password)
+        Return oContainer
+    End Function
+
+    Public Shared Function Load(LogConfig As LogConfig, Password As String, Path As String) As FileContainer
+        Dim oContainer = New FileContainer(LogConfig, Password, Path)
+        oContainer.Load()
+        Return oContainer
+    End Function
+
+    Public Sub New(LogConfig As LogConfig, Password As String)
+        _logger = LogConfig.GetLogger()
+        _crypto = New Encryption.Encryption(LogConfig, Password)
+        _compression = New Compression(LogConfig)
+        _inner = New FileContainerInner()
+    End Sub
+
+    Public Sub New(LogConfig As LogConfig, Password As String, Path As String)
+        MyClass.New(LogConfig, Password)
+        _path = Path
+    End Sub
+
+    Public Sub SetFile(Contents As Byte(), FileName As String)
+        _inner.Contents = Contents
+        _inner.UpdatedAt = Date.Now
+        _inner.FileName = FileName
+    End Sub
+
+    Public Function GetFile() As FileContainerInner
+        Return _inner
+    End Function
+
+    Public Sub Save()
+        If IsNothing(_path) Then
+            Throw New ArgumentException("Path not set")
+        End If
+
+        SaveAs(_path)
+    End Sub
+
+    Public Sub SaveAs(Path As String)
+        Try
+            WriteBytesToFile(TransformToBytes(_inner), Path)
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Sub
+
+    Public Sub Load()
+        If IsNothing(_path) Then
+            Throw New ArgumentException("Path not set")
+        End If
+
+        LoadFrom(_path)
+    End Sub
+
+    Public Sub LoadFrom(Path As String)
+        Try
+            _inner = TransformToObject(ReadBytesFromFile(_path))
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Sub
+
+    Private Function TransformToBytes([Object] As FileContainerInner) As Byte()
+        Dim oBytes = Serialize([Object])
+        Dim oCompressed = _compression.Compress(oBytes)
+        Dim oEncrypted = _crypto.Encrypt(oCompressed)
+        Return oEncrypted
+    End Function
+
+    Private Function TransformToObject(Bytes As Byte()) As FileContainerInner
+        Dim oDecrypted = _crypto.Decrypt(Bytes)
+        Dim oDecompressed = _compression.Decompress(oDecrypted)
+        Dim oObject = Deserialize(oDecompressed)
+        Return oObject
+    End Function
+
+    Private Function Serialize(InnerData As FileContainerInner) As Byte()
+        Dim oBinaryData As Byte()
+
+        Using oStream As New MemoryStream
+            Serializer.Serialize(oStream, InnerData)
+            oBinaryData = oStream.ToArray()
+        End Using
+
+        Return oBinaryData
+    End Function
+
+    Private Function Deserialize(InnerData As Byte()) As FileContainerInner
+        Dim oObject As FileContainerInner
+
+        Using oStream As New MemoryStream(InnerData)
+            oObject = Serializer.Deserialize(Of FileContainerInner)(oStream)
+        End Using
+
+        Return oObject
+    End Function
+
+    Private Sub WriteBytesToFile(Data As Byte(), FilePath As String)
+        Using oSourceStream As New FileStream(FilePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None)
+            oSourceStream.Write(Data, 0, Data.Length)
+            oSourceStream.Flush()
+        End Using
+    End Sub
+
+    Private Function ReadBytesFromFile(FilePath As String) As Byte()
+        Using oFileStream = New FileStream(FilePath, FileMode.Open, FileAccess.Read, FileShare.Read, 4096)
+            Dim oBuffer As Byte() = New Byte(oFileStream.Length - 1) {}
+            oFileStream.Read(oBuffer, 0, oFileStream.Length)
+            oFileStream.Close()
+            Return oBuffer
+        End Using
+    End Function
+End Class

Filesystem/FileContainer/FileContainerInner.vb

@@ -0,0 +1,23 @@
+Imports ProtoBuf
+
+<Serializable>
+<ProtoContract>
+Public Class FileContainerInner
+    <ProtoMember(1)>
+    Public FileId As String
+    <ProtoMember(2)>
+    Public Contents As Byte()
+    <ProtoMember(3)>
+    Public CreatedAt As DateTime
+    <ProtoMember(4)>
+    Public UpdatedAt As DateTime
+    <ProtoMember(5)>
+    Public FileName As String
+
+    Public Sub New()
+        FileId = Guid.NewGuid().ToString
+        CreatedAt = Date.Now
+        UpdatedAt = Date.Now
+    End Sub
+
+End Class

Filesystem/FileWatcher/FileWatcher.vb

@@ -0,0 +1,132 @@
+Imports System.IO
+Imports DigitalData.Modules.Filesystem
+Imports DigitalData.Modules.Filesystem.FileWatcherFilters
+Imports DigitalData.Modules.Logging
+
+
+Public Class FileWatcher
+    ' Internals
+    Private ReadOnly _Logger As Logger
+    Private ReadOnly _Watchers As List(Of FileSystemWatcher)
+    Private ReadOnly _Files As Dictionary(Of String, FileWatcherProperties)
+    Private ReadOnly _Filters As List(Of BaseFileFilter)
+
+    ' Options
+    Private _Path As String
+
+    ' Public Events
+    Public Event FileSaved(ByVal FullName As String, ByVal IsSpecial As Boolean)
+
+    Public Sub New(LogConfig As LogConfig, Path As String, Optional Filters As List(Of BaseFileFilter) = Nothing)
+        _Logger = LogConfig.GetLogger()
+        _Files = New Dictionary(Of String, FileWatcherProperties)
+        _Watchers = New List(Of FileSystemWatcher)
+        _Filters = IIf(IsNothing(Filters), GetDefaultFilters(), Filters)
+        _Path = Path
+
+        For Each oFilePath In Directory.EnumerateFiles(_Path)
+            Try
+                If IO.File.Exists(oFilePath) Then
+                    _Files.Add(oFilePath, New FileWatcherProperties With {
+                        .CreatedAt = DateTime.Now,
+                        .ChangedAt = Nothing
+                    })
+                End If
+            Catch ex As Exception
+                _Logger.Error(ex)
+                _Logger.Warn("File {0} cannot be watched!")
+            End Try
+        Next
+    End Sub
+
+    Public Sub Add(Filter As String)
+        _Watchers.Add(CreateWatcher(Filter))
+    End Sub
+
+    Public Sub Start()
+        For Each oWatcher In _Watchers
+            oWatcher.EnableRaisingEvents = True
+        Next
+    End Sub
+
+    Public Sub [Stop]()
+        For Each oWatcher In _Watchers
+            If Not IsNothing(oWatcher) Then
+                oWatcher.EnableRaisingEvents = False
+                oWatcher.Dispose()
+            End If
+        Next
+    End Sub
+
+    Private Function GetDefaultFilters()
+        Return New List(Of BaseFileFilter) From {
+              New TempFileFilter,
+              New OfficeFileFilter
+        }
+    End Function
+
+    Private Function CreateWatcher(Filter As String)
+        Dim oWatcher = New FileSystemWatcher() With {
+            .Path = _Path,
+            .Filter = Filter,
+            .NotifyFilter = NotifyFilters.LastAccess _
+                            Or NotifyFilters.LastWrite _
+                            Or NotifyFilters.FileName _
+                            Or NotifyFilters.Size _
+                            Or NotifyFilters.FileName _
+                            Or NotifyFilters.Attributes
+        }
+
+        AddHandler oWatcher.Created, AddressOf HandleFileCreated
+        AddHandler oWatcher.Changed, AddressOf HandleFileChanged
+        AddHandler oWatcher.Deleted, AddressOf HandleFileDeleted
+        AddHandler oWatcher.Renamed, AddressOf HandleFileRenamed
+
+        Return oWatcher
+    End Function
+
+    Private Sub HandleFileCreated(sender As Object, e As FileSystemEventArgs)
+        _Files.Add(e.FullPath, New FileWatcherProperties())
+        _Logger.Debug("[Created] " & e.FullPath)
+    End Sub
+
+    ''' <summary>
+    ''' This may fire twice for a single save operation, 
+    ''' see: https://blogs.msdn.microsoft.com/oldnewthing/20140507-00/?p=1053/
+    ''' </summary>
+    Private Sub HandleFileChanged(sender As Object, e As FileSystemEventArgs)
+        _Files.Item(e.FullPath).ChangedAt = DateTime.Now
+        _Logger.Debug("[Changed] " & e.FullPath)
+
+        Dim oShouldRaiseSave As Boolean = Not _Filters.Any(Function(oFilter)
+                                                               Return oFilter.ShouldFilter(e)
+                                                           End Function)
+
+        If oShouldRaiseSave Then
+            RaiseEvent FileSaved(e.FullPath, False)
+        End If
+    End Sub
+    Private Sub HandleFileDeleted(sender As Object, e As FileSystemEventArgs)
+        _Files.Remove(e.FullPath)
+        _Logger.Debug("[Removed] " & e.FullPath)
+    End Sub
+
+    Private Sub HandleFileRenamed(sender As Object, e As RenamedEventArgs)
+        Dim oProperties = _Files.Item(e.OldFullPath)
+        _Files.Remove(e.OldFullPath)
+        _Files.Add(e.FullPath, oProperties)
+        ' Soll eine umbenannte datei als NEU gelten?
+
+        Dim oShouldRaiseSave = _Filters.Any(Function(oFilter)
+                                                Return oFilter.ShouldRaiseSave(e)
+                                            End Function)
+
+        If oShouldRaiseSave Then
+            RaiseEvent FileSaved(e.OldFullPath, True)
+        End If
+
+        _Logger.Debug("[Renamed] {0} --> {1}", e.OldFullPath, e.FullPath)
+    End Sub
+
+
+End Class

Filesystem/FileWatcher/FileWatcherFilters.vb

@@ -0,0 +1,61 @@
+Imports System.IO
+
+''' <summary>
+''' Built-in filters for FileWatcher that are useful for correctly detecting changes on Office documents (currently Office 2016)
+''' </summary>
+Public Class FileWatcherFilters
+    ''' <summary>
+    ''' Base Filter that all filters must inherit from
+    ''' Provides two functions that may be overridden and some useful file extension lists
+    ''' </summary>
+    Public MustInherit Class BaseFileFilter
+        Public TempFiles As New List(Of String) From {".tmp", ""}
+
+        Public Overridable Function ShouldFilter(e As FileSystemEventArgs) As Boolean
+            Return False
+        End Function
+        Public Overridable Function ShouldRaiseSave(e As RenamedEventArgs) As Boolean
+            Return False
+        End Function
+    End Class
+
+    ''' <summary>
+    ''' Simple Filter that filters changes made on temporary files
+    ''' </summary>
+    Public Class TempFileFilter
+        Inherits BaseFileFilter
+
+        Public Overrides Function ShouldFilter(e As FileSystemEventArgs) As Boolean
+            Dim oFileInfo As New FileInfo(e.FullPath)
+            Return TempFiles.Contains(oFileInfo.Extension)
+        End Function
+    End Class
+
+    ''' <summary>
+    ''' Filter to detect changes on Office files
+    ''' </summary>
+    Public Class OfficeFileFilter
+        Inherits BaseFileFilter
+
+        Public OfficeFiles As New List(Of String) From {".docx", ".pptx", ".xlsx"}
+
+        Public Overrides Function ShouldFilter(e As FileSystemEventArgs) As Boolean
+            Dim oFileInfo As New FileInfo(e.FullPath)
+            Return OfficeFiles.Contains(oFileInfo.Extension) And oFileInfo.Name.StartsWith("~")
+        End Function
+
+        Public Overrides Function ShouldRaiseSave(e As RenamedEventArgs) As Boolean
+            Dim oIsTransform = OfficeFiles.Any(Function(Extension As String)
+                                                   Return e.OldName.EndsWith(Extension)
+                                               End Function)
+
+            ' Check if it is renamed to a temp file
+            Dim oIsTempFile = TempFiles.Any(Function(Extension)
+                                                Return e.Name.EndsWith(Extension)
+                                            End Function)
+
+
+            Return oIsTransform And oIsTempFile
+        End Function
+    End Class
+End Class

Filesystem/FileWatcher/FileWatcherProperties.vb

@@ -0,0 +1,10 @@
+Public Class FileWatcherProperties
+    Public Property CreatedAt As DateTime
+    Public Property ChangedAt As DateTime
+    Public ReadOnly Property HasChanged As Boolean
+    Public Sub New()
+        CreatedAt = DateTime.Now
+        ChangedAt = Nothing
+        HasChanged = False
+    End Sub
+End Class

Filesystem/Filesystem.vbproj

@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{991D0231-4623-496D-8BD0-9CA906029CBC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>DigitalData.Modules.Filesystem</RootNamespace>
+    <AssemblyName>DigitalData.Modules.Filesystem</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>DigitalData.Modules.Filesystem.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>DigitalData.Modules.Filesystem.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net, Version=2.4.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="FileContainer\DocumentObject.vb" />
+    <Compile Include="FileContainer\FileContainer.vb" />
+    <Compile Include="File.vb" />
+    <Compile Include="FileContainer\FileContainerInner.vb" />
+    <Compile Include="FileWatcher\FileWatcher.vb" />
+    <Compile Include="FileWatcher\FileWatcherFilters.vb" />
+    <Compile Include="FileWatcher\FileWatcherProperties.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Encryption\Encryption.vbproj">
+      <Project>{8a8f20fc-c46e-41ac-bee7-218366cfff99}</Project>
+      <Name>Encryption</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>

Filesystem/My Project/Application.Designer.vb

@@ -0,0 +1,13 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+

Filesystem/My Project/Application.myapp

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <MySubMain>false</MySubMain>
+  <SingleInstance>false</SingleInstance>
+  <ShutdownMode>0</ShutdownMode>
+  <EnableVisualStyles>true</EnableVisualStyles>
+  <AuthenticationMode>0</AuthenticationMode>
+  <ApplicationType>1</ApplicationType>
+  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
+</MyApplicationData>

Filesystem/My Project/AssemblyInfo.vb

@@ -0,0 +1,35 @@
+Imports System
+Imports System.Reflection
+Imports System.Runtime.InteropServices
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("Modules.Filesystem")>
+<Assembly: AssemblyDescription("Stellt Funktionen für das Filesystem und Container zur Verfügung")>
+<Assembly: AssemblyCompany("Digital Data")>
+<Assembly: AssemblyProduct("Modules.Filesystem")>
+<Assembly: AssemblyCopyright("Copyright © 2022")>
+<Assembly: AssemblyTrademark("1.3.1.0")>
+
+<Assembly: ComVisible(False)>
+
+'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
+<Assembly: Guid("2787495c-e65f-4730-be0c-af87bede4b11")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+' übernehmen, indem Sie "*" eingeben:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("1.3.3.0")>
+<Assembly: AssemblyFileVersion("1.3.3.0")>

Filesystem/My Project/Resources.Designer.vb

@@ -0,0 +1,63 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+Imports System
+
+Namespace My.Resources
+    
+    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    '''<summary>
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    '''</summary>
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
+    Friend Module Resources
+        
+        Private resourceMan As Global.System.Resources.ResourceManager
+        
+        Private resourceCulture As Global.System.Globalization.CultureInfo
+        
+        '''<summary>
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+            Get
+                If Object.ReferenceEquals(resourceMan, Nothing) Then
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.Filesystem.Resources", GetType(Resources).Assembly)
+                    resourceMan = temp
+                End If
+                Return resourceMan
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend Property Culture() As Global.System.Globalization.CultureInfo
+            Get
+                Return resourceCulture
+            End Get
+            Set
+                resourceCulture = value
+            End Set
+        End Property
+    End Module
+End Namespace

Filesystem/My Project/Resources.resx

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Filesystem/My Project/Settings.Designer.vb

@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+    
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+        
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        
+#Region "Automatische My.Settings-Speicherfunktion"
+#If _MyType = "WindowsForms" Then
+    Private Shared addedHandler As Boolean
+
+    Private Shared addedHandlerLockObject As New Object
+
+    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
+        If My.Application.SaveMySettingsOnExit Then
+            My.Settings.Save()
+        End If
+    End Sub
+#End If
+#End Region
+        
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+                
+#If _MyType = "WindowsForms" Then
+               If Not addedHandler Then
+                    SyncLock addedHandlerLockObject
+                        If Not addedHandler Then
+                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                            addedHandler = True
+                        End If
+                    End SyncLock
+                End If
+#End If
+                Return defaultInstance
+            End Get
+        End Property
+    End Class
+End Namespace
+
+Namespace My
+    
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+    Friend Module MySettingsProperty
+        
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        Friend ReadOnly Property Settings() As Global.DigitalData.Modules.Filesystem.My.MySettings
+            Get
+                Return Global.DigitalData.Modules.Filesystem.My.MySettings.Default
+            End Get
+        End Property
+    End Module
+End Namespace

Filesystem/My Project/Settings.settings

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

Filesystem/packages.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="5.0.5" targetFramework="net48" />
+  <package id="NuGet.CommandLine" version="6.13.2" targetFramework="net48" developmentDependency="true" />
+  <package id="protobuf-net" version="2.4.0" targetFramework="net461" />
+</packages>

Interfaces/ActiveDirectoryInterface.vb

@@ -220,10 +220,23 @@ Public Class ActiveDirectoryInterface
             Return oUsers
         End Try
     End Function
+    Private Function GetPartFromFirstOU(dnString As String) As String
+        Dim keyword As String = "OU="
+        Dim index As Integer = dnString.IndexOf(keyword)
 
-    Public Function FindUserWithFilter(User As UserPrincipalEx, Filter As String) As Boolean
+        If index <> -1 Then
+            Return dnString.Substring(index)
+        Else
+            Return "No_Result_from_GetPartFromFirstOU"
+        End If
+    End Function
+    Public Function FindUserWithFilter(pUser As UserPrincipalEx, pFilter As String) As Boolean
         Try
-            Dim oRootPath = String.Join(","c, User.DistinguishedName.Split(","c).Skip(1))
+            'Dim oRootPath = String.Join(","c, pUser.DistinguishedName.Split(","c).Skip(1))
+            Dim oRootPath = GetPartFromFirstOU(pUser.DistinguishedName)
+            _logger.Debug("FindUserWithFilter: pUser.DistinguishedName: [{0}]", pUser.DistinguishedName)
+            _logger.Debug("FindUserWithFilter: oRootPath from User.DistinguishedName: [{0}]", oRootPath)
+
             Dim oPlaceholder = "@SAMACCOUNTNAME"
             Dim oProtocol = "LDAP://"
             Dim oEntry As New DirectoryEntry(oProtocol & oRootPath) With {
@@ -231,22 +244,25 @@ Public Class ActiveDirectoryInterface
                 .Password = Nothing,
                 .AuthenticationType = AuthenticationTypes.Secure
             }
-
+            _logger.Debug("FindUserWithFilter: got oDirectoryEntry (Path): [{0}]", oProtocol & oRootPath)
-            If Filter = String.Empty Then
+            If pFilter = String.Empty Then
-                _logger.Debug("FindUserWithFilter: Filter was empty, returning True for User [{0}]", User.SamAccountName)
+                _logger.Debug("FindUserWithFilter: Filter was empty, returning True for User [{0}]", pUser.SamAccountName)
                 Return True
             End If
 
-            If Filter.Contains(oPlaceholder) Then
+            If pFilter.Contains(oPlaceholder) Then
-                Filter = Filter.Replace(oPlaceholder, User.SamAccountName)
+                pFilter = pFilter.Replace(oPlaceholder, pUser.SamAccountName)
+                _logger.Debug("FindUserWithFilter: Filter.Contains(oPlaceholder) [{0}]", pFilter)
             Else
                 _logger.Warn("FindUserWithFilter: Placeholder [{0}] was not found in filter. Results may not be correct.")
             End If
 
-            Dim oSearcher As New DirectorySearcher(oEntry, Filter)
+            Dim oSearcher As New DirectorySearcher(oEntry, pFilter)
+            _logger.Debug("FindUserWithFilter: oSearcher created! Now executing DirectoryServices.SearchResult with .FindOne ...")
             Dim oResult As SearchResult = oSearcher.FindOne()
 
-            If oResult IsNot Nothing AndAlso oResult.Path.Replace(oProtocol, String.Empty) = User.DistinguishedName Then
+            If oResult IsNot Nothing AndAlso oResult.Path.Replace(oProtocol, String.Empty) = pUser.DistinguishedName Then
+                _logger.Debug("FindUserWithFilter: We have an oResult - oResult.Path: [{0}]", oResult.Path)
                 Return True
             Else
                 Return False

Interfaces/Interfaces.vbproj

@@ -46,30 +46,170 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GdPicture.NET.14, Version=14.2.90.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll</HintPath>
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Base">
+      <HintPath>..\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Database">
+      <HintPath>..\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
+    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
+      <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
+    </Reference>
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=8.0.0.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.6\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Net.Http" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Import Include="Microsoft.VisualBasic" />
@@ -95,6 +235,8 @@
     <Compile Include="GrapQLInterface\LoginData.vb" />
     <Compile Include="GrapQLInterface\LogoutData.vb" />
     <Compile Include="GrapQLInterface\QueryData.vb" />
+    <Compile Include="ZUGFeRDInterface\Enums\ErrorCodes.vb" />
+    <Compile Include="ZUGFeRDInterface\Enums\Item_Types.vb" />
     <Compile Include="ZUGFeRDInterface\Exceptions.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">
@@ -113,8 +255,9 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <Compile Include="ZUGFeRDInterface\PDFConverter.vb" />
-    <Compile Include="ZUGFeRDInterface\Peppol_BIS_Billing3017\CreditNoteType.vb" />
+    <Compile Include="ZUGFeRDInterface\Peppol_UBL2.1\CreditNoteType.vb" />
-    <Compile Include="ZUGFeRDInterface\Peppol_BIS_Billing3017\InvoiceType.vb" />
+    <Compile Include="ZUGFeRDInterface\Peppol_UBL2.1\InvoiceType.vb" />
+    <Compile Include="ZUGFeRDInterface\RejectionStringRow.vb" />
     <Compile Include="ZUGFeRDInterface\Validator.vb" />
     <Compile Include="ZUGFeRDInterface\Version1.0\CrossIndustryDocumentType.vb" />
     <Compile Include="ZUGFeRDInterface.vb" />
@@ -124,7 +267,9 @@
     <Compile Include="ZUGFeRDInterface\Version2.0\CrossIndustryInvoiceType.vb" />
     <Compile Include="ZUGFeRDInterface\Version2.1.1\CrossIndustryInvoiceType.vb" />
     <Compile Include="ZUGFeRDInterface\Version2.2_FacturX\CrossIndustryInvoiceType.vb" />
+    <Compile Include="ZUGFeRDInterface\Version2.3_3_FacturX\CrossIndustryInvoiceType.vb" />
     <Compile Include="ZUGFeRDInterface\Version2.3_FacturX\CrossIndustryInvoiceType.vb" />
+    <Compile Include="ZUGFeRDInterface\Version2.4_FacturX\CrossIndustryInvoiceType.vb" />
     <Compile Include="ZUGFeRDInterface\XmlItemProperty.vb" />
   </ItemGroup>
   <ItemGroup>
@@ -149,14 +294,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Base\Base.vbproj">
-      <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
-      <Name>Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Database\Database.vbproj">
-      <Project>{eaf0ea75-5fa7-485d-89c7-b2d843b03a96}</Project>
-      <Name>Database</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Logging\Logging.vbproj">
       <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
       <Name>Logging</Name>
@@ -167,11 +304,11 @@
   <PropertyGroup>
     <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets'))" />
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
   </Target>
 </Project>

Interfaces/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Modules.Interfaces")>
 <Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("2.2.5.0")>
+<Assembly: AssemblyTrademark("2.3.7.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.2.5.0")>
+<Assembly: AssemblyVersion("2.4.0.0")>
-<Assembly: AssemblyFileVersion("2.2.5.0")>
+<Assembly: AssemblyFileVersion("2.4.0.0")>

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,16 +19,19 @@ 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_INVOICE"
+    Public Const ZUGFERD_SPEC_2_3x = "ZUGFERD_2_3x"
-    Public Const PEPPOL_SPEC_3x_CREDITNOTE = "PEPPOL_BISBILL_3x_CREDITNOTE"
+
+    Public Const UBL_SPEC_21 = "UBL_21"
 
     Public Const XMLSCHEMA_ZUGFERD_10 = "Version1_0"
     Public Const XMLSCHEMA_ZUGFERD_20 = "Version2_0"
     Public Const XMLSCHEMA_ZUGFERD_211 = "Version2_1_1"
     Public Const XMLSCHEMA_ZUGFERD_22 = "Version2_2_FacturX"
     Public Const XMLSCHEMA_ZUGFERD_23 = "Version2_3_FacturX"
-    Public Const XMLSCHEMA_PEPPOL_3017_INVOICE = "Version3017_INVOICE"
+    Public Const XMLSCHEMA_ZUGFERD_233 = "Version2_3_3_FacturX"
-    Public Const XMLSCHEMA_PEPPOL_3017_CREDITNOTE = "Version3017_CREDITNOTE"
+    Public Const XMLSCHEMA_ZUGFERD_24 = "Version2_4_FacturX"
+    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"
@@ -51,6 +52,7 @@ Public Class ZUGFeRDInterface
         UnsupportedFormat
         FileTooBig
         UnknownError
+        NotInUse
     End Enum
 
     Public ReadOnly Property FileGroup As FileGroups
@@ -61,7 +63,8 @@ Public Class ZUGFeRDInterface
         Public Property AllowXRechnung_Filename As Boolean = True
         Public Property AllowZugferd_1_0_Schema As Boolean = True
         Public Property AllowZugferd_2_x_Schema As Boolean = True
-        Public Property AllowPeppol_3017_Schema As Boolean = False
+        Public Property AllowZugferd_2_3_x_Schema As Boolean = True
+        Public Property AllowPeppol_3_x_Schema As Boolean = False
     End Class
 
     Public Class ZugferdResult
@@ -131,24 +134,46 @@ Public Class ZUGFeRDInterface
         AllowedFilenames = oAllowedFilenames
     End Sub
 
-    Public Function FilterPropertyMap(pPropertyMap As Dictionary(Of String, XmlItemProperty), pSpecification As String) As Dictionary(Of String, XmlItemProperty)
+    Public Function FilterPropertyMap(pPropertyMapList As List(Of XmlItemProperty), pSpecification As String) As Dictionary(Of String, XmlItemProperty)
-        _logger.Debug("Filtering Property map for Specification [{0}]", pSpecification)
+        _logger.Debug("Filtering Property map list for Specification [{0}]", pSpecification)
 
         If pSpecification = ZUGFERD_SPEC_10 Then
+            Try
+
                 _logger.Debug("Special Case [{0}], including [{1}]", ZUGFERD_SPEC_10, ZUGFERD_SPEC_DEFAULT)
-            Return pPropertyMap.
+
-                Where(Function(kv) kv.Value.Specification = pSpecification Or kv.Value.Specification = ZUGFERD_SPEC_DEFAULT).
+                Dim countElements As Integer = pPropertyMapList.Where(Function(x) x.Specification = pSpecification Or x.Specification = ZUGFERD_SPEC_DEFAULT).Count
-                ToDictionary(Function(kv) kv.Key, Function(kv) kv.Value)
+                _logger.Debug("Property map list contains [{0}] elements for specification [{1}]", countElements, pSpecification)
+
+                Return pPropertyMapList.
+                        Where(Function(kv) kv.Specification = pSpecification Or kv.Specification = ZUGFERD_SPEC_DEFAULT).
+                        ToDictionary(Function(kv) kv.XMLPath, Function(kv) kv)
+
+            Catch ex As Exception
+                _logger.Error(ex)
+            End Try
         Else
-            _logger.Debug("Using Specification [{0}]", pSpecification)
+
-            Return pPropertyMap.
+            Try
-                Where(Function(kv) kv.Value.Specification = pSpecification).
+
-                ToDictionary(Function(kv) kv.Key, Function(kv) kv.Value)
+                Dim countElements As Integer = pPropertyMapList.Where(Function(x) x.Specification = pSpecification).Count
+                _logger.Debug("Property map list contains [{0}] elements for specification [{1}]", countElements, pSpecification)
+
+                Return pPropertyMapList.
+                        Where(Function(kv) kv.Specification = pSpecification).
+                        ToDictionary(Function(kv) kv.XMLPath, Function(kv) kv)
+
+            Catch ex As Exception
+                _logger.Error(ex)
+            End Try
         End If
+
+        Return Nothing
     End Function
 
     Public Function GetSerializedXMLContentFromFile(oFileInfo As FileInfo) As ZugferdResult
         Dim oResult = New ZugferdResult()
+        Dim oMessage As String = String.Empty
 
         Try
             Dim oFileSize As Integer = oFileInfo.Length
@@ -173,7 +198,7 @@ Public Class ZUGFeRDInterface
 
         Catch ex As Exception
             _logger.Error(ex)
-            Throw New ZUGFeRDExecption(ErrorType.NoValidZugferd, "Datei ist eine ungültige XML Datei.")
+            Throw New ZUGFeRDExecption(ErrorCodes.UnsupportedFerdException, "Datei ist eine ungültige XML Datei.")
         End Try
 
         If oResult.ValidationErrors.Any() Then
@@ -189,7 +214,6 @@ Public Class ZUGFeRDInterface
     ''' Validates a ZUGFeRD File and extracts the XML Document from it
     ''' </summary>
     ''' <param name="Path"></param>
-    ''' <exception cref="ZUGFeRDExecption"></exception>
     Public Function ExtractZUGFeRDFileWithGDPicture(Path As String) As ZugferdResult
         Dim oResult = ValidateZUGFeRDFileWithGDPicture(Path)
         oResult = ValidateZUGFeRDDocument(oResult)
@@ -207,7 +231,6 @@ Public Class ZUGFeRDInterface
     ''' Validates a ZUGFeRD File and extracts the XML Document from it
     ''' </summary>
     ''' <param name="Stream"></param>
-    ''' <exception cref="ZUGFeRDExecption"></exception>
     Public Function ExtractZUGFeRDFileWithGDPicture(Stream As Stream) As ZugferdResult
         Dim oResult = ValidateZUGFeRDFileWithGDPicture(Stream)
         oResult = ValidateZUGFeRDDocument(oResult)
@@ -230,7 +253,6 @@ Public Class ZUGFeRDInterface
     ''' Validates a ZUGFeRD File and extracts the XML Document from it
     ''' </summary>
     ''' <param name="pStream"></param>
-    ''' <exception cref="ZUGFeRDExecption"></exception>
     ''' <returns>The embedded xml data as an XPath document</returns>
     Public Function ValidateZUGFeRDFileWithGDPicture(pStream As Stream) As ZugferdResult
         Dim oEmbedExtractor = New PDFEmbeds(_logConfig)
@@ -249,7 +271,7 @@ Public Class ZUGFeRDInterface
             Throw ex
 
         Catch ex As Exception
-            _logger.Warn("Error while validating ZUGFeRD file with GDPicture")
+            _logger.Warn("Error while validating eInvoice file with GDPicture")
             _logger.Error(ex)
             Throw ex
         End Try
@@ -259,7 +281,6 @@ Public Class ZUGFeRDInterface
     ''' Validates a ZUGFeRD File and extracts the XML Document from it
     ''' </summary>
     ''' <param name="pPath"></param>
-    ''' <exception cref="ZUGFeRDExecption"></exception>
     ''' <returns>The embedded xml data as an XPath document</returns>
     Public Function ValidateZUGFeRDFileWithGDPicture(pPath As String) As ZugferdResult
         Dim oEmbedExtractor = New PDFEmbeds(_logConfig)
@@ -278,19 +299,15 @@ Public Class ZUGFeRDInterface
             Throw ex
 
         Catch ex As Exception
-            _logger.Warn("Error while validating ZUGFeRD file with GDPicture")
+            _logger.Warn("Error while validating eInvoice file with GDPicture")
             _logger.Error(ex)
             Throw ex
         End Try
     End Function
 
     Private Function HandleEmbeddedFiles(pResults As List(Of PDFEmbeds.EmbeddedFile)) As ZugferdResult
-        If pResults Is Nothing Then
+        If pResults Is Nothing OrElse pResults.Count = 0 Then
-            Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei, weil die Attachments nicht gelesen werden konnten.")
+            Throw New ZUGFeRDExecption(ErrorCodes.InvalidFerdNoXMLAttachmentFound, "Die Datei ist keine gültige ZUGFeRD-Datei, es wurde kein passender XML-Anhang gefunden.")
-        End If
-
-        If pResults.Count = 0 Then
-            Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei, weil sie keine Attachments enthält.")
         End If
 
         ' Find the first file which filename matches the valid filenames for embedded invoice files
@@ -299,7 +316,7 @@ Public Class ZUGFeRDInterface
             FirstOrDefault()
 
         If oValidResult Is Nothing Then
-            Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei, weil keine entsprechende XML-Datei gefunden wurde.")
+            Throw New ZUGFeRDExecption(ErrorCodes.InvalidFerdNoXMLAttachmentFound, "Die Datei ist keine ZUGFeRD Datei, weil keine passende XML-Datei gefunden wurde.")
         End If
 
         ' Search the embedded files for the ones which are allowed as per the configuration.
@@ -309,7 +326,7 @@ Public Class ZUGFeRDInterface
             FirstOrDefault()
 
         If oAllowedResult Is Nothing Then
-            Throw New ZUGFeRDExecption(ErrorType.UnsupportedFormat, "Datei ist eine ZUGFeRD Datei, aber das Format wird nicht unterstützt.", oAllowedResult.FileName)
+            Throw New ZUGFeRDExecption(ErrorCodes.InvalidFerdNoXMLAttachmentFound, "Datei enthält einen XML-Anhang mit einem ungültigen Dateinamen.", oAllowedResult.FileName)
         End If
 
         Try
@@ -327,7 +344,7 @@ Public Class ZUGFeRDInterface
 
         Catch ex As Exception
             _logger.Error(ex)
-            Throw New ZUGFeRDExecption(ErrorType.NoValidZugferd, "Datei ist eine ungültige ZUGFeRD Datei.")
+            Throw New ZUGFeRDExecption(ErrorCodes.InvalidFerdException, "XML-Datei konnte nicht gelesen werden.")
         End Try
     End Function
 
@@ -359,6 +376,7 @@ Public Class ZUGFeRDInterface
                 })
             End If
 
+            '' Reihenfolge 2.0 muss unverändert bleiben. Älteste Version immer zuerst!
             If _Options.AllowZugferd_2_x_Schema Then
                 oAllowedTypes.AddRange(New List(Of AllowedType) From {
                     New AllowedType With {
@@ -375,26 +393,42 @@ Public Class ZUGFeRDInterface
                         .SchemaType = GetType(Version2_2_FacturX.CrossIndustryInvoiceType),
                         .Specification = ZUGFERD_SPEC_2x,
                         .XMLSchema = XMLSCHEMA_ZUGFERD_22
+                    }
+                })
+            End If
+
+            '' Reihenfolge ab 2.3 geändert. Neuste Version immer zuerst bzw. oben
+            If _Options.AllowZugferd_2_3_x_Schema Then
+                oAllowedTypes.AddRange(New List(Of AllowedType) From {
+                    New AllowedType With {
+                        .SchemaType = GetType(Version2_4_FacturX.CrossIndustryInvoiceType),
+                        .Specification = ZUGFERD_SPEC_2_3x,
+                        .XMLSchema = XMLSCHEMA_ZUGFERD_24
+                    },
+                    New AllowedType With {
+                        .SchemaType = GetType(Version2_3_3_FacturX.CrossIndustryInvoiceType),
+                        .Specification = ZUGFERD_SPEC_2_3x,
+                        .XMLSchema = XMLSCHEMA_ZUGFERD_233
                     },
                     New AllowedType With {
                         .SchemaType = GetType(Version2_3_FacturX.CrossIndustryInvoiceType),
-                        .Specification = ZUGFERD_SPEC_2x,
+                        .Specification = ZUGFERD_SPEC_2_3x,
                         .XMLSchema = XMLSCHEMA_ZUGFERD_23
                     }
                 })
             End If
 
-            If _Options.AllowPeppol_3017_Schema Then
+            If _Options.AllowPeppol_3_x_Schema Then
                 oAllowedTypes.AddRange(New List(Of AllowedType) From {
                     New AllowedType With {
-                        .SchemaType = GetType(BISBilling30Invoice.InvoiceType),
+                        .SchemaType = GetType(UBL_21_Invoice.InvoiceType),
-                        .Specification = PEPPOL_SPEC_3x_INVOICE,
+                        .Specification = UBL_SPEC_21,
-                        .XMLSchema = XMLSCHEMA_PEPPOL_3017_INVOICE
+                        .XMLSchema = XMLSCHEMA_UBL_21_INVOICE
                     },
                     New AllowedType With {
-                        .SchemaType = GetType(BISBilling30CreditNote.CreditNoteType),
+                        .SchemaType = GetType(UBL_21_CreditNote.CreditNoteType),
-                        .Specification = PEPPOL_SPEC_3x_CREDITNOTE,
+                        .Specification = UBL_SPEC_21,
-                        .XMLSchema = XMLSCHEMA_PEPPOL_3017_CREDITNOTE
+                        .XMLSchema = XMLSCHEMA_UBL_21_CREDITNOTE
                     }
                 })
             End If
@@ -422,8 +456,7 @@ Public Class ZUGFeRDInterface
             Next
 
             If oObject Is Nothing Then
-                'Throw New ApplicationException("No Types matched the given document. Document could not be serialized.")
+                Throw New ZUGFeRDExecption(ErrorCodes.UnsupportedFerdException, "Unsupported Format")
-                Throw New ZUGFeRDExecption(ErrorType.UnsupportedFormat, "Unsupported Format")
             End If
 
             pResult.Specification = oSpecification
@@ -438,8 +471,8 @@ Public Class ZUGFeRDInterface
 
         Catch ex As Exception
             _logger.Error(ex)
-            Dim oMessage = "Datei ist eine ungültige ZUGFeRD Datei oder das Format wird nicht unterstüzt, oder das Format ist deaktiviert."
+            Dim oMessage = "Datei ist eine ungültige Datei oder das Format wird nicht unterstüzt, oder das Format ist deaktiviert."
-            Throw New ZUGFeRDExecption(ErrorType.NoValidZugferd, oMessage)
+            Throw New ZUGFeRDExecption(ErrorCodes.UnsupportedFerdException, oMessage)
         End Try
     End Function
 End Class

Interfaces/ZUGFeRDInterface/Enums/ErrorCodes.vb

@@ -0,0 +1,14 @@
+Public Enum ErrorCodes
+    NotInUse = 0
+    ValidationException = 20001
+    MD5HashException = 20002
+    UnsupportedFerdException = 20003
+    InvalidFerdException = 20004
+    TooMuchFerdsException = 20005
+    InvalidFerdNoXMLAttachmentFound = 20006
+    MissingValueException = 20007
+    FileSizeLimitReachedException = 20008
+    OutOfMemoryException = 20009
+    UnhandledException = 20010
+    FileMoveException = 200011
+End Enum

Interfaces/ZUGFeRDInterface/Enums/Item_Types.vb

@@ -0,0 +1,8 @@
+Public Enum Item_Types
+    StringType  '0
+    DateType    '1
+    MoneyType   '2
+    FileType    '3
+    ListType    '4  - vgl. Währung
+
+End Enum

Interfaces/ZUGFeRDInterface/Exceptions.vb

@@ -4,7 +4,11 @@ Public Class Exceptions
     Public Class ZUGFeRDExecption
         Inherits ApplicationException
 
-        Public ReadOnly Property ErrorType() As ZUGFeRDInterface.ErrorType
+        Public ReadOnly Property ErrorCode() As ErrorCodes
+
+        Public ReadOnly Property Param1 As String = String.Empty
+
+        Public ReadOnly Property Param2 As String = String.Empty
 
         ''' <summary>
         ''' Contains the name of the extracted xml file if already extracted.
@@ -12,18 +16,37 @@ Public Class Exceptions
         ''' <returns>A filename like zugferd-invoice.xml</returns>
         Public ReadOnly Property XmlFile As String = String.Empty
 
-        Public Sub New(ErrorType As ZUGFeRDInterface.ErrorType, Message As String)
+        Public Sub New(pErrorCode As ErrorCodes, Message As String)
             MyBase.New(Message)
 
-            _ErrorType = ErrorType
+            _ErrorCode = pErrorCode
         End Sub
 
-        Public Sub New(ErrorType As ZUGFeRDInterface.ErrorType, Message As String, pXmlFileName As String)
+        Public Sub New(pErrorCode As ErrorCodes, Message As String, pXmlFileName As String)
             MyBase.New(Message)
 
-            _ErrorType = ErrorType
+            _ErrorCode = pErrorCode
             _XmlFile = pXmlFileName
         End Sub
+
+        Public Sub New(pErrorCode As ErrorCodes, Param1 As String, Param2 As String, Message As String)
+            MyBase.New(Message)
+
+            _ErrorCode = pErrorCode
+            _Param1 = Param1
+            _Param2 = Param2
+
+        End Sub
+
+        Public Sub New(pErrorCode As ErrorCodes, Param1 As String, Param2 As String, Message As String, pXmlFileName As String)
+            MyBase.New(Message)
+
+            _ErrorCode = pErrorCode
+            _Param1 = Param1
+            _Param2 = Param2
+            _XmlFile = pXmlFileName
+
+        End Sub
     End Class
 
     Public Class ValidationException
@@ -31,8 +54,13 @@ Public Class Exceptions
 
         Public ValidationErrors As List(Of ZugferdValidationError)
 
+        Public ReadOnly Property ErrorCode() As ErrorCodes
+
         Public Sub New()
             MyBase.New("ZUGFeRD document found but validation failed!")
+
+            _ErrorCode = ErrorCodes.ValidationException
         End Sub
+
     End Class
 End Class

Interfaces/ZUGFeRDInterface/PDFEmbeds.vb

@@ -183,7 +183,7 @@ Public Class PDFEmbeds
 
                                 Dim oFileData As Byte() = New Byte(oFileSize) {}
                                 Dim oStatus As GdPictureStatus = GDPicturePDF.ExtractEmbeddedFile(oIndex, oFileData)
-
+                                'MsgBox($"FileSize of filename: {oFileName} is bytes: {oFileData.Length}/Filesize: {oFileSize}")
                                 If oStatus = GdPictureStatus.OK Then
                                     Logger.Debug("Embedded file [{0}] extracted sucessfully!", oFileName)
 

Interfaces/ZUGFeRDInterface/PropertyValues.vb

@@ -1,4 +1,5 @@
-Imports System.Reflection
+Imports System.Globalization
+Imports System.Reflection
 Imports System.Text.RegularExpressions
 Imports DigitalData.Modules.Logging
 
@@ -27,6 +28,7 @@ Public Class PropertyValues
         Public IsRequired As Boolean
         Public GroupCounter As Integer = -1
 
+        Public EN16931_ID As String
         Public Description As String
         Public Value As String
         Public XMLPath As String
@@ -35,6 +37,7 @@ Public Class PropertyValues
     End Class
 
     Public Class MissingProperty
+        Public EN16931_ID As String
         Public Description As String
         Public XMLPath As String
 
@@ -54,7 +57,7 @@ Public Class PropertyValues
             ToDictionary(Function(Item) Item.Key,
                          Function(Item) Item.Value)
 
-        _logger.Debug("Found {0} default properties.", oDefaultProperties.Count)
+        _logger.Debug("Found {0} ungrouped properties.", oDefaultProperties.Count)
 
         ' PropertyMap items with `IsGrouped = True` are grouped by group scope
         Dim oGroupedProperties = PropertyMap.
@@ -68,7 +71,7 @@ Public Class PropertyValues
             Dim oGroupScope As String = oGroup.Key
 
             Dim oPropertyList As New Dictionary(Of XmlItemProperty, List(Of Object))
-            Dim oRowCount = 0
+            Dim oRowCount = 0       ' TODO - Es wird anhand der Anzahl XML-Knoten ermittelt wieviele Rows gelesen werden???????
 
             _logger.Debug($"Fetching Property values for group [{oGroupScope}].")
 
@@ -84,16 +87,16 @@ Public Class PropertyValues
                     oPropertyValues = New List(Of Object)
                 End Try
 
+                ' check the first batch of values to determine the row count
+                If oRowCount = 0 Then '08.04.2025 MS Added as Workaround for Positions Or oGroupScope = "POSITIONS" !
+                    oRowCount = oPropertyValues.Count
+                End If
+
                 ' Flatten result value
                 oPropertyValues = GetFinalPropValue(oPropertyValues)
 
                 ' Add to list
                 oPropertyList.Add(oProperty.Value, oPropertyValues)
-
-                ' check the first batch of values to determine the row count
-                If oRowCount = 0 Then
-                    oRowCount = oPropertyValues.Count
-                End If
             Next
 
             ' Structure of oPropertyList
@@ -112,32 +115,55 @@ Public Class PropertyValues
                     Dim oPropertyDescription As String = oColumn.Key.Description
                     Dim oPropertyPath As String = oColumn.Key.XMLPath
                     Dim oItemType As Integer = oColumn.Key.ItemType
+                    Dim oEN16931Value As String = oColumn.Key.EN16931_ID
 
                     Dim oRowCounter = oRowIndex + oGlobalGroupCounter + 1
 
                     ' Returns nothing if oColumn.Value contains an empty list
                     Dim oPropertyValue = oColumn.Value.ElementAtOrDefault(oRowIndex)
 
-                    _logger.Debug("Processing itemSpecification *TableColumn* [{0}].", oTableColumn)
+                    _logger.Debug("Processing itemColumn *TableColumn* [{0}].", oTableColumn)
                     If oTableColumn = "INVOICE_SELLER_EMAIL" Then
                         Console.WriteLine("INVOICE_SELLER_EMAIL")
+                    ElseIf oTableColumn = "INVOICE_POSITION_ARTICLE" Then
+                        Console.WriteLine("INVOICE_POSITION_ARTICLE")
                     End If
                     If IsNothing(oPropertyValue) OrElse String.IsNullOrEmpty(oPropertyValue) Then
                         If oColumn.Key.IsRequired Then
-                            _logger.Warn($"{MessageId} # oPropertyValue for specification [{oTableColumn}] is empty or not found but is required. Continuing with Empty String.")
+                            _logger.Warn($"{MessageId} - oPropertyValue for column [{oTableColumn}] is empty or not found but is required. Continuing with Empty String.")
                             Dim oMissingProperty = New MissingProperty() With {
+                                .EN16931_ID = oEN16931Value,
                                 .Description = oPropertyDescription,
                                 .XMLPath = oPropertyPath
                             }
                             oResult.MissingProperties.Add(oMissingProperty)
                         Else
-                            _logger.Debug($"{MessageId} # oPropertyValue for specification [{oTableColumn}] is empty or not found. Continuing with Empty String.")
+                            _logger.Debug($"{MessageId} - oPropertyValue for column [{oTableColumn}] is empty or not found. Continuing with Empty String.")
                         End If
 
                         oPropertyValue = String.Empty
                     End If
 
-                    _logger.Debug("ItemSpecification [{0}] has value '{1}'", oTableColumn, oPropertyValue)
+                    If (oPropertyValue IsNot Nothing) Then
+                        Dim logValue As String = oPropertyValue.ToString()
+                        If logValue.Length > 50 Then
+                            _logger.Debug("Item [{0}] has value '{1}...'", oTableColumn, logValue.Substring(1, 50))
+                        Else
+                            _logger.Debug("Item [{0}] has value '{1}'", oTableColumn, oPropertyValue)
+                        End If
+
+                    End If
+
+                    If oTableColumn = "INVOICE_CURRENCY" Or oItemType = 4 Then
+                        Dim oValuestring = oPropertyValue.ToString()
+
+                        ' Bei Listenelementen entfernen wir den String Item, um den Wert zu erhalten
+                        If oValuestring.Contains("Item") Then
+                            oValuestring = oValuestring.Replace("Item", "")
+                        End If
+
+                        oPropertyValue = oValuestring
+                    End If
 
                     oResult.ValidProperties.Add(New ValidProperty() With {
                         .MessageId = MessageId,
@@ -148,7 +174,8 @@ Public Class PropertyValues
                         .TableColumn = oTableColumn,
                         .IsRequired = oIsRequired,
                         .XMLPath = oPropertyPath,
-                        .ItemType = oItemType
+                        .ItemType = oItemType,
+                        .EN16931_ID = oEN16931Value
                     })
                 Next
             Next
@@ -167,11 +194,12 @@ Public Class PropertyValues
             Dim oIsRequired = oItem.Value.IsRequired
             Dim oDescription = oItem.Value.Description
             Dim oItemType = oItem.Value.ItemType
+            Dim oEN16931_ID = oItem.Value.EN16931_ID
 
             Try
                 oPropertyValueList = GetPropValue(pDocument, oItem.Key)
             Catch ex As Exception
-                _logger.Warn("{2} # Unknown error occurred while fetching specification [{0}] in group [{1}]:", oPropertyDescription, oItem.Value.GroupScope, MessageId)
+                _logger.Warn("{2} - Unknown error occurred while fetching specification [{0}] in group [{1}]:", oTableColumn, oItem.Value.GroupScope, MessageId)
                 _logger.Warn("ERROR-MESSAGE [{0}]", ex.Message)
                 _logger.Error(ex)
                 oPropertyValueList = New List(Of Object)
@@ -190,20 +218,20 @@ Public Class PropertyValues
 
                             ' This should hopefully show config errors
                             If TypeOf oPropertyValue Is List(Of Object) Then
-                                _logger.Warn("Item with specification [{0}] may be configured incorrectly", oPropertyDescription)
+                                _logger.Warn("Item with specification [{0}] may be configured incorrectly", oTableColumn)
                                 oPropertyValue = Nothing
                             End If
                     End Select
                 End If
             Catch ex As Exception
-                _logger.Warn("Unknown error occurred while processing specification [{0}]:", oPropertyDescription)
+                _logger.Warn("Unknown error occurred while processing specification [{0}]:", oTableColumn)
                 _logger.Error(ex)
                 oPropertyValue = Nothing
             End Try
 
             If IsNothing(oPropertyValue) OrElse String.IsNullOrEmpty(oPropertyValue) Then
                 If oItem.Value.IsRequired Then
-                    _logger.Warn("{0} # Specification [{1}] is empty, but marked as required! Skipping.", MessageId, oPropertyDescription)
+                    _logger.Warn("Specification [{0}] is empty, but marked as required! Skipping.", oTableColumn)
                     Dim oMissingProperty = New MissingProperty With
                     {
                         .Description = oPropertyDescription,
@@ -212,15 +240,22 @@ Public Class PropertyValues
                     oResult.MissingProperties.Add(oMissingProperty)
                     Continue For
                 Else
-                    _logger.Debug("{0} # oPropertyValue for specification [{1}] is empty or not found. Skipping.", MessageId, oPropertyDescription)
+                    _logger.Debug("oPropertyValue for specification [{0}] is empty or not found. Skipping.", oTableColumn)
 
                     Continue For
                 End If
             End If
 
-            ' Statt dem Zahlenwert des Enums, wollen wir die Währunsgbezeichnung
+            ' Statt dem Zahlenwert des Enums, wollen wir die Währungsbezeichnung
-            If oTableColumn = "INVOICE_CURRENCY" Then
+            If oTableColumn = "INVOICE_CURRENCY" Or oItemType = 4 Then
-                oPropertyValue = oPropertyValue.ToString()
+                Dim oValuestring = oPropertyValue.ToString()
+
+                ' Bei Listenelementen entfernen wir den String Item, um den Wert zu erhalten
+                If oValuestring.Contains("Item") Then
+                    oValuestring = oValuestring.Replace("Item", "")
+                End If
+
+                oPropertyValue = oValuestring
             End If
 
             oResult.ValidProperties.Add(New ValidProperty() With {
@@ -231,7 +266,8 @@ Public Class PropertyValues
                 .TableColumn = oTableColumn,
                 .IsRequired = oIsRequired,
                 .XMLPath = oPropertyPath,
-                .ItemType = oItemType
+                .ItemType = oItemType,
+                .EN16931_ID = oEN16931_ID
              })
         Next
 
@@ -278,17 +314,11 @@ Public Class PropertyValues
 
             Obj = oInfo.GetValue(Obj, Nothing)
 
-            ' TODO: This code should check for array properties by itself
-            ' and should not rely on the user to 
-            'If oInfo.PropertyType.IsArray Then
-            '    Obj = Obj(0)
-            'End If
-
             If oHasIndex Then
                 Obj = Obj(0)
             End If
 
-            If IsArray(Obj) And Not oHasIndex Then
+            If IsArray(Obj) And Not oHasIndex And oPart <> "Value" Then
                 Dim oCurrentPart As String = oPart
                 Dim oSplitString As String() = New String() {oCurrentPart & "."}
                 Dim oPathFragments = PropertyName.Split(oSplitString, StringSplitOptions.None)
@@ -308,8 +338,56 @@ Public Class PropertyValues
                 Next
 
                 Return oResults
-            End If
+            Else
+                If oPart = "Value" AndAlso Obj IsNot Nothing Then
+                    ' Der Name des gefundenen Datentyps
+                    Dim oObjType = oInfo.PropertyType.FullName
 
+                    If oObjType.Equals("System.DateTime", StringComparison.OrdinalIgnoreCase) Then
+
+                        Dim d As Date
+                        Dim s As String
+                        Dim oResult As String
+
+                        s = Convert.ToString(Obj)
+
+                        If IsDate(s) = True Then
+                            ' Hier wird das DEFAULT-Format auf yyyyMMdd gesetzt
+                            Dim dtfi As DateTimeFormatInfo = CultureInfo.CreateSpecificCulture(CultureInfo.InvariantCulture.Name).DateTimeFormat
+                            dtfi.DateSeparator = ""
+                            dtfi.ShortDatePattern = "yyyyMMdd"
+
+                            d = CDate(s)
+                            oResult = d.ToString("d", dtfi)
+
+                            'Return New List(Of Object) From {oResult}
+                            Dim oRetValue As List(Of Object) = New List(Of Object) From {
+                                oResult
+                            }
+
+                            Return oRetValue
+
+                        End If
+                    ElseIf oObjType.Equals("System.Decimal", StringComparison.OrdinalIgnoreCase) Then
+
+                        Dim oResult As String
+
+                        If IsNumeric(Obj) = True Then
+                            Dim decValue As Decimal = CDec(Obj)
+                            ' Es wird immer ein . als Dezimaltrenner verwendet, falls nötig
+                            oResult = decValue.ToString(CultureInfo.InvariantCulture)
+
+                            'Return New List(Of Object) From {oResult}
+                            Dim oRetValue As List(Of Object) = New List(Of Object) From {
+                                oResult
+                            }
+
+                            Return oRetValue
+
+                        End If
+                    End If
+                End If
+            End If
         Next
 
         Return New List(Of Object) From {Obj}
@@ -337,8 +415,20 @@ Public Class PropertyValues
             Select Case oCount
                 Case 0
                     Return Nothing
+                Case 1
+                    Dim firstElement As Object
+                    firstElement = oList.FirstOrDefault()
+                    If firstElement IsNot Nothing AndAlso IsArray(firstElement) Then
+
+                        ' Attachments sind Byte-Arrays und müssen umgewandelt werden
+                        Return Convert.ToBase64String(firstElement)
+
+                    Else
+                        Return DoGetFinalPropValue(oList.First())
+                    End If
                 Case Else
                     Return DoGetFinalPropValue(oList.First())
+
             End Select
 
             Return DoGetFinalPropValue(Value)

Interfaces/ZUGFeRDInterface/RejectionStringRow.vb

@@ -0,0 +1,8 @@
+Public Class RejectionStringRow
+    Public ModuleName As String
+    Public Title As String
+    Public Caption As String
+    Public Language As String
+    Public String1 As String
+
+End Class

Interfaces/ZUGFeRDInterface/Validator.vb

@@ -14,6 +14,7 @@ Public Class Validator
         ValidateDecimalNodes(pResult)
         ValidateCurrencyNodes(pResult)
 
+        'TODO Validate Datumsfelder
         Return pResult
     End Function
 
@@ -29,7 +30,7 @@ Public Class Validator
                     .ElementName = oNode.Name.LocalName,
                     .ElementValue = oNode.Value,
                     .ErrorMessage = "Value could not be parsed as Decimal.",
-                    .ErrorMessageDE = "Der Wert konnte nicht in eine Dezimalzahl umgewandelt werden."
+                    .ErrorMessageDE = "Der Wert ist keine Dezimalzahl."
                 })
                 End If
             Next

Interfaces/ZUGFeRDInterface/Version2.3_FacturX/CrossIndustryInvoiceType.vb

@@ -567,17 +567,30 @@ Namespace ZUGFeRD.Version2_3_FacturX
      System.Xml.Serialization.XmlTypeAttribute([Namespace]:="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100")>  _
     Partial Public Class DateTimeType
 
-        Private itemField As Object
+        'Private itemField As Object
+
+        ''''<remarks/>
+        '<System.Xml.Serialization.XmlElementAttribute("DateTime", GetType(Date)),  _
+        ' System.Xml.Serialization.XmlElementAttribute("DateTimeString", GetType(DateTimeTypeDateTimeString))>  _
+        'Public Property Item() As Object
+        '    Get
+        '        Return Me.itemField
+        '    End Get
+        '    Set
+        '        Me.itemField = value
+        '    End Set
+        'End Property
+
+        Private itemField As DateTimeTypeDateTimeString
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute("DateTime", GetType(Date)),  _
+        <System.Xml.Serialization.XmlElementAttribute("DateTimeString")>
-         System.Xml.Serialization.XmlElementAttribute("DateTimeString", GetType(DateTimeTypeDateTimeString))>  _
+        Public Property DateTimeString() As DateTimeTypeDateTimeString
-        Public Property Item() As Object
             Get
                 Return Me.itemField
             End Get
             Set
-                Me.itemField = value
+                Me.itemField = Value
             End Set
         End Property
     End Class
@@ -9418,6 +9431,18 @@ Namespace ZUGFeRD.Version2_3_FacturX
         <System.Xml.Serialization.XmlEnumAttribute("870")>
         Item870 = 870
 
+        '''<remarks/>
+        <System.Xml.Serialization.XmlEnumAttribute("875")>
+        Item875 = 875
+
+        '''<remarks/>
+        <System.Xml.Serialization.XmlEnumAttribute("876")>
+        Item876 = 876
+
+        '''<remarks/>
+        <System.Xml.Serialization.XmlEnumAttribute("877")>
+        Item877 = 877
+
         '''<remarks/>
         <System.Xml.Serialization.XmlEnumAttribute("890")>
         Item890 = 890
@@ -20804,431 +20829,786 @@ Namespace ZUGFeRD.Version2_3_FacturX
     End Enum
 
     '''<remarks/>
-    <System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0"),  _
+    <System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0"),
-     System.SerializableAttribute(),  _
+     System.SerializableAttribute(),
-     System.Xml.Serialization.XmlTypeAttribute([Namespace]:="urn:un:unece:uncefact:codelist:standard:UNECE:AllowanceChargeReasonCode:D22A")>  _
+     System.Xml.Serialization.XmlTypeAttribute([Namespace]:="urn:un:unece:uncefact:codelist:standard:UNECE:AllowanceChargeReasonCode:D22A")>
     Public Enum AllowanceChargeReasonCodeContentType
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("1")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("1")>
         Item1
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("2")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("2")>
         Item2
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("3")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("3")>
         Item3
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("4")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("4")>
         Item4
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("5")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("5")>
         Item5
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("6")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("6")>
         Item6
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("7")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("7")>
         Item7
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("8")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("8")>
         Item8
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("9")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("9")>
         Item9
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("10")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("10")>
         Item10
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("11")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("11")>
         Item11
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("12")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("12")>
         Item12
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("13")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("13")>
         Item13
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("14")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("14")>
         Item14
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("15")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("15")>
         Item15
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("16")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("16")>
         Item16
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("17")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("17")>
         Item17
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("18")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("18")>
         Item18
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("19")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("19")>
         Item19
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("20")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("20")>
         Item20
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("21")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("21")>
         Item21
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("22")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("22")>
         Item22
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("23")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("23")>
         Item23
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("24")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("24")>
         Item24
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("25")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("25")>
         Item25
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("26")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("26")>
         Item26
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("27")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("27")>
         Item27
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("28")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("28")>
         Item28
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("29")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("29")>
         Item29
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("30")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("30")>
         Item30
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("31")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("31")>
         Item31
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("32")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("32")>
         Item32
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("33")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("33")>
         Item33
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("34")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("34")>
         Item34
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("35")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("35")>
         Item35
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("36")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("36")>
         Item36
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("37")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("37")>
         Item37
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("38")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("38")>
         Item38
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("39")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("39")>
         Item39
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("40")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("40")>
         Item40
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("41")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("41")>
         Item41
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("42")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("42")>
         Item42
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("43")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("43")>
         Item43
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("44")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("44")>
         Item44
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("45")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("45")>
         Item45
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("46")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("46")>
         Item46
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("47")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("47")>
         Item47
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("48")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("48")>
         Item48
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("49")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("49")>
         Item49
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("50")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("50")>
         Item50
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("51")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("51")>
         Item51
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("52")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("52")>
         Item52
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("53")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("53")>
         Item53
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("54")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("54")>
         Item54
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("55")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("55")>
         Item55
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("56")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("56")>
         Item56
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("57")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("57")>
         Item57
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("58")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("58")>
         Item58
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("59")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("59")>
         Item59
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("60")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("60")>
         Item60
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("61")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("61")>
         Item61
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("62")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("62")>
         Item62
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("63")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("63")>
         Item63
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("64")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("64")>
         Item64
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("65")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("65")>
         Item65
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("66")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("66")>
         Item66
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("67")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("67")>
         Item67
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("68")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("68")>
         Item68
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("69")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("69")>
         Item69
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("70")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("70")>
         Item70
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("71")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("71")>
         Item71
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("72")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("72")>
         Item72
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("73")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("73")>
         Item73
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("74")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("74")>
         Item74
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("75")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("75")>
         Item75
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("76")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("76")>
         Item76
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("77")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("77")>
         Item77
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("78")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("78")>
         Item78
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("79")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("79")>
         Item79
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("80")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("80")>
         Item80
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("81")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("81")>
         Item81
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("82")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("82")>
         Item82
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("83")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("83")>
         Item83
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("84")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("84")>
         Item84
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("85")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("85")>
         Item85
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("86")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("86")>
         Item86
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("87")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("87")>
         Item87
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("88")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("88")>
         Item88
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("89")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("89")>
         Item89
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("90")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("90")>
         Item90
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("91")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("91")>
         Item91
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("92")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("92")>
         Item92
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("93")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("93")>
         Item93
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("94")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("94")>
         Item94
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("95")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("95")>
         Item95
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("96")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("96")>
         Item96
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("97")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("97")>
         Item97
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("98")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("98")>
         Item98
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("99")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("99")>
         Item99
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("100")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("100")>
         Item100
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("101")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("101")>
         Item101
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("102")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("102")>
         Item102
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("103")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("103")>
         Item103
 
         '''<remarks/>
-        <System.Xml.Serialization.XmlEnumAttribute("104")>  _
+        <System.Xml.Serialization.XmlEnumAttribute("104")>
         Item104
 
+        '''<remarks/>
+        AA
+        '''<remarks/>
+        AAA
+        '''<remarks/>
+        AAC
+        '''<remarks/>
+        AAD
+        '''<remarks/>
+        AAE
+        '''<remarks/>
+        AAF
+        '''<remarks/>
+        AAH
+        '''<remarks/>
+        AAI
+        '''<remarks/>
+        AAS
+        '''<remarks/>
+        AAT
+        '''<remarks/>
+        AAV
+        '''<remarks/>
+        AAY
+        '''<remarks/>
+        AAZ
+        '''<remarks/>
+        ABA
+        '''<remarks/>
+        ABB
+        '''<remarks/>
+        ABC
+        '''<remarks/>
+        ABD
+        '''<remarks/>
+        ABF
+        '''<remarks/>
+        ABK
+        '''<remarks/>
+        ABL
+        '''<remarks/>
+        ABN
+        '''<remarks/>
+        ABR
+        '''<remarks/>
+        ABS
+        '''<remarks/>
+        ABT
+        '''<remarks/>
+        ABU
+        '''<remarks/>
+        ACF
+        '''<remarks/>
+        ACG
+        '''<remarks/>
+        ACH
+        '''<remarks/>
+        ACI
+        '''<remarks/>
+        ACJ
+        '''<remarks/>
+        ACK
+        '''<remarks/>
+        ACL
+        '''<remarks/>
+        ACM
+        '''<remarks/>
+        ACS
+        '''<remarks/>
+        ADC
+        '''<remarks/>
+        ADE
+        '''<remarks/>
+        ADJ
+        '''<remarks/>
+        ADK
+        '''<remarks/>
+        ADL
+        '''<remarks/>
+        ADM
+        '''<remarks/>
+        ADN
+        '''<remarks/>
+        ADO
+        '''<remarks/>
+        ADP
+        '''<remarks/>
+        ADQ
+        '''<remarks/>
+        ADR
+        '''<remarks/>
+        ADT
+        '''<remarks/>
+        ADW
+        '''<remarks/>
+        ADY
+        '''<remarks/>
+        ADZ
+        '''<remarks/>
+        AEA
+        '''<remarks/>
+        AEB
+        '''<remarks/>
+        AEC
+        '''<remarks/>
+        AED
+        '''<remarks/>
+        AEF
+        '''<remarks/>
+        AEH
+        '''<remarks/>
+        AEI
+        '''<remarks/>
+        AEJ
+        '''<remarks/>
+        AEK
+        '''<remarks/>
+        AEL
+        '''<remarks/>
+        AEM
+        '''<remarks/>
+        AEN
+        '''<remarks/>
+        AEO
+        '''<remarks/>
+        AEP
+        '''<remarks/>
+        AES
+        '''<remarks/>
+        AET
+        '''<remarks/>
+        AEU
+        '''<remarks/>
+        AEV
+        '''<remarks/>
+        AEW
+        '''<remarks/>
+        AEX
+        '''<remarks/>
+        AEY
+        '''<remarks/>
+        AEZ
+        '''<remarks/>
+        AJ
+        '''<remarks/>
+        AU
+        '''<remarks/>
+        CA
+        '''<remarks/>
+        CAB
+        '''<remarks/>
+        CAD
+        '''<remarks/>
+        CAE
+        '''<remarks/>
+        CAF
+        '''<remarks/>
+        CAI
+        '''<remarks/>
+        CAJ
+        '''<remarks/>
+        CAK
+        '''<remarks/>
+        CAL
+        '''<remarks/>
+        CAM
+        '''<remarks/>
+        CAN
+        '''<remarks/>
+        CAO
+        '''<remarks/>
+        CAP
+        '''<remarks/>
+        CAQ
+        '''<remarks/>
+        CAR
+        '''<remarks/>
+        CAS
+        '''<remarks/>
+        CAT
+        '''<remarks/>
+        CAU
+        '''<remarks/>
+        CAV
+        '''<remarks/>
+        CAW
+        '''<remarks/>
+        CAX
+        '''<remarks/>
+        CAY
+        '''<remarks/>
+        CAZ
+        '''<remarks/>
+        CD
+        '''<remarks/>
+        CG
+        '''<remarks/>
+        CS
+        '''<remarks/>
+        CT
+        '''<remarks/>
+        DAB
+        '''<remarks/>
+        DAC
+        '''<remarks/>
+        DAD
+        '''<remarks/>
+        DAF
+        '''<remarks/>
+        DAG
+        '''<remarks/>
+        DAH
+        '''<remarks/>
+        DAI
+        '''<remarks/>
+        DAJ
+        '''<remarks/>
+        DAK
+        '''<remarks/>
+        DAL
+        '''<remarks/>
+        DAM
+        '''<remarks/>
+        DAN
+        '''<remarks/>
+        DAO
+        '''<remarks/>
+        DAP
+        '''<remarks/>
+        DAQ
+        '''<remarks/>
+        DL
+        '''<remarks/>
+        EG
+        '''<remarks/>
+        EP
+        '''<remarks/>
+        ER
+        '''<remarks/>
+        FAA
+        '''<remarks/>
+        FAB
+        '''<remarks/>
+        FAC
+        '''<remarks/>
+        FC
+        '''<remarks/>
+        FH
+        '''<remarks/>
+        FI
+        '''<remarks/>
+        GAA
+        '''<remarks/>
+        HAA
+        '''<remarks/>
+        HD
+        '''<remarks/>
+        HH
+        '''<remarks/>
+        IAA
+        '''<remarks/>
+        IAB
+        '''<remarks/>
+        ID
+        '''<remarks/>
+        [IF]
+        '''<remarks/>
+        IR
+        '''<remarks/>
+        [Is]
+        '''<remarks/>
+        KO
+        '''<remarks/>
+        L1
+        '''<remarks/>
+        LA
+        '''<remarks/>
+        LAA
+        '''<remarks/>
+        LAB
+        '''<remarks/>
+        LF
+        '''<remarks/>
+        MAE
+        '''<remarks/>
+        MI
+        '''<remarks/>
+        ML
+        '''<remarks/>
+        NAA
+        '''<remarks/>
+        OA
+        '''<remarks/>
+        PA
+        '''<remarks/>
+        PAA
+        '''<remarks/>
+        PC
+        '''<remarks/>
+        PL
+        '''<remarks/>
+        PRV
+        '''<remarks/>
+        RAB
+        '''<remarks/>
+        RAC
+        '''<remarks/>
+        RAD
+        '''<remarks/>
+        RAF
+        '''<remarks/>
+        RE
+        '''<remarks/>
+        RF
+        '''<remarks/>
+        RH
+        '''<remarks/>
+        RV
+        '''<remarks/>
+        SA
+        '''<remarks/>
+        SAA
+        '''<remarks/>
+        SAD
+        '''<remarks/>
+        SAE
+        '''<remarks/>
+        SAI
+        '''<remarks/>
+        SG
+        '''<remarks/>
+        SH
+        '''<remarks/>
+        SM
+        '''<remarks/>
+        SU
+        '''<remarks/>
+        TAB
+        '''<remarks/>
+        TAC
+        '''<remarks/>
+        TT
+        '''<remarks/>
+        TV
+        '''<remarks/>
+        V1
+        '''<remarks/>
+        V2
+        '''<remarks/>
+        WH
+        '''<remarks/>
+        XAA
+        '''<remarks/>
+        YY
         '''<remarks/>
         ZZZ
     End Enum
 
+
     '''<remarks/>
     <System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0"),  _
      System.SerializableAttribute(),  _

Interfaces/ZUGFeRDInterface/XmlItemProperty.vb

@@ -22,7 +22,14 @@
     ''' 0 = Default / Text
     ''' 1 = Datum
     ''' 2 = Gleitkomma
-    ''' 3 = Memo-Feld
+    ''' 3 = Attachment-Felder
+    ''' 4 = Elemente einer Liste, vgl Currency
     ''' </summary>
     Public ItemType As Integer
+
+    ''' <summary>
+    ''' BT-Feld-Bezeichnung
+    ''' </summary>
+    Public EN16931_ID As String
+
 End Class

Interfaces/app.config

@@ -6,6 +6,42 @@
         <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>

Interfaces/packages.config

@@ -1,7 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GdPicture" version="14.2.90" targetFramework="net462" />
+  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.2.90" targetFramework="net462" />
+  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
+  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
+  <package id="GdPicture" version="14.3.3" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
+  <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
+  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
+  <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
+  <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
+  <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
+  <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
+  <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
+  <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
+  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
+  <package id="System.Management" version="8.0.0" targetFramework="net462" />
+  <package id="System.Memory" version="4.6.0" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
+  <package id="System.Text.Json" version="8.0.6" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>

Jobs/App.config

@@ -5,10 +5,48 @@
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+	  <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.9.0" newVersion="14.3.9.0" />
       <dependentAssembly>
         <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

Jobs/Jobs.vbproj

@@ -67,18 +67,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Base\Base.vbproj">
-      <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
-      <Name>Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Config\Config.vbproj">
-      <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
-      <Name>Config</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Database\Database.vbproj">
-      <Project>{eaf0ea75-5fa7-485d-89c7-b2d843b03a96}</Project>
-      <Name>Database</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Interfaces\Interfaces.vbproj">
       <Project>{ab6f09bf-e794-4f6a-94bb-c97c0ba84d64}</Project>
       <Name>Interfaces</Name>
@@ -122,38 +110,186 @@
     <Compile Include="ZUGFeRD\XRechnungViewDocument.vb" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Base">
+      <HintPath>..\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Config">
+      <HintPath>..\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Database">
+      <HintPath>..\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
       <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
     </Reference>
-    <Reference Include="GdPicture.NET.14, Version=14.2.90.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+    <Reference Include="GdPicture.NET.14, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Common, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Document, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Email, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="NativeSDK.Settings, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.dll</HintPath>
+    </Reference>
+    <Reference Include="NativeSDK.Settings.Edition, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.Edition.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
+    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
+      <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
+    </Reference>
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=8.0.0.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.6\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.XML.Linq" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.19\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.19\build\net462\GdPicture.runtimes.windows.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets'))" />
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.19\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.19\build\net462\GdPicture.runtimes.windows.targets'))" />
   </Target>
 </Project>

Jobs/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Modules.Jobs")>
 <Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("2.8.1.0")>
+<Assembly: AssemblyTrademark("3.0.3.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 ' übernehmen, indem Sie "*" eingeben:
 
-<Assembly: AssemblyVersion("2.8.1.0")>
+<Assembly: AssemblyVersion("3.5.0.0")>
-<Assembly: AssemblyFileVersion("2.8.1.0")>
+<Assembly: AssemblyFileVersion("3.5.0.0")>

Jobs/ZUGFeRD/FileFunctions.vb

@@ -80,7 +80,6 @@ Namespace ZUGFeRD
             For Each oFile In pAttachmentFiles
                 Try
                     Dim oFilePath = _filesystem.GetVersionedFilename(Path.Combine(oAttachmentDirectory, oFile.Name))
-
                     _filesystem.MoveTo(oFile.FullName, oFilePath, oAttachmentDirectory)
                     _logger.Info("Attachment moved to {0}", oFilePath)
                 Catch ex As Exception
@@ -98,11 +97,22 @@ Namespace ZUGFeRD
                     If Not File.Exists(oAttachmentDirectory) Then
                         Directory.CreateDirectory(oAttachmentDirectory)
                     End If
-
+                    System.IO.File.WriteAllBytes(oFilePath, oResult.FileContents)
-                    Using oWriter As New FileStream(oFilePath, FileMode.Create)
+                    If CheckBytes(oFilePath, oResult.FileContents) = True Then
-                        oWriter.Write(oResult.FileContents, 0, oResult.FileContents.Length)
+                        If FileOpenwithError(oFilePath) Then
                             _logger.Info("Embedded Attachment moved to {0}", oFilePath)
-                    End Using
+                        Else
+                            _logger.Info("File is corrupt. Deleting the created file ...")
+                            File.Delete(oFilePath)
+                        End If
+                    Else
+                        _logger.Info("File is corrupt (CheckBytes). Deleting the created file ...")
+                        File.Delete(oFilePath)
+                    End If
+                    'Using oWriter As New FileStream(oFilePath, FileMode.Create)
+                    '    oWriter.Write(oResult.FileContents, 0, oResult.FileContents.Length)
+
+                    'End Using
                 Catch ex As Exception
                     _logger.Warn("Could not save embedded attachment {0}", oResult.FileName)
                     _logger.Error(ex)
@@ -111,7 +121,15 @@ Namespace ZUGFeRD
 
             _logger.Info("Finished moving files")
         End Sub
+        Private Function CheckBytes(oFilePath As String, oFileContents As IEnumerable(Of Byte)) As Boolean
+            Dim savedBytes() As Byte = System.IO.File.ReadAllBytes(oFilePath)
 
+            If savedBytes.SequenceEqual(oFileContents) Then
+                Return True
+            Else
+                Return False
+            End If
+        End Function
         Public Function MoveAndRenameEmailToRejected(pArgs As WorkerArgs, pMessageId As String) As EmailData
             _logger.Info("Moving Mail with MessageId [{0}] to Rejected folder", pMessageId)
             _logger.Debug("Fetching Email Data")
@@ -177,7 +195,19 @@ Namespace ZUGFeRD
 
             Return oEmailData
         End Function
-
+        Private Function FileOpenwithError(pFilePath As String) As Boolean
+            Try
+                Using fs As FileStream = File.Open(pFilePath, FileMode.Open, FileAccess.Read, FileShare.None)
+                    Return True ' Datei kann geöffnet werden
+                End Using
+            Catch ex As IOException
+                _logger.Info("file [{0}] could not be opened! Error IOException: [{1}]", pFilePath, ex.Message)
+                Return False ' Datei ist gesperrt oder existiert nicht
+            Catch ex As Exception
+                _logger.Info("file [{0}] could not be opened! Error: [{1}]", pFilePath, ex.Message)
+                Return False ' Andere Fehler
+            End Try
+        End Function
         Public Function GetEmailPathWithSubjectAsName(RejectedEmailDirectory As String, UncleanedSubject As String) As String
             Dim oCleanSubject = String.Join("", UncleanedSubject.Split(Path.GetInvalidPathChars()))
             Dim oAttachmentDirectory = RejectedEmailDirectory

Jobs/ZUGFeRD/HashFunctions.vb

@@ -33,11 +33,6 @@ Public Class HashFunctions
         End If
 
         ' Check if Checksum exists in History Table
-        'Dim oCheckCommand = $"SELECT * FROM TBEDM_ZUGFERD_HISTORY_IN WHERE GUID = (SELECT MAX(GUID) FROM TBEDM_ZUGFERD_HISTORY_IN WHERE UPPER(MD5HASH) = UPPER('{oMD5CheckSum}'))"
-        'Dim oTable As DataTable = _firebird.GetDatatable(oCheckCommand, Firebird.TransactionMode.NoTransaction)
-
-        ' Check if Checksum exists in History Table
-        ' TODO: WHAT THE FUCK IS THIS
         Dim oCheckCommand = $"SELECT * FROM TBEMLP_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBEMLP_HISTORY WHERE UPPER(MD5HASH) = UPPER('{oMD5CheckSum}'))"
         Dim oTable As DataTable = Database.GetDatatable(oCheckCommand, MSSQLServer.TransactionMode.NoTransaction)
 

Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb

@@ -8,8 +8,10 @@ Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Interfaces
 Imports DigitalData.Modules.Interfaces.Exceptions
+Imports DigitalData.Modules.Interfaces.PropertyValues
 Imports DigitalData.Modules.Jobs.Exceptions
 Imports DigitalData.Modules.Logging
+Imports GdPicture14
 
 Public Class ImportZUGFeRDFiles
     Implements IJob
@@ -26,10 +28,35 @@ Public Class ImportZUGFeRDFiles
 
     Private Const DIRECTORY_DONT_MOVE = "DIRECTORY_DONT_MOVE"
 
+    Private Const MIME_TYPE_PDF = "application/pdf"
+    Private Const MIME_TYPE_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+    Private Const MIME_TYPE_ODT = "application/vnd.oasis.opendocument.spreadsheet"
+
     ' List of allowed extensions for PDF/A Attachments
     ' This list should not contain xml so the zugferd xml file will be filtered out
     Private ReadOnly AllowedExtensions As New List(Of String) From {"docx", "doc", "pdf", "xls", "xlsx", "ppt", "pptx", "txt"}
 
+    ' List of the Columns we need to store embedded files on disk and database
+    Private ReadOnly EmbeddedFilesColumnNames As List(Of String) = New List(Of String) From {
+            "ATTACHMENT_FILE_FILENAME", "ATTACHMENT_FILE_VALUE", "ATTACHMENT_FILE_MIMECODE"
+        }
+
+    ' List of the allowed MIME-Codes 
+    ' Allowed Values are:
+    '- application/pdf
+    '- application/vnd.openxmlformats-officedocument.spreadsheetml.sheet (xlsx)
+    '- application/vnd.oasis.opendocument.spreadsheet (odt)
+    '- image/jpeg
+    '- image/png  
+    '- image/tiff (UBL)
+    '- text/csv  
+    '- text/xml (UBL)
+    Private ReadOnly AllowedMimeTypesInEmbeddedFiles As List(Of String) = New List(Of String) From {
+            MIME_TYPE_PDF,
+            MIME_TYPE_XLSX,
+            MIME_TYPE_ODT
+        }
+
     Private ReadOnly _logger As Logger
     Private ReadOnly _logConfig As LogConfig
     Private ReadOnly _filesystem As FilesystemEx
@@ -93,7 +120,7 @@ Public Class ImportZUGFeRDFiles
         _zugferd = New ZUGFeRDInterface(_logConfig, _gdpictureLicenseKey, New ZUGFeRDInterface.ZugferdOptions() With {
             .AllowFacturX_Filename = oArgs.AllowFacturX,
             .AllowXRechnung_Filename = oArgs.AllowXRechnung,
-            .AllowPeppol_3017_Schema = oArgs.AllowPeppolBISBill3x
+            .AllowPeppol_3_x_Schema = oArgs.AllowPeppolBISBill3x
         })
 
         _logger.Debug("Starting Job {0}", [GetType].Name)
@@ -131,7 +158,7 @@ Public Class ImportZUGFeRDFiles
             ' Group files by messageId
             Dim oGrouped As Dictionary(Of String, List(Of FileInfo)) = _zugferd.FileGroup.GroupFiles(oFiles)
 
-            _logger.Info("Found {0} file groups", oGrouped.Count)
+            _logger.Info("Found [{0}] file groups", oGrouped.Count)
 
             'Process each file group together
             'oGrouped equals one e-invoice
@@ -139,8 +166,6 @@ Public Class ImportZUGFeRDFiles
                 ' Start a new transaction for each file group.
                 ' This way we can rollback database changes for the whole filegroup in case something goes wrong.
                 Dim oSQLConnection As SqlConnection = _mssql.GetConnection()
-
-
                 Dim oSQLTransaction As SqlTransaction = oSQLConnection?.BeginTransaction()
 
                 Dim oConnections As New DatabaseConnections() With {
@@ -193,7 +218,7 @@ Public Class ImportZUGFeRDFiles
                         End If
 
                         If oResult.ZugferdFileFound = True Then
-                            _logger.Debug("Zugferd File found")
+                            _logger.Debug("eInvoice File found")
                             oMD5CheckSum = oResult.MD5Checksum
                             oZUGFeRDCount = oResult.ZugferdFileCount
                             oEmailAttachmentFiles.AddRange(oResult.EmailAttachmentFiles)
@@ -310,7 +335,7 @@ Public Class ImportZUGFeRDFiles
                     Dim oBody = String.Format(EmailStrings.EMAIL_TOO_MUCH_FERDS, oEmailData.Subject)
 
                     _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "TooMuchFerdsException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.TooMuchFerdsException, "", "")
-                    AddRejectedState(oMessageId, oRejectionCodeString, "Email enthielt mehr als ein ZUGFeRD-Dokument", "", oSQLTransaction)
+                    AddRejectedState(oMessageId, oRejectionCodeString, "Email enthielt mehr als ein eInvoice-Dokument", "", oSQLTransaction)
 
                 Catch ex As NoFerdsException
                     _logger.Error(ex)
@@ -323,7 +348,7 @@ Public Class ImportZUGFeRDFiles
                     Dim oBody = String.Format(EmailStrings.EMAIL_NO_FERDS, oEmailData.Subject)
 
                     _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "NoFerdsException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.NoFerdsException, "", "")
-                    AddRejectedState(oMessageId, oRejectionCodeString, "Email enthielt keine ZUGFeRD-Dokumente", "", oSQLTransaction)
+                    AddRejectedState(oMessageId, oRejectionCodeString, "Email enthielt keine eInvoice-Dokumente", "", oSQLTransaction)
 
                 Catch ex As MissingValueException
                     _logger.Error(ex)
@@ -342,7 +367,7 @@ Public Class ImportZUGFeRDFiles
                     Dim oEmailData = _file.MoveAndRenameEmailToRejected(oArgs, oMessageId)
 
                     _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "MissingValueException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.MissingValueException, oOrgFilename, oMissingFieldList)
-                    AddRejectedState(oMessageId, oRejectionCodeString, "Es fehlten ZugferdSpezifikationen", "", oSQLTransaction)
+                    AddRejectedState(oMessageId, oRejectionCodeString, "Es fehlten eInvoice-Spezifikationen", "", oSQLTransaction)
 
                 Catch ex As FileSizeLimitReachedException
                     _logger.Error(ex)
@@ -375,7 +400,7 @@ Public Class ImportZUGFeRDFiles
                     Dim oBody = _email.CreateBodyForUnhandledException(oMessageId, ex)
                     Dim oEmailData As New EmailData With {
                         .From = oArgs.ExceptionEmailAddress,
-                        .Subject = $"OutOfMemoryException im ZUGFeRD-Parser @ {oMessageId}"
+                        .Subject = $"OutOfMemoryException im eInvoice-Parser @ {oMessageId}"
                     }
                     _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "OutOfMemoryException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)
 
@@ -398,7 +423,7 @@ Public Class ImportZUGFeRDFiles
                         Dim oBody = _email.CreateBodyForUnhandledException(oMessageId, ex)
                         Dim oEmailData As New EmailData With {
                             .From = oArgs.ExceptionEmailAddress,
-                            .Subject = $"UnhandledException im ZUGFeRD-Parser @ {oMessageId}"
+                            .Subject = $"UnhandledException im eInvoice-Parser @ {oMessageId}"
                         }
                         _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "UnhandledException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)
 
@@ -414,7 +439,8 @@ Public Class ImportZUGFeRDFiles
                         If oMoveDirectory = DIRECTORY_DONT_MOVE Then
                             _logger.Info("Application Error occurred. Files for message Id {0} will not be moved.", oMessageId)
 
-                        ElseIf oArgs.AllowXRechnung And oIsSuccess And oEInvoiceFileGroup.Item(0).Extension = ".xml" Then
+                        ElseIf oArgs.AllowXRechnung And oIsSuccess And
+                            oEInvoiceFileGroup.Item(0).Extension.Equals(".xml", StringComparison.OrdinalIgnoreCase) = True Then
                             _logger.Debug("Before Creating the PDF-File from XML data / Before Commit")
 
                             oxRechnungHandle = True
@@ -454,7 +480,7 @@ Public Class ImportZUGFeRDFiles
                         Dim oBody = _email.CreateBodyForUnhandledException(oMessageId, ex)
                         Dim oEmailData As New EmailData With {
                             .From = oArgs.ExceptionEmailAddress,
-                            .Subject = $"FileMoveException im ZUGFeRD-Parser @ {oMessageId}"
+                            .Subject = $"FileMoveException im eInvoice-Parser @ {oMessageId}"
                         }
                         _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "FileMoveException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)
 
@@ -533,36 +559,46 @@ Public Class ImportZUGFeRDFiles
 
         Try
             oDocument = _zugferd.GetSerializedXMLContentFromFile(pFile)
+            oDocument.ReceiptFileType = ZUGFeRDInterface.RECEIPT_TYPE_XML
 
         Catch ex As ValidationException
             Throw ex
 
         Catch ex As ZUGFeRDExecption
-            Select Case ex.ErrorType
+
-                Case ZUGFeRDInterface.ErrorType.NoZugferd
+            If ex.ErrorCode > 0 Then
-                    _logger.Info("File [{0}] is not a valid ZUGFeRD document. Skipping.", pFile.Name)
+                _logger.Info("New Rejection Logik")
+
+                Select Case ex.ErrorCode
+                    Case ErrorCode.NoFerdsException
+                        _logger.Info("File [{0}] is not a valid eInvoice document. Skipping.", pFile.Name)
 
                         oResult.EmailAttachmentFiles.Add(pFile)
                         Return oResult
 
-                Case ZUGFeRDInterface.ErrorType.UnsupportedFormat
+                    Case ErrorCode.UnsupportedFerdException
-                    _logger.Info("File [{0}/{1}] is an unsupported ZUFeRD document format!", pFile.Name, ex.XmlFile)
+                        _logger.Info("File [{0}/{1}] is an unsupported eInvoice document format!", pFile.Name, ex.XmlFile)
                         Throw New UnsupportedFerdException(ex.XmlFile)
 
-                Case ZUGFeRDInterface.ErrorType.NoValidZugferd
+                    Case ErrorCode.InvalidFerdException
-                    _logger.Info("File [{0}] is an Incorrectly formatted ZUGFeRD document!", pFile.Name)
+                        _logger.Info("File [{0}] is an incorrectly formatted eInvoice document!", pFile.Name)
                         Throw New InvalidFerdException()
 
                     Case Else
-                    _logger.Warn("Unexpected Error occurred while extracting ZUGFeRD Information from file {0}", pFile.Name)
+                        _logger.Warn("Unexpected Error occurred while extracting eInvoice Information from file {0}", pFile.Name)
                         Throw ex
-            End Select
 
+                End Select
+            End If
         End Try
 
         Try
-            oDocument.ReceiptFileType = ZUGFeRDInterface.RECEIPT_TYPE_XML
+            Dim sqlResult As Boolean = False
-            Dim sqlResult As Boolean = StoreXMLItemsInDatabase(pMessageId, oDocument, pFile, pConnections, pArgs)
+
+            If oDocument IsNot Nothing Then
+                sqlResult = StoreXMLItemsInDatabase(pMessageId, oDocument, pFile, pConnections, pArgs, oResult)
+            End If
+
         Catch ex As Exception
             Throw ex
         End Try
@@ -605,30 +641,37 @@ Public Class ImportZUGFeRDFiles
 
         Try
             oDocument = _zugferd.ExtractZUGFeRDFileWithGDPicture(pFile.FullName)
+            oDocument.ReceiptFileType = ZUGFeRDInterface.RECEIPT_TYPE_PDF
 
         Catch ex As ValidationException
             Throw ex
 
         Catch ex As ZUGFeRDExecption
-            Select Case ex.ErrorType
+            If ex.ErrorCode > 0 Then
-                Case ZUGFeRDInterface.ErrorType.NoZugferd
+                _logger.Info("New Rejection Logik")
-                    _logger.Info("File [{0}] is not a valid ZUGFeRD document. Skipping.", pFile.Name)
+
+                Select Case ex.ErrorCode
+                    Case ErrorCode.NoFerdsException
+                        _logger.Info("File [{0}] is not a valid eInvoice document. Skipping.", pFile.Name)
 
                         oResult.EmailAttachmentFiles.Add(pFile)
                         Return oResult
 
-                Case ZUGFeRDInterface.ErrorType.UnsupportedFormat
+                    Case ErrorCode.UnsupportedFerdException
-                    _logger.Info("File [{0}/{1}] is an unsupported ZUFeRD document format!", pFile.Name, ex.XmlFile)
+                        _logger.Info("File [{0}/{1}] is an unsupported eInvoice document format!", pFile.Name, ex.XmlFile)
                         Throw New UnsupportedFerdException(ex.XmlFile)
 
-                Case ZUGFeRDInterface.ErrorType.NoValidZugferd
+                    Case ErrorCode.InvalidFerdException
-                    _logger.Info("File [{0}] is an Incorrectly formatted ZUGFeRD document!", pFile.Name)
+                        _logger.Info("File [{0}] is an incorrectly formatted eInvoice document!", pFile.Name)
                         Throw New InvalidFerdException()
 
                     Case Else
-                    _logger.Warn("Unexpected Error occurred while extracting ZUGFeRD Information from file {0}", pFile.Name)
+                        _logger.Warn("Unexpected Error occurred while extracting eInvoice Information from file {0}", pFile.Name)
                         Throw ex
+
                 End Select
+            End If
+
         End Try
 
         ' Check if there are more than one ZUGFeRD files
@@ -651,8 +694,7 @@ Public Class ImportZUGFeRDFiles
         End If
 
         Try
-            oDocument.ReceiptFileType = ZUGFeRDInterface.RECEIPT_TYPE_PDF
+            Dim sqlResult As Boolean = StoreXMLItemsInDatabase(pMessageId, oDocument, pFile, pConnections, pArgs, oResult)
-            Dim sqlResult As Boolean = StoreXMLItemsInDatabase(pMessageId, oDocument, pFile, pConnections, pArgs)
         Catch ex As Exception
             Throw ex
         End Try
@@ -669,12 +711,12 @@ Public Class ImportZUGFeRDFiles
 
     End Function
 
-    Private Function StoreXMLItemsInDatabase(pMessageId As String, pDocument As ZUGFeRDInterface.ZugferdResult, pFile As FileInfo, pConnections As DatabaseConnections, pArgs As WorkerArgs) As Boolean
+    Private Function StoreXMLItemsInDatabase(pMessageId As String, pDocument As ZUGFeRDInterface.ZugferdResult, pFile As FileInfo, pConnections As DatabaseConnections, pArgs As WorkerArgs, pProcessFileResult As ProcessFileResult) As Boolean
         ' Check the document against the configured property map and return:
         ' - a List of valid properties 
         ' - a List of missing properties
 
-        Dim oPropertyMap = _zugferd.FilterPropertyMap(pArgs.PropertyMap, pDocument.Specification)
+        Dim oPropertyMap As Dictionary(Of String, XmlItemProperty) = _zugferd.FilterPropertyMap(pArgs.PropertyMapList, pDocument.Specification)
         Dim oCheckResult = _zugferd.PropertyValues.CheckPropertyValues(pDocument.SchemaObject, oPropertyMap, pMessageId)
 
         _logger.Info("Properties checked: [{0}] missing properties / [{1}] valid properties found.", oCheckResult.MissingProperties.Count, oCheckResult.ValidProperties.Count)
@@ -686,12 +728,374 @@ Public Class ImportZUGFeRDFiles
             _logger.Debug("No missing properties found. Continuing.")
         End If
 
+        ' Daten in die Datenbank speichern
+        If BulkInsertDataToDatabase(pMessageId, pDocument, pConnections, oCheckResult) = False Then
+            _logger.Error("Bulk Insert for MessageId [{0}] failed!", pMessageId)
+            Throw New Exception("Bulk Insert failed! Exiting.")
+        End If
+
+        ' Eingebettete Dateien speichern
+        If HandleEmbeddedAttachments(pMessageId, pDocument, pConnections, oCheckResult, pArgs, pProcessFileResult) = False Then
+            _logger.Debug("Files saving for MessageId [{0}] failed!", pMessageId)
+        End If
+
+        Return True
+    End Function
+
+    ''' <summary>
+    ''' Hier werden die Dateianhänge behandelt, die im XML als base64 eingetragen wurden.
+    ''' Die zusammengehörigen Knoten müssen über "FILES" gruppiert werden!
+    ''' 
+    ''' Die erwarteten Knoten-Namen sind in der List EmbeddedFilesColumnNames enthalten!
+    ''' </summary>
+    Private Function HandleEmbeddedAttachments(pMessageId As String, pDocument As ZUGFeRDInterface.ZugferdResult, pConnections As DatabaseConnections,
+                                               pCheckResult As CheckPropertyValuesResult, pArgs As WorkerArgs, pProcessFileResult As ProcessFileResult) As Boolean
+
+        If (pCheckResult Is Nothing) Then
+            _logger.Debug("pCheckResult is empty!")
+            Return True
+        End If
+
+        If (CheckEmbeddedAttachmentEntries(pCheckResult) = False) Then
+            _logger.Debug("No embedded Files in XML found!")
+            Return True
+        End If
+
+        Dim embAttachmentList As List(Of ValidProperty) = pCheckResult.ValidProperties.Where(
+            Function(z)
+                Return EmbeddedFilesColumnNames.Contains(z.TableColumn)
+            End Function
+            ).ToList()
+
+        If embAttachmentList Is Nothing OrElse embAttachmentList.Count <= 0 Then
+            _logger.Debug("No Fields for Embedded Files configured!")
+            Return True
+        End If
+
+        ' GroupCounter Werte in Hashset eintragen, um distinct Werte zu erhalten
+        Dim oIndexList As HashSet(Of Integer) = New HashSet(Of Integer)
+        For Each resultItem In embAttachmentList
+            oIndexList.Add(resultItem.GroupCounter)
+        Next
+
+        Dim oOutputPath As String = GetOutputPathForEmbeddedAttachments(pArgs)
+        Dim nextAttachmentIndex As Integer = 0
+        nextAttachmentIndex = GetNextAttachmentIndex(pMessageId)
+        If nextAttachmentIndex <= 0 Then
+            nextAttachmentIndex = 1
+        End If
+
+        For Each groupIndex In oIndexList
+
+            Dim oMimeCodeString As String = String.Empty
+            Dim oOrgFilename As String = String.Empty
+            Dim oBase64String As String = String.Empty
+
+            Dim oMimeTypeProperty As ValidProperty = GetIndexProperty(embAttachmentList, groupIndex, "ATTACHMENT_FILE_MIMECODE")
+
+            If oMimeTypeProperty IsNot Nothing AndAlso oMimeTypeProperty.Value.IsNotNullOrEmpty() Then
+                oMimeCodeString = oMimeTypeProperty.Value.ToLower()
+            Else
+                _logger.Debug("Empty MIME-Code! File can not be stored!")
+                Continue For
+            End If
+
+            Dim oFilenameProperty As ValidProperty = GetIndexProperty(embAttachmentList, groupIndex, "ATTACHMENT_FILE_FILENAME")
+            If oFilenameProperty IsNot Nothing AndAlso oFilenameProperty.Value.IsNotNullOrEmpty() Then
+                oOrgFilename = oFilenameProperty.Value
+            Else
+                _logger.Debug("Empty Filename! File can not be stored!")
+                Continue For
+            End If
+
+            Dim oBase64ValueProperty As ValidProperty = GetIndexProperty(embAttachmentList, groupIndex, "ATTACHMENT_FILE_VALUE")
+            If oBase64ValueProperty IsNot Nothing AndAlso oBase64ValueProperty.Value.IsNotNullOrEmpty() Then
+                oBase64String = oBase64ValueProperty.Value
+            Else
+                _logger.Error("Empty base64 String! File can not be stored!")
+                Continue For
+            End If
+
+            Dim newAttachmentFilename = pMessageId + "~attm" + nextAttachmentIndex.ToString
+
+            Dim oFileExtension = GetEmbeddedFileExtension(oMimeTypeProperty.Value)
+            If oFileExtension.IsNotNullOrEmpty() Then
+                newAttachmentFilename += "." + oFileExtension
+            Else
+                _logger.Warn("No extension found! File can not be stored!")
+                Continue For
+            End If
+
+            Dim embeddedFilePath = Path.Combine(oOutputPath, newAttachmentFilename)
+            _logger.Debug("Next Attachment File is [{0}]", embeddedFilePath)
+            If SaveBase64ToDisk(embeddedFilePath, oBase64String) = True Then
+                _logger.Debug("Saved file [{0}] to disk", embeddedFilePath)
+                pProcessFileResult.EmailAttachmentFiles.Add(New FileInfo(embeddedFilePath))
+            Else
+                _logger.Error("Could not save File to Disk!")
+                Dim oReasonString = "Could not save file " + newAttachmentFilename + " to disk."
+                AddRejectedState(pMessageId, oReasonString, "EMBEDDED FILE CONSISTENCY NOT OK", "Info GUI", pConnections.SQLServerTransaction)
+                Continue For
+            End If
+
+            If TestFileOnDisk(embeddedFilePath, oMimeCodeString) = False Then
+                _logger.Error("Could not save File to Disk!")
+                Dim oReasonString = "Validation of file " + newAttachmentFilename + " on disk was NOT succesfully."
+                AddRejectedState(pMessageId, oReasonString, "EMBEDDED FILE CONSISTENCY NOT OK", "Info GUI", pConnections.SQLServerTransaction)
+                Continue For
+            End If
+
+            If InsertAttachmentHistoryEntry(pMessageId, oOrgFilename, embeddedFilePath) = False Then
+                _logger.Error("Could not save attachment Data to DB!")
+                Return False
+            End If
+
+            If InsertEmbeddedFileDataToDB(pMessageId, oBase64String, oOrgFilename, oMimeCodeString, groupIndex) = False Then
+                _logger.Error("Could not save attachment Data to DB!")
+                Return False
+            End If
+
+            nextAttachmentIndex += 1
+        Next
+
+        Return True
+    End Function
+
+    Private Function TestFileOnDisk(pEmbeddedFilePath As String, pMimeCodeString As String) As Boolean
+        Try
+            If pMimeCodeString = MIME_TYPE_PDF Then
+                Dim oGdPicturePDF As New GdPicturePDF
+                Dim oStatus As GdPictureStatus = oGdPicturePDF.LoadFromFile(pEmbeddedFilePath, True)
+                If oStatus <> GdPictureStatus.OK Then
+                    _logger.Error("File [{0}] has no proper state!", pEmbeddedFilePath)
+                    Return False
+                End If
+
+            Else
+                ' Test other files
+                Dim fileInfo As FileInfo = New FileInfo(pEmbeddedFilePath)
+                If fileInfo.Exists = False Then
+                    _logger.Error("Could not find File [{0}] on Disk!", pEmbeddedFilePath)
+                    Return False
+                End If
+            End If
+
+            Return True
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return False
+        End Try
+    End Function
+
+    Private Function GetEmbeddedFileExtension(pMimeTypeValue As String) As String
+
+        If pMimeTypeValue.IsNullOrEmpty() Then
+            _logger.Warn("Empty MimeCode is not allowed!")
+            Return String.Empty
+        End If
+
+        Select Case pMimeTypeValue.ToLower()
+            Case MIME_TYPE_PDF
+                Return "pdf"
+            Case MIME_TYPE_XLSX
+                Return "xlsx"
+            Case MIME_TYPE_ODT
+                Return "odt"
+            Case "image/jpeg"
+                Return "jpg"
+            Case "image/png"
+                Return "png"
+            Case "image/tiff"
+                Return "tif"
+            Case "text/csv"
+                Return "csv"
+            Case "text/xml"
+                Return "xml"
+            Case Else
+                Return String.Empty
+        End Select
+
+    End Function
+
+    Private Shared Function GetIndexProperty(pListResult As List(Of ValidProperty), pGroupIndex As Integer, pTableColumn As String) As ValidProperty
+        Return pListResult.Where(
+        Function(z)
+            Return z.GroupCounter = pGroupIndex AndAlso z.TableColumn = pTableColumn
+        End Function
+        ).FirstOrDefault
+    End Function
+
+    ''' <summary>
+    ''' Speichert die Daten inkl. base64-String in die Datenbank
+    ''' </summary>
+    Private Function InsertEmbeddedFileDataToDB(pMessageId As String, pItemValue As String, pOrgFilename As String, pMimeType As String, pGroupIndex As Integer) As Boolean
+        Try
+            Dim oCommand = New SqlCommand(
+                "INSERT INTO TBEDMI_ITEM_FILES (
+                    REFERENCE_GUID,
+                    ITEM_VALUE,
+                    ORG_FILENAME,
+                    MIME_TYPE,
+                    GROUP_INDEX,
+                    CREATED_WHO
+                ) VALUES (
+                    @MESSAGE_ID,
+                    @ITEM_VALUE,
+                    @ORG_FILENAME,
+                    @MIME_TYPE,
+                    @GROUP_INDEX,
+                    @CREATED_WHO
+                )")
+
+            Dim fileBytes As Byte() = Convert.FromBase64String(pItemValue)
+
+            oCommand.Parameters.Add("MESSAGE_ID", SqlDbType.VarChar, 250).Value = pMessageId
+            oCommand.Parameters.Add("ITEM_VALUE", SqlDbType.VarBinary).Value = fileBytes
+            oCommand.Parameters.Add("ORG_FILENAME", SqlDbType.VarChar, 256).Value = pOrgFilename
+            oCommand.Parameters.Add("MIME_TYPE", SqlDbType.VarChar, 256).Value = pMimeType
+            oCommand.Parameters.Add("GROUP_INDEX", SqlDbType.Int).Value = pGroupIndex
+            oCommand.Parameters.Add("CREATED_WHO", SqlDbType.VarChar, 100).Value = "eInvoice Parser"
+
+            _mssql.ExecuteNonQuery(oCommand)
+
+            Return True
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return False
+        End Try
+
+    End Function
+
+    ''' <summary>
+    ''' Ermittelt den Ausgabepfad für die eingebetteten Anhänge
+    ''' </summary>
+    Private Function GetOutputPathForEmbeddedAttachments(pArgs As WorkerArgs) As String
+        Return pArgs.WatchDirectory
+    End Function
+
+    ''' <summary>
+    ''' Prüft, ob Embedded Attachments in den XML-Ergebnissen enthalten sind,
+    ''' in dem geprüft wird, ob bestimmte MIME-Codes vorhanden sind.
+    ''' </summary>
+    ''' <param name="pCheckResult"></param>
+    ''' <returns></returns>
+    Private Function CheckEmbeddedAttachmentEntries(pCheckResult As CheckPropertyValuesResult) As Boolean
+
+        Try
+            Dim resultList = pCheckResult.ValidProperties.Where(
+            Function(z)
+                Return (z.TableColumn = "ATTACHMENT_FILE_MIMECODE" AndAlso AllowedMimeTypesInEmbeddedFiles.Contains(z.Value.ToLower()))
+            End Function
+            ).ToList()
+
+            If resultList.Count > 0 Then
+                _logger.Info("Found [{0}] embedded XML-Attachments.", resultList.Count)
+                Return True
+            Else
+                _logger.Info("No embedded XML-Attachments found.")
+                Return False
+            End If
+        Catch ex As Exception
+            _logger.Error("Error searching pCheckResult! {0}", ex.Message)
+            Return False
+        End Try
+
+    End Function
+
+
+    ''' <summary>
+    ''' Speichere base64 als Datei auf der Platte ab.
+    ''' </summary>
+    Private Function SaveBase64ToDisk(pExportFilePath As String, pBase64String As String) As Boolean
+
+        Try
+            Dim oFilename As String = pExportFilePath
+            Dim base64BinaryDataString As String = pBase64String
+            Dim binaryDataString As Byte() = Convert.FromBase64String(base64BinaryDataString)
+
+            ' Using verwenden, um blockieren der Datei zu verhindern
+            Using fs = New FileStream(oFilename, FileMode.Create, FileAccess.ReadWrite)
+                fs.Write(binaryDataString, 0, binaryDataString.Length)
+                fs.Flush()
+                fs.Close()
+            End Using
+
+            Return True
+
+        Catch ex As Exception
+            _logger.Error("Could NOT save File [{0}] to Disk! Exception: [{1}]", pExportFilePath, ex.Message)
+            Return False
+        End Try
+
+    End Function
+
+    ''' <summary>
+    ''' Die Methode lädt die bisherigen Dateinamen zu einer MessageID
+    ''' Die Datei mit dem höchsten Index gibt den folgenden Index vor.
+    ''' </summary>
+    ''' <returns>Nächster Attachment Index</returns>
+    Private Function GetNextAttachmentIndex(pMessageId As String) As Integer
+        Try
+            Dim oSQL = $"SELECT count(*) FROM TBEMLP_HISTORY_ATTACHMENT WHERE EMAIL_MSGID = '{pMessageId}'"
+
+            Dim sqlResult = _mssql.GetScalarValue(oSQL)
+            If sqlResult = 0 Then
+                sqlResult = 1 ' Kleinster Index = 1
+            End If
+
+            Return sqlResult
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
+    ''' <summary>
+    ''' Speichert die Infos zu einem embedded Dateianhang in die DB.
+    ''' Mangels EMail-Daten werden die EMail-Felder (FROM, BODY, usw.) nicht gefüllt
+    ''' </summary>
+    ''' <returns>true, wenn erfolgreich</returns>
+    Private Function InsertAttachmentHistoryEntry(pMessageId As String, pFileName As String, pNewFileName As String) As Boolean
+
+        Try
+            Dim oCommand = New SqlCommand(
+                "INSERT INTO TBEMLP_HISTORY_ATTACHMENT (
+                    WORK_PROCESS,
+                    EMAIL_MSGID,
+                    EMAIL_ATTMT,
+                    EMAIL_ATTMT_INDEX,
+                    EMAIL_FROM,
+                    EMAIL_BODY
+                ) VALUES (
+                    @WORK_PROCESS,
+                    @MESSAGE_ID,
+                    @ATTACHMENT,
+                    @ATTACHMENT_INDEX,
+                    '-',
+                    '-'
+                )")
+
+            oCommand.Parameters.Add("WORK_PROCESS", SqlDbType.VarChar, 100).Value = "Attachment Sniffer (Embedded Files)"
+            oCommand.Parameters.Add("MESSAGE_ID", SqlDbType.VarChar, 500).Value = pMessageId
+            oCommand.Parameters.Add("ATTACHMENT", SqlDbType.VarChar, 500).Value = pFileName
+            oCommand.Parameters.Add("ATTACHMENT_INDEX", SqlDbType.VarChar, 500).Value = pNewFileName
+
+            _mssql.ExecuteNonQuery(oCommand)
+
+            Return True
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return False
+        End Try
+    End Function
+
+    Private Function BulkInsertDataToDatabase(pMessageId As String, pDocument As ZUGFeRDInterface.ZugferdResult, pConnections As DatabaseConnections, pCheckResults As CheckPropertyValuesResult) As Boolean
         If DeleteExistingPropertyValues(pMessageId, pConnections) = False Then
             Throw New Exception("Could not cleanup data. Exiting.")
         End If
 
         ' DataTable vorbereiten
-        Dim oDataTable As DataTable = FillDataTable(pMessageId, oCheckResult, pDocument)
+        Dim oDataTable As DataTable = FillDataTable(pMessageId, pCheckResults, pDocument)
 
         ' ColumnList initialisieren
         Dim oColumnNames As List(Of String) = New List(Of String) From {
@@ -714,6 +1118,7 @@ Public Class ImportZUGFeRDFiles
         Return True
     End Function
 
+
     Private Function FillDataTable(pMessageId As String, pCheckResult As PropertyValues.CheckPropertyValuesResult, pDocument As ZUGFeRDInterface.ZugferdResult) As DataTable
 
         Dim oDataTable As DataTable = New DataTable()
@@ -727,7 +1132,7 @@ Public Class ImportZUGFeRDFiles
         ' Erste Zeile enthält die Spezifikation
         Dim oFirstRow As DataRow = oDataTable.NewRow()
         oFirstRow("REFERENCE_GUID") = pMessageId
-        oFirstRow("ITEM_DESCRIPTION") = "ZUGFeRDSpezifikation"
+        oFirstRow("ITEM_DESCRIPTION") = "Verwendete Spezifikation der E-Rechnung"
         oFirstRow("ITEM_VALUE") = pDocument.Specification
         oFirstRow("GROUP_COUNTER") = 0
         oFirstRow("SPEC_NAME") = "ZUGFERD_SPECIFICATION"
@@ -739,7 +1144,7 @@ Public Class ImportZUGFeRDFiles
         ' Zweite Zeile enthält das verwendete XML Schema
         Dim oSecondRow As DataRow = oDataTable.NewRow()
         oSecondRow("REFERENCE_GUID") = pMessageId
-        oSecondRow("ITEM_DESCRIPTION") = "ZUGFeRDXMLSchema"
+        oSecondRow("ITEM_DESCRIPTION") = "Verwendetes XML-Schema (XSD) der E-Rechnung"
         oSecondRow("ITEM_VALUE") = pDocument.UsedXMLSchema
         oSecondRow("GROUP_COUNTER") = 0
         oSecondRow("SPEC_NAME") = "ZUGFERD_XML_SCHEMA"
@@ -751,7 +1156,7 @@ Public Class ImportZUGFeRDFiles
         ' Dritte Zeile enthält das verwendete Datei-Format des Belegs (PDF/XML)
         Dim oThirdRow As DataRow = oDataTable.NewRow()
         oThirdRow("REFERENCE_GUID") = pMessageId
-        oThirdRow("ITEM_DESCRIPTION") = "ReceiptFileType"
+        oThirdRow("ITEM_DESCRIPTION") = "Dateityp der E-Rechnung"
         oThirdRow("ITEM_VALUE") = pDocument.ReceiptFileType
         oThirdRow("GROUP_COUNTER") = 0
         oThirdRow("SPEC_NAME") = "RECEIPT_FILE_TYPE"
@@ -762,6 +1167,17 @@ Public Class ImportZUGFeRDFiles
 
         For Each oProperty In pCheckResult.ValidProperties
 
+            ' ItemType = 3 => eingebettete Datei, nicht den base64 speichern
+            If oProperty.ItemType = 3 Then
+                Continue For
+            End If
+
+            ' ItemType = 0 (normale texte) dürfen nicht leer sein
+            If oProperty.ItemType = 0 And oProperty.Value.IsNullOrEmpty Then
+                _logger.Debug("No Mapping for Property [{0}] with empty value, because of ItemType = 0.", oProperty.TableColumn)
+                Continue For
+            End If
+
             ' If GroupCounter is -1, it means this is a default property that can only occur once.
             ' Set the actual inserted value to 0
             Dim oGroupCounterValue As Integer = oProperty.GroupCounter
@@ -769,19 +1185,27 @@ Public Class ImportZUGFeRDFiles
                 oGroupCounterValue = 0
             End If
 
-            If oProperty.Value.Length > 900 Then
+            If oProperty.Value.Length > 4000 Then
-                _logger.Warn("Value for field [{0}] is longer than 900 characters, will be truncated!", oProperty.TableColumn)
+                _logger.Warn("Value for field [{0}] is longer than 4000 characters, will be truncated!", oProperty.TableColumn)
+                oProperty.Value = oProperty.Value.Truncate(4000)
+            End If
+
+            Dim oDescription As String
+            If oProperty.EN16931_ID IsNot Nothing AndAlso oProperty.EN16931_ID.Length > 1 Then
+                oDescription = oProperty.EN16931_ID + " (" + oProperty.Description + ")"
+            Else
+                oDescription = oProperty.Description
             End If
 
             Dim oNewRow As DataRow = oDataTable.NewRow()
             oNewRow("REFERENCE_GUID") = pMessageId
-            oNewRow("ITEM_DESCRIPTION") = oProperty.Description
+            oNewRow("ITEM_DESCRIPTION") = oDescription
-            oNewRow("ITEM_VALUE") = oProperty.Value.Truncate(900).Replace("'", "''")
+            oNewRow("ITEM_VALUE") = oProperty.Value
             oNewRow("GROUP_COUNTER") = oGroupCounterValue
             oNewRow("SPEC_NAME") = oProperty.TableColumn
             oNewRow("IS_REQUIRED") = oProperty.IsRequired
 
-            _logger.Debug("Mapping Property [{0}] with value [{1}]", oProperty.TableColumn, oProperty.Value.Replace("'", "''"))
+            _logger.Debug("Mapping Property [{0}] with value [{1}]", oProperty.TableColumn, oProperty.Value)
             oDataTable.Rows.Add(oNewRow)
         Next
 
@@ -799,6 +1223,15 @@ Public Class ImportZUGFeRDFiles
             _logger.Warn("Step [{0}] with SQL [{1}] was not successful.", oStep, oDelSQL)
         End Try
 
+        Try
+            oDelSQL = $"DELETE FROM TBEDMI_ITEM_FILES where REFERENCE_GUID = '{pMessageId}'"
+            oStep = "TBEDMI_ITEM_FILES Delete MessageID Items"
+            Dim retValue As Boolean = _mssql.ExecuteNonQueryWithConnectionObject(oDelSQL, pConnections.SQLServerConnection, MSSQLServer.TransactionMode.ExternalTransaction, pConnections.SQLServerTransaction)
+            Return retValue
+        Catch ex As Exception
+            _logger.Warn("Step [{0}] with SQL [{1}] was not successful.", oStep, oDelSQL)
+        End Try
+
         Return False
     End Function
 
@@ -822,6 +1255,10 @@ Public Class ImportZUGFeRDFiles
         Return True
     End Function
 
+    ''' <summary>
+    ''' Fügt neue Datensätze in Tabelle TBEMLP_HISTORY_STATE ein,
+    ''' per Prozedur DD_ECM.[dbo].[PRCUST_ADD_HISTORY_STATE]
+    ''' </summary>
     Private Sub AddRejectedState(pMessageID As String, pTitle As String, pTitle1 As String, pComment As String, pTransaction As SqlTransaction)
         Try
             'PRCUST_ADD_HISTORY_STATE: @MessageID VARCHAR(250), @TITLE1 VARCHAR(250), @TITLE2 VARCHAR(250)
@@ -831,4 +1268,5 @@ Public Class ImportZUGFeRDFiles
             _logger.Error(ex)
         End Try
     End Sub
+
 End Class

Jobs/ZUGFeRD/WorkerArgs.vb

@@ -12,7 +12,7 @@ Public Class WorkerArgs
     Public NonZugferdDirectory As String = Nothing
 
     ' Property Parameter
-    Public PropertyMap As New Dictionary(Of String, XmlItemProperty)
+    Public PropertyMapList As New List(Of XmlItemProperty)
 
     ' Email Parameter
     Public EmailOutProfileId As Integer = 0
@@ -31,6 +31,7 @@ Public Class WorkerArgs
     Public AllowXRechnung As Boolean = True
     Public AllowZugferd10 As Boolean = True
     Public AllowZugferd2x As Boolean = True
+    Public AllowZugferd23x As Boolean = True
     Public AllowPeppolBISBill3x As Boolean = False
 
 End Class

Jobs/ZUGFeRD/XRechnungViewDocument.vb

@@ -5,6 +5,10 @@ Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports GdPicture14
+Imports System.Drawing
+Imports System.Linq
+Imports System.Text.RegularExpressions
+'11.11.2025
 
 Public Class XRechnungViewDocument
     Private ReadOnly _logger As Logger
@@ -15,8 +19,6 @@ Public Class XRechnungViewDocument
     Private fontResName As String
     Private fontResNameBold As String
     Private fontResNameItalic As String
-    Private MyGDPicturePDF As GdPicturePDF
-
     Public Sub New(LogConfig As LogConfig, MSSQL As MSSQLServer, GDPictureLicenseKey As String)
         _logConfig = LogConfig
         _logger = LogConfig.GetLogger()
@@ -24,39 +26,54 @@ Public Class XRechnungViewDocument
         _file = New ZUGFeRD.FileFunctions(LogConfig, MSSQL)
         _gdpictureLicenseKey = GDPictureLicenseKey
     End Sub
-    Public Function Create_PDFfromXML(oxmlFile As FileInfo, pDTItemValues As DataTable) As FileInfo
+    Public Function Create_PDFfromXML(pXmlFile As FileInfo, pDTItemValues As DataTable) As FileInfo
 
         _logger.Debug("Create_PDFfromXML() Start")
 
         Try
-            Dim oXRechnungFile = oxmlFile.FullName
+            Dim LicenseManager = New LicenseManager()
+            LicenseManager.RegisterKEY(_gdpictureLicenseKey)
+            Dim oXRechnungFile = pXmlFile.FullName
             Dim oNewFileinfo As FileInfo
-            Dim oxmlFilePath = oxmlFile.FullName
+            Dim oXmlFilePath = pXmlFile.FullName
-            Dim oViewRecieptFilename = oxmlFile.Name
+            Dim oViewRecieptFilename = pXmlFile.Name
-            Dim oTempFilePath = Path.GetDirectoryName(oxmlFilePath) + "\Temp"
+            Dim oTempFilePath = Path.Combine(Path.GetDirectoryName(oXmlFilePath), "temp")
             If Not Directory.Exists(oTempFilePath) Then
                 Directory.CreateDirectory(oTempFilePath)
             End If
 
-            oTempFilePath = oTempFilePath + "\xrechnung.xml"
+            oTempFilePath = Path.Combine(oTempFilePath, "xrechnung.xml")
             If File.Exists(oTempFilePath) Then
                 File.Delete(oTempFilePath)
             End If
-            File.Move(oxmlFilePath, oTempFilePath)
-            oxmlFile = New FileInfo(oTempFilePath)
-            oViewRecieptFilename = oViewRecieptFilename.Replace("xml", "pdf")
-            Dim oOutputPath = Path.GetDirectoryName(oxmlFilePath) + "\" + oViewRecieptFilename
-            If File.Exists(oOutputPath) Then
-                File.Delete(oOutputPath)
-            End If
 
-            MyGDPicturePDF = New GdPicturePDF()
+
-            MyGDPicturePDF.NewPDF(PdfConformance.PDF_A_2a)
+
-            Dim oPDFStatus As GdPictureStatus = MyGDPicturePDF.NewPDF()
+
+            pXmlFile = New FileInfo(oTempFilePath)
+
+            'oViewRecieptFilename = oViewRecieptFilename.Replace(".xml", ".pdf")
+            oViewRecieptFilename = Regex.Replace(oViewRecieptFilename, ".xml", ".pdf", RegexOptions.IgnoreCase)
+            Dim MyGDPicturePDF = New GdPicturePDF
+
+            Dim oPDFStatus As GdPictureStatus = MyGDPicturePDF.NewPDF(PdfConformance.PDF_A_3a)
+
             If oPDFStatus <> GdPictureStatus.OK Then
                 _logger.Warn($"Error initializing PDF: {oPDFStatus}")
                 Return Nothing
             End If
+
+            Dim oOutputPath = Path.Combine(Path.GetDirectoryName(oXmlFilePath), oViewRecieptFilename)
+            _logger.Debug("Create_PDFfromXML() Resulting PDF Filepath: [{0}]", oOutputPath)
+            If File.Exists(oOutputPath) Then
+                File.Delete(oOutputPath)
+            End If
+
+
+            Dim oCreatedString = $"Maschinell erstellt durch / Automatically created by Digital Data E-Rechnung Parser: {Now.ToString}"
+
+
+
             MyGDPicturePDF.SetOrigin(PdfOrigin.PdfOriginTopLeft)
             MyGDPicturePDF.SetMeasurementUnit(PdfMeasurementUnit.PdfMeasurementUnitMillimeter)
             MyGDPicturePDF.SetLineWidth(1)
@@ -68,17 +85,42 @@ Public Class XRechnungViewDocument
             'Create a New page
             MyGDPicturePDF.NewPage(PdfPageSizes.PdfPageSizeA4)
             ' Dim oCurrent As Integer = MyGDPicturePDF.GetCurrentPage()
+            'Den HEader erzeugen
+            Dim yPosition As Integer = 15
+            MyGDPicturePDF.SetTextSize(18)
+            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, "xRechnung Sichtbeleg - xInvoice Visual Receipt")
+            yPosition += 10
+            MyGDPicturePDF.SetTextSize(10)
+            MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_DE_Row1)
+            yPosition += 5
+            MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_DE_Row2)
+            yPosition += 5
+            MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_EN_Row1)
+            yPosition += 5
+            MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_EN_Row2)
+            'Den Footer erzeugen
+            MyGDPicturePDF.DrawLine(10, 280, 200, 280)
+
+            MyGDPicturePDF.DrawText(fontResName, 10, 285, oCreatedString)
 
-            Dim yPosition As Integer = Create_PageHeader(False)
-            Create_PageFooter()
 
             Dim oArea As String = ""
             Dim oIsPosition As Boolean = False
             Dim oPosCount = 0
             Dim oPosTerm As String = ""
+            Dim oPosDesc As String = ""
             Dim oCurrencySymbol = "€"
+            Dim oWidthLine = 200
             yPosition += 5
+
+            Dim font As New Font("Helvetica", 10)
+            Dim xRight As Integer = 100
             Dim oIndex As Integer = 0
+            Dim oYPlus As Integer = 0
+            Dim oCreateTextBox As Boolean = False
+            Dim oInvHasDiscount As Boolean = False
+            Dim oYDyn As Integer = 0
+            Dim Former_oItemSPECNAME As String = ""
             For Each oRow As DataRow In pDTItemValues.Rows
                 Dim Y_eq_lastrow As Boolean = CBool(oRow.Item("Y_eq_lastrow"))
                 Dim oRowCaption As String = oRow.Item("Row_Caption")
@@ -86,6 +128,10 @@ Public Class XRechnungViewDocument
                 Dim oItemValue As String = oRow.Item("ITEM_VALUE")
                 Dim oDisplay As Boolean = oRow.Item("Display")
                 Dim oAreaSwitch As Boolean = False
+                Dim oDescriptionFollowup As Boolean = False
+                If oItemSPECNAME = "RECEIPT_ALLOWANCE_REASON" Then
+                    Console.WriteLine("Uiuiu")
+                End If
                 If oRow.Item("Area") = "INTERNAL" Then
                     If oItemSPECNAME = "STATIC_Y_SWITCH" Then
                         yPosition = oItemValue
@@ -97,8 +143,23 @@ Public Class XRechnungViewDocument
                         _logger.Warn($"Could not create a second page. The error was: {oPDFStatus}")
                         Exit For
                     Else
-                        yPosition = Create_PageHeader(True)
+                        'Wieder einen Header und Footer erzeugen
-                        Create_PageFooter()
+                        yPosition = 15
+                        MyGDPicturePDF.SetTextSize(18)
+                        MyGDPicturePDF.DrawText(fontResName, 10, yPosition, "xRechnung Sichtbeleg - xInvoice Visual Receipt")
+                        yPosition += 10
+                        MyGDPicturePDF.SetTextSize(10)
+                        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_DE_Row1)
+                        yPosition += 5
+                        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_DE_Row2)
+                        yPosition += 5
+                        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_EN_Row1)
+                        yPosition += 5
+                        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_EN_Row2)
+
+                        MyGDPicturePDF.DrawLine(10, 280, 200, 280)
+                        'Footer erzeugen
+                        MyGDPicturePDF.DrawText(fontResName, 10, 285, oCreatedString)
                     End If
                     'oCurrent = MyGDPicturePDF.GetCurrentPage()
                 End If
@@ -113,6 +174,7 @@ Public Class XRechnungViewDocument
                 If oArea <> oRow.Item("Area") Then
                     '########## AREA WECHSEL ###########
                     oAreaSwitch = True
+                    oCreateTextBox = False
                     oArea = oRow.Item("Area")
                     _logger.Debug($"Area-Switch to: {oArea}")
                     Dim oAREACaption As String
@@ -125,13 +187,28 @@ Public Class XRechnungViewDocument
                     ElseIf oArea = "POSITION" Then
                         oAREACaption = "Positionen / Positions:"
                         oIsPosition = True
+                    ElseIf oArea = "ALLOWANCE" Then
+                        If oItemSPECNAME = "RECEIPT_ALLOWANCE_CHARGE_INDICATOR" Then
+                            If oItemValue = "False" Then
+                                oAREACaption = "Rabatt/Discount:"
+                                oInvHasDiscount = True
+                            Else
+                                oAREACaption = "Zuschlag/Surcharge:"
+                            End If
+                        Else
+                            oAREACaption = "Zu- oder Abschlag/Surcharge or Discount:"
+                        End If
+                        oIsPosition = True
                     ElseIf oArea = "AMOUNT" Then
                         oAREACaption = "Beträge / Amounts:"
+                        oCreateTextBox = True
                     ElseIf oArea = "TAXPOS" Then
                         oAREACaption = "Steuerbeträge / Tax amounts:"
                         oIsPosition = True
                     ElseIf oArea = "PAYMENT" Then
                         oAREACaption = "Zahlungsinformationen / Payment details:"
+                    ElseIf oArea = "EXEMPTION" Then
+                        oAREACaption = "UST.-Befreiungsgrund / Exemption reason:"
                     Else
                         oAREACaption = String.Empty
                     End If
@@ -139,17 +216,34 @@ Public Class XRechnungViewDocument
                     If Not oAREACaption = String.Empty Then
                         'erste Area-Linie 
                         yPosition += 5
-                        MyGDPicturePDF.DrawLine(10, yPosition, 125, yPosition)
+                        MyGDPicturePDF.DrawLine(10, yPosition, oWidthLine, yPosition)
                         'gdpicturePDF.DrawText(fontResName, 10, yPosition, XRechnungStrings.Seperator_Line)
                         yPosition += 5
                         'Area caption
                         MyGDPicturePDF.DrawText(fontResNameBold, 10, yPosition, oAREACaption)
-
                         yPosition += 5
                         If oArea = "TYPE" Then
-                            MyGDPicturePDF.DrawLine(10, yPosition, 125, yPosition)
+                            MyGDPicturePDF.DrawLine(10, yPosition, oWidthLine, yPosition)
                             ' gdpicturePDF.DrawText(fontResName, 10, yPosition, XRechnungStrings.Seperator_Line)
                             yPosition += 5
+                        ElseIf oArea = "POSITION" Then
+                            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, "Pos#")
+                            MyGDPicturePDF.DrawText(fontResName, 19, yPosition, "Anz./am.")
+                            MyGDPicturePDF.DrawText(fontResName, 35, yPosition, "Einh/Unit")
+                            MyGDPicturePDF.DrawText(fontResName, 50, yPosition, "Pos.Text")
+                            MyGDPicturePDF.DrawText(fontResName, 163, yPosition, "Steuer/Tax")
+                            MyGDPicturePDF.DrawText(fontResName, 181, yPosition, "Betrag/Sum")
+                        ElseIf oArea = "ALLOWANCE" Then
+                            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, "Pos#")
+                            ' MyGDPicturePDF.DrawText(fontResName, 20, yPosition, "Betrag/Amount")
+                            MyGDPicturePDF.DrawText(fontResName, 20, yPosition, "Grund/Reason")
+                            MyGDPicturePDF.DrawText(fontResName, 163, yPosition, "Steuer/Tax")
+                            MyGDPicturePDF.DrawText(fontResName, 163, yPosition, "Steuer/Tax")
+                            MyGDPicturePDF.DrawText(fontResName, 181, yPosition, "Betrag/Sum")
+                            yPosition += 5
+                            oPosCount = 0
+                        ElseIf oArea = "EXEMPTION" Then
+
                         End If
                     End If
                     If oArea = "TYPE" Then
@@ -162,10 +256,31 @@ Public Class XRechnungViewDocument
                         oIsPosition = True
                         If oItemSPECNAME = "INVOICE_POSITION_AMOUNT" Then
                             oPosCount += 1
-                            oPosTerm = $"{oPosCount}. {oItemValue} * "
+                            oYDyn = 0
-                            oItemValue = oPosTerm
+                            yPosition += 5
+                            oPosTerm = ""
+                            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, oPosCount)
+                            ' 
+                            'Dim otextBoxYPos As Integer = yPosition - 3.5
+                            'MyGDPicturePDF.DrawTextBox(fontResName, 10, otextBoxYPos, 16, YCoo_TextBoxPlus5(otextBoxYPos),
+                            '                           TextAlignment.TextAlignmentFar, TextAlignment.TextAlignmentNear,
+                            '                          oPosCount)
+                            MyGDPicturePDF.DrawText(fontResName, 19, yPosition, oItemValue)
+                            'Tabellendarstellung Ende
+                            oDisplay = False
+                            ' yPosition -= 5
+                        End If
+                    ElseIf oArea = "ALLOWANCE" Then
+                        oIsPosition = True
+                        Dim validNames As String() = {"POSITION_ALLOWANCE_ACTUAL_AMOUNT", "RECEIPT_ALLOWANCE_RECEIPT_ALLOWANCE_CHARGE_INDICATOR"}
+                        If validNames.Contains(oItemSPECNAME) Then
+                            oPosCount += 1
+                            oPosTerm = ""
+                            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, oPosCount)
+                            ' 
+                            Dim oCurrTerm = FormatCurrency(oItemValue, oCurrencySymbol)
+                            MyGDPicturePDF.DrawText(fontResName, 20, yPosition, oCurrTerm)
                             oDisplay = False
-                            yPosition -= 5
                         End If
                     ElseIf oArea = "TAXPOS" Then
                         oIsPosition = True
@@ -176,30 +291,122 @@ Public Class XRechnungViewDocument
                             oDisplay = False
                             yPosition -= 5
                         End If
+
                     End If
                 Else
                     'INDIVIDUELLES VERHALTEN BEI Folge-ITEMS
-                    _logger.Debug($"FollowItem: {oItemSPECNAME} - ItemValue: {oItemValue}")
+                    _logger.Debug($"FollowItem - Area: [{oArea}] - ItemSpecname: [{oItemSPECNAME}] - ItemValue: [{oItemValue}]")
-                    If oArea = "POSITION" Then
+                    'Dim otextBoxYPos As Integer
-                        If oItemSPECNAME = "INVOICE_POSITION_AMOUNT" Then
+                    If oArea = "POSITION" Or oArea = "ALLOWANCE" Then
+                        If oItemSPECNAME <> Former_oItemSPECNAME And Former_oItemSPECNAME <> "" Then
+                            If oItemSPECNAME = "INVOICE_POSITION_ARTICLE_DESCRIPTION" And Former_oItemSPECNAME = "INVOICE_POSITION_ARTICLE" Then
+                                oDescriptionFollowup = True
+                            Else
+                                Former_oItemSPECNAME = oItemSPECNAME
+                            End If
+                        Else
+                            Former_oItemSPECNAME = oItemSPECNAME
+                        End If
+                        If {"INVOICE_POSITION_AMOUNT", "POSITION_ALLOWANCE_ACTUAL_AMOUNT", "RECEIPT_ALLOWANCE_ACTUAL_AMOUNT"}.Contains(oItemSPECNAME) Then
                             oPosCount += 1
-                            oPosTerm = $"{oPosCount}. {oItemValue} * "
+                            If Not oDescriptionFollowup Then
+                                oYPlus = 0
+                                oYDyn = 0
+                            End If
+                            oPosTerm = ""
+                            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, oPosCount)
+                            If oItemSPECNAME = "INVOICE_POSITION_AMOUNT" Then
+                                MyGDPicturePDF.DrawText(fontResName, 19, yPosition, oItemValue)
+                            ElseIf {"POSITION_ALLOWANCE_ACTUAL_AMOUNT", "RECEIPT_ALLOWANCE_ACTUAL_AMOUNT"}.Contains(oItemSPECNAME) Then
+                                Dim oTerm = FormatCurrency(oItemValue, oCurrencySymbol)
+                                If oInvHasDiscount And oItemSPECNAME = "RECEIPT_ALLOWANCE_ACTUAL_AMOUNT" And Not oTerm.StartsWith("-") Then
+                                    oTerm = "-" + oTerm
+                                End If
+                                MyGDPicturePDF.DrawText(fontResName, 181, yPosition, oTerm)
+                            Else
+                                If oYDyn = 0 Then
+                                    oYDyn = yPosition
+                                End If
+                                Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue)
+                                For Each olinepart As String In oPartsNL
+                                    Dim oParts As List(Of String) = StringFunctions.SplitText_Length(olinepart, 64)
+                                    ' Durchlaufen der einzelnen Teile in einer Schleife
+                                    For Each part As String In oParts
+                                        MyGDPicturePDF.DrawText(fontResName, 19, oYDyn, part)
+                                        oYDyn += 5
+                                        oYPlus += 5
+                                    Next
+                                Next
+                            End If
+
                             oDisplay = False
-                        ElseIf oItemSPECNAME = "INVOICE_POSITION_ARTICLE" Then
+                        ElseIf oItemSPECNAME = "INVOICE_POSITION_UNIT_TYPE" Then
-                            oPosTerm += $" {oItemValue}"
+                            oYPlus = 0
+                            Dim oUnit = Return_UnitType(oItemValue)
+                            MyGDPicturePDF.DrawText(fontResName, 35, yPosition, oUnit)
                             oDisplay = False
-                        ElseIf oItemSPECNAME = "INVOICE_TAXPOS_TAX_RATE" Or oItemSPECNAME = "INVOICE_TAXPOS_RATE" Then
+                        ElseIf {"POSITION_ALLOWANCE_REASON", "RECEIPT_ALLOWANCE_REASON", "INVOICE_POSITION_ARTICLE", "INVOICE_POSITION_ARTICLE_DESCRIPTION"}.Contains(oItemSPECNAME) Then
-                            oPosTerm += $" - {oItemValue} %"
+                            'Tabellendarstellung
+                            If Not oDescriptionFollowup Then
+                                oYPlus = 0
+                            End If
+                            If oYDyn = 0 Then
+                                oYDyn = yPosition
+                            End If
+                            Dim oX = 50
+                            If oItemSPECNAME.Contains("ALLOWANCE") Then
+                                oX = 20
+                            End If
+                            oPosDesc = ""
+                            oPosDesc = oItemValue
+                            Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue)
+
+                            For Each olinepart As String In oPartsNL
+                                Dim oParts As List(Of String) = StringFunctions.SplitText_Length(olinepart, 64)
+                                ' Durchlaufen der einzelnen Teile in einer Schleife
+                                For Each part As String In oParts
+                                    MyGDPicturePDF.DrawText(fontResName, oX, oYDyn, part)
+                                    oYDyn += 5
+                                    oYPlus += 5
+                                Next
+                            Next
                             oDisplay = False
-                        ElseIf oItemSPECNAME = "INVOICE_POSITION_TAX_AMOUNT" Then
+                        ElseIf oItemSPECNAME = "INVOICE_POSITION_NOTE" Then
-                            oPosTerm += $" - {oItemValue} {oCurrencySymbol}"
+                            'Tabellendarstellung
+                            Dim cleanedText As String = RemoveNewlinesAndTabs(oItemValue)
+                            Dim oParts As List(Of String) = StringFunctions.SplitText_Length(cleanedText, 70)
+                            ' Durchlaufen der einzelnen Teile in einer Schleife
+                            If oYDyn = 0 Then
+                                oYDyn = yPosition
+                            End If
+                            Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue)
+                            For Each olinepart As String In oPartsNL
+                                Dim oPartsPN As List(Of String) = StringFunctions.SplitText_Length(olinepart, 70)
+                                ' Durchlaufen der einzelnen Teile in einer Schleife
+                                For Each part As String In oPartsPN
+                                    MyGDPicturePDF.DrawText(fontResName, 50, oYDyn, part)
+                                    oYDyn += 5
+                                    oYPlus += 5
+                                Next
+                            Next
+
+                            'oPosTerm += $" {oItemValue}"
+                            oDisplay = False
+                        ElseIf {"INVOICE_TAXPOS_TAX_RATE", "INVOICE_TAXPOS_RATE", "POSITION_ALLOWANCE_CALCULATION_PERCENT", "RECEIPT_ALLOWANCE_CALCULATION_PERCENT", "RECEIPT_ALLOWANCE_VAT_RATE"}.Contains(oItemSPECNAME) Then
+                            MyGDPicturePDF.DrawText(fontResName, 163, yPosition, $"{oItemValue} %")
+                            oDisplay = False
+                        ElseIf {"INVOICE_POSITION_TAX_AMOUNT"}.Contains(oItemSPECNAME) Then
+
+                            Dim oYPos = yPosition - 3.5
+                            Dim TAXTERM = FormatCurrency(oItemValue, oCurrencySymbol)
+                            MyGDPicturePDF.DrawTextBox(fontResName, 177, oYPos, 198, YCoo_TextBoxPlus5(oYPos),
+                                                       TextAlignment.TextAlignmentFar, TextAlignment.TextAlignmentNear,
+                                                      TAXTERM)
                         End If
                         oItemValue = oPosTerm
                     ElseIf oArea = "HEAD" Then
-                        If oItemSPECNAME = "INVOICE_DATE" Or oItemSPECNAME = "INVOICE_SERVICE_DATE" Then
+                        If {"INVOICE_DATE", "INVOICE_SERVICE_DATE"}.Contains(oItemSPECNAME) Then
-                            Dim oDateString As String = oItemValue
+                            oItemValue = StringFunctions.DatetimeStringToGermanStringConverter(oItemValue, _logger)
-                            Dim oParsedDate As DateTime = DateTime.ParseExact(oDateString, "yyyyMMdd", System.Globalization.CultureInfo.InvariantCulture)
-                            oItemValue = oParsedDate.ToString("dd.MM.yyyy")
                         End If
                     ElseIf oArea = "TAXPOS" Then
                         If oItemSPECNAME = "INVOICE_TAXPOS_RATE" Then
@@ -207,29 +414,41 @@ Public Class XRechnungViewDocument
                             oPosTerm = $"{oItemValue} %:"
                             oDisplay = False
                         ElseIf oItemSPECNAME = "INVOICE_TAXPOS_AMOUNT" Then
-                            oPosTerm += $" {oItemValue} {oCurrencySymbol}"
+                            oPosTerm += FormatCurrency(oItemValue, oCurrencySymbol)
                             oDisplay = False
                         ElseIf oItemSPECNAME = "INVOICE_TAXPOS_TYPE" Then
-                            oPosTerm += $" - {oItemValue}"
+                            oPosTerm += $" {oItemValue}"
+                        ElseIf oItemValue.Contains("EXEMPTION") Then
+                            _logger.Debug($"We got an Exemption: {oItemValue}")
                         End If
                         oItemValue = oPosTerm
                     End If
                 End If
 
-                If oDisplay = True Then
+                If oDisplay = True And Len(oItemValue) > 0 Then
                     If Y_eq_lastrow = False And oAreaSwitch = False Then
                         yPosition += 5
                     End If
-                    If oArea = "AMOUNT" Then
+                    If oArea = "AMOUNT" Or oArea = "ALLOWANCE" Then
-                        If oItemSPECNAME = "INVOICE_TOTAL_NET" Or oItemSPECNAME = "INVOICE_TOTAL_GROSS" Then
+
-                            oItemValue += $" {oCurrencySymbol}"
+                        Dim oCURRENCYFORMAT = {"INVOICE_TOTAL_TAX", "INVOICE_TOTAL_NET", "INVOICE_TOTAL_GROSS", "POSITION_ALLOWANCE_ACTUAL_AMOUNT", "RECEIPT_ALLOWANCE_ACTUAL_AMOUNT",
+                            "POSITION_ALLOWANCE_CALCULATION_PERCENT", "RECEIPT_ALLOWANCE_CALCULATION_PERCENT"}
+                        If oCURRENCYFORMAT.Contains(oItemSPECNAME) Then
+                            oItemValue = FormatCurrency(oItemValue, oCurrencySymbol)
                         End If
                     End If
-
-
                     If oRowCaption <> String.Empty Then
+                        'Zuerst die RowCaption
                         MyGDPicturePDF.DrawText(fontResName, 10, yPosition, oRowCaption)
+                        'Dann den Wert
+                        If oCreateTextBox Then
+                            Dim otextBoxYPos = yPosition - 3
+                            MyGDPicturePDF.DrawTextBox(fontResName, 70, otextBoxYPos, 90, YCoo_TextBoxPlus5(otextBoxYPos),
+                                                       TextAlignment.TextAlignmentFar, TextAlignment.TextAlignmentCenter,
+                                                       oItemValue)
+                        Else
                             MyGDPicturePDF.DrawText(fontResName, 70, yPosition, oItemValue)
+                        End If
                     Else
                         If Y_eq_lastrow = True Then
                             MyGDPicturePDF.DrawText(fontResName, oRow.Item("xPosition"), yPosition, oItemValue)
@@ -255,31 +474,46 @@ Public Class XRechnungViewDocument
                             End If
 
                         End If
+                    End If
+                Else
+                    If oItemSPECNAME = "INVOICE_POSITION_TAX_AMOUNT" And oYPlus > 0 Then
+                        yPosition += oYPlus
+                    Else
+
+
                     End If
                 End If
                 oIndex += 1
             Next
+            ' Dim oeinv_Format As PdfInvoiceDataFormat = PdfInvoiceDataFormat.ZUGFeRD_2_0
+            Dim oAttString = "E-invoice XML attachment"
+            If File.Exists(oXmlFilePath) Then
+                MyGDPicturePDF.EmbedFile(oXmlFilePath, oAttString)
+            Else
+                _logger.Info("XML File is not existing and could not be embedded!")
+                Return Nothing
+            End If
+
+            MyGDPicturePDF.EnableCompression(True)
 
-            Dim oeinv_Format As PdfInvoiceDataFormat = PdfInvoiceDataFormat.ZUGFeRD_2_0
-            MyGDPicturePDF.EmbedFile(oTempFilePath, "Rechnungsdaten im ZUGFeRD-XML-Format")
             'Finalize And save the PDF
             oPDFStatus = MyGDPicturePDF.SaveToFile(oOutputPath)
             If oPDFStatus = GdPictureStatus.OK Then
                 _logger.Info("PDF VisualReceipt generated successfully!")
+                _logger.Debug("Vor MOVE... oxmlFilePath: [{0}] / oTempFilePath: [{1}]", oXmlFilePath, oTempFilePath)
+                File.Move(oXmlFilePath, oTempFilePath)
             Else
                 _logger.Warn($"Error generating PDF VisualReceipt: {oPDFStatus}")
             End If
-
             'Release resources
             MyGDPicturePDF.CloseDocument()
             If oPDFStatus = GdPictureStatus.OK Then
-                File.Delete(oXRechnungFile)
+                ' File.Delete(oXRechnungFile)
                 oNewFileinfo = New FileInfo(oOutputPath)
-
+                _logger.Info("Create_PDFfromXML() End successfully. File [{0}] written.", oNewFileinfo.FullName)
-                _logger.Debug("Create_PDFfromXML() End successfully")
                 Return oNewFileinfo
             Else
-                _logger.Debug("Create_PDFfromXML() Ends with nothing")
+                _logger.Warn("Create_PDFfromXML() Ends with nothing")
                 Return Nothing
             End If
 
@@ -288,29 +522,85 @@ Public Class XRechnungViewDocument
             Return Nothing
         End Try
     End Function
+    'Private Function FormatCurrency(ByVal pValue As String, pCurrencySymbol As String) As String
+    '    pValue = pValue.Replace(".", ",")
+    '    Dim oBetrag As Decimal = pValue
+    '    Dim oFormatiert As String = oBetrag.ToString("N2", New Globalization.CultureInfo("de-DE"))
+    '    oFormatiert = $"{oFormatiert} {pCurrencySymbol}"
+    '    Return oFormatiert
+    'End Function
+    Private Function FormatCurrency(ByVal pValue As String, pCurrencySymbol As String) As String
+        pValue = pValue.Trim()
 
-    Public Function Create_PageHeader(pFollowPage As Boolean) As Integer
+        Dim oBetrag As Decimal
-        'Draw content on the PDF
+        Dim culture As Globalization.CultureInfo
-        Dim yPosition As Integer = 15
+
-        MyGDPicturePDF.SetTextSize(18)
+        ' Erkennung des Dezimaltrennzeichens
-        MyGDPicturePDF.DrawText(fontResName, 10, yPosition, "xRechnung Sichtbeleg - xInvoice Visual Receipt")
+        If pValue.Contains(",") AndAlso Not pValue.Contains(".") Then
-        yPosition += 10
+            culture = New Globalization.CultureInfo("de-DE") ' Komma → deutsches Format
-        MyGDPicturePDF.SetTextSize(10)
+        ElseIf pValue.Contains(".") AndAlso Not pValue.Contains(",") Then
-        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_DE_Row1)
+            culture = New Globalization.CultureInfo("en-US") ' Punkt → englisches Format
-        yPosition += 5
+        Else
-        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_DE_Row2)
+            ' Mischformat oder Tausendertrennzeichen → Fallback auf aktuelle Culture
-        yPosition += 5
+            culture = Globalization.CultureInfo.CurrentCulture
-        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_EN_Row1)
+        End If
-        yPosition += 5
+
-        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_EN_Row2)
+        ' Parsen mit gewählter Culture
-        Return yPosition
+        If Not Decimal.TryParse(pValue, Globalization.NumberStyles.Any, culture, oBetrag) Then
+            Throw New FormatException($"Ungültiger Zahlenwert: {pValue}")
+        End If
+
+        ' Formatieren mit deutscher Culture
+        Dim oFormatiert As String = oBetrag.ToString("N2", New Globalization.CultureInfo("de-DE"))
+        Return $"{oFormatiert} {pCurrencySymbol}"
     End Function
 
-    Public Sub Create_PageFooter()
+
-        MyGDPicturePDF.DrawLine(10, 280, 200, 280)
+    Private Function FormatStringT(ByVal text As String) As String
-        Dim oCreatedString = $"Maschinell erstellt durch / Automatically created by Digital Data E-Rechnung Parser: {Now.ToString}"
+        Return text.Replace(vbCr, " - ").Replace(vbLf, "").Replace(vbTab, " ")
-        MyGDPicturePDF.DrawText(fontResName, 10, 285, oCreatedString)
+    End Function
-    End Sub
+    Private Function RemoveNewlinesAndTabs(ByVal text As String) As String
+        Return text.Replace(vbCr, " - ").Replace(vbLf, "").Replace(vbTab, " ")
+    End Function
+    Private Function YCoo_TextBoxMinus5(yPosition As Integer)
+        Return yPosition - 5
+    End Function
+    Private Function YCoo_TextBoxPlus5(yPosition As Integer)
+        Return yPosition + 5
+    End Function
+
+
+    Function SplitTextByNewLine(text As String) As List(Of String)
+        If String.IsNullOrEmpty(text) Then
+            Return New List(Of String)()
+        End If
+
+        ' Zerlege den Text anhand von Zeilenumbrüchen
+        Dim lines As List(Of String) = text.Split({vbCrLf, vbLf, vbCr}, StringSplitOptions.None).ToList()
+        Return lines
+    End Function
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     Private Function Return_InvType(pType As String) As String
         Dim oReturn As String = "Rechnung/invoice"
@@ -332,4 +622,42 @@ Public Class XRechnungViewDocument
         Return oReturn
     End Function
 
+    Private Function Return_UnitType(pType As String) As String
+        Dim oReturn As String = "Stück/pc"
+        If pType = "C62" Then
+            oReturn = "Stück/pc"
+        ElseIf pType = "DAY" Then
+            oReturn = "Tag/day"
+        ElseIf pType = "HAR" Then
+            oReturn = "Hek/hec"
+        ElseIf pType = "HUR" Then
+            oReturn = "h"
+        ElseIf pType = "KGM" Then
+            oReturn = "kg"
+        ElseIf pType = "KTM" Then
+            oReturn = "km"
+        ElseIf pType = "KWH" Then
+            oReturn = pType
+        ElseIf pType = "LS" Then
+            oReturn = "pausch/flat"
+        ElseIf pType = "MIN" Then
+            oReturn = "minute"
+        ElseIf pType = "MTK" Then
+            oReturn = "QM/SM"
+        ElseIf pType = "Kubik/CM" Then
+            oReturn = "MTR"
+        ElseIf pType = "Meter" Then
+            oReturn = "minute"
+        ElseIf pType = "P1" Then
+            oReturn = "%"
+        ElseIf pType = "SET" Then
+            oReturn = "Set"
+        ElseIf pType = "TNE" Then
+            oReturn = "Tonne/ton"
+        ElseIf pType = "WEE" Then
+            oReturn = "Woche/week"
+        End If
+        Return oReturn
+    End Function
+
 End Class

Jobs/packages.config

@@ -1,8 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
+  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
+  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
   <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net461" />
-  <package id="GdPicture" version="14.2.90" targetFramework="net462" />
+  <package id="GdPicture" version="14.3.19" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.2.90" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.19" targetFramework="net462" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
+  <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
+  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
+  <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
+  <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
+  <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
+  <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
+  <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
+  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
+  <package id="System.Memory" version="4.6.0" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
+  <package id="System.Text.Json" version="8.0.6" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>

Logging/My Project/AssemblyInfo.vb

@@ -9,10 +9,10 @@ Imports System.Runtime.InteropServices
 ' Werte der Assemblyattribute überprüfen
 
 <Assembly: AssemblyTitle("Modules.Logging")>
-<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyDescription("Logging Modul from DigitalData.Modules for logging Application-Events. Supports Error, Information and Debug")>
-<Assembly: AssemblyCompany("Digital Data")>
+<Assembly: AssemblyCompany("Digital Data GmbH, Heuchelheim")>
 <Assembly: AssemblyProduct("Modules.Logging")>
-<Assembly: AssemblyCopyright("Copyright © 2024")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
 <Assembly: AssemblyTrademark("2.6.4.0")>
 
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.6.4.0")>
+<Assembly: AssemblyVersion("2.6.5.0")>
-<Assembly: AssemblyFileVersion("2.6.4.0")>
+<Assembly: AssemblyFileVersion("2.6.5.0")>

Messaging/Limilab.vb

@@ -43,6 +43,7 @@ Public Class Limilab
         Password = oPassword
         AuthType = oAuthType
         Initialized = True
+
     End Sub
     Public Function CloseImap() As Boolean
         Try
@@ -75,7 +76,6 @@ Public Class Limilab
     ''' <returns>True if connection and query were successful. False otherwise.</returns>
     Public Function IMAPTestLogin() As Boolean
         Logger.Debug("Starting IMAPTestLogin ...")
-
         If Initialized = False Then
             Return False
         End If

Messaging/Messaging.vbproj

@@ -44,6 +44,9 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
     <Reference Include="Mail">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -140,10 +143,6 @@
       <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
       <Name>Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="MailLicense.xml">

Messaging/My Project/AssemblyInfo.vb

@@ -8,12 +8,12 @@ Imports System.Runtime.InteropServices
 
 ' Werte der Assemblyattribute überprüfen
 
-<Assembly: AssemblyTitle("Messaging")>
+<Assembly: AssemblyTitle("Modules.Messaging")>
-<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyDescription("Funktionen rund um das Versenden und Empfangen von Emails")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyCompany("Digital Data GmbH, Heuchelheim")>
-<Assembly: AssemblyProduct("Messaging")>
+<Assembly: AssemblyProduct("Modules.Messaging")>
-<Assembly: AssemblyCopyright("Copyright © 2024")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("1.9.6.0")>
+<Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.9.7.0")>
+<Assembly: AssemblyVersion("1.9.8.0")>
-<Assembly: AssemblyFileVersion("1.9.7.0")>
+<Assembly: AssemblyFileVersion("1.9.8.0")>

Messaging/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net462" />
   <package id="Microsoft.Identity.Client" version="4.55.0" targetFramework="net462" />
   <package id="Microsoft.IdentityModel.Abstractions" version="6.22.0" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />

Modules.sln

@@ -35,6 +35,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Messaging", "Messaging\Mess
 EndProject
 Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Database.Test", "Database.Test\Database.Test.vbproj", "{91B4DFC0-543C-43A7-A9E0-6817DCA277EC}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Filesystem", "Filesystem\Filesystem.vbproj", "{991D0231-4623-496D-8BD0-9CA906029CBC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -105,6 +107,10 @@ Global
 		{91B4DFC0-543C-43A7-A9E0-6817DCA277EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{91B4DFC0-543C-43A7-A9E0-6817DCA277EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91B4DFC0-543C-43A7-A9E0-6817DCA277EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{991D0231-4623-496D-8BD0-9CA906029CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{991D0231-4623-496D-8BD0-9CA906029CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{991D0231-4623-496D-8BD0-9CA906029CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{991D0231-4623-496D-8BD0-9CA906029CBC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Patterns/Modules/Internal.vb

@@ -13,6 +13,11 @@ Namespace Modules
         Public Const INT_VALUE_DOMAIN = "DOMAIN"
         Public Const INT_VALUE_DATE = "DATE"
 
+        Public Const INT_VALUE_FILENAME_EXT = "FILENAME_EXT"
+        Public Const INT_VALUE_FILENAME = "FILENAME_ONLY"
+        Public Const INT_VALUE_FILE_DATE = "FILE_DATE"
+        Public Const INT_VALUE_FILEEXT = "FILE_EXT"
+
         Public Const INT_VALUE_DATE_YYYY = "YYYY"
         Public Const INT_VALUE_DATE_MM = "MM"
         Public Const INT_VALUE_DATE_DD = "DD"

Patterns/My Project/AssemblyInfo.vb

@@ -8,12 +8,12 @@ Imports System.Runtime.InteropServices
 
 ' Werte der Assemblyattribute überprüfen
 
-<Assembly: AssemblyTitle("Patterns")>
+<Assembly: AssemblyTitle("DigitalData.Patterns")>
-<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyDescription("Enthält die Digital Data Struktur von Patterns die zum Ersetzen innerhalb der DD Produkte dienen")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyCompany("Digital Data GmbH, Heuchelheim")>
-<Assembly: AssemblyProduct("Patterns")>
+<Assembly: AssemblyProduct("DigitalData.Patterns")>
-<Assembly: AssemblyCopyright("Copyright © 2022")>
+<Assembly: AssemblyCopyright("")>
-<Assembly: AssemblyTrademark("1.3.0.0")>
+<Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.3.0.0")>
+<Assembly: AssemblyVersion("1.3.1.0")>
-<Assembly: AssemblyFileVersion("1.3.0.0")>
+<Assembly: AssemblyFileVersion("1.3.1.0")>

Patterns/Patterns.vb

@@ -1,4 +1,5 @@
-Imports System.Text.RegularExpressions
+Imports System.IO
+Imports System.Text.RegularExpressions
 Imports System.Windows.Forms
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.ZooFlow
@@ -36,10 +37,21 @@ Public Class ClassPatterns
     Public Const INT_VALUE_DOMAIN = "DOMAIN"
     Public Const INT_VALUE_DATE = "DATE"
 
+    Public Const INT_VALUE_FILENAME_EXT = "FILENAME_EXT"
+    Public Const INT_VALUE_FILENAME = "FILENAME"
+    Public Const INT_VALUE_FILEEXT = "FILE_EXT"
+    Public Const INT_VALUE_FILE_DATE = "FILE_DATE"
+
+
     Public Const CLIPBOARD_VALUE_DE = "@Zwischenablage"
     Public Const CLIPBOARD_VALUE_EN = "@Clipboard"
 
+    Public Const PATTERN_WMDOCID = "{@WMDocID}"
+    Public Const PATTERN_IDBOBJID = "{@IDBObjID}"
+
+
     Public Const MAX_TRY_COUNT = 100
+    Public _handled_File As String = Nothing
 
     Public ReadOnly Property PatternRegex As Regex
         Get
@@ -51,7 +63,7 @@ Public Class ClassPatterns
     Private ReadOnly _LogConfig As LogConfig
 
     Private ReadOnly _Regex As Regex = New Regex("{#(\w+)#([\w\s_-]+)}+")
-    Private ReadOnly _AllPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_USER, PATTERN_INT}
+    Private ReadOnly _AllPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_USER, PATTERN_INT, PATTERN_WMDOCID, PATTERN_IDBOBJID}
     Private ReadOnly _ComplexPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL}
     Private ReadOnly _SimplePatterns As New List(Of String) From {PATTERN_USER, PATTERN_INT}
 
@@ -67,12 +79,13 @@ Public Class ClassPatterns
         _Logger = pLogConfig.GetLogger
     End Sub
 
-    Public Function ReplaceAllValues(pInput As String, pUser As State.UserState, pClipboardContents As String) As String
+    Public Function ReplaceAllValues(pInput As String, pUser As State.UserState, pClipboardContents As String, pObjectID As String) As String
         Try
             Dim result = pInput
 
             result = ReplaceClipboardContents(result, pClipboardContents)
             result = ReplaceInternalValues(result)
+            result = ReplaceObjectIDValues(result, pObjectID)
             result = ReplaceUserValues(result, pUser)
 
             Return result
@@ -95,6 +108,13 @@ Public Class ClassPatterns
 
         Return oResult
     End Function
+    Public Function ReplaceObjectIDValues(pInput As String, pObjectID As String) As String
+        Dim oResult = pInput
+
+        oResult = oResult.Replace(CLIPBOARD_VALUE_DE, pObjectID)
+
+        Return oResult
+    End Function
 
     Public Function ReplaceInternalValues(pInput As String) As String
         Try
@@ -120,6 +140,45 @@ Public Class ClassPatterns
                 oResult = ReplacePattern(oResult, PATTERN_INT, Now.ToShortDateString)
             End While
 
+            While ContainsPatternAndValue(oResult, PATTERN_INT, INT_VALUE_FILENAME_EXT)
+                If Not IsNothing(_handled_File) Then
+                    If File.Exists(_handled_File) Then
+                        Dim oFileName As String = Path.GetFileName(_handled_File)
+                        oResult = ReplacePattern(oResult, PATTERN_INT, oFileName)
+                    End If
+
+                End If
+
+            End While
+
+            While ContainsPatternAndValue(oResult, PATTERN_INT, INT_VALUE_FILENAME)
+                If Not IsNothing(_handled_File) Then
+                    If File.Exists(_handled_File) Then
+                        Dim oFileName As String = Path.GetFileNameWithoutExtension(_handled_File)
+                        oResult = ReplacePattern(oResult, PATTERN_INT, oFileName)
+                    End If
+                End If
+            End While
+            While ContainsPatternAndValue(oResult, PATTERN_INT, INT_VALUE_FILEEXT)
+                If Not IsNothing(_handled_File) Then
+                    If File.Exists(_handled_File) Then
+                        Dim oFileExt As String = Path.GetExtension(_handled_File).Substring(1)
+                        oResult = ReplacePattern(oResult, PATTERN_INT, oFileExt)
+                    End If
+                End If
+            End While
+            While ContainsPatternAndValue(oResult, PATTERN_INT, INT_VALUE_FILE_DATE)
+                If Not IsNothing(_handled_File) Then
+                    If File.Exists(_handled_File) Then
+                        Dim oCreationDate As DateTime = File.GetCreationTime(_handled_File)
+                        Dim oDateOnlyString As String = oCreationDate.ToString("yyyy-MM-dd")
+                        oResult = ReplacePattern(oResult, PATTERN_INT, oDateOnlyString)
+                    End If
+                End If
+            End While
+
+
+
             Return oResult
         Catch ex As Exception
             _Logger.Error(ex)

Patterns/Patterns.vbproj

@@ -53,6 +53,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
     <Reference Include="Interop.WINDREAMLib">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
@@ -142,10 +145,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
     <ProjectReference Include="..\ZooFlow\ZooFlow.vbproj">
       <Project>{81cac44f-3711-4c8f-ae98-e02a7448782a}</Project>
       <Name>ZooFlow</Name>

Patterns/packages.config

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
+  <package id="NuGet.CommandLine" version="6.13.2" targetFramework="net462" developmentDependency="true" />
 </packages>

Windows/My Project/AssemblyInfo.vb

@@ -8,12 +8,12 @@ Imports System.Runtime.InteropServices
 
 ' Werte der Assemblyattribute überprüfen
 
-<Assembly: AssemblyTitle("Windows")>
+<Assembly: AssemblyTitle("Modules.Windows")>
-<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyDescription("Stellt Funktionen für windows und Hotkeys bereit")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyCompany("Digital Data GmbH, Heuchelheim")>
-<Assembly: AssemblyProduct("Windows")>
+<Assembly: AssemblyProduct("Modules.Windows")>
-<Assembly: AssemblyCopyright("Copyright © 2022")>
+<Assembly: AssemblyCopyright("")>
-<Assembly: AssemblyTrademark("1.5.0.0")>
+<Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.5.0.0")>
+<Assembly: AssemblyVersion("1.5.1.0")>
-<Assembly: AssemblyFileVersion("1.5.0.0")>
+<Assembly: AssemblyFileVersion("1.5.1.0")>

Windows/Windows.vbproj

@@ -35,7 +35,7 @@
     <OptionExplicit>On</OptionExplicit>
   </PropertyGroup>
   <PropertyGroup>
-    <OptionCompare>Binary</OptionCompare>
+    <OptionCompare>Text</OptionCompare>
   </PropertyGroup>
   <PropertyGroup>
     <OptionStrict>Off</OptionStrict>
@@ -44,6 +44,9 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
@@ -138,10 +141,6 @@
       <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
       <Name>Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Logging\Logging.vbproj">
-      <Project>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <COMReference Include="Microsoft.Office.Core">

Windows/packages.config

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
+  <package id="NuGet.CommandLine" version="6.13.2" targetFramework="net462" developmentDependency="true" />
 </packages>

Windream/Constants.vb

@@ -40,6 +40,7 @@
     Public Const HISTORY_NEW_FROM_VERSION = "HISTORY_New_From_Version"
     Public Const HISTORY_USER_DEFINED = "HISTORY_User_Defined"
 
+
     ' Entity Types
     Public Const ENTITY_TYPE_OBJECTTYPE = 10
 
@@ -54,6 +55,7 @@
 
     ' Misc
     Public Const OBJECT_TYPE_DEFAULT = "Standard"
+    Public Const DELETE_ATTRIBUTE_VALUE = "DeleteWMAttributeValue"
 
     ' File Stream
     Public Const STREAM_BINARY_OBJECT = "BinaryObject"

Windream/Helpers.vb

@@ -16,63 +16,206 @@ Public Class Helpers
     }
 
     Friend Shared Function ConvertVectorType(pIndexType As Integer, pValue As String)
-        Dim myArray
+        Dim myArray()
         ReDim myArray(0)
         Select Case pIndexType
             Case INDEX_TYPE_HASH ' 36865
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return String.Empty
+                Else
                     'Umwandeln in String
                     myArray(0) = CStr(pValue)
-                Return myArray
+                End If
             Case INDEX_TYPE_VECTOR_STRING '4097
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return String.Empty
+                Else
                     'Umwandeln in String
                     myArray(0) = CStr(pValue)
-                Return myArray
+                End If
-            Case 8204 'auch INDEX_TYPE_VECTOR_STRING 
-                'Umwandeln in String
-                myArray(0) = CStr(pValue)
-                Return myArray
             Case INDEX_TYPE_VECTOR_INTEGER '4098
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
                     'Umwandeln in Integer
                     myArray(0) = CInt(pValue.Replace(" ", ""))
-                Return myArray
+                End If
             Case INDEX_TYPE_VECTOR_FLOAT  '4099
                 pValue = pValue.
                     Replace(" ", "").
                     Replace(".", ",")
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
                     'Umwandeln in Double
                     myArray(0) = CDbl(pValue)
-                Return myArray
+                End If
             Case INDEX_TYPE_VECTOR_BOOLEAN '4100
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
                     'Umwandeln in Boolean
                     myArray(0) = CBool(pValue)
-                Return myArray
+                End If
+
             Case INDEX_TYPE_VECTOR_DATE '4101
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
                     'Umwandeln in Date
                     myArray(0) = CDate(pValue)
-                Return myArray
+                End If
             Case INDEX_TYPE_VECTOR_INTEGER_64BIT '4107
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    'Umwandeln in Date
                     myArray(0) = Convert.ToInt64(pValue)
-                Return myArray
+                End If
             Case INDEX_TYPE_VECTOR_DATE_TIME '4103
-                'Umwandeln in Datum Uhrzeit
+                Return Convert.ToDateTime(pValue)
-                Return pValue
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    'Umwandeln in Date
+                    myArray(0) = Convert.ToDateTime(pValue)
+                End If
+
             Case 8204
+                pValue = pValue.Replace(" ", "")
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
                     'Umwandeln in Integer
                     myArray(0) = CInt(pValue.Replace(" ", ""))
-                Return myArray
+                End If
             Case Else
                 'Umwandeln in String
                 myArray(0) = CStr(pValue)
-                Return myArray
         End Select
+        Return myArray
     End Function
 
     Friend Shared Function ConvertIndexValue(Type As Integer, pValue As String) As Object
-        ' Leerzeichen an Anfang und Ende entfernen
+
+        pValue = pValue.Trim()
         If Type > 4095 Then
             Return ConvertVectorType(Type, pValue)
         End If
+
+
+        Select Case Type
+            Case INDEX_TYPE_HASH
+                Return pValue
+            Case INDEX_TYPE_STRING
+                ' Leerzeichen an Anfang und Ende entfernen
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return String.Empty
+                Else
+                    Return pValue
+                End If
+
+            Case INDEX_TYPE_VECTOR_STRING
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return String.Empty
+                Else
+                    Return pValue
+                End If
+            Case INDEX_TYPE_INTEGER
+                pValue = pValue.Replace(" ", String.Empty)
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    Return Convert.ToInt32(pValue)
+                End If
+            Case INDEX_TYPE_VECTOR_INTEGER
+                pValue = pValue.Replace(" ", String.Empty)
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    Return Convert.ToInt32(pValue)
+                End If
+            Case INDEX_TYPE_VECTOR_INTEGER_64BIT
+                pValue = pValue.Replace(" ", String.Empty)
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    Return Convert.ToInt64(pValue)
+                End If
+            Case INDEX_TYPE_VECTOR_BOOLEAN
+                Return Convert.ToBoolean(pValue)
+            Case INDEX_TYPE_BOOLEAN
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    Return Convert.ToBoolean(pValue)
+                End If
+
+            Case INDEX_TYPE_DATE
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    Return Convert.ToDateTime(pValue)
+                End If
+
+            Case INDEX_TYPE_DATE_TIME
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    Return Convert.ToDateTime(pValue)
+                End If
+            Case INDEX_TYPE_TIME
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    Return Convert.ToDateTime(pValue)
+                End If
+            Case INDEX_TYPE_VECTOR_DATE_TIME
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    Return Convert.ToDateTime(pValue)
+                End If
+            Case INDEX_TYPE_VECTOR_DATE
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    Return Convert.ToDateTime(pValue)
+                End If
+            Case INDEX_TYPE_FLOAT
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    Return Convert.ToDouble(pValue)
+                End If
+
+            Case INDEX_TYPE_VECTOR_FLOAT
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    Return Convert.ToDouble(pValue)
+                End If
+            Case INDEX_TYPE_CURRENCY
+                If pValue = DELETE_ATTRIBUTE_VALUE Then
+                    Return Nothing
+                Else
+                    'Wegen currency muß ein eigenes Objekt vom typ Variant erzeugt werden
+                    Dim aValueWrapper As System.Runtime.InteropServices.CurrencyWrapper = New System.Runtime.InteropServices.CurrencyWrapper(CDec(pValue))
+                    Return aValueWrapper
+                End If
+
+            Case Else
+                Return pValue
+        End Select
+    End Function
+
+    Friend Shared Function ConvertAttrValue(Type As Integer, pValue As String) As Object
+        ' Leerzeichen an Anfang und Ende entfernen
         pValue = pValue.Trim()
+        If Type > 4095 Then
+            Return ConvertVectorType1(Type, pValue)
+        End If
+
 
         Select Case Type
             Case INDEX_TYPE_HASH
@@ -116,7 +259,42 @@ Public Class Helpers
                 Return pValue
         End Select
     End Function
-
+    Friend Shared Function ConvertVectorType1(pIndexType As Integer, pValue As String)
+        Select Case pIndexType
+            Case INDEX_TYPE_HASH ' 36865
+                'Umwandeln in String
+                Return CStr(pValue)
+            Case INDEX_TYPE_VECTOR_STRING '4097
+                'Umwandeln in String
+                Return CStr(pValue)
+            Case INDEX_TYPE_VECTOR_INTEGER '4098
+                'Umwandeln in Integer
+                Return CInt(pValue.Replace(" ", ""))
+            Case INDEX_TYPE_VECTOR_FLOAT  '4099
+                pValue = pValue.
+                    Replace(" ", "").
+                    Replace(".", ",")
+                'Umwandeln in Double
+                Return CDbl(pValue)
+            Case INDEX_TYPE_VECTOR_BOOLEAN '4100
+                'Umwandeln in Boolean
+                Return CBool(pValue)
+            Case INDEX_TYPE_VECTOR_DATE '4101
+                'Umwandeln in Date
+                Return CDate(pValue)
+            Case INDEX_TYPE_VECTOR_INTEGER_64BIT '4107
+                Return Convert.ToInt64(pValue)
+            Case INDEX_TYPE_VECTOR_DATE_TIME '4103
+                'Umwandeln in Datum Uhrzeit
+                Return pValue
+            Case 8204
+                'Umwandeln in Integer
+                Return CInt(pValue.Replace(" ", ""))
+            Case Else
+                'Umwandeln in String
+                Return CStr(pValue)
+        End Select
+    End Function
     Friend Shared Function IsVectorIndex(indexType As Integer)
         Return VectorIndicies.Contains(indexType)
     End Function

Windream/My Project/AssemblyInfo.vb

@@ -9,11 +9,11 @@ Imports System.Runtime.InteropServices
 ' Werte der Assemblyattribute überprüfen
 
 <Assembly: AssemblyTitle("Modules.Windream")>
-<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyDescription("Stellt Funktionen und Module für die windream Funktionalität zur Verfügung")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyCompany("Digital Data GmbH. Heuchelheim")>
 <Assembly: AssemblyProduct("Modules.Windream")>
-<Assembly: AssemblyCopyright("Copyright © 2023")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("1.9.2.0")>
+<Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.9.5.1")>
+<Assembly: AssemblyVersion("1.9.7.0")>
-<Assembly: AssemblyFileVersion("1.9.5.1")>
+<Assembly: AssemblyFileVersion("1.9.7.0")>

Windream/Windream.vb

@@ -1,20 +1,17 @@
 Imports System.IO
 Imports System.IO.Path
 Imports System.Text.RegularExpressions
-
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
 Imports WINDREAMLib
 Imports WINDREAMLib.WMCOMEvent
 Imports WINDREAMLib.WMEntity
 Imports WINDREAMLib.WMObjectEditMode
+Imports WMCNNCTDLLLib
 Imports WMOBRWSLib
 Imports WMOSRCHLib
-Imports WMCNNCTDLLLib
 Imports WMOTOOLLib
 
-Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Language
-Imports DigitalData.Modules.Base
-
 ''' <module>Windream</module>
 ''' <version>0.0.0.2</version>
 ''' <date>23.10.2018</date>
@@ -787,7 +784,7 @@ Public Class Windream
             Return False
         End Try
 
-        _logger.Info($"File '{FilenameTarget}' has been streamde successfully!")
+        _logger.Info($"File '{FilenameTarget}' has been successfully streamed to windream!")
         Dim oDocid = GetIndexValue(FilenameTarget, "Dokument-ID")
         If Not IsNothing(oDocid) Then
             NewDocumentID = oDocid(0)
@@ -1223,7 +1220,7 @@ Public Class Windream
         End Try
     End Function
 
-    Public Function SetFileIndex(Path As String, IndexName As String, Value As String, ObjectType As String) As Boolean
+    Public Function SetFileIndex(Path As String, pIndexName As String, pStringValue As String, pObjectType As String) As Boolean
         If TestSessionLoggedIn() = False Then
             Return False
         End If
@@ -1241,15 +1238,15 @@ Public Class Windream
         End If
 
         If oWMObject.aObjectType.aName = Constants.OBJECT_TYPE_DEFAULT Then
-            oWMObject.aObjectType = GetObjectByName(ObjectType, WMEntityObjectType)
+            oWMObject.aObjectType = GetObjectByName(pObjectType, WMEntityObjectType)
         End If
 
         Try
-            Dim oType As Integer = GetIndexType(IndexName)
+            Dim oType As Integer = GetIndexType(pIndexName)
             If Not IsNothing(oType) Then
-                Dim oConvertedValue As Object = Helpers.ConvertIndexValue(oType, Value)
+                Dim oConvertedValue As Object = Helpers.ConvertIndexValue(oType, pStringValue)
 
-                oWMObject.SetVariableValue(IndexName, oConvertedValue)
+                oWMObject.SetVariableValue(pIndexName, oConvertedValue)
                 oWMObject.Save()
 
                 If UnlockObject(oWMObject) = False Then
@@ -1268,56 +1265,59 @@ Public Class Windream
         End Try
     End Function
 
-    Public Function SetFileIndexLoS(Path As String, IndexName As String, Values As List(Of String), ObjectType As String) As Boolean
+    Public Function SetFileIndexLoS(pPath As String, pIndexName As String, pAttributeValues As List(Of String), pObjectType As String) As Boolean
         If TestSessionLoggedIn() = False Then
             Return False
         End If
 
-        If TestFileExists(Path) = False Then
+        If TestFileExists(pPath) = False Then
-            _logger.Warn("File '{0}' does not exist", Path)
+            _logger.Warn("File '{0}' does not exist", pPath)
             Return False
         End If
         Dim oWMObject As IWMObject6
 
         Try
-            oWMObject = GetFileByPath(Path)
+            'Create the windream-Object via path
+            oWMObject = GetFileByPath(pPath)
         Catch ex As Exception
-            _logger.Warn("Could not create a WMObject for path '{0}'!!", Path)
+            _logger.Warn("Could not create a WMObject for path '{0}'!!", pPath)
             _logger.Warn(ex.Message)
             Return False
         End Try
-
+        'Lock WMObject for changes
         If LockObject(oWMObject, WMObjectEditModeIndexEdit) = False Then
             _logger.Warn("File {0} could not be locked")
             Return False
         End If
 
         If oWMObject.aObjectType.aName = Constants.OBJECT_TYPE_DEFAULT Then
-            oWMObject.aObjectType = GetObjectByName(ObjectType, WMEntityObjectType)
+            oWMObject.aObjectType = GetObjectByName(pObjectType, WMEntityObjectType)
         End If
 
         Try
-            Dim oType As Integer = GetIndexType(IndexName)
+            Dim oType As Integer = GetIndexType(pIndexName)
             Dim oConvertedValues As New List(Of String)
             Dim oArray As Object
-            _logger.Debug("SetFileIndexLoS '{0}' - Indextype: {1} ... ", IndexName, oType)
+            _logger.Debug("SetFileIndexLoS '{0}' - Indextype: {1} - Values.Count: {2} ... ", pIndexName, oType, pAttributeValues.Count)
-            ReDim oArray(Values.Count - 1)
+            ReDim oArray(pAttributeValues.Count - 1)
 
-            For oIndex = 0 To Values.Count - 1
+            For oIndex = 0 To pAttributeValues.Count - 1
-                Dim oValue As Object = Helpers.ConvertIndexValue(oType, Values.Item(oIndex))
+                Dim oValue As Object = Helpers.ConvertAttrValue(oType, pAttributeValues.Item(oIndex))
+                _logger.Debug("Converted Value: {0}", oValue.ToString)
                 oArray(oIndex) = oValue
             Next
 
-            oWMObject.SetVariableValue(IndexName, oArray)
+            oWMObject.SetVariableValue(pIndexName, oArray)
             oWMObject.Save()
 
             If UnlockObject(oWMObject) = False Then
-                _logger.Warn("File {0} could not be unlocked", Path)
+                _logger.Warn("File {0} could not be unlocked", pPath)
             End If
 
             Return True
         Catch ex As Exception
             _logger.Error(ex)
+
             Return False
         End Try
     End Function

Windream/Windream.vbproj

@@ -44,6 +44,9 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
     <Reference Include="Interop.WINDREAMLib">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -137,10 +140,6 @@
       <Project>{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}</Project>
       <Name>Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <COMReference Include="WMOBRWSLib">

Windream/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
 </packages>

c

@@ -0,0 +1,66 @@
+51798a28 (HEAD -> master) HEAD@{0}: reset: moving to 51798a28f5fddb5b5e62e5e3944dfa8cea4bb12a
+ec3a677c HEAD@{1}: commit: MS Jobs Sichtbeleg
+48406884 HEAD@{2}: pull --progress --no-edit --no-stat --recurse-submodules=no origin: Fast-forward
+204aaaeb HEAD@{3}: commit: Korrektur
+ec378ba3 HEAD@{4}: commit: Modules.Interfaces: Version 2.3.7.0
+35b19cde HEAD@{5}: commit: Modules.Interfaces: Fehlende Elemente der Codeliste UNTDID 7161 (Charge codes) nachgetragen, passend zur Version 2.3.x
+9ae5465c HEAD@{6}: commit: Modules.Jobs: Version 3.0.3.0
+82139fc3 HEAD@{7}: commit: Modules.Jobs: 4000 Zeichen-Grenze
+f4ba4d9e HEAD@{8}: commit: Modules.Interface: Listen-Items Handling (Item_Type = 4)
+0aabc12f HEAD@{9}: commit: Modules.Jobs: Version 3.0.2.0
+adbd0fe9 HEAD@{10}: commit: Modules.Jobs: Kürzen der ITEM_VALUE-Werte entfernt. Tabelle muss VARCHAR(max) vorsehen.
+2d6a2df4 HEAD@{11}: commit: Modules.Jobs: Version 3.0.1.0
+e7ccb748 HEAD@{12}: commit: Modules.Interfaces: Version 2.3.6.0
+05355c93 HEAD@{13}: commit: Readonly Property
+2007bb91 HEAD@{14}: commit: Modules.Interfaces & Modules.Jobs: Weitergabe der ErrorCodes in den Exceptions, um sie im WebService auswerten zu können.
+d7d2ecf8 HEAD@{15}: commit: Modules.Jobs: Replace Case-Insensitiv
+447c7ea6 HEAD@{16}: commit: Modules.Jobs: Version 3.0.0.0
+32bb14db HEAD@{17}: commit: Modules.Jobs: Strings-Vergleiche sollten unbedingt mit string.equals() erfolgen!
+a5226a81 HEAD@{18}: commit: Modules.Interfaces: Try/Catch und logging
+b534c4c7 HEAD@{19}: commit: Modules.Interfaces: Version 2.3.5.0
+dc801383 HEAD@{20}: commit: Modules.Jobs: Version 2.9.9.0
+477bb511 HEAD@{21}: commit: Modules.Interfaces & Modules.Jobs: ZUGFeRD 2.3.x-Logik angepasst. Auswertung der XML-Tabelle korrigiert, das Dictionary wird erst später erstellt.
+0b66b805 HEAD@{22}: commit: Modules.Jobs: Version 2.9.8.0
+5fd924d4 HEAD@{23}: commit: Modules.Interfaces: Version 2.3.4.0
+e8ebc302 HEAD@{24}: commit: Modules.Interface + Modules.Jobs: ITEM_TYPE = 4 / Description enthält jetzt BT-Feld-Info / Kommentare / Abfrage BT-Felder
+262805d1 HEAD@{25}: commit: Modules.Interface: Datumsformat immer 8-stellig (yyyyMMdd) aufbereiten
+623807c5 HEAD@{26}: commit: Modules.Interfaces: Version 2.3.3
+aee7997c HEAD@{27}: commit: Modules.Interfaces: Date/DateTime (yyyy-MM-dd) und Decimal/Numeric-Werte mit CultureInfo.Invariant.Culture speichern.
+82a95faa HEAD@{28}: commit: Modules.Jobs: Version 2.9.7.0
+af7534df HEAD@{29}: commit: Modules.Interfaces: Version 2.3.2.0
+fa2c2a64 HEAD@{30}: commit: Modules.Jobs: Keine Hochkomma-Ersetzung mehr bei Bulk-Insert
+390a5247 HEAD@{31}: commit: Modules.Interfaces: Belegarten in ZUGFeRD 2.3.x korrigiert und fehlende nachgetragen.
+0ed99610 HEAD@{32}: commit: Leere Strings (item_type = 0) nicht mehr in die DB schreiben
+2e0ae13a HEAD@{33}: commit: Modules.Jobs: Version 2.9.6.0
+267e0387 HEAD@{34}: commit: Modules.Jobs: Prüfe ob Value überhaupt einen Wert hat, sonst wird auch keine Datei erstellt
+2673755b HEAD@{35}: commit: Jobs: base64 / varbinary
+5052ce4f HEAD@{36}: commit: Modules.Jobs: Version 2.9.5.0
+717909d7 HEAD@{37}: commit: Modules.Jobs: MIME-Typen (pdf, xlsx, odt) - Fehlerhandling ergänzt, wenn Dateien nicht erstellt werden können.
+04a408ab HEAD@{38}: commit: Jobs: MIME-Types + File-Extension + xlsx-Dateien
+face3c76 HEAD@{39}: commit: Modules.Database: Version 2.3.6.0
+2d3a1cd2 HEAD@{40}: commit: Korrektur von MS in master nachgezogen
+43e95a20 HEAD@{41}: checkout: moving from Update-Net-8 to master
+c0054d41 (Update-Net-8) HEAD@{42}: checkout: moving from master to Update-Net-8
+43e95a20 HEAD@{43}: checkout: moving from Update-Net-8 to master
+c0054d41 (Update-Net-8) HEAD@{44}: checkout: moving from master to Update-Net-8
+43e95a20 HEAD@{45}: checkout: moving from Update-Net-8 to master
+c0054d41 (Update-Net-8) HEAD@{46}: checkout: moving from master to Update-Net-8
+43e95a20 HEAD@{47}: commit: Modules.Jobs: Version 2.9.4.0
+05d0bd60 HEAD@{48}: commit: Modules.Interfaces: Version 2.3.1.0
+7e70c059 HEAD@{49}: commit: Auslesen von embedded Files aus einer XML-Datei
+0261d237 HEAD@{50}: pull --progress --no-edit --no-stat --recurse-submodules=no origin: Fast-forward
+ea7fe74e HEAD@{51}: pull --progress --no-edit --no-stat --recurse-submodules=no origin: Merge made by the 'ort' strategy.
+df04b0a7 HEAD@{52}: commit: Modules.Jobs: Version 2.9.3.0
+ce652760 HEAD@{53}: commit: Modules.Base: version 1.3.9.0
+17d5acee HEAD@{54}: commit: Neue Datum-Konvertierungsfunktion
+c7afa2f7 HEAD@{55}: commit: Modules.Interfaces: Version 2.2.9.0
+4d5ab649 HEAD@{56}: commit: Peppol in UBL2.1 umbenannt
+f4c3e9b3 HEAD@{57}: commit: Modules.Interfaces: Version 2.2.8.0
+9d76b17b HEAD@{58}: commit: Integration ZUGFeRD 2.3.3 XSD Schema
+2ec92511 HEAD@{59}: commit: Modules.Jobs: Version 2.9.2.0
+8e1b9d21 HEAD@{60}: commit: Modules.Interfaces - Version 2.2.7.0
+7ac596b9 HEAD@{61}: pull --progress --no-edit --no-stat --recurse-submodules=no origin: Merge made by the 'ort' strategy.
+cf9650be HEAD@{62}: commit: Peppol 3017 / UBL Logik
+5774eb76 HEAD@{63}: pull --progress --no-edit --no-stat --recurse-submodules=no origin: Fast-forward
+7602f2c8 HEAD@{64}: commit: Nuget Update - GDPicture
+c74b7782 HEAD@{65}: clone: from http://git.dd:3000/AppStd/Modules