Feature_GesamtsicherheitenNEU

2022-10-19 09:46:29 +02:00
parent db85cc6243
commit 5647343b76
4 changed files with 226 additions and 246 deletions
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
@@ -44,7 +44,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.Label17 = New System.Windows.Forms.Label()
        Me.Label16 = New System.Windows.Forms.Label()
        Me.btnClosePanOverlay = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.dgvGesamtsicherheitCRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvGesamtsicherheitPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.btnAddClose = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.btnAddOpen = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.lblGestellungNr = New System.Windows.Forms.Label()
@@ -59,12 +59,13 @@ Partial Class frmGesamtsicherheitenNEU
        Me.txtMRNSicherheitsbetrag = New System.Windows.Forms.TextBox()
        Me.txtMRNWarenwert = New System.Windows.Forms.TextBox()
        Me.txtMRN = New System.Windows.Forms.TextBox()
-        Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.btn_resetSearch = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.lblZollsatz = New System.Windows.Forms.Label()
        Me.lblReferenzwert = New System.Windows.Forms.Label()
        Me.lblSaldo = New System.Windows.Forms.Label()
        Me.panOben = New System.Windows.Forms.Panel()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.btnSuche = New System.Windows.Forms.Button()
        Me.Label26 = New System.Windows.Forms.Label()
        Me.Button7 = New System.Windows.Forms.Button()
@@ -83,12 +84,12 @@ Partial Class frmGesamtsicherheitenNEU
        Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker()
        Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.Label23 = New System.Windows.Forms.Label()
-        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label19 = New System.Windows.Forms.Label()
-        Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.TextBox1 = New System.Windows.Forms.TextBox()
-        Me.TextBox2 = New System.Windows.Forms.TextBox()
+        Me.cbxFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.txtLKW = New System.Windows.Forms.TextBox()
+        Me.txtAbfNr = New System.Windows.Forms.TextBox()
        Me.Label20 = New System.Windows.Forms.Label()
        Me.Label21 = New System.Windows.Forms.Label()
        Me.Label22 = New System.Windows.Forms.Label()
@@ -116,12 +117,11 @@ Partial Class frmGesamtsicherheitenNEU
        Me.Label1 = New System.Windows.Forms.Label()
        Me.txtFreitextClose = New System.Windows.Forms.TextBox()
        Me.txtFreitextOpen = New System.Windows.Forms.TextBox()
-        Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        CType(Me.dgvGesamtsicherheitMRN, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ContextMenuStrip1.SuspendLayout()
        Me.Panel2.SuspendLayout()
        Me.panOverlay.SuspendLayout()
-        CType(Me.dgvGesamtsicherheitCRN, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dgvGesamtsicherheitPositionen, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.panOben.SuspendLayout()
        Me.Panel1.SuspendLayout()
        Me.SuspendLayout()
@@ -180,7 +180,7 @@ Partial Class frmGesamtsicherheitenNEU
        'Panel2
        '
        Me.Panel2.Controls.Add(Me.panOverlay)
-        Me.Panel2.Controls.Add(Me.dgvGesamtsicherheitCRN)
+        Me.Panel2.Controls.Add(Me.dgvGesamtsicherheitPositionen)
        Me.Panel2.Controls.Add(Me.dgvGesamtsicherheitMRN)
        Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill
        Me.Panel2.Location = New System.Drawing.Point(0, 290)
@@ -323,11 +323,11 @@ Partial Class frmGesamtsicherheitenNEU
        Me.btnClosePanOverlay.TabIndex = 0
        Me.btnClosePanOverlay.UseVisualStyleBackColor = False
        '
-        'dgvGesamtsicherheitCRN
+        'dgvGesamtsicherheitPositionen
        '
-        Me.dgvGesamtsicherheitCRN.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvGesamtsicherheitCRN.AllowUserToAddRows = False
-        Me.dgvGesamtsicherheitCRN.AllowUserToDeleteRows = False
+        Me.dgvGesamtsicherheitPositionen.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvGesamtsicherheitPositionen.AllowUserToAddRows = False
+        Me.dgvGesamtsicherheitPositionen.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))
@@ -335,8 +335,8 @@ Partial Class frmGesamtsicherheitenNEU
        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvGesamtsicherheitCRN.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
