Merge branch 'master' of https://git.it.verag.ag/edv/AVISO

Aviso/App.config

@@ -1,30 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <configSections>
+  <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="AVISO.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="AVISO.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-        </sectionGroup>
+    </sectionGroup>
-    </configSections>
+  </configSections>
-    <connectionStrings>
+  <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" />
+    <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>
+  </connectionStrings>
-    <startup>
+  <appSettings>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+    <add key="CustomerPortalApiBaseUrl" value="https://login.server.verag.ag" />
-    </startup>
+    <add key="CustomerPortalApiUsername" value="admin" />
-     
+    <add key="CustomerPortalApiPassword" value="veragadmin" />
-    <userSettings>
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
-        <AVISO.My.MySettings>
+  </appSettings>
-            <setting name="frmMainSize" serializeAs="String">
+  <startup>
-                <value>600, 800</value>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
-            </setting>
+  </startup>
-            <setting name="frmMainPosition" serializeAs="String">
+  <userSettings>
-                <value>200, 200</value>
+    <AVISO.My.MySettings>
-            </setting>
+      <setting name="frmMainSize" serializeAs="String">
-            <setting name="s" serializeAs="String">
+        <value>600, 800</value>
-                <value />
+      </setting>
-            </setting>
+      <setting name="frmMainPosition" serializeAs="String">
-        </AVISO.My.MySettings>
+        <value>200, 200</value>
-    </userSettings>
+      </setting>
+      <setting name="s" serializeAs="String">
+        <value />
+      </setting>
+    </AVISO.My.MySettings>
+  </userSettings>
   <system.serviceModel>
     <bindings>
       <basicHttpBinding>
@@ -93,4 +98,16 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+  <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>

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

Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb

@@ -35,6 +35,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.PrüfungAusPlausibilitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AusgangEingangToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.SicherheitsbetragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.MehrfacheATBNrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.PictureBox5 = New System.Windows.Forms.PictureBox()
         Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton()
@@ -69,7 +70,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.lblReferenzwert = New System.Windows.Forms.Label()
         Me.btnExcel = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.MehrfacheATBNrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.cbxAUTO = New System.Windows.Forms.CheckBox()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.Panel1.SuspendLayout()
         CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -80,7 +81,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         '
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem, Me.SaldoZumStichtagToolStripMenuItem, Me.PrüfungAusPlausibilitätToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(202, 114)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(202, 92)
         '
         'ExportCSVToolStripMenuItem
         '
@@ -135,18 +136,25 @@ Partial Class frmGesamtsicherheitenMenuNEU
         'AusgangEingangToolStripMenuItem
         '
         Me.AusgangEingangToolStripMenuItem.Name = "AusgangEingangToolStripMenuItem"
-        Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
         Me.AusgangEingangToolStripMenuItem.Text = "Ausgang < Eingang"
         '
         'SicherheitsbetragToolStripMenuItem
         '
         Me.SicherheitsbetragToolStripMenuItem.Name = "SicherheitsbetragToolStripMenuItem"
-        Me.SicherheitsbetragToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.SicherheitsbetragToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
         Me.SicherheitsbetragToolStripMenuItem.Text = "Sicherheitsbetrag"
         '
+        'MehrfacheATBNrToolStripMenuItem
+        '
+        Me.MehrfacheATBNrToolStripMenuItem.Name = "MehrfacheATBNrToolStripMenuItem"
+        Me.MehrfacheATBNrToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
+        Me.MehrfacheATBNrToolStripMenuItem.Text = "mehrfache ATB-Nr"
+        '
         'Panel1
         '
         Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Panel1.Controls.Add(Me.cbxAUTO)
         Me.Panel1.Controls.Add(Me.PictureBox5)
         Me.Panel1.Controls.Add(Me.btnOpenOver85Days)
         Me.Panel1.Controls.Add(Me.txtDatBis)
@@ -181,7 +189,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel1.Location = New System.Drawing.Point(0, 0)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(658, 288)
+        Me.Panel1.Size = New System.Drawing.Size(706, 288)
         Me.Panel1.TabIndex = 0
         '
         'PictureBox5
@@ -567,7 +575,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.btnNeu.FlatAppearance.BorderSize = 0
         Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnNeu.ForeColor = System.Drawing.Color.Black
-        Me.btnNeu.Location = New System.Drawing.Point(571, 253)
+        Me.btnNeu.Location = New System.Drawing.Point(619, 253)
         Me.btnNeu.Name = "btnNeu"
         Me.btnNeu.Size = New System.Drawing.Size(75, 23)
         Me.btnNeu.TabIndex = 34
@@ -580,7 +588,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.lblSaldo.AutoSize = True
         Me.lblSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblSaldo.ForeColor = System.Drawing.Color.Red
-        Me.lblSaldo.Location = New System.Drawing.Point(450, 11)
+        Me.lblSaldo.Location = New System.Drawing.Point(447, 10)
         Me.lblSaldo.Name = "lblSaldo"
         Me.lblSaldo.Size = New System.Drawing.Size(82, 24)
         Me.lblSaldo.TabIndex = 1
@@ -592,7 +600,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.lblZollsatz.AutoSize = True
         Me.lblZollsatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblZollsatz.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblZollsatz.Location = New System.Drawing.Point(451, 116)
+        Me.lblZollsatz.Location = New System.Drawing.Point(448, 115)
         Me.lblZollsatz.Name = "lblZollsatz"
         Me.lblZollsatz.Size = New System.Drawing.Size(63, 16)
         Me.lblZollsatz.TabIndex = 9
@@ -604,7 +612,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.lblReferenzwert.AutoSize = True
         Me.lblReferenzwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblReferenzwert.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblReferenzwert.Location = New System.Drawing.Point(451, 89)
+        Me.lblReferenzwert.Location = New System.Drawing.Point(448, 88)
         Me.lblReferenzwert.Name = "lblReferenzwert"
         Me.lblReferenzwert.Size = New System.Drawing.Size(95, 16)
         Me.lblReferenzwert.TabIndex = 6
@@ -618,7 +626,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.btnExcel.FlatAppearance.BorderSize = 0
         Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnExcel.ForeColor = System.Drawing.Color.Black
-        Me.btnExcel.Location = New System.Drawing.Point(249, 688)
+        Me.btnExcel.Location = New System.Drawing.Point(297, 688)
         Me.btnExcel.Name = "btnExcel"
         Me.btnExcel.Size = New System.Drawing.Size(105, 23)
         Me.btnExcel.TabIndex = 35
@@ -637,20 +645,27 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.dgvListe.Location = New System.Drawing.Point(-3, 288)
         Me.dgvListe.Name = "dgvListe"
         Me.dgvListe.ReadOnly = True
-        Me.dgvListe.Size = New System.Drawing.Size(658, 394)
+        Me.dgvListe.Size = New System.Drawing.Size(706, 394)
         Me.dgvListe.TabIndex = 1
         '
-        'MehrfacheATBNrToolStripMenuItem
+        'cbxAUTO
         '
-        Me.MehrfacheATBNrToolStripMenuItem.Name = "MehrfacheATBNrToolStripMenuItem"
+        Me.cbxAUTO.AutoSize = True
-        Me.MehrfacheATBNrToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.cbxAUTO.Checked = True
-        Me.MehrfacheATBNrToolStripMenuItem.Text = "mehrfache ATB-Nr"
+        Me.cbxAUTO.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxAUTO.ForeColor = System.Drawing.SystemColors.ButtonHighlight
+        Me.cbxAUTO.Location = New System.Drawing.Point(36, 233)
+        Me.cbxAUTO.Name = "cbxAUTO"
+        Me.cbxAUTO.Size = New System.Drawing.Size(56, 17)
+        Me.cbxAUTO.TabIndex = 133
+        Me.cbxAUTO.Text = "AUTO"
+        Me.cbxAUTO.UseVisualStyleBackColor = True
         '
         'frmGesamtsicherheitenMenuNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(658, 721)
+        Me.ClientSize = New System.Drawing.Size(706, 721)
         Me.Controls.Add(Me.btnExcel)
         Me.Controls.Add(Me.dgvListe)
         Me.Controls.Add(Me.Panel1)
@@ -715,4 +730,5 @@ Partial Class frmGesamtsicherheitenMenuNEU
     Friend WithEvents SicherheitsbetragToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents RLZollamtBereinigtToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents MehrfacheATBNrToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents cbxAUTO As CheckBox
 End Class

Aviso/frmGesamtsicherheitenMenuNEU.vb

@@ -75,6 +75,7 @@ Public Class frmGesamtsicherheitenMenuNEU
                                                             ) <> 0 "
         If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = " & cbxStandort._value.ToString
         If cbxWarenort._value <> "" Then sqladdon &= " AND gs_warenort = '" & cbxWarenort._value.ToString & "'"
+        If cbxAUTO.Checked Then sqladdon &= " AND CAST(gs_dakoyimport AS INT) = 1"
 
         'Dim sqlstring As String =
         '    " select * from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort, MIN(gs_warenort) as gs_warenort, MIN(gs_filialenNr) as gs_filialenNr, min(gs_abfertigungsNr) as gs_abfertigungsNr, MIN(gs_avisoId) as gs_avisoId,
@@ -127,12 +128,14 @@ Public Class frmGesamtsicherheitenMenuNEU
                                 )
                                 SELECT
                                     gs.gs_gsnr,
+                                    MAX(CAST(gs_dakoyimport AS INT)) AS gs_DAKOSYAUTO,                                    
                                     MIN(gs.gs_standort) AS gs_standort,
                                     MIN(gs.gs_warenort) AS gs_warenort,
                                     MIN(gs.gs_filialenNr) AS gs_filialenNr,
                                     MIN(gs.gs_abfertigungsNr) AS gs_abfertigungsNr,
                                     MIN(gs.gs_avisoId) AS gs_avisoId,
                                     MAX(gs.gs_LKWKZ) AS gs_LKWKZ,
