Update Vermerke + Dokumente link

2026-03-18 11:24:58 +01:00
parent 5490712df7
commit 69f4462c08
6 changed files with 1541 additions and 804 deletions
--- a/Aviso/App.config
+++ b/Aviso/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <configSections>
    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -8,10 +8,15 @@
  <connectionStrings>
    <add name="AVISO.My.MySettings.AVISO_ConnectionString_TEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;" providerName="System.Data.SqlClient" />
  </connectionStrings>
  <appSettings>
    <add key="CustomerPortalApiBaseUrl" value="https://login.server.verag.ag" />
    <add key="CustomerPortalApiUsername" value="admin" />
    <add key="CustomerPortalApiPassword" value="veragadmin" />
    <add key="ClientSettingsProvider.ServiceUri" value="" />
  </appSettings>
  <startup>
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
  </startup>
  <userSettings>
    <AVISO.My.MySettings>
      <setting name="frmMainSize" serializeAs="String">
@@ -93,4 +98,16 @@
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <system.web>
    <membership defaultProvider="ClientAuthenticationMembershipProvider">
      <providers>
        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
      </providers>
    </membership>
    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
      <providers>
        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
      </providers>
    </roleManager>
  </system.web>
 </configuration>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
-<Assembly: AssemblyVersion("4.2.4.5")>
+<Assembly: AssemblyVersion("4.2.4.9")>
-<Assembly: AssemblyFileVersion("4.2.4.5")>
+<Assembly: AssemblyFileVersion("4.2.4.9")>
--- a/Aviso/frmAddSendungsvermerkShort.Designer.vb
+++ b/Aviso/frmAddSendungsvermerkShort.Designer.vb
@@ -1,4 +1,4 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmAddSendungsvermerkShort
    Inherits System.Windows.Forms.Form
@@ -27,21 +27,11 @@ Partial Class frmAddSendungsvermerkShort
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.pnlMain = New System.Windows.Forms.Panel()
        Me.pnlSendungsVermker = New System.Windows.Forms.Panel()
-        Me.optDraft = New System.Windows.Forms.CheckBox()
+        Me.Label5 = New System.Windows.Forms.Label()
        Me.optGewPackAngefordert = New System.Windows.Forms.CheckBox()
        Me.optKostenbestaetigungAngefordert = New System.Windows.Forms.CheckBox()
        Me.optZolltarifnummerAngefordert = New System.Windows.Forms.CheckBox()
        Me.txtSonstigesDokumentFehlt = New System.Windows.Forms.TextBox()
        Me.cbxPackliste = New System.Windows.Forms.CheckBox()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.optFremd_ATB = New System.Windows.Forms.CheckBox()
        Me.optFremd_SendungAvisiert = New System.Windows.Forms.CheckBox()
        Me.optFahrerKeinATR = New System.Windows.Forms.CheckBox()
        Me.optFrachtkostenAngefordert = New System.Windows.Forms.CheckBox()
        Me.optKundeNichtErreichbar = New System.Windows.Forms.CheckBox()
        Me.optAbsenderbestätigung = New System.Windows.Forms.CheckBox()
        Me.cbxRgBest = New System.Windows.Forms.CheckBox()
        Me.optUeberwachungsdok = New System.Windows.Forms.CheckBox()
        Me.lblErrSpedition = New System.Windows.Forms.Label()
        Me.Label2 = New System.Windows.Forms.Label()
        Me.lblErrGrund = New System.Windows.Forms.Label()