-        Me.dgvGesamtsicherheitCRN.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvGesamtsicherheitPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
+        Me.dgvGesamtsicherheitPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        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))
@@ -344,14 +344,14 @@ Partial Class frmGesamtsicherheitenNEU
        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvGesamtsicherheitCRN.DefaultCellStyle = DataGridViewCellStyle5
-        Me.dgvGesamtsicherheitCRN.Dock = System.Windows.Forms.DockStyle.Right
-        Me.dgvGesamtsicherheitCRN.Location = New System.Drawing.Point(692, 0)
-        Me.dgvGesamtsicherheitCRN.Name = "dgvGesamtsicherheitCRN"
-        Me.dgvGesamtsicherheitCRN.ReadOnly = True
-        Me.dgvGesamtsicherheitCRN.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvGesamtsicherheitCRN.Size = New System.Drawing.Size(692, 486)
-        Me.dgvGesamtsicherheitCRN.TabIndex = 1
+        Me.dgvGesamtsicherheitPositionen.DefaultCellStyle = DataGridViewCellStyle5
+        Me.dgvGesamtsicherheitPositionen.Dock = System.Windows.Forms.DockStyle.Right
+        Me.dgvGesamtsicherheitPositionen.Location = New System.Drawing.Point(692, 0)
+        Me.dgvGesamtsicherheitPositionen.Name = "dgvGesamtsicherheitPositionen"
+        Me.dgvGesamtsicherheitPositionen.ReadOnly = True
+        Me.dgvGesamtsicherheitPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvGesamtsicherheitPositionen.Size = New System.Drawing.Size(692, 486)
+        Me.dgvGesamtsicherheitPositionen.TabIndex = 1
        '
        'btnAddClose
        '
@@ -362,7 +362,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.btnAddClose.FlatAppearance.BorderSize = 0
        Me.btnAddClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnAddClose.ForeColor = System.Drawing.Color.Black
-        Me.btnAddClose.Location = New System.Drawing.Point(1348, 104)
+        Me.btnAddClose.Location = New System.Drawing.Point(1348, 225)
        Me.btnAddClose.Name = "btnAddClose"
        Me.btnAddClose.Size = New System.Drawing.Size(24, 24)
        Me.btnAddClose.TabIndex = 31
@@ -503,19 +503,19 @@ Partial Class frmGesamtsicherheitenNEU
        Me.txtMRN.Size = New System.Drawing.Size(205, 24)
        Me.txtMRN.TabIndex = 19
        '
-        'FlatButton1
+        'btn_resetSearch
        '
-        Me.FlatButton1.allowBorder = False
-        Me.FlatButton1.BackColor = System.Drawing.Color.White
-        Me.FlatButton1.FlatAppearance.BorderSize = 0
-        Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.FlatButton1.ForeColor = System.Drawing.Color.Black
-        Me.FlatButton1.Image = Global.AVISO.My.Resources.Resources.refresh
-        Me.FlatButton1.Location = New System.Drawing.Point(1340, 15)
-        Me.FlatButton1.Name = "FlatButton1"
-        Me.FlatButton1.Size = New System.Drawing.Size(32, 33)
-        Me.FlatButton1.TabIndex = 3
-        Me.FlatButton1.UseVisualStyleBackColor = False
+        Me.btn_resetSearch.allowBorder = False
+        Me.btn_resetSearch.BackColor = System.Drawing.Color.White
+        Me.btn_resetSearch.FlatAppearance.BorderSize = 0
+        Me.btn_resetSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btn_resetSearch.ForeColor = System.Drawing.Color.Black
+        Me.btn_resetSearch.Image = Global.AVISO.My.Resources.Resources.refresh
+        Me.btn_resetSearch.Location = New System.Drawing.Point(354, 28)
+        Me.btn_resetSearch.Name = "btn_resetSearch"
+        Me.btn_resetSearch.Size = New System.Drawing.Size(32, 33)
+        Me.btn_resetSearch.TabIndex = 3
+        Me.btn_resetSearch.UseVisualStyleBackColor = False
        '
        'lblZollsatz
        '