+                                   
                                     MIN(gs.gs_datum) AS gs_datum,
                                     (
                                        COALESCE(MAX(SicherheitsSaldo.gs_SicherheitsSaldo), 0) + 
@@ -166,7 +169,7 @@ Public Class frmGesamtsicherheitenMenuNEU
             .RowHeadersWidth = 6
             .Columns("gs_standort").Visible = False
             .Columns("gs_gsnr").HeaderText = "#"
-            .Columns("gs_gsnr").Width = 36
+            .Columns("gs_gsnr").Width = 45
             .Columns("gs_filialenNr").HeaderText = "Filiale"
             .Columns("gs_filialenNr").Width = 43
             .Columns("gs_abfertigungsNr").HeaderText = "Abfert.Nr."
@@ -181,6 +184,21 @@ Public Class frmGesamtsicherheitenMenuNEU
             .Columns("gs_avisoId").Width = 96
             .Columns("gs_avisoId").HeaderText = "LKW-ID"
             .Columns("gs_LKWKZ").HeaderText = "LKW-KZ"
+            .Columns("gs_DAKOSYAUTO").HeaderText = "AUTO"
+
+            .Columns("gs_DAKOSYAUTO").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+
+            If TypeOf .Columns("gs_DAKOSYAUTO") Is DataGridViewCheckBoxColumn = False Then
+                Dim colIndex As Integer = dgvListe.Columns("gs_DAKOSYAUTO").Index
+                .Columns.Remove("gs_DAKOSYAUTO")
+                Dim chkCol As New DataGridViewCheckBoxColumn()
+                chkCol.Name = "gs_DAKOSYAUTO"
+                chkCol.HeaderText = "AUTO"
+                chkCol.Width = 40
+                chkCol.DataPropertyName = "gs_DAKOSYAUTO"
+                .Columns.Insert(colIndex, chkCol)
+            End If
+
 
         End With
 
@@ -233,7 +251,8 @@ Public Class frmGesamtsicherheitenMenuNEU
                 .warenortID = dgvListe.CurrentRow.Cells("gs_warenort").Value
                 .avisoID = dgvListe.CurrentRow.Cells("gs_avisoId").Value
                 .dataTable = Me.dataTable
-                .firmaId = Me.firmaId
+                .DAKOSY_AUTO = dgvListe.CurrentRow.Cells("gs_DAKOSYAUTO").Value
+
             End With
 
             AddHandler frm.FormClosing, Function()

Aviso/frmGesamtsicherheitenNEU.Designer.vb

@@ -22,16 +22,16 @@ Partial Class frmGesamtsicherheitenNEU
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheitenNEU))
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheitenNEU))
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Me.ContextMenuStripGesSicherh = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Me.ContextMenuStripGesSicherh = New System.Windows.Forms.ContextMenuStrip()
         Me.ATBNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.MRNNRÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.pnlChangeATCNr = New System.Windows.Forms.Panel()
         Me.txtSicherheitsbetragContext = New System.Windows.Forms.TextBox()
@@ -55,7 +55,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Label18 = New System.Windows.Forms.Label()
         Me.Label17 = New System.Windows.Forms.Label()
         Me.Label16 = New System.Windows.Forms.Label()
-        Me.ContextMenuStripPosSicherheiten = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ContextMenuStripPosSicherheiten = New System.Windows.Forms.ContextMenuStrip()
         Me.ATCMRNNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlSummeGes = New System.Windows.Forms.Panel()
         Me.Label28 = New System.Windows.Forms.Label()
@@ -89,18 +89,20 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtGestellInfo = New System.Windows.Forms.TextBox()
         Me.lblId = New System.Windows.Forms.Label()
         Me.cbxZollsatzueberschreiben = New System.Windows.Forms.CheckBox()
-        Me.btnNext = New System.Windows.Forms.Button()
         Me.lbloffenerSaldo = New System.Windows.Forms.Label()
-        Me.btnPrev = New System.Windows.Forms.Button()
         Me.Label20 = New System.Windows.Forms.Label()
         Me.txtPosNr = New System.Windows.Forms.TextBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.cbxHeader = New System.Windows.Forms.CheckBox()
+        Me.btnDAKOSY_AUTO = New System.Windows.Forms.Button()
         Me.cbxRundPosanzeigen = New System.Windows.Forms.CheckBox()
         Me.btnRundungsdifAusgl = New System.Windows.Forms.Button()
         Me.btnNew = New System.Windows.Forms.Button()
         Me.cbx_offene = New System.Windows.Forms.CheckBox()
         Me.txtSuche = New System.Windows.Forms.TextBox()
         Me.Label21 = New System.Windows.Forms.Label()
+        Me.btnPrev = New System.Windows.Forms.Button()
+        Me.btnNext = New System.Windows.Forms.Button()
         Me.Label15 = New System.Windows.Forms.Label()
         Me.txtAnzahlPos = New System.Windows.Forms.TextBox()
         Me.Label14 = New System.Windows.Forms.Label()
@@ -131,8 +133,8 @@ Partial Class frmGesamtsicherheitenNEU
         Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.btnSave = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.btnClosePanOverlay = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.dgvGesamtsicherheit = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvGesamtsicherheit = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
-        Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
         Me.txtPosSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtPosWarenwertGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -147,7 +149,6 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnUpdateSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.btnAddPos = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.btnAddSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStripGesSicherh.SuspendLayout()
         Me.Panel2.SuspendLayout()
         Me.pnlChangeATCNr.SuspendLayout()
@@ -180,6 +181,12 @@ Partial Class frmGesamtsicherheitenNEU
         Me.MRNNRÄndernToolStripMenuItem.Size = New System.Drawing.Size(200, 22)
         Me.MRNNRÄndernToolStripMenuItem.Text = "MRN-NR ändern"
         '
+        'LöschenToolStripMenuItem
+        '
+        Me.LöschenToolStripMenuItem.Name = "LöschenToolStripMenuItem"
+        Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(200, 22)
+        Me.LöschenToolStripMenuItem.Text = "löschen"
+        '
         'Panel2
         '
         Me.Panel2.Controls.Add(Me.pnlChangeATCNr)
@@ -191,7 +198,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Panel2.Location = New System.Drawing.Point(0, 287)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(1684, 489)
+        Me.Panel2.Size = New System.Drawing.Size(1774, 489)
         Me.Panel2.TabIndex = 1
         '
         'pnlChangeATCNr
@@ -466,7 +473,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.pnlSummeGes.Dock = System.Windows.Forms.DockStyle.Bottom
         Me.pnlSummeGes.Location = New System.Drawing.Point(0, 457)
         Me.pnlSummeGes.Name = "pnlSummeGes"
-        Me.pnlSummeGes.Size = New System.Drawing.Size(1684, 32)
+        Me.pnlSummeGes.Size = New System.Drawing.Size(1774, 32)
         Me.pnlSummeGes.TabIndex = 3
         '
         'Label28
@@ -551,7 +558,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lblGestellungNr.AutoSize = True
         Me.lblGestellungNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblGestellungNr.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblGestellungNr.Location = New System.Drawing.Point(312, 7)
+        Me.lblGestellungNr.Location = New System.Drawing.Point(402, 7)
         Me.lblGestellungNr.Name = "lblGestellungNr"
         Me.lblGestellungNr.Size = New System.Drawing.Size(177, 24)
         Me.lblGestellungNr.TabIndex = 1
@@ -559,8 +566,9 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'txtPosTime
         '
+        Me.txtPosTime.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.txtPosTime.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosTime.Location = New System.Drawing.Point(1282, 200)
+        Me.txtPosTime.Location = New System.Drawing.Point(1411, 200)
         Me.txtPosTime.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosTime.Name = "txtPosTime"
         Me.txtPosTime.Size = New System.Drawing.Size(55, 24)
@@ -577,9 +585,10 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'txtPosSicherheitsbetrag
         '
+        Me.txtPosSicherheitsbetrag.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.txtPosSicherheitsbetrag.Enabled = False
         Me.txtPosSicherheitsbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosSicherheitsbetrag.Location = New System.Drawing.Point(1443, 200)
+        Me.txtPosSicherheitsbetrag.Location = New System.Drawing.Point(1572, 200)
         Me.txtPosSicherheitsbetrag.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosSicherheitsbetrag.Name = "txtPosSicherheitsbetrag"
         Me.txtPosSicherheitsbetrag.Size = New System.Drawing.Size(104, 24)
@@ -587,8 +596,9 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'txtPosWarenwert
         '
+        Me.txtPosWarenwert.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.txtPosWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosWarenwert.Location = New System.Drawing.Point(1340, 200)
+        Me.txtPosWarenwert.Location = New System.Drawing.Point(1469, 200)
         Me.txtPosWarenwert.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosWarenwert.Name = "txtPosWarenwert"
         Me.txtPosWarenwert.Size = New System.Drawing.Size(100, 24)
@@ -596,9 +606,10 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'txtPositionenCRN
         '
+        Me.txtPositionenCRN.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.txtPositionenCRN.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper
         Me.txtPositionenCRN.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPositionenCRN.Location = New System.Drawing.Point(964, 200)
+        Me.txtPositionenCRN.Location = New System.Drawing.Point(1093, 200)
         Me.txtPositionenCRN.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPositionenCRN.Name = "txtPositionenCRN"
         Me.txtPositionenCRN.Size = New System.Drawing.Size(203, 24)
@@ -639,7 +650,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lblZollsatz.AutoSize = True
         Me.lblZollsatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblZollsatz.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblZollsatz.Location = New System.Drawing.Point(1252, 137)
+        Me.lblZollsatz.Location = New System.Drawing.Point(1471, 137)
         Me.lblZollsatz.Name = "lblZollsatz"
         Me.lblZollsatz.Size = New System.Drawing.Size(85, 16)
         Me.lblZollsatz.TabIndex = 7
@@ -651,7 +662,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lblReferenzwert.AutoSize = True
         Me.lblReferenzwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblReferenzwert.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblReferenzwert.Location = New System.Drawing.Point(1252, 121)
+        Me.lblReferenzwert.Location = New System.Drawing.Point(1342, 121)
         Me.lblReferenzwert.Name = "lblReferenzwert"
         Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16)
         Me.lblReferenzwert.TabIndex = 6
@@ -663,7 +674,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lblSaldo.AutoSize = True
         Me.lblSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblSaldo.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblSaldo.Location = New System.Drawing.Point(1439, 105)
+        Me.lblSaldo.Location = New System.Drawing.Point(1529, 105)
         Me.lblSaldo.Name = "lblSaldo"
         Me.lblSaldo.Size = New System.Drawing.Size(147, 24)
         Me.lblSaldo.TabIndex = 5
@@ -732,7 +743,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.panOben.Location = New System.Drawing.Point(0, 0)
         Me.panOben.Margin = New System.Windows.Forms.Padding(0)
         Me.panOben.Name = "panOben"
-        Me.panOben.Size = New System.Drawing.Size(1684, 287)
+        Me.panOben.Size = New System.Drawing.Size(1774, 287)
         Me.panOben.TabIndex = 0
         '
         'Label31
@@ -787,10 +798,11 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'dtpPosDat
         '
+        Me.dtpPosDat.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.dtpPosDat.CustomFormat = "''"
         Me.dtpPosDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.dtpPosDat.Format = System.Windows.Forms.DateTimePickerFormat.Custom
-        Me.dtpPosDat.Location = New System.Drawing.Point(1171, 200)
+        Me.dtpPosDat.Location = New System.Drawing.Point(1300, 200)
         Me.dtpPosDat.Margin = New System.Windows.Forms.Padding(0)
         Me.dtpPosDat.Name = "dtpPosDat"
         Me.dtpPosDat.RightToLeft = System.Windows.Forms.RightToLeft.No
