diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cGesamtssicherheitsPositionen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cGesamtssicherheitsPositionen.vb
new file mode 100644
index 00000000..174bbeb6
--- /dev/null
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cGesamtssicherheitsPositionen.vb
@@ -0,0 +1,136 @@
+Imports System.Data.SqlClient
+Imports System.Reflection
+
+Public Class cGesamtssicherheitsPositionen
+
+    Property gsp_gspPosId As Integer
+    Property gsp_gsId As Object = Nothing
+    Property gsp_warenwert As Object = Nothing
+    Property gsp_sicherheitsbetrag As Object = Nothing
+    Property gsp_freitext As Object = Nothing
+    Property gsp_art As Object = Nothing
+    Property gsp_avisoId As Object = Nothing
+    Property gsp_ust As Object = Nothing
+    Property gsp_filialenNr As Object = Nothing
+    Property gsp_abfertigungsNr As Object = Nothing
+    Property gsp_ATCNr As Object = Nothing
+    Property gsp_MRNNr As Object = Nothing
+
+
+
+    Public hasEntry = False
+
+    Dim SQL As New SQL
+
+    Sub New(gsp_gspPosId)
+        Me.gsp_gspPosId = gsp_gspPosId
+        LOAD()
+    End Sub
+    Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_gspPosId", gsp_gspPosId,, True))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_gsId", gsp_gsId))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_warenwert", gsp_warenwert))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_sicherheitsbetrag", gsp_sicherheitsbetrag))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_freitext", gsp_freitext))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_art", gsp_art))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_avisoId", gsp_avisoId))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_ust", gsp_ust))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_filialenNr", gsp_filialenNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_abfertigungsNr", gsp_abfertigungsNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_ATCNr", gsp_ATCNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_MRNNr", gsp_MRNNr))
+
+        Return list
+    End Function
+
+
+
+    Public Function SAVE() As Boolean
+        Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM [tblGesamtsicherheitsPositionen]  WHERE gsp_gspPosId=@gsp_gspPosId AND gsp_gsId=@gsp_gsId ) " &
+                       " BEGIN " & getUpdateCmd() & " END " &
+                       " Else " &
+                       " BEGIN " & getInsertCmd() & " END " &
+                       " commit tran "
+
+        Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
+    End Function
+
+    Public Sub LOAD()
+        Try
+            hasEntry = False
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using cmd As New SqlCommand("SELECT * FROM [tblGesamtsicherheitsPositionen] WHERE gsp_gspPosId=@gsp_gspPosId  AND gsp_gsId=@gsp_gsId ", conn)
+                    cmd.Parameters.AddWithValue("@gsp_gspPosId", gsp_gspPosId)
+                    cmd.Parameters.AddWithValue("@gsp_gsId", gsp_gsId)
+                    Dim dr = cmd.ExecuteReader()
+                    If dr.Read Then
+                        For Each li In getParameterList()
+                            Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+                            If dr.Item(li.Text) Is DBNull.Value Then
+                                propInfo.SetValue(Me, Nothing)
+                            Else
+                                propInfo.SetValue(Me, dr.Item(li.Text))
+                            End If
+
+                        Next
+                        hasEntry = True
+                    End If
+                    dr.Close()
+                End Using
+            End Using
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+    End Sub
+
+
+
+    Public Function getUpdateCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+            Dim str As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            Return (" UPDATE [[tblGesamtsicherheitsPositionen]] SET " & str & " WHERE gsp_gspPosId=@gsp_gspPosId AND gsp_gsId=@gsp_gsId")
+
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+
+    Public Function getInsertCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+            Dim str As String = ""
+            Dim values As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "],"
+                    values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            values = values.Substring(0, values.Length - 1) 'wg. ','
+            Return (" INSERT INTO [tblGesamtsicherheitsPositionen]  (" & str & ") VALUES(" & values & ")  ")
+        Catch ex As Exception
+                MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+            End Try
+            Return ""
+        End Function
+
+
+
+
+
+End Class
diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
index 916d99e0..11e6bb31 100644
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -311,6 +311,7 @@
     </Compile>
     <Compile Include="cAllgemein.vb" />
     <Compile Include="cErrorHandler.vb" />
