merge

2022-12-06 08:49:07 +01:00
parent eb090f8b37 edd4881016
commit 4b2dca43dd
7 changed files with 1344 additions and 60 deletions
--- a/Aviso/frmEssensbestellungen.Designer.vb
+++ b/Aviso/frmEssensbestellungen.Designer.vb
@@ -26,6 +26,7 @@ Partial Class frmEssensbestellungen
        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmEssensbestellungen))
        Me.lblWochenkarte = New System.Windows.Forms.Label()
        Me.btnSave = New System.Windows.Forms.Button()
        Me.lblDatum = New System.Windows.Forms.Label()
@@ -754,7 +755,9 @@ Partial Class frmEssensbestellungen
        Me.Controls.Add(Me.dgvBestellungen)
        Me.Controls.Add(Me.lblWochenkarte)
        Me.Controls.Add(Me.cbxMenu)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.Name = "frmEssensbestellungen"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "Essensbestellung"
        Me.MyPanel1.ResumeLayout(False)
        Me.MyPanel1.PerformLayout()
--- a/Aviso/frmEssensbestellungen.resx
+++ b/Aviso/frmEssensbestellungen.resx
--- a/Aviso/frmEssensbestellungen.vb
+++ b/Aviso/frmEssensbestellungen.vb
@@ -1,5 +1,4 @@

-Imports Therefore.API
 Imports VERAG_PROG_ALLGEMEIN

 Public Class frmEssensbestellungen
@@ -7,6 +6,7 @@ Public Class frmEssensbestellungen
    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
    Dim essen As New cEssensbestellung()
    Dim dt As New DataTable
+    Dim ttMontag, ttDienstag, ttMittwoch, ttDonnerstag, ttFreitag As New ToolTip()



@@ -112,6 +112,12 @@ Public Class frmEssensbestellungen
            lblBestellungBis.Text = ""
            loadDGVBestellungen()
            btnSave.Enabled = False
+            For Each comp As System.ComponentModel.Component In Me.components.Components
+                If TypeOf comp Is ToolTip Then
+                    Dim tip = DirectCast(comp, ToolTip)
+                    tip.RemoveAll()
+                End If
+            Next
            Exit Sub
        End If

@@ -313,7 +319,7 @@ Public Class frmEssensbestellungen

        If dt.Rows(0).Item("MenuEssenMo") IsNot Nothing Then
            pbMontag.Visible = True
-            Dim ttMontag As New ToolTip()
+
            ttMontag.SetToolTip(pbMontag, dt.Rows(0).Item("MenuEssenMo").ToString)
        Else
            pbMontag.Visible = False
@@ -322,7 +328,7 @@ Public Class frmEssensbestellungen

        If dt.Rows(0).Item("MenuEssenDi") IsNot Nothing Then
            pbDienstag.Visible = True
-            Dim ttDienstag As New ToolTip()
+
            ttDienstag.SetToolTip(pbDienstag, dt.Rows(0).Item("MenuEssenDi").ToString)
        Else
            pbDienstag.Visible = False
@@ -331,7 +337,6 @@ Public Class frmEssensbestellungen

        If dt.Rows(0).Item("MenuEssenMi") IsNot Nothing Then
            pbMittwoch.Visible = True
-            Dim ttMittwoch As New ToolTip()
            ttMittwoch.SetToolTip(pbMittwoch, dt.Rows(0).Item("MenuEssenMi").ToString)
        Else
            pbMittwoch.Visible = False
@@ -339,7 +344,6 @@ Public Class frmEssensbestellungen

        If dt.Rows(0).Item("MenuEssenDo") IsNot Nothing Then
            pbDonnerstag.Visible = True
-            Dim ttDonnerstag As New ToolTip()
            ttDonnerstag.SetToolTip(pbDonnerstag, dt.Rows(0).Item("MenuEssenDo").ToString)
        Else
            pbDonnerstag.Visible = False
@@ -347,7 +351,6 @@ Public Class frmEssensbestellungen

        If dt.Rows(0).Item("MenuEssenFr") IsNot Nothing Then
            pbFreitag.Visible = True
-            Dim ttFreitag As New ToolTip()
            ttFreitag.SetToolTip(pbFreitag, dt.Rows(0).Item("MenuEssenFr").ToString)
        Else
            pbFreitag.Visible = False
--- a/Aviso/frmGesamtsicherheitenMenuNEU.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb
@@ -48,7 +48,7 @@ Public Class frmGesamtsicherheitenMenuNEU

    Public Function LoadDGV()
        Dim sqladdon As String = ""
-        If chkOffen.Checked Then sqladdon &= " AND gs_SicherheitsSaldo != '0,00 €'"
+        If chkOffen.Checked Then sqladdon &= " AND gs_SicherheitsSaldo != '0,00 €' AND gs_SicherheitsSaldo != '0,01 €' AND gs_SicherheitsSaldo != '-0,01 €'"
        If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = '" & cbxStandort._value.ToString & "'"
        If cbxWarenort._value <> "" Then sqladdon &= " AND gs_warenort = '" & cbxWarenort._value.ToString & "'"

