diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb
index f9bdaed..7132f64 100644
--- a/Aviso/My Project/AssemblyInfo.vb	
+++ b/Aviso/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.8.3.5")>
-<Assembly: AssemblyFileVersion("3.8.3.5")>
+<Assembly: AssemblyVersion("3.8.3.7")>
+<Assembly: AssemblyFileVersion("3.8.3.7")>
diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb
index db27e38..cd149e2 100644
--- a/Aviso/frmGesamtsicherheitenMenuNEU.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb
@@ -194,7 +194,8 @@ Public Class frmGesamtsicherheitenMenuNEU
                                         LoadDGV()
                                         Me.BringToFront()
                                     End Function
-        frm.Show()
+        frm.Show(Me)
+        '        frm.Parent = Me
     End Sub
 
     Private Sub lblSaldo_Click(sender As Object, e As EventArgs) Handles lblSaldo.Click
diff --git a/Aviso/frmGesamtsicherheitenNEU.Designer.vb b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
index 143a36f..e150b9e 100644
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
@@ -33,6 +33,8 @@ Partial Class frmGesamtsicherheitenNEU
         Me.ATBNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.pnlChangeATCNr = New System.Windows.Forms.Panel()
+        Me.txtWarenwertContext = New System.Windows.Forms.TextBox()
+        Me.lblWarenwertContext = New System.Windows.Forms.Label()
         Me.txtUhrzeitaendern = New System.Windows.Forms.TextBox()
         Me.txtDatumaendern = New System.Windows.Forms.TextBox()
         Me.Label26 = New System.Windows.Forms.Label()
@@ -79,9 +81,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Label25 = New System.Windows.Forms.Label()
         Me.lblGestellungNr = New System.Windows.Forms.Label()
         Me.txtPosTime = New System.Windows.Forms.TextBox()
-        Me.txtPosDate = New System.Windows.Forms.TextBox()
         Me.txtSicherheitTime = New System.Windows.Forms.TextBox()
-        Me.txtSicherheitDate = New System.Windows.Forms.TextBox()
         Me.txtPosSicherheitsbetrag = New System.Windows.Forms.TextBox()
         Me.txtPosWarenwert = New System.Windows.Forms.TextBox()
         Me.txtPositionenCRN = New System.Windows.Forms.TextBox()
@@ -92,6 +92,10 @@ 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.txtSicherheitDat = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.dtpSicherheitDat = New System.Windows.Forms.DateTimePicker()
+        Me.txtPosDat = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.dtpPosDat = New System.Windows.Forms.DateTimePicker()
         Me.lbloffenerWarenwert = New System.Windows.Forms.Label()
         Me.txtGestellInfo = New System.Windows.Forms.TextBox()
         Me.btnSaveDatetime = New VERAG_PROG_ALLGEMEIN.FlatButton()
@@ -138,8 +142,6 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtSicherheitFreitext = New System.Windows.Forms.TextBox()
         Me.btnAddPos = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.btnAddSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.txtWarenwertContext = New System.Windows.Forms.TextBox()
-        Me.lblWarenwertContext = New System.Windows.Forms.Label()
         Me.ContextMenuStripGesSicherh.SuspendLayout()
         Me.Panel2.SuspendLayout()
         Me.pnlChangeATCNr.SuspendLayout()
@@ -175,9 +177,9 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Panel2.Controls.Add(Me.dgvSicherheitsPos)
         Me.Panel2.Controls.Add(Me.pnlSummeGes)
         Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Panel2.Location = New System.Drawing.Point(0, 290)
+        Me.Panel2.Location = New System.Drawing.Point(0, 287)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(1384, 486)
+        Me.Panel2.Size = New System.Drawing.Size(1384, 489)
         Me.Panel2.TabIndex = 1
         '
         'pnlChangeATCNr
@@ -199,6 +201,25 @@ Partial Class frmGesamtsicherheitenNEU
         Me.pnlChangeATCNr.TabIndex = 13
         Me.pnlChangeATCNr.Visible = False
         '
+        'txtWarenwertContext
+        '
+        Me.txtWarenwertContext.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtWarenwertContext.Location = New System.Drawing.Point(95, 104)
+        Me.txtWarenwertContext.Margin = New System.Windows.Forms.Padding(0)
+        Me.txtWarenwertContext.Name = "txtWarenwertContext"
+        Me.txtWarenwertContext.Size = New System.Drawing.Size(180, 24)
+        Me.txtWarenwertContext.TabIndex = 12
+        '
+        'lblWarenwertContext
+        '
+        Me.lblWarenwertContext.AutoSize = True
+        Me.lblWarenwertContext.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblWarenwertContext.Location = New System.Drawing.Point(10, 104)
+        Me.lblWarenwertContext.Name = "lblWarenwertContext"
+        Me.lblWarenwertContext.Size = New System.Drawing.Size(86, 20)
+        Me.lblWarenwertContext.TabIndex = 13
+        Me.lblWarenwertContext.Text = "Warenwert"
+        '
         'txtUhrzeitaendern
         '
         Me.txtUhrzeitaendern.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -567,7 +588,7 @@ Partial Class frmGesamtsicherheitenNEU
         DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.dgvGesamtsicherheit.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
         Me.dgvGesamtsicherheit.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvGesamtsicherheit.Size = New System.Drawing.Size(742, 454)
+        Me.dgvGesamtsicherheit.Size = New System.Drawing.Size(742, 457)
         Me.dgvGesamtsicherheit.TabIndex = 0
         '
         'dgvSicherheitsPos
