feature_gesamtsicherheiten

2022-10-28 08:05:38 +02:00
parent 3d5f7302dd
commit 32ded84b4d
5 changed files with 677 additions and 245 deletions
--- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
@@ -53,7 +53,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.Label3 = New System.Windows.Forms.Label()
        Me.Label2 = New System.Windows.Forms.Label()
        Me.Label1 = New System.Windows.Forms.Label()
-        Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.btnResetFilter = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.txtSuchbegriff = New System.Windows.Forms.TextBox()
        Me.chkOffen = New System.Windows.Forms.CheckBox()
        Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton()
@@ -62,6 +62,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.lblReferenzwert = New System.Windows.Forms.Label()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ExportCSVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton()
        CType(Me.dgvListe, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.ContextMenuStrip1.SuspendLayout()
@@ -77,12 +78,13 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.dgvListe.Location = New System.Drawing.Point(0, 313)
        Me.dgvListe.Name = "dgvListe"
        Me.dgvListe.ReadOnly = True
-        Me.dgvListe.Size = New System.Drawing.Size(502, 408)
+        Me.dgvListe.Size = New System.Drawing.Size(576, 408)
        Me.dgvListe.TabIndex = 1
        '
        '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.btnOpenOver85Days)
        Me.Panel1.Controls.Add(Me.txtDatBis)
        Me.Panel1.Controls.Add(Me.Label26)
        Me.Panel1.Controls.Add(Me.btnBisTag)
@@ -110,7 +112,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.Panel1.Controls.Add(Me.Label3)
        Me.Panel1.Controls.Add(Me.Label2)
        Me.Panel1.Controls.Add(Me.Label1)
-        Me.Panel1.Controls.Add(Me.FlatButton1)
+        Me.Panel1.Controls.Add(Me.btnResetFilter)
        Me.Panel1.Controls.Add(Me.txtSuchbegriff)
        Me.Panel1.Controls.Add(Me.chkOffen)
        Me.Panel1.Controls.Add(Me.btnNeu)
@@ -120,7 +122,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(502, 313)
+        Me.Panel1.Size = New System.Drawing.Size(576, 313)
        Me.Panel1.TabIndex = 0
        '
        'txtDatBis
@@ -140,24 +142,24 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.txtDatBis.Enabled = False
        Me.txtDatBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtDatBis.ForeColor = System.Drawing.Color.Black
-        Me.txtDatBis.Location = New System.Drawing.Point(51, 170)
+        Me.txtDatBis.Location = New System.Drawing.Point(62, 170)
        Me.txtDatBis.MaxLength = 10
        Me.txtDatBis.MaxLineLength = -1
        Me.txtDatBis.MaxLines_Warning = ""
        Me.txtDatBis.MaxLines_Warning_Label = Nothing
        Me.txtDatBis.Name = "txtDatBis"
        Me.txtDatBis.Size = New System.Drawing.Size(63, 20)
-        Me.txtDatBis.TabIndex = 52
+        Me.txtDatBis.TabIndex = 21
        '
        'Label26
        '
        Me.Label26.AutoSize = True
        Me.Label26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label26.ForeColor = System.Drawing.Color.White
-        Me.Label26.Location = New System.Drawing.Point(22, 120)
+        Me.Label26.Location = New System.Drawing.Point(33, 120)
        Me.Label26.Name = "Label26"
        Me.Label26.Size = New System.Drawing.Size(43, 13)
-        Me.Label26.TabIndex = 51
+        Me.Label26.TabIndex = 10
        Me.Label26.Text = "Datum"
        '
        'btnBisTag
@@ -167,11 +169,11 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.btnBisTag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.btnBisTag.ForeColor = System.Drawing.Color.Black
        Me.btnBisTag.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnBisTag.Location = New System.Drawing.Point(282, 115)
+        Me.btnBisTag.Location = New System.Drawing.Point(311, 120)
        Me.btnBisTag.Margin = New System.Windows.Forms.Padding(0)
        Me.btnBisTag.Name = "btnBisTag"
        Me.btnBisTag.Size = New System.Drawing.Size(34, 23)
-        Me.btnBisTag.TabIndex = 43
+        Me.btnBisTag.TabIndex = 13
        Me.btnBisTag.Text = ">>"
        Me.btnBisTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnBisTag.UseVisualStyleBackColor = False
@@ -183,11 +185,11 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.btnVonTag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.btnVonTag.ForeColor = System.Drawing.Color.Black
        Me.btnVonTag.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnVonTag.Location = New System.Drawing.Point(163, 115)
+        Me.btnVonTag.Location = New System.Drawing.Point(192, 120)
        Me.btnVonTag.Margin = New System.Windows.Forms.Padding(0)
        Me.btnVonTag.Name = "btnVonTag"
        Me.btnVonTag.Size = New System.Drawing.Size(34, 23)
-        Me.btnVonTag.TabIndex = 41
+        Me.btnVonTag.TabIndex = 11
        Me.btnVonTag.Text = "<<"
        Me.btnVonTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnVonTag.UseVisualStyleBackColor = False
@@ -199,11 +201,11 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.btnTag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.btnTag.ForeColor = System.Drawing.Color.Black
        Me.btnTag.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnTag.Location = New System.Drawing.Point(196, 115)
+        Me.btnTag.Location = New System.Drawing.Point(225, 120)
        Me.btnTag.Margin = New System.Windows.Forms.Padding(0)
        Me.btnTag.Name = "btnTag"
        Me.btnTag.Size = New System.Drawing.Size(87, 23)
-        Me.btnTag.TabIndex = 42
+        Me.btnTag.TabIndex = 12
        Me.btnTag.Text = "Heute"
        Me.btnTag.UseVisualStyleBackColor = False
        '
@@ -223,23 +225,23 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.txtDatVon._WaehrungZeichen = True
        Me.txtDatVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtDatVon.ForeColor = System.Drawing.Color.Black
-        Me.txtDatVon.Location = New System.Drawing.Point(51, 146)
+        Me.txtDatVon.Location = New System.Drawing.Point(62, 146)
        Me.txtDatVon.MaxLength = 10
        Me.txtDatVon.MaxLineLength = -1
        Me.txtDatVon.MaxLines_Warning = ""
        Me.txtDatVon.MaxLines_Warning_Label = Nothing
        Me.txtDatVon.Name = "txtDatVon"
        Me.txtDatVon.Size = New System.Drawing.Size(63, 20)
-        Me.txtDatVon.TabIndex = 37
+        Me.txtDatVon.TabIndex = 16
        '
        'Label24
        '
        Me.Label24.AutoSize = True
        Me.Label24.ForeColor = System.Drawing.Color.White
-        Me.Label24.Location = New System.Drawing.Point(22, 173)
+        Me.Label24.Location = New System.Drawing.Point(33, 173)
        Me.Label24.Name = "Label24"
        Me.Label24.Size = New System.Drawing.Size(23, 13)
-        Me.Label24.TabIndex = 40
+        Me.Label24.TabIndex = 20
        Me.Label24.Text = "bis:"
        '
        'btnJahr
@@ -249,11 +251,11 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.btnJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.btnJahr.ForeColor = System.Drawing.Color.Black
        Me.btnJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnJahr.Location = New System.Drawing.Point(196, 167)
+        Me.btnJahr.Location = New System.Drawing.Point(225, 172)
        Me.btnJahr.Margin = New System.Windows.Forms.Padding(0)
        Me.btnJahr.Name = "btnJahr"
        Me.btnJahr.Size = New System.Drawing.Size(87, 23)
-        Me.btnJahr.TabIndex = 49
+        Me.btnJahr.TabIndex = 24
        Me.btnJahr.Text = "2016"
        Me.btnJahr.UseVisualStyleBackColor = False
        '
@@ -264,11 +266,11 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.btnBisJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.btnBisJahr.ForeColor = System.Drawing.Color.Black
        Me.btnBisJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnBisJahr.Location = New System.Drawing.Point(282, 167)
+        Me.btnBisJahr.Location = New System.Drawing.Point(311, 172)
        Me.btnBisJahr.Margin = New System.Windows.Forms.Padding(0)
        Me.btnBisJahr.Name = "btnBisJahr"
        Me.btnBisJahr.Size = New System.Drawing.Size(34, 23)
-        Me.btnBisJahr.TabIndex = 50
+        Me.btnBisJahr.TabIndex = 25
        Me.btnBisJahr.Text = ">>"
        Me.btnBisJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnBisJahr.UseVisualStyleBackColor = False
@@ -280,11 +282,11 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.btnVonJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.btnVonJahr.ForeColor = System.Drawing.Color.Black
        Me.btnVonJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnVonJahr.Location = New System.Drawing.Point(163, 167)
+        Me.btnVonJahr.Location = New System.Drawing.Point(192, 172)
        Me.btnVonJahr.Margin = New System.Windows.Forms.Padding(0)
        Me.btnVonJahr.Name = "btnVonJahr"
        Me.btnVonJahr.Size = New System.Drawing.Size(34, 23)
-        Me.btnVonJahr.TabIndex = 48
+        Me.btnVonJahr.TabIndex = 23
        Me.btnVonJahr.Text = "<<"
        Me.btnVonJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnVonJahr.UseVisualStyleBackColor = False
@@ -296,11 +298,11 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.btnMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.btnMonat.ForeColor = System.Drawing.Color.Black
        Me.btnMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnMonat.Location = New System.Drawing.Point(196, 141)
+        Me.btnMonat.Location = New System.Drawing.Point(225, 146)
        Me.btnMonat.Margin = New System.Windows.Forms.Padding(0)
        Me.btnMonat.Name = "btnMonat"
        Me.btnMonat.Size = New System.Drawing.Size(87, 23)
-        Me.btnMonat.TabIndex = 46
+        Me.btnMonat.TabIndex = 18
        Me.btnMonat.Text = "September"
        Me.btnMonat.UseVisualStyleBackColor = False
        '
@@ -311,11 +313,11 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.btnBisMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.btnBisMonat.ForeColor = System.Drawing.Color.Black
        Me.btnBisMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnBisMonat.Location = New System.Drawing.Point(282, 141)
+        Me.btnBisMonat.Location = New System.Drawing.Point(311, 146)
        Me.btnBisMonat.Margin = New System.Windows.Forms.Padding(0)
        Me.btnBisMonat.Name = "btnBisMonat"
        Me.btnBisMonat.Size = New System.Drawing.Size(34, 23)
-        Me.btnBisMonat.TabIndex = 47
+        Me.btnBisMonat.TabIndex = 19
        Me.btnBisMonat.Text = ">>"
        Me.btnBisMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnBisMonat.UseVisualStyleBackColor = False
@@ -327,11 +329,11 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.btnVonMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.btnVonMonat.ForeColor = System.Drawing.Color.Black
        Me.btnVonMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnVonMonat.Location = New System.Drawing.Point(163, 141)
+        Me.btnVonMonat.Location = New System.Drawing.Point(192, 146)
        Me.btnVonMonat.Margin = New System.Windows.Forms.Padding(0)
        Me.btnVonMonat.Name = "btnVonMonat"
        Me.btnVonMonat.Size = New System.Drawing.Size(34, 23)
-        Me.btnVonMonat.TabIndex = 45
+        Me.btnVonMonat.TabIndex = 17
        Me.btnVonMonat.Text = "<<"
        Me.btnVonMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnVonMonat.UseVisualStyleBackColor = False
@@ -340,33 +342,33 @@ Partial Class frmGesamtsicherheitenMenuNEU
        '
        Me.DateTimePicker2.CustomFormat = "''"
        Me.DateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom
-        Me.DateTimePicker2.Location = New System.Drawing.Point(51, 170)
+        Me.DateTimePicker2.Location = New System.Drawing.Point(62, 170)
        Me.DateTimePicker2.Margin = New System.Windows.Forms.Padding(0)
        Me.DateTimePicker2.Name = "DateTimePicker2"
        Me.DateTimePicker2.RightToLeft = System.Windows.Forms.RightToLeft.No
        Me.DateTimePicker2.Size = New System.Drawing.Size(92, 20)
-        Me.DateTimePicker2.TabIndex = 39
+        Me.DateTimePicker2.TabIndex = 22
        '
        'Label25
        '
        Me.Label25.AutoSize = True
        Me.Label25.ForeColor = System.Drawing.Color.White
-        Me.Label25.Location = New System.Drawing.Point(22, 149)
+        Me.Label25.Location = New System.Drawing.Point(33, 149)
        Me.Label25.Name = "Label25"
        Me.Label25.Size = New System.Drawing.Size(28, 13)
-        Me.Label25.TabIndex = 44
+        Me.Label25.TabIndex = 14
        Me.Label25.Text = "von:"
        '
        'DateTimePicker1
        '
        Me.DateTimePicker1.CustomFormat = "''"
        Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom
-        Me.DateTimePicker1.Location = New System.Drawing.Point(51, 145)
+        Me.DateTimePicker1.Location = New System.Drawing.Point(62, 145)
        Me.DateTimePicker1.Margin = New System.Windows.Forms.Padding(0)
        Me.DateTimePicker1.Name = "DateTimePicker1"
        Me.DateTimePicker1.RightToLeft = System.Windows.Forms.RightToLeft.No
        Me.DateTimePicker1.Size = New System.Drawing.Size(92, 20)
-        Me.DateTimePicker1.TabIndex = 38
+        Me.DateTimePicker1.TabIndex = 15
        '
        'cbxWarenort
        '
@@ -375,10 +377,10 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.cbxWarenort._value = ""
        Me.cbxWarenort.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.cbxWarenort.FormattingEnabled = True
-        Me.cbxWarenort.Location = New System.Drawing.Point(112, 67)
+        Me.cbxWarenort.Location = New System.Drawing.Point(132, 69)
        Me.cbxWarenort.Name = "cbxWarenort"
        Me.cbxWarenort.Size = New System.Drawing.Size(81, 21)
-        Me.cbxWarenort.TabIndex = 17
+        Me.cbxWarenort.TabIndex = 8
        '
        'Label4
        '
@@ -386,10 +388,10 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.Label4.AutoSize = True
        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.Label4.ForeColor = System.Drawing.Color.Honeydew
-        Me.Label4.Location = New System.Drawing.Point(112, 49)
+        Me.Label4.Location = New System.Drawing.Point(132, 51)
        Me.Label4.Name = "Label4"
        Me.Label4.Size = New System.Drawing.Size(60, 15)
-        Me.Label4.TabIndex = 16
+        Me.Label4.TabIndex = 5
        Me.Label4.Text = "Warenort:"
        '
        'cbxStandort
@@ -399,10 +401,10 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.cbxStandort._value = ""
        Me.cbxStandort.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.cbxStandort.FormattingEnabled = True
-        Me.cbxStandort.Location = New System.Drawing.Point(12, 67)
+        Me.cbxStandort.Location = New System.Drawing.Point(32, 69)
        Me.cbxStandort.Name = "cbxStandort"
        Me.cbxStandort.Size = New System.Drawing.Size(81, 21)
-        Me.cbxStandort.TabIndex = 15
+        Me.cbxStandort.TabIndex = 7
        '
        'lblFiliale
        '
@@ -410,10 +412,10 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.lblFiliale.AutoSize = True
        Me.lblFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.lblFiliale.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblFiliale.Location = New System.Drawing.Point(12, 49)
+        Me.lblFiliale.Location = New System.Drawing.Point(32, 51)
        Me.lblFiliale.Name = "lblFiliale"
        Me.lblFiliale.Size = New System.Drawing.Size(43, 15)
-        Me.lblFiliale.TabIndex = 14
+        Me.lblFiliale.TabIndex = 4
        Me.lblFiliale.Text = "Filiale:"
        '
        'FlatButton2
@@ -424,10 +426,10 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.FlatButton2.FlatAppearance.BorderSize = 0
        Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.FlatButton2.ForeColor = System.Drawing.Color.Black
-        Me.FlatButton2.Location = New System.Drawing.Point(395, 281)
+        Me.FlatButton2.Location = New System.Drawing.Point(483, 193)
        Me.FlatButton2.Name = "FlatButton2"
        Me.FlatButton2.Size = New System.Drawing.Size(81, 20)
-        Me.FlatButton2.TabIndex = 10
+        Me.FlatButton2.TabIndex = 34
        Me.FlatButton2.Text = "jedes Datum"
        Me.FlatButton2.UseVisualStyleBackColor = False
        Me.FlatButton2.Visible = False
@@ -440,10 +442,10 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.btnSucheStarten.FlatAppearance.BorderSize = 0
        Me.btnSucheStarten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnSucheStarten.ForeColor = System.Drawing.Color.Black
-        Me.btnSucheStarten.Location = New System.Drawing.Point(28, 269)
+        Me.btnSucheStarten.Location = New System.Drawing.Point(32, 281)
        Me.btnSucheStarten.Name = "btnSucheStarten"
        Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20)
