Merge branch 'master' of https://git.it.verag.ag/edv/AVISO

2025-12-11 09:31:20 +01:00
parent f4e3cfc29e 636ede6a32
commit 6584411469
7 changed files with 1057 additions and 648 deletions
--- a/Aviso/ATEZ/frmATEZ_EZA.vb
+++ b/Aviso/ATEZ/frmATEZ_EZA.vb
@@ -28,7 +28,7 @@ Public Class frmATEZ_EZA
    Dim id As Integer = -1
    Dim dgv As DataGridView = Nothing
    Dim atez_data As cATEZ_NCTS_DATA
-    'Dim atez = New cATEZ_NCTS_IN("atez_ncts")
+    Dim atez = New cATEZ_NCTS_IN("atez_ncts")
    Dim allSelected As Boolean = False

    Property BezugsNr As String = ""
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
--- a/Aviso/frmGesamtsicherheitenNEU.resx
+++ b/Aviso/frmGesamtsicherheitenNEU.resx
@@ -120,10 +120,210 @@
  <metadata name="ContextMenuStripGesSicherh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="FlatButton4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="FlatButton2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnClosePanOverlay.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
  <metadata name="ContextMenuStripPosSicherheiten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>268, 15</value>
  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnDeletePos.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnDeleteSicherheit.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnUpdatePos.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
+  <data name="btnUpdateSicherheit.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
+  <data name="btnAddPos.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCENR738Ar4uDi7bEECMsdngO
+        BPzNzFolGmSbTw+zA9wlCnowouBGQQ9GroN4nELB5/4KRtEnC9wlCnowouBGQQ9G7oKVaJBtAF0U0pEO
+        zULyAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnAddSicherheit.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCENR738Ar4uDi7bEECMsdngO
+        BPzNzFolGmSbTw+zA9wlCnowouBGQQ9GroN4nELB5/4KRtEnC9wlCnowouBGQQ9G7oKVaJBtAF0U0pEO
+        zULyAAAAAElFTkSuQmCC
+</value>
+  </data>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAABILAAASCwAAAAAAAAAA
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -1,6 +1,4 @@
-
-Imports System.Web.UI.WebControls.Expressions
-Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN

 Public Class frmGesamtsicherheitenNEU

@@ -147,7 +145,7 @@ Public Class frmGesamtsicherheitenNEU
            If cbxRundPosanzeigen.Checked = False Then sqlSearchSting &= "AND ISNULL(gs_isRundungsdiff,0) = 0"
        End If

-        Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = " & gessicherheitID & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]"
+        Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_ATBNr],[gs_posNr],[gs_MRNNr], [gs_posSubNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = " & gessicherheitID & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]"

        dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,)
        dgvGesamtsicherheit.LOAD()
@@ -166,12 +164,10 @@ Public Class frmGesamtsicherheitenNEU
                Select Case currentGesSichRef.brgakto_gs_ATR
                    Case True

-                        If Standort = "Verag GmbH" Then
-                            .Columns("gs_ATBNr").HeaderText = "Reg-Nr."
-                        Else
-                            .Columns("gs_ATBNr").HeaderText = "T1 MRN"
-                        End If
-
+                        .Columns("gs_ATBNr").HeaderText = "Vorpapier/T1"
+                        .Columns("gs_MRNNr").HeaderText = "MRN /SumA"
+                        .Columns("gs_posSubNr").HeaderText = "SPos"
+                        .Columns("gs_posSubNr").Width = 35
                        .Columns("gs_ATBNr").Width = 130
                        .Columns("gs_atr").HeaderText = "ATR"
                        .Columns("gs_atr").Visible = True
@@ -181,7 +177,6 @@ Public Class frmGesamtsicherheitenNEU
                        .Columns("gs_ust").DefaultCellStyle.Format = "c2"

                    Case Else
-
                        If Standort = "Verag GmbH" Then
                            .Columns("gs_ATBNr").HeaderText = "Reg-Nr."
                        Else
@@ -189,6 +184,8 @@ Public Class frmGesamtsicherheitenNEU
                        End If
                        .Columns("gs_ATBNr").Width = 150
                End Select