@@ -53,32 +43,36 @@ Partial Class frmAddSendungsvermerkShort
        Me.optSpeditionWeitergeleitet = New System.Windows.Forms.CheckBox()
        Me.optFreierText = New System.Windows.Forms.CheckBox()
        Me.optATAangefordert = New System.Windows.Forms.CheckBox()
        Me.optVorkasseAngefordert = New System.Windows.Forms.CheckBox()
        Me.optKontaktdatenAngefordert = New System.Windows.Forms.CheckBox()
        Me.Label3 = New System.Windows.Forms.Label()
        Me.lblErr240Zeichen = New System.Windows.Forms.Label()
        Me.txtDetail = New System.Windows.Forms.TextBox()
        Me.btnCustomerUploadLink = New System.Windows.Forms.Button()
        Me.btnCustomerUploadEmail = New System.Windows.Forms.Button()
        Me.txtCustomerUploadEmail = New System.Windows.Forms.TextBox()
        Me.lblCustomerUploadEmail = New System.Windows.Forms.Label()
        Me.lblCustomerUploadValidityHours = New System.Windows.Forms.Label()
        Me.nudCustomerUploadValidityHours = New System.Windows.Forms.NumericUpDown()
        Me.cmbCustomerUploadLanguage = New System.Windows.Forms.ComboBox()
        Me.lblCustomerUploadLanguage = New System.Windows.Forms.Label()
        Me.txtCustomerUploadEmailText = New System.Windows.Forms.TextBox()
        Me.lblCustomerUploadEmailText = New System.Windows.Forms.Label()
        Me.pnlCustomerUploadSeparator = New System.Windows.Forms.Panel()
        Me.lblZustzlFreitext = New System.Windows.Forms.Label()
        Me.txtSendungSpedition = New System.Windows.Forms.TextBox()
        Me.cbxNichtLeserlich = New System.Windows.Forms.CheckBox()
        Me.btnOK = New System.Windows.Forms.Button()
        Me.cbxSonstDok = New System.Windows.Forms.CheckBox()
        Me.Label9 = New System.Windows.Forms.Label()
        Me.cbxVollmacht = New System.Windows.Forms.CheckBox()
        Me.cbxCMR = New System.Windows.Forms.CheckBox()
        Me.Label17 = New System.Windows.Forms.Label()
        Me.Label13 = New System.Windows.Forms.Label()
        Me.cbxATR = New System.Windows.Forms.CheckBox()
        Me.cbxLS = New System.Windows.Forms.CheckBox()
        Me.txtFreierText = New System.Windows.Forms.TextBox()
        Me.cbxRechnung = New System.Windows.Forms.CheckBox()
        Me.Label20 = New System.Windows.Forms.Label()
        Me.cbxAuftrag = New System.Windows.Forms.CheckBox()
        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
        Me.PictureBox4 = New System.Windows.Forms.PictureBox()
        Me.Panel4 = New System.Windows.Forms.Panel()
        Me.pnlMain.SuspendLayout()
        Me.pnlSendungsVermker.SuspendLayout()
        CType(Me.nudCustomerUploadValidityHours, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
@@ -95,28 +89,18 @@ Partial Class frmAddSendungsvermerkShort
        Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlMain.Location = New System.Drawing.Point(0, 0)
        Me.pnlMain.Name = "pnlMain"
-        Me.pnlMain.Size = New System.Drawing.Size(454, 605)
+        Me.pnlMain.Size = New System.Drawing.Size(474, 868)
        Me.pnlMain.TabIndex = 0
        '
        'pnlSendungsVermker
        '
        Me.pnlSendungsVermker.BackColor = System.Drawing.Color.White
        Me.pnlSendungsVermker.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.pnlSendungsVermker.Controls.Add(Me.optDraft)
+        Me.pnlSendungsVermker.Controls.Add(Me.Label5)
        Me.pnlSendungsVermker.Controls.Add(Me.optGewPackAngefordert)
        Me.pnlSendungsVermker.Controls.Add(Me.optKostenbestaetigungAngefordert)
        Me.pnlSendungsVermker.Controls.Add(Me.optZolltarifnummerAngefordert)
        Me.pnlSendungsVermker.Controls.Add(Me.txtSonstigesDokumentFehlt)
        Me.pnlSendungsVermker.Controls.Add(Me.cbxPackliste)
        Me.pnlSendungsVermker.Controls.Add(Me.Label4)
        Me.pnlSendungsVermker.Controls.Add(Me.optFremd_ATB)
        Me.pnlSendungsVermker.Controls.Add(Me.optFremd_SendungAvisiert)
        Me.pnlSendungsVermker.Controls.Add(Me.optFahrerKeinATR)
        Me.pnlSendungsVermker.Controls.Add(Me.optFrachtkostenAngefordert)
        Me.pnlSendungsVermker.Controls.Add(Me.optKundeNichtErreichbar)
        Me.pnlSendungsVermker.Controls.Add(Me.optAbsenderbestätigung)
        Me.pnlSendungsVermker.Controls.Add(Me.cbxRgBest)
        Me.pnlSendungsVermker.Controls.Add(Me.optUeberwachungsdok)
        Me.pnlSendungsVermker.Controls.Add(Me.lblErrSpedition)
        Me.pnlSendungsVermker.Controls.Add(Me.Label2)
        Me.pnlSendungsVermker.Controls.Add(Me.lblErrGrund)
@@ -128,102 +112,65 @@ Partial Class frmAddSendungsvermerkShort
        Me.pnlSendungsVermker.Controls.Add(Me.optSpeditionWeitergeleitet)
        Me.pnlSendungsVermker.Controls.Add(Me.optFreierText)
        Me.pnlSendungsVermker.Controls.Add(Me.optATAangefordert)
        Me.pnlSendungsVermker.Controls.Add(Me.optVorkasseAngefordert)
        Me.pnlSendungsVermker.Controls.Add(Me.optKontaktdatenAngefordert)
        Me.pnlSendungsVermker.Controls.Add(Me.Label3)
        Me.pnlSendungsVermker.Controls.Add(Me.lblErr240Zeichen)
        Me.pnlSendungsVermker.Controls.Add(Me.txtDetail)
        Me.pnlSendungsVermker.Controls.Add(Me.btnCustomerUploadLink)
        Me.pnlSendungsVermker.Controls.Add(Me.btnCustomerUploadEmail)
        Me.pnlSendungsVermker.Controls.Add(Me.txtCustomerUploadEmail)
        Me.pnlSendungsVermker.Controls.Add(Me.lblCustomerUploadEmail)
        Me.pnlSendungsVermker.Controls.Add(Me.lblCustomerUploadValidityHours)
        Me.pnlSendungsVermker.Controls.Add(Me.nudCustomerUploadValidityHours)
        Me.pnlSendungsVermker.Controls.Add(Me.cmbCustomerUploadLanguage)
        Me.pnlSendungsVermker.Controls.Add(Me.lblCustomerUploadLanguage)
        Me.pnlSendungsVermker.Controls.Add(Me.txtCustomerUploadEmailText)
        Me.pnlSendungsVermker.Controls.Add(Me.lblCustomerUploadEmailText)
        Me.pnlSendungsVermker.Controls.Add(Me.pnlCustomerUploadSeparator)
        Me.pnlSendungsVermker.Controls.Add(Me.lblZustzlFreitext)
        Me.pnlSendungsVermker.Controls.Add(Me.txtSendungSpedition)
        Me.pnlSendungsVermker.Controls.Add(Me.cbxNichtLeserlich)
        Me.pnlSendungsVermker.Controls.Add(Me.btnOK)
        Me.pnlSendungsVermker.Controls.Add(Me.cbxSonstDok)
        Me.pnlSendungsVermker.Controls.Add(Me.Label9)
        Me.pnlSendungsVermker.Controls.Add(Me.cbxVollmacht)
        Me.pnlSendungsVermker.Controls.Add(Me.cbxCMR)
        Me.pnlSendungsVermker.Controls.Add(Me.Label17)
        Me.pnlSendungsVermker.Controls.Add(Me.Label13)
        Me.pnlSendungsVermker.Controls.Add(Me.cbxATR)
        Me.pnlSendungsVermker.Controls.Add(Me.cbxLS)
        Me.pnlSendungsVermker.Controls.Add(Me.txtFreierText)
        Me.pnlSendungsVermker.Controls.Add(Me.cbxRechnung)
        Me.pnlSendungsVermker.Controls.Add(Me.Label20)
        Me.pnlSendungsVermker.Controls.Add(Me.cbxAuftrag)
        Me.pnlSendungsVermker.Controls.Add(Me.PictureBox1)
        Me.pnlSendungsVermker.Controls.Add(Me.PictureBox4)
        Me.pnlSendungsVermker.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlSendungsVermker.Location = New System.Drawing.Point(0, 0)
        Me.pnlSendungsVermker.Name = "pnlSendungsVermker"
-        Me.pnlSendungsVermker.Size = New System.Drawing.Size(454, 605)
+        Me.pnlSendungsVermker.Size = New System.Drawing.Size(474, 868)
        Me.pnlSendungsVermker.TabIndex = 0
        '
-        'optDraft
+        'Label5
        '
-        Me.optDraft.AutoSize = True
+        Me.Label5.AutoSize = True
-        Me.optDraft.Location = New System.Drawing.Point(12, 262)
+        Me.Label5.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optDraft.Name = "optDraft"
+        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.optDraft.Size = New System.Drawing.Size(174, 17)
+        Me.Label5.Location = New System.Drawing.Point(2, 642)
-        Me.optDraft.TabIndex = 102
+        Me.Label5.Name = "Label5"
-        Me.optDraft.Text = "T1/T2 ""Draft"" OK - angefordert"
+        Me.Label5.Size = New System.Drawing.Size(202, 17)
-        Me.optDraft.UseVisualStyleBackColor = True
+        Me.Label5.TabIndex = 118
-        '
+        Me.Label5.Text = "Kundenportal Upload-Link:"
        'optGewPackAngefordert
        '
        Me.optGewPackAngefordert.AutoSize = True
        Me.optGewPackAngefordert.Location = New System.Drawing.Point(12, 236)
        Me.optGewPackAngefordert.Name = "optGewPackAngefordert"
        Me.optGewPackAngefordert.Size = New System.Drawing.Size(245, 17)
        Me.optGewPackAngefordert.TabIndex = 101
        Me.optGewPackAngefordert.Text = "Gewicht/Packstücke mangelhaft - angefordert"
        Me.optGewPackAngefordert.UseVisualStyleBackColor = True
        '
        'optKostenbestaetigungAngefordert
        '
        Me.optKostenbestaetigungAngefordert.AutoSize = True
        Me.optKostenbestaetigungAngefordert.Location = New System.Drawing.Point(270, 214)
        Me.optKostenbestaetigungAngefordert.Name = "optKostenbestaetigungAngefordert"
        Me.optKostenbestaetigungAngefordert.Size = New System.Drawing.Size(177, 17)
        Me.optKostenbestaetigungAngefordert.TabIndex = 99
        Me.optKostenbestaetigungAngefordert.Text = "Kostenbestätigung - angefordert"
        Me.optKostenbestaetigungAngefordert.UseVisualStyleBackColor = True
        '
        'optZolltarifnummerAngefordert
        '
        Me.optZolltarifnummerAngefordert.AutoSize = True
        Me.optZolltarifnummerAngefordert.Location = New System.Drawing.Point(12, 214)
        Me.optZolltarifnummerAngefordert.Name = "optZolltarifnummerAngefordert"
        Me.optZolltarifnummerAngefordert.Size = New System.Drawing.Size(154, 17)
        Me.optZolltarifnummerAngefordert.TabIndex = 98
        Me.optZolltarifnummerAngefordert.Text = "Zolltarifnummer angefordert"
        Me.optZolltarifnummerAngefordert.UseVisualStyleBackColor = True
        '
        'txtSonstigesDokumentFehlt
        '
        Me.txtSonstigesDokumentFehlt.BackColor = System.Drawing.Color.White
        Me.txtSonstigesDokumentFehlt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSonstigesDokumentFehlt.Location = New System.Drawing.Point(94, 96)
+        Me.txtSonstigesDokumentFehlt.Location = New System.Drawing.Point(96, 214)
        Me.txtSonstigesDokumentFehlt.MaxLength = 80
        Me.txtSonstigesDokumentFehlt.Name = "txtSonstigesDokumentFehlt"
        Me.txtSonstigesDokumentFehlt.Size = New System.Drawing.Size(198, 20)
        Me.txtSonstigesDokumentFehlt.TabIndex = 10
        '
        'cbxPackliste
        '
        Me.cbxPackliste.AutoSize = True
        Me.cbxPackliste.BackColor = System.Drawing.Color.WhiteSmoke
        Me.cbxPackliste.Location = New System.Drawing.Point(308, 75)
        Me.cbxPackliste.Name = "cbxPackliste"
        Me.cbxPackliste.Size = New System.Drawing.Size(69, 17)
        Me.cbxPackliste.TabIndex = 97
        Me.cbxPackliste.Text = "Packliste"
        Me.cbxPackliste.UseVisualStyleBackColor = False
        '
        'Label4
        '
        Me.Label4.AutoSize = True
        Me.Label4.BackColor = System.Drawing.Color.WhiteSmoke
        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.Location = New System.Drawing.Point(11, 411)
+        Me.Label4.Location = New System.Drawing.Point(11, 563)
        Me.Label4.Name = "Label4"
        Me.Label4.Size = New System.Drawing.Size(125, 17)
        Me.Label4.TabIndex = 96
@@ -233,7 +180,7 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.optFremd_ATB.AutoSize = True
        Me.optFremd_ATB.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optFremd_ATB.Location = New System.Drawing.Point(12, 458)
+        Me.optFremd_ATB.Location = New System.Drawing.Point(12, 610)
        Me.optFremd_ATB.Name = "optFremd_ATB"
        Me.optFremd_ATB.Size = New System.Drawing.Size(130, 17)
        Me.optFremd_ATB.TabIndex = 94
@@ -244,81 +191,19 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.optFremd_SendungAvisiert.AutoSize = True
        Me.optFremd_SendungAvisiert.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optFremd_SendungAvisiert.Location = New System.Drawing.Point(12, 435)
+        Me.optFremd_SendungAvisiert.Location = New System.Drawing.Point(12, 587)
        Me.optFremd_SendungAvisiert.Name = "optFremd_SendungAvisiert"
        Me.optFremd_SendungAvisiert.Size = New System.Drawing.Size(193, 17)
        Me.optFremd_SendungAvisiert.TabIndex = 93
        Me.optFremd_SendungAvisiert.Text = "Sendung an Fremdeinsteller avisiert"
        Me.optFremd_SendungAvisiert.UseVisualStyleBackColor = False
        '
        'optFahrerKeinATR
        '
        Me.optFahrerKeinATR.AutoSize = True
        Me.optFahrerKeinATR.BackColor = System.Drawing.Color.WhiteSmoke
        Me.optFahrerKeinATR.Location = New System.Drawing.Point(308, 52)
        Me.optFahrerKeinATR.Name = "optFahrerKeinATR"
        Me.optFahrerKeinATR.Size = New System.Drawing.Size(125, 17)
        Me.optFahrerKeinATR.TabIndex = 92
        Me.optFahrerKeinATR.Text = "Fahrer hat kein A.TR"
        Me.optFahrerKeinATR.UseVisualStyleBackColor = False
        '
        'optFrachtkostenAngefordert
        '
        Me.optFrachtkostenAngefordert.AutoSize = True
        Me.optFrachtkostenAngefordert.Location = New System.Drawing.Point(12, 162)
        Me.optFrachtkostenAngefordert.Name = "optFrachtkostenAngefordert"
        Me.optFrachtkostenAngefordert.Size = New System.Drawing.Size(145, 17)
        Me.optFrachtkostenAngefordert.TabIndex = 91
        Me.optFrachtkostenAngefordert.Text = "Frachtkosten angefordert"
        Me.optFrachtkostenAngefordert.UseVisualStyleBackColor = True
        '
        'optKundeNichtErreichbar
        '
        Me.optKundeNichtErreichbar.AutoSize = True
        Me.optKundeNichtErreichbar.Location = New System.Drawing.Point(270, 141)
        Me.optKundeNichtErreichbar.Name = "optKundeNichtErreichbar"
        Me.optKundeNichtErreichbar.Size = New System.Drawing.Size(133, 17)
        Me.optKundeNichtErreichbar.TabIndex = 90
        Me.optKundeNichtErreichbar.Text = "Kunde nicht erreichbar"
        Me.optKundeNichtErreichbar.UseVisualStyleBackColor = True
        '
        'optAbsenderbestätigung
        '
        Me.optAbsenderbestätigung.AutoSize = True
        Me.optAbsenderbestätigung.BackColor = System.Drawing.Color.WhiteSmoke
        Me.optAbsenderbestätigung.Location = New System.Drawing.Point(308, 32)
        Me.optAbsenderbestätigung.Name = "optAbsenderbestätigung"
        Me.optAbsenderbestätigung.Size = New System.Drawing.Size(136, 17)
        Me.optAbsenderbestätigung.TabIndex = 89
        Me.optAbsenderbestätigung.Text = "Absenderbestät. angef."
        Me.optAbsenderbestätigung.UseVisualStyleBackColor = False
        '
        'cbxRgBest
        '
        Me.cbxRgBest.AutoSize = True
        Me.cbxRgBest.Location = New System.Drawing.Point(270, 185)
        Me.cbxRgBest.Name = "cbxRgBest"
        Me.cbxRgBest.Size = New System.Drawing.Size(146, 17)
        Me.cbxRgBest.TabIndex = 86
        Me.cbxRgBest.Text = "Rechnungsbestät. angef."
        Me.cbxRgBest.UseVisualStyleBackColor = True
        '
        'optUeberwachungsdok
        '
        Me.optUeberwachungsdok.AutoSize = True
        Me.optUeberwachungsdok.Location = New System.Drawing.Point(270, 163)
        Me.optUeberwachungsdok.Name = "optUeberwachungsdok"
        Me.optUeberwachungsdok.Size = New System.Drawing.Size(114, 17)
        Me.optUeberwachungsdok.TabIndex = 85
        Me.optUeberwachungsdok.Text = "Ü-Dok. angefodert"
        Me.optUeberwachungsdok.UseVisualStyleBackColor = True
        '
        'lblErrSpedition
        '
        Me.lblErrSpedition.AutoSize = True
        Me.lblErrSpedition.BackColor = System.Drawing.Color.WhiteSmoke
        Me.lblErrSpedition.ForeColor = System.Drawing.Color.Red
-        Me.lblErrSpedition.Location = New System.Drawing.Point(175, 316)
+        Me.lblErrSpedition.Location = New System.Drawing.Point(175, 468)
        Me.lblErrSpedition.Name = "lblErrSpedition"
        Me.lblErrSpedition.Size = New System.Drawing.Size(158, 13)
        Me.lblErrSpedition.TabIndex = 17
@@ -330,7 +215,7 @@ Partial Class frmAddSendungsvermerkShort
        Me.Label2.AutoSize = True
        Me.Label2.BackColor = System.Drawing.Color.WhiteSmoke
        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
-        Me.Label2.Location = New System.Drawing.Point(175, 316)
+        Me.Label2.Location = New System.Drawing.Point(175, 468)
        Me.Label2.Name = "Label2"
        Me.Label2.Size = New System.Drawing.Size(57, 13)
        Me.Label2.TabIndex = 84
@@ -341,7 +226,7 @@ Partial Class frmAddSendungsvermerkShort
        Me.lblErrGrund.AutoSize = True
        Me.lblErrGrund.BackColor = System.Drawing.Color.WhiteSmoke
        Me.lblErrGrund.ForeColor = System.Drawing.Color.Red
-        Me.lblErrGrund.Location = New System.Drawing.Point(147, 385)
+        Me.lblErrGrund.Location = New System.Drawing.Point(147, 537)
        Me.lblErrGrund.Name = "lblErrGrund"
        Me.lblErrGrund.Size = New System.Drawing.Size(149, 13)
        Me.lblErrGrund.TabIndex = 26
@@ -357,7 +242,7 @@ Partial Class frmAddSendungsvermerkShort
        Me.btnCLose.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnCLose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.btnCLose.ForeColor = System.Drawing.Color.White
-        Me.btnCLose.Location = New System.Drawing.Point(399, -1)
+        Me.btnCLose.Location = New System.Drawing.Point(419, -1)
        Me.btnCLose.Name = "btnCLose"
        Me.btnCLose.RightToLeft = System.Windows.Forms.RightToLeft.Yes
        Me.btnCLose.Size = New System.Drawing.Size(54, 20)
@@ -370,7 +255,7 @@ Partial Class frmAddSendungsvermerkShort
        Me.lblErrDokument.AutoSize = True
        Me.lblErrDokument.BackColor = System.Drawing.Color.WhiteSmoke
        Me.lblErrDokument.ForeColor = System.Drawing.Color.Red
-        Me.lblErrDokument.Location = New System.Drawing.Point(91, 115)
+        Me.lblErrDokument.Location = New System.Drawing.Point(93, 233)
        Me.lblErrDokument.Name = "lblErrDokument"
        Me.lblErrDokument.Size = New System.Drawing.Size(157, 13)
        Me.lblErrDokument.TabIndex = 11
@@ -392,7 +277,7 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.txtSpedition.BackColor = System.Drawing.Color.WhiteSmoke
        Me.txtSpedition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSpedition.Location = New System.Drawing.Point(177, 332)
+        Me.txtSpedition.Location = New System.Drawing.Point(177, 484)
        Me.txtSpedition.MaxLength = 50
        Me.txtSpedition.Name = "txtSpedition"
        Me.txtSpedition.Size = New System.Drawing.Size(125, 20)
@@ -413,7 +298,7 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.optSpeditionWeitergeleitet.AutoSize = True
        Me.optSpeditionWeitergeleitet.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optSpeditionWeitergeleitet.Location = New System.Drawing.Point(12, 334)
+        Me.optSpeditionWeitergeleitet.Location = New System.Drawing.Point(12, 486)
        Me.optSpeditionWeitergeleitet.Name = "optSpeditionWeitergeleitet"
        Me.optSpeditionWeitergeleitet.Size = New System.Drawing.Size(163, 17)
        Me.optSpeditionWeitergeleitet.TabIndex = 19
@@ -424,7 +309,7 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.optFreierText.AutoSize = True
        Me.optFreierText.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optFreierText.Location = New System.Drawing.Point(12, 361)
+        Me.optFreierText.Location = New System.Drawing.Point(12, 513)
        Me.optFreierText.Name = "optFreierText"
        Me.optFreierText.Size = New System.Drawing.Size(105, 17)
        Me.optFreierText.TabIndex = 27
@@ -435,38 +320,18 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.optATAangefordert.AutoSize = True
        Me.optATAangefordert.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optATAangefordert.Location = New System.Drawing.Point(164, 458)
+        Me.optATAangefordert.Location = New System.Drawing.Point(164, 610)
        Me.optATAangefordert.Name = "optATAangefordert"
        Me.optATAangefordert.Size = New System.Drawing.Size(208, 17)
        Me.optATAangefordert.TabIndex = 15
        Me.optATAangefordert.Text = "ATA/ATC-Nr. angefordert (Fremdanm.)"
        Me.optATAangefordert.UseVisualStyleBackColor = False
        '
        'optVorkasseAngefordert
        '
        Me.optVorkasseAngefordert.AutoSize = True
        Me.optVorkasseAngefordert.Location = New System.Drawing.Point(12, 184)
        Me.optVorkasseAngefordert.Name = "optVorkasseAngefordert"
        Me.optVorkasseAngefordert.Size = New System.Drawing.Size(144, 17)
        Me.optVorkasseAngefordert.TabIndex = 14
        Me.optVorkasseAngefordert.Text = "Vorauskasse angefordert"
        Me.optVorkasseAngefordert.UseVisualStyleBackColor = True
        '
        'optKontaktdatenAngefordert
        '
        Me.optKontaktdatenAngefordert.AutoSize = True
        Me.optKontaktdatenAngefordert.Location = New System.Drawing.Point(12, 141)
        Me.optKontaktdatenAngefordert.Name = "optKontaktdatenAngefordert"
        Me.optKontaktdatenAngefordert.Size = New System.Drawing.Size(212, 17)
        Me.optKontaktdatenAngefordert.TabIndex = 12
        Me.optKontaktdatenAngefordert.Text = "Kontaktdaten (z.B.Tel-Nr.) - angefordert"
        Me.optKontaktdatenAngefordert.UseVisualStyleBackColor = True
        '
        'Label3
        '
        Me.Label3.AutoSize = True
        Me.Label3.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.Label3.Location = New System.Drawing.Point(308, 335)
+        Me.Label3.Location = New System.Drawing.Point(308, 487)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(57, 13)
        Me.Label3.TabIndex = 22
@@ -476,7 +341,7 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.lblErr240Zeichen.AutoSize = True
        Me.lblErr240Zeichen.ForeColor = System.Drawing.Color.Red
-        Me.lblErr240Zeichen.Location = New System.Drawing.Point(219, 496)
+        Me.lblErr240Zeichen.Location = New System.Drawing.Point(212, 785)
        Me.lblErr240Zeichen.Name = "lblErr240Zeichen"
        Me.lblErr240Zeichen.Size = New System.Drawing.Size(95, 13)
        Me.lblErr240Zeichen.TabIndex = 32
@@ -488,7 +353,7 @@ Partial Class frmAddSendungsvermerkShort
        Me.txtDetail.AcceptsReturn = True
        Me.txtDetail.BackColor = System.Drawing.Color.White
        Me.txtDetail.ForeColor = System.Drawing.SystemColors.InfoText
-        Me.txtDetail.Location = New System.Drawing.Point(12, 512)
+        Me.txtDetail.Location = New System.Drawing.Point(5, 801)
        Me.txtDetail.MaxLength = 240
        Me.txtDetail.Multiline = True
        Me.txtDetail.Name = "txtDetail"
@@ -498,10 +363,117 @@ Partial Class frmAddSendungsvermerkShort
        Me.txtDetail.TabStop = False
        Me.txtDetail.WordWrap = False
        '
        'btnCustomerUploadLink
        '
        Me.btnCustomerUploadLink.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnCustomerUploadLink.Location = New System.Drawing.Point(340, 668)
        Me.btnCustomerUploadLink.Name = "btnCustomerUploadLink"
        Me.btnCustomerUploadLink.Size = New System.Drawing.Size(124, 23)
        Me.btnCustomerUploadLink.TabIndex = 108
        Me.btnCustomerUploadLink.Text = "Link kopieren"
        Me.btnCustomerUploadLink.UseVisualStyleBackColor = True
        '
        'btnCustomerUploadEmail
        '
        Me.btnCustomerUploadEmail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnCustomerUploadEmail.Location = New System.Drawing.Point(340, 694)
        Me.btnCustomerUploadEmail.Name = "btnCustomerUploadEmail"
        Me.btnCustomerUploadEmail.Size = New System.Drawing.Size(124, 23)
        Me.btnCustomerUploadEmail.TabIndex = 109
        Me.btnCustomerUploadEmail.Text = "E-Mail senden"
        Me.btnCustomerUploadEmail.UseVisualStyleBackColor = True
        '
        'txtCustomerUploadEmail
        '
        Me.txtCustomerUploadEmail.BackColor = System.Drawing.Color.White
        Me.txtCustomerUploadEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtCustomerUploadEmail.Location = New System.Drawing.Point(80, 696)
        Me.txtCustomerUploadEmail.MaxLength = 255
        Me.txtCustomerUploadEmail.Name = "txtCustomerUploadEmail"
        Me.txtCustomerUploadEmail.Size = New System.Drawing.Size(254, 20)
        Me.txtCustomerUploadEmail.TabIndex = 107
        '
        'lblCustomerUploadEmail
        '
        Me.lblCustomerUploadEmail.AutoSize = True
        Me.lblCustomerUploadEmail.Location = New System.Drawing.Point(2, 699)
        Me.lblCustomerUploadEmail.Name = "lblCustomerUploadEmail"
        Me.lblCustomerUploadEmail.Size = New System.Drawing.Size(54, 13)
        Me.lblCustomerUploadEmail.TabIndex = 110
        Me.lblCustomerUploadEmail.Text = "E-Mail an:"
        '
        'lblCustomerUploadValidityHours
        '
        Me.lblCustomerUploadValidityHours.AutoSize = True
        Me.lblCustomerUploadValidityHours.Location = New System.Drawing.Point(176, 672)
        Me.lblCustomerUploadValidityHours.Name = "lblCustomerUploadValidityHours"
        Me.lblCustomerUploadValidityHours.Size = New System.Drawing.Size(66, 13)
        Me.lblCustomerUploadValidityHours.TabIndex = 111
        Me.lblCustomerUploadValidityHours.Text = "Gültigkeit(h):"
        '
        'nudCustomerUploadValidityHours
        '
        Me.nudCustomerUploadValidityHours.Location = New System.Drawing.Point(260, 670)
        Me.nudCustomerUploadValidityHours.Maximum = New Decimal(New Integer() {168, 0, 0, 0})
        Me.nudCustomerUploadValidityHours.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
        Me.nudCustomerUploadValidityHours.Name = "nudCustomerUploadValidityHours"
        Me.nudCustomerUploadValidityHours.Size = New System.Drawing.Size(74, 20)
        Me.nudCustomerUploadValidityHours.TabIndex = 112
        Me.nudCustomerUploadValidityHours.Value = New Decimal(New Integer() {168, 0, 0, 0})
        '
        'cmbCustomerUploadLanguage
        '
        Me.cmbCustomerUploadLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        Me.cmbCustomerUploadLanguage.FormattingEnabled = True
        Me.cmbCustomerUploadLanguage.Items.AddRange(New Object() {"de", "en", "tr", "sr", "bg"})
        Me.cmbCustomerUploadLanguage.Location = New System.Drawing.Point(80, 670)
        Me.cmbCustomerUploadLanguage.Name = "cmbCustomerUploadLanguage"
        Me.cmbCustomerUploadLanguage.Size = New System.Drawing.Size(80, 21)
        Me.cmbCustomerUploadLanguage.TabIndex = 116
        '
        'lblCustomerUploadLanguage
        '
        Me.lblCustomerUploadLanguage.AutoSize = True
        Me.lblCustomerUploadLanguage.Location = New System.Drawing.Point(2, 673)
        Me.lblCustomerUploadLanguage.Name = "lblCustomerUploadLanguage"
        Me.lblCustomerUploadLanguage.Size = New System.Drawing.Size(72, 13)
        Me.lblCustomerUploadLanguage.TabIndex = 117
        Me.lblCustomerUploadLanguage.Text = "Mail Sprache:"
        '
        'txtCustomerUploadEmailText
        '
        Me.txtCustomerUploadEmailText.BackColor = System.Drawing.Color.White
        Me.txtCustomerUploadEmailText.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtCustomerUploadEmailText.Location = New System.Drawing.Point(80, 718)
        Me.txtCustomerUploadEmailText.MaxLength = 500
        Me.txtCustomerUploadEmailText.Multiline = True
        Me.txtCustomerUploadEmailText.Name = "txtCustomerUploadEmailText"
        Me.txtCustomerUploadEmailText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
        Me.txtCustomerUploadEmailText.Size = New System.Drawing.Size(254, 54)
        Me.txtCustomerUploadEmailText.TabIndex = 113
        Me.txtCustomerUploadEmailText.Text = "Bitte laden Sie die angeforderten Dokumente über den Link hoch."
        '
        'lblCustomerUploadEmailText
        '
        Me.lblCustomerUploadEmailText.AutoSize = True
        Me.lblCustomerUploadEmailText.Location = New System.Drawing.Point(2, 721)
        Me.lblCustomerUploadEmailText.Name = "lblCustomerUploadEmailText"
        Me.lblCustomerUploadEmailText.Size = New System.Drawing.Size(63, 13)
        Me.lblCustomerUploadEmailText.TabIndex = 114
        Me.lblCustomerUploadEmailText.Text = "E-Mail Text:"
        '
        'pnlCustomerUploadSeparator
        '
        Me.pnlCustomerUploadSeparator.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.pnlCustomerUploadSeparator.Location = New System.Drawing.Point(-8, 779)
        Me.pnlCustomerUploadSeparator.Name = "pnlCustomerUploadSeparator"
        Me.pnlCustomerUploadSeparator.Size = New System.Drawing.Size(474, 1)
        Me.pnlCustomerUploadSeparator.TabIndex = 115
        '
        'lblZustzlFreitext
        '
        Me.lblZustzlFreitext.AutoSize = True
-        Me.lblZustzlFreitext.Location = New System.Drawing.Point(9, 496)
+        Me.lblZustzlFreitext.Location = New System.Drawing.Point(2, 785)
        Me.lblZustzlFreitext.Name = "lblZustzlFreitext"
        Me.lblZustzlFreitext.Size = New System.Drawing.Size(142, 13)
        Me.lblZustzlFreitext.TabIndex = 31
@@ -511,7 +483,7 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.txtSendungSpedition.BackColor = System.Drawing.Color.WhiteSmoke
        Me.txtSendungSpedition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSendungSpedition.Location = New System.Drawing.Point(144, 332)
+        Me.txtSendungSpedition.Location = New System.Drawing.Point(144, 484)
        Me.txtSendungSpedition.MaxLength = 50
        Me.txtSendungSpedition.Name = "txtSendungSpedition"
        Me.txtSendungSpedition.Size = New System.Drawing.Size(25, 20)
@@ -522,7 +494,7 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.cbxNichtLeserlich.AutoSize = True
        Me.cbxNichtLeserlich.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.cbxNichtLeserlich.Location = New System.Drawing.Point(308, 98)
+        Me.cbxNichtLeserlich.Location = New System.Drawing.Point(310, 216)
        Me.cbxNichtLeserlich.Name = "cbxNichtLeserlich"
        Me.cbxNichtLeserlich.Size = New System.Drawing.Size(90, 17)
        Me.cbxNichtLeserlich.TabIndex = 8
@@ -532,7 +504,7 @@ Partial Class frmAddSendungsvermerkShort
        'btnOK
        '
        Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnOK.Location = New System.Drawing.Point(320, 512)
+        Me.btnOK.Location = New System.Drawing.Point(313, 801)
        Me.btnOK.Name = "btnOK"
        Me.btnOK.Size = New System.Drawing.Size(124, 54)
        Me.btnOK.TabIndex = 34
@@ -543,7 +515,7 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.cbxSonstDok.AutoSize = True
        Me.cbxSonstDok.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.cbxSonstDok.Location = New System.Drawing.Point(12, 98)
+        Me.cbxSonstDok.Location = New System.Drawing.Point(14, 216)
        Me.cbxSonstDok.Name = "cbxSonstDok"
        Me.cbxSonstDok.Size = New System.Drawing.Size(83, 17)
        Me.cbxSonstDok.TabIndex = 9
@@ -555,40 +527,18 @@ Partial Class frmAddSendungsvermerkShort
        Me.Label9.AutoSize = True
        Me.Label9.BackColor = System.Drawing.Color.WhiteSmoke
        Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
-        Me.Label9.Location = New System.Drawing.Point(354, 385)
+        Me.Label9.Location = New System.Drawing.Point(354, 537)
        Me.Label9.Name = "Label9"
        Me.Label9.Size = New System.Drawing.Size(90, 13)
        Me.Label9.TabIndex = 30
        Me.Label9.Text = "(max. 80 Zeichen)"
        '
        'cbxVollmacht
        '
        Me.cbxVollmacht.AutoSize = True
        Me.cbxVollmacht.BackColor = System.Drawing.Color.WhiteSmoke
        Me.cbxVollmacht.Location = New System.Drawing.Point(164, 75)
        Me.cbxVollmacht.Name = "cbxVollmacht"
        Me.cbxVollmacht.Size = New System.Drawing.Size(72, 17)
        Me.cbxVollmacht.TabIndex = 7
        Me.cbxVollmacht.Text = "Vollmacht"
        Me.cbxVollmacht.UseVisualStyleBackColor = False
        '
        'cbxCMR
        '
        Me.cbxCMR.AutoSize = True
        Me.cbxCMR.BackColor = System.Drawing.Color.WhiteSmoke
        Me.cbxCMR.Location = New System.Drawing.Point(164, 32)
        Me.cbxCMR.Name = "cbxCMR"
        Me.cbxCMR.Size = New System.Drawing.Size(50, 17)
        Me.cbxCMR.TabIndex = 3
        Me.cbxCMR.Text = "CMR"
        Me.cbxCMR.UseVisualStyleBackColor = False
        '
        'Label17
        '
        Me.Label17.AutoSize = True
        Me.Label17.BackColor = System.Drawing.Color.WhiteSmoke
        Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Italic)