-        Me.btnSucheStarten.TabIndex = 11
+        Me.btnSucheStarten.TabIndex = 32
        Me.btnSucheStarten.Text = "Suche starten"
        Me.btnSucheStarten.UseVisualStyleBackColor = False
        '
@@ -463,13 +465,13 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.txtbis._WaehrungZeichen = True
        Me.txtbis.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.txtbis.ForeColor = System.Drawing.Color.Black
-        Me.txtbis.Location = New System.Drawing.Point(395, 257)
+        Me.txtbis.Location = New System.Drawing.Point(483, 169)
        Me.txtbis.MaxLineLength = -1
        Me.txtbis.MaxLines_Warning = ""
        Me.txtbis.MaxLines_Warning_Label = Nothing
        Me.txtbis.Name = "txtbis"
        Me.txtbis.Size = New System.Drawing.Size(81, 20)
-        Me.txtbis.TabIndex = 8
+        Me.txtbis.TabIndex = 31
        Me.txtbis.Visible = False
        '
        'txtVon
@@ -488,13 +490,13 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.txtVon._WaehrungZeichen = True
        Me.txtVon.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.txtVon.ForeColor = System.Drawing.Color.Black
-        Me.txtVon.Location = New System.Drawing.Point(295, 257)
+        Me.txtVon.Location = New System.Drawing.Point(480, 126)
        Me.txtVon.MaxLineLength = -1
        Me.txtVon.MaxLines_Warning = ""
        Me.txtVon.MaxLines_Warning_Label = Nothing
        Me.txtVon.Name = "txtVon"
        Me.txtVon.Size = New System.Drawing.Size(81, 20)
-        Me.txtVon.TabIndex = 7
+        Me.txtVon.TabIndex = 30
        Me.txtVon.Visible = False
        '
        'Label3
@@ -503,10 +505,10 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.Label3.AutoSize = True
        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.Label3.ForeColor = System.Drawing.Color.Honeydew
-        Me.Label3.Location = New System.Drawing.Point(392, 238)
+        Me.Label3.Location = New System.Drawing.Point(480, 150)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(24, 15)
-        Me.Label3.TabIndex = 5
+        Me.Label3.TabIndex = 29
        Me.Label3.Text = "Bis"
        Me.Label3.Visible = False
        '
@@ -516,10 +518,10 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.Label2.AutoSize = True
        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.Label2.ForeColor = System.Drawing.Color.Honeydew
-        Me.Label2.Location = New System.Drawing.Point(295, 238)
+        Me.Label2.Location = New System.Drawing.Point(480, 107)
        Me.Label2.Name = "Label2"
        Me.Label2.Size = New System.Drawing.Size(28, 15)
-        Me.Label2.TabIndex = 4
+        Me.Label2.TabIndex = 28
        Me.Label2.Text = "Von"
        Me.Label2.Visible = False
        '