+
+                Label1.Text = .Columns("gs_ATBNr").HeaderText
                changeLabel(currentGesSichRef.brgakto_gs_ATR)

                .Columns("gs_posNr").Width = 35
@@ -583,7 +580,7 @@ Public Class frmGesamtsicherheitenNEU
    End Sub


-    Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtSicherheitWarenwert.KeyPress, txtPosWarenwert.KeyPress, txtAnzahlPos.KeyPress, txtZollsatzueberschreiben.KeyPress
+    Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtSicherheitWarenwert.KeyPress, txtPosWarenwert.KeyPress, txtAnzahlPos.KeyPress, txtSPosNr.KeyPress, txtZollsatzueberschreiben.KeyPress
        Select Case Asc(e.KeyChar)
            Case 48 To 57, 8, 44, 22
                ' Zahlen, Backspace und , zulassen
@@ -688,6 +685,8 @@ Public Class frmGesamtsicherheitenNEU
                    .gs_gsNr = gessicherheitID
                    .gs_ATBNr = txtSicherheitATBNr.Text
                    .gs_posNr = count
+                    .gs_MRNNr = txtMRNNr.Text
+                    .gs_posSubNr = count
                    .gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDat.Text, txtSicherheitTime.Text)
                    .gs_warenwert = warenwert
                    .gs_sicherheitsbetrag = sicherheitsbetrag
@@ -714,6 +713,7 @@ Public Class frmGesamtsicherheitenNEU
                    Case Else
                        With OPEN
                            .gs_posNr = getLatestPosNr(gessicherheitID, txtSicherheitATBNr.Text) + 1
+                            .gs_posSubNr = getLatestSubPosNr(gessicherheitID, txtMRNNr.Text) + 1
                        End With
                        attachPosNrToExistingATB = True
                        indexGsId = OPEN.SAVEOBJECT()
@@ -775,6 +775,8 @@ Public Class frmGesamtsicherheitenNEU
            With OPEN
                .gs_gsNr = gessicherheitID
                .gs_ATBNr = ""
+                .gs_MRNNr = ""
+                .gs_posSubNr = Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_MRNNr) + 1
                .gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
                .gs_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
                .gs_warenwert = 0
@@ -964,7 +966,9 @@ Public Class frmGesamtsicherheitenNEU
        Dim Sicherh As New cSicherheiten(dgvGesamtsicherheit.CurrentRow.Cells("gs_gsId").Value, dgvGesamtsicherheit.CurrentRow.Cells("gs_posNr").Value)

        txtSicherheitATBNr.Text = Sicherh.gs_ATBNr
+        txtMRNNr.Text = Sicherh.gs_MRNNr
        txtAnzahlPos.Text = Sicherh.gs_posNr
+        txtSPosNr.Text = Sicherh.gs_posSubNr
        txtSicherheitWarenwert.Text = Sicherh.gs_warenwert
        txtSicherheitFreitext.Text = Sicherh.gs_freitext
        cboSicherheitATR.SelectedItem = Sicherh.gs_atr
@@ -973,6 +977,7 @@ Public Class frmGesamtsicherheitenNEU

        currentSicherheit = Sicherh
        txtAnzahlPos.Enabled = False
+        txtSPosNr.Enabled = False

        If Sicherh.gs_isRundungsdiff = True Then
            btnAddSicherheit.Visible = False
@@ -995,7 +1000,9 @@ Public Class frmGesamtsicherheitenNEU

        With currentSicherheit
            .gs_ATBNr = txtSicherheitATBNr.Text
+            .gs_MRNNr = txtMRNNr.Text
            .gs_posNr = Integer.Parse(setNullToZero(txtAnzahlPos.Text))
+            .gs_posSubNr = IIf(Integer.Parse(setNullToZero(txtSPosNr.Text)) <> 0, Integer.Parse(setNullToZero(txtSPosNr.Text)), Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_MRNNr) + 1)
            .gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDat.Text, txtSicherheitTime.Text)
            .gs_warenwert = Double.Parse(txtSicherheitWarenwert.Text)
            .gs_sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text)