-        Me.Label17.Location = New System.Drawing.Point(144, 385)
+        Me.Label17.Location = New System.Drawing.Point(144, 537)
        Me.Label17.Name = "Label17"
        Me.Label17.Size = New System.Drawing.Size(182, 13)
        Me.Label17.TabIndex = 29
@@ -599,82 +549,38 @@ Partial Class frmAddSendungsvermerkShort
        Me.Label13.AutoSize = True
        Me.Label13.BackColor = System.Drawing.Color.WhiteSmoke
        Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label13.Location = New System.Drawing.Point(9, 307)
+        Me.Label13.Location = New System.Drawing.Point(9, 459)
        Me.Label13.Name = "Label13"
        Me.Label13.Size = New System.Drawing.Size(84, 17)
        Me.Label13.TabIndex = 16
        Me.Label13.Text = "Sonstiges:"
        '
        'cbxATR
        '
        Me.cbxATR.AutoSize = True
        Me.cbxATR.BackColor = System.Drawing.Color.WhiteSmoke
        Me.cbxATR.Location = New System.Drawing.Point(164, 52)
        Me.cbxATR.Name = "cbxATR"
        Me.cbxATR.Size = New System.Drawing.Size(127, 17)
        Me.cbxATR.TabIndex = 5
        Me.cbxATR.Text = "A.TR (Original/Kopie)"
        Me.cbxATR.UseVisualStyleBackColor = False
        '
        'cbxLS
        '
        Me.cbxLS.AutoSize = True
        Me.cbxLS.BackColor = System.Drawing.Color.WhiteSmoke
        Me.cbxLS.Location = New System.Drawing.Point(12, 75)
        Me.cbxLS.Name = "cbxLS"
        Me.cbxLS.Size = New System.Drawing.Size(83, 17)
        Me.cbxLS.TabIndex = 6
        Me.cbxLS.Text = "Lieferschein"
        Me.cbxLS.UseVisualStyleBackColor = False
        '
        'txtFreierText
        '
        Me.txtFreierText.BackColor = System.Drawing.Color.WhiteSmoke
        Me.txtFreierText.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.txtFreierText.Location = New System.Drawing.Point(122, 359)