@@ -529,34 +531,34 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.Label1.AutoSize = True
        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.Label1.ForeColor = System.Drawing.Color.Honeydew
-        Me.Label1.Location = New System.Drawing.Point(12, 8)
+        Me.Label1.Location = New System.Drawing.Point(32, 10)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(45, 15)
        Me.Label1.TabIndex = 0
        Me.Label1.Text = "Suche:"
        '
-        'FlatButton1
+        'btnResetFilter
        '
-        Me.FlatButton1.allowBorder = False
+        Me.btnResetFilter.allowBorder = False
-        Me.FlatButton1.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.btnResetFilter.Anchor = System.Windows.Forms.AnchorStyles.Right
-        Me.FlatButton1.BackColor = System.Drawing.Color.White
+        Me.btnResetFilter.BackColor = System.Drawing.Color.White
-        Me.FlatButton1.FlatAppearance.BorderSize = 0
+        Me.btnResetFilter.FlatAppearance.BorderSize = 0
-        Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.FlatButton1.ForeColor = System.Drawing.Color.Black
+        Me.btnResetFilter.ForeColor = System.Drawing.Color.Black
-        Me.FlatButton1.Image = Global.AVISO.My.Resources.Resources.refresh
+        Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh
-        Me.FlatButton1.Location = New System.Drawing.Point(233, 24)
+        Me.btnResetFilter.Location = New System.Drawing.Point(249, 24)
-        Me.FlatButton1.Name = "FlatButton1"
+        Me.btnResetFilter.Name = "btnResetFilter"
-        Me.FlatButton1.Size = New System.Drawing.Size(32, 33)
+        Me.btnResetFilter.Size = New System.Drawing.Size(32, 33)
-        Me.FlatButton1.TabIndex = 2
+        Me.btnResetFilter.TabIndex = 3
-        Me.FlatButton1.UseVisualStyleBackColor = False
+        Me.btnResetFilter.UseVisualStyleBackColor = False
        '
        'txtSuchbegriff
        '
        Me.txtSuchbegriff.Anchor = System.Windows.Forms.AnchorStyles.Right
-        Me.txtSuchbegriff.Location = New System.Drawing.Point(12, 26)
+        Me.txtSuchbegriff.Location = New System.Drawing.Point(32, 28)
        Me.txtSuchbegriff.Name = "txtSuchbegriff"
        Me.txtSuchbegriff.Size = New System.Drawing.Size(181, 20)
-        Me.txtSuchbegriff.TabIndex = 1
+        Me.txtSuchbegriff.TabIndex = 2
        '
        'chkOffen
        '
@@ -565,10 +567,10 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.chkOffen.Checked = True
        Me.chkOffen.CheckState = System.Windows.Forms.CheckState.Checked
        Me.chkOffen.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.chkOffen.Location = New System.Drawing.Point(28, 221)
+        Me.chkOffen.Location = New System.Drawing.Point(35, 210)
        Me.chkOffen.Name = "chkOffen"
        Me.chkOffen.Size = New System.Drawing.Size(120, 17)
-        Me.chkOffen.TabIndex = 12
+        Me.chkOffen.TabIndex = 26
        Me.chkOffen.Text = "nur offene anzeigen"
        Me.chkOffen.UseVisualStyleBackColor = True
        '
@@ -580,10 +582,10 @@ 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(163, 269)
+        Me.btnNeu.Location = New System.Drawing.Point(492, 278)
        Me.btnNeu.Name = "btnNeu"
        Me.btnNeu.Size = New System.Drawing.Size(75, 23)
-        Me.btnNeu.TabIndex = 13
+        Me.btnNeu.TabIndex = 33
        Me.btnNeu.Text = "Neu"
        Me.btnNeu.UseVisualStyleBackColor = False
        '
@@ -593,10 +595,10 @@ 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.Honeydew
-        Me.lblSaldo.Location = New System.Drawing.Point(294, 23)
+        Me.lblSaldo.Location = New System.Drawing.Point(368, 23)
        Me.lblSaldo.Name = "lblSaldo"
        Me.lblSaldo.Size = New System.Drawing.Size(147, 24)
-        Me.lblSaldo.TabIndex = 3
+        Me.lblSaldo.TabIndex = 1
        Me.lblSaldo.Text = "Saldo: €80.000"
        '
        'lblZollsatz
@@ -605,7 +607,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(295, 85)
+        Me.lblZollsatz.Location = New System.Drawing.Point(369, 85)
        Me.lblZollsatz.Name = "lblZollsatz"
        Me.lblZollsatz.Size = New System.Drawing.Size(85, 16)
        Me.lblZollsatz.TabIndex = 9
@@ -617,7 +619,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(295, 58)
+        Me.lblReferenzwert.Location = New System.Drawing.Point(369, 58)
        Me.lblReferenzwert.Name = "lblReferenzwert"
        Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16)
        Me.lblReferenzwert.TabIndex = 6
@@ -635,11 +637,27 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(132, 22)
        Me.ExportCSVToolStripMenuItem.Text = "Export CSV"
        '
        'btnOpenOver85Days
        '
        Me.btnOpenOver85Days.allowBorder = False
        Me.btnOpenOver85Days.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.btnOpenOver85Days.BackColor = System.Drawing.Color.White
        Me.btnOpenOver85Days.FlatAppearance.BorderSize = 0
        Me.btnOpenOver85Days.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnOpenOver85Days.ForeColor = System.Drawing.Color.Black
        Me.btnOpenOver85Days.Location = New System.Drawing.Point(36, 244)
        Me.btnOpenOver85Days.Name = "btnOpenOver85Days"
        Me.btnOpenOver85Days.Size = New System.Drawing.Size(116, 20)
        Me.btnOpenOver85Days.TabIndex = 27
        Me.btnOpenOver85Days.Text = "Über 85 Tage offen"
        Me.btnOpenOver85Days.UseVisualStyleBackColor = False
        Me.btnOpenOver85Days.Visible = False
        '
        'frmGesamtsicherheitenMenuNEU
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(502, 721)
+        Me.ClientSize = New System.Drawing.Size(576, 721)
        Me.Controls.Add(Me.dgvListe)
        Me.Controls.Add(Me.Panel1)
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@@ -664,7 +682,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
    Friend WithEvents btnNeu As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents chkOffen As CheckBox
    Friend WithEvents txtSuchbegriff As TextBox
-    Friend WithEvents FlatButton1 As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents btnResetFilter As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents Label3 As Label
    Friend WithEvents Label2 As Label
    Friend WithEvents Label1 As Label
@@ -694,4 +712,5 @@ Partial Class frmGesamtsicherheitenMenuNEU
    Friend WithEvents DateTimePicker2 As DateTimePicker
    Friend WithEvents Label25 As Label
    Friend WithEvents DateTimePicker1 As DateTimePicker
    Friend WithEvents btnOpenOver85Days As VERAG_PROG_ALLGEMEIN.FlatButton
 End Class
--- a/Aviso/frmGesamtsicherheitenMenuNEU.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb
@@ -1,29 +1,38 @@
 Imports System.Reflection
 Imports SDL
 Public Class frmGesamtsicherheitenMenuNEU
    Public SQL As New VERAG_PROG_ALLGEMEIN.SQL
    Dim GesSichRef As VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz
-    Dim dt As DataTable
+    Public dt As DataTable
    Public Property Standort As String = ""
    Private Sub frmGesamtsicherheitenNEU_Menu_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        cbxStandort.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
        cbxWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
        Me.Text = "Gesamtsicherheiten " & Standort
        frmHauptfenster.EnableDoubleBuffered(dgvListe)
        GesSichRef = New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(Standort)
        'GesSichRef.LOAD("standort", Standort)
        lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
        'txtDatVon._ShortDateOnly = True
        'txtDatBis._ShortDateOnly = True
-        txtDatVon.Text = Now.ToShortDateString 'CDate("01." & Now.ToString("MM.yyyy")).AddMonths(-1).ToShortDateString
+        txtDatVon.Text = Now.ToShortDateString
        txtDatBis.Text = Now.ToShortDateString
        btnMonat.Text = MONAT.ToString("MMMM")
        btnJahr.Text = JAHR.Year
        If GesSichRef.gsr_ATR = True Then
            Dim anzahlOffenerGSUeber85Tage As Integer = checkOpenATBs()
            If anzahlOffenerGSUeber85Tage > 0 Then
                btnOpenOver85Days.Visible = True
            End If
        End If
        'txtDatVon.Text = Date.Today.AddDays(-30).ToString("dd.MM.yyyy")
        'txtDatBis.Text = Date.Today.ToString("dd.MM.yyyy")
@@ -33,17 +42,24 @@ Public Class frmGesamtsicherheitenMenuNEU
    Public Function LoadDGV()
        Dim sqladdon As String = ""
-        If chkOffen.Checked Then sqladdon &= " AND gs_Sicherheitssaldo != '0,00 €'"
+        If chkOffen.Checked Then sqladdon &= " AND gs_SicherheitsSaldo != '0,00 €'"
        If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = '" & cbxStandort._value.ToString & "'"
        If cbxWarenort._value <> "" Then sqladdon &= " AND gs_warenort = '" & cbxWarenort._value.ToString & "'"
        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,
