Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

SDL/My Project/AssemblyInfo.vb

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

SDL/OriginalArchiv_ATR/frmATR.Designer.vb

@@ -56,6 +56,7 @@ Partial Class frmATR
         Me.PictureBox6 = New System.Windows.Forms.PictureBox()
         Me.Label10 = New System.Windows.Forms.Label()
         Me.Panel3 = New System.Windows.Forms.Panel()
+        Me.lblErr_ErhaltenDatum = New System.Windows.Forms.Label()
         Me.Label9 = New System.Windows.Forms.Label()
         Me.cbxKurierPaketdienst = New System.Windows.Forms.CheckBox()
         Me.txtErhaltenReferenz = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -72,7 +73,6 @@ Partial Class frmATR
         Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.txtInfo = New System.Windows.Forms.RichTextBox()
         Me.lblErr_Ausstellungsdatum = New System.Windows.Forms.Label()
-        Me.lblErr_ErhaltenDatum = New System.Windows.Forms.Label()
         Me.Panel1.SuspendLayout()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel2.SuspendLayout()
@@ -627,6 +627,19 @@ Partial Class frmATR
         Me.Panel3.Size = New System.Drawing.Size(462, 118)
         Me.Panel3.TabIndex = 98
         '
+        'lblErr_ErhaltenDatum
+        '
+        Me.lblErr_ErhaltenDatum.AutoSize = True
+        Me.lblErr_ErhaltenDatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Italic)
+        Me.lblErr_ErhaltenDatum.ForeColor = System.Drawing.Color.Red
+        Me.lblErr_ErhaltenDatum.Location = New System.Drawing.Point(245, 26)
+        Me.lblErr_ErhaltenDatum.Name = "lblErr_ErhaltenDatum"
+        Me.lblErr_ErhaltenDatum.Size = New System.Drawing.Size(56, 13)
+        Me.lblErr_ErhaltenDatum.TabIndex = 109
+        Me.lblErr_ErhaltenDatum.Text = "Pflichtfeld!"
+        Me.lblErr_ErhaltenDatum.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.lblErr_ErhaltenDatum.Visible = False
+        '
         'Label9
         '
         Me.Label9.AutoSize = True
@@ -855,19 +868,6 @@ Partial Class frmATR
         Me.lblErr_Ausstellungsdatum.TextAlign = System.Drawing.ContentAlignment.TopRight
         Me.lblErr_Ausstellungsdatum.Visible = False
         '
-        'lblErr_ErhaltenDatum
-        '
-        Me.lblErr_ErhaltenDatum.AutoSize = True
-        Me.lblErr_ErhaltenDatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Italic)
-        Me.lblErr_ErhaltenDatum.ForeColor = System.Drawing.Color.Red
-        Me.lblErr_ErhaltenDatum.Location = New System.Drawing.Point(245, 26)
-        Me.lblErr_ErhaltenDatum.Name = "lblErr_ErhaltenDatum"
-        Me.lblErr_ErhaltenDatum.Size = New System.Drawing.Size(56, 13)
-        Me.lblErr_ErhaltenDatum.TabIndex = 109
-        Me.lblErr_ErhaltenDatum.Text = "Pflichtfeld!"
-        Me.lblErr_ErhaltenDatum.TextAlign = System.Drawing.ContentAlignment.TopRight
-        Me.lblErr_ErhaltenDatum.Visible = False
-        '
         'frmATR
         '
         Me.AllowDrop = True

SDL/OriginalArchiv_ATR/frmATR.vb

@@ -482,4 +482,5 @@ Public Class frmATR
         Dim webAddress As String = "https://wiki.verag.ag/de/software/aviso/howtos/ATRArchiv"
         Process.Start(webAddress)
     End Sub
+
 End Class

SDL/SDL.vbproj

@@ -119,9 +119,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dll\SharpSSH\DiffieHellman.dll</HintPath>
     </Reference>
-    <Reference Include="documentformat.openxml%281%29, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>F:\PROGRAMMIERUNG\dll\documentformat.openxml(1).dll</HintPath>
+      <HintPath>F:\PROGRAMMIERUNG\dll\OpenXML\DocumentFormat.OpenXml.dll</HintPath>
     </Reference>
     <Reference Include="ExcelNumberFormat, Version=1.0.10.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL">
       <HintPath>..\..\..\AVISO\Aviso\packages\ExcelNumberFormat.1.0.10\lib\net20\ExcelNumberFormat.dll</HintPath>