@@ -595,7 +595,6 @@ Partial Class frmGesamtsicherheitenNEU
        Me.panOben.Controls.Add(Me.txtMRNSicherheitsbetrag)
        Me.panOben.Controls.Add(Me.txtMRNWarenwert)
        Me.panOben.Controls.Add(Me.txtMRN)
-        Me.panOben.Controls.Add(Me.FlatButton1)
        Me.panOben.Controls.Add(Me.lblZollsatz)
        Me.panOben.Controls.Add(Me.lblReferenzwert)
        Me.panOben.Controls.Add(Me.lblSaldo)
@@ -628,27 +627,54 @@ Partial Class frmGesamtsicherheitenNEU
        Me.Panel1.Controls.Add(Me.DateTimePicker1)
        Me.Panel1.Controls.Add(Me.btnSucheStarten)
        Me.Panel1.Controls.Add(Me.Label23)
-        Me.Panel1.Controls.Add(Me.MyComboBox1)
+        Me.Panel1.Controls.Add(Me.cbxWarenort)
        Me.Panel1.Controls.Add(Me.Label19)
-        Me.Panel1.Controls.Add(Me.MyComboBox2)
-        Me.Panel1.Controls.Add(Me.FlatButton2)
-        Me.Panel1.Controls.Add(Me.TextBox1)
-        Me.Panel1.Controls.Add(Me.TextBox2)
+        Me.Panel1.Controls.Add(Me.cbxFiliale)
+        Me.Panel1.Controls.Add(Me.btnNeu)
+        Me.Panel1.Controls.Add(Me.txtLKW)
+        Me.Panel1.Controls.Add(Me.txtAbfNr)
        Me.Panel1.Controls.Add(Me.Label20)
        Me.Panel1.Controls.Add(Me.Label21)
        Me.Panel1.Controls.Add(Me.Label22)
+        Me.Panel1.Controls.Add(Me.btn_resetSearch)
        Me.Panel1.Location = New System.Drawing.Point(0, 44)
        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(1316, 97)
+        Me.Panel1.Size = New System.Drawing.Size(1384, 97)
        Me.Panel1.TabIndex = 10
        Me.Panel1.Visible = False
        '
+        'txtDatBis
+        '
+        Me.txtDatBis._DateTimeOnly = False
+        Me.txtDatBis._numbersOnly = False
+        Me.txtDatBis._numbersOnlyKommastellen = ""
+        Me.txtDatBis._numbersOnlyTrennzeichen = True
+        Me.txtDatBis._Prozent = False
+        Me.txtDatBis._ShortDateNew = False
+        Me.txtDatBis._ShortDateOnly = True
+        Me.txtDatBis._TimeOnly = False
+        Me.txtDatBis._TimeOnly_Seconds = False
+        Me.txtDatBis._value = ""
+        Me.txtDatBis._Waehrung = False
+        Me.txtDatBis._WaehrungZeichen = True
+        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(53, 63)
+        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 = 36
+        '
        'btnSuche
        '
        Me.btnSuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnSuche.Location = New System.Drawing.Point(921, 5)
+        Me.btnSuche.Location = New System.Drawing.Point(414, 19)
        Me.btnSuche.Name = "btnSuche"
        Me.btnSuche.Size = New System.Drawing.Size(162, 52)
        Me.btnSuche.TabIndex = 35
@@ -870,12 +896,13 @@ Partial Class frmGesamtsicherheitenNEU
        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(1194, 60)
+        Me.btnSucheStarten.Location = New System.Drawing.Point(1262, 60)
        Me.btnSucheStarten.Name = "btnSucheStarten"
        Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20)
        Me.btnSucheStarten.TabIndex = 17
        Me.btnSucheStarten.Text = "Suche starten"
        Me.btnSucheStarten.UseVisualStyleBackColor = False
