bugfixing_gesamtsicherheiten

2022-10-28 16:10:58 +02:00
parent e70c75aecc
commit 0b6e9800e2
2 changed files with 171 additions and 167 deletions
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
@@ -34,6 +34,8 @@ Partial Class frmGesamtsicherheitenNEU
        Me.ClosedErzeugenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.Panel2 = New System.Windows.Forms.Panel()
        Me.pnlSummeGesPos = New System.Windows.Forms.Panel()
+        Me.txtPosSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtPosWarenwertGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtPosAnzalPosGes = New System.Windows.Forms.TextBox()
        Me.Label29 = New System.Windows.Forms.Label()
        Me.Label28 = New System.Windows.Forms.Label()
@@ -51,6 +53,8 @@ Partial Class frmGesamtsicherheitenNEU
        Me.btnClosePanOverlay = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.pnlSummeGes = New System.Windows.Forms.Panel()
+        Me.txtSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtWarenwertGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtAnzalPosGes = New System.Windows.Forms.TextBox()
        Me.Label27 = New System.Windows.Forms.Label()
        Me.Label24 = New System.Windows.Forms.Label()
@@ -114,10 +118,6 @@ 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.txtWarenwertGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txtSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txtPosWarenwertGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txtPosSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        CType(Me.dgvGesamtsicherheit, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ContextMenuStrip1.SuspendLayout()
        Me.Panel2.SuspendLayout()
@@ -165,7 +165,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(689, 486)
+        Me.dgvGesamtsicherheit.Size = New System.Drawing.Size(742, 486)
        Me.dgvGesamtsicherheit.TabIndex = 0
        '
        'ContextMenuStrip1
@@ -202,11 +202,59 @@ Partial Class frmGesamtsicherheitenNEU
        Me.pnlSummeGesPos.Controls.Add(Me.Label29)
        Me.pnlSummeGesPos.Controls.Add(Me.Label28)
        Me.pnlSummeGesPos.Controls.Add(Me.Label22)
-        Me.pnlSummeGesPos.Location = New System.Drawing.Point(692, 451)
+        Me.pnlSummeGesPos.Location = New System.Drawing.Point(748, 451)
        Me.pnlSummeGesPos.Name = "pnlSummeGesPos"
-        Me.pnlSummeGesPos.Size = New System.Drawing.Size(692, 35)
+        Me.pnlSummeGesPos.Size = New System.Drawing.Size(636, 35)
        Me.pnlSummeGesPos.TabIndex = 4
        '
+        'txtPosSicherheitsbGes
+        '
+        Me.txtPosSicherheitsbGes._DateTimeOnly = False
+        Me.txtPosSicherheitsbGes._numbersOnly = False
+        Me.txtPosSicherheitsbGes._numbersOnlyKommastellen = ""
+        Me.txtPosSicherheitsbGes._numbersOnlyTrennzeichen = False
+        Me.txtPosSicherheitsbGes._Prozent = False
+        Me.txtPosSicherheitsbGes._ShortDateNew = False
+        Me.txtPosSicherheitsbGes._ShortDateOnly = False
+        Me.txtPosSicherheitsbGes._TimeOnly = False
+        Me.txtPosSicherheitsbGes._TimeOnly_Seconds = False
+        Me.txtPosSicherheitsbGes._value = ""
+        Me.txtPosSicherheitsbGes._Waehrung = True
+        Me.txtPosSicherheitsbGes._WaehrungZeichen = True
+        Me.txtPosSicherheitsbGes.ForeColor = System.Drawing.Color.Black
+        Me.txtPosSicherheitsbGes.Location = New System.Drawing.Point(533, 10)
+        Me.txtPosSicherheitsbGes.MaxLineLength = -1
+        Me.txtPosSicherheitsbGes.MaxLines_Warning = ""
+        Me.txtPosSicherheitsbGes.MaxLines_Warning_Label = Nothing
+        Me.txtPosSicherheitsbGes.Name = "txtPosSicherheitsbGes"
+        Me.txtPosSicherheitsbGes.ReadOnly = True
+        Me.txtPosSicherheitsbGes.Size = New System.Drawing.Size(100, 20)
+        Me.txtPosSicherheitsbGes.TabIndex = 5
+        '
+        'txtPosWarenwertGes
+        '
+        Me.txtPosWarenwertGes._DateTimeOnly = False
+        Me.txtPosWarenwertGes._numbersOnly = False
+        Me.txtPosWarenwertGes._numbersOnlyKommastellen = ""
+        Me.txtPosWarenwertGes._numbersOnlyTrennzeichen = False
+        Me.txtPosWarenwertGes._Prozent = False
+        Me.txtPosWarenwertGes._ShortDateNew = False
+        Me.txtPosWarenwertGes._ShortDateOnly = False
+        Me.txtPosWarenwertGes._TimeOnly = False
+        Me.txtPosWarenwertGes._TimeOnly_Seconds = False
+        Me.txtPosWarenwertGes._value = ""
+        Me.txtPosWarenwertGes._Waehrung = True
+        Me.txtPosWarenwertGes._WaehrungZeichen = True
+        Me.txtPosWarenwertGes.ForeColor = System.Drawing.Color.Black
+        Me.txtPosWarenwertGes.Location = New System.Drawing.Point(261, 10)
+        Me.txtPosWarenwertGes.MaxLineLength = -1
+        Me.txtPosWarenwertGes.MaxLines_Warning = ""
+        Me.txtPosWarenwertGes.MaxLines_Warning_Label = Nothing
+        Me.txtPosWarenwertGes.Name = "txtPosWarenwertGes"
+        Me.txtPosWarenwertGes.ReadOnly = True
+        Me.txtPosWarenwertGes.Size = New System.Drawing.Size(100, 20)
+        Me.txtPosWarenwertGes.TabIndex = 3
+        '
        'txtPosAnzalPosGes
        '
        Me.txtPosAnzalPosGes.Location = New System.Drawing.Point(84, 10)
@@ -218,30 +266,30 @@ Partial Class frmGesamtsicherheitenNEU
        'Label29
        '
        Me.Label29.AutoSize = True
-        Me.Label29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label29.Location = New System.Drawing.Point(180, 13)
+        Me.Label29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label29.Location = New System.Drawing.Point(155, 13)
        Me.Label29.Name = "Label29"
-        Me.Label29.Size = New System.Drawing.Size(120, 13)
+        Me.Label29.Size = New System.Drawing.Size(103, 13)
        Me.Label29.TabIndex = 2
        Me.Label29.Text = "Warentwert Summe:"
        '
        'Label28
        '
        Me.Label28.AutoSize = True
-        Me.Label28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label28.Location = New System.Drawing.Point(426, 13)
+        Me.Label28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label28.Location = New System.Drawing.Point(397, 13)
        Me.Label28.Name = "Label28"
-        Me.Label28.Size = New System.Drawing.Size(154, 13)
+        Me.Label28.Size = New System.Drawing.Size(130, 13)
        Me.Label28.TabIndex = 4
        Me.Label28.Text = "Sicherheitsbetrag Summe:"
        '
        'Label22
        '
        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.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label22.Location = New System.Drawing.Point(3, 13)
        Me.Label22.Name = "Label22"
-        Me.Label22.Size = New System.Drawing.Size(74, 13)
+        Me.Label22.Size = New System.Drawing.Size(63, 13)
        Me.Label22.TabIndex = 0
        Me.Label22.Text = "Anzahl Pos:"
        '
@@ -403,11 +451,11 @@ Partial Class frmGesamtsicherheitenNEU
        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
        Me.dgvSicherheitsPos.DefaultCellStyle = DataGridViewCellStyle5
        Me.dgvSicherheitsPos.Dock = System.Windows.Forms.DockStyle.Right
-        Me.dgvSicherheitsPos.Location = New System.Drawing.Point(695, 0)
+        Me.dgvSicherheitsPos.Location = New System.Drawing.Point(748, 0)
        Me.dgvSicherheitsPos.Name = "dgvSicherheitsPos"
        Me.dgvSicherheitsPos.ReadOnly = True
        Me.dgvSicherheitsPos.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvSicherheitsPos.Size = New System.Drawing.Size(689, 486)
+        Me.dgvSicherheitsPos.Size = New System.Drawing.Size(636, 486)
        Me.dgvSicherheitsPos.TabIndex = 1
        '
        'pnlSummeGes
@@ -421,9 +469,57 @@ Partial Class frmGesamtsicherheitenNEU
        Me.pnlSummeGes.Controls.Add(Me.Label25)
        Me.pnlSummeGes.Location = New System.Drawing.Point(0, 451)
        Me.pnlSummeGes.Name = "pnlSummeGes"
-        Me.pnlSummeGes.Size = New System.Drawing.Size(692, 35)
+        Me.pnlSummeGes.Size = New System.Drawing.Size(742, 35)
        Me.pnlSummeGes.TabIndex = 3
        '
+        'txtSicherheitsbGes
+        '
+        Me.txtSicherheitsbGes._DateTimeOnly = False
+        Me.txtSicherheitsbGes._numbersOnly = False
+        Me.txtSicherheitsbGes._numbersOnlyKommastellen = ""
+        Me.txtSicherheitsbGes._numbersOnlyTrennzeichen = False
+        Me.txtSicherheitsbGes._Prozent = False
+        Me.txtSicherheitsbGes._ShortDateNew = False
+        Me.txtSicherheitsbGes._ShortDateOnly = False
+        Me.txtSicherheitsbGes._TimeOnly = False
+        Me.txtSicherheitsbGes._TimeOnly_Seconds = False
+        Me.txtSicherheitsbGes._value = ""
+        Me.txtSicherheitsbGes._Waehrung = True
+        Me.txtSicherheitsbGes._WaehrungZeichen = True
+        Me.txtSicherheitsbGes.ForeColor = System.Drawing.Color.Black
+        Me.txtSicherheitsbGes.Location = New System.Drawing.Point(638, 10)
+        Me.txtSicherheitsbGes.MaxLineLength = -1
+        Me.txtSicherheitsbGes.MaxLines_Warning = ""
+        Me.txtSicherheitsbGes.MaxLines_Warning_Label = Nothing
+        Me.txtSicherheitsbGes.Name = "txtSicherheitsbGes"
+        Me.txtSicherheitsbGes.ReadOnly = True
+        Me.txtSicherheitsbGes.Size = New System.Drawing.Size(100, 20)
+        Me.txtSicherheitsbGes.TabIndex = 5
+        '
+        'txtWarenwertGes
+        '
+        Me.txtWarenwertGes._DateTimeOnly = False
+        Me.txtWarenwertGes._numbersOnly = False
+        Me.txtWarenwertGes._numbersOnlyKommastellen = ""
+        Me.txtWarenwertGes._numbersOnlyTrennzeichen = False
+        Me.txtWarenwertGes._Prozent = False
+        Me.txtWarenwertGes._ShortDateNew = False
+        Me.txtWarenwertGes._ShortDateOnly = False
+        Me.txtWarenwertGes._TimeOnly = False
+        Me.txtWarenwertGes._TimeOnly_Seconds = False
+        Me.txtWarenwertGes._value = ""
+        Me.txtWarenwertGes._Waehrung = True
+        Me.txtWarenwertGes._WaehrungZeichen = True
+        Me.txtWarenwertGes.ForeColor = System.Drawing.Color.Black
+        Me.txtWarenwertGes.Location = New System.Drawing.Point(315, 10)
+        Me.txtWarenwertGes.MaxLineLength = -1
+        Me.txtWarenwertGes.MaxLines_Warning = ""
+        Me.txtWarenwertGes.MaxLines_Warning_Label = Nothing
+        Me.txtWarenwertGes.Name = "txtWarenwertGes"
+        Me.txtWarenwertGes.ReadOnly = True
+        Me.txtWarenwertGes.Size = New System.Drawing.Size(100, 20)
+        Me.txtWarenwertGes.TabIndex = 3
+        '
        'txtAnzalPosGes
        '
        Me.txtAnzalPosGes.Location = New System.Drawing.Point(89, 10)
@@ -435,30 +531,30 @@ Partial Class frmGesamtsicherheitenNEU
        'Label27
        '
        Me.Label27.AutoSize = True
-        Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label27.Location = New System.Drawing.Point(406, 13)
+        Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label27.Location = New System.Drawing.Point(479, 13)
        Me.Label27.Name = "Label27"
-        Me.Label27.Size = New System.Drawing.Size(154, 13)
+        Me.Label27.Size = New System.Drawing.Size(130, 13)
        Me.Label27.TabIndex = 4
        Me.Label27.Text = "Sicherheitsbetrag Summe:"
        '
        'Label24
        '
        Me.Label24.AutoSize = True
-        Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label24.Location = New System.Drawing.Point(9, 13)
        Me.Label24.Name = "Label24"
-        Me.Label24.Size = New System.Drawing.Size(74, 13)
+        Me.Label24.Size = New System.Drawing.Size(63, 13)
        Me.Label24.TabIndex = 0
        Me.Label24.Text = "Anzahl Pos:"
        '
        'Label25
        '
        Me.Label25.AutoSize = True
-        Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label25.Location = New System.Drawing.Point(156, 13)
+        Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label25.Location = New System.Drawing.Point(194, 13)
        Me.Label25.Name = "Label25"
-        Me.Label25.Size = New System.Drawing.Size(120, 13)
+        Me.Label25.Size = New System.Drawing.Size(103, 13)
        Me.Label25.TabIndex = 2
        Me.Label25.Text = "Warentwert Summe:"
        '
@@ -486,7 +582,7 @@ 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(654, 205)
+        Me.btnAddSicherheit.Location = New System.Drawing.Point(663, 205)
        Me.btnAddSicherheit.Name = "btnAddSicherheit"
        Me.btnAddSicherheit.Size = New System.Drawing.Size(24, 24)
        Me.btnAddSicherheit.TabIndex = 36
@@ -507,7 +603,7 @@ 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(1006, 204)
+        Me.txtPosTime.Location = New System.Drawing.Point(1060, 204)
        Me.txtPosTime.Margin = New System.Windows.Forms.Padding(0)
        Me.txtPosTime.Name = "txtPosTime"
        Me.txtPosTime.Size = New System.Drawing.Size(55, 24)
@@ -518,7 +614,7 @@ Partial Class frmGesamtsicherheitenNEU
        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(921, 204)
+        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)
@@ -548,7 +644,7 @@ Partial Class frmGesamtsicherheitenNEU
        '
        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(1172, 204)