@@ -1013,6 +1020,7 @@ Public Class frmGesamtsicherheitenNEU
        currentSicherheit.gs_zuletztgeandert = Now()
        currentSicherheit.SAVE()
        txtAnzahlPos.Enabled = True
+        txtSPosNr.Enabled = True
        btnUpdateSicherheit.Visible = False
        btnAddSicherheit.Visible = True
        btnDeleteSicherheit.Visible = False
@@ -1182,6 +1190,23 @@ Public Class frmGesamtsicherheitenNEU

    End Function

+
+    Private Function getLatestSubPosNr(gs_gsnr As Integer, gs_MRNNr As String) As Integer
+        Dim posNr As Integer = 0
+        Dim sqlq As String = "Select MAX([gs_posSubNr]) As MaxPosNr from [tblGesamtsicherheit] where gs_gsnr = " & gs_gsnr & " And gs_MRNNr = '" & gs_MRNNr & "'"
+        Dim dt As New DataTable
+        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
+
+        If (dt.Rows(0).Item(0) IsNot DBNull.Value) Then
+
+            posNr = dt.Rows(0).Item(0)
+
+        End If
+
+        Return posNr
+
+    End Function
+
    Private Sub btnSuche_Click(sender As Object, e As EventArgs)
        Try
            If Me.Visible Then LoadDGVSicherheiten(True)
@@ -1643,6 +1668,7 @@ Public Class frmGesamtsicherheitenNEU
        Else
            lblWarningATB.Text = ""
        End If
+        Label32.Text = "Vorpapier/T1-Nr"
        dgvGesamtsicherheit.Enabled = False
        txtATBNraendern.Text = ATBNr
        pnlChangeATBNr.Visible = True
@@ -1696,19 +1722,44 @@ Public Class frmGesamtsicherheitenNEU
    End Sub

    Private Sub FlatButton1_Click(sender As Object, e As EventArgs) Handles FlatButton1.Click
-        If txtATBNraendern.Text = "" Then
-            MsgBox("Bitte ATR-Nr angeben!")
-            Exit Sub
-        End If
-        If dgvGesamtsicherheit.SelectedRows.Count > 0 Then

-            For Each row As DataGridViewRow In dgvGesamtsicherheit.SelectedRows
-                Dim sicherh As New cSicherheiten(row.Cells("gs_gsId").Value, row.Cells("gs_posNr").Value)
-                sicherh.gs_ATBNr = txtATBNraendern.Text
-                sicherh.SAVE()
+        Select Case Label32.Text
+
+            Case "MRN-Nr"
+
+                If txtATBNraendern.Text = "" Then
+                    MsgBox("Bitte MRN-Nr angeben!")
+                    Exit Sub
+                End If
+                If dgvGesamtsicherheit.SelectedRows.Count > 0 Then
+
+                    For Each row As DataGridViewRow In dgvGesamtsicherheit.SelectedRows
+                        Dim sicherh As New cSicherheiten(row.Cells("gs_gsId").Value, row.Cells("gs_posNr").Value)
+                        sicherh.gs_MRNNr = txtATBNraendern.Text
+                        sicherh.SAVE()
+
+                    Next
+                End If
+
+            Case Else
+
+
+                If txtATBNraendern.Text = "" Then
+                    MsgBox("Bitte ATR-Nr angeben!")
+                    Exit Sub
+                End If
+                If dgvGesamtsicherheit.SelectedRows.Count > 0 Then
+
+                    For Each row As DataGridViewRow In dgvGesamtsicherheit.SelectedRows
+                        Dim sicherh As New cSicherheiten(row.Cells("gs_gsId").Value, row.Cells("gs_posNr").Value)
+                        sicherh.gs_ATBNr = txtATBNraendern.Text
+                        sicherh.SAVE()
+
+                    Next
+                End If
+
+        End Select

-            Next
-        End If


        pnlChangeATBNr.Visible = False
