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

Jobs Sichtbeleg Anpassung
MS Änderungen lokal PC Mirko
2025-12-12 12:34:24 +01:00 · 2025-11-19 16:41:36 +01:00 · 2025-11-18 16:15:22 +01:00 · 2025-11-17 12:50:52 +01:00 · 2025-11-17 12:42:17 +01:00 · 2025-11-11 17:42:08 +01:00
32 changed files with 48162 additions and 772 deletions
--- a/Base/Base.vbproj
+++ b/Base/Base.vbproj
@@ -45,8 +45,8 @@
    <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 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">
--- a/Base/packages.config
+++ b/Base/packages.config
@@ -1,6 +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" />
  <package id="NuGet.CommandLine" version="6.13.2" targetFramework="net462" developmentDependency="true" />
 </packages>
--- a/Config/Config.vbproj
+++ b/Config/Config.vbproj
@@ -47,17 +47,19 @@
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Base">
+      <HintPath>..\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll</HintPath>
+    <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.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll</HintPath>
+    <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">
-      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
+      <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>
@@ -148,9 +150,6 @@
    </None>
    <None Include="packages.config" />
  </ItemGroup>
-  <ItemGroup>
-    <Content Include="README.txt" />
-  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <PropertyGroup>
    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
--- a/Config/README.txt
+++ b/Config/README.txt
@@ -1,5 +0,0 @@
-BASE MODULE
-===========
-
-This module is intended for often used constants and datastructures.
-Therefor it is important that this module does not have any dependencies on other modules!!
--- a/Config/packages.config
+++ b/Config/packages.config
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
-  <package id="DigitalData.Modules.Database" version="2.3.5.4" targetFramework="net462" />
-  <package id="DigitalData.Modules.Encryption" version="1.3.1" targetFramework="net462" />
-  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net462" />
  <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" />
--- a/Database/Database.vbproj
+++ b/Database/Database.vbproj
@@ -47,11 +47,12 @@
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll</HintPath>
+    <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">
-      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
+      <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>
--- a/Database/packages.config
+++ b/Database/packages.config
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DigitalData.Modules.Encryption" version="1.3.1" targetFramework="net462" />
-  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net462" />
  <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" />
--- a/Encryption/Encryption.vbproj
+++ b/Encryption/Encryption.vbproj
@@ -46,7 +46,8 @@
  </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>
+      <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">
--- a/Encryption/packages.config
+++ b/Encryption/packages.config
@@ -1,5 +1,4 @@
 <?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>
--- a/Filesystem/Filesystem.vbproj
+++ b/Filesystem/Filesystem.vbproj
@@ -45,7 +45,8 @@
  </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>
+      <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">
--- a/Filesystem/packages.config
+++ b/Filesystem/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net48" />
  <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" />
--- a/Interfaces/Interfaces.vbproj
+++ b/Interfaces/Interfaces.vbproj
@@ -49,6 +49,15 @@
    <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.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>
@@ -185,8 +194,8 @@
    <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.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
+    <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>
@@ -226,6 +235,7 @@
    <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" />
@@ -247,6 +257,7 @@
    <Compile Include="ZUGFeRDInterface\PDFConverter.vb" />
    <Compile Include="ZUGFeRDInterface\Peppol_UBL2.1\CreditNoteType.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" />
@@ -258,6 +269,7 @@
    <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>
@@ -282,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>
--- a/Project/AssemblyInfo.vb
+++ b/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.3.4.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.3.4.0")>
-<Assembly: AssemblyFileVersion("2.3.4.0")>
+<Assembly: AssemblyVersion("2.4.0.0")>
+<Assembly: AssemblyFileVersion("2.4.0.0")>
--- a/Interfaces/ZUGFeRDInterface.vb
+++ b/Interfaces/ZUGFeRDInterface.vb
@@ -19,6 +19,7 @@ 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 ZUGFERD_SPEC_2_3x = "ZUGFERD_2_3x"

    Public Const UBL_SPEC_21 = "UBL_21"

@@ -28,6 +29,7 @@ Public Class ZUGFeRDInterface
    Public Const XMLSCHEMA_ZUGFERD_22 = "Version2_2_FacturX"
    Public Const XMLSCHEMA_ZUGFERD_23 = "Version2_3_FacturX"
    Public Const XMLSCHEMA_ZUGFERD_233 = "Version2_3_3_FacturX"
+    Public Const XMLSCHEMA_ZUGFERD_24 = "Version2_4_FacturX"
    Public Const XMLSCHEMA_UBL_21_INVOICE = "UBL2_1_INVOICE"
    Public Const XMLSCHEMA_UBL_21_CREDITNOTE = "UBL2_1_CREDITNOTE"

@@ -50,6 +52,7 @@ Public Class ZUGFeRDInterface
        UnsupportedFormat
        FileTooBig
        UnknownError
+        NotInUse
    End Enum

    Public ReadOnly Property FileGroup As FileGroups
@@ -60,6 +63,7 @@ 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 AllowZugferd_2_3_x_Schema As Boolean = True
        Public Property AllowPeppol_3_x_Schema As Boolean = False
    End Class

@@ -130,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)
-        _logger.Debug("Filtering Property map for Specification [{0}]", pSpecification)
+    Public Function FilterPropertyMap(pPropertyMapList As List(Of XmlItemProperty), pSpecification As String) As Dictionary(Of String, XmlItemProperty)
+        _logger.Debug("Filtering Property map list for Specification [{0}]", pSpecification)

        If pSpecification = ZUGFERD_SPEC_10 Then