+        Me.txtPosSicherheitsbetrag.Location = New System.Drawing.Point(1226, 204)
        Me.txtPosSicherheitsbetrag.Margin = New System.Windows.Forms.Padding(0)
        Me.txtPosSicherheitsbetrag.Name = "txtPosSicherheitsbetrag"
        Me.txtPosSicherheitsbetrag.Size = New System.Drawing.Size(100, 24)
@@ -557,7 +653,7 @@ Partial Class frmGesamtsicherheitenNEU
        '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(1072, 204)
+        Me.txtPosWarenwert.Location = New System.Drawing.Point(1126, 204)
        Me.txtPosWarenwert.Margin = New System.Windows.Forms.Padding(0)
        Me.txtPosWarenwert.Name = "txtPosWarenwert"
        Me.txtPosWarenwert.Size = New System.Drawing.Size(100, 24)
@@ -566,7 +662,7 @@ 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(708, 204)
+        Me.txtPositionenCRN.Location = New System.Drawing.Point(762, 204)
        Me.txtPositionenCRN.Margin = New System.Windows.Forms.Padding(0)
        Me.txtPositionenCRN.Name = "txtPositionenCRN"
        Me.txtPositionenCRN.Size = New System.Drawing.Size(205, 24)
@@ -620,7 +716,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(724, 139)
+        Me.lblZollsatz.Location = New System.Drawing.Point(769, 139)
        Me.lblZollsatz.Name = "lblZollsatz"
        Me.lblZollsatz.Size = New System.Drawing.Size(85, 16)
        Me.lblZollsatz.TabIndex = 7
