Merge Commit

2025-07-01 10:26:22 +02:00 · 2025-07-01 10:26:22 +02:00 · 62322d1abe
commit 62322d1abe
parent ab82f41907 2814955490
9 changed files with 71 additions and 69 deletions
--- a/Controls.DocumentViewer/DocumentViewer.resx
+++ b/Controls.DocumentViewer/DocumentViewer.resx
@ -161,26 +161,6 @@
        NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy
        OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00
        LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-</value>
-  </data>
-  <data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
-        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
-        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
-        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
-        MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
-        YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
-        MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
-        LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
-        Cjwvc3ZnPgs=
 </value>
  </data>
  <data name="btnPrevHighlight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -243,6 +223,26 @@
        ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
        LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
        QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
+        MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
+        YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
+        MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
+        LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
+        Cjwvc3ZnPgs=
 </value>
  </data>
  <metadata name="PrintDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/Controls.DocumentViewer/DocumentViewer.vbproj
+++ b/Controls.DocumentViewer/DocumentViewer.vbproj
@ -78,21 +78,17 @@
    <Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Base">
+      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Config">
+      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Messaging, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Messaging">
+      <HintPath>..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.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>
@ -164,9 +160,15 @@
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
+    <Reference Include="IndexRange, Version=1.0.3.0, Culture=neutral, PublicKeyToken=35e6a3c4212514c6, processorArchitecture=MSIL">
+      <HintPath>..\packages\IndexRange.1.0.3\lib\net45\IndexRange.dll</HintPath>
+    </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.Bcl.HashCode, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.HashCode.6.0.0\lib\net462\Microsoft.Bcl.HashCode.dll</HintPath>
+    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <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>
@ -177,8 +179,8 @@
    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
    </Reference>
-    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
+    <Reference Include="OpenMcdf, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenMcdf.3.0.0\lib\netstandard2.0\OpenMcdf.dll</HintPath>
    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
--- a/Controls.DocumentViewer/My
+++ b/Controls.DocumentViewer/My
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("2.0.0.0")>
-<Assembly: AssemblyFileVersion("2.0.0.0")>
+<Assembly: AssemblyVersion("2.0.1.0")>
+<Assembly: AssemblyFileVersion("2.0.1.0")>
--- a/Controls.DocumentViewer/packages.config
+++ b/Controls.DocumentViewer/packages.config
@ -5,14 +5,16 @@
  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
  <package id="GdPicture" version="14.3.3" targetFramework="net462" />
  <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
+  <package id="IndexRange" version="1.0.3" targetFramework="net462" />
  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.HashCode" version="6.0.0" targetFramework="net462" />
  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
  <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
  <package id="NLog" version="5.0.5" targetFramework="net461" />
-  <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
+  <package id="OpenMcdf" version="3.0.0" targetFramework="net462" />
  <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
  <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
  <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("LookupGrid")>
 <Assembly: AssemblyCopyright("Copyright © 2024")>
-<Assembly: AssemblyTrademark("3.4.0.0")>
+<Assembly: AssemblyTrademark("3.4.3.0")>

 <Assembly: ComVisible(False)>

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("3.4.2.0")>
-<Assembly: AssemblyFileVersion("3.4.2.0")>
+<Assembly: AssemblyVersion("3.4.3.0")>
+<Assembly: AssemblyFileVersion("3.4.3.0")>
--- a/Controls.LookupGrid/frmLookupGrid.Designer.vb
+++ b/Controls.LookupGrid/frmLookupGrid.Designer.vb
@ -50,6 +50,7 @@ Partial Class frmLookupGrid
        '
        Me.viewLookup.GridControl = Me.gridLookup
        Me.viewLookup.Name = "viewLookup"
+        Me.viewLookup.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
        Me.viewLookup.OptionsView.ShowGroupPanel = False
        '
        'Panel1
--- a/Services.EmailService/DDEmailService.vbproj
+++ b/Services.EmailService/DDEmailService.vbproj
@ -49,26 +49,22 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="DigitalData.Modules.Base">
-      <HintPath>..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Database">
+      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Encryption, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Encryption">
+      <HintPath>..\..\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Messaging, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Messaging">
+      <HintPath>..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
    </Reference>
    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
--- a/Services.EmailService/EmailService.vb
+++ b/Services.EmailService/EmailService.vb
@ -119,6 +119,7 @@ Public Class EmailService

            If _AnyDatabaseInitialized Then
                _Logger.Info("Starting Initial Run...")
+                _ConfigManager.Save()
                _EmailQueue.RunWorkerAsync()
            End If
        Catch ex As Exception
@ -275,10 +276,10 @@ Public Class EmailService
        End Try
    End Function

-    Private Function SendEmailFrom(Database As DatabaseType, MSSQLInstance As MSSQLServer)
+    Private Function SendEmailFrom(pDatabase As DatabaseType, pMSSQLInstance As MSSQLServer)
        Try
            Dim oSQL As String = String.Empty
-            Dim oEmailAccounts As List(Of EmailAccount) = GetAccounts(Database, MSSQLInstance)
+            Dim oEmailAccounts As List(Of EmailAccount) = GetAccounts(pDatabase, pMSSQLInstance)
            Dim oEmailQueue As DataTable = Nothing

            If IsNothing(oEmailAccounts) Then