-            _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).
-                ToDictionary(Function(kv) kv.Key, Function(kv) kv.Value)
+            Try
+
+                _logger.Debug("Special Case [{0}], including [{1}]", ZUGFERD_SPEC_10, ZUGFERD_SPEC_DEFAULT)
+
+                Dim countElements As Integer = pPropertyMapList.Where(Function(x) x.Specification = pSpecification Or x.Specification = ZUGFERD_SPEC_DEFAULT).Count
+                _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.
-                Where(Function(kv) kv.Value.Specification = pSpecification).
-                ToDictionary(Function(kv) kv.Key, Function(kv) kv.Value)
+
+            Try
+
+                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
@@ -172,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
@@ -188,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)
@@ -206,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)
@@ -229,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)
@@ -258,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)
@@ -284,12 +306,8 @@ Public Class ZUGFeRDInterface
    End Function

    Private Function HandleEmbeddedFiles(pResults As List(Of PDFEmbeds.EmbeddedFile)) As ZugferdResult
-        If pResults Is Nothing Then
-            Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei, weil die Attachments nicht gelesen werden konnten.")
-        End If
-
-        If pResults.Count = 0 Then
-            Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei, weil sie keine Attachments enthält.")
+        If pResults Is Nothing OrElse pResults.Count = 0 Then
+            Throw New ZUGFeRDExecption(ErrorCodes.InvalidFerdNoXMLAttachmentFound, "Die Datei ist keine gültige ZUGFeRD-Datei, es wurde kein passender XML-Anhang gefunden.")
        End If

        ' Find the first file which filename matches the valid filenames for embedded invoice files
@@ -298,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.
@@ -308,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
@@ -326,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

@@ -358,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 {
@@ -374,16 +393,27 @@ 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_3_FacturX.CrossIndustryInvoiceType),
-                        .Specification = ZUGFERD_SPEC_2x,
-                        .XMLSchema = XMLSCHEMA_ZUGFERD_23
+                        .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_2x,
+                        .Specification = ZUGFERD_SPEC_2_3x,
                        .XMLSchema = XMLSCHEMA_ZUGFERD_233
+                    },
+                    New AllowedType With {
+                        .SchemaType = GetType(Version2_3_FacturX.CrossIndustryInvoiceType),
+                        .Specification = ZUGFERD_SPEC_2_3x,
+                        .XMLSchema = XMLSCHEMA_ZUGFERD_23
                    }
                })
            End If
@@ -426,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(ErrorType.UnsupportedFormat, "Unsupported Format")
+                Throw New ZUGFeRDExecption(ErrorCodes.UnsupportedFerdException, "Unsupported Format")
            End If

            pResult.Specification = oSpecification
@@ -442,8 +471,8 @@ Public Class ZUGFeRDInterface

        Catch ex As Exception
            _logger.Error(ex)
-            Dim oMessage = "Datei ist eine ungültige eInvoice Datei oder das Format wird nicht unterstüzt, oder das Format ist deaktiviert."
-            Throw New ZUGFeRDExecption(ErrorType.NoValidZugferd, oMessage)
+            Dim oMessage = "Datei ist eine ungültige Datei oder das Format wird nicht unterstüzt, oder das Format ist deaktiviert."
+            Throw New ZUGFeRDExecption(ErrorCodes.UnsupportedFerdException, oMessage)
        End Try
    End Function
 End Class
--- a/Interfaces/ZUGFeRDInterface/Enums/ErrorCodes.vb
+++ b/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
--- a/Interfaces/ZUGFeRDInterface/Exceptions.vb
+++ b/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
--- a/Interfaces/ZUGFeRDInterface/PropertyValues.vb
+++ b/Interfaces/ZUGFeRDInterface/PropertyValues.vb
@@ -71,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}].")

@@ -154,6 +154,17 @@ Public Class PropertyValues

                    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,
                        .Description = oPropertyDescription,
@@ -220,7 +231,7 @@ Public Class PropertyValues

            If IsNothing(oPropertyValue) OrElse String.IsNullOrEmpty(oPropertyValue) Then
                If oItem.Value.IsRequired Then