@@ -632,7 +728,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(724, 123)
+        Me.lblReferenzwert.Location = New System.Drawing.Point(769, 123)
        Me.lblReferenzwert.Name = "lblReferenzwert"
        Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16)
        Me.lblReferenzwert.TabIndex = 6
@@ -752,7 +848,7 @@ Partial Class frmGesamtsicherheitenNEU
        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.Location = New System.Drawing.Point(908, 156)
        Me.txtZollsatzueberschreiben.MaxLineLength = -1
        Me.txtZollsatzueberschreiben.MaxLines_Warning = ""
        Me.txtZollsatzueberschreiben.MaxLines_Warning_Label = Nothing
@@ -764,7 +860,7 @@ Partial Class frmGesamtsicherheitenNEU
        '
        Me.cbxZollsatzueberschreiben.AutoSize = True
        Me.cbxZollsatzueberschreiben.ForeColor = System.Drawing.Color.White
-        Me.cbxZollsatzueberschreiben.Location = New System.Drawing.Point(725, 158)
+        Me.cbxZollsatzueberschreiben.Location = New System.Drawing.Point(770, 158)
        Me.cbxZollsatzueberschreiben.Name = "cbxZollsatzueberschreiben"
        Me.cbxZollsatzueberschreiben.Size = New System.Drawing.Size(132, 17)
        Me.cbxZollsatzueberschreiben.TabIndex = 9