-                max(gs_LKWKZ) as gs_LKWKZ, min (gs_datum) as gs_datum, FORMAT(SUM( 
+                max(gs_LKWKZ) as gs_LKWKZ, min (gs_datum) as gs_datum, FORMAT(
-            Case 
+                  (Select SUM( Case 
 			when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
 			when gs_art = 'Close' then gs_sicherheitsbetrag
-            End) , 'C', 'de-DE')As gs_SicherheitsSaldo
+		        End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr
 		        )
 		        +
 		        (Select SUM( Case 
 			when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
 			when gsp_art = 'Close' then gsp_sicherheitsbetrag
 		        End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr
 			        ) , 'C', 'de-DE') as gs_SicherheitsSaldo
            From (select * from (select gs_gsnr as ding from [tblGesamtsicherheit] where 
                gs_freitext like '%" & txtSuchbegriff.Text & "%' OR
@@ -70,13 +86,37 @@ Public Class frmGesamtsicherheitenMenuNEU
            .Columns("gs_abfertigungsNr").HeaderText = "Abfert.Nr."
            .Columns("gs_abfertigungsNr").Width = 107
            .Columns("gs_datum").Width = 112
-            .Columns("gs_SicherheitsSaldo").Width = 106
+            .Columns("gs_datum").HeaderText = "Datum"
            .Columns("gs_SicherheitsSaldo").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
            .Columns("gs_SicherheitsSaldo").HeaderText = "Sicherheitssaldo"
            .Columns("gs_Warenort").Width = 96
            .Columns("gs_Warenort").HeaderText = "Warenort"
            .Columns("gs_LKWKZ").HeaderText = "LKW-KZ"
        End With
        If dgvListe.Rows.Count = 0 Then Exit Function
        dt = New DataTable()
        dt.Columns.Add("gs_gsnr", GetType(Integer))
        dt.Columns.Add("gs_isOpen", GetType(Boolean))
            For Each row As DataGridViewRow In dgvListe.Rows
            If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then
                dt.Rows.Add(row.Cells("gs_gsnr").Value, True)
            Else
                dt.Rows.Add(row.Cells("gs_gsnr").Value, False)
            End If
        Next
        For Each row As DataGridViewRow In dgvListe.Rows
            If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then
                row.DefaultCellStyle.BackColor = Color.Red
            Else
@@ -107,6 +147,7 @@ Public Class frmGesamtsicherheitenMenuNEU
            .FilialNummer = dgvListe.CurrentRow.Cells("gs_filialenNr").Value
            .Abfertigungsnummer = dgvListe.CurrentRow.Cells("gs_abfertigungsNr").Value
            .warenortID = dgvListe.CurrentRow.Cells("gs_warenort").Value
            .dt = Me.dt
        End With
        AddHandler frm.FormClosing, Function()
@@ -125,6 +166,7 @@ Public Class frmGesamtsicherheitenMenuNEU
            .Standort = Me.Standort
            .datum = Date.Now
            .Neu = True
            .dt = Me.dt
        End With
        AddHandler frm.FormClosing, Function()
                                        GesSichRef.CalcSaldo()
@@ -154,7 +196,7 @@ Public Class frmGesamtsicherheitenMenuNEU
        End Select
    End Sub
-    Private Sub resetSearchfields_Click(sender As Object, e As EventArgs) Handles FlatButton1.Click
+    Private Sub resetSearchfields_Click(sender As Object, e As EventArgs) Handles btnResetFilter.Click
        txtSuchbegriff.Text = "" : chkOffen.Checked = True
        txtDatVon.Text = Date.Today.AddDays(-30).ToString("dd.MM.yyyy")
        txtDatBis.Text = Date.Today.ToString("dd.MM.yyyy")
@@ -332,5 +374,51 @@ Public Class frmGesamtsicherheitenMenuNEU
        End If
    End Function
    Private Sub btnOpenOver85Days_Click(sender As Object, e As EventArgs) Handles btnOpenOver85Days.Click
        resetSearchfields_Click(sender, e)
        chkOffen.Checked = True
        DateTimePicker1.Value = Now.AddYears(-20)
        DateTimePicker2.Value = Now.AddDays(-85)
        btnSucheStarten_Click(sender, e)
    End Sub
    Private Function checkOpenATBs() As Integer
        Dim anzahlOffenerGSUeber85Tage As Integer
        Dim dtNew As New DataTable
            Dim sqlstring As String = "select count(*) as anzahlOffeneATBs from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort,min (gs_datum) as gs_datum, 
                  (Select SUM( Case 
 			when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
 			when gs_art = 'Close' then gs_sicherheitsbetrag
 		        End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr
 		        )
 		        +
 		        (Select SUM( Case 
 			when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
 			when gsp_art = 'Close' then gsp_sicherheitsbetrag
 		        End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr
 			        ) as Sicherheitssaldo
            From [tblGesamtsicherheit] as meh group by gs_gsnr) as meh2
            Where gs_standort = '" & Standort & "'  AND Sicherheitssaldo != '0' AND gs_datum < '" & Date.Now().AddDays(-85) & "'"
            dtNew = SQL.loadDgvBySql(sqlstring, "AVISO", 100, True)
        If (dtNew.Rows(0).Item(0) IsNot DBNull.Value) Then
            anzahlOffenerGSUeber85Tage = dtNew.Rows(0).Item(0)
            If anzahlOffenerGSUeber85Tage > 0 Then
                MsgBox("Es sind " & anzahlOffenerGSUeber85Tage & " ATBs offen, die älter als 85 Tage sind!")
            End If
            Return anzahlOffenerGSUeber85Tage
            End If
    End Function
 End Class
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
@@ -64,9 +64,15 @@ Partial Class frmGesamtsicherheitenNEU
        Me.lblReferenzwert = New System.Windows.Forms.Label()
        Me.lblSaldo = New System.Windows.Forms.Label()
        Me.panOben = New System.Windows.Forms.Panel()
        Me.txtZollsatzueberschreiben = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        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.cbx_offene = New System.Windows.Forms.CheckBox()
        Me.btnSuche = New System.Windows.Forms.Button()
        Me.Label23 = New System.Windows.Forms.Label()
        Me.cbx_Suche_Warenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -97,7 +103,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.Label1 = New System.Windows.Forms.Label()
        Me.txtPosFreitext = New System.Windows.Forms.TextBox()
        Me.txtSicherheitFreitext = New System.Windows.Forms.TextBox()
-        Me.lbloffenerSaldo = New System.Windows.Forms.Label()
+        Me.lblId = New System.Windows.Forms.Label()
        CType(Me.dgvGesamtsicherheit, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ContextMenuStrip1.SuspendLayout()
        Me.Panel2.SuspendLayout()
@@ -506,7 +512,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(962, 168)
+        Me.lblZollsatz.Location = New System.Drawing.Point(724, 139)
        Me.lblZollsatz.Name = "lblZollsatz"
        Me.lblZollsatz.Size = New System.Drawing.Size(85, 16)
        Me.lblZollsatz.TabIndex = 4
@@ -518,7 +524,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(962, 152)
+        Me.lblReferenzwert.Location = New System.Drawing.Point(724, 123)
        Me.lblReferenzwert.Name = "lblReferenzwert"
        Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16)
        Me.lblReferenzwert.TabIndex = 1
@@ -539,7 +545,12 @@ Partial Class frmGesamtsicherheitenNEU
        'panOben
        '
        Me.panOben.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
        Me.panOben.Controls.Add(Me.lblId)
        Me.panOben.Controls.Add(Me.txtZollsatzueberschreiben)
        Me.panOben.Controls.Add(Me.cbxZollsatzueberschreiben)
        Me.panOben.Controls.Add(Me.btnNext)
        Me.panOben.Controls.Add(Me.lbloffenerSaldo)
        Me.panOben.Controls.Add(Me.btnPrev)
        Me.panOben.Controls.Add(Me.Label20)
        Me.panOben.Controls.Add(Me.txtPosNr)
        Me.panOben.Controls.Add(Me.Panel1)
@@ -591,6 +602,79 @@ Partial Class frmGesamtsicherheitenNEU
        Me.panOben.Size = New System.Drawing.Size(1384, 290)
        Me.panOben.TabIndex = 0
        '
        'txtZollsatzueberschreiben
        '
        Me.txtZollsatzueberschreiben._DateTimeOnly = False
        Me.txtZollsatzueberschreiben._numbersOnly = True
        Me.txtZollsatzueberschreiben._numbersOnlyKommastellen = ""
        Me.txtZollsatzueberschreiben._numbersOnlyTrennzeichen = True
        Me.txtZollsatzueberschreiben._Prozent = False
        Me.txtZollsatzueberschreiben._ShortDateNew = False
        Me.txtZollsatzueberschreiben._ShortDateOnly = False
        Me.txtZollsatzueberschreiben._TimeOnly = False
        Me.txtZollsatzueberschreiben._TimeOnly_Seconds = False
        Me.txtZollsatzueberschreiben._value = ""
        Me.txtZollsatzueberschreiben._Waehrung = False
        Me.txtZollsatzueberschreiben._WaehrungZeichen = True
        Me.txtZollsatzueberschreiben.Enabled = False
        Me.txtZollsatzueberschreiben.ForeColor = System.Drawing.Color.Black
        Me.txtZollsatzueberschreiben.Location = New System.Drawing.Point(863, 156)
        Me.txtZollsatzueberschreiben.MaxLineLength = -1
        Me.txtZollsatzueberschreiben.MaxLines_Warning = ""
        Me.txtZollsatzueberschreiben.MaxLines_Warning_Label = Nothing
        Me.txtZollsatzueberschreiben.Name = "txtZollsatzueberschreiben"
        Me.txtZollsatzueberschreiben.Size = New System.Drawing.Size(30, 20)
        Me.txtZollsatzueberschreiben.TabIndex = 45
        '
        'cbxZollsatzueberschreiben
        '
        Me.cbxZollsatzueberschreiben.AutoSize = True
        Me.cbxZollsatzueberschreiben.ForeColor = System.Drawing.Color.White
        Me.cbxZollsatzueberschreiben.Location = New System.Drawing.Point(725, 158)
        Me.cbxZollsatzueberschreiben.Name = "cbxZollsatzueberschreiben"
        Me.cbxZollsatzueberschreiben.Size = New System.Drawing.Size(132, 17)
        Me.cbxZollsatzueberschreiben.TabIndex = 37
        Me.cbxZollsatzueberschreiben.Text = "Zollsatz überschreiben"
        Me.cbxZollsatzueberschreiben.UseVisualStyleBackColor = True
        '
        'btnNext
        '
        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(1309, 111)
        Me.btnNext.Name = "btnNext"
        Me.btnNext.Size = New System.Drawing.Size(75, 47)
        Me.btnNext.TabIndex = 37
        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(238, 108)
        Me.lbloffenerSaldo.Name = "lbloffenerSaldo"
        Me.lbloffenerSaldo.Size = New System.Drawing.Size(146, 24)
        Me.lbloffenerSaldo.TabIndex = 44
        Me.lbloffenerSaldo.Text = "offener Saldo: "
        '
        '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(12, 108)
        Me.btnPrev.Name = "btnPrev"
        Me.btnPrev.Size = New System.Drawing.Size(75, 47)
        Me.btnPrev.TabIndex = 36
        Me.btnPrev.Text = "<<"
        Me.btnPrev.UseVisualStyleBackColor = False
        '
        'Label20
        '
        Me.Label20.AutoSize = True
@@ -614,6 +698,7 @@ Partial Class frmGesamtsicherheitenNEU
        'Panel1
        '
        Me.Panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight
        Me.Panel1.Controls.Add(Me.cbx_offene)
        Me.Panel1.Controls.Add(Me.btnSuche)
        Me.Panel1.Controls.Add(Me.Label23)
        Me.Panel1.Controls.Add(Me.cbx_Suche_Warenort)
@@ -626,6 +711,16 @@ Partial Class frmGesamtsicherheitenNEU
        Me.Panel1.Size = New System.Drawing.Size(1384, 61)
        Me.Panel1.TabIndex = 10
        '
        'cbx_offene
        '
        Me.cbx_offene.AutoSize = True
        Me.cbx_offene.Location = New System.Drawing.Point(12, 19)
        Me.cbx_offene.Name = "cbx_offene"
        Me.cbx_offene.Size = New System.Drawing.Size(120, 17)
        Me.cbx_offene.TabIndex = 36
        Me.cbx_offene.Text = "nur offene anzeigen"
        Me.cbx_offene.UseVisualStyleBackColor = True
        '
        'btnSuche
        '
        Me.btnSuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -957,17 +1052,17 @@ Partial Class frmGesamtsicherheitenNEU
        Me.txtSicherheitFreitext.Size = New System.Drawing.Size(256, 24)
        Me.txtSicherheitFreitext.TabIndex = 40
        '
-        'lbloffenerSaldo
+        'lblId
        '
-        Me.lbloffenerSaldo.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.lblId.Anchor = System.Windows.Forms.AnchorStyles.Right
-        Me.lbloffenerSaldo.AutoSize = True
+        Me.lblId.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.lblId.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.lblId.ForeColor = System.Drawing.Color.Honeydew
-        Me.lbloffenerSaldo.Location = New System.Drawing.Point(238, 108)
+        Me.lblId.Location = New System.Drawing.Point(1229, 9)
-        Me.lbloffenerSaldo.Name = "lbloffenerSaldo"
+        Me.lblId.Name = "lblId"
-        Me.lbloffenerSaldo.Size = New System.Drawing.Size(146, 24)
+        Me.lblId.Size = New System.Drawing.Size(29, 24)
-        Me.lbloffenerSaldo.TabIndex = 44
+        Me.lblId.TabIndex = 46
-        Me.lbloffenerSaldo.Text = "offener Saldo: "
+        Me.lblId.Text = "ID"
        '
        'frmGesamtsicherheitenNEU
        '
@@ -1065,4 +1160,10 @@ Partial Class frmGesamtsicherheitenNEU
    Friend WithEvents Label20 As Label
    Friend WithEvents txtPosNr As TextBox
    Friend WithEvents lbloffenerSaldo As Label
    Friend WithEvents btnNext As Button
    Friend WithEvents btnPrev As Button
    Friend WithEvents cbx_offene As CheckBox
    Friend WithEvents txtZollsatzueberschreiben As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents cbxZollsatzueberschreiben As CheckBox
    Friend WithEvents lblId As Label
 End Class
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -13,6 +13,8 @@ Public Class frmGesamtsicherheitenNEU
    Property currentSPos As cGesamtsicherheitsPositionen
    Property currentGesSichRef As cGesamtsicherheitsReferenz
    Public Property gessicherheitID As Integer
    Public Property prevGessicherheitID As Integer = 0
    Public Property nextGessicherheitID As Integer = 0
    Public Property datum As DateTime = Nothing
    Property Standort As String = ""
@@ -36,8 +38,12 @@ Public Class frmGesamtsicherheitenNEU
    Dim indexGspPosId As Integer
    Dim isOpen As Boolean = False
    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
    Public dt As New DataTable
    Private Sub frmGesamtsicherheitNEU_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -59,13 +65,17 @@ Public Class frmGesamtsicherheitenNEU
            cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
            If datum = Nothing Then datum = Date.Now
            nextGessicherheitID = -1
            prevGessicherheitID = -1
        Else
            LoadDGVSicherheiten()
        End If
        LoadStandort()
        cboSicherheitATR.Enabled = currentGesSichRef.gsr_ATR
-        Zollsatz = currentGesSichRef.gsr_zollsatz
+
        cbx_offene.Checked = True
        initPrevNextButtons()
        Me.Text = "Gesamtsicherheit " & Standort
@@ -74,26 +84,22 @@ Public Class frmGesamtsicherheitenNEU
-    Public Sub LoadDGVSicherheiten()
+    Public Sub LoadDGVSicherheiten(Optional withFilterParam As Boolean = False)
        lblSaldo.Text = "Saldo: € " & currentGesSichRef.gsr_Saldo.ToString()
        lblGestellungNr.Text = ""
        Dim sqladd1 As String = ""
        If currentGesSichRef.gsr_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.gsr_ust & "/100), 'C', 'de-DE') as gs_ust"
        If currentGesSichRef.gsr_ATR Then sqladd1 &= ", [gs_atr]"
-        If txt_Suche.Text <> "" Or cbx_Suche_Warenort._value <> "" Then Dim sqlSearchSting As String = ""
+        Dim sqlSearchSting As String = ""
        If withFilterParam = True Then
            If txt_Suche.Text <> "" Then sqlSearchSting &= "AND ([gs_abfertigungsNr] Like '%" & txt_Suche.Text & "%' OR [gs_ATBNr] Like '%" & txt_Suche.Text & "%' OR [gs_LKWKZ] like '%" & txt_Suche.Text & "%' OR [gs_avisoId] like '%" & txt_Suche.Text & "%' OR [gs_freitext] like '%" & txt_Suche.Text & "%')"
            If cbx_Suche_Warenort._value <> "" Then sqlSearchSting &= "AND gs_warenort like '%" & cbx_Suche_Warenort.Text & "%'"
        End If
        'Dim addtosqlstring As String = ""
-        Dim addtosqlstring As String = ""
+        Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_ATBNr], [gs_posNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" & sqlSearchSting & "order by [gs_gsId]"
        'Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_ATBNr], [gs_posNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " &
        '                                sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] 
        '                                where gs_standort = '" & Standort & "'And gs_datum > '" & Date.Parse(txtDatVon.Text) & "' And gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "'" &
        '                                "AND (gs_abfertigungsNr Like '%" & txt_Suche.Text & "%' OR" &
        '                                " gs_ATBNr like '%" & txt_Suche.Text & "%' OR" &
        '                                " gs_LKWKZ like '%" & txt_Suche.Text & "%' OR" &
        '                                " gs_warenort like '%" & cbx_Suche_Warenort.Text & "%') order by [gs_datum]"
        Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_ATBNr], [gs_posNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "' order by [gs_datum]"
        dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,)
        dgvGesamtsicherheit.LOAD()
@@ -111,11 +117,11 @@ Public Class frmGesamtsicherheitenNEU
                Select Case currentGesSichRef.gsr_ATR
                    Case True
                        .Columns("gs_ATBNr").HeaderText = "ATB"
-                        .Columns("gs_atr").HeaderText = "ATR"
+                        .Columns("gs_atr").HeaderText = "MRN"
                        .Columns("gs_atr").Width = 33
                        .Columns("gs_ust").Width = 69
                    Case Else
-                        .Columns("gs_ATBNr").HeaderText = "CRN"
+                        .Columns("gs_ATBNr").HeaderText = "ATB"
                End Select
                .Columns("gs_ATBNr").Width = 146
@@ -128,15 +134,6 @@ Public Class frmGesamtsicherheitenNEU
                .Columns("gs_freitext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
            End With
            'For Each row As DataGridViewRow In dgvGesamtsicherheit.Rows
            '    If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then
            '        row.DefaultCellStyle.BackColor = Color.Red
            '    Else
            '        row.DefaultCellStyle.BackColor = Color.Green
            '    End If
            'Next
        End If
@@ -145,24 +142,36 @@ Public Class frmGesamtsicherheitenNEU
    Private Sub dgvGesamtsicherheit_SelectionChanged(sender As Object, e As EventArgs) Handles dgvGesamtsicherheit.SelectionChanged
        If dgvGesamtsicherheit.SelectedRows.Count > 0 Then
-            indexGsId = CInt(dgvGesamtsicherheit.SelectedRows(0).Cells("gs_gsId").Value)
+            indexGsId = CInt(dgvGesamtsicherheit.SelectedRows(0).Cells("gs_gsNr").Value)
            currentSicherheit = New cSicherheiten(indexGsId)
-
+            LoadDGVSicherheitsPos(indexGsId, True)
            LoadDGVSicherheitsPos(indexGsId)
            loadTitle()
            setSaldo()
            If dgvGesamtsicherheit.Enabled = False Then Exit Sub
        Else
            LoadDGVSicherheitsPos(-1, True)
        End If
    End Sub
-    Public Sub LoadDGVSicherheitsPos(gsId As Integer)
+    Public Sub LoadDGVSicherheitsPos(gsNr As Integer, Optional withFilterParam As Boolean = False)
-        If gsId = 0 Then Exit Sub
+        'If gsNr = "" Then Exit Sub
-        Dim SQLStringCRN As String = "select [gsp_gspPosId] ,[gsp_gsId],[gsp_warenwert],[gsp_sicherheitsbetrag],[gsp_freitext],[gsp_art] ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_ATCNr] ,[gsp_MRNNr],[gsp_erstellungsdatum] from [tblGesamtsicherheitsPositionen] where [gsp_gsId] = '" & gsId & "' order by [gsp_gspPosId]"
+        Dim sqlSearchSting As String = ""
        If withFilterParam = True Then
            sqlSearchSting &= "AND gsp_gsid IN (select gs_gsId from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'"
            If txt_Suche.Text <> "" Then sqlSearchSting &= "AND ([gs_abfertigungsNr] Like '%" & txt_Suche.Text & "%' OR [gs_ATBNr] Like '%" & txt_Suche.Text & "%' OR [gs_LKWKZ] like '%" & txt_Suche.Text & "%' OR [gs_avisoId] like '%" & txt_Suche.Text & "%' OR [gs_freitext] like '%" & txt_Suche.Text & "%')"
            If cbx_Suche_Warenort._value <> "" Then sqlSearchSting &= " AND gs_warenort like '%" & cbx_Suche_Warenort.Text & "%'"
            sqlSearchSting &= ")"
        End If
        Dim SQLStringCRN As String = "select [gsp_gspPosId] ,[gsp_gsId],[gsp_gsnr],[gsp_warenwert],[gsp_sicherheitsbetrag],[gsp_freitext],[gsp_art] ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_ATCNr] ,[gsp_MRNNr],[gsp_erstellungsdatum] from [tblGesamtsicherheitsPositionen] where [gsp_gsnr] = '" & gsNr & "'" & sqlSearchSting & " order by [gsp_gsId]"
        dgvSicherheitsPos.SET_SQL(SQLStringCRN, "AVISO", ,)
        dgvSicherheitsPos.LOAD()
@@ -188,6 +197,7 @@ Public Class frmGesamtsicherheitenNEU
            End With
        End If
        btnAddPos.Visible = True
    End Sub
@@ -206,7 +216,7 @@ Public Class frmGesamtsicherheitenNEU
        'Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "'"
        lblGestellungNr.Text = ""
-
+        lblId.Text = ""
        Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsId] = '" & indexGsId & "'"
@@ -224,6 +234,7 @@ Public Class frmGesamtsicherheitenNEU
        If Me.FilialNummer.ToString.Length > 0 Then lblGestellungNr.Text &= "FilialNr: " & Me.FilialNummer & " "
        If Me.Abfertigungsnummer.Length > 0 Then lblGestellungNr.Text &= "AbfNr: " & Me.Abfertigungsnummer & " "
        If Me.warenortID.Length > 0 Then lblGestellungNr.Text &= "Warenort: " & Me.warenortID & " "
        If gessicherheitID <> 0 Then lblId.Text &= "GS-Nr: " & gessicherheitID 'currentSicherheit.gs_gsNr
@@ -232,9 +243,13 @@ Public Class frmGesamtsicherheitenNEU
    Public Sub LoadStandort()
        Zollsatz = currentGesSichRef.gsr_zollsatz
        txtZollsatzueberschreiben.Text = Zollsatz
        cbxZollsatzueberschreiben.Checked = False
        lblReferenzwert.Text = "Referenzwert: €" & currentGesSichRef.gsr_referenzwert.ToString()
        lblZollsatz.Text = "Zollsatz: " & currentGesSichRef.gsr_zollsatz & "%"
        ZollsatzMulti = currentGesSichRef.gsr_zollsatz / 100
    End Sub
    Private Sub Warenwert_TextChanged(sender As Object, e As EventArgs) Handles txtSicherheitWarenwert.TextChanged, txtPosWarenwert.TextChanged
@@ -250,7 +265,7 @@ Public Class frmGesamtsicherheitenNEU
        End Try
    End Sub
-    Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtSicherheitWarenwert.KeyPress, txtPosWarenwert.KeyPress, txtAnzahlPos.KeyPress
+    Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtSicherheitWarenwert.KeyPress, txtPosWarenwert.KeyPress, txtAnzahlPos.KeyPress, txtZollsatzueberschreiben.KeyPress
        Select Case Asc(e.KeyChar)
            Case 48 To 57, 8, 44
                ' Zahlen, Backspace und , zulassen
@@ -299,55 +314,82 @@ Public Class frmGesamtsicherheitenNEU
    End Sub
    Private Sub btnAddSicherheit_Click(sender As Object, e As EventArgs) Handles btnAddSicherheit.Click
        Dim attachPosNrToExistingATB As Boolean = False
        Try
            If (txtAnzahlPos.Text = "") Then
                txtAnzahlPos.Focus()
                Exit Sub
            End If
            Dim limit As Integer = Integer.Parse(setNullToZero(txtAnzahlPos.Text))
            For count As Integer = 1 To limit
                attachPosNrToExistingATB = False
                Dim warenwert As Double
                Dim sicherheitsbetrag As Double
                If count > 1 Then
                    warenwert = 0
                    sicherheitsbetrag = 0
                Else
                    warenwert = Double.Parse(txtSicherheitWarenwert.Text)
                    sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text)
                End If
                Dim OPEN As New cSicherheiten()
                With OPEN
-                .gs_gsNr = AddNewGesamtSichNr()
+                    .gs_gsNr = gessicherheitID
                    .gs_ATBNr = txtSicherheitATBNr.Text
-                .gs_posNr = Integer.Parse(setNullToZero(txtAnzahlPos.Text))
+                    .gs_posNr = count
                    .gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDate.Text, txtSicherheitTime.Text)
-                .gs_warenwert = Double.Parse(txtSicherheitWarenwert.Text) '.Replace(".", "").Replace(",", ".")
+                    .gs_warenwert = warenwert
-                .gs_sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
+                    .gs_sicherheitsbetrag = sicherheitsbetrag
                    .gs_standort = Me.Standort
                    .gs_art = "OPEN"
                .gs_gsNr = Me.gessicherheitID
                    .gs_erstellungsdatum = Me.datum
                    .gs_freitext = Me.txtSicherheitFreitext.Text
                    .gs_saldo = currentGesSichRef.gsr_Saldo
                    .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
                    .gs_zollsatz = Me.Zollsatz
                    setEnviromentDataToObject(OPEN, Me)
                End With
            'If Neu = True AndAlso count <= 1 Then OPENWithMultiplePosNr.gs_gsNr = AddNewGesamtSichNr()
            'Select Case checkIfExist(OPENWithMultiplePosNr.gs_ATBNr, gessicherheitID)
            '    Case "Neu"
            '        OPENWithMultiplePosNr.SAVE()
            '    Case Else
            '        If (count > 1) Then
            '            OPENWithMultiplePosNr.SAVE()
            '        Else
            '            MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPENWithMultiplePosNr.gs_ATBNr, gessicherheitID) & "eingetragen") : OPENWithMultiplePosNr.SAVE()
            '        End If
-            'End Select
+
                If Neu = True AndAlso count <= 1 Then OPEN.gs_gsNr = AddNewGesamtSichNr()
                Select Case checkIfExist(OPEN.gs_ATBNr, gessicherheitID)
                    Case "Neu"
                        indexGsId = OPEN.SAVEOBJECT()
                    Case Else
                        With OPEN
                            .gs_posNr = getLatestPosNr(gessicherheitID, txtSicherheitATBNr.Text) + 1
                        End With
                        attachPosNrToExistingATB = True
                        indexGsId = OPEN.SAVEOBJECT()
                        If count = 1 Then MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPEN.gs_ATBNr, gessicherheitID) & "eingetragen") ': indexGsId = OPEN.SAVEOBJECT()