-                    _logger.Warn("Specification [{1}] is empty, but marked as required! Skipping.", oTableColumn)
+                    _logger.Warn("Specification [{0}] is empty, but marked as required! Skipping.", oTableColumn)
                    Dim oMissingProperty = New MissingProperty With
                    {
                        .Description = oPropertyDescription,
@@ -229,7 +240,7 @@ Public Class PropertyValues
                    oResult.MissingProperties.Add(oMissingProperty)
                    Continue For
                Else
-                    _logger.Debug("oPropertyValue for specification [{1}] is empty or not found. Skipping.", oTableColumn)
+                    _logger.Debug("oPropertyValue for specification [{0}] is empty or not found. Skipping.", oTableColumn)

                    Continue For
                End If
@@ -237,7 +248,14 @@ Public Class PropertyValues

            ' Statt dem Zahlenwert des Enums, wollen wir die Währungsbezeichnung
            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 {
@@ -333,7 +351,7 @@ Public Class PropertyValues

                        s = Convert.ToString(Obj)

-                        If IsDate(s) Then
+                        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 = ""
@@ -354,7 +372,7 @@ Public Class PropertyValues

                        Dim oResult As String

-                        If IsNumeric(Obj) Then
+                        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)
@@ -370,7 +388,6 @@ Public Class PropertyValues
                    End If
                End If
            End If
-
        Next

        Return New List(Of Object) From {Obj}
--- a/Interfaces/ZUGFeRDInterface/RejectionStringRow.vb
+++ b/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
--- a/Interfaces/ZUGFeRDInterface/Validator.vb
+++ b/Interfaces/ZUGFeRDInterface/Validator.vb
@@ -30,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
--- a/Interfaces/ZUGFeRDInterface/Version2.3_3_FacturX/CrossIndustryInvoiceType.vb
+++ b/Interfaces/ZUGFeRDInterface/Version2.3_3_FacturX/CrossIndustryInvoiceType.vb
--- a/Interfaces/ZUGFeRDInterface/Version2.3_FacturX/CrossIndustryInvoiceType.vb
+++ b/Interfaces/ZUGFeRDInterface/Version2.3_FacturX/CrossIndustryInvoiceType.vb
--- a/Interfaces/ZUGFeRDInterface/Version2.4_FacturX/CrossIndustryInvoiceType.vb
+++ b/Interfaces/ZUGFeRDInterface/Version2.4_FacturX/CrossIndustryInvoiceType.vb
--- a/Interfaces/app.config
+++ b/Interfaces/app.config
@@ -40,7 +40,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
--- a/Interfaces/packages.config
+++ b/Interfaces/packages.config
@@ -26,7 +26,7 @@
  <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.5" 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>
--- a/Jobs/App.config
+++ b/Jobs/App.config
@@ -5,6 +5,8 @@
    </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" />
@@ -43,7 +45,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
--- a/Jobs/Jobs.vbproj
+++ b/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>
@@ -125,6 +113,18 @@
    <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>
@@ -134,74 +134,80 @@
    <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.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
+    <Reference Include="GdPicture.NET.14, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <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.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 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.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 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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+    <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.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 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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+    <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.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+    <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.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
+      <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="NativeSDK.Settings, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <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>
@@ -227,9 +233,6 @@
    <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>
@@ -264,8 +267,8 @@
    <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.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
+    <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>
@@ -282,11 +285,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.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\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.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'))" />
+    <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>
--- a/Project/AssemblyInfo.vb
+++ b/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.9.8.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.9.8.0")>
-<Assembly: AssemblyFileVersion("2.9.8.0")>
+<Assembly: AssemblyVersion("3.5.0.0")>
+<Assembly: AssemblyFileVersion("3.5.0.0")>
--- a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb
+++ b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb
@@ -439,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
@@ -558,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
-                    _logger.Info("File [{0}] is not a valid eInvoice document. Skipping.", pFile.Name)

-                    oResult.EmailAttachmentFiles.Add(pFile)
-                    Return oResult
+            If ex.ErrorCode > 0 Then
+                _logger.Info("New Rejection Logik")

-                Case ZUGFeRDInterface.ErrorType.UnsupportedFormat
-                    _logger.Info("File [{0}/{1}] is an unsupported eInvoice document format!", pFile.Name, ex.XmlFile)
-                    Throw New UnsupportedFerdException(ex.XmlFile)
+                Select Case ex.ErrorCode
+                    Case ErrorCode.NoFerdsException
+                        _logger.Info("File [{0}] is not a valid eInvoice document. Skipping.", pFile.Name)

-                Case ZUGFeRDInterface.ErrorType.NoValidZugferd
-                    _logger.Info("File [{0}] is an Incorrectly formatted eInvoice document!", pFile.Name)
-                    Throw New InvalidFerdException()
+                        oResult.EmailAttachmentFiles.Add(pFile)
+                        Return oResult

-                Case Else
-                    _logger.Warn("Unexpected Error occurred while extracting eInvoice Information from file {0}", pFile.Name)
-                    Throw ex
-            End Select
+                    Case ErrorCode.UnsupportedFerdException
+                        _logger.Info("File [{0}/{1}] is an unsupported eInvoice document format!", pFile.Name, ex.XmlFile)
+                        Throw New UnsupportedFerdException(ex.XmlFile)

+                    Case ErrorCode.InvalidFerdException
+                        _logger.Info("File [{0}] is an incorrectly formatted eInvoice document!", pFile.Name)
+                        Throw New InvalidFerdException()
+
+                    Case Else
+                        _logger.Warn("Unexpected Error occurred while extracting eInvoice Information from file {0}", pFile.Name)
+                        Throw ex
+
+                End Select
+            End If
        End Try

        Try
-            oDocument.ReceiptFileType = ZUGFeRDInterface.RECEIPT_TYPE_XML
-            Dim sqlResult As Boolean = StoreXMLItemsInDatabase(pMessageId, oDocument, pFile, pConnections, pArgs, oResult)
+            Dim sqlResult As Boolean = False
+
+            If oDocument IsNot Nothing Then
+                sqlResult = StoreXMLItemsInDatabase(pMessageId, oDocument, pFile, pConnections, pArgs, oResult)
+            End If
+
        Catch ex As Exception
            Throw ex
        End Try
@@ -630,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
-                Case ZUGFeRDInterface.ErrorType.NoZugferd
-                    _logger.Info("File [{0}] is not a valid eInvoice document. Skipping.", pFile.Name)
+            If ex.ErrorCode > 0 Then
+                _logger.Info("New Rejection Logik")

-                    oResult.EmailAttachmentFiles.Add(pFile)
-                    Return oResult
+                Select Case ex.ErrorCode
+                    Case ErrorCode.NoFerdsException
+                        _logger.Info("File [{0}] is not a valid eInvoice document. Skipping.", pFile.Name)

-                Case ZUGFeRDInterface.ErrorType.UnsupportedFormat
-                    _logger.Info("File [{0}/{1}] is an unsupported eInvoice document format!", pFile.Name, ex.XmlFile)
-                    Throw New UnsupportedFerdException(ex.XmlFile)
+                        oResult.EmailAttachmentFiles.Add(pFile)
+                        Return oResult

-                Case ZUGFeRDInterface.ErrorType.NoValidZugferd
-                    _logger.Info("File [{0}] is an incorrectly formatted eInvoice document!", pFile.Name)
-                    Throw New InvalidFerdException()
+                    Case ErrorCode.UnsupportedFerdException
+                        _logger.Info("File [{0}/{1}] is an unsupported eInvoice document format!", pFile.Name, ex.XmlFile)
+                        Throw New UnsupportedFerdException(ex.XmlFile)
+
+                    Case ErrorCode.InvalidFerdException
+                        _logger.Info("File [{0}] is an incorrectly formatted eInvoice document!", pFile.Name)
+                        Throw New InvalidFerdException()
+
+                    Case Else
+                        _logger.Warn("Unexpected Error occurred while extracting eInvoice Information from file {0}", pFile.Name)
+                        Throw ex
+
+                End Select
+            End If

-                Case Else
-                    _logger.Warn("Unexpected Error occurred while extracting eInvoice Information from file {0}", pFile.Name)
-                    Throw ex
-            End Select
        End Try

        ' Check if there are more than one ZUGFeRD files
@@ -676,7 +694,6 @@ Public Class ImportZUGFeRDFiles
        End If

        Try
-            oDocument.ReceiptFileType = ZUGFeRDInterface.RECEIPT_TYPE_PDF
            Dim sqlResult As Boolean = StoreXMLItemsInDatabase(pMessageId, oDocument, pFile, pConnections, pArgs, oResult)
        Catch ex As Exception
            Throw ex
@@ -699,7 +716,7 @@ Public Class ImportZUGFeRDFiles
        ' - 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)
@@ -1168,8 +1185,9 @@ Public Class ImportZUGFeRDFiles
                oGroupCounterValue = 0
            End If

-            If oProperty.Value.Length > 900 Then
-                _logger.Warn("Value for field [{0}] is longer than 900 characters, will be truncated!", oProperty.TableColumn)
+            If oProperty.Value.Length > 4000 Then
+                _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
@@ -1182,7 +1200,7 @@ Public Class ImportZUGFeRDFiles
            Dim oNewRow As DataRow = oDataTable.NewRow()
            oNewRow("REFERENCE_GUID") = pMessageId
            oNewRow("ITEM_DESCRIPTION") = oDescription
-            oNewRow("ITEM_VALUE") = oProperty.Value.Truncate(900)
+            oNewRow("ITEM_VALUE") = oProperty.Value
            oNewRow("GROUP_COUNTER") = oGroupCounterValue
            oNewRow("SPEC_NAME") = oProperty.TableColumn
            oNewRow("IS_REQUIRED") = oProperty.IsRequired
--- a/Jobs/ZUGFeRD/WorkerArgs.vb
+++ b/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
--- a/Jobs/ZUGFeRD/XRechnungViewDocument.vb
+++ b/Jobs/ZUGFeRD/XRechnungViewDocument.vb
@@ -7,6 +7,9 @@ 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
    Private ReadOnly _logConfig As LogConfig
@@ -16,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()
@@ -25,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 oViewRecieptFilename = oxmlFile.Name
-            Dim oTempFilePath = Path.GetDirectoryName(oxmlFilePath) + "\Temp"
+            Dim oXmlFilePath = pXmlFile.FullName
+            Dim oViewRecieptFilename = pXmlFile.Name
+            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)
@@ -69,9 +85,24 @@ 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 Single = Create_PageHeader(False)
-            Create_PageFooter()

            Dim oArea As String = ""
            Dim oIsPosition As Boolean = False