@@ -1890,7 +1941,9 @@ Public Class frmGesamtsicherheitenNEU
                With OPEN
                    .gs_gsNr = gessicherheitID
                    .gs_ATBNr = "Korrekt. Rundungsdiff. " & gessicherheitID
+                    .gs_MRNNr = ""
                    .gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
+                    .gs_posSubNr = Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_MRNNr) + 1
                    .gs_datum = DateTime.Now
                    .gs_warenwert = 0
                    .gs_sicherheitsbetrag = 0
@@ -2008,4 +2061,65 @@ Public Class frmGesamtsicherheitenNEU
        End If
    End Sub

+    Private Sub MRNNRÄndernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MRNNRÄndernToolStripMenuItem.Click
+        Dim MRNNr As String
+        Dim mutlitpleMRNNr As Boolean = False
+
+        MRNNr = dgvGesamtsicherheit.SelectedRows(dgvGesamtsicherheit.SelectedRows.Count - 1).Cells("gs_MRNNr").Value.ToString
+
+        If dgvGesamtsicherheit.SelectedRows.Count > 0 Then
+
+            For Each row As DataGridViewRow In dgvGesamtsicherheit.SelectedRows
+                If row.Cells("gs_MRNNr").Value.ToString <> MRNNr Then
+                    mutlitpleMRNNr = True
+                End If
+            Next
+        End If
+
+        If mutlitpleMRNNr Then
+            lblWarningATB.Text = "ACHTUNG!" & vbCrLf & "Es wurden unterschiedl. MRN-Nr. markiert!"
+        Else
+            lblWarningATB.Text = ""
+        End If
+        Label32.Text = "MRN-Nr"
+        dgvGesamtsicherheit.Enabled = False
+        txtATBNraendern.Text = MRNNr
+        pnlChangeATBNr.Visible = True
+    End Sub
+
+    Private Sub LöschenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LöschenToolStripMenuItem.Click
+
+
+        If dgvGesamtsicherheit.SelectedRows.Count > 0 Then
+
+            If vbYes = MsgBox("Möchten Sie die " & dgvGesamtsicherheit.SelectedRows.Count & " Datensätze löschen?", vbYesNo) Then
+                For Each row As DataGridViewRow In dgvGesamtsicherheit.SelectedRows
+
+                    indexGsId = CInt(row.Cells("gs_gsid").Value)
+                    indexPosNr = CInt(row.Cells("gs_posNr").Value)
+                    currentSicherheit = New cSicherheiten(indexGsId, indexPosNr)
+
+                    Dim posNr = currentSicherheit.gs_posNr
+                    Dim ATBNr = currentSicherheit.gs_ATBNr
+                    Dim gsNr = currentSicherheit.gs_gsNr
+                    If currentSicherheit.hasEntry Then
+                        currentSicherheit.Delete()
+                        rearangePosNr(gsNr, ATBNr, posNr)
+                    End If
+
+
+                Next
+
+                btnUpdateSicherheit.Visible = False
+                btnAddSicherheit.Visible = True
+                btnDeleteSicherheit.Visible = False
+                txtAnzahlPos.Enabled = True
+                AfterButton()
+
+            End If
+
+        End If
+
+
+    End Sub
 End Class
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -417,6 +417,7 @@ Partial Class frmHauptfenster
        Me.Panel7 = New System.Windows.Forms.Panel()
        Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
        Me.NewsletterToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.UNBescheinigungAusTFEinlesenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
        Me.pnlDetailsRechts.SuspendLayout()
@@ -650,7 +651,7 @@ Partial Class frmHauptfenster
        '
        'AdministrationToolStripMenuItem
        '
-        Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem, Me.AnhangsartenToolStripMenuItem, Me.SpireLizenzPrüfenToolStripMenuItem})
+        Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem, Me.AnhangsartenToolStripMenuItem, Me.SpireLizenzPrüfenToolStripMenuItem, Me.UNBescheinigungAusTFEinlesenToolStripMenuItem})
        Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem"
        Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(213, 22)
        Me.AdministrationToolStripMenuItem.Text = "Administration"