+    <Compile Include="cGesamtsicherheitsReferenz.vb" />
     <Compile Include="Classes\cAbfertigungsarten.vb" />
     <Compile Include="Classes\cAbgaben.vb" />
     <Compile Include="Classes\cAbrechnung_NCTSBrg.vb" />
@@ -333,6 +334,7 @@
     <Compile Include="Classes\cFirmen.vb" />
     <Compile Include="Classes\cFremdSpeditionenZuordnung.vb" />
     <Compile Include="Classes\cGelangensbestaetigung.vb" />
+    <Compile Include="Classes\cGesamtssicherheitsPositionen.vb" />
     <Compile Include="Classes\cGestellungsgarantien.vb" />
     <Compile Include="Classes\cGestellungsmitteilung.vb" />
     <Compile Include="Classes\cGrenzstelle.vb" />
diff --git a/VERAG_PROG_ALLGEMEIN/cGesamtsicherheitsReferenz.vb b/VERAG_PROG_ALLGEMEIN/cGesamtsicherheitsReferenz.vb
new file mode 100644
index 00000000..97271473
--- /dev/null
+++ b/VERAG_PROG_ALLGEMEIN/cGesamtsicherheitsReferenz.vb
@@ -0,0 +1,192 @@
+Imports System.Data.SqlClient
+Imports System.Reflection
+Imports Spire.Pdf
+
+Public Class cGesamtsicherheitsReferenz
+
+    Property gsr_id As Integer
+    Property gsr_zollsatz As Integer
+
+    'Property zollsatzMulti As Object = Nothing
+    Property gsr_referenzwert As Object = Nothing
+    Property gsr_ustEnabled As Boolean = False
+    Property gsr_ust As Object = Nothing
+    Property gsr_Saldo As Object = Nothing
+    Property gsr_ATR As Boolean = False
+    Property gsr_standort As Object = Nothing
+
+    Public hasEntry = False
+
+    Dim SQL As New SQL
+
+    Sub New()
+
+    End Sub
+
+    Sub New(_gsr_standort)
+        gsr_standort = _gsr_standort
+        LOAD()
+    End Sub
+
+    Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsr_standort", gsr_standort,, True))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsr_zollsatz", gsr_zollsatz))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsr_referenzwert", gsr_referenzwert))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsr_ustEnabled", gsr_ustEnabled))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsr_ust", gsr_ust))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsr_ATR", gsr_ATR))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsr_id", gsr_id))
+
+
+        Return list
+    End Function
+
+
+
+    Public Function SAVE() As Boolean
+        Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM [tblGesamtsicherheitReferenz] WHERE gsr_standort=@gsr_standort) " &
+                       " BEGIN " & getUpdateCmd() & " END " &
+                       " Else " &
+                       " BEGIN " & getInsertCmd() & " END " &
+                       " commit tran "
+
+        Return SQL.doSQLVarList(sqlstr, "AVISO", , list)
+    End Function
+
+    'Public Sub LOAD()
+
+
+    '    Try
+    '        hasEntry = False
+    '        Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO()
+
+    '            Using cmd As New SqlCommand("SELECT * FROM [tblGesamtsicherheitReferenz] WHERE gsr_Id=@gsrID  ", conn)
+    '                cmd.Parameters.AddWithValue("@gsr_Id", gsrId)
+
+    '                Dim dr = cmd.ExecuteReader()
+    '                If dr.Read Then
+    '                    For Each li In getParameterList()
+    '                        Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+    '                        If dr.Item(li.Text) Is DBNull.Value Then
+    '                            propInfo.SetValue(Me, Nothing)
+    '                        Else
+    '                            propInfo.SetValue(Me, dr.Item(li.Text))
+    '                        End If
+    '                    Next
+    '                    hasEntry = True
+    '                End If
+    '                dr.Close()
+    '            End Using
+    '        End Using
+    '    Catch ex As Exception
+    '        MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+    '    End Try
+    'End Sub
+
+    Public Sub LOAD()
+
+
+        Try
+            hasEntry = False
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO()
+
+
+                Using cmd As New SqlCommand("SELECT * FROM tblGesamtsicherheitReferenz WHERE gsr_Standort=@gsr_standort  ", conn)
+                    cmd.Parameters.AddWithValue("@gsr_standort", gsr_standort)
+                    Dim dr = cmd.ExecuteReader()
+                    If dr.Read Then
+                        For Each li In getParameterList()
+                            Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+                            If dr.Item(li.Text) Is DBNull.Value Then
+                                propInfo.SetValue(Me, Nothing)
+                            Else
+                                propInfo.SetValue(Me, dr.Item(li.Text))
+                            End If
+                        Next
+                        hasEntry = True
+                    End If
+                    dr.Close()
+                End Using
+            End Using
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+    End Sub
+
+
+
+
+
+
+    Public Function getUpdateCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+            Dim str As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            Return (" UPDATE [tblGesamtsicherheitReferenz] SET " & str & " WHERE gsr_standort=@gsr_standort ")
+
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+
+    Public Function getInsertCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+            Dim str As String = ""
+            Dim values As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "],"
+                    values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            values = values.Substring(0, values.Length - 1) 'wg. ','
+            Return (" INSERT INTO [tblGesamtsicherheitReferenz]  (" & str & ") VALUES(" & values & ")  ")
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+
+
+    Public Function updateSaldo()
+        Return SQL.doSQL("Update [tblGesamtsicherheitReferenz] Set gsr_aktSaldo = '" & gsr_saldo & "' WHERE gsr_Standort = '" & gsr_standort & "'", "AVISO")
+    End Function
+
+    Public Function CalcSaldo() As String
+        Dim SaldoString As String =
+            "select SUM( 
+                    case 
+    	                when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
+    	                when gs_art = 'Close' then gs_sicherheitsbetrag
+                    end) as SicherheitsSaldo
+            from [tblGesamtsicherheit] Where gs_standort = '" & gsr_standort & "'"
+
+        Dim dt As New DataTable
+        Dim mrn As Double = 0
+        dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True)
+        If dt.Rows(0).Item(0).ToString.Length > 0 Then
+            mrn = dt.Rows(0).Item(0)
+        End If
+
+        gsr_saldo = gsr_referenzwert + mrn
+        Return gsr_saldo
+    End Function
+
+End Class
diff --git a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb
index 80d57e7d..be496f9f 100644
--- a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb
+++ b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb
@@ -3,53 +3,57 @@ Imports System.Reflection
 
 Public Class cSicherheiten
 