@@ -87,6 +118,9 @@ Public Class XRechnungViewDocument
            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")
@@ -94,7 +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
@@ -106,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)
-                        Create_PageFooter()
+                        'Wieder einen Header und Footer erzeugen
+                        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
@@ -135,6 +187,18 @@ 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
@@ -163,15 +227,21 @@ Public Class XRechnungViewDocument
                            ' gdpicturePDF.DrawText(fontResName, 10, yPosition, XRechnungStrings.Seperator_Line)
                            yPosition += 5
                        ElseIf oArea = "POSITION" Then
-                            'Tabellendarstellung
                            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, "Pos#")
                            MyGDPicturePDF.DrawText(fontResName, 19, yPosition, "Anz./am.")
-                            MyGDPicturePDF.DrawText(fontResName, 35, yPosition, "Einh/unt")
+                            MyGDPicturePDF.DrawText(fontResName, 35, yPosition, "Einh/Unit")
                            MyGDPicturePDF.DrawText(fontResName, 50, yPosition, "Pos.Text")
-                            MyGDPicturePDF.DrawText(fontResName, 164, yPosition, "Steuer/tax")
-                            MyGDPicturePDF.DrawText(fontResName, 181, yPosition, "Betrag/sum")
+                            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
-                            'Tabellendarstellung Ende
+                            oPosCount = 0
                        ElseIf oArea = "EXEMPTION" Then

                        End If
@@ -186,9 +256,8 @@ Public Class XRechnungViewDocument
                        oIsPosition = True
                        If oItemSPECNAME = "INVOICE_POSITION_AMOUNT" Then
                            oPosCount += 1
-                            'oPosTerm = $"{oPosCount}. {oItemValue} * "
-                            'oItemValue = oPosTerm
-                            'Tabellendarstellung
+                            oYDyn = 0
+                            yPosition += 5
                            oPosTerm = ""
                            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, oPosCount)
                            ' 
