merge

2024-02-14 08:22:36 +01:00
parent 1d4b53bce6 eb291ea140
commit c587692b75
10 changed files with 79 additions and 62 deletions
--- a/VERAGAddIn.sln
+++ b/VERAGAddIn.sln
@@ -127,8 +127,8 @@ Global
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|x64
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|x64
+		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.Build.0 = Debug|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
--- a/VERAGAddIn/ThisAddIn.vb
+++ b/VERAGAddIn/ThisAddIn.vb
@@ -28,7 +28,7 @@ Public Class ThisAddIn
        inspectors = Me.Application.Inspectors
        currentExplorer = Me.Application.ActiveExplorer
        SharedExplorer = currentExplorer
-        checkConnection()
+        'checkConnection()

        AddHandler VERAGRibbon.bla, Sub()
                                        '  MsgBox("JOAS")
@@ -179,7 +179,7 @@ Public Class ThisAddIn

    Private Sub checkConnection()

-        Dim con = New VERAG_PROG_ALLGEMEIN.SQL
+        Dim con = New SQL

        For Each COMAddIn As COMAddIn In Me.Application.COMAddIns

--- a/VERAGAddIn/VERAGAddIn.vbproj
+++ b/VERAGAddIn/VERAGAddIn.vbproj
@@ -33,11 +33,11 @@
    <TargetFrameworkProfile />
    <IsWebBootstrapper>True</IsWebBootstrapper>
    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <PublishUrl>\\ftps.verag.ag\g\ftp\programme\VERAGAddin\</PublishUrl>
-    <InstallUrl>http://ftps.verag.ag/VERAGAddin/</InstallUrl>
+    <PublishUrl>\\ftps.verag.ag\g\ftp\programme\VERAGAddin_Test\</PublishUrl>
+    <InstallUrl>http://ftps.verag.ag/VERAGAddin_Test/</InstallUrl>
    <TargetCulture>de</TargetCulture>
-    <ApplicationVersion>1.0.1.108</ApplicationVersion>
-    <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
+    <ApplicationVersion>1.0.1.115</ApplicationVersion>
+    <AutoIncrementApplicationRevision>false</AutoIncrementApplicationRevision>
    <UpdateEnabled>true</UpdateEnabled>
    <UpdateInterval>0</UpdateInterval>
    <UpdateIntervalUnits>days</UpdateIntervalUnits>
@@ -170,7 +170,7 @@
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="VERAG_PROG_ALLGEMEIN">
-      <HintPath>..\..\SDL\SDL\SDL\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
+      <HintPath>..\..\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
@@ -260,9 +260,11 @@
    <EmbeddedResource Include="rbnVERAG.resx">
      <DependentUpon>rbnVERAG.vb</DependentUpon>
    </EmbeddedResource>
-    <None Include="AL20210908.pfx" />
+    <None Include="AL20231110.pfx" />
    <None Include="app.config" />
    <None Include="Ich habe keine Ahnung, was ich hier mache.pfx" />
+    <None Include="PrivateCodeSignaturDaniel2024.pfx" />
+    <None Include="PrivateCodeSignaturDaniel20240131.pfx" />
    <None Include="Resources\GS\gsdll32.lib">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
@@ -293,9 +295,6 @@
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
-    <None Include="VERAGAddIn_1_TemporaryKey.pfx" />
-    <None Include="VeragAddIn_tempKey.pfx" />
-    <None Include="VERAGAddIn_TemporaryKey.pfx" />
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="stdole1">
@@ -365,7 +364,7 @@
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
  </PropertyGroup>
  <PropertyGroup>
-    <OptionExplicit>On</OptionExplicit>
+    <OptionExplicit>Off</OptionExplicit>
  </PropertyGroup>
  <PropertyGroup>
    <OptionCompare>Binary</OptionCompare>
@@ -377,10 +376,10 @@
    <SignManifests>true</SignManifests>
  </PropertyGroup>
  <PropertyGroup>
-    <ManifestKeyFile>AL20210908.pfx</ManifestKeyFile>
+    <ManifestKeyFile>AL20231110.pfx</ManifestKeyFile>
  </PropertyGroup>
  <PropertyGroup>
-    <ManifestCertificateThumbprint>34D75D5089806BE69485715D014CE0611D10E677</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>75156A186435E8542612CE6E7E26CA9FCE0A5BAF</ManifestCertificateThumbprint>
  </PropertyGroup>
  <PropertyGroup>
    <SignAssembly>false</SignAssembly>