@@ -117,7 +117,7 @@ Public Class frmGesamtsicherheitenMenuNEU

        For Each row As DataGridViewRow In dgvListe.Rows
            If Not IsDBNull(row.Cells("gs_SicherheitsSaldo").Value) Then
-                If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then
+                If row.Cells("gs_SicherheitsSaldo").Value <> 0 And row.Cells("gs_SicherheitsSaldo").Value <> 0.01 And row.Cells("gs_SicherheitsSaldo").Value <> -0.01 Then

                    dataTable.Rows.Add(row.Cells("gs_gsnr").Value, True)
                Else
@@ -136,7 +136,7 @@ Public Class frmGesamtsicherheitenMenuNEU

        For Each row As DataGridViewRow In dgvListe.Rows
            If Not IsDBNull(row.Cells("gs_SicherheitsSaldo").Value) Then
-                If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then
+                If row.Cells("gs_SicherheitsSaldo").Value <> 0 And row.Cells("gs_SicherheitsSaldo").Value <> 0.01 And row.Cells("gs_SicherheitsSaldo").Value <> -0.01 Then
                    row.DefaultCellStyle.BackColor = Color.Red
                Else
                    row.DefaultCellStyle.BackColor = Color.Green
@@ -371,7 +371,7 @@ Public Class frmGesamtsicherheitenMenuNEU
 			        ) as Sicherheitssaldo

            From [tblGesamtsicherheit] as meh group by gs_gsnr) as meh2
-            Where gs_standort = '" & Standort & "'  AND Sicherheitssaldo != '0' AND gs_datum < '" & Date.Now().AddDays(-85) & "'"
+            Where gs_standort = '" & Standort & "'  AND Sicherheitssaldo > '0.01' AND gs_datum < '" & Date.Now().AddDays(-85) & "'"

        dtNew = SQL.loadDgvBySql(sqlstring, "AVISO", 100, True)

@@ -414,4 +414,8 @@ Public Class frmGesamtsicherheitenMenuNEU

        End If
    End Sub
+
+    Private Sub chkOffen_CheckedChanged_1(sender As Object, e As EventArgs) Handles chkOffen.CheckedChanged
+        If txtDatVon._value <> "" AndAlso txtDatBis._value <> "" Then btnSucheStarten.PerformClick()
+    End Sub
 End Class
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
@@ -33,6 +33,9 @@ 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.txtUhrzeitaendern = New System.Windows.Forms.TextBox()
+        Me.txtDatumaendern = New System.Windows.Forms.TextBox()
+        Me.Label26 = New System.Windows.Forms.Label()
        Me.lblATCwarning = New System.Windows.Forms.Label()
        Me.FlatButton3 = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.txtATCaendern = New System.Windows.Forms.TextBox()
@@ -89,6 +92,7 @@ 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.txtGestellInfo = New System.Windows.Forms.TextBox()
        Me.btnSaveDatetime = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.lblId = New System.Windows.Forms.Label()
        Me.txtZollsatzueberschreiben = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -99,6 +103,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.Label20 = New System.Windows.Forms.Label()
        Me.txtPosNr = New System.Windows.Forms.TextBox()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.btnNew = New System.Windows.Forms.Button()
        Me.cbx_offene = New System.Windows.Forms.CheckBox()
        Me.btnSuche = New System.Windows.Forms.Button()
        Me.cbx_Suche_Warenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -132,6 +137,7 @@ 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.lbloffenerWarenwert = New System.Windows.Forms.Label()
        Me.ContextMenuStripGesSicherh.SuspendLayout()
        Me.Panel2.SuspendLayout()
        Me.pnlChangeATCNr.SuspendLayout()
@@ -175,6 +181,9 @@ Partial Class frmGesamtsicherheitenNEU
        'pnlChangeATCNr
        '
        Me.pnlChangeATCNr.BackColor = System.Drawing.SystemColors.ButtonHighlight
+        Me.pnlChangeATCNr.Controls.Add(Me.txtUhrzeitaendern)
+        Me.pnlChangeATCNr.Controls.Add(Me.txtDatumaendern)
+        Me.pnlChangeATCNr.Controls.Add(Me.Label26)
        Me.pnlChangeATCNr.Controls.Add(Me.lblATCwarning)
        Me.pnlChangeATCNr.Controls.Add(Me.FlatButton3)
        Me.pnlChangeATCNr.Controls.Add(Me.txtATCaendern)
@@ -182,10 +191,38 @@ Partial Class frmGesamtsicherheitenNEU
        Me.pnlChangeATCNr.Controls.Add(Me.FlatButton4)
        Me.pnlChangeATCNr.Location = New System.Drawing.Point(1051, 42)
        Me.pnlChangeATCNr.Name = "pnlChangeATCNr"
