Merge branch 'master' of http://git.dd:3000/AppStd/Modules

Config/Config.vbproj

@@ -47,6 +47,9 @@
     <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="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
@@ -78,6 +81,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ConfigAttributes.vb" />
+    <Compile Include="ConfigDbFunct.vb" />
     <Compile Include="ConfigManager.vb" />
     <Compile Include="ConfigSample.vb" />
     <Compile Include="ConfigUtils.vb" />

Config/ConfigDbFunct.vb

@@ -0,0 +1,52 @@
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Database
+
+
+Public Class ConfigDbFunct
+
+    ''' <summary>
+    ''' Ermittelt die aktuelle Lizenz für das gewünschte Produkt
+    ''' aus der DB-Tabelle TBDD_3RD_PARTY_MODULES
+    ''' </summary>
+    ''' 
+    ''' <param name="pLogConfig">An instance of LogConfig</param>
+    ''' <param name="pConnectionString">Initial connectionstring for connecting to DD_ECM database.</param>
+    ''' <returns>LicenseKey, if found, otherwise String.Empty</returns>
+    Public Shared Function GetProductLicense(pProductName As String, pVersion As String, pLogConfig As LogConfig, pConnectionString As String) As String
+
+        Dim oLogger As Logger = pLogConfig.GetLogger()
+
+        If (String.IsNullOrEmpty(pProductName)) Then
+            oLogger.Error("Parameter pProductName is null or empty")
+            Return String.Empty
+        End If
+
+        If (String.IsNullOrEmpty(pVersion)) Then
+            oLogger.Error("Parameter pVersion is null or empty")
+            Return String.Empty
+        End If
+
+        If (String.IsNullOrEmpty(pConnectionString)) Then
+            oLogger.Error("Parameter pConnectionString is null or empty")
+            Return String.Empty
+        End If
+
+        Try
+            Dim oDecryptedConnectionString As String = MSSQLServer.DecryptConnectionString(pConnectionString)
+            Dim oDatabase As MSSQLServer = New MSSQLServer(pLogConfig, oDecryptedConnectionString)
+
+            Dim oSql As String = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = '" + pProductName + "' AND ACTIVE = 1 AND VERSION = '" + pVersion + "'"
+            Dim oLicenseString As String = oDatabase.GetScalarValue(oSql)
+
+            Return oLicenseString
+
+        Catch ex As Exception
+            oLogger.Error("Exception occured in ConfigDbFunct.GetProductLicense()")
+            oLogger.Error(ex)
+        End Try
+
+        Return String.Empty
+
+    End Function
+
+End Class

Config/My Project/AssemblyInfo.vb

@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("Modules.Config")>
-<Assembly: AssemblyCopyright("Copyright © 2023")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyTrademark("1.3.0.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.2.2.1")>
+<Assembly: AssemblyVersion("1.3.0.0")>
-<Assembly: AssemblyFileVersion("1.2.2.1")>
+<Assembly: AssemblyFileVersion("1.3.0.0")>

Interfaces/Interfaces.vbproj

@@ -46,8 +46,8 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GdPicture.NET.14, Version=14.2.89.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+    <Reference Include="GdPicture.NET.14, Version=14.2.90.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.2.89\lib\net462\GdPicture.NET.14.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -113,6 +113,8 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <Compile Include="ZUGFeRDInterface\PDFConverter.vb" />
+    <Compile Include="ZUGFeRDInterface\Peppol_BIS_Billing3017\CreditNoteType.vb" />
+    <Compile Include="ZUGFeRDInterface\Peppol_BIS_Billing3017\InvoiceType.vb" />
     <Compile Include="ZUGFeRDInterface\Validator.vb" />
     <Compile Include="ZUGFeRDInterface\Version1.0\CrossIndustryDocumentType.vb" />
     <Compile Include="ZUGFeRDInterface.vb" />
@@ -146,17 +148,6 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="GdPicture.NET.14.filters.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </AdditionalFiles>
-    <AdditionalFiles Include="GdPicture.NET.14.image.gdimgplug.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </AdditionalFiles>
-    <AdditionalFiles Include="GdPicture.NET.14.Imaging.Rendering.Skia.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </AdditionalFiles>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Base\Base.vbproj">
       <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