+        Me.txtFreierText.Location = New System.Drawing.Point(122, 511)
        Me.txtFreierText.MaxLength = 80
        Me.txtFreierText.Name = "txtFreierText"
        Me.txtFreierText.Size = New System.Drawing.Size(322, 23)
        Me.txtFreierText.TabIndex = 28
        '
        'cbxRechnung
        '
        Me.cbxRechnung.AutoSize = True
        Me.cbxRechnung.BackColor = System.Drawing.Color.WhiteSmoke
        Me.cbxRechnung.Location = New System.Drawing.Point(12, 53)
        Me.cbxRechnung.Name = "cbxRechnung"
        Me.cbxRechnung.Size = New System.Drawing.Size(137, 17)
        Me.cbxRechnung.TabIndex = 4
        Me.cbxRechnung.Text = "Rechnung (mangelhaft)"
        Me.cbxRechnung.UseVisualStyleBackColor = False
        '
        'Label20
        '
        Me.Label20.AutoSize = True
        Me.Label20.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.Label20.Location = New System.Drawing.Point(267, 335)
+        Me.Label20.Location = New System.Drawing.Point(267, 487)
        Me.Label20.Name = "Label20"
        Me.Label20.Size = New System.Drawing.Size(0, 13)
        Me.Label20.TabIndex = 21
        '
        'cbxAuftrag
        '
        Me.cbxAuftrag.AutoSize = True
        Me.cbxAuftrag.BackColor = System.Drawing.Color.WhiteSmoke
        Me.cbxAuftrag.Location = New System.Drawing.Point(12, 32)
        Me.cbxAuftrag.Name = "cbxAuftrag"
        Me.cbxAuftrag.Size = New System.Drawing.Size(60, 17)
        Me.cbxAuftrag.TabIndex = 2
        Me.cbxAuftrag.Text = "Auftrag"
        Me.cbxAuftrag.UseVisualStyleBackColor = False
        '
        'PictureBox1
        '
        Me.PictureBox1.BackColor = System.Drawing.Color.WhiteSmoke
        Me.PictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.PictureBox1.Location = New System.Drawing.Point(-1, -1)
        Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(453, 130)