@@ -598,7 +619,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.dgvSicherheitsPos.Name = "dgvSicherheitsPos"
         Me.dgvSicherheitsPos.ReadOnly = True
         Me.dgvSicherheitsPos.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvSicherheitsPos.Size = New System.Drawing.Size(636, 454)
+        Me.dgvSicherheitsPos.Size = New System.Drawing.Size(636, 457)
         Me.dgvSicherheitsPos.TabIndex = 1
         '
         'ContextMenuStripPosSicherheiten
@@ -630,7 +651,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.pnlSummeGes.Controls.Add(Me.Label24)
         Me.pnlSummeGes.Controls.Add(Me.Label25)
         Me.pnlSummeGes.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnlSummeGes.Location = New System.Drawing.Point(0, 454)
+        Me.pnlSummeGes.Location = New System.Drawing.Point(0, 457)
         Me.pnlSummeGes.Name = "pnlSummeGes"
         Me.pnlSummeGes.Size = New System.Drawing.Size(1384, 32)
         Me.pnlSummeGes.TabIndex = 3
@@ -813,7 +834,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lblGestellungNr.AutoSize = True
         Me.lblGestellungNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblGestellungNr.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblGestellungNr.Location = New System.Drawing.Point(12, 9)
+        Me.lblGestellungNr.Location = New System.Drawing.Point(12, 7)
         Me.lblGestellungNr.Name = "lblGestellungNr"
         Me.lblGestellungNr.Size = New System.Drawing.Size(177, 24)
         Me.lblGestellungNr.TabIndex = 1
@@ -822,57 +843,35 @@ Partial Class frmGesamtsicherheitenNEU
         'txtPosTime
         '
         Me.txtPosTime.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosTime.Location = New System.Drawing.Point(1060, 204)
+        Me.txtPosTime.Location = New System.Drawing.Point(1078, 204)
         Me.txtPosTime.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosTime.Name = "txtPosTime"
         Me.txtPosTime.Size = New System.Drawing.Size(55, 24)
         Me.txtPosTime.TabIndex = 33
         '
-        'txtPosDate
-        '
-        Me.txtPosDate.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
-        Me.txtPosDate.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource
-        Me.txtPosDate.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosDate.Location = New System.Drawing.Point(975, 204)
-        Me.txtPosDate.Margin = New System.Windows.Forms.Padding(0)
-        Me.txtPosDate.Name = "txtPosDate"
-        Me.txtPosDate.Size = New System.Drawing.Size(85, 24)
-        Me.txtPosDate.TabIndex = 32
-        '
         'txtSicherheitTime
         '
         Me.txtSicherheitTime.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSicherheitTime.Location = New System.Drawing.Point(368, 204)
+        Me.txtSicherheitTime.Location = New System.Drawing.Point(390, 204)
         Me.txtSicherheitTime.Margin = New System.Windows.Forms.Padding(0)
         Me.txtSicherheitTime.Name = "txtSicherheitTime"
         Me.txtSicherheitTime.Size = New System.Drawing.Size(55, 24)
         Me.txtSicherheitTime.TabIndex = 28
         '
-        'txtSicherheitDate
-        '
-        Me.txtSicherheitDate.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
-        Me.txtSicherheitDate.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource
-        Me.txtSicherheitDate.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSicherheitDate.Location = New System.Drawing.Point(283, 204)
-        Me.txtSicherheitDate.Margin = New System.Windows.Forms.Padding(0)
-        Me.txtSicherheitDate.Name = "txtSicherheitDate"
-        Me.txtSicherheitDate.Size = New System.Drawing.Size(85, 24)
-        Me.txtSicherheitDate.TabIndex = 27
-        '
         'txtPosSicherheitsbetrag
         '
         Me.txtPosSicherheitsbetrag.Enabled = False
         Me.txtPosSicherheitsbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosSicherheitsbetrag.Location = New System.Drawing.Point(1226, 204)
+        Me.txtPosSicherheitsbetrag.Location = New System.Drawing.Point(1239, 204)
         Me.txtPosSicherheitsbetrag.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosSicherheitsbetrag.Name = "txtPosSicherheitsbetrag"
-        Me.txtPosSicherheitsbetrag.Size = New System.Drawing.Size(100, 24)
+        Me.txtPosSicherheitsbetrag.Size = New System.Drawing.Size(104, 24)
         Me.txtPosSicherheitsbetrag.TabIndex = 35
         '
         'txtPosWarenwert
         '
         Me.txtPosWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosWarenwert.Location = New System.Drawing.Point(1126, 204)
+        Me.txtPosWarenwert.Location = New System.Drawing.Point(1136, 204)
         Me.txtPosWarenwert.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosWarenwert.Name = "txtPosWarenwert"
         Me.txtPosWarenwert.Size = New System.Drawing.Size(100, 24)
@@ -881,17 +880,17 @@ Partial Class frmGesamtsicherheitenNEU
         'txtPositionenCRN
         '
         Me.txtPositionenCRN.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPositionenCRN.Location = New System.Drawing.Point(762, 204)
+        Me.txtPositionenCRN.Location = New System.Drawing.Point(760, 204)
         Me.txtPositionenCRN.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPositionenCRN.Name = "txtPositionenCRN"
-        Me.txtPositionenCRN.Size = New System.Drawing.Size(205, 24)
+        Me.txtPositionenCRN.Size = New System.Drawing.Size(203, 24)
         Me.txtPositionenCRN.TabIndex = 31
         '
         'txtSicherheitSicherheitsbetrag
         '
         Me.txtSicherheitSicherheitsbetrag.Enabled = False
         Me.txtSicherheitSicherheitsbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSicherheitSicherheitsbetrag.Location = New System.Drawing.Point(523, 204)