-            For count As Integer = 1 To limit
+                End Select
                'If (count > 1) Then txtMRNWarenwert.Text = 0
-                Dim OPENPos As New cGesamtsicherheitsPositionen(indexGsId, count)
+                Dim OPENPos As cGesamtsicherheitsPositionen
                If attachPosNrToExistingATB Then
                    OPENPos = New cGesamtsicherheitsPositionen(indexGsId, OPEN.gs_posNr)
                Else
                    OPENPos = New cGesamtsicherheitsPositionen(indexGsId, count)
                End If
                With OPENPos
-                    '.gsp_gsId =
+
-                    '.gsp_gspPosId = count
+                    .gsp_gsNr = OPEN.gs_gsNr
                    .gsp_warenwert = 0
                    .gsp_sicherheitsbetrag = 0
                    .gsp_freitext = ""
@@ -359,32 +401,20 @@ Public Class frmGesamtsicherheitenNEU
                    .gsp_ust = ""
                    .gsp_ATCNr = ""
                    .gsp_MRNNr = ""
                    .gsp_gsNr = OPEN.gs_gsNr
                End With
                OPENPos.SAVE()
                If Neu = True AndAlso count <= 1 Then OPEN.gs_gsNr = AddNewGesamtSichNr()
                Select Case checkIfExist(OPEN.gs_ATBNr, gessicherheitID)
                    Case "Neu"
                        OPEN.SAVE()
                    Case Else
                        If (count >= 1) Then
                            OPEN.SAVE()
                            OPENPos.SAVE()
                        Else
                            MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPEN.gs_ATBNr, gessicherheitID) & "eingetragen") : OPEN.SAVE()
                        End If
                End Select
            Next
            AfterButton()
        Catch ex As Exception
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try
@@ -394,11 +424,11 @@ Public Class frmGesamtsicherheitenNEU
        If dgvGesamtsicherheit.SelectedRows.Count = 0 Then