@@ -201,6 +270,18 @@ Public Class XRechnungViewDocument
                            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
+                        End If
                    ElseIf oArea = "TAXPOS" Then
                        oIsPosition = True
                        If oItemSPECNAME = "INVOICE_TAXPOS_RATE" Then
@@ -216,106 +297,115 @@ Public Class XRechnungViewDocument
                    'INDIVIDUELLES VERHALTEN BEI Folge-ITEMS
                    _logger.Debug($"FollowItem - Area: [{oArea}] - ItemSpecname: [{oItemSPECNAME}] - ItemValue: [{oItemValue}]")
                    'Dim otextBoxYPos As Integer
-                    If oArea = "POSITION" Then
-                        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
-                            oYPlus = 0
-                            'Tabellendarstellung
-                            yPosition += 5
+                            If Not oDescriptionFollowup Then
+                                oYPlus = 0
+                                oYDyn = 0
+                            End If
                            oPosTerm = ""
                            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, oPosCount)
-                            'otextBoxYPos = 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
+                            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_UNIT_TYPE" Then
                            oYPlus = 0
                            Dim oUnit = Return_UnitType(oItemValue)
                            MyGDPicturePDF.DrawText(fontResName, 35, yPosition, oUnit)
                            oDisplay = False
-                        ElseIf oItemSPECNAME = "INVOICE_POSITION_ARTICLE" Then
+                        ElseIf {"POSITION_ALLOWANCE_REASON", "RECEIPT_ALLOWANCE_REASON", "INVOICE_POSITION_ARTICLE", "INVOICE_POSITION_ARTICLE_DESCRIPTION"}.Contains(oItemSPECNAME) Then
                            'Tabellendarstellung
-                            oYPlus = 0
+                            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 oYDyn As Integer = yPosition - 5
                            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, 67)
+                                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
-                                    MyGDPicturePDF.DrawText(fontResName, 50, oYDyn, part)
                                Next
                            Next
-                            'Tabellendarstellung Ende
-                            ' oPosTerm += $" {oItemValue}"
                            oDisplay = False
                        ElseIf oItemSPECNAME = "INVOICE_POSITION_NOTE" Then
                            '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
-                            Dim oYDyn As Integer = yPosition
+                            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
-                                    MyGDPicturePDF.DrawText(fontResName, 50, oYDyn, part)
                                Next
                            Next

                            'oPosTerm += $" {oItemValue}"
                            oDisplay = False
-                        ElseIf oItemSPECNAME = "INVOICE_POSITION_ARTICLE_DESCRIPTION" Then
-                            '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
-                            Dim oYDyn As Integer = yPosition
-                            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
-                                    oYDyn += 5
-                                    oYPlus += 5
-                                    MyGDPicturePDF.DrawText(fontResName, 50, oYDyn, part)
-                                Next
-                            Next
+                        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

-                            'oPosTerm += $" {oItemValue}"
-                            oDisplay = False
-                        ElseIf oItemSPECNAME = "INVOICE_TAXPOS_TAX_RATE" Or oItemSPECNAME = "INVOICE_TAXPOS_RATE" Then
-                            'Tabellendarstellung
-                            MyGDPicturePDF.DrawText(fontResName, 164, yPosition, $"{oItemValue} %")
-                            'Tabellendarstellung ENDE
-                            ' oPosTerm += $" - {oItemValue} %"
-                            oDisplay = False
-                        ElseIf oItemSPECNAME = "INVOICE_POSITION_TAX_AMOUNT" Then
-                            'Tabellendarstellung
                            Dim oYPos = yPosition - 3.5
-                            Dim oBetrag As Decimal = oItemValue
-                            Dim oFormatiert As String = oBetrag.ToString("N2", New Globalization.CultureInfo("de-DE"))
-
-                            Dim TAXTERM = $"{oFormatiert} {oCurrencySymbol}"
+                            Dim TAXTERM = FormatCurrency(oItemValue, oCurrencySymbol)
                            MyGDPicturePDF.DrawTextBox(fontResName, 177, oYPos, 198, YCoo_TextBoxPlus5(oYPos),
                                                       TextAlignment.TextAlignmentFar, TextAlignment.TextAlignmentNear,
                                                      TAXTERM)
-                            ' MyGDPicturePDF.DrawText(fontResName, 180, yPosition, $"{oItemValue} {oCurrencySymbol}")
-
-                            'Tabellendarstellung Ende
                        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
                            oItemValue = StringFunctions.DatetimeStringToGermanStringConverter(oItemValue, _logger)
                        End If
                    ElseIf oArea = "TAXPOS" Then
@@ -324,10 +414,7 @@ Public Class XRechnungViewDocument
                            oPosTerm = $"{oItemValue} %:"
                            oDisplay = False
                        ElseIf oItemSPECNAME = "INVOICE_TAXPOS_AMOUNT" Then
-                            Dim oBetrag As Decimal = oItemValue
-                            Dim oFormatiert As String = oBetrag.ToString("N2", New Globalization.CultureInfo("de-DE"))
-                            oFormatiert += $" {oCurrencySymbol}"
-                            oPosTerm += $" {oFormatiert}"
+                            oPosTerm += FormatCurrency(oItemValue, oCurrencySymbol)
                            oDisplay = False
                        ElseIf oItemSPECNAME = "INVOICE_TAXPOS_TYPE" Then
                            oPosTerm += $" {oItemValue}"
@@ -342,16 +429,14 @@ Public Class XRechnungViewDocument
                    If Y_eq_lastrow = False And oAreaSwitch = False Then
                        yPosition += 5
                    End If