@@ -813,7 +909,7 @@ Partial Class frmGesamtsicherheitenNEU
        '
        Me.Label20.AutoSize = True
        Me.Label20.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label20.Location = New System.Drawing.Point(918, 237)
+        Me.Label20.Location = New System.Drawing.Point(972, 237)
        Me.Label20.Name = "Label20"
        Me.Label20.Size = New System.Drawing.Size(25, 13)
        Me.Label20.TabIndex = 42
@@ -823,7 +919,7 @@ Partial Class frmGesamtsicherheitenNEU
        '
        Me.txtPosNr.Enabled = False
        Me.txtPosNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosNr.Location = New System.Drawing.Point(921, 250)
+        Me.txtPosNr.Location = New System.Drawing.Point(975, 250)
        Me.txtPosNr.Margin = New System.Windows.Forms.Padding(0)
        Me.txtPosNr.Name = "txtPosNr"
        Me.txtPosNr.Size = New System.Drawing.Size(37, 24)
@@ -947,7 +1043,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(654, 175)
+        Me.btnDeleteSicherheit.Location = New System.Drawing.Point(663, 175)
        Me.btnDeleteSicherheit.Name = "btnDeleteSicherheit"
        Me.btnDeleteSicherheit.Size = New System.Drawing.Size(24, 24)
        Me.btnDeleteSicherheit.TabIndex = 12