+        Me.btnSucheStarten.Visible = False
        '
        'Label23
        '
@@ -883,87 +910,87 @@ Partial Class frmGesamtsicherheitenNEU
        Me.Label23.AutoSize = True
        Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.Label23.ForeColor = System.Drawing.Color.Honeydew
-        Me.Label23.Location = New System.Drawing.Point(139, 5)
+        Me.Label23.Location = New System.Drawing.Point(207, 5)
        Me.Label23.Name = "Label23"
        Me.Label23.Size = New System.Drawing.Size(24, 15)
        Me.Label23.TabIndex = 13
        Me.Label23.Text = "Bis"
        '
-        'MyComboBox1
+        'cbxWarenort
        '
-        Me.MyComboBox1._allowedValuesFreiText = Nothing
-        Me.MyComboBox1._allowFreiText = False
-        Me.MyComboBox1._value = ""
-        Me.MyComboBox1.DropDownWidth = 300
-        Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.MyComboBox1.FormattingEnabled = True
-        Me.MyComboBox1.Location = New System.Drawing.Point(336, 13)
-        Me.MyComboBox1.MaxLength = 4
-        Me.MyComboBox1.Name = "MyComboBox1"
-        Me.MyComboBox1.Size = New System.Drawing.Size(95, 24)
-        Me.MyComboBox1.TabIndex = 9
+        Me.cbxWarenort._allowedValuesFreiText = Nothing
+        Me.cbxWarenort._allowFreiText = False
+        Me.cbxWarenort._value = ""
+        Me.cbxWarenort.DropDownWidth = 300
+        Me.cbxWarenort.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxWarenort.FormattingEnabled = True
+        Me.cbxWarenort.Location = New System.Drawing.Point(663, 29)
+        Me.cbxWarenort.MaxLength = 4
+        Me.cbxWarenort.Name = "cbxWarenort"
+        Me.cbxWarenort.Size = New System.Drawing.Size(95, 24)
+        Me.cbxWarenort.TabIndex = 9
        '
        'Label19
        '
        Me.Label19.AutoSize = True
        Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label19.Location = New System.Drawing.Point(333, 0)
+        Me.Label19.Location = New System.Drawing.Point(660, 16)
        Me.Label19.Name = "Label19"
        Me.Label19.Size = New System.Drawing.Size(63, 13)
        Me.Label19.TabIndex = 8
        Me.Label19.Text = "Warenort:"
        '
-        'MyComboBox2
+        'cbxFiliale
        '
-        Me.MyComboBox2._allowedValuesFreiText = Nothing
-        Me.MyComboBox2._allowFreiText = False
-        Me.MyComboBox2._value = ""
-        Me.MyComboBox2.DropDownWidth = 300
-        Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.MyComboBox2.FormattingEnabled = True
-        Me.MyComboBox2.Location = New System.Drawing.Point(456, 16)
-        Me.MyComboBox2.MaxLength = 4
-        Me.MyComboBox2.Name = "MyComboBox2"
-        Me.MyComboBox2.Size = New System.Drawing.Size(95, 21)
-        Me.MyComboBox2.TabIndex = 2
+        Me.cbxFiliale._allowedValuesFreiText = Nothing
+        Me.cbxFiliale._allowFreiText = False
+        Me.cbxFiliale._value = ""
+        Me.cbxFiliale.DropDownWidth = 300
+        Me.cbxFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxFiliale.FormattingEnabled = True
+        Me.cbxFiliale.Location = New System.Drawing.Point(783, 32)
+        Me.cbxFiliale.MaxLength = 4
+        Me.cbxFiliale.Name = "cbxFiliale"
+        Me.cbxFiliale.Size = New System.Drawing.Size(95, 21)
+        Me.cbxFiliale.TabIndex = 2
        '
-        'FlatButton2
+        'btnNeu
        '