+        Me.txtSicherheitSicherheitsbetrag.Location = New System.Drawing.Point(549, 204)
         Me.txtSicherheitSicherheitsbetrag.Margin = New System.Windows.Forms.Padding(0)
         Me.txtSicherheitSicherheitsbetrag.Name = "txtSicherheitSicherheitsbetrag"
         Me.txtSicherheitSicherheitsbetrag.Size = New System.Drawing.Size(100, 24)
@@ -900,7 +899,7 @@ Partial Class frmGesamtsicherheitenNEU
         'txtSicherheitWarenwert
         '
         Me.txtSicherheitWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSicherheitWarenwert.Location = New System.Drawing.Point(423, 204)
+        Me.txtSicherheitWarenwert.Location = New System.Drawing.Point(446, 204)
         Me.txtSicherheitWarenwert.Margin = New System.Windows.Forms.Padding(0)
         Me.txtSicherheitWarenwert.Name = "txtSicherheitWarenwert"
         Me.txtSicherheitWarenwert.Size = New System.Drawing.Size(100, 24)
@@ -909,10 +908,10 @@ Partial Class frmGesamtsicherheitenNEU
         'txtSicherheitATBNr
         '
         Me.txtSicherheitATBNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSicherheitATBNr.Location = New System.Drawing.Point(34, 204)
+        Me.txtSicherheitATBNr.Location = New System.Drawing.Point(12, 204)
         Me.txtSicherheitATBNr.Margin = New System.Windows.Forms.Padding(0)
         Me.txtSicherheitATBNr.Name = "txtSicherheitATBNr"
-        Me.txtSicherheitATBNr.Size = New System.Drawing.Size(205, 24)
+        Me.txtSicherheitATBNr.Size = New System.Drawing.Size(227, 24)
         Me.txtSicherheitATBNr.TabIndex = 25
         '
         'lblZollsatz
@@ -921,7 +920,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(769, 139)
+        Me.lblZollsatz.Location = New System.Drawing.Point(769, 137)
         Me.lblZollsatz.Name = "lblZollsatz"
         Me.lblZollsatz.Size = New System.Drawing.Size(85, 16)
         Me.lblZollsatz.TabIndex = 7
@@ -933,7 +932,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(769, 123)
+        Me.lblReferenzwert.Location = New System.Drawing.Point(769, 121)
         Me.lblReferenzwert.Name = "lblReferenzwert"
         Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16)
         Me.lblReferenzwert.TabIndex = 6
@@ -945,7 +944,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lblSaldo.AutoSize = True
         Me.lblSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblSaldo.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblSaldo.Location = New System.Drawing.Point(1025, 108)
+        Me.lblSaldo.Location = New System.Drawing.Point(1025, 106)
         Me.lblSaldo.Name = "lblSaldo"
         Me.lblSaldo.Size = New System.Drawing.Size(147, 24)
         Me.lblSaldo.TabIndex = 5
@@ -954,6 +953,10 @@ 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.txtSicherheitDat)
+        Me.panOben.Controls.Add(Me.dtpSicherheitDat)
+        Me.panOben.Controls.Add(Me.txtPosDat)
+        Me.panOben.Controls.Add(Me.dtpPosDat)
         Me.panOben.Controls.Add(Me.lbloffenerWarenwert)
         Me.panOben.Controls.Add(Me.txtGestellInfo)
         Me.panOben.Controls.Add(Me.btnSaveDatetime)
@@ -994,9 +997,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.panOben.Controls.Add(Me.btnAddSicherheit)
         Me.panOben.Controls.Add(Me.lblGestellungNr)
         Me.panOben.Controls.Add(Me.txtPosTime)
-        Me.panOben.Controls.Add(Me.txtPosDate)
         Me.panOben.Controls.Add(Me.txtSicherheitTime)
-        Me.panOben.Controls.Add(Me.txtSicherheitDate)
         Me.panOben.Controls.Add(Me.txtPosSicherheitsbetrag)
         Me.panOben.Controls.Add(Me.txtPosWarenwert)
         Me.panOben.Controls.Add(Me.txtPositionenCRN)
@@ -1010,16 +1011,91 @@ Partial Class frmGesamtsicherheitenNEU
         Me.panOben.Location = New System.Drawing.Point(0, 0)
         Me.panOben.Margin = New System.Windows.Forms.Padding(0)
         Me.panOben.Name = "panOben"
-        Me.panOben.Size = New System.Drawing.Size(1384, 290)
+        Me.panOben.Size = New System.Drawing.Size(1384, 287)
         Me.panOben.TabIndex = 0
         '