-        Me.pnlChangeATCNr.Size = New System.Drawing.Size(292, 103)
+        Me.pnlChangeATCNr.Size = New System.Drawing.Size(292, 135)
        Me.pnlChangeATCNr.TabIndex = 13
        Me.pnlChangeATCNr.Visible = False
        '
+        'txtUhrzeitaendern
+        '
+        Me.txtUhrzeitaendern.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtUhrzeitaendern.Location = New System.Drawing.Point(210, 72)
+        Me.txtUhrzeitaendern.Margin = New System.Windows.Forms.Padding(0)
+        Me.txtUhrzeitaendern.Name = "txtUhrzeitaendern"
+        Me.txtUhrzeitaendern.Size = New System.Drawing.Size(71, 24)
+        Me.txtUhrzeitaendern.TabIndex = 8
+        '
+        'txtDatumaendern
+        '
+        Me.txtDatumaendern.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtDatumaendern.Location = New System.Drawing.Point(95, 72)
+        Me.txtDatumaendern.Margin = New System.Windows.Forms.Padding(0)
+        Me.txtDatumaendern.Name = "txtDatumaendern"
+        Me.txtDatumaendern.Size = New System.Drawing.Size(112, 24)
+        Me.txtDatumaendern.TabIndex = 7
+        '
+        'Label26
+        '
+        Me.Label26.AutoSize = True
+        Me.Label26.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label26.Location = New System.Drawing.Point(10, 72)
+        Me.Label26.Name = "Label26"
+        Me.Label26.Size = New System.Drawing.Size(57, 20)
+        Me.Label26.TabIndex = 11
+        Me.Label26.Text = "Datum"
+        '
        'lblATCwarning
        '
        Me.lblATCwarning.AutoSize = True
@@ -203,7 +240,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.FlatButton3.FlatAppearance.BorderSize = 0
        Me.FlatButton3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.FlatButton3.ForeColor = System.Drawing.Color.Black
-        Me.FlatButton3.Location = New System.Drawing.Point(210, 77)
+        Me.FlatButton3.Location = New System.Drawing.Point(210, 109)
        Me.FlatButton3.Name = "FlatButton3"
        Me.FlatButton3.Size = New System.Drawing.Size(75, 23)
        Me.FlatButton3.TabIndex = 9
@@ -341,7 +378,7 @@ Partial Class frmGesamtsicherheitenNEU
        '
        'txtlkwIdSearch
        '
-        Me.txtlkwIdSearch._allowFreitext = False
+        Me.txtlkwIdSearch._allowFreitext = True
        Me.txtlkwIdSearch._AllowSetValue = False
        Me.txtlkwIdSearch._allowSpaceAsSplitter = False
        Me.txtlkwIdSearch._autoSizeGross = False
@@ -361,7 +398,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.txtlkwIdSearch.SQL_SELECT = Nothing
        Me.txtlkwIdSearch.SQL_WHERE = Nothing
        Me.txtlkwIdSearch.SQL_WhereParamList = Nothing
-        Me.txtlkwIdSearch.TabIndex = 11
+        Me.txtlkwIdSearch.TabIndex = 7
        Me.txtlkwIdSearch.usrcntl = Nothing
        '
        'Label23
@@ -772,11 +809,11 @@ 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(23, 17)
+        Me.lblGestellungNr.Location = New System.Drawing.Point(12, 9)
        Me.lblGestellungNr.Name = "lblGestellungNr"
-        Me.lblGestellungNr.Size = New System.Drawing.Size(171, 24)
+        Me.lblGestellungNr.Size = New System.Drawing.Size(177, 24)
        Me.lblGestellungNr.TabIndex = 1
-        Me.lblGestellungNr.Text = "Gesamtsicherheit"
+        Me.lblGestellungNr.Text = "Gesamtsicherheit:"
        '
        'txtPosTime
        '
@@ -913,6 +950,8 @@ 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.lbloffenerWarenwert)
+        Me.panOben.Controls.Add(Me.txtGestellInfo)
        Me.panOben.Controls.Add(Me.btnSaveDatetime)
        Me.panOben.Controls.Add(Me.lblId)
        Me.panOben.Controls.Add(Me.txtZollsatzueberschreiben)
@@ -970,6 +1009,18 @@ Partial Class frmGesamtsicherheitenNEU
        Me.panOben.Size = New System.Drawing.Size(1384, 290)
        Me.panOben.TabIndex = 0
        '
+        'txtGestellInfo
+        '
+        Me.txtGestellInfo.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.txtGestellInfo.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.txtGestellInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtGestellInfo.ForeColor = System.Drawing.Color.Honeydew
+        Me.txtGestellInfo.Location = New System.Drawing.Point(197, 9)
+        Me.txtGestellInfo.Name = "txtGestellInfo"
+        Me.txtGestellInfo.ReadOnly = True
+        Me.txtGestellInfo.Size = New System.Drawing.Size(863, 22)
+        Me.txtGestellInfo.TabIndex = 50
+        '
        'btnSaveDatetime
        '
        Me.btnSaveDatetime.allowBorder = False