@@ -659,97 +660,97 @@ Partial Class frmHauptfenster
        'KdNrZuordnenToolStripMenuItem
        '
        Me.KdNrZuordnenToolStripMenuItem.Name = "KdNrZuordnenToolStripMenuItem"
-        Me.KdNrZuordnenToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.KdNrZuordnenToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.KdNrZuordnenToolStripMenuItem.Text = "KdNr Zuordnen"
        '
        'OptionenToolStripMenuItem1
        '
        Me.OptionenToolStripMenuItem1.Name = "OptionenToolStripMenuItem1"
-        Me.OptionenToolStripMenuItem1.Size = New System.Drawing.Size(209, 22)
+        Me.OptionenToolStripMenuItem1.Size = New System.Drawing.Size(257, 22)
        Me.OptionenToolStripMenuItem1.Text = "Optionen"
        '
        'VorlagenUploadToolStripMenuItem
        '
        Me.VorlagenUploadToolStripMenuItem.Name = "VorlagenUploadToolStripMenuItem"
-        Me.VorlagenUploadToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.VorlagenUploadToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.VorlagenUploadToolStripMenuItem.Text = "Vorlagen Upload"
        '
        'BarcodeTestToolStripMenuItem
        '
        Me.BarcodeTestToolStripMenuItem.Name = "BarcodeTestToolStripMenuItem"
-        Me.BarcodeTestToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.BarcodeTestToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.BarcodeTestToolStripMenuItem.Text = "Barcode Test"
        '
        'TabellenToolStripMenuItem
        '
        Me.TabellenToolStripMenuItem.Name = "TabellenToolStripMenuItem"
-        Me.TabellenToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.TabellenToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.TabellenToolStripMenuItem.Text = "Tabellen"
        '
        'SMSTestToolStripMenuItem
        '
        Me.SMSTestToolStripMenuItem.Name = "SMSTestToolStripMenuItem"
-        Me.SMSTestToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.SMSTestToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.SMSTestToolStripMenuItem.Text = "SMS Test"
        '
        'QSTeamsToolStripMenuItem
        '
        Me.QSTeamsToolStripMenuItem.Name = "QSTeamsToolStripMenuItem"
-        Me.QSTeamsToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.QSTeamsToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.QSTeamsToolStripMenuItem.Text = "QS Teams"
        '
        'LeereRechnungToolStripMenuItem
        '
        Me.LeereRechnungToolStripMenuItem.Name = "LeereRechnungToolStripMenuItem"
-        Me.LeereRechnungToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.LeereRechnungToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.LeereRechnungToolStripMenuItem.Text = "leere Rechnung TEST"
        '
        'EMAILTESTToolStripMenuItem
        '
        Me.EMAILTESTToolStripMenuItem.Name = "EMAILTESTToolStripMenuItem"
-        Me.EMAILTESTToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.EMAILTESTToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.EMAILTESTToolStripMenuItem.Text = "EMAILTEST"
        '
        'FreigabeMailTestToolStripMenuItem
        '
        Me.FreigabeMailTestToolStripMenuItem.Name = "FreigabeMailTestToolStripMenuItem"
-        Me.FreigabeMailTestToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.FreigabeMailTestToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.FreigabeMailTestToolStripMenuItem.Text = "FreigabeMail test"
        '
        'SDLProgrammStartenToolStripMenuItem
        '
        Me.SDLProgrammStartenToolStripMenuItem.Name = "SDLProgrammStartenToolStripMenuItem"
-        Me.SDLProgrammStartenToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.SDLProgrammStartenToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.SDLProgrammStartenToolStripMenuItem.Text = "SDL Programm starten"
        '
        'TESTToolStripMenuItem
        '
        Me.TESTToolStripMenuItem.Name = "TESTToolStripMenuItem"
-        Me.TESTToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.TESTToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.TESTToolStripMenuItem.Text = "TEST"
        '
        'AlleStatusMailsSchickenToolStripMenuItem
        '
        Me.AlleStatusMailsSchickenToolStripMenuItem.Name = "AlleStatusMailsSchickenToolStripMenuItem"
-        Me.AlleStatusMailsSchickenToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.AlleStatusMailsSchickenToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.AlleStatusMailsSchickenToolStripMenuItem.Text = "Alle Status Mails schicken"
        '
        'RoutenverwaltungToolStripMenuItem
        '
        Me.RoutenverwaltungToolStripMenuItem.Name = "RoutenverwaltungToolStripMenuItem"
-        Me.RoutenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.RoutenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.RoutenverwaltungToolStripMenuItem.Text = "Routenverwaltung"
        '
        'AnhangsartenToolStripMenuItem
        '
        Me.AnhangsartenToolStripMenuItem.Name = "AnhangsartenToolStripMenuItem"
-        Me.AnhangsartenToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.AnhangsartenToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.AnhangsartenToolStripMenuItem.Text = "Anhangsarten"
        '
        'SpireLizenzPrüfenToolStripMenuItem
        '
        Me.SpireLizenzPrüfenToolStripMenuItem.Name = "SpireLizenzPrüfenToolStripMenuItem"
-        Me.SpireLizenzPrüfenToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.SpireLizenzPrüfenToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.SpireLizenzPrüfenToolStripMenuItem.Text = "Spire-Lizenz prüfen"
        '
        'ToolStripSeparator4
@@ -924,26 +925,26 @@ Partial Class frmHauptfenster
        'GenerelleGestellungenDurchsuchenToolStripMenuItem
        '
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem"
-        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen"
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False
        '
        'KundenVonFremdenSpeditionenToolStripMenuItem
        '
        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem"
-        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen"
        '
        'KundenverwaltungToolStripMenuItem
        '
        Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem"
-        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung"
        '
        'MDMParkplatzkartenToolStripMenuItem
        '
        Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem"
-        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten"
        '
        'SMSSendenToolStripMenuItem
@@ -951,7 +952,7 @@ Partial Class frmHauptfenster
        Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem})
        Me.SMSSendenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.handy2
        Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem"
-        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.SMSSendenToolStripMenuItem.Text = "SMS"
        '
        'NeueSMSSendenToolStripMenuItem
@@ -969,51 +970,51 @@ Partial Class frmHauptfenster
        'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem
        '
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem"
-        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen"
        '
        'MRNBarcodedruckToolStripMenuItem
        '
        Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem"
-        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck"
        '
        'ToolStripSeparator12
        '
        Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
-        Me.ToolStripSeparator12.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6)
        '
        'tool_BRGXLS
        '
        Me.tool_BRGXLS.Name = "tool_BRGXLS"
-        Me.tool_BRGXLS.Size = New System.Drawing.Size(391, 30)
+        Me.tool_BRGXLS.Size = New System.Drawing.Size(383, 22)
        Me.tool_BRGXLS.Text = "Bürgschaften Excel"
        '
        'ToolStripMenuItem4
        '
        Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
-        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel"
        Me.ToolStripMenuItem4.Visible = False
        '
        'ToolStripMenuItem5
        '
        Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem5.Text = "AT | Gesamtsicherheit VERAG AG - Excel"
        Me.ToolStripMenuItem5.Visible = False
        '
        'BürgschaftenExcelToolStripMenuItem
        '
        Me.BürgschaftenExcelToolStripMenuItem.Name = "BürgschaftenExcelToolStripMenuItem"
-        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel"
        Me.BürgschaftenExcelToolStripMenuItem.Visible = False
        '
        'ToolStripMenuItem6
        '
        Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
-        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel"
        Me.ToolStripMenuItem6.Visible = False
        '
@@ -1021,7 +1022,7 @@ Partial Class frmHauptfenster
        '
        Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem, Me.DEAmbarToolStripMenuItem, Me.ATAtillaToolStripMenuItem})
        Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem"
-        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten"
        Me.GesamtsicherheitenToolStripMenuItem.Visible = False
        '
@@ -1071,25 +1072,25 @@ Partial Class frmHauptfenster
        'ToolStripMenuItem10
        '
        Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