-            MsgBox("Bitte Sicherheit markieren, zu diese eine Pos hinzugefügt/entfernt/aktualisiert werden soll")
+            MsgBox("Bitte eine Gestellung markieren, zu diese eine Pos hinzugefügt/entfernt/aktualisiert werden soll")
            Exit Sub
        End If
-        If (checkWarenwert() = False) Then
+        If (checkSicherheitsbetrag() = False) Then
            MsgBox("Der Warenwert der Positionen übersteigt den Warenwert der Gestellung!")
            txtPosWarenwert.Focus()
            Exit Sub
@@ -406,15 +436,38 @@ Public Class frmGesamtsicherheitenNEU
        Try
            Dim OPEN As New cSicherheiten()
            With OPEN
                .gs_gsNr = gessicherheitID
                .gs_ATBNr = ""
                .gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
                .gs_datum = DateTimeString2DateTimeKonvertinator(txtPosDate.Text, txtPosTime.Text)
                .gs_warenwert = 0
                .gs_sicherheitsbetrag = 0
                .gs_standort = Me.Standort
                .gs_art = "OPEN"
                .gs_erstellungsdatum = Me.datum
                .gs_freitext = Me.txtSicherheitFreitext.Text
                .gs_saldo = currentGesSichRef.gsr_Saldo
                .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
                .gs_zollsatz = Me.Zollsatz
                setEnviromentDataToObject(OPEN, Me)
            End With
            Dim gs_gsId = OPEN.SAVEOBJECT()
            Dim SicherheitsPos As New cGesamtsicherheitsPositionen()
            With SicherheitsPos