@@ -1050,11 +1101,11 @@ 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(238, 108)
+        Me.lbloffenerSaldo.Location = New System.Drawing.Point(93, 139)
        Me.lbloffenerSaldo.Name = "lbloffenerSaldo"
-        Me.lbloffenerSaldo.Size = New System.Drawing.Size(190, 24)
+        Me.lbloffenerSaldo.Size = New System.Drawing.Size(253, 24)
        Me.lbloffenerSaldo.TabIndex = 4
-        Me.lbloffenerSaldo.Text = "offener S-Betrag:  €"
+        Me.lbloffenerSaldo.Text = "offener Sicherheitswert:  €"
        '
        'btnPrev
        '
@@ -1092,6 +1143,7 @@ Partial Class frmGesamtsicherheitenNEU
        'Panel1
        '
        Me.Panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight
+        Me.Panel1.Controls.Add(Me.btnNew)
        Me.Panel1.Controls.Add(Me.cbx_offene)
        Me.Panel1.Controls.Add(Me.btnSuche)
        Me.Panel1.Controls.Add(Me.cbx_Suche_Warenort)
@@ -1104,6 +1156,15 @@ Partial Class frmGesamtsicherheitenNEU
        Me.Panel1.Size = New System.Drawing.Size(1384, 61)
        Me.Panel1.TabIndex = 2
        '
+        'btnNew
+        '
+        Me.btnNew.Location = New System.Drawing.Point(1265, 13)
+        Me.btnNew.Name = "btnNew"
+        Me.btnNew.Size = New System.Drawing.Size(93, 30)
+        Me.btnNew.TabIndex = 50
+        Me.btnNew.Text = "Neu"
+        Me.btnNew.UseVisualStyleBackColor = True
+        '
        'cbx_offene
        '
        Me.cbx_offene.AutoSize = True
@@ -1477,6 +1538,18 @@ Partial Class frmGesamtsicherheitenNEU
        Me.btnAddSicherheit.TabIndex = 36
        Me.btnAddSicherheit.UseVisualStyleBackColor = False
        '
+        '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.Name = "lbloffenerWarenwert"
+        Me.lbloffenerWarenwert.Size = New System.Drawing.Size(204, 24)
+        Me.lbloffenerWarenwert.TabIndex = 51
+        Me.lbloffenerWarenwert.Text = "offener Warenwert: €"
+        '
        'frmGesamtsicherheitenNEU
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1614,4 +1687,10 @@ Partial Class frmGesamtsicherheitenNEU
    Friend WithEvents txtATCaendern As TextBox
    Friend WithEvents Label34 As Label
    Friend WithEvents FlatButton4 As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents btnNew As Button
+    Friend WithEvents txtGestellInfo As TextBox
+    Friend WithEvents txtDatumaendern As TextBox
+    Friend WithEvents Label26 As Label
+    Friend WithEvents txtUhrzeitaendern As TextBox
+    Friend WithEvents lbloffenerWarenwert As Label
 End Class
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -1,8 +1,11 @@

 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
@@ -36,6 +39,8 @@ Public Class frmGesamtsicherheitenNEU

    Dim indexGsId As Integer

+    Dim indexGsNr As Integer
+
    Dim indexGspPosId As Integer

    Dim isOpen As Boolean = False
@@ -92,7 +97,7 @@ Public Class frmGesamtsicherheitenNEU
    Public Sub LoadDGVSicherheiten(Optional withFilterParam As Boolean = False)

        'lblSaldo.Text = "Saldo:     € " & currentGesSichRef.gsr_Saldo.ToString()
-        lblGestellungNr.Text = ""
+        txtGestellInfo.Text = ""
        Dim sqladd1 As String = ""
        If currentGesSichRef.brgakto_gs_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.brgakto_gs_ust & "/100), 'C', 'de-DE') as gs_ust"
        If currentGesSichRef.brgakto_gs_ATR Then sqladd1 &= ", [gs_atr]"
@@ -167,7 +172,7 @@ Public Class frmGesamtsicherheitenNEU
        Next

        Dim SQLStringSicherheit As String = "select  [gs_ATBNr] as 'ATB Verwahrlager',[gs_gsnr] as 'GS Nr', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt',  