-        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem10.Text = "TICKET Parkplatz"
        '
        'TICKETWaidhausToolStripMenuItem
        '
        Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem"
-        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz"
        '
        'ToolStripSeparator10
        '
        Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
-        Me.ToolStripSeparator10.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6)
        '
        'DAKOSYToolStripMenuItem
        '
        Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem})
        Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem"
-        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.DAKOSYToolStripMenuItem.Text = "DAKOSY"
        '
        'StammreferenzenVerwaltenToolStripMenuItem
@@ -1101,25 +1102,25 @@ Partial Class frmHauptfenster
        'ToolStripSeparator23
        '
        Me.ToolStripSeparator23.Name = "ToolStripSeparator23"
-        Me.ToolStripSeparator23.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator23.Size = New System.Drawing.Size(380, 6)
        '
        'toolOriginalATR
        '
        Me.toolOriginalATR.Image = Global.AVISO.My.Resources.Resources.atr
        Me.toolOriginalATR.Name = "toolOriginalATR"
-        Me.toolOriginalATR.Size = New System.Drawing.Size(391, 30)
+        Me.toolOriginalATR.Size = New System.Drawing.Size(383, 22)
        Me.toolOriginalATR.Text = "Original-ATR"
        '
        'SDLAbholaufträgeToolStripMenuItem
        '
        Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem"
-        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge"
        '
        'ToolStripMenuItem13
        '
        Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13"
-        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)"
        '
        'VerträgeToolStripMenuItem
@@ -1129,48 +1130,55 @@ Partial Class frmHauptfenster
        Me.VerträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.VerträgeToolStripMenuItem.Text = "Verträge"
        '
+        'VerträgeToolStripMenuItem
+        '
+        Me.VerträgeToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.spedbuch_small
+        Me.VerträgeToolStripMenuItem.Name = "VerträgeToolStripMenuItem"
+        Me.VerträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.VerträgeToolStripMenuItem.Text = "Verträge"
+        '
        'VorauskassenToolStripMenuItem
        '
        Me.VorauskassenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.vorauszahlung
        Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem"
-        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen"
        '
        'ToolStripSeparator11
        '
        Me.ToolStripSeparator11.Name = "ToolStripSeparator11"
-        Me.ToolStripSeparator11.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6)
        '
        'EssensbestellungenToolStripMenuItem
        '
        Me.EssensbestellungenToolStripMenuItem.Name = "EssensbestellungenToolStripMenuItem"
-        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.EssensbestellungenToolStripMenuItem.Text = "Essensbestellungen"
        Me.EssensbestellungenToolStripMenuItem.Visible = False
        '
        'AdministrationEssensbestellungenToolStripMenuItem
        '
        Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem"
-        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen"
        Me.AdministrationEssensbestellungenToolStripMenuItem.Visible = False
        '
        'ToolStripSeparator24
        '
        Me.ToolStripSeparator24.Name = "ToolStripSeparator24"
-        Me.ToolStripSeparator24.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator24.Size = New System.Drawing.Size(380, 6)
        '
        'WarenorteToolStripMenuItem
        '
        Me.WarenorteToolStripMenuItem.Name = "WarenorteToolStripMenuItem"
-        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.WarenorteToolStripMenuItem.Text = "Warenorte"
        '
        'DatevBuchungsexportToolStripMenuItem
        '
        Me.DatevBuchungsexportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EMAILToolStripMenuItem, Me.FTPToolStripMenuItem})
        Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem"
-        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev  Buchungsexport"
        Me.DatevBuchungsexportToolStripMenuItem.Visible = False
        '
@@ -1189,13 +1197,13 @@ Partial Class frmHauptfenster
        'APIToolStripMenuItem
        '
        Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem"
-        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.APIToolStripMenuItem.Text = "API"
        '
        'FIBUSachkontenToolStripMenuItem
        '
        Me.FIBUSachkontenToolStripMenuItem.Name = "FIBUSachkontenToolStripMenuItem"