-                    If oArea = "AMOUNT" Then
-                        If oItemSPECNAME = "INVOICE_TOTAL_TAX" Or oItemSPECNAME = "INVOICE_TOTAL_NET" Or oItemSPECNAME = "INVOICE_TOTAL_GROSS" Then
-                            Dim oBetrag As Decimal = oItemValue
-                            Dim oFormatiert As String = oBetrag.ToString("N2", New Globalization.CultureInfo("de-DE"))
-                            oFormatiert += $" {oCurrencySymbol}"
-                            oItemValue = oFormatiert
+                    If oArea = "AMOUNT" Or oArea = "ALLOWANCE" Then
+
+                        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)
@@ -364,7 +449,6 @@ Public Class XRechnungViewDocument
                        Else
                            MyGDPicturePDF.DrawText(fontResName, 70, yPosition, oItemValue)
                        End If
-
                    Else
                        If Y_eq_lastrow = True Then
                            MyGDPicturePDF.DrawText(fontResName, oRow.Item("xPosition"), yPosition, oItemValue)
@@ -392,35 +476,44 @@ Public Class XRechnungViewDocument
                        End If
                    End If
                Else
-                    'Tabellendarstellung 
                    If oItemSPECNAME = "INVOICE_POSITION_TAX_AMOUNT" And oYPlus > 0 Then
-                        yPosition += oYPlus - 5
+                        yPosition += oYPlus
+                    Else
+
+
                    End If
-                    'Tabellendarstellung Ende
                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.Debug("Create_PDFfromXML() End successfully")
+                _logger.Info("Create_PDFfromXML() End successfully. File [{0}] written.", oNewFileinfo.FullName)
                Return oNewFileinfo
            Else
-                _logger.Debug("Create_PDFfromXML() Ends with nothing")
+                _logger.Warn("Create_PDFfromXML() Ends with nothing")
                Return Nothing
            End If

@@ -429,6 +522,43 @@ 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()
+
+        Dim oBetrag As Decimal
+        Dim culture As Globalization.CultureInfo
+
+        ' Erkennung des Dezimaltrennzeichens
+        If pValue.Contains(",") AndAlso Not pValue.Contains(".") Then
+            culture = New Globalization.CultureInfo("de-DE") ' Komma → deutsches Format
+        ElseIf pValue.Contains(".") AndAlso Not pValue.Contains(",") Then
+            culture = New Globalization.CultureInfo("en-US") ' Punkt → englisches Format
+        Else
+            ' Mischformat oder Tausendertrennzeichen → Fallback auf aktuelle Culture
+            culture = Globalization.CultureInfo.CurrentCulture
+        End If
+
+        ' Parsen mit gewählter Culture
+        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
+
+
+    Private Function FormatStringT(ByVal text As String) As String
+        Return text.Replace(vbCr, " - ").Replace(vbLf, "").Replace(vbTab, " ")
+    End Function
    Private Function RemoveNewlinesAndTabs(ByVal text As String) As String
        Return text.Replace(vbCr, " - ").Replace(vbLf, "").Replace(vbTab, " ")
    End Function
@@ -449,28 +579,28 @@ Public Class XRechnungViewDocument
        Dim lines As List(Of String) = text.Split({vbCrLf, vbLf, vbCr}, StringSplitOptions.None).ToList()
        Return lines
    End Function
-    Public Function Create_PageHeader(pFollowPage As Boolean) As Integer
-        'Draw content on the PDF
-        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)
-        Return yPosition
-    End Function

-    Public Sub Create_PageFooter()
-        MyGDPicturePDF.DrawLine(10, 280, 200, 280)
-        Dim oCreatedString = $"Maschinell erstellt durch / Automatically created by Digital Data E-Rechnung Parser: {Now.ToString}"
-        MyGDPicturePDF.DrawText(fontResName, 10, 285, oCreatedString)
-    End Sub
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

    Private Function Return_InvType(pType As String) As String
        Dim oReturn As String = "Rechnung/invoice"
--- a/Jobs/packages.config
+++ b/Jobs/packages.config
@@ -4,8 +4,8 @@
  <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.3.3" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
+  <package id="GdPicture" version="14.3.19" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.19" 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" />
@@ -18,16 +18,14 @@
  <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.5" 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>