@@ -803,7 +815,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lbloffenerWarenwert.AutoSize = True
         Me.lbloffenerWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lbloffenerWarenwert.ForeColor = System.Drawing.Color.Red
-        Me.lbloffenerWarenwert.Location = New System.Drawing.Point(393, 109)
+        Me.lbloffenerWarenwert.Location = New System.Drawing.Point(483, 109)
         Me.lbloffenerWarenwert.Name = "lbloffenerWarenwert"
         Me.lbloffenerWarenwert.Size = New System.Drawing.Size(204, 24)
         Me.lbloffenerWarenwert.TabIndex = 51
@@ -827,7 +839,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lblId.AutoSize = True
         Me.lblId.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblId.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblId.Location = New System.Drawing.Point(1529, 7)
+        Me.lblId.Location = New System.Drawing.Point(1619, 7)
         Me.lblId.Name = "lblId"
         Me.lblId.Size = New System.Drawing.Size(29, 24)
         Me.lblId.TabIndex = 0
@@ -835,59 +847,34 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'cbxZollsatzueberschreiben
         '
+        Me.cbxZollsatzueberschreiben.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.cbxZollsatzueberschreiben.AutoSize = True
         Me.cbxZollsatzueberschreiben.ForeColor = System.Drawing.Color.White
-        Me.cbxZollsatzueberschreiben.Location = New System.Drawing.Point(974, 154)
+        Me.cbxZollsatzueberschreiben.Location = New System.Drawing.Point(1103, 154)
         Me.cbxZollsatzueberschreiben.Name = "cbxZollsatzueberschreiben"
         Me.cbxZollsatzueberschreiben.Size = New System.Drawing.Size(132, 17)
         Me.cbxZollsatzueberschreiben.TabIndex = 9
         Me.cbxZollsatzueberschreiben.Text = "Zollsatz überschreiben"
         Me.cbxZollsatzueberschreiben.UseVisualStyleBackColor = True
         '
-        'btnNext
-        '
-        Me.btnNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnNext.BackColor = System.Drawing.Color.White
-        Me.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnNext.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnNext.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnNext.Location = New System.Drawing.Point(1628, 37)
-        Me.btnNext.Name = "btnNext"
-        Me.btnNext.Size = New System.Drawing.Size(50, 25)
-        Me.btnNext.TabIndex = 8
-        Me.btnNext.Text = ">>"
-        Me.btnNext.UseVisualStyleBackColor = False
-        '
         'lbloffenerSaldo
         '
         Me.lbloffenerSaldo.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.lbloffenerSaldo.AutoSize = True
         Me.lbloffenerSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lbloffenerSaldo.ForeColor = System.Drawing.Color.Red
-        Me.lbloffenerSaldo.Location = New System.Drawing.Point(393, 137)
+        Me.lbloffenerSaldo.Location = New System.Drawing.Point(483, 137)
         Me.lbloffenerSaldo.Name = "lbloffenerSaldo"
         Me.lbloffenerSaldo.Size = New System.Drawing.Size(253, 24)
         Me.lbloffenerSaldo.TabIndex = 4
         Me.lbloffenerSaldo.Text = "offener Sicherheitswert:  €"
         '
-        'btnPrev
-        '
-        Me.btnPrev.BackColor = System.Drawing.Color.White
-        Me.btnPrev.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnPrev.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnPrev.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnPrev.Location = New System.Drawing.Point(9, 40)
-        Me.btnPrev.Name = "btnPrev"
-        Me.btnPrev.Size = New System.Drawing.Size(50, 22)
-        Me.btnPrev.TabIndex = 3
-        Me.btnPrev.Text = "<<"
-        Me.btnPrev.UseVisualStyleBackColor = False
-        '
         'Label20
         '
+        Me.Label20.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label20.AutoSize = True
         Me.Label20.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label20.Location = New System.Drawing.Point(1176, 233)
+        Me.Label20.Location = New System.Drawing.Point(1305, 233)
         Me.Label20.Name = "Label20"
         Me.Label20.Size = New System.Drawing.Size(25, 13)
         Me.Label20.TabIndex = 42
@@ -895,9 +882,10 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'txtPosNr
         '
+        Me.txtPosNr.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.txtPosNr.Enabled = False
         Me.txtPosNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosNr.Location = New System.Drawing.Point(1179, 246)
+        Me.txtPosNr.Location = New System.Drawing.Point(1308, 246)
         Me.txtPosNr.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosNr.Name = "txtPosNr"
         Me.txtPosNr.Size = New System.Drawing.Size(37, 24)
@@ -908,6 +896,8 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Panel1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight
+        Me.Panel1.Controls.Add(Me.cbxHeader)
+        Me.Panel1.Controls.Add(Me.btnDAKOSY_AUTO)
         Me.Panel1.Controls.Add(Me.cbxRundPosanzeigen)
         Me.Panel1.Controls.Add(Me.btnRundungsdifAusgl)
         Me.Panel1.Controls.Add(Me.btnNew)
@@ -918,9 +908,28 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Panel1.Controls.Add(Me.btnNext)
         Me.Panel1.Location = New System.Drawing.Point(3, 34)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(1681, 65)
+        Me.Panel1.Size = New System.Drawing.Size(1771, 65)
         Me.Panel1.TabIndex = 2
         '
+        'cbxHeader
+        '
+        Me.cbxHeader.AutoSize = True
+        Me.cbxHeader.Location = New System.Drawing.Point(135, 2)
+        Me.cbxHeader.Name = "cbxHeader"
+        Me.cbxHeader.Size = New System.Drawing.Size(103, 17)
+        Me.cbxHeader.TabIndex = 54
+        Me.cbxHeader.Text = "DAKOSY HEAD"
+        Me.cbxHeader.UseVisualStyleBackColor = True
+        '
+        'btnDAKOSY_AUTO
+        '
+        Me.btnDAKOSY_AUTO.Location = New System.Drawing.Point(1325, 4)
+        Me.btnDAKOSY_AUTO.Name = "btnDAKOSY_AUTO"
+        Me.btnDAKOSY_AUTO.Size = New System.Drawing.Size(122, 42)
+        Me.btnDAKOSY_AUTO.TabIndex = 53
+        Me.btnDAKOSY_AUTO.Text = "DAKOSY AUTO"
+        Me.btnDAKOSY_AUTO.UseVisualStyleBackColor = True
+        '
         'cbxRundPosanzeigen
         '
         Me.cbxRundPosanzeigen.AutoSize = True
@@ -962,7 +971,7 @@ Partial Class frmGesamtsicherheitenNEU
         'txtSuche
         '
         Me.txtSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSuche.Location = New System.Drawing.Point(255, 3)
+        Me.txtSuche.Location = New System.Drawing.Point(323, 3)
         Me.txtSuche.Margin = New System.Windows.Forms.Padding(0)
         Me.txtSuche.Name = "txtSuche"
         Me.txtSuche.Size = New System.Drawing.Size(243, 24)
@@ -972,12 +981,39 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label21.AutoSize = True
         Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label21.Location = New System.Drawing.Point(205, 3)
+        Me.Label21.Location = New System.Drawing.Point(273, 3)
         Me.Label21.Name = "Label21"
         Me.Label21.Size = New System.Drawing.Size(47, 13)
         Me.Label21.TabIndex = 1
         Me.Label21.Text = "Suche:"
         '
+        'btnPrev
+        '
+        Me.btnPrev.BackColor = System.Drawing.Color.White
+        Me.btnPrev.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnPrev.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnPrev.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnPrev.Location = New System.Drawing.Point(9, 40)
+        Me.btnPrev.Name = "btnPrev"
+        Me.btnPrev.Size = New System.Drawing.Size(50, 22)
+        Me.btnPrev.TabIndex = 3
+        Me.btnPrev.Text = "<<"
+        Me.btnPrev.UseVisualStyleBackColor = False
+        '
+        'btnNext
+        '
+        Me.btnNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnNext.BackColor = System.Drawing.Color.White
+        Me.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnNext.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnNext.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnNext.Location = New System.Drawing.Point(1718, 37)
+        Me.btnNext.Name = "btnNext"
+        Me.btnNext.Size = New System.Drawing.Size(50, 25)
+        Me.btnNext.TabIndex = 8
+        Me.btnNext.Text = ">>"
+        Me.btnNext.UseVisualStyleBackColor = False
+        '
         'Label15
         '
         Me.Label15.AutoSize = True
@@ -1040,9 +1076,10 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'Label7
         '
+        Me.Label7.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label7.AutoSize = True
         Me.Label7.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label7.Location = New System.Drawing.Point(1279, 229)
+        Me.Label7.Location = New System.Drawing.Point(1408, 229)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(41, 13)
         Me.Label7.TabIndex = 43
@@ -1050,9 +1087,10 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'Label8
         '
+        Me.Label8.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label8.AutoSize = True
         Me.Label8.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label8.Location = New System.Drawing.Point(1341, 187)
+        Me.Label8.Location = New System.Drawing.Point(1470, 187)
         Me.Label8.Name = "Label8"
         Me.Label8.Size = New System.Drawing.Size(59, 13)
         Me.Label8.TabIndex = 22
@@ -1060,9 +1098,10 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'Label9
         '
+        Me.Label9.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label9.AutoSize = True
         Me.Label9.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label9.Location = New System.Drawing.Point(1444, 187)
+        Me.Label9.Location = New System.Drawing.Point(1573, 187)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(89, 13)
         Me.Label9.TabIndex = 23
@@ -1070,9 +1109,10 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'Label10
         '
+        Me.Label10.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label10.AutoSize = True
         Me.Label10.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label10.Location = New System.Drawing.Point(1280, 187)
+        Me.Label10.Location = New System.Drawing.Point(1409, 187)
         Me.Label10.Name = "Label10"
         Me.Label10.Size = New System.Drawing.Size(40, 13)
         Me.Label10.TabIndex = 21
@@ -1080,9 +1120,10 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'Label11
         '
+        Me.Label11.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label11.AutoSize = True
         Me.Label11.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label11.Location = New System.Drawing.Point(1171, 187)
+        Me.Label11.Location = New System.Drawing.Point(1300, 187)
         Me.Label11.Name = "Label11"
         Me.Label11.Size = New System.Drawing.Size(38, 13)
         Me.Label11.TabIndex = 20
@@ -1090,9 +1131,10 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'Label12
         '
+        Me.Label12.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label12.AutoSize = True
         Me.Label12.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label12.Location = New System.Drawing.Point(1023, 187)
+        Me.Label12.Location = New System.Drawing.Point(1152, 187)
         Me.Label12.Name = "Label12"
         Me.Label12.Size = New System.Drawing.Size(77, 13)
         Me.Label12.TabIndex = 19
@@ -1160,8 +1202,9 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'txtPosFreitext
         '