-        Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.FIBUSachkontenToolStripMenuItem.Text = "FIBU Sachkonten"
        Me.FIBUSachkontenToolStripMenuItem.Visible = False
        '
@@ -3986,7 +3994,11 @@ Partial Class frmHauptfenster
        Me.UsrCntlTestsystem1.TabIndex = 8
        '
        'NewsletterToolStripMenuItem
+        'UNBescheinigungAusTFEinlesenToolStripMenuItem
        '
+        Me.UNBescheinigungAusTFEinlesenToolStripMenuItem.Name = "UNBescheinigungAusTFEinlesenToolStripMenuItem"
+        Me.UNBescheinigungAusTFEinlesenToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
+        Me.UNBescheinigungAusTFEinlesenToolStripMenuItem.Text = "UN-Bescheinigung aus TF einlesen"
        Me.NewsletterToolStripMenuItem.Name = "NewsletterToolStripMenuItem"
        Me.NewsletterToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.NewsletterToolStripMenuItem.Text = "Newsletter"
@@ -4451,4 +4463,5 @@ Partial Class frmHauptfenster
    Friend WithEvents MitarbeiterverzeichnisToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents VerträgeToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents NewsletterToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents UNBescheinigungAusTFEinlesenToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -7,13 +7,13 @@ Imports com.esendex.sdk.messaging
 Imports Newtonsoft.Json
 Imports System.Reflection
 Imports System.Drawing.Drawing2D
-Imports SDL
 Imports Microsoft.Office.Interop
 Imports Spire.Pdf.Texts
 Imports System.Net
 Imports System.Text
 Imports System.IO.Pipes
 Imports System.Security.AccessControl
+Imports SDL
 'Imports UID
 Public Class frmHauptfenster

@@ -3762,7 +3762,7 @@ ELSE_ATILLA:

    Private Sub btnKassenbuch_Click(sender As Object, e As EventArgs) Handles btnKassenbuch.Click
        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX" ', "ATILLA" erst freischalten, wenn alles implementiert ist!
+            Case "IMEX", "ATILLA"
                pnlOptionen.Visible = Not pnlOptionen.Visible
            Case Else
                Dim s As New SDL.frmSecureLoginKassenbuch
@@ -4215,8 +4215,14 @@ ELSE_ATILLA:
        pnlOptionen.Visible = False
        Dim s As New SDL.frmSecureLoginKassenbuch
        s.openKB = True
-        s.KassenbuchNr_tmp = 5030
        s.disableCBO = False
+
+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Case "ATILLA" : s.KassenbuchNr_tmp = 5033
+            Case Else : s.KassenbuchNr_tmp = 5030
+
+        End Select
+
        s.ShowDialog(Me)

    End Sub
@@ -5267,10 +5273,18 @@ ELSE_ATILLA:


    Private Sub VerträgeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerträgeToolStripMenuItem.Click
-        Dim f As New SDL.cKundenSearchVertrag
+        Dim f As New cKundenSearchVertrag
        f.Show(Me)
    End Sub

+    Private Sub UNBescheinigungAusTFEinlesenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UNBescheinigungAusTFEinlesenToolStripMenuItem.Click
+
+
+        VERAG_PROG_ALLGEMEIN.cTherefore.getFileFromFolderCat("381")
+
+
+    End Sub
+
    Private Sub NewsletterToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NewsletterToolStripMenuItem.Click
        Dim f As New SDL.frmNewsletter
        f.Show(Me)
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -7674,7 +7674,7 @@ Public Class frmSendungsdetailsNEU

            For Each s As cSendungen In SENDUNG_LIST
                'nur Betrag EUR
-                If s.tblSnd_Vorpapier = vorp Then
+                If s.tblSnd_Vorpapier = vorpT1 Then
                    If s.tblSnd_WarenwertWaehrung = "EUR" AndAlso s.tblSnd_Warenwert > 0 AndAlso s.FilialenNr = SENDUNG_LIST(CURRENT_INDEX).FilialenNr Then
                        calcWarenwerte += s.tblSnd_Warenwert
                    Else