+        'txtSicherheitDat
+        '
+        Me.txtSicherheitDat._DateTimeOnly = False
+        Me.txtSicherheitDat._numbersOnly = False
+        Me.txtSicherheitDat._numbersOnlyKommastellen = ""
+        Me.txtSicherheitDat._numbersOnlyTrennzeichen = True
+        Me.txtSicherheitDat._Prozent = False
+        Me.txtSicherheitDat._ShortDateNew = False
+        Me.txtSicherheitDat._ShortDateOnly = True
+        Me.txtSicherheitDat._TimeOnly = False
+        Me.txtSicherheitDat._TimeOnly_Seconds = False
+        Me.txtSicherheitDat._value = ""
+        Me.txtSicherheitDat._Waehrung = False
+        Me.txtSicherheitDat._WaehrungZeichen = True
+        Me.txtSicherheitDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtSicherheitDat.ForeColor = System.Drawing.Color.Black
+        Me.txtSicherheitDat.Location = New System.Drawing.Point(279, 204)
+        Me.txtSicherheitDat.MaxLength = 10
+        Me.txtSicherheitDat.MaxLineLength = -1
+        Me.txtSicherheitDat.MaxLines_Warning = ""
+        Me.txtSicherheitDat.MaxLines_Warning_Label = Nothing
+        Me.txtSicherheitDat.Multiline = True
+        Me.txtSicherheitDat.Name = "txtSicherheitDat"
+        Me.txtSicherheitDat.Size = New System.Drawing.Size(78, 24)
+        Me.txtSicherheitDat.TabIndex = 27
+        '
+        'dtpSicherheitDat
+        '
+        Me.dtpSicherheitDat.CustomFormat = "''"
+        Me.dtpSicherheitDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.dtpSicherheitDat.Format = System.Windows.Forms.DateTimePickerFormat.Custom
+        Me.dtpSicherheitDat.Location = New System.Drawing.Point(279, 204)
+        Me.dtpSicherheitDat.Margin = New System.Windows.Forms.Padding(0)
+        Me.dtpSicherheitDat.Name = "dtpSicherheitDat"
+        Me.dtpSicherheitDat.Size = New System.Drawing.Size(110, 24)
+        Me.dtpSicherheitDat.TabIndex = 54
+        '
+        'txtPosDat
+        '
+        Me.txtPosDat._DateTimeOnly = False
+        Me.txtPosDat._numbersOnly = False
+        Me.txtPosDat._numbersOnlyKommastellen = ""
+        Me.txtPosDat._numbersOnlyTrennzeichen = True
+        Me.txtPosDat._Prozent = False
+        Me.txtPosDat._ShortDateNew = False
+        Me.txtPosDat._ShortDateOnly = True
+        Me.txtPosDat._TimeOnly = False
+        Me.txtPosDat._TimeOnly_Seconds = False
+        Me.txtPosDat._value = ""
+        Me.txtPosDat._Waehrung = False
+        Me.txtPosDat._WaehrungZeichen = True
+        Me.txtPosDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtPosDat.ForeColor = System.Drawing.Color.Black
+        Me.txtPosDat.Location = New System.Drawing.Point(965, 204)
+        Me.txtPosDat.MaxLength = 10
+        Me.txtPosDat.MaxLineLength = -1
+        Me.txtPosDat.MaxLines_Warning = ""
+        Me.txtPosDat.MaxLines_Warning_Label = Nothing
+        Me.txtPosDat.Multiline = True
+        Me.txtPosDat.Name = "txtPosDat"
+        Me.txtPosDat.Size = New System.Drawing.Size(78, 24)
+        Me.txtPosDat.TabIndex = 32
+        '
+        'dtpPosDat
+        '
+        Me.dtpPosDat.CustomFormat = "''"
+        Me.dtpPosDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.dtpPosDat.Format = System.Windows.Forms.DateTimePickerFormat.Custom
+        Me.dtpPosDat.Location = New System.Drawing.Point(967, 204)
+        Me.dtpPosDat.Margin = New System.Windows.Forms.Padding(0)
+        Me.dtpPosDat.Name = "dtpPosDat"
+        Me.dtpPosDat.RightToLeft = System.Windows.Forms.RightToLeft.No
+        Me.dtpPosDat.Size = New System.Drawing.Size(110, 24)
+        Me.dtpPosDat.TabIndex = 52
+        '
         'lbloffenerWarenwert
         '
         Me.lbloffenerWarenwert.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.lbloffenerWarenwert.AutoSize = True
         Me.lbloffenerWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lbloffenerWarenwert.ForeColor = System.Drawing.Color.Red
-        Me.lbloffenerWarenwert.Location = New System.Drawing.Point(93, 111)
+        Me.lbloffenerWarenwert.Location = New System.Drawing.Point(93, 109)
         Me.lbloffenerWarenwert.Name = "lbloffenerWarenwert"
         Me.lbloffenerWarenwert.Size = New System.Drawing.Size(204, 24)
         Me.lbloffenerWarenwert.TabIndex = 51
@@ -1057,7 +1133,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lblId.AutoSize = True
         Me.lblId.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblId.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblId.Location = New System.Drawing.Point(1229, 9)
+        Me.lblId.Location = New System.Drawing.Point(1229, 7)
         Me.lblId.Name = "lblId"
         Me.lblId.Size = New System.Drawing.Size(29, 24)
         Me.lblId.TabIndex = 0
@@ -1117,7 +1193,7 @@ Partial Class frmGesamtsicherheitenNEU
         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(93, 139)
+        Me.lbloffenerSaldo.Location = New System.Drawing.Point(93, 137)
         Me.lbloffenerSaldo.Name = "lbloffenerSaldo"
         Me.lbloffenerSaldo.Size = New System.Drawing.Size(253, 24)
         Me.lbloffenerSaldo.TabIndex = 4
@@ -1271,7 +1347,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnDeletePos.FlatAppearance.BorderSize = 0
         Me.btnDeletePos.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnDeletePos.ForeColor = System.Drawing.Color.Black
-        Me.btnDeletePos.Location = New System.Drawing.Point(1348, 195)
+        Me.btnDeletePos.Location = New System.Drawing.Point(1357, 164)
         Me.btnDeletePos.Name = "btnDeletePos"
         Me.btnDeletePos.Size = New System.Drawing.Size(24, 24)
         Me.btnDeletePos.TabIndex = 24
@@ -1287,7 +1363,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnDeleteSicherheit.FlatAppearance.BorderSize = 0
         Me.btnDeleteSicherheit.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnDeleteSicherheit.ForeColor = System.Drawing.Color.Black