@@ -392,7 +391,7 @@
    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
  </PropertyGroup>
  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>VeragAddIn_tempKey.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>PrivateCodeSignaturDaniel20240131.pfx</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <!-- Include the build rules for a Visual Basic project. -->
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
@@ -409,4 +408,7 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
+  <PropertyGroup>
+    <PostBuildEvent>\\192.168.0.90\f\Zertifikate\signtool.exe sign /f \\192.168.0.90\f\Zertifikate\AL20231110.pfx /p zYGNNJRG+tzlw90Rz6NqOXnoeBycFCy07YcUsY5iD0M= "Aviso.exe"</PostBuildEvent>
+  </PropertyGroup>
 </Project>
--- a/VERAGAddIn/frmAvisoAnfügen.Designer.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.Designer.vb
@@ -36,7 +36,6 @@ Partial Class frmAvisoAnfuegen
        Me.cbx = New System.Windows.Forms.CheckBox()
        Me.CheckBox1 = New System.Windows.Forms.CheckBox()
        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.cboArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.txtSrchDat = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.dgvSendungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -48,6 +47,8 @@ Partial Class frmAvisoAnfuegen
        Me.bttnSaveMail = New System.Windows.Forms.Button()
        Me.btnSaveAttachments = New System.Windows.Forms.Button()
        Me.Label4 = New System.Windows.Forms.Label()
+        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.Pfad = New System.Windows.Forms.DataGridViewTextBoxColumn()
        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvSendungen, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvAviso, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -191,7 +192,7 @@ Partial Class frmAvisoAnfuegen
        Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
        Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvAnhaenge.ColumnHeadersVisible = False
-        Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName})
+        Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName, Me.Pfad})
        Me.dgvAnhaenge.Location = New System.Drawing.Point(15, 665)
        Me.dgvAnhaenge.Name = "dgvAnhaenge"
        Me.dgvAnhaenge.ReadOnly = True
@@ -200,13 +201,6 @@ Partial Class frmAvisoAnfuegen
        Me.dgvAnhaenge.Size = New System.Drawing.Size(615, 129)
        Me.dgvAnhaenge.TabIndex = 21
        '
-        'columnName
-        '
-        Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.columnName.HeaderText = "Name"
-        Me.columnName.Name = "columnName"
-        Me.columnName.ReadOnly = True
-        '
        'cboArt
        '
        Me.cboArt._allowedValuesFreiText = Nothing
@@ -409,6 +403,20 @@ Partial Class frmAvisoAnfuegen
        Me.Label4.TabIndex = 39
        Me.Label4.Text = "Testsystem"
        '
+        'columnName
+        '
+        Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.columnName.HeaderText = "Name"
+        Me.columnName.Name = "columnName"
+        Me.columnName.ReadOnly = True
+        '
+        'Pfad
+        '
+        Me.Pfad.HeaderText = "Pfad"
+        Me.Pfad.Name = "Pfad"
+        Me.Pfad.ReadOnly = True
+        Me.Pfad.Visible = False
+        '
        'frmAvisoAnfuegen
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -471,8 +479,9 @@ Partial Class frmAvisoAnfuegen
    Friend WithEvents Label3 As Windows.Forms.Label
    Friend WithEvents cboArt As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents dgvAnhaenge As VERAG_PROG_ALLGEMEIN.MyDatagridview
-    Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn
    Friend WithEvents cbx As Windows.Forms.CheckBox
    Friend WithEvents CheckBox1 As Windows.Forms.CheckBox
    Friend WithEvents Label4 As Windows.Forms.Label
+    Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents Pfad As Windows.Forms.DataGridViewTextBoxColumn
 End Class
--- a/VERAGAddIn/frmAvisoAnfügen.resx
+++ b/VERAGAddIn/frmAvisoAnfügen.resx
@@ -120,6 +120,9 @@
  <metadata name="columnName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="Pfad.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