@@ -176,11 +167,11 @@
   <PropertyGroup>
     <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" />
   <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>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets'))" />
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets'))" />
   </Target>
 </Project>

Interfaces/My Project/AssemblyInfo.vb

@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Modules.Interfaces")>
-<Assembly: AssemblyCopyright("Copyright © 2024")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("2.1.0.0")>
+<Assembly: AssemblyTrademark("2.2.1.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.1.0.0")>
+<Assembly: AssemblyVersion("2.2.1.0")>
-<Assembly: AssemblyFileVersion("2.1.0.0")>
+<Assembly: AssemblyFileVersion("2.2.1.0")>

Interfaces/ZUGFeRDInterface.vb

@@ -2,6 +2,7 @@
 Imports System.Xml
 Imports System.Xml.Serialization
 Imports DigitalData.Modules.Interfaces.Exceptions
+Imports DigitalData.Modules.Interfaces.Peppol
 Imports DigitalData.Modules.Interfaces.ZUGFeRD
 Imports DigitalData.Modules.Logging
 Imports GdPicture14
@@ -18,12 +19,16 @@ Public Class ZUGFeRDInterface
     Public Const ZUGFERD_SPEC_DEFAULT = "DEFAULT"
     Public Const ZUGFERD_SPEC_10 = "ZUGFERD_10"
     Public Const ZUGFERD_SPEC_2x = "ZUGFERD_2x"
+    Public Const PEPPOL_SPEC_3x_INVOICE = "PEPPOL_BISBILL_3x_INVOICE"
+    Public Const PEPPOL_SPEC_3x_CREDITNOTE = "PEPPOL_BISBILL_3x_CREDITNOTE"
 
     Public Const XMLSCHEMA_ZUGFERD_10 = "Version1_0"
     Public Const XMLSCHEMA_ZUGFERD_20 = "Version2_0"
     Public Const XMLSCHEMA_ZUGFERD_211 = "Version2_1_1"
     Public Const XMLSCHEMA_ZUGFERD_22 = "Version2_2_FacturX"
     Public Const XMLSCHEMA_ZUGFERD_23 = "Version2_3_FacturX"
+    Public Const XMLSCHEMA_PEPPOL_3017_INVOICE = "Version3017_INVOICE"
+    Public Const XMLSCHEMA_PEPPOL_3017_CREDITNOTE = "Version3017_CREDITNOTE"
 
     Private ReadOnly ValidFilenames As New List(Of String) From {
         PDFEmbeds.ZUGFERD_XML_FILENAME.ToUpper,
@@ -51,6 +56,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 AllowPeppol_3017_Schema As Boolean = True
     End Class
 
     Public Class ZugferdResult
@@ -331,6 +337,21 @@ Public Class ZUGFeRDInterface
                 })
             End If
 
+            If _Options.AllowPeppol_3017_Schema Then
+                oAllowedTypes.AddRange(New List(Of AllowedType) From {
+                    New AllowedType With {
+                        .SchemaType = GetType(BISBilling30Invoice.InvoiceType),
+                        .Specification = PEPPOL_SPEC_3x_INVOICE,
+                        .XMLSchema = XMLSCHEMA_PEPPOL_3017_INVOICE
+                    },
+                    New AllowedType With {
+                        .SchemaType = GetType(BISBilling30CreditNote.CreditNoteType),
+                        .Specification = PEPPOL_SPEC_3x_CREDITNOTE,
+                        .XMLSchema = XMLSCHEMA_PEPPOL_3017_CREDITNOTE
+                    }
+                })
+            End If
+
             For Each oType In oAllowedTypes
                 Dim oTypeName As String = oType.SchemaType.FullName
                 Dim oSerializer As New XmlSerializer(oType.SchemaType)

Interfaces/ZUGFeRDInterface/PropertyValues.vb

@@ -35,6 +35,10 @@ Public Class PropertyValues
     Public Class MissingProperty
         Public Description As String
         Public XMLPath As String
+
+        Public Overrides Function ToString() As String
+            Return XMLPath
+        End Function
     End Class
 
     Public Function CheckPropertyValues(pDocument As Object, PropertyMap As Dictionary(Of String, XmlItemProperty), MessageId As String) As CheckPropertyValuesResult

Interfaces/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GdPicture" version="14.2.89" targetFramework="net462" />
+  <package id="GdPicture" version="14.2.90" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.2.89" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.2.90" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
 </packages>