-        Me.btnDeleteSicherheit.Location = New System.Drawing.Point(663, 175)
+        Me.btnDeleteSicherheit.Location = New System.Drawing.Point(665, 165)
         Me.btnDeleteSicherheit.Name = "btnDeleteSicherheit"
         Me.btnDeleteSicherheit.Size = New System.Drawing.Size(24, 24)
         Me.btnDeleteSicherheit.TabIndex = 12
@@ -1303,7 +1379,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnUpdatePos.FlatAppearance.BorderSize = 0
         Me.btnUpdatePos.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnUpdatePos.ForeColor = System.Drawing.Color.Black
-        Me.btnUpdatePos.Location = New System.Drawing.Point(1348, 257)
+        Me.btnUpdatePos.Location = New System.Drawing.Point(1357, 245)
         Me.btnUpdatePos.Name = "btnUpdatePos"
         Me.btnUpdatePos.Size = New System.Drawing.Size(24, 24)
         Me.btnUpdatePos.TabIndex = 49
@@ -1319,7 +1395,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnUpdateSicherheit.FlatAppearance.BorderSize = 0
         Me.btnUpdateSicherheit.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnUpdateSicherheit.ForeColor = System.Drawing.Color.Black
-        Me.btnUpdateSicherheit.Location = New System.Drawing.Point(663, 237)
+        Me.btnUpdateSicherheit.Location = New System.Drawing.Point(665, 246)
         Me.btnUpdateSicherheit.Name = "btnUpdateSicherheit"
         Me.btnUpdateSicherheit.Size = New System.Drawing.Size(24, 24)
         Me.btnUpdateSicherheit.TabIndex = 41
@@ -1349,7 +1425,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label14.AutoSize = True
         Me.Label14.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label14.Location = New System.Drawing.Point(194, 237)
+        Me.Label14.Location = New System.Drawing.Point(242, 237)
         Me.Label14.Name = "Label14"
         Me.Label14.Size = New System.Drawing.Size(59, 13)
         Me.Label14.TabIndex = 39
@@ -1359,17 +1435,17 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.txtSicherheitEust.Enabled = False
         Me.txtSicherheitEust.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSicherheitEust.Location = New System.Drawing.Point(197, 250)
+        Me.txtSicherheitEust.Location = New System.Drawing.Point(242, 250)
         Me.txtSicherheitEust.Margin = New System.Windows.Forms.Padding(0)
         Me.txtSicherheitEust.Name = "txtSicherheitEust"
-        Me.txtSicherheitEust.Size = New System.Drawing.Size(100, 24)
+        Me.txtSicherheitEust.Size = New System.Drawing.Size(70, 24)
         Me.txtSicherheitEust.TabIndex = 45
         '
         'Label13
         '
         Me.Label13.AutoSize = True
         Me.Label13.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label13.Location = New System.Drawing.Point(76, 234)
+        Me.Label13.Location = New System.Drawing.Point(134, 233)
         Me.Label13.Name = "Label13"
         Me.Label13.Size = New System.Drawing.Size(73, 13)
         Me.Label13.TabIndex = 37
@@ -1381,7 +1457,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.cboSicherheitATR.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!)
         Me.cboSicherheitATR.FormattingEnabled = True
         Me.cboSicherheitATR.Items.AddRange(New Object() {"JA", "NEIN"})
-        Me.cboSicherheitATR.Location = New System.Drawing.Point(74, 250)
+        Me.cboSicherheitATR.Location = New System.Drawing.Point(119, 246)
         Me.cboSicherheitATR.Name = "cboSicherheitATR"
         Me.cboSicherheitATR.Size = New System.Drawing.Size(120, 26)
         Me.cboSicherheitATR.TabIndex = 44
@@ -1390,7 +1466,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label7.AutoSize = True
         Me.Label7.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label7.Location = New System.Drawing.Point(1068, 237)
+        Me.Label7.Location = New System.Drawing.Point(1075, 233)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(41, 13)
         Me.Label7.TabIndex = 43
@@ -1400,7 +1476,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label8.AutoSize = True
         Me.Label8.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label8.Location = New System.Drawing.Point(1129, 191)
+        Me.Label8.Location = New System.Drawing.Point(1137, 191)
         Me.Label8.Name = "Label8"
         Me.Label8.Size = New System.Drawing.Size(59, 13)
         Me.Label8.TabIndex = 22
@@ -1410,7 +1486,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label9.AutoSize = True
         Me.Label9.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label9.Location = New System.Drawing.Point(1223, 191)
+        Me.Label9.Location = New System.Drawing.Point(1240, 191)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(89, 13)
         Me.Label9.TabIndex = 23
@@ -1420,7 +1496,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label10.AutoSize = True
         Me.Label10.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label10.Location = New System.Drawing.Point(1057, 191)
+        Me.Label10.Location = New System.Drawing.Point(1076, 191)
         Me.Label10.Name = "Label10"
         Me.Label10.Size = New System.Drawing.Size(40, 13)
         Me.Label10.TabIndex = 21
@@ -1430,7 +1506,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label11.AutoSize = True
         Me.Label11.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label11.Location = New System.Drawing.Point(972, 191)
+        Me.Label11.Location = New System.Drawing.Point(967, 191)
         Me.Label11.Name = "Label11"
         Me.Label11.Size = New System.Drawing.Size(38, 13)
         Me.Label11.TabIndex = 20
@@ -1450,7 +1526,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label6.AutoSize = True
         Me.Label6.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label6.Location = New System.Drawing.Point(364, 237)
+        Me.Label6.Location = New System.Drawing.Point(385, 237)
         Me.Label6.Name = "Label6"
         Me.Label6.Size = New System.Drawing.Size(41, 13)
         Me.Label6.TabIndex = 40