+        Me.txtPosFreitext.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.txtPosFreitext.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosFreitext.Location = New System.Drawing.Point(1282, 242)
+        Me.txtPosFreitext.Location = New System.Drawing.Point(1411, 242)
         Me.txtPosFreitext.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosFreitext.Name = "txtPosFreitext"
         Me.txtPosFreitext.Size = New System.Drawing.Size(264, 24)
@@ -1350,45 +1393,6 @@ Partial Class frmGesamtsicherheitenNEU
         Me.dgvGesamtsicherheit.AKTUALISIERUNGS_INTERVALL = -1
         Me.dgvGesamtsicherheit.AllowUserToAddRows = False
         Me.dgvGesamtsicherheit.AllowUserToDeleteRows = False
-        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvGesamtsicherheit.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5
-        Me.dgvGesamtsicherheit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvGesamtsicherheit.ContextMenuStrip = Me.ContextMenuStripGesSicherh
-        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvGesamtsicherheit.DefaultCellStyle = DataGridViewCellStyle6
-        Me.dgvGesamtsicherheit.Dock = System.Windows.Forms.DockStyle.Left
-        Me.dgvGesamtsicherheit.Location = New System.Drawing.Point(0, 0)
-        Me.dgvGesamtsicherheit.Name = "dgvGesamtsicherheit"
-        Me.dgvGesamtsicherheit.ReadOnly = True
-        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvGesamtsicherheit.RowHeadersDefaultCellStyle = DataGridViewCellStyle7
-        Me.dgvGesamtsicherheit.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvGesamtsicherheit.Size = New System.Drawing.Size(922, 457)
-        Me.dgvGesamtsicherheit.TabIndex = 0
-        '
-        'dgvSicherheitsPos
-        '
-        Me.dgvSicherheitsPos.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvSicherheitsPos.AllowUserToAddRows = False
-        Me.dgvSicherheitsPos.AllowUserToDeleteRows = False
         DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
         DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
         DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -1396,9 +1400,9 @@ Partial Class frmGesamtsicherheitenNEU
         DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
         DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
         DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvSicherheitsPos.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
+        Me.dgvGesamtsicherheit.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
-        Me.dgvSicherheitsPos.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvGesamtsicherheit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvSicherheitsPos.ContextMenuStrip = Me.ContextMenuStripPosSicherheiten
+        Me.dgvGesamtsicherheit.ContextMenuStrip = Me.ContextMenuStripGesSicherh
         DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
         DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
         DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -1406,13 +1410,52 @@ Partial Class frmGesamtsicherheitenNEU
         DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
         DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
         DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvSicherheitsPos.DefaultCellStyle = DataGridViewCellStyle2
+        Me.dgvGesamtsicherheit.DefaultCellStyle = DataGridViewCellStyle2
+        Me.dgvGesamtsicherheit.Dock = System.Windows.Forms.DockStyle.Left
+        Me.dgvGesamtsicherheit.Location = New System.Drawing.Point(0, 0)
+        Me.dgvGesamtsicherheit.Name = "dgvGesamtsicherheit"
+        Me.dgvGesamtsicherheit.ReadOnly = True
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle3.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.WindowText
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvGesamtsicherheit.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
+        Me.dgvGesamtsicherheit.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvGesamtsicherheit.Size = New System.Drawing.Size(998, 457)
+        Me.dgvGesamtsicherheit.TabIndex = 0
+        '
+        'dgvSicherheitsPos
+        '
+        Me.dgvSicherheitsPos.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvSicherheitsPos.AllowUserToAddRows = False
+        Me.dgvSicherheitsPos.AllowUserToDeleteRows = False
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.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))
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvSicherheitsPos.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
+        Me.dgvSicherheitsPos.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvSicherheitsPos.ContextMenuStrip = Me.ContextMenuStripPosSicherheiten
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvSicherheitsPos.DefaultCellStyle = DataGridViewCellStyle5
         Me.dgvSicherheitsPos.Dock = System.Windows.Forms.DockStyle.Right
-        Me.dgvSicherheitsPos.Location = New System.Drawing.Point(928, 0)
+        Me.dgvSicherheitsPos.Location = New System.Drawing.Point(1004, 0)
         Me.dgvSicherheitsPos.Name = "dgvSicherheitsPos"
         Me.dgvSicherheitsPos.ReadOnly = True
         Me.dgvSicherheitsPos.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvSicherheitsPos.Size = New System.Drawing.Size(756, 457)
+        Me.dgvSicherheitsPos.Size = New System.Drawing.Size(770, 457)
         Me.dgvSicherheitsPos.TabIndex = 1
         '
         'txtPosSicherheitsbGes
@@ -1551,9 +1594,10 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtPosDat._value = ""
         Me.txtPosDat._Waehrung = False
         Me.txtPosDat._WaehrungZeichen = True
+        Me.txtPosDat.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.txtPosDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txtPosDat.ForeColor = System.Drawing.Color.Black
-        Me.txtPosDat.Location = New System.Drawing.Point(1169, 200)
+        Me.txtPosDat.Location = New System.Drawing.Point(1298, 200)
         Me.txtPosDat.MaxLength = 10
         Me.txtPosDat.MaxLineLength = -1
         Me.txtPosDat.MaxLines_Warning = ""
@@ -1592,9 +1636,10 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtZollsatzueberschreiben._value = ""
         Me.txtZollsatzueberschreiben._Waehrung = False
         Me.txtZollsatzueberschreiben._WaehrungZeichen = True
+        Me.txtZollsatzueberschreiben.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.txtZollsatzueberschreiben.Enabled = False
         Me.txtZollsatzueberschreiben.ForeColor = System.Drawing.Color.Black
-        Me.txtZollsatzueberschreiben.Location = New System.Drawing.Point(1112, 152)
+        Me.txtZollsatzueberschreiben.Location = New System.Drawing.Point(1241, 152)
         Me.txtZollsatzueberschreiben.MaxLineLength = -1
         Me.txtZollsatzueberschreiben.MaxLines_Warning = ""
         Me.txtZollsatzueberschreiben.MaxLines_Warning_Label = Nothing
@@ -1605,13 +1650,14 @@ Partial Class frmGesamtsicherheitenNEU
         'btnDeletePos
         '
         Me.btnDeletePos.allowBorder = False
+        Me.btnDeletePos.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.btnDeletePos.BackColor = System.Drawing.Color.White
         Me.btnDeletePos.BackgroundImage = CType(resources.GetObject("btnDeletePos.BackgroundImage"), System.Drawing.Image)
         Me.btnDeletePos.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
         Me.btnDeletePos.FlatAppearance.BorderSize = 0
         Me.btnDeletePos.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnDeletePos.ForeColor = System.Drawing.Color.Black
-        Me.btnDeletePos.Location = New System.Drawing.Point(1561, 160)
+        Me.btnDeletePos.Location = New System.Drawing.Point(1690, 160)
         Me.btnDeletePos.Name = "btnDeletePos"
         Me.btnDeletePos.Size = New System.Drawing.Size(24, 24)
         Me.btnDeletePos.TabIndex = 24
@@ -1637,13 +1683,14 @@ Partial Class frmGesamtsicherheitenNEU
         'btnUpdatePos
         '
         Me.btnUpdatePos.allowBorder = False
+        Me.btnUpdatePos.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.btnUpdatePos.BackColor = System.Drawing.Color.White
         Me.btnUpdatePos.BackgroundImage = CType(resources.GetObject("btnUpdatePos.BackgroundImage"), System.Drawing.Image)
         Me.btnUpdatePos.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
         Me.btnUpdatePos.FlatAppearance.BorderSize = 0
         Me.btnUpdatePos.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnUpdatePos.ForeColor = System.Drawing.Color.Black
-        Me.btnUpdatePos.Location = New System.Drawing.Point(1561, 241)
+        Me.btnUpdatePos.Location = New System.Drawing.Point(1690, 241)
         Me.btnUpdatePos.Name = "btnUpdatePos"
         Me.btnUpdatePos.Size = New System.Drawing.Size(24, 24)
         Me.btnUpdatePos.TabIndex = 49
@@ -1669,13 +1716,14 @@ Partial Class frmGesamtsicherheitenNEU
         'btnAddPos
         '
         Me.btnAddPos.allowBorder = False
+        Me.btnAddPos.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.btnAddPos.BackColor = System.Drawing.Color.White
         Me.btnAddPos.BackgroundImage = CType(resources.GetObject("btnAddPos.BackgroundImage"), System.Drawing.Image)
         Me.btnAddPos.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
         Me.btnAddPos.FlatAppearance.BorderSize = 0
         Me.btnAddPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnAddPos.ForeColor = System.Drawing.Color.Black
-        Me.btnAddPos.Location = New System.Drawing.Point(1561, 199)
+        Me.btnAddPos.Location = New System.Drawing.Point(1690, 199)
         Me.btnAddPos.Name = "btnAddPos"
         Me.btnAddPos.Size = New System.Drawing.Size(24, 24)
         Me.btnAddPos.TabIndex = 39
@@ -1696,21 +1744,14 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnAddSicherheit.TabIndex = 36
         Me.btnAddSicherheit.UseVisualStyleBackColor = False
         '
-        'LöschenToolStripMenuItem
-        '
-        Me.LöschenToolStripMenuItem.Name = "LöschenToolStripMenuItem"
-        Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(200, 22)
-        Me.LöschenToolStripMenuItem.Text = "löschen"
-        '
         'frmGesamtsicherheitenNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1684, 776)
+        Me.ClientSize = New System.Drawing.Size(1774, 776)
         Me.Controls.Add(Me.Panel2)
         Me.Controls.Add(Me.panOben)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.MaximumSize = New System.Drawing.Size(1700, 815)
         Me.MinimumSize = New System.Drawing.Size(1438, 815)
         Me.Name = "frmGesamtsicherheitenNEU"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
@@ -1855,4 +1896,6 @@ Partial Class frmGesamtsicherheitenNEU
     Friend WithEvents txtSPosNr As TextBox
     Friend WithEvents Label31 As Label
     Friend WithEvents LöschenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents btnDAKOSY_AUTO As Button
+    Friend WithEvents cbxHeader As CheckBox
 End Class

Aviso/frmGesamtsicherheitenNEU.resx

@@ -120,10 +120,52 @@
   <metadata name="ContextMenuStripGesSicherh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="FlatButton4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="FlatButton2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnClosePanOverlay.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
   <metadata name="ContextMenuStripPosSicherheiten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>268, 15</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnDeletePos.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -199,7 +241,7 @@
         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAAYBJREFUOE9jYKAAyLnI
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYBJREFUOE9jYKAAyLnI
         BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb
         Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u
         lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow
@@ -256,7 +298,7 @@
         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAAYBJREFUOE9jYKAAyLnI
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYBJREFUOE9jYKAAyLnI
         BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb
         Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u
         lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow
@@ -280,48 +322,6 @@
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCENR738Ar4uDi7bEECMsdngO
         BPzNzFolGmSbTw+zA9wlCnowouBGQQ9GroN4nELB5/4KRtEnC9wlCnowouBGQQ9G7oKVaJBtAF0U0pEO
         zULyAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="FlatButton4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
-        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
-        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
-        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
-        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
-        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
-        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
-        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
-        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="FlatButton2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
-        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
-        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
-        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
-        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
-        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
-        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
-        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
-        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="btnClosePanOverlay.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
-        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
-        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
-        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
-        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
-        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
-        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
-        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
-        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

Aviso/frmGesamtsicherheitenNEU.vb

@@ -1,5 +1,4 @@
-Imports GrapeCity.Enterprise.Data.Expressions.Tools
+Imports VERAG_PROG_ALLGEMEIN
-Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmGesamtsicherheitenNEU
 
@@ -52,6 +51,8 @@ Public Class frmGesamtsicherheitenNEU
 
     Public warenortPrefix As String = ""
 
+    Public DAKOSY_AUTO As Boolean = False
+
 
 
     Private Sub frmGesamtsicherheitNEU_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -127,6 +128,9 @@ Public Class frmGesamtsicherheitenNEU
         changeLabel()
 
 
+        btnDAKOSY_AUTO.Enabled = Not DAKOSY_AUTO
+
+
         Me.Text = "Gesamtsicherheit " & Standort
         frmHauptfenster.EnableDoubleBuffered(dgvSicherheitsPos)
 
@@ -144,9 +148,10 @@ Public Class frmGesamtsicherheitenNEU
         If withFilterParam = True Then
             If txtSuche.Text <> "" Then sqlSearchSting &= " AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')"
             If cbxRundPosanzeigen.Checked = False Then sqlSearchSting &= "AND ISNULL(gs_isRundungsdiff,0) = 0"
+            If Not cbxHeader.Checked Then sqlSearchSting &= "AND gs_posNr <> 0 "
         End If
 
-        Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_ATBNr],[gs_posNr],[gs_MRNNr], [gs_posSubNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = " & gessicherheitID & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]"
+        Dim SQLStringSicherheit As String = "select [gs_gsId],[gs_dakoyimport] ,[gs_gsnr], [gs_ATBNr],[gs_posNr],[gs_MRNNr], [gs_posSubNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " ,[gs_EH_Anzahl], [gs_gewicht] , [gs_freitext], [gs_DK_laufnr] from [tblGesamtsicherheit] where [gs_gsnr] = " & gessicherheitID & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]"
 
         dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,)
         dgvGesamtsicherheit.LOAD()
@@ -157,6 +162,13 @@ Public Class frmGesamtsicherheitenNEU
                 .RowHeadersWidth = 10
                 .Columns("gs_gsId").Visible = False
                 .Columns("gs_gsnr").Visible = False
+                .Columns("gs_dakoyimport").Visible = False
+                If Not cbxHeader.Checked Then
+                    .Columns("gs_DK_laufnr").Visible = False
+                Else
+                    .Columns("gs_DK_laufnr").Visible = True
+                End If
+
                 .Columns("gs_warenwert").DefaultCellStyle.Format = "c"
                 .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c"
                 .Columns("gs_saldo").DefaultCellStyle.Format = "c"
@@ -196,6 +208,17 @@ Public Class frmGesamtsicherheitenNEU
                 .Columns("gs_datum").HeaderText = "Datum"
                 .Columns("gs_warenwert").Width = 85
                 .Columns("gs_warenwert").HeaderText = "Warenwert"