Jobs/My Project/AssemblyInfo.vb

@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Modules.Jobs")>
-<Assembly: AssemblyCopyright("Copyright © 2024")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("2.6.2.0")>
+<Assembly: AssemblyTrademark("2.6.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.6.2.0")>
+<Assembly: AssemblyVersion("2.6.3.0")>
-<Assembly: AssemblyFileVersion("2.6.2.0")>
+<Assembly: AssemblyFileVersion("2.6.3.0")>

Jobs/ZUGFeRD/EmailFunctions.vb

@@ -1,13 +1,11 @@
 Imports System.Collections.Generic
 Imports System.Data
+Imports System.Data.SqlClient
 Imports System.IO
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Database
-Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Jobs.ImportZUGFeRDFiles
-Imports System.Data.SqlClient
-Imports FirebirdSql.Data
 Imports DigitalData.Modules.Interfaces.PropertyValues
+Imports DigitalData.Modules.Logging
 
 Namespace ZUGFeRD
     Public Class EmailFunctions

Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb

@@ -4,10 +4,10 @@ Imports System.Data.SqlClient
 Imports System.IO
 Imports System.Linq
 Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Interfaces
 Imports DigitalData.Modules.Interfaces.Exceptions
-Imports DigitalData.Modules.Interfaces.PropertyValues
 Imports DigitalData.Modules.Jobs.Exceptions
 Imports DigitalData.Modules.Logging
 
@@ -73,8 +73,7 @@ Public Class ImportZUGFeRDFiles
 
         _logger.Debug("Registering GDPicture License")
         If _mssql IsNot Nothing Then
-            Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"
+            _gdpictureLicenseKey = ConfigDbFunct.GetProductLicense("GDPICTURE", "11.2024", _logConfig, _mssql.CurrentConnectionString)
-            _gdpictureLicenseKey = _mssql.GetScalarValue(oSQL)
         Else
             _logger.Warn("GDPicture License could not be registered! MSSQL is not enabled!")
             Throw New ArgumentNullException("MSSQL")
@@ -83,7 +82,6 @@ Public Class ImportZUGFeRDFiles
 
     Public Sub Start(Arguments As Object) Implements IJob.Start
         Dim oArgs As WorkerArgs = Arguments
-        'Dim oPropertyExtractor = New PropertyValues(_logConfig)
         Dim oAttachmentExtractor = New PDFEmbeds(_logConfig)
 
         _EmailOutAccountId = oArgs.EmailOutProfileId
@@ -550,25 +548,9 @@ Public Class ImportZUGFeRDFiles
 
         End If
 
-        DeleteExistingPropertyValues(pMessageId, oConnections)
+        If DeleteExistingPropertyValues(pMessageId, oConnections) = False Then
-
+            Throw New Exception("Could not cleanup data. Exiting.")
-        ' MP 05.06.2024 - Einzel-Inserts durch BULK-Insert abgelöst
+        End If
-        'Dim oFirstProperty = oCheckResult.ValidProperties.FirstOrDefault()
-        'If oFirstProperty IsNot Nothing Then
-        '    InsertPropertyValue(pMessageId, oConnections, New PropertyValues.ValidProperty() With {
-        '        .MessageId = pMessageId,
-        '        .Description = "ZUGFeRDSpezifikation",
-        '        .GroupCounter = 0,
-        '        .IsRequired = False,
-        '        .Value = oDocument.Specification,
-        '        .TableName = oFirstProperty.TableName,
-        '        .TableColumn = "ZUGFERD_SPECIFICATION"
-        '    })
-        'End If
-
-        'For Each oProperty In oCheckResult.ValidProperties
-        '    InsertPropertyValue(pMessageId, oConnections, oProperty)
-        'Next
 
         ' DataTable vorbereiten
         Dim oDataTable As DataTable = FillDataTable(pMessageId, oCheckResult, oDocument.Specification, oDocument.UsedXMLSchema)
@@ -587,6 +569,7 @@ Public Class ImportZUGFeRDFiles
 
         If oBulkResult = False Then
             _logger.Error("Bulk Insert for MessageId [{0}] failed!", pMessageId)
+            Throw New Exception("Bulk Insert failed! Exiting.")
         End If
 
         _logger.Info("Bulk Insert finished. [{0}] rows inserted for MessageId [{1}].", oDataTable.Rows.Count, pMessageId)