@@ -979,7 +1075,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(654, 237)
+        Me.btnUpdateSicherheit.Location = New System.Drawing.Point(663, 237)
        Me.btnUpdateSicherheit.Name = "btnUpdateSicherheit"
        Me.btnUpdateSicherheit.Size = New System.Drawing.Size(24, 24)
        Me.btnUpdateSicherheit.TabIndex = 41
@@ -1052,7 +1148,7 @@ Partial Class frmGesamtsicherheitenNEU
        '
        Me.Label7.AutoSize = True
        Me.Label7.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label7.Location = New System.Drawing.Point(1014, 237)
+        Me.Label7.Location = New System.Drawing.Point(1068, 237)
        Me.Label7.Name = "Label7"
        Me.Label7.Size = New System.Drawing.Size(41, 13)
        Me.Label7.TabIndex = 43
@@ -1062,7 +1158,7 @@ Partial Class frmGesamtsicherheitenNEU
        '
        Me.Label8.AutoSize = True
        Me.Label8.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label8.Location = New System.Drawing.Point(1075, 191)
+        Me.Label8.Location = New System.Drawing.Point(1129, 191)
        Me.Label8.Name = "Label8"
        Me.Label8.Size = New System.Drawing.Size(59, 13)
        Me.Label8.TabIndex = 22
@@ -1072,7 +1168,7 @@ Partial Class frmGesamtsicherheitenNEU
        '
        Me.Label9.AutoSize = True
        Me.Label9.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label9.Location = New System.Drawing.Point(1169, 191)
+        Me.Label9.Location = New System.Drawing.Point(1223, 191)
        Me.Label9.Name = "Label9"
        Me.Label9.Size = New System.Drawing.Size(89, 13)
        Me.Label9.TabIndex = 23
@@ -1082,7 +1178,7 @@ Partial Class frmGesamtsicherheitenNEU
        '
        Me.Label10.AutoSize = True
        Me.Label10.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label10.Location = New System.Drawing.Point(1003, 191)
+        Me.Label10.Location = New System.Drawing.Point(1057, 191)
        Me.Label10.Name = "Label10"
        Me.Label10.Size = New System.Drawing.Size(40, 13)
        Me.Label10.TabIndex = 21
@@ -1092,7 +1188,7 @@ Partial Class frmGesamtsicherheitenNEU
        '
        Me.Label11.AutoSize = True
        Me.Label11.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label11.Location = New System.Drawing.Point(918, 191)
+        Me.Label11.Location = New System.Drawing.Point(972, 191)
        Me.Label11.Name = "Label11"
        Me.Label11.Size = New System.Drawing.Size(38, 13)
        Me.Label11.TabIndex = 20
@@ -1102,7 +1198,7 @@ Partial Class frmGesamtsicherheitenNEU
        '
        Me.Label12.AutoSize = True
        Me.Label12.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label12.Location = New System.Drawing.Point(765, 191)
+        Me.Label12.Location = New System.Drawing.Point(819, 191)
        Me.Label12.Name = "Label12"
        Me.Label12.Size = New System.Drawing.Size(64, 13)
        Me.Label12.TabIndex = 19
@@ -1171,7 +1267,7 @@ 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(1017, 250)
+        Me.txtPosFreitext.Location = New System.Drawing.Point(1071, 250)
        Me.txtPosFreitext.Margin = New System.Windows.Forms.Padding(0)
        Me.txtPosFreitext.Name = "txtPosFreitext"
        Me.txtPosFreitext.Size = New System.Drawing.Size(255, 24)
@@ -1186,102 +1282,6 @@ Partial Class frmGesamtsicherheitenNEU
        Me.txtSicherheitFreitext.Size = New System.Drawing.Size(256, 24)
        Me.txtSicherheitFreitext.TabIndex = 46
        '