@@ -1460,7 +1536,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label5.AutoSize = True
         Me.Label5.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label5.Location = New System.Drawing.Point(426, 191)
+        Me.Label5.Location = New System.Drawing.Point(447, 191)
         Me.Label5.Name = "Label5"
         Me.Label5.Size = New System.Drawing.Size(59, 13)
         Me.Label5.TabIndex = 17
@@ -1470,7 +1546,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label4.AutoSize = True
         Me.Label4.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label4.Location = New System.Drawing.Point(520, 191)
+        Me.Label4.Location = New System.Drawing.Point(541, 191)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(89, 13)
         Me.Label4.TabIndex = 18
@@ -1480,7 +1556,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label3.AutoSize = True
         Me.Label3.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label3.Location = New System.Drawing.Point(365, 191)
+        Me.Label3.Location = New System.Drawing.Point(392, 191)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(40, 13)
         Me.Label3.TabIndex = 16
@@ -1509,19 +1585,19 @@ Partial Class frmGesamtsicherheitenNEU
         'txtPosFreitext
         '
         Me.txtPosFreitext.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosFreitext.Location = New System.Drawing.Point(1071, 250)
+        Me.txtPosFreitext.Location = New System.Drawing.Point(1078, 246)
         Me.txtPosFreitext.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosFreitext.Name = "txtPosFreitext"
-        Me.txtPosFreitext.Size = New System.Drawing.Size(255, 24)
+        Me.txtPosFreitext.Size = New System.Drawing.Size(264, 24)
         Me.txtPosFreitext.TabIndex = 48
         '
         'txtSicherheitFreitext
         '
         Me.txtSicherheitFreitext.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSicherheitFreitext.Location = New System.Drawing.Point(367, 250)
+        Me.txtSicherheitFreitext.Location = New System.Drawing.Point(389, 250)
         Me.txtSicherheitFreitext.Margin = New System.Windows.Forms.Padding(0)
         Me.txtSicherheitFreitext.Name = "txtSicherheitFreitext"
-        Me.txtSicherheitFreitext.Size = New System.Drawing.Size(256, 24)
+        Me.txtSicherheitFreitext.Size = New System.Drawing.Size(260, 24)
         Me.txtSicherheitFreitext.TabIndex = 46
         '
         'btnAddPos
@@ -1533,7 +1609,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnAddPos.FlatAppearance.BorderSize = 0
         Me.btnAddPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnAddPos.ForeColor = System.Drawing.Color.Black
-        Me.btnAddPos.Location = New System.Drawing.Point(1348, 225)
+        Me.btnAddPos.Location = New System.Drawing.Point(1357, 203)
         Me.btnAddPos.Name = "btnAddPos"
         Me.btnAddPos.Size = New System.Drawing.Size(24, 24)
         Me.btnAddPos.TabIndex = 38
@@ -1548,31 +1624,12 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnAddSicherheit.FlatAppearance.BorderSize = 0
         Me.btnAddSicherheit.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnAddSicherheit.ForeColor = System.Drawing.Color.Black
-        Me.btnAddSicherheit.Location = New System.Drawing.Point(663, 205)
+        Me.btnAddSicherheit.Location = New System.Drawing.Point(665, 204)
         Me.btnAddSicherheit.Name = "btnAddSicherheit"
         Me.btnAddSicherheit.Size = New System.Drawing.Size(24, 24)
         Me.btnAddSicherheit.TabIndex = 36
         Me.btnAddSicherheit.UseVisualStyleBackColor = False
         '
-        'txtWarenwertContext
-        '
-        Me.txtWarenwertContext.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtWarenwertContext.Location = New System.Drawing.Point(95, 104)
-        Me.txtWarenwertContext.Margin = New System.Windows.Forms.Padding(0)
-        Me.txtWarenwertContext.Name = "txtWarenwertContext"
-        Me.txtWarenwertContext.Size = New System.Drawing.Size(180, 24)
-        Me.txtWarenwertContext.TabIndex = 12
-        '
-        'lblWarenwertContext
-        '
-        Me.lblWarenwertContext.AutoSize = True
-        Me.lblWarenwertContext.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblWarenwertContext.Location = New System.Drawing.Point(10, 104)
-        Me.lblWarenwertContext.Name = "lblWarenwertContext"
-        Me.lblWarenwertContext.Size = New System.Drawing.Size(86, 20)
-        Me.lblWarenwertContext.TabIndex = 13
-        Me.lblWarenwertContext.Text = "Warenwert"
-        '
         'frmGesamtsicherheitenNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1614,9 +1671,7 @@ Partial Class frmGesamtsicherheitenNEU
     Friend WithEvents btnAddSicherheit As VERAG_PROG_ALLGEMEIN.FlatButton
     Friend WithEvents lblGestellungNr As Label
     Friend WithEvents txtPosTime As TextBox
-    Friend WithEvents txtPosDate As TextBox
     Friend WithEvents txtSicherheitTime As TextBox
-    Friend WithEvents txtSicherheitDate As TextBox
     Friend WithEvents txtPosSicherheitsbetrag As TextBox
     Friend WithEvents txtPosWarenwert As TextBox
     Friend WithEvents txtPositionenCRN As TextBox
@@ -1718,4 +1773,8 @@ Partial Class frmGesamtsicherheitenNEU
     Friend WithEvents lbloffenerWarenwert As Label
     Friend WithEvents txtWarenwertContext As TextBox
     Friend WithEvents lblWarenwertContext As Label
+    Friend WithEvents txtPosDat As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents dtpPosDat As DateTimePicker
+    Friend WithEvents txtSicherheitDat As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents dtpSicherheitDat As DateTimePicker
 End Class
diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb
index 9676e88..4bef73f 100644
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -1,11 +1,4 @@
 
-Imports System.Data.SqlTypes
-Imports System.Linq.Expressions
-Imports Chilkat
-Imports DocumentFormat.OpenXml.Presentation
-Imports GrapeCity.Viewer.Common.Model
-Imports Org.BouncyCastle.Cms
-Imports Spire.PdfViewer.Forms
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmGesamtsicherheitenNEU
@@ -90,6 +83,7 @@ Public Class frmGesamtsicherheitenNEU
 
         Me.Text = "Gesamtsicherheit " & Standort
         frmHauptfenster.EnableDoubleBuffered(dgvSicherheitsPos)
+
     End Sub
 
 
@@ -398,10 +392,9 @@ Public Class frmGesamtsicherheitenNEU
         End Select
     End Sub
 
-    Private Sub Date_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosDate.KeyPress, txtSicherheitDate.KeyPress, txtDatumaendern.KeyPress
+    Private Sub Date_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosDat.KeyPress, txtSicherheitDat.KeyPress, txtDatumaendern.KeyPress
         Select Case Asc(e.KeyChar)
             Case 48 To 57, 8, 46, 58
-
                 ' Zahlen, Backspace, . und : zulassen
 
             Case Else
@@ -419,23 +412,17 @@ Public Class frmGesamtsicherheitenNEU
                 ' alle anderen Eingaben unterdrücken
                 e.Handled = True
         End Select
-
-        txtPosTime.Text = Replace(txtPosTime.Text, ".", ":")
-        txtPosTime.Select(txtPosTime.Text.Length + 1, 1)
-        txtSicherheitTime.Text = Replace(txtSicherheitTime.Text, ".", ":")
-        txtSicherheitTime.Select(txtPosTime.Text.Length + 1, 1)
-        txtUhrzeitaendern.Text = Replace(txtUhrzeitaendern.Text, ".", ":")
-        txtUhrzeitaendern.Select(txtPosTime.Text.Length + 1, 1)
-
     End Sub
 
 
-    Private Sub txtMRNDate_GotFocus(sender As Object, e As EventArgs) Handles txtSicherheitDate.GotFocus, txtPosDate.GotFocus, txtSicherheitTime.GotFocus, txtPosTime.GotFocus, txtUhrzeitaendern.GotFocus, txtDatumaendern.GotFocus
+    Private Sub txtMRNDate_GotFocus(sender As Object, e As EventArgs) Handles txtSicherheitDat.GotFocus, txtSicherheitTime.GotFocus, txtPosTime.GotFocus, txtUhrzeitaendern.GotFocus, txtDatumaendern.GotFocus
         Select Case sender.name
-            Case "txtSicherheitDate"
-                If txtSicherheitDate.Text.Length < 1 Then txtSicherheitDate.Text = Date.Today.ToString("dd.MM.yyyy")
-            Case "txtPosDate"
-                If txtPosDate.Text.Length < 1 Then txtPosDate.Text = Date.Today.ToString("dd.MM.yyyy")
+            Case "txtSicherheitDat"
+                If txtSicherheitDat.Text.Length < 1 Then txtSicherheitDat.Text = Date.Today.ToString("dd.MM.yyyy")
+            'Case "txtPosDate"
+            '    If txtPosDate.Text.Length < 1 Then txtPosDate.Text = Date.Today.ToString("dd.MM.yyyy")
+            Case "txtPosDat"
+                If txtPosDat.Text.Length < 1 Then txtPosDat.Text = Date.Today.ToString("dd.MM.yyyy")
             Case "txtSicherheitTime"
                 If txtSicherheitTime.Text.Length < 1 Then txtSicherheitTime.Text = Date.Now.ToString("HH:mm")
             Case "txtPosTime"
@@ -484,7 +471,7 @@ Public Class frmGesamtsicherheitenNEU
                     .gs_gsNr = gessicherheitID
                     .gs_ATBNr = txtSicherheitATBNr.Text
                     .gs_posNr = count
-                    .gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDate.Text, txtSicherheitTime.Text)
+                    .gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDat.Text, txtSicherheitTime.Text)
                     .gs_warenwert = warenwert
                     .gs_sicherheitsbetrag = sicherheitsbetrag
                     .gs_standort = Me.Standort
@@ -570,7 +557,7 @@ Public Class frmGesamtsicherheitenNEU
                 .gs_gsNr = gessicherheitID
                 .gs_ATBNr = ""
                 .gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
-                .gs_datum = DateTimeString2DateTimeKonvertinator(txtPosDate.Text, txtPosTime.Text)
+                .gs_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
                 .gs_warenwert = 0
                 .gs_sicherheitsbetrag = 0
                 .gs_standort = Me.Standort
@@ -598,7 +585,7 @@ Public Class frmGesamtsicherheitenNEU
                 .gsp_art = "CLOSE"
                 .gsp_gsNr = gessicherheitID
                 .gsp_abfertigungsNr = currentSicherheit.gs_abfertigungsnr
-                .gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDate.Text, txtPosTime.Text)
+                .gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
                 .gsp_erstellungsdatum = DateTime.Now
                 .gsp_ust = currentSicherheit.gs_ust
                 .gsp_ATCNr = txtPositionenCRN.Text
@@ -648,7 +635,7 @@ Public Class frmGesamtsicherheitenNEU
     Public Sub EmptyTXT()
         Dim a As New List(Of Windows.Forms.Control)
         For Each contr As Windows.Forms.Control In panOben.Controls