@@ -663,38 +646,17 @@ Public Class ImportZUGFeRDFiles
         Return oDataTable
     End Function
 
-    Private Sub DeleteExistingPropertyValues(pMessageId As String, pConnections As DatabaseConnections)
+    Private Function DeleteExistingPropertyValues(pMessageId As String, pConnections As DatabaseConnections) As Boolean
         Dim oDelSQL = $"DELETE FROM TBEDMI_ITEM_VALUE where REFERENCE_GUID = '{pMessageId}'"
-        Dim oStep As String
+        Dim oStep As String = "TBEDMI_ITEM_VALUE Delete MessageID Items"
 
-        oStep = "TBEDMI_ITEM_VALUE Delete MessageID Items"
         Try
-            _mssql.ExecuteNonQueryWithConnectionObject(oDelSQL, pConnections.SQLServerConnection, MSSQLServer.TransactionMode.ExternalTransaction, pConnections.SQLServerTransaction)
+            Dim retValue As Boolean = _mssql.ExecuteNonQueryWithConnectionObject(oDelSQL, pConnections.SQLServerConnection, MSSQLServer.TransactionMode.ExternalTransaction, pConnections.SQLServerTransaction)
+            Return retValue
         Catch ex As Exception
             _logger.Warn("Step [{0}] with SQL [{1}] was not successful.", oStep, oDelSQL)
         End Try
-    End Sub
+    End Function
-
-    ' Alte Insert-Methode
-    'Private Sub InsertPropertyValue(pMessageId As String, pConnections As DatabaseConnections, pProperty As PropertyValues.ValidProperty)
-    '    Dim oGroupCounterValue = pProperty.GroupCounter
-
-    '    ' If GroupCounter is -1, it means this is a default property that can only occur once.
-    '    ' Set the actual inserted value to 0
-    '    If oGroupCounterValue = -1 Then
-    '        oGroupCounterValue = 0
-    '    End If
-
-    '    Dim oCommand = $"INSERT INTO {pProperty.TableName} (REFERENCE_GUID, ITEM_DESCRIPTION, ITEM_VALUE, GROUP_COUNTER, SPEC_NAME, IS_REQUIRED) VALUES 
-    '                                        ('{pMessageId}', '{pProperty.Description}', '{pProperty.Value.Replace("'", "''")}', {oGroupCounterValue},'{pProperty.TableColumn}','{pProperty.IsRequired}')"
-    '    _logger.Debug("Mapping Property [{0}] with value [{1}], Will be inserted into table [{2}]", pProperty.TableColumn, pProperty.Value.Replace("'", "''"), pProperty.TableName)
-
-    '    ' Insert into SQL Server
-    '    Dim oResult = _mssql.ExecuteNonQueryWithConnectionObject(oCommand, pConnections.SQLServerConnection, MSSQLServer.TransactionMode.ExternalTransaction, pConnections.SQLServerTransaction)
-    '    If oResult = False Then
-    '        _logger.Warn($"SQL Command [{oCommand}] was not successful. Check the log.")
-    '    End If
-    'End Sub
 
     Private Function BulkInsert(pConnections As DatabaseConnections, pTable As DataTable, pDestinationTable As String, pColumns As List(Of String)) As Boolean
 

Jobs/ZUGFeRD/WorkerArgs.vb

@@ -18,15 +18,19 @@ Public Class WorkerArgs
     Public EmailOutProfileId As Integer = 0
     Public RejectionTemplateId As Integer = 0
 
-    ' Misc Flag Parameters
+    ' Misc Parameters
     Public ExceptionEmailAddress As String = Nothing
     Public IgnoreRejectionStatus As Boolean = False
     Public MaxAttachmentSizeInMegaBytes As Integer = -1
     Public MinFileAgeInMinutes As Integer = 5
     Public NamePortal As String = "NO PORTAL_NAME IN CONFIG"
+    Public GDPictureVersion As String = String.Empty
 
+    ' Feature Flags
     Public AllowFacturX As Boolean = True
     Public AllowXRechnung As Boolean = True
     Public AllowZugferd10 As Boolean = True
     Public AllowZugferd2x As Boolean = True
+    Public AllowPeppolBISBill3x As Boolean = True
+
 End Class