--- a/66
+++ b/66
@@ -0,0 +1,66 @@
+[33m51798a28[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mmaster[m[33m)[m HEAD@{0}: reset: moving to 51798a28f5fddb5b5e62e5e3944dfa8cea4bb12a
+[33mec3a677c[m HEAD@{1}: commit: MS Jobs Sichtbeleg
+[33m48406884[m HEAD@{2}: pull --progress --no-edit --no-stat --recurse-submodules=no origin: Fast-forward
+[33m204aaaeb[m HEAD@{3}: commit: Korrektur
+[33mec378ba3[m HEAD@{4}: commit: Modules.Interfaces: Version 2.3.7.0
+[33m35b19cde[m HEAD@{5}: commit: Modules.Interfaces: Fehlende Elemente der Codeliste UNTDID 7161 (Charge codes) nachgetragen, passend zur Version 2.3.x
+[33m9ae5465c[m HEAD@{6}: commit: Modules.Jobs: Version 3.0.3.0
+[33m82139fc3[m HEAD@{7}: commit: Modules.Jobs: 4000 Zeichen-Grenze
+[33mf4ba4d9e[m HEAD@{8}: commit: Modules.Interface: Listen-Items Handling (Item_Type = 4)
+[33m0aabc12f[m HEAD@{9}: commit: Modules.Jobs: Version 3.0.2.0
+[33madbd0fe9[m HEAD@{10}: commit: Modules.Jobs: Kürzen der ITEM_VALUE-Werte entfernt. Tabelle muss VARCHAR(max) vorsehen.
+[33m2d6a2df4[m HEAD@{11}: commit: Modules.Jobs: Version 3.0.1.0
+[33me7ccb748[m HEAD@{12}: commit: Modules.Interfaces: Version 2.3.6.0
+[33m05355c93[m HEAD@{13}: commit: Readonly Property
+[33m2007bb91[m HEAD@{14}: commit: Modules.Interfaces & Modules.Jobs: Weitergabe der ErrorCodes in den Exceptions, um sie im WebService auswerten zu können.
+[33md7d2ecf8[m HEAD@{15}: commit: Modules.Jobs: Replace Case-Insensitiv
+[33m447c7ea6[m HEAD@{16}: commit: Modules.Jobs: Version 3.0.0.0
+[33m32bb14db[m HEAD@{17}: commit: Modules.Jobs: Strings-Vergleiche sollten unbedingt mit string.equals() erfolgen!
+[33ma5226a81[m HEAD@{18}: commit: Modules.Interfaces: Try/Catch und logging
+[33mb534c4c7[m HEAD@{19}: commit: Modules.Interfaces: Version 2.3.5.0
+[33mdc801383[m HEAD@{20}: commit: Modules.Jobs: Version 2.9.9.0
+[33m477bb511[m 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.
+[33m0b66b805[m HEAD@{22}: commit: Modules.Jobs: Version 2.9.8.0
+[33m5fd924d4[m HEAD@{23}: commit: Modules.Interfaces: Version 2.3.4.0
+[33me8ebc302[m HEAD@{24}: commit: Modules.Interface + Modules.Jobs: ITEM_TYPE = 4 / Description enthält jetzt BT-Feld-Info / Kommentare / Abfrage BT-Felder
+[33m262805d1[m HEAD@{25}: commit: Modules.Interface: Datumsformat immer 8-stellig (yyyyMMdd) aufbereiten
+[33m623807c5[m HEAD@{26}: commit: Modules.Interfaces: Version 2.3.3
+[33maee7997c[m HEAD@{27}: commit: Modules.Interfaces: Date/DateTime (yyyy-MM-dd) und Decimal/Numeric-Werte mit CultureInfo.Invariant.Culture speichern.
+[33m82a95faa[m HEAD@{28}: commit: Modules.Jobs: Version 2.9.7.0
+[33maf7534df[m HEAD@{29}: commit: Modules.Interfaces: Version 2.3.2.0
+[33mfa2c2a64[m HEAD@{30}: commit: Modules.Jobs: Keine Hochkomma-Ersetzung mehr bei Bulk-Insert
+[33m390a5247[m HEAD@{31}: commit: Modules.Interfaces: Belegarten in ZUGFeRD 2.3.x korrigiert und fehlende nachgetragen.
+[33m0ed99610[m HEAD@{32}: commit: Leere Strings (item_type = 0) nicht mehr in die DB schreiben
+[33m2e0ae13a[m HEAD@{33}: commit: Modules.Jobs: Version 2.9.6.0
+[33m267e0387[m HEAD@{34}: commit: Modules.Jobs: Prüfe ob Value überhaupt einen Wert hat, sonst wird auch keine Datei erstellt
+[33m2673755b[m HEAD@{35}: commit: Jobs: base64 / varbinary
+[33m5052ce4f[m HEAD@{36}: commit: Modules.Jobs: Version 2.9.5.0
+[33m717909d7[m HEAD@{37}: commit: Modules.Jobs: MIME-Typen (pdf, xlsx, odt) - Fehlerhandling ergänzt, wenn Dateien nicht erstellt werden können.
+[33m04a408ab[m HEAD@{38}: commit: Jobs: MIME-Types + File-Extension + xlsx-Dateien
+[33mface3c76[m HEAD@{39}: commit: Modules.Database: Version 2.3.6.0
+[33m2d3a1cd2[m HEAD@{40}: commit: Korrektur von MS in master nachgezogen
+[33m43e95a20[m HEAD@{41}: checkout: moving from Update-Net-8 to master
+[33mc0054d41[m[33m ([m[1;32mUpdate-Net-8[m[33m)[m HEAD@{42}: checkout: moving from master to Update-Net-8
+[33m43e95a20[m HEAD@{43}: checkout: moving from Update-Net-8 to master
+[33mc0054d41[m[33m ([m[1;32mUpdate-Net-8[m[33m)[m HEAD@{44}: checkout: moving from master to Update-Net-8
+[33m43e95a20[m HEAD@{45}: checkout: moving from Update-Net-8 to master
+[33mc0054d41[m[33m ([m[1;32mUpdate-Net-8[m[33m)[m HEAD@{46}: checkout: moving from master to Update-Net-8
+[33m43e95a20[m HEAD@{47}: commit: Modules.Jobs: Version 2.9.4.0
+[33m05d0bd60[m HEAD@{48}: commit: Modules.Interfaces: Version 2.3.1.0
+[33m7e70c059[m HEAD@{49}: commit: Auslesen von embedded Files aus einer XML-Datei
+[33m0261d237[m HEAD@{50}: pull --progress --no-edit --no-stat --recurse-submodules=no origin: Fast-forward
+[33mea7fe74e[m HEAD@{51}: pull --progress --no-edit --no-stat --recurse-submodules=no origin: Merge made by the 'ort' strategy.
+[33mdf04b0a7[m HEAD@{52}: commit: Modules.Jobs: Version 2.9.3.0
+[33mce652760[m HEAD@{53}: commit: Modules.Base: version 1.3.9.0
+[33m17d5acee[m HEAD@{54}: commit: Neue Datum-Konvertierungsfunktion
+[33mc7afa2f7[m HEAD@{55}: commit: Modules.Interfaces: Version 2.2.9.0
+[33m4d5ab649[m HEAD@{56}: commit: Peppol in UBL2.1 umbenannt
+[33mf4c3e9b3[m HEAD@{57}: commit: Modules.Interfaces: Version 2.2.8.0
+[33m9d76b17b[m HEAD@{58}: commit: Integration ZUGFeRD 2.3.3 XSD Schema
+[33m2ec92511[m HEAD@{59}: commit: Modules.Jobs: Version 2.9.2.0
+[33m8e1b9d21[m HEAD@{60}: commit: Modules.Interfaces - Version 2.2.7.0
+[33m7ac596b9[m HEAD@{61}: pull --progress --no-edit --no-stat --recurse-submodules=no origin: Merge made by the 'ort' strategy.
+[33mcf9650be[m HEAD@{62}: commit: Peppol 3017 / UBL Logik
+[33m5774eb76[m HEAD@{63}: pull --progress --no-edit --no-stat --recurse-submodules=no origin: Fast-forward
+[33m7602f2c8[m HEAD@{64}: commit: Nuget Update - GDPicture
+[33mc74b7782[m HEAD@{65}: clone: from http://git.dd:3000/AppStd/Modules
Author	SHA1	Message	Date
pitzm	32015e5439	Modules.Interface: ZUGFeRD 2.4 - Schema-Klasse und Aufruf ergänzt	2025-12-12 12:34:24 +01:00
Developer01	ceb688fc3f	Jobs Sichtbeleg Anpassung	2025-11-19 16:41:36 +01:00
Developer01	aa5742a529	MS Änderungen lokal PC Mirko	2025-11-18 16:15:22 +01:00
Developer01	79267e6bd9	GD Picture und Verweise	2025-11-17 12:50:52 +01:00
Developer01	cf63fd8c39	Update GDPIcture	2025-11-17 12:42:17 +01:00
Developer01	ec3a677ca8	MS Jobs Sichtbeleg	2025-11-11 17:42:08 +01:00
Developer01	48406884ca	Merge branch 'master' of http://git.dd:3000/AppStd/Modules	2025-09-15 08:46:37 +02:00
pitzm	204aaaeb4e	Korrektur	2025-09-12 12:55:41 +02:00
pitzm	ec378ba3b4	Modules.Interfaces: Version 2.3.7.0	2025-09-12 11:12:38 +02:00
pitzm	35b19cde82	Modules.Interfaces: Fehlende Elemente der Codeliste UNTDID 7161 (Charge codes) nachgetragen, passend zur Version 2.3.x	2025-09-12 11:11:52 +02:00
Developer01	f7c0a29676	v3.1. Änderung Sichtbeleg Version 1 vor Abstimmung WISAG	2025-09-05 10:59:39 +02:00
pitzm	9ae5465c48	Modules.Jobs: Version 3.0.3.0	2025-09-02 11:22:03 +02:00
pitzm	82139fc30d	Modules.Jobs: 4000 Zeichen-Grenze	2025-09-02 11:20:14 +02:00
pitzm	f4ba4d9e1d	Modules.Interface: Listen-Items Handling (Item_Type = 4)	2025-08-20 14:21:50 +02:00
pitzm	0aabc12f49	Modules.Jobs: Version 3.0.2.0	2025-08-19 12:39:00 +02:00
pitzm	adbd0fe99b	Modules.Jobs: Kürzen der ITEM_VALUE-Werte entfernt. Tabelle muss VARCHAR(max) vorsehen.	2025-08-19 12:37:38 +02:00
pitzm	2d6a2df48a	Modules.Jobs: Version 3.0.1.0	2025-08-08 11:48:03 +02:00
pitzm	e7ccb74828	Modules.Interfaces: Version 2.3.6.0	2025-08-08 11:47:33 +02:00
pitzm	05355c93a5	Readonly Property	2025-08-08 11:46:52 +02:00
pitzm	2007bb91f3	Modules.Interfaces & Modules.Jobs: Weitergabe der ErrorCodes in den Exceptions, um sie im WebService auswerten zu können.	2025-08-08 11:46:21 +02:00
pitzm	d7d2ecf8a0	Modules.Jobs: Replace Case-Insensitiv	2025-08-04 14:13:20 +02:00
pitzm	447c7ea600	Modules.Jobs: Version 3.0.0.0	2025-08-04 13:07:19 +02:00
pitzm	32bb14db06	Modules.Jobs: Strings-Vergleiche sollten unbedingt mit string.equals() erfolgen!	2025-08-04 13:06:04 +02:00
pitzm	a5226a8101	Modules.Interfaces: Try/Catch und logging	2025-07-25 13:01:45 +02:00
pitzm	b534c4c799	Modules.Interfaces: Version 2.3.5.0	2025-07-23 11:51:47 +02:00
pitzm	dc80138311	Modules.Jobs: Version 2.9.9.0	2025-07-23 11:51:14 +02:00
pitzm	477bb511c4	Modules.Interfaces & Modules.Jobs: ZUGFeRD 2.3.x-Logik angepasst. Auswertung der XML-Tabelle korrigiert, das Dictionary wird erst später erstellt.	2025-07-23 11:50:40 +02:00