-        Me.FlatButton2.allowBorder = False
-        Me.FlatButton2.BackColor = System.Drawing.Color.Gainsboro
-        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(1194, 16)
-        Me.FlatButton2.Name = "FlatButton2"
-        Me.FlatButton2.Size = New System.Drawing.Size(75, 23)
-        Me.FlatButton2.TabIndex = 7
-        Me.FlatButton2.Text = "Speichern"
-        Me.FlatButton2.UseVisualStyleBackColor = False
+        Me.btnNeu.allowBorder = False
+        Me.btnNeu.BackColor = System.Drawing.Color.Gainsboro
+        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(1156, 31)
+        Me.btnNeu.Name = "btnNeu"
+        Me.btnNeu.Size = New System.Drawing.Size(75, 23)
+        Me.btnNeu.TabIndex = 7
+        Me.btnNeu.Text = "Neu"
+        Me.btnNeu.UseVisualStyleBackColor = False
        '
-        'TextBox1
+        'txtLKW
        '
-        Me.TextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBox1.Location = New System.Drawing.Point(728, 16)
-        Me.TextBox1.Margin = New System.Windows.Forms.Padding(0)
-        Me.TextBox1.Name = "TextBox1"
-        Me.TextBox1.Size = New System.Drawing.Size(79, 24)
-        Me.TextBox1.TabIndex = 6
+        Me.txtLKW.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtLKW.Location = New System.Drawing.Point(1055, 32)
+        Me.txtLKW.Margin = New System.Windows.Forms.Padding(0)
+        Me.txtLKW.Name = "txtLKW"
+        Me.txtLKW.Size = New System.Drawing.Size(79, 24)
+        Me.txtLKW.TabIndex = 6
        '
-        'TextBox2
+        'txtAbfNr
        '
-        Me.TextBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBox2.Location = New System.Drawing.Point(571, 16)
-        Me.TextBox2.Margin = New System.Windows.Forms.Padding(0)
-        Me.TextBox2.Name = "TextBox2"
-        Me.TextBox2.Size = New System.Drawing.Size(122, 24)
-        Me.TextBox2.TabIndex = 4
+        Me.txtAbfNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtAbfNr.Location = New System.Drawing.Point(898, 32)
+        Me.txtAbfNr.Margin = New System.Windows.Forms.Padding(0)
+        Me.txtAbfNr.Name = "txtAbfNr"
+        Me.txtAbfNr.Size = New System.Drawing.Size(122, 24)
+        Me.txtAbfNr.TabIndex = 4
        '
        'Label20
        '
        Me.Label20.AutoSize = True
        Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label20.Location = New System.Drawing.Point(725, 0)
+        Me.Label20.Location = New System.Drawing.Point(1052, 16)
        Me.Label20.Name = "Label20"
        Me.Label20.Size = New System.Drawing.Size(55, 13)
        Me.Label20.TabIndex = 5
@@ -973,7 +1000,7 @@ 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(568, 0)
+        Me.Label21.Location = New System.Drawing.Point(895, 16)
        Me.Label21.Name = "Label21"
        Me.Label21.Size = New System.Drawing.Size(125, 13)
        Me.Label21.TabIndex = 3
@@ -983,7 +1010,7 @@ Partial Class frmGesamtsicherheitenNEU
        '
        Me.Label22.AutoSize = True
        Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label22.Location = New System.Drawing.Point(453, 0)
+        Me.Label22.Location = New System.Drawing.Point(780, 16)
        Me.Label22.Name = "Label22"
        Me.Label22.Size = New System.Drawing.Size(44, 13)
        Me.Label22.TabIndex = 1
@@ -998,7 +1025,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.btnDeleteClose.FlatAppearance.BorderSize = 0
        Me.btnDeleteClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnDeleteClose.ForeColor = System.Drawing.Color.Black
-        Me.btnDeleteClose.Location = New System.Drawing.Point(1348, 74)
+        Me.btnDeleteClose.Location = New System.Drawing.Point(1348, 195)
        Me.btnDeleteClose.Name = "btnDeleteClose"
        Me.btnDeleteClose.Size = New System.Drawing.Size(24, 24)
        Me.btnDeleteClose.TabIndex = 7