+                .Columns("gs_EH_Anzahl").HeaderText = "Anz."
+                .Columns("gs_EH_Anzahl").Width = 50
+                .Columns("gs_EH_Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+
+                .Columns("gs_gewicht").HeaderText = "Gewicht"
+                .Columns("gs_gewicht").Width = 50
+                .Columns("gs_gewicht").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+
+                .Columns("gs_DK_laufnr").HeaderText = "DK_ID."
+                .Columns("gs_DK_laufnr").Width = 40
+
                 .Columns("gs_saldo").Width = 100
                 .Columns("gs_saldo").HeaderText = "Saldo"
                 .Columns("gs_sicherheitsbetrag").Width = 85
@@ -217,6 +240,12 @@ Public Class frmGesamtsicherheitenNEU
                     Me.dgvGesamtsicherheit.Rows(i).DefaultCellStyle.BackColor = Color.White
                 End If
 
+                If dgvGesamtsicherheit.Rows(i).Cells("gs_dakoyimport").Value Then
+                    btnDAKOSY_AUTO.Enabled = False
+                Else
+                    btnDAKOSY_AUTO.Enabled = True
+                End If
+
 
             Next
 
@@ -426,7 +455,7 @@ Public Class frmGesamtsicherheitenNEU
         Next
 
         Dim SQLStringSicherheit As String = "select  [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt', gs_art,  
-                                            [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext, gsp_art" &
+                                            [gsp_MRNNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext, gsp_art" &
                                             IIf(detailinfo, ", gs_erstellungsdatum as 'Eingang erstellt am', gs_systemuser as 'von', gs_zuletztgeandert as ' Eingang geändert am',  gsp_erstellungsdatum as 'Ausgang erstellt am', gsp_systemuser as 'von_', gsp_zuletztgeandert as ' Ausgang geändert am'", "") &
                                             "from [tblGesamtsicherheit]
                                             left join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId
@@ -437,7 +466,7 @@ Public Class frmGesamtsicherheitenNEU
 
 
         Dim SQLStringSicherheit_new As String = "	select  [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt',  
-                                            [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext" &
+                                            [gsp_MRNNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext" &
                                             IIf(detailinfo, ", gs_erstellungsdatum as 'Eingang erstellt am', gs_systemuser as 'von', gs_zuletztgeandert as ' Eingang geändert am',  gsp_erstellungsdatum as 'Ausgang erstellt am', gsp_systemuser as 'von_', gsp_zuletztgeandert as ' Ausgang geändert am'", "") &
                                             "From tblGesamtsicherheit
                                             Where gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0
@@ -527,12 +556,13 @@ Public Class frmGesamtsicherheitenNEU
             sqlSearch &= "And gsp_gsid In (Select gs_gsId from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'"
             If txtSuche.Text <> "" Then sqlSearch &= "AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')"
             If cbxRundPosanzeigen.Checked = False Then sqlSearch &= "AND ISNULL(gsp_isPosRundungsdiff,0) = 0"
+            If Not cbxHeader.Checked Then sqlSearch &= " AND gs_posNr <> 0 "
             sqlSearch &= ")"
         End If
 
 
         Dim SQLStringCRN As String =
-            "select [gsp_gspPosId],[gsp_ATCNr],[gsp_datum],[gsp_gsId],[gsp_gsnr],[gsp_warenwert],[gsp_sicherheitsbetrag],  [gsp_freitext]" &' ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_MRNNr], [gsp_art]
+            "select [gsp_gspPosId],[gsp_ATCNr],[gsp_MRNNr],[gsp_datum],[gsp_gsId],[gsp_gsnr],[gsp_warenwert],[gsp_sicherheitsbetrag], [gsp_EH_Anzahl], [gsp_freitext]" &' ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_MRNNr], [gsp_art]
                 "From [tblGesamtsicherheitsPositionen] inner join [tblGesamtsicherheit] on gs_gsId = gsp_gsId where [gsp_gsnr] = '" & gsNr & "'" & sqlSearch & " order by [gs_ATBNr], [gs_posNr]"
 
         dgvSicherheitsPos.SET_SQL(SQLStringCRN, "AVISO", ,)
@@ -545,38 +575,35 @@ Public Class frmGesamtsicherheitenNEU
                 .Columns("gsp_gspPosId").HeaderText = "Pos#"
                 .Columns("gsp_gsId").Visible = False
                 .Columns("gsp_gsnr").Visible = False
+                .Columns("gsp_ATCNr").Visible = False
                 .Columns("gsp_warenwert").DefaultCellStyle.Format = "c"
                 .Columns("gsp_sicherheitsbetrag").DefaultCellStyle.Format = "c"
                 Select Case currentGesSichRef.brgakto_gs_ATR
                     Case True
                         If Standort = "Verag GmbH" Then
-                            .Columns("gsp_ATCNr").HeaderText = "Reg-Nr. / MRN"
+                            .Columns("gsp_MRNNr").HeaderText = "ATC. / MRN"
                         ElseIf Standort = "VERAG AG" Then
-                            .Columns("gsp_ATCNr").HeaderText = "T1 CRN"
+                            .Columns("gsp_MRNNr").HeaderText = "T1 CRN"
                         Else
-                            .Columns("gsp_ATCNr").HeaderText = "EZA / T1 CRN"
+                            .Columns("gsp_MRNNr").HeaderText = "EZA / T1 CRN"
-                        End If
-
-                    Case Else
-                        If Standort = "Verag GmbH" Then
-                            .Columns("gsp_ATCNr").HeaderText = "Reg-Nr. / MRN"
-                        ElseIf Standort = "VERAG AG" Then
-                            .Columns("gsp_ATCNr").HeaderText = "T1 CRN"
-                        Else
-                            .Columns("gsp_ATCNr").HeaderText = "EZA / T1 CRN"
                         End If
 
                 End Select
-                .Columns("gsp_ATCNr").Width = 140
+                .Columns("gsp_MRNNr").Width = 140
                 .Columns("gsp_datum").Width = 100
                 .Columns("gsp_datum").HeaderText = "Datum"
                 .Columns("gsp_warenwert").Width = 100
                 .Columns("gsp_warenwert").HeaderText = "Warenwert"
                 .Columns("gsp_sicherheitsbetrag").Width = 85
                 .Columns("gsp_sicherheitsbetrag").HeaderText = "S-Betrag"
+                .Columns("gsp_EH_Anzahl").HeaderText = "Anz."
+                .Columns("gsp_EH_Anzahl").Width = 50
+                .Columns("gsp_EH_Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+
                 .Columns("gsp_freitext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
                 .Columns("gsp_freitext").HeaderText = "Freitext"
 
+
             End With
 
             Dim changeColor = True
@@ -843,10 +870,10 @@ Public Class frmGesamtsicherheitenNEU
 
                     Case Else
                         With OPEN
-                            .gs_posNr = getLatestPosNr(gessicherheitID, txtSicherheitATBNr.Text) + 1
+                            .gs_posNr = OPEN.getLatestPosNr(gessicherheitID, txtSicherheitATBNr.Text) + 1
 
                             If .gs_MRNNr <> "" Then
-                                .gs_posSubNr = getLatestSubPosNr(gessicherheitID, txtSicherheitATBNr.Text, txtMRNNr.Text) + 1
+                                .gs_posSubNr = OPEN.getLatestSubPosNr(gessicherheitID, txtSicherheitATBNr.Text, txtMRNNr.Text) + 1
                             Else
                                 .gs_posSubNr = Nothing
                             End If
@@ -918,11 +945,11 @@ Public Class frmGesamtsicherheitenNEU
                 .gs_ATBNr = ""
                 .gs_MRNNr = ""
                 If .gs_MRNNr <> "" Then
-                    .gs_posSubNr = Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1
+                    .gs_posSubNr = OPEN.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1
                 Else
                     .gs_posSubNr = Nothing
                 End If
-                .gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
+                .gs_posNr = OPEN.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
                 .gs_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
                 .gs_warenwert = 0
                 .gs_sicherheitsbetrag = 0
@@ -954,7 +981,7 @@ Public Class frmGesamtsicherheitenNEU
                 .gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
                 .gsp_erstellungsdatum = DateTime.Now
                 .gsp_ust = currentSicherheit.gs_ust
-                .gsp_ATCNr = txtPositionenCRN.Text
+                .gsp_MRNNr = txtPositionenCRN.Text
                 .gsp_avisoId = Me.avisoID
                 .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
             End With
@@ -980,7 +1007,7 @@ Public Class frmGesamtsicherheitenNEU
     Sub AfterButton()
         'currentGesSichRef.CalcSaldo()
         lblSaldo.Text = "Saldo: €" & Decimal.Parse(currentGesSichRef.CalcSaldo()).ToString("N")
-        LoadDGVSicherheiten()
+        LoadDGVSicherheiten(True)
         EmptyTXT()
     End Sub
 
@@ -1148,7 +1175,7 @@ Public Class frmGesamtsicherheitenNEU
             .gs_MRNNr = txtMRNNr.Text
             .gs_posNr = Integer.Parse(setNullToZero(txtAnzahlPos.Text))
             If .gs_MRNNr <> "" Then
-                .gs_posSubNr = IIf(Integer.Parse(setNullToZero(txtSPosNr.Text)) <> 0, Integer.Parse(setNullToZero(txtSPosNr.Text)), Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1)
+                .gs_posSubNr = IIf(Integer.Parse(setNullToZero(txtSPosNr.Text)) <> 0, Integer.Parse(setNullToZero(txtSPosNr.Text)), currentSicherheit.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1)
             Else
                 .gs_posSubNr = Nothing
             End If
@@ -1191,13 +1218,13 @@ Public Class frmGesamtsicherheitenNEU
             .gsp_freitext = txtPosFreitext.Text
             .gsp_sicherheitsbetrag = Double.Parse(txtPosSicherheitsbetrag.Text)
             .gsp_warenwert = Double.Parse(txtPosWarenwert.Text)
-            .gsp_ATCNr = If(txtPositionenCRN.Text <> "", txtPositionenCRN.Text, Nothing)
+            .gsp_MRNNr = If(txtPositionenCRN.Text <> "", txtPositionenCRN.Text, Nothing)
 
             If txtPosDat.Text <> "" AndAlso txtPosTime.Text <> "" Then
                 currentSPos.gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
             Else
                 currentSPos.gsp_datum = Nothing
-                If .gsp_ATCNr <> "" AndAlso currentSPos.gsp_datum Is Nothing Then
+                If .gsp_MRNNr <> "" AndAlso currentSPos.gsp_datum Is Nothing Then
                     MsgBox("Datum/Uhrzeit bei Position " & currentSPos.gsp_gspPosId & " muss eingetragen werden!")
                     Exit Sub
                 End If
@@ -1224,7 +1251,7 @@ Public Class frmGesamtsicherheitenNEU
         txtPosFreitext.Text = sPos.gsp_freitext
         txtPosSicherheitsbetrag.Text = sPos.gsp_sicherheitsbetrag
         txtPosWarenwert.Text = sPos.gsp_warenwert
-        txtPositionenCRN.Text = CStr(sPos.gsp_ATCNr)
+        txtPositionenCRN.Text = CStr(sPos.gsp_MRNNr)
 
         Try
             If sPos.gsp_datum IsNot Nothing Then
@@ -1251,7 +1278,7 @@ Public Class frmGesamtsicherheitenNEU
             Dim gsNr = currentSicherheit.gs_gsNr
             Dim subPosNr = currentSicherheit.gs_posSubNr
             currentSicherheit.Delete()
-            rearangePosNr(gsNr, ATBNr, posNr)
+            currentSicherheit.rearangePosNr(gsNr, ATBNr, posNr)
             'rearangeSubPosNr(gsNr, ATBNr, posNr, subPosNr)
             btnUpdateSicherheit.Visible = False
             btnAddSicherheit.Visible = True
@@ -1324,40 +1351,6 @@ Public Class frmGesamtsicherheitenNEU
     End Sub
 
 
-    Private Function getLatestPosNr(gs_gsnr As Integer, gs_ATBNr As String) As Integer
-        Dim posNr As Integer = 0
-        'Dim sqlq As String = "Select MAX([gsp_gspPosId]) As MaxPosNr from tblGesamtsicherheitsPositionen where gsp_gsnr = " & gs_gsnr
-        Dim sqlq As String = "Select MAX([gs_posNr]) As MaxPosNr from [tblGesamtsicherheit] where gs_gsnr = " & gs_gsnr & " And gs_ATBNR = '" & gs_ATBNr & "'"
-        Dim dt As New DataTable
-        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
-
-        If (dt.Rows(0).Item(0) IsNot DBNull.Value) Then
-
-            posNr = dt.Rows(0).Item(0)
-
-        End If
-
-        Return posNr
-
-    End Function
-
-
-    Private Function getLatestSubPosNr(gs_gsnr As Integer, gs_ATBNr As String, gs_MRNNr As String) As Integer
-        Dim posNr As Integer = 0
-        Dim sqlq As String = "Select MAX([gs_posSubNr]) As MaxPosNr from [tblGesamtsicherheit] where gs_gsnr = " & gs_gsnr & " And gs_MRNNr is not null and gs_MRNNr = '" & gs_MRNNr & "'  And gs_ATBNR = '" & gs_ATBNr & "'"
-        Dim dt As New DataTable
-        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
-
-        If (dt.Rows(0).Item(0) IsNot DBNull.Value) Then
-
-            posNr = dt.Rows(0).Item(0)
-
-        End If
-
-        Return posNr
-
-    End Function
-
     Private Sub btnSuche_Click(sender As Object, e As EventArgs)
         Try
             If Me.Visible Then LoadDGVSicherheiten(True)
@@ -1653,7 +1646,7 @@ Public Class frmGesamtsicherheitenNEU
         End If
 
 
-        LoadDGVSicherheiten()
+        LoadDGVSicherheiten(True)
     End Sub
 
     Private Sub btnNext_Click(sender As Object, e As EventArgs) Handles btnNext.Click
@@ -1673,7 +1666,7 @@ Public Class frmGesamtsicherheitenNEU
             Me.gessicherheitID = Me.nextGessicherheitID
         End If
 
-        LoadDGVSicherheiten()
+        LoadDGVSicherheiten(True)
     End Sub
 
     Private Sub initPrevNextButtons()
@@ -1722,101 +1715,111 @@ Public Class frmGesamtsicherheitenNEU
     End Sub
     Private Sub calcGesamtsummen()
 
-        txtAnzalPosGes.Text = DirectCast(dgvGesamtsicherheit.Rows.Count().ToString(), String)
+        Try
-
-        txtPosAnzalPosGes.Text = DirectCast(dgvSicherheitsPos.Rows.Count().ToString(), String)
-
-        Dim countSicherheitsbetrag As Double = 0
-        Dim countWarenwert As Double = 0
-
-        For i As Integer = 0 To dgvGesamtsicherheit.Rows.Count - 1
-            countSicherheitsbetrag += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_sicherheitsbetrag").Value)
-            countWarenwert += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_warenwert").Value)
 
 
-        Next
+            txtAnzalPosGes.Text = DirectCast(dgvGesamtsicherheit.Rows.Count().ToString(), String)
 
-        txtSicherheitsbGes._value = countSicherheitsbetrag.ToString
+            txtPosAnzalPosGes.Text = DirectCast(dgvSicherheitsPos.Rows.Count().ToString(), String)
-        txtWarenwertGes._value = countWarenwert.ToString
 
-        Dim countSicherheitsbetragPos As Double = 0
+            Dim countSicherheitsbetrag As Double = 0
-        Dim countWarenwertPos As Double = 0
+            Dim countWarenwert As Double = 0
 
-        For i As Integer = 0 To dgvSicherheitsPos.Rows.Count - 1
+            For i As Integer = 0 To dgvGesamtsicherheit.Rows.Count - 1
-
-            countSicherheitsbetragPos += CDbl(dgvSicherheitsPos.Rows(i).Cells("gsp_sicherheitsbetrag").Value)
-            countWarenwertPos += CDbl(dgvSicherheitsPos.Rows(i).Cells("gsp_warenwert").Value)
-
-        Next
-
-        txtPosSicherheitsbGes._value = countSicherheitsbetragPos.ToString
-        txtPosWarenwertGes._value = countWarenwertPos.ToString
-
-        lbloffenerWarenwert.Text = "offener Warenwert: €"
-        lbloffenerWarenwert.Text &= Math.Round(countWarenwert, 2) - Math.Round(countWarenwertPos, 2)
-
-        If (Math.Abs(countSicherheitsbetrag - countSicherheitsbetragPos) < 0.1 AndAlso Math.Abs(countSicherheitsbetrag - countSicherheitsbetragPos) <> 0) Then
-            btnRundungsdifAusgl.Enabled = True
-            rundungsdiff = Math.Round(countSicherheitsbetrag - countSicherheitsbetragPos, 2)
-        Else
-            btnRundungsdifAusgl.Enabled = False
-        End If
 
 
 
-    End Sub
+                countSicherheitsbetrag += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_sicherheitsbetrag").Value)
-
+                countWarenwert += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_warenwert").Value)
-    Private Sub rearangePosNr(gsNr As Integer, ATBNr As String, posNr As Integer)
-
-        If posNr = -1 Or posNr = 1 Then Exit Sub
-
-        Dim sqlq As String = "select [gs_gsId], [gs_posNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posNr >= " & posNr
-        Dim dt As New DataTable
-        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
-
-        If (dt.Rows.Count = 0) Then Exit Sub
 
 
-        For i As Integer = 0 To dt.Rows.Count - 1
+            Next
-            Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr"))
-            Dim currentPos = sicherheit.gs_posNr
 
-            If sicherheit.gs_posSubNr IsNot Nothing Then
+            txtSicherheitsbGes._value = countSicherheitsbetrag.ToString
-                rearangeSubPosNr(gsNr, ATBNr, currentPos, sicherheit.gs_posSubNr)
+            txtWarenwertGes._value = countWarenwert.ToString
+
+            Dim countSicherheitsbetragPos As Double = 0
+            Dim countWarenwertPos As Double = 0
+
+            For i As Integer = 0 To dgvSicherheitsPos.Rows.Count - 1
+
+                countSicherheitsbetragPos += CDbl(dgvSicherheitsPos.Rows(i).Cells("gsp_sicherheitsbetrag").Value)
+                countWarenwertPos += CDbl(dgvSicherheitsPos.Rows(i).Cells("gsp_warenwert").Value)
+
+            Next
+
+            txtPosSicherheitsbGes._value = countSicherheitsbetragPos.ToString
+            txtPosWarenwertGes._value = countWarenwertPos.ToString
+
+            lbloffenerWarenwert.Text = "offener Warenwert: €"
+            lbloffenerWarenwert.Text &= Math.Round(countWarenwert, 2) - Math.Round(countWarenwertPos, 2)
+
+            If (Math.Abs(countSicherheitsbetrag - countSicherheitsbetragPos) < 0.1 AndAlso Math.Abs(countSicherheitsbetrag - countSicherheitsbetragPos) <> 0) Then
+                btnRundungsdifAusgl.Enabled = True
+                rundungsdiff = Math.Round(countSicherheitsbetrag - countSicherheitsbetragPos, 2)
+            Else
+                btnRundungsdifAusgl.Enabled = False
             End If
 
-            sicherheit.gs_posNr = currentPos - 1
-
-            sicherheit.UPDATEWithNewPosNr(True)
-
-        Next
 
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
 
     End Sub
 
+    '-------------- AUSGELAGERT IN KLASSE
 
-    Private Sub rearangeSubPosNr(gsNr As Integer, ATBNr As String, posNr As Integer, subposNr As Integer)
+    'Private Sub rearangePosNr(gsNr As Integer, ATBNr As String, posNr As Integer)
 
-        If subposNr = -1 Or subposNr = 1 Then Exit Sub
+    '    If posNr = -1 Or posNr = 1 Then Exit Sub
 
-        'Dim sqlq As String = "select [gs_gsId], [gs_posNr] ,[gs_posSubNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posNr >= " & posNr & " AND gs_posSubNr >= " & subposNr
+    '    Dim sqlq As String = "select [gs_gsId], [gs_posNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posNr >= " & posNr
-        Dim sqlq As String = "select [gs_gsId], [gs_posNr] ,[gs_posSubNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posSubNr >= " & subposNr
+    '    Dim dt As New DataTable
-        Dim dt As New DataTable
+    '    dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
-        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
 
-        If (dt.Rows.Count = 0) Then Exit Sub
+    '    If (dt.Rows.Count = 0) Then Exit Sub
 
 
-        For i As Integer = 0 To dt.Rows.Count - 1
+    '    For i As Integer = 0 To dt.Rows.Count - 1
-            Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr"), dt.Rows(i).Item("gs_posSubNr"))
+    '        Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr"))
-            Dim currentPos = sicherheit.gs_posSubNr
+    '        Dim currentPos = sicherheit.gs_posNr
-            sicherheit.gs_posSubNr = currentPos - 1
-            sicherheit.UPDATEWithNewPosNr()
 
-        Next
+    '        If sicherheit.gs_posSubNr IsNot Nothing Then
+    '            rearangeSubPosNr(gsNr, ATBNr, currentPos, sicherheit.gs_posSubNr)
+    '        End If
+
+    '        sicherheit.gs_posNr = currentPos - 1
+
+    '        sicherheit.UPDATEWithNewPosNr(True)
+
+    '    Next
 
 
-    End Sub
+    'End Sub
+
+
+    'Private Sub rearangeSubPosNr(gsNr As Integer, ATBNr As String, posNr As Integer, subposNr As Integer)
+
+    '    If subposNr = -1 Or subposNr = 1 Then Exit Sub
+
+    '    Dim sqlq As String = "select [gs_gsId], [gs_posNr] ,[gs_posSubNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posSubNr >= " & subposNr
+    '    Dim dt As New DataTable
+    '    dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
+
+    '    If (dt.Rows.Count = 0) Then Exit Sub
+
+
+    '    For i As Integer = 0 To dt.Rows.Count - 1
+    '        Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr"), dt.Rows(i).Item("gs_posSubNr"))
+    '        Dim currentPos = sicherheit.gs_posSubNr
+    '        sicherheit.gs_posSubNr = currentPos - 1
+    '        sicherheit.UPDATEWithNewPosNr()
+
+    '    Next
+
+
+    'End Sub
 
     Private Sub txtlkwIdSearch_VALUE_CHANGED() Handles txtlkwIdSearch.VALUE_CHANGED
         If (txtlkwIdSearch._value <> "") Then
@@ -1862,7 +1865,7 @@ Public Class frmGesamtsicherheitenNEU
         Dim mutlitpleATCNr As Boolean = False
         Dim Warenwert As Double
 
-        ATCNr = dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_ATCNr").Value.ToString
+        ATCNr = dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_MRNNr").Value.ToString
         tempDatum = If(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value IsNot DBNull.Value, CDate(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value).ToString("dd.MM.yyyy"), "")
         TempUhrzeit = If(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value IsNot DBNull.Value, CDate(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value).ToString("HH:mm"), "")
         Warenwert = If(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_warenwert").Value IsNot DBNull.Value, CDbl(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_warenwert").Value), "")
@@ -1871,7 +1874,7 @@ Public Class frmGesamtsicherheitenNEU
         If dgvSicherheitsPos.SelectedRows.Count > 0 Then
 
             For Each row As DataGridViewRow In dgvSicherheitsPos.SelectedRows
-                If row.Cells("gsp_ATCNr").Value.ToString <> ATCNr Then
+                If row.Cells("gsp_MRNNr").Value.ToString <> ATCNr Then
                     mutlitpleATCNr = True
                 End If
             Next
@@ -1920,7 +1923,7 @@ Public Class frmGesamtsicherheitenNEU
                         Dim sicherh As New cSicherheiten(row.Cells("gs_gsId").Value, row.Cells("gs_posNr").Value)
                         sicherh.gs_MRNNr = txtATBNraendern.Text
                         If sicherh.gs_MRNNr <> "" Then
-                            sicherh.gs_posSubNr = IIf(Integer.Parse(setNullToZero(txtSPosNr.Text)) <> 0, Integer.Parse(setNullToZero(txtSPosNr.Text)), Me.getLatestSubPosNr(sicherh.gs_gsNr, sicherh.gs_ATBNr, sicherh.gs_MRNNr) + 1)
+                            sicherh.gs_posSubNr = IIf(Integer.Parse(setNullToZero(txtSPosNr.Text)) <> 0, Integer.Parse(setNullToZero(txtSPosNr.Text)), sicherh.getLatestSubPosNr(sicherh.gs_gsNr, sicherh.gs_ATBNr, sicherh.gs_MRNNr) + 1)
                         Else
                             sicherh.gs_posSubNr = Nothing
                         End If
@@ -2008,7 +2011,7 @@ Public Class frmGesamtsicherheitenNEU
                     End If
                 End If
 
-                SicherhPos.gsp_ATCNr = txtATCaendern.Text
+                SicherhPos.gsp_MRNNr = txtATCaendern.Text
                 SicherhPos.gsp_datum = DateTimeString2DateTimeKonvertinator(txtDatumaendern.Text, txtUhrzeitaendern.Text)
                 SicherhPos.SAVE()
             Next
@@ -2132,10 +2135,10 @@ Public Class frmGesamtsicherheitenNEU
                     .gs_gsNr = gessicherheitID
                     .gs_ATBNr = "Korrekt. Rundungsdiff. " & gessicherheitID
                     .gs_MRNNr = ""
-                    .gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
+                    .gs_posNr = OPEN.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
 
                     If .gs_MRNNr <> "" Then
-                        .gs_posSubNr = Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1
+                        .gs_posSubNr = OPEN.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1
                     Else
                         .gs_posSubNr = Nothing
                     End If
@@ -2171,7 +2174,7 @@ Public Class frmGesamtsicherheitenNEU
                     .gsp_datum = DateTime.Now
                     .gsp_erstellungsdatum = DateTime.Now
                     .gsp_ust = currentSicherheit.gs_ust
-                    .gsp_ATCNr = "Korrekt. Rundungsdiff. " & gessicherheitID
+                    .gsp_MRNNr = "Korrekt. Rundungsdiff. " & gessicherheitID
                     .gsp_isPosRundungsdiff = True
                     .gsp_avisoId = Me.avisoID
                     .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
@@ -2302,7 +2305,7 @@ Public Class frmGesamtsicherheitenNEU
 
                     If currentSicherheit.hasEntry Then
                         currentSicherheit.Delete()
-                        rearangePosNr(gsNr, ATBNr, posNr)
+                        currentSicherheit.rearangePosNr(gsNr, ATBNr, posNr)
                         ' If subPosNr IsNot Nothing Then rearangeSubPosNr(gsNr, ATBNr, posNr, subPosNr)
                     End If
 
@@ -2321,4 +2324,19 @@ Public Class frmGesamtsicherheitenNEU
 
 
     End Sub
+
+    Private Sub btnDAKOSY_AUTO_Click(sender As Object, e As EventArgs) Handles btnDAKOSY_AUTO.Click
+        If Me.gessicherheitID > 0 Then
+            Dim sqlstring = "Update [tblGesamtsicherheit] set [gs_dakoyimport] = 1 WHERE [gs_gsNr] = " & Me.gessicherheitID
+            If SQL.doSQL(sqlstring, "AVISO") Then btnDAKOSY_AUTO.Enabled = False
+        End If
+
+    End Sub
+
+    Private Sub cbxHeader_CheckedChanged(sender As Object, e As EventArgs) Handles cbxHeader.CheckedChanged
+
+        LoadDGVSicherheiten(True)
+
+    End Sub
+
 End Class

Aviso/usrCntlSND_ATBGestellung.vb

@@ -14,6 +14,7 @@ Public Class usrCntlSND_ATBGestellung
     Dim AVISO As VERAG_PROG_ALLGEMEIN.cAviso = Nothing
     Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing
     Dim gsnr_global As Integer = -1
+    Dim gsnr_proLKW_global As Integer = -1
 
     Sub New(AVISO, SND)
 
@@ -39,6 +40,11 @@ Public Class usrCntlSND_ATBGestellung
             SND = f.SENDUNG_LIST(f.CURRENT_INDEX)
 
             If Not IsNumeric(SND.AbfertigungsNr) OrElse CInt(SND.AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
+
+            If Not IsNumeric(SND.tblSnd_Warenwert) OrElse CInt(SND.tblSnd_Warenwert) < 0 Then MsgBox("Warenwert angeben!") : Exit Sub
+
+            If (SND.tblSnd_WarenwertWaehrung) Is Nothing Then MsgBox("Währungseinheit angeben!") : Exit Sub
+
             If If(SND.tblSnd_ATB_T1, "") = "" Then MsgBox("MRN (Gestellung) angeben!") : Exit Sub
 
             If SND.tblSnd_T1_Frist IsNot Nothing AndAlso IsDate(SND.tblSnd_T1_Frist) Then
@@ -103,7 +109,7 @@ Public Class usrCntlSND_ATBGestellung
                 If MsgBox("Gestellung kann NICHT durchgeführt werden!" & vbNewLine & "Eingetragener Warenwert: " & SND.tblSnd_Warenwert & " (Sicherheitsbetrag: " & sicherheitsbertrag & ") übersteigt den vorhandenen Sicherheitssaldo von: " & saldo & vbNewLine & "Trotzdem fortfahren", vbYesNoCancel) <> vbYes Then Exit Sub
             End If
 
-            Dim frMZA As New SDL.frmZollanmeldung("AA", Nothing, AVISO, SND, Now.ToString("yy"), GesSichRef, Standort)
+            Dim frMZA As New SDL.frmZollanmeldung("AA", Nothing, AVISO, SND, Now.ToString("yy"), GesSichRef, Standort, gsnr_proLKW_global)
 
             frMZA.Show()
 
@@ -112,11 +118,11 @@ Public Class usrCntlSND_ATBGestellung
                                              initGesamtsicherheiten()
                                              '     initdgvZollAnmeldungen()
                                          End Sub
-        Else
+            Else
             MsgBox("Fehler beim Speichern. Ankunftsanzeige abgebrochen.")
-        End If
+            End If
-        Me.Cursor = Cursors.Default
+            Me.Cursor = Cursors.Default
-    End Sub
+            End Sub
 
 
     Private Sub btnGesSicherheit_Click(sender As Object, e As EventArgs) Handles btnGesSicherheit.Click
@@ -139,7 +145,7 @@ Public Class usrCntlSND_ATBGestellung
 
         'falls nicht gefunden, 2 Schritt -> Gestellung nach AVISO ID, oder Aberftigungsnr and FilialNr
         If gsnr = 0 Then
-            Dim SQLString As String = "Select top (1) gs_gsNr from [tblGesamtsicherheit] where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & " ) or gs_avisoId = '" & SND.tblSnd_AvisoID & "' order by gs_datum desc"
+            Dim SQLString As String = "Select top (1) gs_gsNr from [tblGesamtsicherheit] where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & " )  order by gs_datum desc"
             dt = SQL.loadDgvBySql(SQLString, "AVISO", 100, True)
             If dt.Rows.Count > 0 Then
                 gsnr = dt.Rows(0).Item("gs_gsNr")
@@ -275,12 +281,21 @@ Public Class usrCntlSND_ATBGestellung
     Private Sub initGesamtsicherheiten()
         Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
         Dim gsnr As Integer = 0
+        Dim gsnr_proLKW As Integer = 0
         Dim sqlWhere = ""
 
         Dim dt As New DataTable
 
         If SND.tblSnd_ATB_T1 IsNot Nothing Then txtATBT1.Text = SND.tblSnd_ATB_T1.ToString
 
+        If gsnr_proLKW = 0 Then
+            Dim SQLString As String = "Select top (1) gs_gsNr from [tblGesamtsicherheit] where gs_avisoId = '" & SND.tblSnd_AvisoID & "' order by gs_datum desc"
+            dt = SQL.loadDgvBySql(SQLString, "AVISO", 100, True)
+            If dt.Rows.Count > 0 Then
+                gsnr_proLKW = dt.Rows(0).Item("gs_gsNr")
+            End If
+        End If
+
         '1.Schritt -> Gestellung nach aktuellster ATB-NR
         If txtATBT1.Text <> "" Then
             Dim SQLString As String = "Select top (1) gs_gsNr from [tblGesamtsicherheit] where [gs_ATBNr] = '" & txtATBT1.Text & "' order by gs_datum desc"
@@ -292,7 +307,7 @@ Public Class usrCntlSND_ATBGestellung
 
         'falls nicht gefunden, 2 Schritt -> Gestellung nach AVISO ID, oder Aberftigungsnr and FilialNr
         If gsnr = 0 Then
-            Dim SQLString As String = "Select top (1) gs_gsNr from [tblGesamtsicherheit] where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & " ) or gs_avisoId = '" & SND.tblSnd_AvisoID & "' order by gs_datum desc"
+            Dim SQLString As String = "Select top (1) gs_gsNr from [tblGesamtsicherheit] where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & " ) order by gs_datum desc"
             dt = SQL.loadDgvBySql(SQLString, "AVISO", 100, True)
             If dt.Rows.Count > 0 Then
                 gsnr = dt.Rows(0).Item("gs_gsNr")
@@ -300,15 +315,18 @@ Public Class usrCntlSND_ATBGestellung
         End If
 
         gsnr_global = gsnr
+        gsnr_proLKW_global = gsnr_proLKW
 
-        If gsnr_global > 0 Then
+        If gsnr_global > 0 Then 'es gibt 
-
             btnGesSicherheit.Enabled = True
-            Button1.Enabled = False
         Else
             btnGesSicherheit.Enabled = False
-            Button1.Enabled = True
+        End If
 
+        If gsnr_proLKW_global > 0 AndAlso gsnr_global < 1 OrElse gsnr_proLKW_global < 1 Then
+            Button1.Enabled = True
+        Else
+            Button1.Enabled = False
         End If
 
     End Sub
@@ -322,37 +340,4 @@ Public Class usrCntlSND_ATBGestellung
         Process.Start(webAddress)
     End Sub
 
-
-    'Public Sub setValues()
-    '    txtATBT1.Text = If(NCTS_GA.nga_name, "")
-    '    txtT1VerzollungsadresseStrasse.Text = If(NCTS_GA.nga_strasse, "")
-    '    txtT1VerzollungsadressePlz.Text = If(NCTS_GA.nga_plz, "")
-    '    txtT1VerzollungsadresseOrt.Text = If(NCTS_GA.nga_ort, "")
-    '    sbT1VerzollungsadresseLand.SET_VALUE(If(NCTS_GA.nga_land, ""))
-
-    '    txtT1VerzollungsadresseAnspr.Text = If(NCTS_GA.nga_Ansprechpartner, "")
-    '    txtT1VerzollungsadresseEORI.Text = If(NCTS_GA.nga_EORI, "")
-    '    txtT1VerzollungsadresseEORI_NL.Text = If(NCTS_GA.nga_EORI_NL, "")
-    '    txtT1VerzollungsadresseBestimmungszollstelle.SET_VALUE(If(NCTS_GA.nga_bestZollst, ""))
-
-
-    '    lblNGAId.Text = If(NCTS_GA.nga_id > 0, NCTS_GA.nga_id, "-")
-    '    picDel.Visible = (NCTS_GA.nga_id > 0)
-    'End Sub
-
-
-    'Public Sub getValues()
-    '    NCTS_GA.nga_name = txtATBT1.Text
-    '    NCTS_GA.nga_strasse = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseStrasse.Text)
-    '    NCTS_GA.nga_plz = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadressePlz.Text)
-    '    NCTS_GA.nga_ort = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseOrt.Text)
-    '    NCTS_GA.nga_land = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(sbT1VerzollungsadresseLand._value)
-
-    '    NCTS_GA.nga_Ansprechpartner = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseAnspr.Text)
-    '    NCTS_GA.nga_EORI = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI.Text)
-    '    NCTS_GA.nga_EORI_NL = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI_NL.Text)
-    '    NCTS_GA.nga_bestZollst = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseBestimmungszollstelle._value)
-    'End Sub
-
-
 End Class

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()
@@ -632,46 +632,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]
@@ -1043,46 +1043,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]