-                .gsp_gsId = currentSicherheit.gs_gsId
+                .gsp_gsId = gs_gsId
-                .gsp_gspPosId = Me.getLatestPosNr(currentSicherheit.gs_gsId) + 1
+                '.gsp_gspPosId = Me.getLatestPosNr(currentSicherheit.gs_gsNr, ) + 1
                .gsp_gspPosId = OPEN.gs_posNr
                .gsp_warenwert = Double.Parse(txtPosWarenwert.Text)
                .gsp_sicherheitsbetrag = Double.Parse(txtPosSicherheitsbetrag.Text)
                .gsp_freitext = txtPosFreitext.Text
                .gsp_filialenNr = currentSicherheit.gs_filialenNr
-                .gsp_art = "OPEN"
+                .gsp_art = "CLOSE"
                .gsp_gsNr = gessicherheitID
                .gsp_abfertigungsNr = currentSicherheit.gs_abfertigungsnr
                .gsp_erstellungsdatum = DateTimeString2DateTimeKonvertinator(txtPosDate.Text, txtPosTime.Text)
                .gsp_ust = currentSicherheit.gs_ust
@@ -422,19 +475,8 @@ Public Class frmGesamtsicherheitenNEU
                .gsp_MRNNr = txtPositionenCRN.Text
            End With
            SicherheitsPos.SAVE()
            'If Neu = True Then Close.gs_gsNr = AddNewGesamtSichNr()
            'Select Case checkIfExist(Close.gs_ATBNr, gessicherheitID)
            '    Case "Neu"
            '        Close.SAVE()
            '    Case Else
            '        MsgBox("Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(Close.gs_ATBNr, gessicherheitID) & "eingetragen") : Exit Sub
            'End Select
            AfterButton()
        Catch ex As Exception
            MsgBox(ex.Message)
@@ -520,7 +562,7 @@ Public Class frmGesamtsicherheitenNEU
        End Try
        Try
-            Me.warenortID = checkNothingValue(cbx_Suche_Warenort.SelectedItem, "String")
+            Me.warenortID = checkNothingValue(cboWarenort.SelectedItem, "String")
        Catch
            Me.warenortID = "-"
@@ -529,13 +571,14 @@ Public Class frmGesamtsicherheitenNEU
        Me.Abfertigungsnummer = txtAbfertNum.Text
        Me.LKWKZ = txtLKWID.Text
-        If setNullToZero(Me.gessicherheitID) >= 0 Then
+        If setNullToZero(Me.gessicherheitID) > 0 Then
            Dim sqlstring = "Update [tblGesamtsicherheit] set [gs_filialenNr] = '" & Me.FilialNummer & "', [gs_abfertigungsNr] = '" & Me.Abfertigungsnummer & "', [gs_LKWKZ] = '" & Me.LKWKZ & "', [gs_warenort] = '" & Me.warenortID & "' WHERE [gs_gsNr] = '" & Me.gessicherheitID & "' "
            SQL.doSQL(sqlstring, "AVISO")
            btnAddPos.Visible = True
            LoadDGVSicherheiten()
        End If
        loadTitle()
-
+        btnAddPos.Visible = False
        panOben.Enabled = True : panOben.Enabled = True
        panOverlay.Visible = False
    End Sub
@@ -559,9 +602,9 @@ Public Class frmGesamtsicherheitenNEU
    End Function
-    Private Sub dgvGesamtsicherheit_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheit.CellContentClick
+    Private Sub dgvGesamtsicherheit_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheit.CellDoubleClick
-        Dim Sicherh As New cSicherheiten(dgvGesamtsicherheit.CurrentRow.Cells("gs_gsId").Value)
+        Dim Sicherh As New cSicherheiten(dgvGesamtsicherheit.CurrentRow.Cells("gs_gsId").Value, dgvGesamtsicherheit.CurrentRow.Cells("gs_posNr").Value)
        txtSicherheitATBNr.Text = Sicherh.gs_ATBNr
        txtAnzahlPos.Text = Sicherh.gs_posNr
@@ -572,6 +615,7 @@ Public Class frmGesamtsicherheitenNEU
        txtSicherheitTime.Text = Sicherh.gs_erstellungsdatum.ToString("HH:mm")
        currentSicherheit = Sicherh
        txtAnzahlPos.Enabled = False
        btnAddSicherheit.Visible = False
        btnUpdateSicherheit.Visible = True
@@ -581,10 +625,10 @@ Public Class frmGesamtsicherheitenNEU
    Private Sub btnUpdateSicherheit_Click(sender As Object, e As EventArgs) Handles btnUpdateSicherheit.Click
        With currentSicherheit
            .gs_ATBNr = txtSicherheitATBNr.Text
-            .gs_posNr = Double.Parse(setNullToZero(txtAnzahlPos.Text))
+            .gs_posNr = Integer.Parse(setNullToZero(txtAnzahlPos.Text))
            .gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDate.Text, txtSicherheitTime.Text)
-            .gs_warenwert = Double.Parse(txtSicherheitWarenwert.Text) '.Replace(".", "").Replace(",", ".")
+            .gs_warenwert = Double.Parse(txtSicherheitWarenwert.Text)
-            .gs_sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
+            .gs_sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text)
            .gs_standort = Me.Standort
            .gs_art = "OPEN"
            .gs_gsNr = Me.gessicherheitID
@@ -593,8 +637,9 @@ Public Class frmGesamtsicherheitenNEU
            '.saldo = currentGesSichRef.Saldo
            .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
        End With
-        checkWarenwert()
+        checkSicherheitsbetrag()
        currentSicherheit.SAVE()
        txtAnzahlPos.Enabled = True
        btnUpdateSicherheit.Visible = False
        btnAddSicherheit.Visible = True
        btnDeleteSicherheit.Visible = False
@@ -611,7 +656,7 @@ Public Class frmGesamtsicherheitenNEU
            .gsp_ATCNr = txtPositionenCRN.Text
        End With
-        checkWarenwert()
+        checkSicherheitsbetrag()
        currentSPos.SAVE()
        btnAddPos.Visible = True
        btnUpdatePos.Visible = False
@@ -619,9 +664,9 @@ Public Class frmGesamtsicherheitenNEU
        AfterButton()
    End Sub
-    Private Sub dgvGesamtsicherheitPositionen_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSicherheitsPos.CellDoubleClick
+    Private Sub dgvGesamtsicherheitPositionen_CellCellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSicherheitsPos.CellDoubleClick
-        Dim sPos As New cGesamtsicherheitsPositionen(indexGsId, dgvSicherheitsPos.CurrentRow.Cells("gsp_gspPosId").Value)
+        Dim sPos As New cGesamtsicherheitsPositionen(dgvSicherheitsPos.CurrentRow.Cells("gsp_gsId").Value, dgvSicherheitsPos.CurrentRow.Cells("gsp_gspPosId").Value)
        txtPosNr.Text = sPos.gsp_gspPosId
        txtPosFreitext.Text = sPos.gsp_freitext
@@ -631,6 +676,7 @@ Public Class frmGesamtsicherheitenNEU
        txtPosDate.Text = sPos.gsp_erstellungsdatum.ToString("dd.MM.yyyy")
        txtPosTime.Text = sPos.gsp_erstellungsdatum.ToString("HH:mm")
        currentSPos = sPos
        btnDeletePos.Visible = True
@@ -644,6 +690,7 @@ Public Class frmGesamtsicherheitenNEU
            btnUpdateSicherheit.Visible = False
            btnAddSicherheit.Visible = True
            btnDeleteSicherheit.Visible = False
            txtAnzahlPos.Enabled = True
            AfterButton()
        Catch ex As Exception
            MsgBox(ex.Message)
@@ -666,8 +713,8 @@ Public Class frmGesamtsicherheitenNEU
        panOverlay.Visible = True
        cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
        cboFiliale.SelectedIndex = cboFiliale.FindString(Me.FilialNummer)
-        cbx_Suche_Warenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
+        cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
-        cbx_Suche_Warenort.SelectedIndex = cbx_Suche_Warenort.FindString(Me.warenortID)
+        cboWarenort.SelectedIndex = cbx_Suche_Warenort.FindString(Me.warenortID)
        txtAbfertNum.Text = Me.Abfertigungsnummer
        txtLKWID.Text = Me.LKWKZ
        panOben.Enabled = False
@@ -684,6 +731,7 @@ Public Class frmGesamtsicherheitenNEU
            MsgBox("Bitte Warenort angeben!")
            isFilled = False
        End If
        Return isFilled