+        Me.PictureBox1.Size = New System.Drawing.Size(474, 250)
        Me.PictureBox1.TabIndex = 83
        Me.PictureBox1.TabStop = False
        '
@@ -682,9 +588,9 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.PictureBox4.BackColor = System.Drawing.Color.WhiteSmoke
        Me.PictureBox4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.PictureBox4.Location = New System.Drawing.Point(-1, 297)
+        Me.PictureBox4.Location = New System.Drawing.Point(-1, 450)
        Me.PictureBox4.Name = "PictureBox4"
-        Me.PictureBox4.Size = New System.Drawing.Size(453, 189)
+        Me.PictureBox4.Size = New System.Drawing.Size(481, 189)
        Me.PictureBox4.TabIndex = 78
        Me.PictureBox4.TabStop = False
        '
@@ -695,14 +601,14 @@ Partial Class frmAddSendungsvermerkShort
        Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top
        Me.Panel4.Location = New System.Drawing.Point(0, 0)
        Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(454, 0)
+        Me.Panel4.Size = New System.Drawing.Size(474, 0)
        Me.Panel4.TabIndex = 1
        '
        'frmAddSendungsvermerkShort
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(454, 605)
+        Me.ClientSize = New System.Drawing.Size(474, 868)
        Me.Controls.Add(Me.pnlMain)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@@ -714,6 +620,7 @@ Partial Class frmAddSendungsvermerkShort
        Me.pnlMain.ResumeLayout(False)
        Me.pnlSendungsVermker.ResumeLayout(False)
        Me.pnlSendungsVermker.PerformLayout()
        CType(Me.nudCustomerUploadValidityHours, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
@@ -727,8 +634,6 @@ Partial Class frmAddSendungsvermerkShort
    Friend WithEvents optSpeditionWeitergeleitet As System.Windows.Forms.CheckBox
    Friend WithEvents optFreierText As System.Windows.Forms.CheckBox
    Friend WithEvents optATAangefordert As System.Windows.Forms.CheckBox
    Friend WithEvents optVorkasseAngefordert As System.Windows.Forms.CheckBox
    Friend WithEvents optKontaktdatenAngefordert As System.Windows.Forms.CheckBox
    Friend WithEvents Label3 As System.Windows.Forms.Label
    Friend WithEvents lblErr240Zeichen As System.Windows.Forms.Label
    Friend WithEvents lblZustzlFreitext As System.Windows.Forms.Label
@@ -737,19 +642,13 @@ Partial Class frmAddSendungsvermerkShort
    Friend WithEvents btnOK As System.Windows.Forms.Button
    Friend WithEvents cbxSonstDok As System.Windows.Forms.CheckBox
    Friend WithEvents Label9 As System.Windows.Forms.Label
    Friend WithEvents cbxVollmacht As System.Windows.Forms.CheckBox
    Friend WithEvents lblErrSpedition As System.Windows.Forms.Label
    Friend WithEvents cbxCMR As System.Windows.Forms.CheckBox
    Friend WithEvents lblErrGrund As System.Windows.Forms.Label
    Friend WithEvents Label17 As System.Windows.Forms.Label
    Friend WithEvents Label13 As System.Windows.Forms.Label
    Friend WithEvents cbxATR As System.Windows.Forms.CheckBox
    Friend WithEvents cbxLS As System.Windows.Forms.CheckBox
    Friend WithEvents txtFreierText As System.Windows.Forms.TextBox
    Friend WithEvents txtSpedition As System.Windows.Forms.TextBox
    Friend WithEvents cbxRechnung As System.Windows.Forms.CheckBox
    Friend WithEvents Label20 As System.Windows.Forms.Label
    Friend WithEvents cbxAuftrag As System.Windows.Forms.CheckBox
    Friend WithEvents PictureBox4 As System.Windows.Forms.PictureBox
    Friend WithEvents Label1 As System.Windows.Forms.Label
    Friend WithEvents optSendungInVorbereitung As System.Windows.Forms.CheckBox
@@ -757,19 +656,20 @@ Partial Class frmAddSendungsvermerkShort
    Friend WithEvents lblErrDokument As System.Windows.Forms.Label
    Friend WithEvents btnCLose As System.Windows.Forms.Button
    Friend WithEvents Label2 As System.Windows.Forms.Label
    Friend WithEvents optUeberwachungsdok As System.Windows.Forms.CheckBox
    Friend WithEvents cbxRgBest As CheckBox
    Friend WithEvents Label4 As Label
    Friend WithEvents optFremd_ATB As CheckBox
    Friend WithEvents optFremd_SendungAvisiert As CheckBox
    Friend WithEvents optFahrerKeinATR As CheckBox
    Friend WithEvents optFrachtkostenAngefordert As CheckBox
    Friend WithEvents optKundeNichtErreichbar As CheckBox
    Friend WithEvents optAbsenderbestätigung As CheckBox
    Friend WithEvents cbxPackliste As CheckBox
    Friend WithEvents optGewPackAngefordert As CheckBox
    Friend WithEvents optKostenbestaetigungAngefordert As CheckBox
    Friend WithEvents optZolltarifnummerAngefordert As CheckBox
    Friend WithEvents optDraft As CheckBox
    Public WithEvents txtDetail As TextBox
    Friend WithEvents btnCustomerUploadLink As Button
    Friend WithEvents btnCustomerUploadEmail As Button
    Friend WithEvents txtCustomerUploadEmail As TextBox
    Friend WithEvents lblCustomerUploadEmail As Label
    Friend WithEvents lblCustomerUploadValidityHours As Label
    Friend WithEvents nudCustomerUploadValidityHours As NumericUpDown
    Friend WithEvents cmbCustomerUploadLanguage As ComboBox
    Friend WithEvents lblCustomerUploadLanguage As Label
    Friend WithEvents txtCustomerUploadEmailText As TextBox
    Friend WithEvents lblCustomerUploadEmailText As Label
    Friend WithEvents pnlCustomerUploadSeparator As Panel
    Friend WithEvents Label5 As Label
 End Class
--- a/Aviso/frmAddSendungsvermerkShort.vb
+++ b/Aviso/frmAddSendungsvermerkShort.vb
--- a/Aviso/usrcntlAktDetails.Designer.vb
+++ b/Aviso/usrcntlAktDetails.Designer.vb
@@ -23,16 +23,16 @@ Partial Class usrcntlAktDetails
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlAktDetails))
        Me.pnlDetailsRechts = New System.Windows.Forms.Panel()
        Me.Panel3 = New System.Windows.Forms.Panel()