-        'txtWarenwertGes
-        '
-        Me.txtWarenwertGes._DateTimeOnly = False
-        Me.txtWarenwertGes._numbersOnly = False
-        Me.txtWarenwertGes._numbersOnlyKommastellen = ""
-        Me.txtWarenwertGes._numbersOnlyTrennzeichen = False
-        Me.txtWarenwertGes._Prozent = False
-        Me.txtWarenwertGes._ShortDateNew = False
-        Me.txtWarenwertGes._ShortDateOnly = False
-        Me.txtWarenwertGes._TimeOnly = False
-        Me.txtWarenwertGes._TimeOnly_Seconds = False
-        Me.txtWarenwertGes._value = ""
-        Me.txtWarenwertGes._Waehrung = True
-        Me.txtWarenwertGes._WaehrungZeichen = True
-        Me.txtWarenwertGes.ForeColor = System.Drawing.Color.Black
-        Me.txtWarenwertGes.Location = New System.Drawing.Point(277, 10)
-        Me.txtWarenwertGes.MaxLineLength = -1
-        Me.txtWarenwertGes.MaxLines_Warning = ""
-        Me.txtWarenwertGes.MaxLines_Warning_Label = Nothing
-        Me.txtWarenwertGes.Name = "txtWarenwertGes"
-        Me.txtWarenwertGes.ReadOnly = True
-        Me.txtWarenwertGes.Size = New System.Drawing.Size(100, 20)
-        Me.txtWarenwertGes.TabIndex = 3
-        '
-        'txtSicherheitsbGes
-        '
-        Me.txtSicherheitsbGes._DateTimeOnly = False
-        Me.txtSicherheitsbGes._numbersOnly = False
-        Me.txtSicherheitsbGes._numbersOnlyKommastellen = ""
-        Me.txtSicherheitsbGes._numbersOnlyTrennzeichen = False
-        Me.txtSicherheitsbGes._Prozent = False
-        Me.txtSicherheitsbGes._ShortDateNew = False
-        Me.txtSicherheitsbGes._ShortDateOnly = False
-        Me.txtSicherheitsbGes._TimeOnly = False
-        Me.txtSicherheitsbGes._TimeOnly_Seconds = False
-        Me.txtSicherheitsbGes._value = ""
-        Me.txtSicherheitsbGes._Waehrung = True
-        Me.txtSicherheitsbGes._WaehrungZeichen = True
-        Me.txtSicherheitsbGes.ForeColor = System.Drawing.Color.Black
-        Me.txtSicherheitsbGes.Location = New System.Drawing.Point(565, 10)
-        Me.txtSicherheitsbGes.MaxLineLength = -1
-        Me.txtSicherheitsbGes.MaxLines_Warning = ""
-        Me.txtSicherheitsbGes.MaxLines_Warning_Label = Nothing
-        Me.txtSicherheitsbGes.Name = "txtSicherheitsbGes"
-        Me.txtSicherheitsbGes.ReadOnly = True
-        Me.txtSicherheitsbGes.Size = New System.Drawing.Size(100, 20)
-        Me.txtSicherheitsbGes.TabIndex = 5
-        '
-        'txtPosWarenwertGes
-        '
-        Me.txtPosWarenwertGes._DateTimeOnly = False
-        Me.txtPosWarenwertGes._numbersOnly = False
-        Me.txtPosWarenwertGes._numbersOnlyKommastellen = ""
-        Me.txtPosWarenwertGes._numbersOnlyTrennzeichen = False
-        Me.txtPosWarenwertGes._Prozent = False
-        Me.txtPosWarenwertGes._ShortDateNew = False
-        Me.txtPosWarenwertGes._ShortDateOnly = False
-        Me.txtPosWarenwertGes._TimeOnly = False
-        Me.txtPosWarenwertGes._TimeOnly_Seconds = False
-        Me.txtPosWarenwertGes._value = ""
-        Me.txtPosWarenwertGes._Waehrung = True
-        Me.txtPosWarenwertGes._WaehrungZeichen = True
-        Me.txtPosWarenwertGes.ForeColor = System.Drawing.Color.Black
-        Me.txtPosWarenwertGes.Location = New System.Drawing.Point(306, 10)
-        Me.txtPosWarenwertGes.MaxLineLength = -1
-        Me.txtPosWarenwertGes.MaxLines_Warning = ""
-        Me.txtPosWarenwertGes.MaxLines_Warning_Label = Nothing
-        Me.txtPosWarenwertGes.Name = "txtPosWarenwertGes"
-        Me.txtPosWarenwertGes.ReadOnly = True
-        Me.txtPosWarenwertGes.Size = New System.Drawing.Size(100, 20)
-        Me.txtPosWarenwertGes.TabIndex = 3
-        '
-        'txtPosSicherheitsbGes
-        '
-        Me.txtPosSicherheitsbGes._DateTimeOnly = False
-        Me.txtPosSicherheitsbGes._numbersOnly = False
-        Me.txtPosSicherheitsbGes._numbersOnlyKommastellen = ""
-        Me.txtPosSicherheitsbGes._numbersOnlyTrennzeichen = False
-        Me.txtPosSicherheitsbGes._Prozent = False
-        Me.txtPosSicherheitsbGes._ShortDateNew = False
-        Me.txtPosSicherheitsbGes._ShortDateOnly = False
-        Me.txtPosSicherheitsbGes._TimeOnly = False
-        Me.txtPosSicherheitsbGes._TimeOnly_Seconds = False
-        Me.txtPosSicherheitsbGes._value = ""
-        Me.txtPosSicherheitsbGes._Waehrung = True
-        Me.txtPosSicherheitsbGes._WaehrungZeichen = True
-        Me.txtPosSicherheitsbGes.ForeColor = System.Drawing.Color.Black
-        Me.txtPosSicherheitsbGes.Location = New System.Drawing.Point(589, 10)
-        Me.txtPosSicherheitsbGes.MaxLineLength = -1
-        Me.txtPosSicherheitsbGes.MaxLines_Warning = ""
-        Me.txtPosSicherheitsbGes.MaxLines_Warning_Label = Nothing
-        Me.txtPosSicherheitsbGes.Name = "txtPosSicherheitsbGes"
-        Me.txtPosSicherheitsbGes.ReadOnly = True
-        Me.txtPosSicherheitsbGes.Size = New System.Drawing.Size(100, 20)
-        Me.txtPosSicherheitsbGes.TabIndex = 5
-        '
        'frmGesamtsicherheitenNEU
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -95,7 +95,7 @@ Public Class frmGesamtsicherheitenNEU
        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 & "%'"