@@ -699,10 +747,10 @@ Public Class frmGesamtsicherheitenNEU
    End Sub
-
+    Private Function getLatestPosNr(gs_gsnr As Integer, gs_ATBNr As String) As Integer
    Private Function getLatestPosNr(gs_gsId As Integer) As Integer
        Dim posNr As Integer = 0
-        Dim sqlq As String = "select MAX([gsp_gspPosId]) as MaxPosNr from tblGesamtsicherheitsPositionen where gsp_gsId = " & gs_gsId
+        '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)
@@ -716,11 +764,9 @@ Public Class frmGesamtsicherheitenNEU
    End Function
    Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click
        Try
-            If Me.Visible Then LoadDGVSicherheiten()
+            If Me.Visible Then LoadDGVSicherheiten(True)
        Catch ex As Exception
            MsgBox("Datum VON und/oder BIS konnte nicht konvertiert werden.")
        End Try
@@ -749,36 +795,64 @@ Public Class frmGesamtsicherheitenNEU
        txt_Suche.Clear()
    End Sub
-    Private Function checkWarenwert() As Boolean
+    Private Function checkSicherheitsbetrag() As Boolean
        Dim ok As Boolean = True
-        Dim offenerWarenwert As Double
+        Dim offenerSicherheitsbetrag As Double
        Dim offenerSicherheitsbetragPos As Double
        Try
-            offenerWarenwert = calcOffenenWarenwert()
+            offenerSicherheitsbetrag = calcOffenerSicherheitsbetrag()
-            If (offenerWarenwert < Double.Parse(txtPosWarenwert.Text)) Then
+            If (offenerSicherheitsbetrag < 0) Then Return False
-                ok = False
+
-            End If
+            If (offenerSicherheitsbetrag < offenerSicherheitsbetragPos) Then Return False
        Catch ex As Exception
            MsgBox(ex.Message)
        End Try
        Return ok
    End Function
    Private Function calcSicherheitsbetragPos() As Double
        Dim sicherheitsbetragSumPositionen As Double
        If currentSicherheit Is Nothing Then Exit Function
        sicherheitsbetragSumPositionen = CDbl(SQL.DLookup("SUM(gsp_sicherheitsbetrag)", "[tblGesamtsicherheitsPositionen]", "gsp_gsnr ='" & currentSicherheit.gs_gsNr & "'", "AVISO"))
        If currentSPos IsNot Nothing Then
            sicherheitsbetragSumPositionen = sicherheitsbetragSumPositionen + Double.Parse(setNullToZero(txtPosWarenwert.Text))
        End If
        Return sicherheitsbetragSumPositionen
    End Function
-    Private Function calcOffenenWarenwert() As Double
+    Private Function calcSicherheitsbetragGestelle() As Double
        Dim sicherheitsbetragSumGestelle As Double
        If currentSicherheit Is Nothing Then Exit Function
        sicherheitsbetragSumGestelle = CDbl(SQL.DLookup("SUM(gs_sicherheitsbetrag)", "[tblGesamtsicherheit]", "gs_gsnr ='" & currentSicherheit.gs_gsNr & "'", "AVISO"))
        Return sicherheitsbetragSumGestelle
    End Function
    Private Function calcOffenerSicherheitsbetrag() As Double
        Dim diff As Double = -10000
-        If currentSicherheit Is Nothing Then Exit Function
+
        Try
-            Dim warenwertSumPositionen = CDbl(SQL.DLookup("SUM(gsp_warenwert)", "[tblGesamtsicherheitsPositionen]", "gsp_gsId ='" & currentSicherheit.gs_gsId & "'", "AVISO"))
+            Dim sicherheitsbetragSumPositionen = calcSicherheitsbetragPos()
-            diff = Double.Parse(currentSicherheit.gs_warenwert) - Double.Parse(warenwertSumPositionen)
+            Dim sicherheitsbetragSumGestelle = calcSicherheitsbetragGestelle()
            diff = Double.Parse(sicherheitsbetragSumGestelle) - Double.Parse(sicherheitsbetragSumPositionen)
        Catch ex As Exception
            MsgBox(ex.Message)
        End Try
@@ -789,11 +863,14 @@ Public Class frmGesamtsicherheitenNEU
    Private Sub setSaldo()
-        lbloffenerSaldo.Text = "offener Saldo: "
+        lbloffenerSaldo.Text = "offener S-Saldo: "
-        If Me.calcOffenenWarenwert > 0 Then
+        Dim offernerSB As Double = Me.calcOffenerSicherheitsbetrag()
-            lbloffenerSaldo.Text &= Me.calcOffenenWarenwert()
+        If offernerSB > 0 Then
            lbloffenerSaldo.Text &= Me.calcOffenerSicherheitsbetrag().ToString
            isOpen = True
        Else
            lbloffenerSaldo.Text &= "0"
            isOpen = False
        End If
    End Sub
@@ -801,9 +878,156 @@ Public Class frmGesamtsicherheitenNEU
    End Sub
    Private Function setPrevAndNextGesIDAllOpen()
        Dim isInList As Boolean = False
        Dim onlyOpenDT As DataTable
        onlyOpenDT = dt.Select("gs_isOpen = True").CopyToDataTable
        For i As Integer = 0 To onlyOpenDT.Rows.Count - 1
            If onlyOpenDT.Rows(i).Item("gs_gsnr") = Me.gessicherheitID Then
                isInList = True
                If i = 0 Then
                    prevGessicherheitID = -1 ' no prev Sicherheit
                Else
                    prevGessicherheitID = onlyOpenDT.Rows(i - 1).Item("gs_gsnr")
                End If
                If i = onlyOpenDT.Rows.Count - 1 Then
                    nextGessicherheitID = -1 ' no next Sicherheit
                Else
                    nextGessicherheitID = onlyOpenDT.Rows(i + 1).Item("gs_gsnr")
                End If
            End If
        Next
        If isInList = False AndAlso onlyOpenDT.Rows.Count - 1 <> 0 Then
            For i As Integer = 0 To dt.Rows.Count - 1
                If dt.Rows(i).Item("gs_gsnr") = Me.gessicherheitID Then
                    If i = 0 Then
                        prevGessicherheitID = -1 ' no prev Sicherheit
                    Else
                        For j As Integer = i To 0
                            If dt.Rows(j).Item("gs_isOpen") Then
                                prevGessicherheitID = dt.Rows(j).Item("gs_gsnr")
                                Exit For
                            End If
                        Next
                    End If
                    If i = dt.Rows.Count - 1 Then
                        nextGessicherheitID = -1 ' ' no next Sicherheit
                    Else
                        For k As Integer = i To dt.Rows.Count - 1
                            If dt.Rows(k).Item("gs_isOpen") Then
                                nextGessicherheitID = dt.Rows(k).Item("gs_gsnr")
                                Exit For
                            End If
                        Next
                    End If
                End If
            Next
        End If
    End Function
    Private Function setPrevAndNextGesAll()
        For i As Integer = 0 To dt.Rows.Count - 1
            If dt.Rows(i).Item("gs_gsnr") = Me.gessicherheitID Then
                prevGessicherheitID = i - 1
                nextGessicherheitID = i + 1
                If i = 0 Then prevGessicherheitID = -1 ' no prev Sicherheit
                If i = dt.Rows.Count - 1 Then nextGessicherheitID = -1 ' ' no next Sicherheit
                Return i
            End If
        Next
    End Function
    Private Sub btnPrev_Click(sender As Object, e As EventArgs) Handles btnPrev.Click
        If (cbx_offene.Checked) Then
            setPrevAndNextGesIDAllOpen()
        Else
            setPrevAndNextGesAll()
        End If
        If Me.prevGessicherheitID = -1 Then
            initPrevNextButtons()
            Exit Sub
        End If
        Me.gessicherheitID = Me.prevGessicherheitID
        LoadDGVSicherheiten()
    End Sub
    Private Sub btnNext_Click(sender As Object, e As EventArgs) Handles btnNext.Click
        If (cbx_offene.Checked) Then
            setPrevAndNextGesIDAllOpen()
        Else
            setPrevAndNextGesAll()
        End If
        If Me.nextGessicherheitID = -1 Then
            initPrevNextButtons()
            Exit Sub
        End If
        Me.gessicherheitID = Me.nextGessicherheitID
        LoadDGVSicherheiten()
    End Sub
    Private Sub initPrevNextButtons()
        If nextGessicherheitID = -1 Then
            btnNext.Enabled = False
        Else
            btnNext.Enabled = True
        End If
        If prevGessicherheitID = -1 Then
            btnPrev.Enabled = False
        Else
            btnPrev.Enabled = True
        End If
    End Sub
    Private Sub cbxZollsatzueberschreiben_CheckedChanged(sender As Object, e As EventArgs) Handles cbxZollsatzueberschreiben.CheckedChanged
        If cbxZollsatzueberschreiben.Checked Then
            txtZollsatzueberschreiben.Enabled = True
        Else
            txtZollsatzueberschreiben.Enabled = False
            txtZollsatzueberschreiben.Text = currentGesSichRef.gsr_zollsatz.ToString
        End If
    End Sub
    Private Sub txtZollsatzueberschreiben_TextChanged(sender As Object, e As EventArgs) Handles txtZollsatzueberschreiben.TextChanged
        lblZollsatz.Text = "Zollsatz: " & txtZollsatzueberschreiben.Text & "%"
        ZollsatzMulti = CDbl(setNullToZero(txtZollsatzueberschreiben.Text)) / 100
    End Sub
 End Class
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -4177,7 +4177,7 @@ Public Class frmHauptfenster
    Private Sub DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem.Click
        Dim frm As New frmGesamtsicherheitenMenuNEU
-        frm.Standort = "VERAG AG"
+        frm.Standort = "VERAG GmbH"
        frm.Show()
    End Sub
 End Class