@@ -169,6 +169,7 @@ Partial Class usrcntlAktDetails
        Me.HervorhebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolUeberweisungsBeleg = New System.Windows.Forms.ToolStripMenuItem()
        Me.toolVkReminder = New System.Windows.Forms.ToolStripMenuItem()
        Me.VermerkTextAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.MitarbeiterAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.conVermerkLöschenNew = New System.Windows.Forms.ToolStripMenuItem()
        Me.cntxtFormulare = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -188,7 +189,6 @@ Partial Class usrcntlAktDetails
        Me.btnÄndern = New System.Windows.Forms.Button()
        Me.btnTV = New System.Windows.Forms.Button()
        Me.Button10 = New System.Windows.Forms.Button()
        Me.VermerkTextAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.pnlDetailsRechts.SuspendLayout()
        Me.Panel3.SuspendLayout()
        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -620,46 +620,46 @@ Partial Class usrcntlAktDetails
        Me.dgvSendungen.AllowUserToAddRows = False
        Me.dgvSendungen.AllowUserToDeleteRows = False
        Me.dgvSendungen.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle21.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21
        Me.dgvSendungen.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle22.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle22.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
+        Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22
        Me.dgvSendungen.ColumnHeadersHeight = 34
        Me.dgvSendungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle3
+        Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle23
        Me.dgvSendungen.Dock = System.Windows.Forms.DockStyle.Fill
        Me.dgvSendungen.Location = New System.Drawing.Point(0, 0)
        Me.dgvSendungen.MultiSelect = False
        Me.dgvSendungen.Name = "dgvSendungen"
        Me.dgvSendungen.ReadOnly = True
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
+        Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle24
        Me.dgvSendungen.RowHeadersVisible = False
        Me.dgvSendungen.RowHeadersWidth = 62
        Me.dgvSendungen.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle5
+        Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle25
        Me.dgvSendungen.RowTemplate.Height = 20
        Me.dgvSendungen.RowTemplate.ReadOnly = True
        Me.dgvSendungen.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
@@ -1031,46 +1031,46 @@ Partial Class usrcntlAktDetails
        Me.gridVermerke.AllowUserToAddRows = False
        Me.gridVermerke.AllowUserToDeleteRows = False
        Me.gridVermerke.AllowUserToResizeRows = False
-        DataGridViewCellStyle6.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle26.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
+        Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26
        Me.gridVermerke.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle27.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle27.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
+        Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27
        Me.gridVermerke.ColumnHeadersHeight = 34
        Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle8
+        Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle28
        Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill
        Me.gridVermerke.Location = New System.Drawing.Point(0, 30)
        Me.gridVermerke.MultiSelect = False
        Me.gridVermerke.Name = "gridVermerke"
        Me.gridVermerke.ReadOnly = True
-        DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
+        Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle29
        Me.gridVermerke.RowHeadersVisible = False
        Me.gridVermerke.RowHeadersWidth = 62
        Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle10
+        Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle30
        Me.gridVermerke.RowTemplate.Height = 20
        Me.gridVermerke.RowTemplate.ReadOnly = True
        Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
@@ -2177,7 +2177,7 @@ Partial Class usrcntlAktDetails
        Me.conMenuVermerke.ImageScalingSize = New System.Drawing.Size(24, 24)
        Me.conMenuVermerke.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conVermerkEntgLöschen, Me.HervorhebenToolStripMenuItem, Me.ToolUeberweisungsBeleg, Me.toolVkReminder, Me.VermerkTextAnzeigenToolStripMenuItem, Me.MitarbeiterAnzeigenToolStripMenuItem, Me.conVermerkLöschenNew})
        Me.conMenuVermerke.Name = "conMenuVermerke"
-        Me.conMenuVermerke.Size = New System.Drawing.Size(252, 236)
+        Me.conMenuVermerke.Size = New System.Drawing.Size(252, 214)
        '
        'conVermerkEntgLöschen
        '
@@ -2208,6 +2208,12 @@ Partial Class usrcntlAktDetails
        Me.toolVkReminder.Text = "Reminder geschickt"
        Me.toolVkReminder.Visible = False
        '
        'VermerkTextAnzeigenToolStripMenuItem
        '
        Me.VermerkTextAnzeigenToolStripMenuItem.Name = "VermerkTextAnzeigenToolStripMenuItem"
        Me.VermerkTextAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(251, 30)
        Me.VermerkTextAnzeigenToolStripMenuItem.Text = "Vermerk-Text anzeigen"
        '
        'MitarbeiterAnzeigenToolStripMenuItem
        '
        Me.MitarbeiterAnzeigenToolStripMenuItem.Image = CType(resources.GetObject("MitarbeiterAnzeigenToolStripMenuItem.Image"), System.Drawing.Image)