-                                            [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_erstellungsdatum as Date) as Datum, CONVERT(VARCHAR(5),gsp_erstellungsdatum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext
+                                            [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext
                                            from [tblGesamtsicherheit]
                                            inner join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId
                                             where [gs_gsnr] IN (" & gsnr & ")
@@ -220,9 +225,10 @@ Public Class frmGesamtsicherheitenNEU
    Private Sub dgvGesamtsicherheit_SelectionChanged(sender As Object, e As EventArgs) Handles dgvGesamtsicherheit.SelectionChanged
        If dgvGesamtsicherheit.SelectedRows.Count > 0 Then

-            indexGsId = CInt(dgvGesamtsicherheit.SelectedRows(0).Cells("gs_gsNr").Value)
-            currentSicherheit = New cSicherheiten(indexGsId)
-            LoadDGVSicherheitsPos(indexGsId, True)
+            indexGsId = CInt(dgvGesamtsicherheit.SelectedRows(0).Cells("gs_gsId").Value)
+            indexGsNr = CInt(dgvGesamtsicherheit.SelectedRows(0).Cells("gs_gsNr").Value)
+            currentSicherheit = New cSicherheiten(indexGsNr)
+            LoadDGVSicherheitsPos(indexGsNr, True)
            loadTitle()
            setSaldo()

@@ -251,7 +257,7 @@ Public Class frmGesamtsicherheitenNEU


        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]
+            "select [gsp_gspPosId],[gsp_ATCNr],[gsp_datum],[gsp_gsId],[gsp_gsnr],[gsp_warenwert],[gsp_sicherheitsbetrag],  [gsp_freitext]" &' ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_MRNNr], [gsp_art]
                "From [tblGesamtsicherheitsPositionen] where [gsp_gsnr] = '" & gsNr & "'" & sqlSearchSting & " order by [gsp_gsId]"

        dgvSicherheitsPos.SET_SQL(SQLStringCRN, "AVISO", ,)
@@ -273,8 +279,8 @@ Public Class frmGesamtsicherheitenNEU
                        .Columns("gsp_ATCNr").HeaderText = "CRN / MRN"
                End Select
                .Columns("gsp_ATCNr").Width = 140
-                .Columns("gsp_erstellungsdatum").Width = 100
-                .Columns("gsp_erstellungsdatum").HeaderText = "Datum"
+                .Columns("gsp_datum").Width = 100
+                .Columns("gsp_datum").HeaderText = "Datum"
                .Columns("gsp_warenwert").Width = 100
                .Columns("gsp_warenwert").HeaderText = "Warenwert"
                .Columns("gsp_sicherheitsbetrag").Width = 85
@@ -304,9 +310,9 @@ Public Class frmGesamtsicherheitenNEU
    Sub loadTitle()
        'Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "'"

-        lblGestellungNr.Text = ""
+        txtGestellInfo.Text = ""
        lblId.Text = ""
-        Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsId] = '" & indexGsId & "'"
+        Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & indexGsNr & "'"


        Dim dt As New DataTable
@@ -316,15 +322,15 @@ Public Class frmGesamtsicherheitenNEU
            Me.avisoID = setNullToZero(dt.Rows(0).Item("gs_avisoId"))
            Me.LKWKZ = setNullToZero(dt.Rows(0).Item("gs_LKWKZ"))
            Me.FilialNummer = setNullToZero(dt.Rows(0).Item("gs_filialenNr"))
-            Me.Abfertigungsnummer = setNullToZero(dt.Rows(0).Item("gs_abfertigungsNr"))
+            Me.Abfertigungsnummer = dt.Rows(0).Item("gs_abfertigungsNr")
            Me.warenortID = setNullToZero(dt.Rows(0).Item("gs_warenort"))
        End If

-        If Me.avisoID.ToString.Length > 0 Then lblGestellungNr.Text &= "LKW-ID: " & Me.avisoID & " "
-        If Me.LKWKZ.ToString.Length > 0 Then lblGestellungNr.Text &= "LKW-KZ: " & Me.LKWKZ & " "
-        If Me.FilialNummer.ToString.Length > 0 Then lblGestellungNr.Text &= "FilialNr: " & Me.FilialNummer & " "
-        If Me.Abfertigungsnummer.Length > 0 Then lblGestellungNr.Text &= "AbfNr: " & Me.Abfertigungsnummer & " "
-        If Me.warenortID.Length > 0 Then lblGestellungNr.Text &= "Warenort: " & Me.warenortID & " "
+        If Me.avisoID.ToString.Length > 0 Then txtGestellInfo.Text &= "LKW-ID: " & Me.avisoID & " "
+        If Me.LKWKZ.ToString.Length > 0 Then txtGestellInfo.Text &= "LKW-KZ: " & Me.LKWKZ & " "
+        If Me.FilialNummer.ToString.Length > 0 Then txtGestellInfo.Text &= "FilialNr: " & Me.FilialNummer & " "
+        If Me.Abfertigungsnummer.Length > 0 Then txtGestellInfo.Text &= "AbfNr: " & Me.Abfertigungsnummer & " "
+        If Me.warenortID.Length > 0 Then txtGestellInfo.Text &= "Warenort: " & Me.warenortID & " "
        If gessicherheitID <> 0 Then lblId.Text &= "GS-Nr: " & gessicherheitID 'currentSicherheit.gs_gsNr


@@ -392,7 +398,7 @@ Public Class frmGesamtsicherheitenNEU
        End Select
    End Sub

-    Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosDate.KeyPress, txtPosTime.KeyPress, txtSicherheitDate.KeyPress, txtSicherheitTime.KeyPress
+    Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosDate.KeyPress, txtPosTime.KeyPress, txtSicherheitDate.KeyPress, txtSicherheitTime.KeyPress, txtDatumaendern.KeyPress, txtUhrzeitaendern.KeyPress
        Select Case Asc(e.KeyChar)
            Case 48 To 57, 8, 46, 58