-    Property gsID As Integer
-    Property kennnummer As String
-    Property posNr As Integer
-    Property datum As DateTime
-    Property erstellungsdatum As DateTime
-    Property warenwert As Double
-    Property sicherheitsbetrag As Double
-    Property saldo As Double
-    Property standort As String
-    Property art As String
-    Property gesamtsichNr As Integer
-    Property ust As Integer
-    Property freitext As String
-    Property filialNr As Integer
-    Property abfertigungsNr As String
-    Property LKWID As String
-    Property isATR As String = ""
-    Property warenort As String
+    Property gs_gsId As Integer
+    Property gs_ATBNr As String
+    Property gs_posNr As Integer
+    Property gs_datum As DateTime
+    Property gs_erstellungsdatum As DateTime
+    Property gs_warenwert As Object
+    Property gs_sicherheitsbetrag As Object
+    Property gs_saldo As Object
+    Property gs_standort As String
+    Property gs_art As String
+    Property gs_gsNr As Integer
+    Property gs_ust As Integer
+    Property gs_freitext As String
+    Property gs_filialenNr As Integer
+    Property gs_abfertigungsnr As String
+    Property gs_LKWID As String
+    Property gs_atr As String = ""
+    Property gs_warenort As String
 
     Public hasEntry = False
 
     Dim SQL As New SQL
 