-            If contr.GetType.FullName = "System.Windows.Forms.TextBox" Then contr.Text = ""
+            If contr.GetType.FullName = "System.Windows.Forms.TextBox" Or contr.GetType.FullName = "VERAG_PROG_ALLGEMEIN.MyTextBox" Then contr.Text = ""
         Next
         cboSicherheitATR.SelectedItem = Nothing
     End Sub
@@ -760,7 +747,7 @@ Public Class frmGesamtsicherheitenNEU
         txtSicherheitWarenwert.Text = Sicherh.gs_warenwert
         txtSicherheitFreitext.Text = Sicherh.gs_freitext
         cboSicherheitATR.SelectedItem = Sicherh.gs_atr
-        txtSicherheitDate.Text = Sicherh.gs_datum.ToString("dd.MM.yyyy")
+        txtSicherheitDat.Text = Sicherh.gs_datum.ToString("dd.MM.yyyy")
         txtSicherheitTime.Text = Sicherh.gs_datum.ToString("HH:mm")
 
         currentSicherheit = Sicherh
@@ -782,7 +769,7 @@ Public Class frmGesamtsicherheitenNEU
         With currentSicherheit
             .gs_ATBNr = txtSicherheitATBNr.Text
             .gs_posNr = Integer.Parse(setNullToZero(txtAnzahlPos.Text))
-            .gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDate.Text, txtSicherheitTime.Text)
+            .gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDat.Text, txtSicherheitTime.Text)
             .gs_warenwert = Double.Parse(txtSicherheitWarenwert.Text)
             .gs_sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text)
             .gs_standort = Me.Standort
@@ -812,8 +799,8 @@ Public Class frmGesamtsicherheitenNEU
             .gsp_warenwert = Double.Parse(txtPosWarenwert.Text)
             .gsp_ATCNr = If(txtPositionenCRN.Text <> "", txtPositionenCRN.Text, Nothing)
 
-            If txtPosDate.Text <> "" AndAlso txtPosTime.Text <> "" Then
-                .gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDate.Text, txtPosTime.Text)
+            If txtPosDat.Text <> "" AndAlso txtPosTime.Text <> "" Then
+                .gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
             Else
                 .gsp_datum = Nothing
             End If
@@ -841,7 +828,7 @@ Public Class frmGesamtsicherheitenNEU
 
         Try
             If sPos.gsp_datum IsNot Nothing Then
-                txtPosDate.Text = CDate(sPos.gsp_datum).ToString("dd.MM.yyyy")
+                txtPosDat.Text = CDate(sPos.gsp_datum).ToString("dd.MM.yyyy")
                 txtPosTime.Text = CDate(sPos.gsp_datum).ToString("HH:mm")
             End If
 
@@ -1278,7 +1265,7 @@ Public Class frmGesamtsicherheitenNEU
 
     Private Sub btnSaveDatetime_Click(sender As Object, e As EventArgs) Handles btnSaveDatetime.Click
         Try
-            Dim a As Date = Date.ParseExact(txtSicherheitDate.Text, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo)
+            Dim a As Date = Date.ParseExact(txtSicherheitDat.Text, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo)
             Dim b As Date = Date.ParseExact(txtSicherheitTime.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
 
             Dim ab As Date = a.AddHours(b.Hour).AddMinutes(b.Minute)
@@ -1516,12 +1503,48 @@ Public Class frmGesamtsicherheitenNEU
     End Sub
 
     Private Sub btnNew_Click(sender As Object, e As EventArgs) Handles btnNew.Click
-        Me.Close()
 
-        'Dim frm As New frmGesamtsicherheitenMenuNEU
-        'frm.Standort = Me.Standort
-        'frm.btnNeu.PerformClick()
+
+        If Not System.Windows.Forms.Application.OpenForms.Item("frmGesamtsicherheitenMenuNEU") Is Nothing Then
+            Dim p = System.Windows.Forms.Application.OpenForms.Item("frmGesamtsicherheitenMenuNEU")
+            DirectCast(p, frmGesamtsicherheitenMenuNEU).btnNeu.PerformClick()
+            Me.Close()
+            Me.Cursor = Cursors.Default : Exit Sub
+        End If
+
 
     End Sub
 
+    Private Sub dtpSicherheitDat_ValueChanged(sender As Object, e As EventArgs) Handles dtpSicherheitDat.ValueChanged
+        txtSicherheitDat._value = CDate(sender.value).ToShortDateString
+    End Sub
+
+    Private Sub dtpPosDat_ValueChanged(sender As Object, e As EventArgs) Handles dtpPosDat.ValueChanged
+        txtPosDat._value = CDate(sender.value).ToShortDateString
+    End Sub
+
+    Private Sub txtPosTime_Leave(sender As Object, e As EventArgs) Handles txtPosTime.Leave, txtSicherheitTime.Leave, txtUhrzeitaendern.Leave
+
+        If txtPosTime.Text <> "" Then
+            txtPosTime.Text = Replace(txtPosTime.Text, ".", ":")
+        End If
+
+        If txtSicherheitTime.Text <> "" Then
+            txtSicherheitTime.Text = Replace(txtSicherheitTime.Text, ".", ":")
+        End If
+
+        If txtUhrzeitaendern.Text <> "" Then
+            txtUhrzeitaendern.Text = Replace(txtUhrzeitaendern.Text, ".", ":")
+        End If
+
+
+    End Sub
+
+    Private Sub txtSicherheitFreitext_TextChanged(sender As Object, e As EventArgs) Handles txtSicherheitFreitext.TextChanged
+
+    End Sub
+
+    Private Sub Label6_Click(sender As Object, e As EventArgs) Handles Label6.Click
+
+    End Sub
 End Class