@@ -2471,12 +2477,6 @@ Partial Class usrcntlAktDetails
        Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.Button10.UseVisualStyleBackColor = False
        '
        'VermerkTextAnzeigenToolStripMenuItem
        '
        Me.VermerkTextAnzeigenToolStripMenuItem.Name = "VermerkTextAnzeigenToolStripMenuItem"
        Me.VermerkTextAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(251, 30)
        Me.VermerkTextAnzeigenToolStripMenuItem.Text = "Vermerk-Text anzeigen"
        '
        'usrcntlAktDetails
        '
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
--- a/Aviso/usrcntlAktDetails.vb
+++ b/Aviso/usrcntlAktDetails.vb
@@ -1,4 +1,4 @@
-Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN
 Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO
 Imports System.IO
@@ -463,6 +463,8 @@ Public Class usrcntlAktDetails
            .Columns("SMSId").Visible = False     'tblSnd_Empfaengernicht anzeigen
            .Columns("VermerkIDAufgehoben").Visible = False     'tblSnd_Empfaengernicht anzeigen
            .Columns("Kategorie").Visible = False     'tblSnd_Empfaengernicht anzeigen
            If .Columns.Contains("PaarId") Then .Columns("PaarId").Visible = False
            If .Columns.Contains("PaarBezeichnung") Then .Columns("PaarBezeichnung").Visible = False
            .Columns("Datum").Width = 125 '110
            .Columns("Datum").HeaderText = "Datum"
@@ -879,22 +881,23 @@ Public Class usrcntlAktDetails
    End Sub
-    Public Shared vermerkehSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben,Geloescht," &
+    Public Shared vermerkehSQL As String = " SELECT TOP 1000 Vermerke.[VermerkID],Vermerke.[AvisoID], Vermerke.[SendungID],Vermerke.[VermerkeCode], Vermerke.[Datum],Vermerke.[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Vermerke.Hervorheben,Vermerke.Geloescht, VermerkeCodes.PaarId, VC2.Bezeichnung as PaarBezeichnung, " &
                                " 
-                                CASE WHEN VermerkeCode IS NULL OR VermerkBezeichnungFixAnzeigen = 1 
+                                CASE WHEN Vermerke.VermerkeCode IS NULL OR VermerkeCodes.VermerkBezeichnungFixAnzeigen = 1 
                                    THEN
                                        CASE 
-                                            WHEN LEN(Hinweis_Vermerk) > 200 
+                                            WHEN LEN(Vermerke.Hinweis_Vermerk) > 200 
-                                                THEN LEFT(Hinweis_Vermerk, 200) + '...'
+                                                THEN LEFT(Vermerke.Hinweis_Vermerk, 200) + '...'
-                                            ELSE Hinweis_Vermerk 
+                                            ELSE Vermerke.Hinweis_Vermerk 
                                        END 
                                    ELSE  
                                        VermerkeCodes.Bezeichnung 
                                    END as [Hinweis_Vermerk_Anzeige]
-                                ,[Hinweis_Vermerk],  tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben, Datum as DatumValue, Kategorie" &
+                                ,Vermerke.[Hinweis_Vermerk],  tblSendungen.tblSnd_Empfaenger ,Vermerke.[Mitarbeiter],Vermerke.VorauskasseId,Vermerke.SMSId,Vermerke.VermerkIDAufgehoben, Vermerke.Datum as DatumValue, VermerkeCodes.Kategorie" &
-                             " FROM [Vermerke]   LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " &
+                             " FROM [Vermerke]   LEFT JOIN VermerkeCodes ON Vermerke.[VermerkeCode]=VermerkeCodes.VermerkCodeId " &
-                             " LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " &
+                             " LEFT JOIN VermerkeCodes VC2 ON VermerkeCodes.PaarId = VC2.VermerkCodeId " &
-                             " WHERE AvisoID = [[AvisoId]] [[sendwhere]]  AND HintergrundVermerk =0 " &
+                             " LEFT JOIN tblSendungen ON Vermerke.[SendungID]=tblSendungen.tblSnd_SendungID " &
                             " WHERE Vermerke.AvisoID = [[AvisoId]] [[sendwhere]]  AND Vermerke.HintergrundVermerk =0 " &
                             " order by /*VermerkArt ASC,tblSnd_PosUnterNr,*/Datum DESC "
    Private Sub Vermerke_anzeigen2(Optional rowindex As Integer = -1)
        If Not loaded Then Exit Sub
@@ -1111,234 +1114,60 @@ Public Class usrcntlAktDetails
            myVermerk.Mitarbeiter = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter
            myVermerk.MitarbeiterId = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.MitarbeiterID
            init = False
            Select Case CStr(gridVermerke.Rows(RowIndex).Cells("VermerkeCode").Value)
                Case "1"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 2
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)
                    ' initDgvSendungen()
-                Case "3"
+            Dim vermerkCode As Integer = CInt(gridVermerke.Rows(RowIndex).Cells("VermerkeCode").Value)
-                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
+            Dim paarId As Integer = 0
-                    myVermerk.VermerkCodeId = 4
+            If gridVermerke.Columns.Contains("PaarId") AndAlso gridVermerke.Rows(RowIndex).Cells("PaarId").Value IsNot DBNull.Value Then
-                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
+                paarId = CInt(gridVermerke.Rows(RowIndex).Cells("PaarId").Value)
-                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
+            End If
            Dim paarBez As String = ""
            If gridVermerke.Columns.Contains("PaarBezeichnung") AndAlso gridVermerke.Rows(RowIndex).Cells("PaarBezeichnung").Value IsNot DBNull.Value Then
                paarBez = CStr(gridVermerke.Rows(RowIndex).Cells("PaarBezeichnung").Value)
            End If
-                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
+            Select Case vermerkCode
-
+                Case 46
-                Case "5"
+                    init = False
-                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
+                Case 13
                    myVermerk.VermerkCodeId = 6
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "7"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 8
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "9"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 10
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "11"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 12
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "90"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 93
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "13"
                    If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" OrElse VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_Vermerk_VKErhalten", "AVISO") Then
-
+                        If paarId > 0 Then
-
+                            myVermerk.Hinweis_Vermerk = paarBez
-                        myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
+                            myVermerk.VermerkCodeId = paarId
                        myVermerk.VermerkCodeId = 14
                            If gridVermerke.Rows(RowIndex).Cells("VorauskasseId").Value IsNot DBNull.Value Then
                                myVermerk.VorauskasseId = gridVermerke.Rows(RowIndex).Cells("VorauskasseId").Value
                            End If
                            Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                            VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
-
+                            init = True
-                        init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
+                        End If
                    Else
                        MsgBox("Keine Berechtigung. Bitte wenden Sie sich an die Buchhaltung oder Abteilungsleitung.")
                    End If
-
+                Case Else
-                Case "17"
+                    If paarId > 0 Then
-                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("eingereicht", "fertig")
+                        myVermerk.Hinweis_Vermerk = paarBez
-                    myVermerk.VermerkCodeId = 18
+                        myVermerk.VermerkCodeId = paarId
                        Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                        VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                        init = True
                        Select Case vermerkCode
                            Case 17
                                VermerkeDAL.UpdateLKW(myVermerk.AvisoID, False)
-                    '  avisoAktualisierenAktiveIdBehalten(myVermerk.AvisoID)
+                            Case 80
                    'Vermerke_aktualisieren()
                    init = True '   Vermerke_anzeigen(RowIndex)
                Case "19"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("eingereicht", "fertig")
                    myVermerk.VermerkCodeId = 20
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "25"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 30
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "31"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("in Vorbereitung", "Vorbereitung abgeschl.")
                    myVermerk.VermerkCodeId = 32
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "33"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 34
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "46"
                    '  MsgBox("SMS " & gridVermerke.Rows(RowIndex).Cells("VermerkeOptions").ToolTipText)
                    init = False 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "36"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 37
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "53"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 54
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "55"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 56
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "57"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 58
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "74"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 75
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "76"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 77
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "80"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("folgt", "erhalten")
                    myVermerk.VermerkCodeId = 81
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                    'Ankunft
                                If vbYes = MsgBox("Soll der LKW auf Status 'ANKUNFT' gesetzt werden?", vbYesNoCancel) Then
                                    If AvisoStatusFunctions.setAnkunft(AVISO.AvisoID) Then
                                        frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
                                        frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
                                    End If
                                End If
-
+                            Case 82
                Case "82"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("eingereicht", "fertig")
                    myVermerk.VermerkCodeId = 83
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                                VermerkeDAL.UpdateLKW(myVermerk.AvisoID, False)
                                Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
                                sql.doSQL("UPDATE AVISO SET ZOLLDigitalEingereicht=0, LKW_fertig=1  where avisoid=" & AVISO.AvisoID, "AVISO")
                                AvisoStatusFunctions.printFinish(AVISO)