--- a/VERAGAddIn/frmAvisoAnfügen.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.vb
@@ -63,10 +63,11 @@ Public Class frmAvisoAnfuegen
                    Dim sp = a.Split("\")
                    display = sp(sp.Count - 1)
                End If
-                dgvAnhaenge.Rows.Add({display})
+                dgvAnhaenge.Rows.Add({display, a})
            Next
        End If
        dgvAnhaenge.ClearSelection()
+
    End Sub

    Private Sub txtLKWNr_TextChanged(sender As Object, e As KeyEventArgs) Handles txtLKWNr.KeyDown, txtAbfertigungsnummer.KeyDown, cboFiliale.KeyDown
@@ -92,7 +93,7 @@ Public Class frmAvisoAnfuegen

                Dim sql = "SELECT TOP 10 AvisoID, Grenzstelle as Grenze, Datum, LKW_Nr,Auftraggeber,Frächter,Firma FROM Aviso left join tblSendungen on tblSnd_AvisoID=AvisoID WHERE  status <>2  " & firma & " "
                If IsDate(txtSrchDat.Text) Then sql &= " AND Datum > '" & CDate(txtSrchDat.Text).ToShortDateString & "'"
-                If txtLKWNr.Text <> "" Then sql &= " AND LKW_Nr LIKE '%" & txtLKWNr.Text & "%'"
+                If txtLKWNr.Text <> "" Then sql &= " AND (LKW_Nr LIKE '%" & txtLKWNr.Text & "%' OR AvisoID ='" & txtLKWNr.Text & "')"


                If cboFiliale._value <> "" Then sql &= " AND FilialenNr LIKE '%" & cboFiliale._value & "%'"
@@ -102,7 +103,9 @@ Public Class frmAvisoAnfuegen
                .SET_SQL(sql, "AVISO")
                .LOAD()

-                .Columns("AvisoId").Visible = False
+                '.Columns("AvisoId").Visible = False
+                .Columns("AvisoId").HeaderText = "LKW-ID"
+                .Columns("AvisoId").Width = 60
                .AutoSizeColumnsMode = Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
                .Columns("Grenze").Width = 40
                .Columns("Datum").Width = 80
@@ -242,10 +245,9 @@ Public Class frmAvisoAnfuegen

        Try
            If dgvAnhaenge.SelectedRows.Count > 0 Then
-                If dgvAnhaenge.SelectedRows(0).Cells(0).Value <> "" Then
+                If dgvAnhaenge.SelectedRows(0).Cells(1).Value <> "" Then

-                    Dim strTmpPath As String = System.IO.Path.GetTempPath()
-                    Process.Start(strTmpPath & dgvAnhaenge.SelectedRows(0).Cells(0).Value)
+                    Process.Start(dgvAnhaenge.SelectedRows(0).Cells(1).Value)

                End If
            End If
--- a/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb
+++ b/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb
@@ -38,10 +38,11 @@ Partial Class frmAvisoFormularAnfuegen
        Me.pbAnhaenge = New System.Windows.Forms.PictureBox()
        Me.lblMultiAttachements = New System.Windows.Forms.Label()
        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
        Me.btnOK = New System.Windows.Forms.Button()
        Me.btnCancel = New System.Windows.Forms.Button()
+        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.Pfad = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.panelKunden.SuspendLayout()
        Me.pnlBottom.SuspendLayout()
        CType(Me.pbAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -202,7 +203,7 @@ Partial Class frmAvisoFormularAnfuegen
        Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
        Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvAnhaenge.ColumnHeadersVisible = False
-        Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName})
+        Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName, Me.Pfad})
        Me.dgvAnhaenge.Location = New System.Drawing.Point(12, 19)
        Me.dgvAnhaenge.Name = "dgvAnhaenge"
        Me.dgvAnhaenge.ReadOnly = True
@@ -212,13 +213,6 @@ Partial Class frmAvisoFormularAnfuegen
        Me.dgvAnhaenge.TabIndex = 39
        Me.dgvAnhaenge.Visible = False
        '
-        'columnName
-        '
-        Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.columnName.HeaderText = "Name"
-        Me.columnName.Name = "columnName"
-        Me.columnName.ReadOnly = True
-        '
        'MyPanel1
        '
        Me.MyPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -251,6 +245,20 @@ Partial Class frmAvisoFormularAnfuegen
        Me.btnCancel.Text = "Abbrechen"
        Me.btnCancel.UseVisualStyleBackColor = True
        '
+        'columnName
+        '
+        Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.columnName.HeaderText = "Name"
+        Me.columnName.Name = "columnName"
+        Me.columnName.ReadOnly = True
+        '
+        'Pfad
+        '
+        Me.Pfad.HeaderText = "Pfad"
+        Me.Pfad.Name = "Pfad"
+        Me.Pfad.ReadOnly = True
+        Me.Pfad.Visible = False
+        '
        'frmAvisoFormularAnfuegen
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -287,8 +295,9 @@ Partial Class frmAvisoFormularAnfuegen
    Friend WithEvents pbAnhaenge As Windows.Forms.PictureBox
    Friend WithEvents lblMultiAttachements As Windows.Forms.Label
    Friend WithEvents dgvAnhaenge As MyDatagridview
-    Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn
    Friend WithEvents MyPanel1 As MyPanel
    Friend WithEvents btnOK As Windows.Forms.Button
    Friend WithEvents btnCancel As Windows.Forms.Button
+    Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents Pfad As Windows.Forms.DataGridViewTextBoxColumn
 End Class
--- a/VERAGAddIn/frmAvisoFormularAnfügen.resx
+++ b/VERAGAddIn/frmAvisoFormularAnfügen.resx
@@ -120,6 +120,9 @@
  <metadata name="columnName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="Pfad.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