@@ -1030,7 +1057,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.btnUpdateClose.FlatAppearance.BorderSize = 0
        Me.btnUpdateClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnUpdateClose.ForeColor = System.Drawing.Color.Black
-        Me.btnUpdateClose.Location = New System.Drawing.Point(1348, 136)
+        Me.btnUpdateClose.Location = New System.Drawing.Point(1348, 257)
        Me.btnUpdateClose.Name = "btnUpdateClose"
        Me.btnUpdateClose.Size = New System.Drawing.Size(24, 24)
        Me.btnUpdateClose.TabIndex = 37
@@ -1253,32 +1280,6 @@ Partial Class frmGesamtsicherheitenNEU
        Me.txtFreitextOpen.Size = New System.Drawing.Size(256, 24)
        Me.txtFreitextOpen.TabIndex = 40
        '
-        'txtDatBis
-        '
-        Me.txtDatBis._DateTimeOnly = False
-        Me.txtDatBis._numbersOnly = False
-        Me.txtDatBis._numbersOnlyKommastellen = ""
-        Me.txtDatBis._numbersOnlyTrennzeichen = True
-        Me.txtDatBis._Prozent = False
-        Me.txtDatBis._ShortDateNew = False
-        Me.txtDatBis._ShortDateOnly = True
-        Me.txtDatBis._TimeOnly = False
-        Me.txtDatBis._TimeOnly_Seconds = False
-        Me.txtDatBis._value = ""
-        Me.txtDatBis._Waehrung = False
-        Me.txtDatBis._WaehrungZeichen = True
-        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(53, 63)
-        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 = 36
-        '
        'frmGesamtsicherheitenNEU
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1297,7 +1298,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.Panel2.ResumeLayout(False)
        Me.panOverlay.ResumeLayout(False)
        Me.panOverlay.PerformLayout()
-        CType(Me.dgvGesamtsicherheitCRN, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dgvGesamtsicherheitPositionen, System.ComponentModel.ISupportInitialize).EndInit()
        Me.panOben.ResumeLayout(False)
        Me.panOben.PerformLayout()
        Me.Panel1.ResumeLayout(False)
@@ -1308,7 +1309,7 @@ Partial Class frmGesamtsicherheitenNEU

    Friend WithEvents dgvGesamtsicherheitMRN As VERAG_PROG_ALLGEMEIN.MyDatagridview
    Friend WithEvents Panel2 As Panel
-    Friend WithEvents dgvGesamtsicherheitCRN As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents dgvGesamtsicherheitPositionen As VERAG_PROG_ALLGEMEIN.MyDatagridview
    Friend WithEvents btnAddClose As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents btnAddOpen As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents lblGestellungNr As Label
@@ -1323,7 +1324,7 @@ Partial Class frmGesamtsicherheitenNEU
    Friend WithEvents txtMRNSicherheitsbetrag As TextBox
    Friend WithEvents txtMRNWarenwert As TextBox
    Friend WithEvents txtMRN As TextBox
-    Friend WithEvents FlatButton1 As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents btn_resetSearch As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents lblZollsatz As Label
    Friend WithEvents lblReferenzwert As Label
    Friend WithEvents lblSaldo As Label
@@ -1366,12 +1367,12 @@ Partial Class frmGesamtsicherheitenNEU
    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
    Friend WithEvents ClosedErzeugenToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents Panel1 As Panel
-    Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxWarenort As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Label19 As Label
-    Friend WithEvents MyComboBox2 As VERAG_PROG_ALLGEMEIN.MyComboBox
-    Friend WithEvents FlatButton2 As VERAG_PROG_ALLGEMEIN.FlatButton
-    Friend WithEvents TextBox1 As TextBox
-    Friend WithEvents TextBox2 As TextBox
+    Friend WithEvents cbxFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents btnNeu As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents txtLKW As TextBox
+    Friend WithEvents txtAbfNr As TextBox
    Friend WithEvents Label20 As Label
    Friend WithEvents Label21 As Label
    Friend WithEvents Label22 As Label