@@ -405,7 +411,7 @@ Public Class frmGesamtsicherheitenNEU
    End Sub


-    Private Sub txtMRNDate_GotFocus(sender As Object, e As EventArgs) Handles txtSicherheitDate.GotFocus, txtPosDate.GotFocus, txtSicherheitTime.GotFocus, txtPosTime.GotFocus
+    Private Sub txtMRNDate_GotFocus(sender As Object, e As EventArgs) Handles txtSicherheitDate.GotFocus, txtPosDate.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")
@@ -415,6 +421,10 @@ Public Class frmGesamtsicherheitenNEU
                If txtSicherheitTime.Text.Length < 1 Then txtSicherheitTime.Text = Date.Now.ToString("HH:mm")
            Case "txtPosTime"
                If txtPosTime.Text.Length < 1 Then txtPosTime.Text = Date.Now.ToString("HH:mm")
+            Case "txtDatumaendern"
+                If txtDatumaendern.Text.Length < 1 Then txtDatumaendern.Text = Date.Today.ToString("dd.MM.yyyy")
+            Case "txtUhrzeitaendern"
+                If txtUhrzeitaendern.Text.Length < 1 Then txtUhrzeitaendern.Text = Date.Now.ToString("HH:mm")
        End Select
    End Sub

@@ -460,7 +470,7 @@ Public Class frmGesamtsicherheitenNEU
                    .gs_sicherheitsbetrag = sicherheitsbetrag
                    .gs_standort = Me.Standort
                    .gs_art = "OPEN"
-                    .gs_erstellungsdatum = Me.datum
+                    .gs_erstellungsdatum = DateTime.Now
                    .gs_freitext = Me.txtSicherheitFreitext.Text
                    .gs_saldo = currentGesSichRef.brgakto_gs_aktSaldo
                    .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
@@ -505,10 +515,9 @@ Public Class frmGesamtsicherheitenNEU
                    .gsp_filialenNr = OPEN.gs_filialenNr
                    .gsp_art = "OPEN"
                    .gsp_abfertigungsNr = OPEN.gs_abfertigungsnr
-                    .gsp_erstellungsdatum = DateTimeString2DateTimeKonvertinator(txtSicherheitDate.Text, txtSicherheitTime.Text)
+                    .gsp_erstellungsdatum = DateTime.Now
                    .gsp_ust = ""
                    .gsp_avisoId = Me.avisoID
-                    '.gsp_ATCNr = ""
                    .gsp_gsNr = OPEN.gs_gsNr
                End With

@@ -547,7 +556,7 @@ Public Class frmGesamtsicherheitenNEU
                .gs_sicherheitsbetrag = 0
                .gs_standort = Me.Standort
                .gs_art = "OPEN"
-                .gs_erstellungsdatum = Me.datum
+                .gs_erstellungsdatum = DateTime.Now
                .gs_freitext = Me.txtSicherheitFreitext.Text
                .gs_saldo = currentGesSichRef.brgakto_gs_aktSaldo
                .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
@@ -570,7 +579,8 @@ Public Class frmGesamtsicherheitenNEU
                .gsp_art = "CLOSE"
                .gsp_gsNr = gessicherheitID
                .gsp_abfertigungsNr = currentSicherheit.gs_abfertigungsnr
-                .gsp_erstellungsdatum = DateTimeString2DateTimeKonvertinator(txtPosDate.Text, txtPosTime.Text)
+                .gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDate.Text, txtPosTime.Text)
+                .gsp_erstellungsdatum = DateTime.Now
                .gsp_ust = currentSicherheit.gs_ust
                .gsp_ATCNr = txtPositionenCRN.Text
                .gsp_avisoId = Me.avisoID
@@ -669,12 +679,19 @@ Public Class frmGesamtsicherheitenNEU
            Me.warenortID = "-"
        End Try

+        Try
+            Me.Abfertigungsnummer = checkNothingValue(txtAbfertNum.Text, "String")
+
+        Catch
            Me.Abfertigungsnummer = txtAbfertNum.Text
-        Me.LKWKZ = txtLKWKZ.Text
+        End Try
+
        If txtlkwIdSearch.Text IsNot "" Then
            Me.avisoID = CInt(txtlkwIdSearch.Text)
        End If

+        Me.LKWKZ = txtLKWKZ.Text
+

        If setNullToZero(Me.gessicherheitID) > 0 Then
            Dim sqlstring = "Update [tblGesamtsicherheit] set [gs_filialenNr] = '" & Me.FilialNummer & "', [gs_abfertigungsNr] = '" & Me.Abfertigungsnummer & "',  [gs_avisoId] = '" & Me.avisoID & "',[gs_LKWKZ] = '" & Me.LKWKZ & "', [gs_warenort] = '" & Me.warenortID & "' WHERE [gs_gsNr] = '" & Me.gessicherheitID & "' "