--- a/VERAGAddIn/frmAvisoFormularAnfügen.vb
+++ b/VERAGAddIn/frmAvisoFormularAnfügen.vb
@@ -355,7 +355,7 @@ Public Class frmAvisoFormularAnfuegen
                    Dim sp = a.Split("\")
                    display = sp(sp.Count - 1)
                End If
-                dgvAnhaenge.Rows.Add({display})
+                dgvAnhaenge.Rows.Add({display, a})
            Next
            ATTTemp = ATT
        End If
@@ -471,10 +471,9 @@ Public Class frmAvisoFormularAnfuegen
    Private Sub dgvAnhaenge_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvAnhaenge.CellDoubleClick, dgvAnhaenge.CellContentDoubleClick
        Try
            If dgvAnhaenge.SelectedRows.Count > 0 Then
-                If dgvAnhaenge.SelectedRows(0).Cells(0).Value <> "" Then
+                If dgvAnhaenge.SelectedRows(0).Cells(1).Value <> "" Then

-                    Dim strTmpPath As String = System.IO.Path.GetTempPath()
-                    Process.Start(strTmpPath & dgvAnhaenge.SelectedRows(0).Cells(0).Value)
+                    Process.Start(dgvAnhaenge.SelectedRows(0).Cells(1).Value)

                End If
            End If
--- a/VERAGAddIn/rbnVERAG.vb
+++ b/VERAGAddIn/rbnVERAG.vb
@@ -4,23 +4,12 @@ Imports VERAG_PROG_ALLGEMEIN
 Imports Microsoft.Office.Tools.Ribbon
 Imports System.Windows.Forms
 Imports Microsoft.Office.Interop
-Imports VERAGAddIn.ThisAddIn
 Imports System.Runtime.InteropServices
 Imports System.Text.RegularExpressions
-Imports System.IO
-Imports SDL
 Imports System.Net
-Imports System.Security.Policy
-Imports System.Diagnostics.Eventing.Reader
-Imports System.Runtime.InteropServices.ComTypes
-Imports System.Drawing
-Imports System.Threading.Tasks
-Imports System.Net.Http
-Imports System.Diagnostics
-Imports VERAG_PROG_ALLGEMEIN.Kleinma.Controls
-Imports System.Data.Odbc
 Imports System.Reflection

+
 Public Class VERAGRibbon
    Dim LOGIN_OK = False
    Public Shared Event bla()
@@ -58,7 +47,7 @@ Public Class VERAGRibbon

    Private Sub Button4_Click(sender As Object, e As RibbonControlEventArgs) Handles Button4.Click
        Try
-            MsgBox("User: " & System.Security.Principal.WindowsIdentity.GetCurrent().Name & vbNewLine & "Version: " & Assembly.GetExecutingAssembly().GetName().Version.ToString)
+            MsgBox("User: " & System.Security.Principal.WindowsIdentity.GetCurrent().Name & vbNewLine & "Version: " & Assembly.GetExecutingAssembly().GetName().Version.ToString & vbNewLine & "System: " & IIf(cAllgemein.TESTSYSTEM, "TEST", "PRODUKTIV"))
        Catch ex As Exception
        End Try
    End Sub
@@ -123,6 +112,7 @@ Public Class AVISO_Mail_Functions

                    addMailToAviso(mailItem, sender)
                Else
+
                    MsgBox("Die markierte Email kann nicht verarbeitet werden!" & vbNewLine & "Bitte andere Email verwenden.")
                End If
            End If
@@ -612,7 +602,7 @@ Public Class AVISO_Mail_Functions
                Dim cnt = 0
                For Each l In sp
                    If cnt > 0 AndAlso l.Contains(""">") Then ' ENDE
-                        Dim link = ("https://web01.ekol.com/documentservice/download/" & l.ToString.Substring(0, l.ToString.IndexOf(""">") - 1))
+                        Dim link = ("https://web01.ekol.com/documentservice/download/" & l.ToString.Substring(0, l.ToString.IndexOf(""">")))

                        'Ansonten stüzt der Webservice-Aufruf ab! ABER -> For .NET 4.7 or later, the System.Net.ServicePointManager.SecurityProtocol should not be set manualy!
                        System.Net.ServicePointManager.SecurityProtocol = System.Net.ServicePointManager.SecurityProtocol Or SecurityProtocolType.Tls11 Or SecurityProtocolType.Tls12
@@ -622,7 +612,7 @@ Public Class AVISO_Mail_Functions
                        My.Computer.Network.DownloadFile(link, TMP_PATH)


-                        If IO.File.Exists(TMP_PATH) Then
+                        If IO.File.Exists(TMP_PATH) AndAlso TMP_PATH.Contains(".pdf") Then
                            ATT.Add(TMP_PATH)
                        End If