@ -291,7 +292,7 @@ Public Class EmailService
                Return False
            End If

-            Select Case Database
+            Select Case pDatabase
                Case DatabaseType.Firebird
                    oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''"
                    oEmailQueue = _Firebird.GetDatatable(oSQL)
@ -300,10 +301,10 @@ Public Class EmailService
                        _Logger.Debug("My.Settings.MSSQL_SELECT will be used..")
                        oSQL = My.Settings.MSSQL_SELECT
                    Else
-                        oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> ''"
+                        oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> '' ORDER BY GUID"
                    End If

-                    oEmailQueue = MSSQLInstance.GetDatatable(oSQL)
+                    oEmailQueue = pMSSQLInstance.GetDatatable(oSQL)
            End Select

            If IsNothing(oEmailQueue) Then
@ -326,7 +327,7 @@ Public Class EmailService

                    Dim oAccountQueue As DataRow()

-                    Select Case Database
+                    Select Case pDatabase
                        Case DatabaseType.Firebird
                            oAccountQueue = oEmailQueue.Select($"EMAIL_ACCOUNT_ID = {oAccount.Guid}", "GUID ASC")
                        Case Else
@ -339,7 +340,7 @@ Public Class EmailService
                        Continue For
                    End If

-                    _Logger.Debug("Preparing to send [{0}] mails..", oAccountQueue.Count)
+                    _Logger.Info("Preparing to send [{0}] mails for Email-Account [{1}]", oAccountQueue.Count, oAccount.Guid)

                    ' ======= Initialize Sender =======

@ -356,7 +357,7 @@ Public Class EmailService
                    Dim oResult As Mail.MailSession.SessionInfo = _MailSender.Connect(oAccount.Server, oAccount.Port, oAccount.Username, oAccount.Password, oAccount.AuthType, oOptions)

                    If oResult.Connected = False Then
-                        _Logger.Warn("Could not connect to server. Skipping.")
+                        _Logger.Warn("Could not connect to server! (Method: Mail.MailSession.SessionInfo) # Skipping...")
                        Continue For

                    End If
@ -379,7 +380,7 @@ Public Class EmailService
                        Dim ATT1_RELATED_ID = String.Empty
                        Dim ATT1_REL_TYPE = String.Empty

-                        Select Case Database
+                        Select Case pDatabase
                            Case DatabaseType.Firebird
                                oGuid = oRow.Item("GUID")

@ -421,7 +422,7 @@ Public Class EmailService
                        If ATT1_RELATED_ID <> String.Empty And ATT1_REL_TYPE <> String.Empty Then
                            _Logger.Info($"Attachment via byte/ID [{ATT1_RELATED_ID}]...")
                            If ATT1_REL_TYPE = "EnvelopeResult" Then
-                                GetEnvelope_Result_FileStreamByte(ATT1_RELATED_ID, MSSQLInstance)
+                                GetEnvelope_Result_FileStreamByte(ATT1_RELATED_ID, pMSSQLInstance)
                            End If
                            If IsNothing(_AttachmentByteData) = False Then
                                Dim oTempFolder = _TempFiles.TempPath
@ -455,13 +456,13 @@ Public Class EmailService
                            oTotalSent.Add(oEmailTo)
                            oSuccessfulSent.Add(oEmailTo)

-                            Select Case Database
+                            Select Case pDatabase
                                Case DatabaseType.Firebird
                                    oSQL = GetFirebirdUpdateString(oComment, oGuid)
                                    _Firebird.ExecuteNonQuery(oSQL)
                                Case DatabaseType.MSSQL
                                    oSQL = GetSQLUpdateString(oComment, oGuid)
-                                    MSSQLInstance.ExecuteNonQuery(oSQL)
+                                    pMSSQLInstance.ExecuteNonQuery(oSQL)
                            End Select
                            _Logger.Info($"EmailID [{oGuid.ToString}] has been send to: {oEmailTo}")

@ -469,7 +470,7 @@ Public Class EmailService
                            oTotalSent.Add(oEmailTo)
                            oFailedSent.Add(oEmailTo)

-                            Select Case Database
+                            Select Case pDatabase
                                Case DatabaseType.MSSQL
                                    Dim oErrorMessage As String
                                    If String.IsNullOrEmpty(_limilab.ErrorMessage) = False Then
@ -478,7 +479,7 @@ Public Class EmailService
                                        oErrorMessage = $"Could not sent email to email adress. Check log!"
                                    End If
                                    oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE(), ERROR_TIMESTAMP = GETDATE(), ERROR_MSG = '{oErrorMessage}' WHERE GUID = {oGuid} "
-                                    MSSQLInstance.ExecuteNonQuery(oSQL)
+                                    pMSSQLInstance.ExecuteNonQuery(oSQL)

                            End Select
                        End If
--- a/Services.EmailService/My
+++ b/Services.EmailService/My
@ -32,4 +32,4 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")>

 <Assembly: AssemblyVersion("1.7.3.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.7.3.0")>