@@ -697,17 +714,17 @@ Public Class frmGesamtsicherheitenNEU
                    Return obj.value.ToString
                End If
            Case "Integer"
-                If obj Is Nothing Or obj Is DBNull.Value Or obj = "" Then
+                If obj Is Nothing Or obj Is DBNull.Value Then
                    Return Nothing
                Else
-                    Return Integer.Parse(CStr(obj))
+                    Return Integer.Parse(CInt(obj.value))
                End If

            Case "Double"
                If obj Is Nothing Or obj Is DBNull.Value Or obj = "" Then
                    Return Nothing
                Else
-                    Return Double.Parse(CStr(obj))
+                    Return Double.Parse(CDbl(obj))
                End If

        End Select
@@ -775,7 +792,13 @@ Public Class frmGesamtsicherheitenNEU
            .gsp_sicherheitsbetrag = Double.Parse(txtPosSicherheitsbetrag.Text)
            .gsp_warenwert = Double.Parse(txtPosWarenwert.Text)
            .gsp_ATCNr = If(txtPositionenCRN.Text <> "", txtPositionenCRN.Text, Nothing)
-            .gsp_erstellungsdatum = DateTimeString2DateTimeKonvertinator(txtPosDate.Text, txtPosTime.Text)
+
+            If txtPosDate.Text <> "" AndAlso txtPosTime.Text <> "" Then
+                .gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDate.Text, txtPosTime.Text)
+            Else
+                .gsp_datum = Nothing
+            End If
+

        End With
        If checkSicherheitsbetrag() = False Then Exit Sub
@@ -784,6 +807,7 @@ Public Class frmGesamtsicherheitenNEU
        btnUpdatePos.Visible = False
        btnDeletePos.Visible = False
        AfterButton()
+
    End Sub

    Private Sub dgvGesamtsicherheitPositionen_CellCellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSicherheitsPos.CellDoubleClick
@@ -795,8 +819,16 @@ Public Class frmGesamtsicherheitenNEU
        txtPosSicherheitsbetrag.Text = sPos.gsp_sicherheitsbetrag
        txtPosWarenwert.Text = sPos.gsp_warenwert
        txtPositionenCRN.Text = CStr(sPos.gsp_ATCNr)
-        txtPosDate.Text = sPos.gsp_erstellungsdatum.ToString("dd.MM.yyyy")
-        txtPosTime.Text = sPos.gsp_erstellungsdatum.ToString("HH:mm")
+
+        Try
+            If sPos.gsp_datum IsNot Nothing Then
+                txtPosDate.Text = CDate(sPos.gsp_datum).ToString("dd.MM.yyyy")
+                txtPosTime.Text = CDate(sPos.gsp_datum).ToString("HH:mm")
+            End If
+
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try


        currentSPos = sPos
@@ -835,14 +867,14 @@ Public Class frmGesamtsicherheitenNEU
        End Try
    End Sub

-    Private Sub lblGestellungNr_Click(sender As Object, e As EventArgs) Handles lblGestellungNr.DoubleClick
+    Private Sub lblGestellungNr_Click(sender As Object, e As EventArgs) Handles txtGestellInfo.DoubleClick
        panOverlay.Visible = True
        cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
        cboFiliale.SelectedIndex = cboFiliale.FindString(Me.FilialNummer)
        cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1'  ORDER BY [wo_reihenfolge] ", True, "AVISO", True)
        cboWarenort.SelectedIndex = cbx_Suche_Warenort.FindString(Me.warenortID)
-        txtlkwIdSearch.initSearchBox(Me.FindForm, "  LKW_Nr, AvisoID, CAST(Datum as Date) as Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoID", "AVISO",, 250, 200)
-        txtlkwIdSearch.Text = Me.avisoID
+        txtlkwIdSearch.initSearchBox(Me.FindForm, "  LKW_Nr, AvisoID, CAST(Datum as Date) as Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoId", "AVISO",, 250, 200)
+        txtlkwIdSearch.SET_VALUE(avisoID)
        txtAbfertNum.Text = Me.Abfertigungsnummer
        txtLKWKZ.Text = Me.LKWKZ
        panOben.Enabled = False
@@ -850,6 +882,7 @@ Public Class frmGesamtsicherheitenNEU

    Private Sub btnClosePanOverlay_Click(sender As Object, e As EventArgs) Handles btnClosePanOverlay.Click
        panOverlay.Visible = False
+        Me.Close()
    End Sub

    Private Function checkMandatoryFieldsAreFilled() As Boolean
@@ -1044,10 +1077,11 @@ Public Class frmGesamtsicherheitenNEU

    Private Sub setSaldo()