Aviso/usrcntlAktDetails.vb

@@ -1,4 +1,4 @@
-Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN
 Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO
 
 Imports System.IO
@@ -553,6 +553,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"
@@ -969,22 +971,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
@@ -1201,234 +1204,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
-                        If gridVermerke.Rows(RowIndex).Cells("VorauskasseId").Value IsNot DBNull.Value Then
+                                myVermerk.VorauskasseId = gridVermerke.Rows(RowIndex).Cells("VorauskasseId").Value
-                            myVermerk.VorauskasseId = gridVermerke.Rows(RowIndex).Cells("VorauskasseId").Value
+                            End If
+                            Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
+                            VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
+                            init = True
                         End If
-                        Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
-                        VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
-
-                        init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
                     Else
                         MsgBox("Keine Berechtigung. Bitte wenden Sie sich an die Buchhaltung oder Abteilungsleitung.")
                     End If
+                Case Else
+                    If paarId > 0 Then
+                        myVermerk.Hinweis_Vermerk = paarBez
+                        myVermerk.VermerkCodeId = paarId
+                        Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
+                        VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
+                        init = True
 
-                Case "17"
+                        Select Case vermerkCode
-                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("eingereicht", "fertig")
+                            Case 17
-                    myVermerk.VermerkCodeId = 18
+                                VermerkeDAL.UpdateLKW(myVermerk.AvisoID, False)
-                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
+                            Case 80
-                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
+                                If vbYes = MsgBox("Soll der LKW auf Status 'ANKUNFT' gesetzt werden?", vbYesNoCancel) Then
-                    VermerkeDAL.UpdateLKW(myVermerk.AvisoID, False)
+                                    If AvisoStatusFunctions.setAnkunft(AVISO.AvisoID) Then
-                    '  avisoAktualisierenAktiveIdBehalten(myVermerk.AvisoID)
+                                        frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-                    'Vermerke_aktualisieren()
+                                        frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-                    init = True '   Vermerke_anzeigen(RowIndex)
+                                    End If
-
+                                End If
-                Case "19"
+                            Case 82
-                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("eingereicht", "fertig")
+                                VermerkeDAL.UpdateLKW(myVermerk.AvisoID, False)
-                    myVermerk.VermerkCodeId = 20
+                                Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
-                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
+                                sql.doSQL("UPDATE AVISO SET ZOLLDigitalEingereicht=0, LKW_fertig=1  where avisoid=" & AVISO.AvisoID, "AVISO")
-                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
+                                AvisoStatusFunctions.printFinish(AVISO)
-                    init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
+                        End Select
-
-                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"
-                    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)
-
-                    '  avisoAktualisierenAktiveIdBehalten(myVermerk.AvisoID)
-                    '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
@@ -1465,88 +1294,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)
@@ -1554,10 +1312,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
@@ -1579,77 +1333,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
+                                Else
+                                    If Not existCodeInGridVermerke_VK_OLD(gridvermerke, r.Cells("SendungID").Value) Then
+                                        optionCell.Value = paarBez
+                                        optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk '" & paarBez & "' einzutragen."
+                                    End If
+                                End If
                             End If
-                        Case 55
-                            If Not existCodeInGridVermerke(r, gridvermerke, 56, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
-                                optionCell.Value = "Rg-Best. erhalten"
-                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Rg-Best. erhalten' 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
-                            End If
+                                    optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk '" & paarBez & "' einzutragen."
-                        Case 105
+                                End If
-                            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