+            If cbx_Suche_Warenort._value <> "" Then sqlSearchSting &= "AND gs_warenort like '%" & cbx_Suche_Warenort._value & "%'"
        End If

        'Dim addtosqlstring As String = ""
@@ -118,28 +118,30 @@ Public Class frmGesamtsicherheitenNEU
                Select Case currentGesSichRef.gsr_ATR
                    Case True
                        .Columns("gs_ATBNr").HeaderText = "ATB"
+                        .Columns("gs_ATBNr").Width = 130
                        .Columns("gs_atr").HeaderText = "MRN"
                        .Columns("gs_atr").Visible = True
-                        .Columns("gs_atr").Width = 33
-                        .Columns("gs_ust").Width = 69
+                        .Columns("gs_atr").Width = 35
+                        .Columns("gs_ust").Width = 70
                        .Columns("gs_ust").HeaderText = "Ust"
                    Case Else
                        .Columns("gs_ATBNr").HeaderText = "ATB"
+                        .Columns("gs_ATBNr").Width = 150
                End Select
-                .Columns("gs_ATBNr").Width = 146
+

                .Columns("gs_posNr").Width = 35
                .Columns("gs_posNr").HeaderText = "Pos#"
                .Columns("gs_datum").Width = 95
                .Columns("gs_datum").HeaderText = "Datum"
-                .Columns("gs_warenwert").Width = 100
+                .Columns("gs_warenwert").Width = 85
                .Columns("gs_warenwert").HeaderText = "Warenwert"
                .Columns("gs_saldo").Width = 100
                .Columns("gs_saldo").HeaderText = "Saldo"
-
                .Columns("gs_sicherheitsbetrag").Width = 85
                .Columns("gs_sicherheitsbetrag").HeaderText = "S-Betrag"
                .Columns("gs_freitext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+                .Columns("gs_freitext").HeaderText = "Freitext"
            End With

        End If
@@ -176,12 +178,15 @@ Public Class frmGesamtsicherheitenNEU
        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 & "%'"
+            If cbx_Suche_Warenort._value <> "" Then sqlSearchSting &= " AND gs_warenort like '%" & cbx_Suche_Warenort._value & "%'"
            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]"
+        Dim SQLStringCRN As String =
+            "select [gsp_gspPosId],[gsp_ATCNr],[gsp_erstellungsdatum],[gsp_gsId],[gsp_gsnr],[gsp_warenwert],[gsp_sicherheitsbetrag],  [gsp_freitext]" &' ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_MRNNr], [gsp_art]
+                "From [tblGesamtsicherheitsPositionen] where [gsp_gsnr] = '" & gsNr & "'" & sqlSearchSting & " order by [gsp_gsId]"
+
        dgvSicherheitsPos.SET_SQL(SQLStringCRN, "AVISO", ,)
        dgvSicherheitsPos.LOAD()