-        lbloffenerSaldo.Text = "offener S-Betrag: €"
-        Dim offernerSB As Double = Me.calcOffenerSicherheitsbetrag()
-        If offernerSB <> 0 Then
-            lbloffenerSaldo.Text &= Decimal.Parse(Math.Round(offernerSB, 2)).ToString("N")
+        lbloffenerSaldo.Text = "offener Sicherheitswert:  €"
+
+        Dim offernerSB As Double = Math.Round(Me.calcOffenerSicherheitsbetrag(), 2)
+        If offernerSB > 0.01 Then
+            lbloffenerSaldo.Text &= Decimal.Parse(offernerSB.ToString("N"))

            isOpen = True
        Else
@@ -1266,6 +1300,10 @@ Public Class frmGesamtsicherheitenNEU
        txtPosSicherheitsbGes._value = countSicherheitsbetragPos.ToString
        txtPosWarenwertGes._value = countWarenwertPos.ToString

+        lbloffenerWarenwert.Text = "offener Warenwert: €"
+        lbloffenerWarenwert.Text &= Math.Round(countWarenwert, 2) - Math.Round(countWarenwertPos, 2)
+
+
    End Sub

    Private Sub rearangePosNr(gsNr As Integer, ATBNr As String, posNr As Integer)
@@ -1329,9 +1367,13 @@ Public Class frmGesamtsicherheitenNEU

    Private Sub ATCMRNNraendernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATCMRNNraendernToolStripMenuItem.Click
        Dim ATCNr As String
+        Dim tempDatum As String
+        Dim TempUhrzeit As String
        Dim mutlitpleATCNr As Boolean = False

        ATCNr = dgvSicherheitsPos.SelectedRows(0).Cells("gsp_ATCNr").Value.ToString
+        tempDatum = If(dgvSicherheitsPos.SelectedRows(0).Cells("gsp_datum").Value IsNot DBNull.Value, CDate(dgvSicherheitsPos.SelectedRows(0).Cells("gsp_datum").Value).ToString("dd.MM.yyyy"), "")
+        TempUhrzeit = If(dgvSicherheitsPos.SelectedRows(0).Cells("gsp_datum").Value IsNot DBNull.Value, CDate(dgvSicherheitsPos.SelectedRows(0).Cells("gsp_datum").Value).ToString("HH:mm"), "")

        If dgvSicherheitsPos.SelectedRows.Count > 0 Then

@@ -1349,6 +1391,8 @@ Public Class frmGesamtsicherheitenNEU
        End If
        dgvSicherheitsPos.Enabled = False
        txtATCaendern.Text = ATCNr
+        txtDatumaendern.Text = tempDatum
+        txtUhrzeitaendern.Text = TempUhrzeit
        pnlChangeATCNr.Visible = True


@@ -1357,6 +1401,7 @@ Public Class frmGesamtsicherheitenNEU
    Private Sub dgvSicherheitsPos_SelectionChanged(sender As Object, e As EventArgs) Handles dgvSicherheitsPos.SelectionChanged
        If dgvSicherheitsPos.SelectedRows.Count > 0 Then
            ATCMRNNraendernToolStripMenuItem.Visible = True
+            loadTitle()
        Else
            ATCMRNNraendernToolStripMenuItem.Visible = False
        End If
@@ -1395,12 +1440,19 @@ Public Class frmGesamtsicherheitenNEU
            MsgBox("Bitte ATC/MRN-Nr angeben!")
            Exit Sub
        End If
+
+        If txtUhrzeitaendern.Text = "" Or txtDatumaendern.Text = "" Then
+            MsgBox("Bitte Datum/Uhrzeit angeben!")
+            Exit Sub
+        End If
+
        If dgvSicherheitsPos.SelectedRows.Count > 0 Then

            For Each row As DataGridViewRow In dgvSicherheitsPos.SelectedRows

                Dim SicherhPos As New cGesamtsicherheitsPositionen(row.Cells("gsp_gsId").Value, row.Cells("gsp_gspPosId").Value)
                SicherhPos.gsp_ATCNr = txtATCaendern.Text
+                SicherhPos.gsp_datum = DateTimeString2DateTimeKonvertinator(txtDatumaendern.Text, txtUhrzeitaendern.Text)
                SicherhPos.SAVE()
            Next
        End If
@@ -1416,7 +1468,7 @@ Public Class frmGesamtsicherheitenNEU
    End Sub

    Private Sub txtAbfertNum_TextChanged(sender As Object, e As EventArgs) Handles txtAbfertNum.TextChanged
-        If Not IsNumeric(txtAbfertNum.Text) Then
+        If Not IsNumeric(txtAbfertNum.Text) AndAlso txtAbfertNum.Text <> "" Then
            txtAbfertNum.ForeColor = Color.Red
            btnSave.Enabled = False
            Exit Sub
@@ -1426,4 +1478,14 @@ Public Class frmGesamtsicherheitenNEU

        End If
    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()
+
+    End Sub
+
 End Class
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -5435,7 +5435,7 @@ Public Class frmSendungsdetailsNEU

                        Mail = CType(olSess.OpenSharedItem(PathTmpANH), Outlook.MailItem)

-                        Mail = Mail.Reply()
+                        Mail = Mail.ReplyAll
                        isReply = True

                    Else