-
+                        End Select
-                    '  avisoAktualisierenAktiveIdBehalten(myVermerk.AvisoID)
+                    End If
                    'Vermerke_aktualisieren()
                    init = True '   Vermerke_anzeigen(RowIndex)
                Case "96"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 97
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "101"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("offen", "erledigt")
                    myVermerk.VermerkCodeId = 102
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "103"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 104
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "105"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 106
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "107"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 108
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                Case "118"
                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
                    myVermerk.VermerkCodeId = 119
                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
            End Select
        End If
@@ -1375,88 +1204,17 @@ Public Class usrcntlAktDetails
                    r.DefaultCellStyle.Font = New Font(gridvermerke.Font.FontFamily, gridvermerke.Font.Size, FontStyle.Strikeout)
                End If
                If (r.Cells("VermerkeCode").Value) IsNot DBNull.Value Then
                    Dim vermerkCode As Integer = CInt(r.Cells("VermerkeCode").Value)
                    Dim paarId As Integer = 0
                    If gridvermerke.Columns.Contains("PaarId") AndAlso r.Cells("PaarId").Value IsNot DBNull.Value Then
                        paarId = CInt(r.Cells("PaarId").Value)
                    End If
                    Dim paarBez As String = ""
                    If gridvermerke.Columns.Contains("PaarBezeichnung") AndAlso r.Cells("PaarBezeichnung").Value IsNot DBNull.Value Then
                        paarBez = CStr(r.Cells("PaarBezeichnung").Value)
                    End If
-                    Select Case CInt(r.Cells("VermerkeCode").Value)
+                    Select Case vermerkCode
                        Case 1
                            If Not existCodeInGridVermerke(r, gridvermerke, 2, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "Auftrag erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Auftrag erhalten' einzutragen."
                            End If
                        Case 3
                            If Not existCodeInGridVermerke(r, gridvermerke, 4, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "Rechnung erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Rechnung erhalten' einzutragen."
                            End If
                        Case 5
                            If Not existCodeInGridVermerke(r, gridvermerke, 6, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "LS erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'LS erhalten' einzutragen."
                            End If
                        Case 7
                            If Not existCodeInGridVermerke(r, gridvermerke, 8, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "ATR erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATR erhalten' einzutragen."
                            End If
                        Case 9
                            If Not existCodeInGridVermerke(r, gridvermerke, 10, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "Vollmacht erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vollmacht erhalten' einzutragen."
                            End If
                        Case 11
                            If Not existCodeInGridVermerke(r, gridvermerke, 12, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "CMR erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'CMR erhalten' einzutragen."
                            End If
                        Case 90
                            If Not existCodeInGridVermerke(r, gridvermerke, 93, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "Packliste erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Packliste erhalten' einzutragen."
                            End If
                        Case 13
                            If r.Cells("VorauskasseId").Value IsNot DBNull.Value Then
                                If Not existCodeInGridVermerke_VK(gridvermerke, r.Cells("VorauskasseId").Value) Then
                                    optionCell.Value = "Vorauskasse erhalten"
                                    optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorauskasse erhalten' einzutragen."
                                End If
                            Else
                                If Not existCodeInGridVermerke_VK_OLD(gridvermerke, r.Cells("SendungID").Value) Then
                                    optionCell.Value = "Vorauskasse erhalten"
                                    optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorauskasse erhalten' einzutragen."
                                End If
                            End If
                        Case 17
                            If Not existCodeInGridVermerke(r, gridvermerke, 18) Then
                                optionCell.Value = "DE-ZOLL fertig"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'DE-ZOLL fertig' einzutragen."
                            End If
                        Case 19
                            If Not existCodeInGridVermerke(r, gridvermerke, 20) Then
                                optionCell.Value = "AT-ZOLL fertig"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'AT-ZOLL fertig' einzutragen."
                            End If
                        Case 25
                            If Not existCodeInGridVermerke(r, gridvermerke, 30, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "Dokument erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Dokument erhalten' einzutragen."
                            End If
                        Case 31
                            If Not existCodeInGridVermerke(r, gridvermerke, 32, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "Vorbereitung abgeschlossen"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorbereitung abgeschlossen' einzutragen."
                            End If
                        Case 33
                            If Not existCodeInGridVermerke(r, gridvermerke, 34, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "ATA-Nr. erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATA-Nr. erhalten' einzutragen."
                            End If
                        Case 36
                            If Not existCodeInGridVermerke(r, gridvermerke, 37, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "Kontaktdaten erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Kontaktdaten erhalten' einzutragen."
                            End If
                        Case 46
                            If r.Cells("SMSId").Value IsNot DBNull.Value AndAlso IsNumeric(r.Cells("SMSId").Value) Then
                                Dim SMS As New VERAG_PROG_ALLGEMEIN.cSMS(r.Cells("SMSId").Value)
@@ -1464,10 +1222,6 @@ Public Class usrcntlAktDetails
                                optionCell.Style.BackColor = Color.White
                                optionCell.LinkColor = Color.Black
                                'Select Case MSG.Status
                                '    Case MessageStatus.Expired, MessageStatus.Failed, MessageStatus.FailedAuthorisation, MessageStatus.Cancelled, MessageStatus.Rejected
                                Select Case SMS.sms_Status
                                    Case -1 : optionCell.Value = ""
                                    Case com.esendex.sdk.core.MessageStatus.Submitted, com.esendex.sdk.core.MessageStatus.Sent, com.esendex.sdk.core.MessageStatus.Connecting, com.esendex.sdk.core.MessageStatus.Acknowledged, com.esendex.sdk.core.MessageStatus.Scheduled
@@ -1489,77 +1243,31 @@ Public Class usrcntlAktDetails
                                        'optionCell.Style.SelectionBackColor = optionCell.Style.BackColor
                                End Select
                            End If
-                        Case 53
+                        Case 13
-                            If Not existCodeInGridVermerke(r, gridvermerke, 54, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
+                            If paarId > 0 Then
-                                optionCell.Value = "Ü-Dok erhalten"
+                                If r.Cells("VorauskasseId").Value IsNot DBNull.Value Then
-                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Ü-Dok erhalten' einzutragen."
+                                    If Not existCodeInGridVermerke_VK(gridvermerke, r.Cells("VorauskasseId").Value) Then
                                        optionCell.Value = paarBez
                                        optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk '" & paarBez & "' einzutragen."
                                    End If
-                        Case 55
+                                Else
-                            If Not existCodeInGridVermerke(r, gridvermerke, 56, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
+                                    If Not existCodeInGridVermerke_VK_OLD(gridvermerke, r.Cells("SendungID").Value) Then
-                                optionCell.Value = "Rg-Best. erhalten"
+                                        optionCell.Value = paarBez
-                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Rg-Best. erhalten' einzutragen."
+                                        optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk '" & paarBez & "' einzutragen."
                                    End If
                        Case 57
                            If Not existCodeInGridVermerke(r, gridvermerke, 58, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "Dispoliste erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Dispoliste erhalten' einzutragen."
                                End If
                        Case 74
                            If Not existCodeInGridVermerke(r, gridvermerke, 75, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "Frachtkosten erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Frachtkosten erhalten' einzutragen."
                            End If
                        Case 76
                            If Not existCodeInGridVermerke(r, gridvermerke, 77, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "Absend.best. erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Absenderbestätigung erhalten' einzutragen."
                            End If
                        Case 96
                            If Not existCodeInGridVermerke(r, gridvermerke, 97, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "T1 Bestätigung erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'T1 Bestätigung erhalten' einzutragen."
                            End If
                        Case 80
                            If Not existCodeInGridVermerke(r, gridvermerke, 81, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "ATB-Nr. erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATB-Nr. erhalten' einzutragen."
                            End If
                        Case 82
                            If Not existCodeInGridVermerke(r, gridvermerke, 83) Then
                                optionCell.Value = "DE-ZOLL fertig"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'DE-ZOLL (DIGITAL) fertig' einzutragen."
                            End If
                        Case 101
-
+                            If paarId > 0 AndAlso r.Cells("VermerkIDAufgehoben").Value Is DBNull.Value Then
-                            If r.Cells("VermerkIDAufgehoben").Value Is DBNull.Value Then
+                                optionCell.Value = paarBez
-                                '  If Not existCodeInGridVermerke(gridvermerke ,102, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
+                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk '" & paarBez & "' einzutragen."
                                optionCell.Value = "Erledigt"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Sonstiger Grund erledigt' einzutragen."
                            End If
-                        Case 103
+                        Case Else
-                            If Not existCodeInGridVermerke(r, gridvermerke, 104, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
+                            If paarId > 0 Then
-                                optionCell.Value = "Gewicht/Packstücke erhalten"
+                                If Not existCodeInGridVermerke(r, gridvermerke, paarId, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
-                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Gewicht/Packstücke erhalten' einzutragen."
+                                    optionCell.Value = paarBez
                                    optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk '" & paarBez & "' einzutragen."
                                End If
                        Case 105
                            If Not existCodeInGridVermerke(r, gridvermerke, 106, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "Zolltarifnummer erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Zolltarifnummer erhalten' einzutragen."
                            End If
                        Case 107
                            If Not existCodeInGridVermerke(r, gridvermerke, 108, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "Kostenbestätigung erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Kostenbestätigung erhalten' einzutragen."
                            End If
                        Case 118
                            If Not existCodeInGridVermerke(r, gridvermerke, 119, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "T1/T2 Draft OK erhalten"
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'T1/T2 Draft OK ' einzutragen."
                            End If
                    End Select
                End If