@@ -194,23 +199,22 @@ Public Class frmGesamtsicherheitenNEU
                .Columns("gsp_gsnr").Visible = False
                .Columns("gsp_warenwert").DefaultCellStyle.Format = "c"
                .Columns("gsp_sicherheitsbetrag").DefaultCellStyle.Format = "c"
-                '.Columns("gs_saldo").DefaultCellStyle.Format = "c"
-                '.Columns("gs_saldo").Visible = False
                Select Case currentGesSichRef.gsr_ATR
                    Case True
                        .Columns("gsp_ATCNr").HeaderText = "ATC / MRN"
                    Case Else
                        .Columns("gsp_ATCNr").HeaderText = "CRN / MRN"
                End Select
-                .Columns("gsp_ATCNr").Width = 120
+                .Columns("gsp_ATCNr").Width = 140
                .Columns("gsp_erstellungsdatum").Width = 100
                .Columns("gsp_erstellungsdatum").HeaderText = "Datum"
                .Columns("gsp_warenwert").Width = 100
                .Columns("gsp_warenwert").HeaderText = "Warenwert"
                .Columns("gsp_sicherheitsbetrag").Width = 85
                .Columns("gsp_sicherheitsbetrag").HeaderText = "S-Betrag"
-                .Columns("gsp_freitext").Width = 110
+                .Columns("gsp_freitext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
                .Columns("gsp_freitext").HeaderText = "Freitext"
+
            End With

        End If
@@ -433,11 +437,7 @@ Public Class frmGesamtsicherheitenNEU
            Exit Sub
        End If

-        If (checkSicherheitsbetrag() = False) Then
-            MsgBox("Der Warenwert der Positionen übersteigt den Warenwert der Gestellung!")
-            txtPosWarenwert.Focus()
-            Exit Sub
-        End If
+        If checkSicherheitsbetrag() = False Then Exit Sub

        Try

@@ -642,7 +642,7 @@ Public Class frmGesamtsicherheitenNEU
            '.saldo = currentGesSichRef.Saldo
            .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
        End With
-        checkSicherheitsbetrag()
+        If checkSicherheitsbetrag() = False Then Exit Sub
        currentSicherheit.SAVE()
        txtAnzahlPos.Enabled = True
        btnUpdateSicherheit.Visible = False
@@ -661,7 +661,7 @@ Public Class frmGesamtsicherheitenNEU
            .gsp_ATCNr = txtPositionenCRN.Text

        End With
-        checkSicherheitsbetrag()
+        If checkSicherheitsbetrag() = False Then Exit Sub
        currentSPos.SAVE()
        btnAddPos.Visible = True
        btnUpdatePos.Visible = False
@@ -811,9 +811,14 @@ Public Class frmGesamtsicherheitenNEU

            offenerSicherheitsbetrag = calcOffenerSicherheitsbetrag()

-            If (offenerSicherheitsbetrag < 0) Then Return False
+            If (offenerSicherheitsbetrag < 0 Or offenerSicherheitsbetrag < offenerSicherheitsbetragPos) Then
+                If vbYes = MsgBox("Der Warenwert der Positionen übersteigt den Warenwert der Gestellung!" & vbCrLf & "Trotzdem speichen?", vbYesNo) Then
+                    Return True
+                Else
+                    Return False
+                End If
+            End If

-            If (offenerSicherheitsbetrag < offenerSicherheitsbetragPos) Then Return False

        Catch ex As Exception
            MsgBox(ex.Message)
@@ -829,7 +834,7 @@ Public Class frmGesamtsicherheitenNEU
        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))
+            sicherheitsbetragSumPositionen = sicherheitsbetragSumPositionen + Double.Parse(setNullToZero(txtPosSicherheitsbetrag.Text))
        End If

        Return sicherheitsbetragSumPositionen
@@ -871,7 +876,7 @@ Public Class frmGesamtsicherheitenNEU
        lbloffenerSaldo.Text = "offener S-Saldo: "
        Dim offernerSB As Double = Me.calcOffenerSicherheitsbetrag()
        If offernerSB <> 0 Then
-            lbloffenerSaldo.Text &= Math.Round(calcOffenerSicherheitsbetrag(), 2).ToString
+            lbloffenerSaldo.Text &= Math.Round(offernerSB, 2).ToString
            isOpen = True
        Else
            lbloffenerSaldo.Text &= "0"
@@ -1093,6 +1098,5 @@ Public Class frmGesamtsicherheitenNEU



-
 End Class