-    Sub New(GesamtSichID)
-        Me.gsID = gsID
+    Sub New(gs_gsID)
+        Me.gs_gsId = gs_gsID
         LOAD()
     End Sub
+
+    Sub New()
+
+    End Sub
     Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
         Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_gsID", gsID,, True))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_kennNr", kennnummer))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_posNr", posNr))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_datum", datum))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_erstellungsdatum", erstellungsdatum))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_warenwert", warenwert))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_sicherheitsbetrag", sicherheitsbetrag))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_saldo", saldo))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_standort", standort))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_art", art))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_gsNr", gesamtsichNr))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_ust", ust))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_freitext", freitext))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_filialNr", filialNr))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_abfertigungsnr", abfertigungsNr))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_LKWID", LKWID))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_atr", isATR))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_warenort", warenort))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_gsId", gs_gsId,, True))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_ATBNr", gs_ATBNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_posNr", gs_posNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_datum", gs_datum))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_erstellungsdatum", gs_erstellungsdatum))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_warenwert", gs_warenwert))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_sicherheitsbetrag", gs_sicherheitsbetrag))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_saldo", gs_saldo))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_standort", gs_standort))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_art", gs_art))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_gsNr", gs_gsNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_ust", gs_ust))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_freitext", gs_freitext))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_filialenNr", gs_filialenNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_abfertigungsnr", gs_abfertigungsnr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_LKWID", gs_LKWID))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_atr", gs_atr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_warenort", gs_warenort))
 
         Return list
     End Function
@@ -59,21 +63,21 @@ Public Class cSicherheiten
     Public Function SAVE() As Boolean
         Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
 
-        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM [tblGesamtsicherheit]  WHERE gsID=@GesamtSichID) " &
+        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM [tblGesamtsicherheit]  WHERE gs_gsId=@gs_gsId) " &
                        " BEGIN " & getUpdateCmd() & " END " &
                        " Else " &
                        " BEGIN " & getInsertCmd() & " END " &
                        " commit tran "
 
-        Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
+        Return SQL.doSQLVarList(sqlstr, "AVISO", , list)
     End Function
 
     Public Sub LOAD()
         Try
             hasEntry = False
-            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
-                Using cmd As New SqlCommand("SELECT * FROM [tblGesamtsicherheit] WHERE gsID=@gsID  ", conn)
-                    cmd.Parameters.AddWithValue("@gsID", gsID)
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO()
+                Using cmd As New SqlCommand("SELECT * FROM [tblGesamtsicherheit] WHERE gs_gsId=@gs_gsId  ", conn)
+                    cmd.Parameters.AddWithValue("@gs_gsID", gs_gsId)
                     Dim dr = cmd.ExecuteReader()
                     If dr.Read Then
                         For Each li In getParameterList()
@@ -109,7 +113,7 @@ Public Class cSicherheiten
                 End If
             Next
             str = str.Substring(0, str.Length - 1) 'wg. ','
-            Return (" UPDATE [tblGesamtsicherheit] SET " & str & " WHERE gsID=@gsID ")
+            Return (" UPDATE [tblGesamtsicherheit] SET " & str & " WHERE gs_gsId=@gs_gsId ")
 
         Catch ex As Exception
             MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
@@ -138,4 +142,9 @@ Public Class cSicherheiten
         Return ""
     End Function
 
+
+    Public Function Delete()
+        SQL.doSQL("delete from [tblGesamtsicherheit] where gs_gsId = '" & Me.gs_gsId & "'", "AVISO")
+    End Function
+
 End Class