version

Merge branch 'master' of https://git.it.verag.ag/edv/AVISO
2026-02-05 10:19:36 +01:00 · 2026-02-04 10:58:35 +01:00 · 2026-02-04 08:37:27 +01:00 · 2026-02-04 08:37:21 +01:00 · 2026-02-04 08:24:43 +01:00 · 2026-02-04 08:24:12 +01:00
52 changed files with 8782 additions and 4740 deletions
--- a/Aviso/AktenErfassung/frmEintragAviso.designer.vb
+++ b/Aviso/AktenErfassung/frmEintragAviso.designer.vb
--- a/Aviso/AktenErfassung/frmEintragAviso.resx
+++ b/Aviso/AktenErfassung/frmEintragAviso.resx
--- a/Aviso/AktenErfassung/frmEintragAviso.vb
+++ b/Aviso/AktenErfassung/frmEintragAviso.vb
--- a/Aviso/AktenErfassung/frmEintragAvisoInfo.designer.vb
+++ b/Aviso/AktenErfassung/frmEintragAvisoInfo.designer.vb
--- a/Aviso/AktenErfassung/frmEintragAvisoInfo.resx
+++ b/Aviso/AktenErfassung/frmEintragAvisoInfo.resx
--- a/Aviso/AktenErfassung/frmEintragAvisoInfo.vb
+++ b/Aviso/AktenErfassung/frmEintragAvisoInfo.vb
--- a/Aviso/AktenErfassung/frmEintragSammelakt.designer.vb
+++ b/Aviso/AktenErfassung/frmEintragSammelakt.designer.vb
@@ -0,0 +1,532 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmEintragSammelakt
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmEintragSammelakt))
+        Me.btnOK = New System.Windows.Forms.Button()
+        Me.lblErfAm = New System.Windows.Forms.Label()
+        Me.btnAbbruch = New System.Windows.Forms.Button()
+        Me.txtInfo = New System.Windows.Forms.TextBox()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.lblLkwKennzeichen = New System.Windows.Forms.Label()
+        Me.txtÄnderungen = New System.Windows.Forms.TextBox()
+        Me.lblAenderungen = New System.Windows.Forms.Label()
+        Me.dtpDatum = New System.Windows.Forms.DateTimePicker()
+        Me.txtLKW_Nr = New System.Windows.Forms.TextBox()
+        Me.lblStatus = New System.Windows.Forms.Label()
+        Me.lblStatus2 = New System.Windows.Forms.Label()
+        Me.lblAktenuebersicht = New System.Windows.Forms.Label()
+        Me.grpAviso = New System.Windows.Forms.GroupBox()
+        Me.lblErr_Kunde = New System.Windows.Forms.Label()
+        Me.lblErr_Aktentyp = New System.Windows.Forms.Label()
+        Me.lblErr_LKW = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+        Me.kdAuftraggeber = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
+        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnPfad = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.btnAuftraggeber = New System.Windows.Forms.Button()
+        Me.lblErrFmZollKdNr = New System.Windows.Forms.Label()
+        Me.Button3 = New System.Windows.Forms.Button()
+        Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.lblErrErfasstDat = New System.Windows.Forms.Label()
+        Me.Label12 = New System.Windows.Forms.Label()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.grpAviso.SuspendLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'btnOK
+        '
+        Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnOK.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnOK.Location = New System.Drawing.Point(21, 489)
+        Me.btnOK.Name = "btnOK"
+        Me.btnOK.Size = New System.Drawing.Size(271, 45)
+        Me.btnOK.TabIndex = 24
+        Me.btnOK.Text = "OK"
+        Me.btnOK.UseVisualStyleBackColor = True
+        '
+        'lblErfAm
+        '
+        Me.lblErfAm.AutoSize = True
+        Me.lblErfAm.Location = New System.Drawing.Point(220, 12)
+        Me.lblErfAm.Name = "lblErfAm"
+        Me.lblErfAm.Size = New System.Drawing.Size(59, 13)
+        Me.lblErfAm.TabIndex = 2
+        Me.lblErfAm.Text = "Erfasst am:"
+        '
+        'btnAbbruch
+        '
+        Me.btnAbbruch.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAbbruch.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnAbbruch.Location = New System.Drawing.Point(298, 489)
+        Me.btnAbbruch.Name = "btnAbbruch"
+        Me.btnAbbruch.Size = New System.Drawing.Size(111, 45)
+        Me.btnAbbruch.TabIndex = 27
+        Me.btnAbbruch.Text = "Abbruch"
+        Me.btnAbbruch.UseVisualStyleBackColor = True
+        '
+        'txtInfo
+        '
+        Me.txtInfo.AcceptsReturn = True
+        Me.txtInfo.Location = New System.Drawing.Point(424, 356)
+        Me.txtInfo.MaxLength = 240
+        Me.txtInfo.Multiline = True
+        Me.txtInfo.Name = "txtInfo"
+        Me.txtInfo.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
+        Me.txtInfo.Size = New System.Drawing.Size(360, 75)
+        Me.txtInfo.TabIndex = 25
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(421, 340)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(25, 13)
+        Me.Label3.TabIndex = 21
+        Me.Label3.Text = "Info"
+        '
+        'lblLkwKennzeichen
+        '
+        Me.lblLkwKennzeichen.AutoSize = True
+        Me.lblLkwKennzeichen.Location = New System.Drawing.Point(6, 77)
+        Me.lblLkwKennzeichen.Name = "lblLkwKennzeichen"
+        Me.lblLkwKennzeichen.Size = New System.Drawing.Size(96, 13)
+        Me.lblLkwKennzeichen.TabIndex = 11
+        Me.lblLkwKennzeichen.Text = "Aktenbezeichnung"
+        '
+        'txtÄnderungen
+        '
+        Me.txtÄnderungen.AcceptsReturn = True
+        Me.txtÄnderungen.BackColor = System.Drawing.SystemColors.Info
+        Me.txtÄnderungen.ForeColor = System.Drawing.SystemColors.InfoText
+        Me.txtÄnderungen.Location = New System.Drawing.Point(424, 466)
+        Me.txtÄnderungen.MaxLength = 0
+        Me.txtÄnderungen.Multiline = True
+        Me.txtÄnderungen.Name = "txtÄnderungen"
+        Me.txtÄnderungen.ReadOnly = True
+        Me.txtÄnderungen.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
+        Me.txtÄnderungen.Size = New System.Drawing.Size(360, 68)
+        Me.txtÄnderungen.TabIndex = 13
+        Me.txtÄnderungen.TabStop = False
+        '
+        'lblAenderungen
+        '
+        Me.lblAenderungen.AutoSize = True
+        Me.lblAenderungen.Location = New System.Drawing.Point(421, 450)
+        Me.lblAenderungen.Name = "lblAenderungen"
+        Me.lblAenderungen.Size = New System.Drawing.Size(65, 13)
+        Me.lblAenderungen.TabIndex = 12
+        Me.lblAenderungen.Text = "Änderungen"
+        '
+        'dtpDatum
+        '
+        Me.dtpDatum.CustomFormat = "dd.MM.yyyy HH:mm"
+        Me.dtpDatum.Format = System.Windows.Forms.DateTimePickerFormat.Custom
+        Me.dtpDatum.Location = New System.Drawing.Point(285, 7)
+        Me.dtpDatum.Name = "dtpDatum"
+        Me.dtpDatum.Size = New System.Drawing.Size(130, 20)
+        Me.dtpDatum.TabIndex = 0
+        '
+        'txtLKW_Nr
+        '
+        Me.txtLKW_Nr.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtLKW_Nr.Location = New System.Drawing.Point(108, 69)
+        Me.txtLKW_Nr.MaxLength = 30
+        Me.txtLKW_Nr.Name = "txtLKW_Nr"
+        Me.txtLKW_Nr.Size = New System.Drawing.Size(289, 26)
+        Me.txtLKW_Nr.TabIndex = 15
+        '
+        'lblStatus
+        '
+        Me.lblStatus.BackColor = System.Drawing.Color.LemonChiffon
+        Me.lblStatus.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblStatus.ForeColor = System.Drawing.Color.Green
+        Me.lblStatus.Location = New System.Drawing.Point(516, 7)
+        Me.lblStatus.Name = "lblStatus"
+        Me.lblStatus.Size = New System.Drawing.Size(268, 20)
+        Me.lblStatus.TabIndex = 4
+        Me.lblStatus.Text = "freigegeben"
+        '
+        'lblStatus2
+        '
+        Me.lblStatus2.AutoSize = True
+        Me.lblStatus2.Location = New System.Drawing.Point(430, 12)
+        Me.lblStatus2.Name = "lblStatus2"
+        Me.lblStatus2.Size = New System.Drawing.Size(80, 13)
+        Me.lblStatus2.TabIndex = 3
+        Me.lblStatus2.Text = "aktueller Status"
+        '
+        'lblAktenuebersicht
+        '
+        Me.lblAktenuebersicht.AutoSize = True
+        Me.lblAktenuebersicht.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAktenuebersicht.Location = New System.Drawing.Point(12, 11)
+        Me.lblAktenuebersicht.Name = "lblAktenuebersicht"
+        Me.lblAktenuebersicht.Size = New System.Drawing.Size(130, 20)
+        Me.lblAktenuebersicht.TabIndex = 1
+        Me.lblAktenuebersicht.Text = "Aktenübersicht"
+        '
+        'grpAviso
+        '
+        Me.grpAviso.Controls.Add(Me.lblErr_Kunde)
+        Me.grpAviso.Controls.Add(Me.lblErr_Aktentyp)
+        Me.grpAviso.Controls.Add(Me.lblErr_LKW)
+        Me.grpAviso.Controls.Add(Me.Label5)
+        Me.grpAviso.Controls.Add(Me.Label4)
+        Me.grpAviso.Controls.Add(Me.Label1)
+        Me.grpAviso.Controls.Add(Me.MyComboBox1)
+        Me.grpAviso.Controls.Add(Me.PictureBox1)
+        Me.grpAviso.Controls.Add(Me.kdAuftraggeber)
+        Me.grpAviso.Controls.Add(Me.dgvAnhaenge)
+        Me.grpAviso.Controls.Add(Me.txtLKW_Nr)
+        Me.grpAviso.Controls.Add(Me.btnAuftraggeber)
+        Me.grpAviso.Controls.Add(Me.lblLkwKennzeichen)
+        Me.grpAviso.Location = New System.Drawing.Point(12, 49)
+        Me.grpAviso.Name = "grpAviso"
+        Me.grpAviso.Size = New System.Drawing.Size(403, 434)
+        Me.grpAviso.TabIndex = 7
+        Me.grpAviso.TabStop = False
+        Me.grpAviso.Text = "CBAM"
+        '
+        'lblErr_Kunde
+        '
+        Me.lblErr_Kunde.AutoSize = True
+        Me.lblErr_Kunde.ForeColor = System.Drawing.Color.Red
+        Me.lblErr_Kunde.Location = New System.Drawing.Point(105, 124)
+        Me.lblErr_Kunde.Name = "lblErr_Kunde"
+        Me.lblErr_Kunde.Size = New System.Drawing.Size(130, 13)
+        Me.lblErr_Kunde.TabIndex = 61
+        Me.lblErr_Kunde.Text = "Kunde darf nicht leer sein!"
+        Me.lblErr_Kunde.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.lblErr_Kunde.Visible = False
+        '
+        'lblErr_Aktentyp
+        '
+        Me.lblErr_Aktentyp.AutoSize = True
+        Me.lblErr_Aktentyp.ForeColor = System.Drawing.Color.Red
+        Me.lblErr_Aktentyp.Location = New System.Drawing.Point(105, 13)
+        Me.lblErr_Aktentyp.Name = "lblErr_Aktentyp"
+        Me.lblErr_Aktentyp.Size = New System.Drawing.Size(141, 13)
+        Me.lblErr_Aktentyp.TabIndex = 60
+        Me.lblErr_Aktentyp.Text = "Aktentyp darf nicht leer sein!"
+        Me.lblErr_Aktentyp.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.lblErr_Aktentyp.Visible = False
+        '
+        'lblErr_LKW
+        '
+        Me.lblErr_LKW.AutoSize = True
+        Me.lblErr_LKW.ForeColor = System.Drawing.Color.Red
+        Me.lblErr_LKW.Location = New System.Drawing.Point(105, 58)
+        Me.lblErr_LKW.Name = "lblErr_LKW"
+        Me.lblErr_LKW.Size = New System.Drawing.Size(188, 13)
+        Me.lblErr_LKW.TabIndex = 54
+        Me.lblErr_LKW.Text = "Aktenbezeichnung darf nicht leer sein!"
+        Me.lblErr_LKW.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.lblErr_LKW.Visible = False
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Location = New System.Drawing.Point(6, 132)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(53, 13)
+        Me.Label5.TabIndex = 59
+        Me.Label5.Text = "Anhänge:"
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(6, 35)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(59, 13)
+        Me.Label4.TabIndex = 58
+        Me.Label4.Text = "Akten-Typ:"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(6, 104)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(41, 13)
+        Me.Label1.TabIndex = 57
+        Me.Label1.Text = "Kunde:"
+        '
+        'MyComboBox1
+        '
+        Me.MyComboBox1._allowedValuesFreiText = Nothing
+        Me.MyComboBox1._allowFreiText = False
+        Me.MyComboBox1._value = ""
+        Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
+        Me.MyComboBox1.FormattingEnabled = True
+        Me.MyComboBox1.Location = New System.Drawing.Point(108, 27)
+        Me.MyComboBox1.Name = "MyComboBox1"
+        Me.MyComboBox1.Size = New System.Drawing.Size(198, 28)
+        Me.MyComboBox1.TabIndex = 56
+        '
+        'PictureBox1
+        '
+        Me.PictureBox1.BackgroundImage = Global.AVISO.My.Resources.Resources.cbam_s
+        Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox1.Location = New System.Drawing.Point(312, 9)
+        Me.PictureBox1.Name = "PictureBox1"
+        Me.PictureBox1.Size = New System.Drawing.Size(85, 58)
+        Me.PictureBox1.TabIndex = 48
+        Me.PictureBox1.TabStop = False
+        '
+        'kdAuftraggeber
+        '
+        Me.kdAuftraggeber._AlleFirmenCLUSTER = False
+        Me.kdAuftraggeber._AllowSetValue = True
+        Me.kdAuftraggeber._autoSizeGross = False
+        Me.kdAuftraggeber._display_Name1 = False
+        Me.kdAuftraggeber._displayAVISO_Email = True
+        Me.kdAuftraggeber._displayFullName = False
+        Me.kdAuftraggeber._displayWoelflKd = False
+        Me.kdAuftraggeber._hideIfListEmpty = True
+        Me.kdAuftraggeber._loadKdData = False
+        Me.kdAuftraggeber._searchName1 = True
+        Me.kdAuftraggeber._UseFIRMA = ""
+        Me.kdAuftraggeber._ValueKdAndName = True
+        Me.kdAuftraggeber.dgvpos = "LEFT"
+        Me.kdAuftraggeber.KdName = ""
+        Me.kdAuftraggeber.KdNr = "-1"
+        Me.kdAuftraggeber.kdNrField = Nothing
+        Me.kdAuftraggeber.KdNrNullInt = Nothing
+        Me.kdAuftraggeber.Location = New System.Drawing.Point(108, 101)
+        Me.kdAuftraggeber.Name = "kdAuftraggeber"
+        Me.kdAuftraggeber.nurAktive = False
+        Me.kdAuftraggeber.searchActive = True
+        Me.kdAuftraggeber.Size = New System.Drawing.Size(258, 20)
+        Me.kdAuftraggeber.TabIndex = 42
+        Me.kdAuftraggeber.TIMER_SEARCH = True
+        Me.kdAuftraggeber.usrcntl = Nothing
+        '
+        'dgvAnhaenge
+        '
+        Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvAnhaenge.AllowUserToAddRows = False
+        Me.dgvAnhaenge.AllowUserToDeleteRows = False
+        Me.dgvAnhaenge.AllowUserToResizeColumns = False
+        Me.dgvAnhaenge.AllowUserToResizeRows = False
+        Me.dgvAnhaenge.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
+        Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvAnhaenge.ColumnHeadersVisible = False
+        Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName, Me.clmnPfad})
+        Me.dgvAnhaenge.Location = New System.Drawing.Point(9, 148)
+        Me.dgvAnhaenge.Name = "dgvAnhaenge"
+        Me.dgvAnhaenge.ReadOnly = True
+        Me.dgvAnhaenge.RowHeadersVisible = False
+        Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvAnhaenge.Size = New System.Drawing.Size(388, 286)
+        Me.dgvAnhaenge.TabIndex = 17
+        '
+        'columnName
+        '
+        Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.columnName.HeaderText = "Name"
+        Me.columnName.Name = "columnName"
+        Me.columnName.ReadOnly = True
+        '
+        'clmnPfad
+        '
+        Me.clmnPfad.HeaderText = "Pfad"
+        Me.clmnPfad.Name = "clmnPfad"
+        Me.clmnPfad.ReadOnly = True
+        Me.clmnPfad.Visible = False
+        '
+        'btnAuftraggeber
+        '
+        Me.btnAuftraggeber.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnAuftraggeber.Enabled = False
+        Me.btnAuftraggeber.FlatAppearance.BorderSize = 0
+        Me.btnAuftraggeber.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAuftraggeber.Image = CType(resources.GetObject("btnAuftraggeber.Image"), System.Drawing.Image)
+        Me.btnAuftraggeber.Location = New System.Drawing.Point(372, 97)
+        Me.btnAuftraggeber.Name = "btnAuftraggeber"
+        Me.btnAuftraggeber.Size = New System.Drawing.Size(25, 24)
+        Me.btnAuftraggeber.TabIndex = 43
+        Me.btnAuftraggeber.TabStop = False
+        Me.btnAuftraggeber.Tag = "Kunde hinzufügen"
+        Me.btnAuftraggeber.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.btnAuftraggeber.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+        Me.btnAuftraggeber.UseVisualStyleBackColor = True
+        '
+        'lblErrFmZollKdNr
+        '
+        Me.lblErrFmZollKdNr.AutoSize = True
+        Me.lblErrFmZollKdNr.ForeColor = System.Drawing.Color.Red
+        Me.lblErrFmZollKdNr.Location = New System.Drawing.Point(591, 372)
+        Me.lblErrFmZollKdNr.Name = "lblErrFmZollKdNr"
+        Me.lblErrFmZollKdNr.Size = New System.Drawing.Size(156, 26)
+        Me.lblErrFmZollKdNr.TabIndex = 26
+        Me.lblErrFmZollKdNr.Text = "Wenn möglich bitte die FM-Zoll " & Global.Microsoft.VisualBasic.ChrW(10) & "Zuordnung mit KdNr eintragen!"
+        Me.lblErrFmZollKdNr.Visible = False
+        '
+        'Button3
+        '
+        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button3.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button3.Location = New System.Drawing.Point(424, 49)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(359, 37)
+        Me.Button3.TabIndex = 11
+        Me.Button3.Text = "Weiter zu den Unterakten"
+        Me.Button3.UseVisualStyleBackColor = True
+        '
+        'cboFirma
+        '
+        Me.cboFirma._allowedValuesFreiText = Nothing
+        Me.cboFirma._allowFreiText = False
+        Me.cboFirma._value = ""
+        Me.cboFirma.FormattingEnabled = True
+        Me.cboFirma.Location = New System.Drawing.Point(285, 28)
+        Me.cboFirma.Name = "cboFirma"
+        Me.cboFirma.Size = New System.Drawing.Size(130, 21)
+        Me.cboFirma.TabIndex = 6
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(220, 31)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(43, 13)
+        Me.Label2.TabIndex = 5
+        Me.Label2.Text = "FIRMA:"
+        '
+        'lblErrErfasstDat
+        '
+        Me.lblErrErfasstDat.AutoSize = True
+        Me.lblErrErfasstDat.ForeColor = System.Drawing.Color.Red
+        Me.lblErrErfasstDat.Location = New System.Drawing.Point(139, 5)
+        Me.lblErrErfasstDat.Name = "lblErrErfasstDat"
+        Me.lblErrErfasstDat.Size = New System.Drawing.Size(85, 26)
+        Me.lblErrErfasstDat.TabIndex = 52
+        Me.lblErrErfasstDat.Text = "Darf nicht in der " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zukunft liegen!"
+        Me.lblErrErfasstDat.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.lblErrErfasstDat.Visible = False
+        '
+        'Label12
+        '
+        Me.Label12.BackColor = System.Drawing.Color.Transparent
+        Me.Label12.Location = New System.Drawing.Point(421, 432)
+        Me.Label12.Name = "Label12"
+        Me.Label12.Size = New System.Drawing.Size(372, 18)
+        Me.Label12.TabIndex = 29
+        Me.Label12.Text = "Achtung: im Feld Info nur allgemeine Infos erfassen. "
+        '
+        'Panel1
+        '
+        Me.Panel1.Location = New System.Drawing.Point(424, 92)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(358, 245)
+        Me.Panel1.TabIndex = 53
+        '
+        'frmEintragAvisoCBAM
+        '
+        Me.AcceptButton = Me.btnOK
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.BackColor = System.Drawing.Color.White
+        Me.ClientSize = New System.Drawing.Size(792, 564)
+        Me.Controls.Add(Me.Panel1)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.cboFirma)
+        Me.Controls.Add(Me.Button3)
+        Me.Controls.Add(Me.grpAviso)
+        Me.Controls.Add(Me.lblAktenuebersicht)
+        Me.Controls.Add(Me.lblStatus)
+        Me.Controls.Add(Me.lblStatus2)
+        Me.Controls.Add(Me.lblErfAm)
+        Me.Controls.Add(Me.txtÄnderungen)
+        Me.Controls.Add(Me.dtpDatum)
+        Me.Controls.Add(Me.btnAbbruch)
+        Me.Controls.Add(Me.lblAenderungen)
+        Me.Controls.Add(Me.btnOK)
+        Me.Controls.Add(Me.txtInfo)
+        Me.Controls.Add(Me.lblErrFmZollKdNr)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.Label12)
+        Me.Controls.Add(Me.lblErrErfasstDat)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.KeyPreview = True
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "frmEintragAvisoCBAM"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Sammelaktakt erfassen/bearbeiten"
+        Me.grpAviso.ResumeLayout(False)
+        Me.grpAviso.PerformLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+    Friend WithEvents btnOK As System.Windows.Forms.Button
+    Friend WithEvents lblErfAm As System.Windows.Forms.Label
+    Friend WithEvents btnAbbruch As System.Windows.Forms.Button
+    Friend WithEvents txtInfo As System.Windows.Forms.TextBox
+    Friend WithEvents Label3 As System.Windows.Forms.Label
+    Friend WithEvents lblLkwKennzeichen As System.Windows.Forms.Label
+    Friend WithEvents txtÄnderungen As System.Windows.Forms.TextBox
+    Friend WithEvents lblAenderungen As System.Windows.Forms.Label
+    Friend WithEvents txtLKW_Nr As System.Windows.Forms.TextBox
+    Friend WithEvents txtDatum As System.Windows.Forms.TextBox
+    Friend WithEvents lblStatus As System.Windows.Forms.Label
+    Friend WithEvents lblStatus2 As System.Windows.Forms.Label
+    Friend WithEvents dtpDatum As System.Windows.Forms.DateTimePicker
+    Friend WithEvents lblAktenuebersicht As System.Windows.Forms.Label
+    Friend WithEvents grpAviso As System.Windows.Forms.GroupBox
+    Friend WithEvents lblErrFmZollKdNr As System.Windows.Forms.Label
+    Friend WithEvents Button3 As System.Windows.Forms.Button
+    Friend WithEvents btnAuftraggeber As System.Windows.Forms.Button
+    Friend WithEvents kdAuftraggeber As VERAG_PROG_ALLGEMEIN.KdSearchBox
+    Friend WithEvents dgvAnhaenge As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents columnName As DataGridViewTextBoxColumn
+    Friend WithEvents clmnPfad As DataGridViewTextBoxColumn
+    Friend WithEvents cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label2 As Label
+    Friend WithEvents lblErrErfasstDat As Label
+    Friend WithEvents Label4 As Label
+    Friend WithEvents Label1 As Label
+    Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents PictureBox1 As PictureBox
+    Friend WithEvents Label12 As Label
+    Friend WithEvents Label5 As Label
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents lblErr_Kunde As Label
+    Friend WithEvents lblErr_Aktentyp As Label
+    Friend WithEvents lblErr_LKW As Label
+End Class
--- a/Aviso/AktenErfassung/frmEintragSammelakt.resx
+++ b/Aviso/AktenErfassung/frmEintragSammelakt.resx
--- a/Aviso/AktenErfassung/frmEintragSammelakt.vb
+++ b/Aviso/AktenErfassung/frmEintragSammelakt.vb
@@ -0,0 +1,597 @@
+Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO
+
+Public Class frmEintragSammelakt
+    '   Public frmHilf As frmMain
+
+    Dim Firmen As New cFirmenDAL
+    Dim AvisoDAL As New cAvisoDAL
+    Dim myAviso As New cAviso
+    Dim AVISOFUNC As New AvisoStatusFunctions
+    Dim ADMIN As New cADMIN
+    Dim hÄnderung As Boolean = False
+    Dim Neuanlage As Boolean = False
+    Public EingangsDatum As Date = CDate("01.01.1990")
+
+    Dim hStatus As Integer
+    Dim showSendungsdetails As Boolean = False
+    Dim hAdresse As String = ""
+    Dim hCC As String = ""
+    Public aktiv As Boolean = False
+
+    Public ATT As List(Of String)
+    Dim PROG As New cProgramFunctions
+    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+
+
+    Public FIRMA_TMP As String = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+
+    Public Sub New()
+        InitializeComponent()
+        Icon = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.GetProgrammIcon
+    End Sub
+
+
+
+    Private Sub frmEintragAviso_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles Me.KeyDown
+        'Escape händisch abfangen und auf Abbruch-Taste legen
+        If e.KeyCode = Keys.Escape Then
+            btnAbbruch.PerformClick()
+        End If
+        If e.KeyCode = Keys.Return Then
+            e.Handled = True
+        End If
+    End Sub
+
+    Sub initAttachment()
+        If ATT Is Nothing Then dgvAnhaenge.Visible = False : Exit Sub
+        dgvAnhaenge.Rows.Clear()
+        If ATT.Count = 0 Then
+            '    btnSaveAttachments.Enabled = False
+        Else
+            dgvAnhaenge.Visible = True
+
+            For Each a In ATT
+                Dim display = a
+                If a.Contains("\") Then
+                    Dim sp = a.Split("\")
+                    display = sp(sp.Count - 1)
+                End If
+                dgvAnhaenge.Rows.Add({display, a})
+            Next
+        End If
+        dgvAnhaenge.ClearSelection()
+    End Sub
+
+
+    Private Sub frmEintragAviso_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
+        'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
+        '    MsgBox("Keine Berechtigung!")
+        '    Me.Close()
+        'End If
+
+
+        Me.CenterToParent()
+        btnOK.Enabled = False
+        kdAuftraggeber.initKdBox(Me)
+
+        MyComboBox1.Items.Clear()
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CBAM", "CBAM"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EUDR", "EUDR"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FGAS", "FGAS"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ZOLLBERATUNG", "COMPLIANCE"))
+        MyComboBox1.changeItem("")
+
+
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
+            ATILLA_NEUERAKTENDECKEL = True
+        End If
+
+        ' SDL.cProgramFunctions.initDrucker(cboPrinter)
+
+
+        cboFirma.Items.Clear()
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE"))
+        cboFirma.changeItem(FIRMA_TMP)
+        cboFirma.Enabled = False
+
+
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
+            cboFirma.Enabled = True
+        End If
+
+
+
+        AddHandler kdAuftraggeber.PropertyChanged, Sub()
+                                                       If kdAuftraggeber.KdNr_value > 0 Then
+                                                           btnAuftraggeber.Enabled = True
+                                                       Else
+                                                           btnAuftraggeber.Enabled = False
+                                                       End If
+                                                   End Sub
+
+
+
+        btnOK.Enabled = True
+
+
+
+        Dim bearb As Boolean = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Avisodaten_verwalten", Me.FindForm)
+
+        If cGlobal.Aktive_ID = 0 Then
+            'es erfolgt eine Neuanlage
+            Neuanlage = True
+            Me.Text = "Neuanlage LKW-Aviso"
+            dtpDatum.Value = Now
+            If Not bearb Then dtpDatum.Enabled = False
+
+            txtÄnderungen.Text = "Neuanlage von " & cGlobal.AktiverMitarbeiter.Mitarbeiter
+            lblStatus.Text = "Neuanlage"
+
+            kdAuftraggeber.Text = ""
+
+
+        Else
+            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then
+                Me.Close()
+            End If
+
+
+            Me.Text = "Änderung LKW-Aviso"
+            'If myAviso.Status = cGlobal.Status_Ankunft Or myAviso.Status = cGlobal.Status_Freigegeben Then datVoraussichtlichesEintreffen.Visible = False
+
+            'txtInfo.Visible = False
+            'Label3.Visible = False
+            ''ausgewählter Datensatz wird geladen
+            'Button3.Visible = False
+
+            myAviso = AvisoDAL.LesenAviso(cGlobal.Aktive_ID, "")
+
+            'Werte(zuweisen)
+            dtpDatum.Value = myAviso.Datum
+            If Not bearb Then dtpDatum.Enabled = False
+
+            If myAviso.Auftraggeber_KdNr > 0 Then
+                kdAuftraggeber.KdNr = myAviso.Auftraggeber_KdNr
+            Else
+                kdAuftraggeber.Text = myAviso.Auftraggeber
+            End If
+
+            txtInfo.Text = myAviso.Info.Trim
+            txtLKW_Nr.Text = myAviso.LKW_Nr
+
+
+            txtÄnderungen.Text = myAviso.Änderungen.Trim
+
+            hStatus = myAviso.Status
+
+            If myAviso.Status <> cGlobal.Status_Erfasst Then txtInfo.Enabled = False
+
+            'optOhneAviso.Checked = txtÄnderungen.Text.Contains("Neuanlage Ankunft ohne Aviso")
+
+            'Status anzeigen
+
+            Select Case hStatus
+                Case cGlobal.Status_Ankunft
+                    lblStatus.Text = "Ankunft"
+                    If myAviso.Ankunft <> LeerDatum Then lblStatus.Text += " " & Format(myAviso.Ankunft, "dd.MM. HH:mm")
+                    lblStatus.ForeColor = Color.Blue
+                Case cGlobal.Status_Erfasst
+                    lblStatus.Text = "erfasst"
+                    lblStatus.ForeColor = Color.Red
+                Case cGlobal.Status_Freigegeben
+                    lblStatus.Text = "Freigabe " & Format(myAviso.Freigabe, "dd.MM. HH:mm")
+                    lblStatus.ForeColor = Color.Green
+                    btnOK.Enabled = bearb
+                Case cGlobal.Status_NichtEingetroffen
+                    lblStatus.Text = "LKW nicht eingetroffen"
+                    lblStatus.ForeColor = Color.DarkGray
+                    btnOK.Enabled = bearb
+                Case cGlobal.Status_Vorbereitet
+                    lblStatus.Text = "Vorbereitet"
+                    lblStatus.ForeColor = Color.Brown
+                    btnOK.Enabled = bearb
+                Case cGlobal.Status_Vorgeschrieben
+                    lblStatus.Text = "Vorgeschrieben"
+                    lblStatus.ForeColor = Color.Purple
+                    btnOK.Enabled = bearb
+                Case Else
+                    lblStatus.Text = ""
+            End Select
+            lblStatus.Text = " " & lblStatus.Text & " "   'für bessere farbliche Hervorhebung
+            cboFirma.changeItem("")
+            cboFirma.changeItem(myAviso.FIRMA)
+
+
+
+
+        End If
+
+        If bearb Then Me.Text += " (Verwaltung)"
+
+        hÄnderung = False
+
+        dtpDatum.Enabled = bearb   'nur Administrator darf Erfassungsdatum ändern/bearbeiten
+        'If Neuanlage Then
+        '    dtpAvisoEingangDatum.Value = Now.Date
+        '    dtpAvisoEingangZeit.Value = LeerDatum
+        'Else
+        '    dtpAvisoEingangDatum.Enabled = bearb
+        '    dtpAvisoEingangZeit.Enabled = bearb
+        'End If
+
+
+        initAttachment()
+
+    End Sub
+
+    Private Sub dgvAnhaenge_KeyDown(sender As Object, e As KeyEventArgs) Handles dgvAnhaenge.KeyDown
+        If e.KeyCode = Keys.Delete Then
+
+            If dgvAnhaenge.SelectedRows.Count > 0 Then
+                For Each row In dgvAnhaenge.SelectedRows.Cast(Of DataGridViewRow)().OrderByDescending(Function(dgvr) dgvr.Index)
+                    ATT.RemoveAt(row.Index)
+                Next
+
+                'ATT.RemoveAt(dgvAnhaenge.SelectedRows(0).Index) 'Inex-Rows = Index-Att
+                initAttachment()
+            End If
+        End If
+    End Sub
+
+    Private Sub btnAbbruch_Click(sender As System.Object, e As System.EventArgs) Handles btnAbbruch.Click
+        Me.Close()
+    End Sub
+
+    Private Sub txtFeld_GotFocus(sender As Object, e As System.EventArgs) Handles txtLKW_Nr.GotFocus
+        CType(sender, TextBox).SelectAll()
+    End Sub
+
+    Private Sub btnOK_Click(sender As System.Object, e As System.EventArgs) Handles btnOK.Click
+        Try
+
+
+            If Not aktiv Then Exit Sub
+
+
+            lblErrErfasstDat.Visible = False
+            lblErr_Aktentyp.Visible = False
+            lblErr_Kunde.Visible = False
+            lblErr_LKW.Visible = False
+
+            If FIRMA_TMP = "VERIMEX" Then
+                If cboFirma._value = "" Then
+                    MsgBox("Firma auswählen!", vbInformation)
+                    cboFirma.Focus()
+                    Exit Sub
+
+                End If
+            End If
+
+
+            If dtpDatum.Enabled AndAlso CDate(dtpDatum.Value) > Now Then
+                lblErrErfasstDat.Visible = True
+                dtpDatum.Focus()
+                Exit Sub
+            End If
+
+            If MyComboBox1._value.Trim = "" Then
+                ' MsgBox("Bitte die LKW-Nummer eingegeben.", vbInformation)
+                lblErr_Aktentyp.Visible = True
+                MyComboBox1.Focus()
+                Exit Sub
+            End If
+
+            If txtLKW_Nr.Text.Trim = "" Then
+                ' MsgBox("Bitte die LKW-Nummer eingegeben.", vbInformation)
+                lblErr_LKW.Visible = True
+                txtLKW_Nr.Focus()
+                Exit Sub
+            End If
+
+            If kdAuftraggeber.KdNr_value <= 0 Then
+                lblErr_Kunde.Visible = True
+                kdAuftraggeber.Focus()
+                Exit Sub
+            End If
+
+
+
+            If Neuanlage Then
+                'jetzt eine Prüfung, ob dieser LKW bereits vor kurzem erfasst wurde
+                Dim hLKWCheck2 As String = AvisoDAL.Suche_LKWStatus(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))
+                If hLKWCheck2 <> "" Then
+                    Dim antwort As MsgBoxResult = MsgBox(hLKWCheck2 & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
+                                           "Aviso-Eintrag")
+                    If antwort = vbNo Then
+                        Exit Sub
+                    End If
+                End If
+
+                If hLKWCheck2 = "" Then
+                    'jetzt eine Prüfung, ob dieser LKW bereits vor kurzem erfasst wurde
+                    Dim hLKWCheck As String = AvisoDAL.Suche_LKW(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))
+                    If hLKWCheck <> "" Then
+                        Dim antwort As MsgBoxResult = MsgBox(hLKWCheck & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
+                                               "Aviso-Eintrag")
+                        If antwort = vbNo Then
+                            Exit Sub
+                        End If
+                    End If
+                End If
+
+            End If
+
+
+
+            Me.Cursor = Cursors.WaitCursor
+
+            Dim aendart As String = ""
+            Dim aendText As String = ""
+
+            'Werte zuweisen
+            myAviso.Telefonisch = ""
+            myAviso.Datum = dtpDatum.Value
+            myAviso.LKW_Nr = txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", "")
+
+
+            If kdAuftraggeber.KdNr_value > 0 Then
+                myAviso.Auftraggeber = IIf(kdAuftraggeber.KdName <> "", kdAuftraggeber.KdName, kdAuftraggeber.Text)
+                myAviso.Auftraggeber_KdNr = kdAuftraggeber.KdNr_value
+            Else
+                myAviso.Auftraggeber = kdAuftraggeber.Text
+                myAviso.Auftraggeber_KdNr = -1
+            End If
+
+            If myAviso.Auftraggeber.Length > 50 Then myAviso.Auftraggeber = myAviso.Auftraggeber.Substring(0, 50)
+
+            myAviso.Frächter = myAviso.Auftraggeber
+            myAviso.Frächter_KdNr = myAviso.Auftraggeber_KdNr
+
+
+            myAviso.Grenzstelle = ""
+            myAviso.Info = ""
+
+            If Neuanlage Then
+                myAviso.letzterMitarbeiter = cGlobal.AktiverMitarbeiter.Mitarbeiter
+                myAviso.TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
+            End If
+
+            If Neuanlage Then
+                myAviso.Änderungen = "Neuanlage von " & cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")
+                aendart = "Neuanlage"
+                aendText = "Neuanlage von " & cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")
+
+            Else
+                myAviso.Änderungen = "Änderung per Eingabefenster von " & cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm") & vbCrLf & myAviso.Änderungen
+                aendart = "Änderung per Eingabefenster"
+                aendText = "Änderung per Eingabefenster von " & cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")
+            End If
+
+            Dim DatAnkunftNow = AVISOFUNC.getAnkunftDateNow()
+
+
+            myAviso.Status = cGlobal.Status_Ankunft
+
+
+            myAviso.Status = cGlobal.Status_Erfasst
+            myAviso.Ankunft = LeerDatum
+            myAviso.Freigabe = LeerDatum
+            myAviso.Vorbereitet = LeerDatum
+            myAviso.Vorgeschrieben = LeerDatum
+            myAviso.Dauer = 0
+
+
+
+
+            myAviso.FIRMA = If(cboFirma._value <> "", cboFirma._value, FIRMA_TMP)
+            myAviso.Cluster = If(VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER, "")
+
+
+
+
+            Dim tmpId = AvisoDAL.SpeichernAviso(myAviso)
+
+
+            myAviso.AvisoID = tmpId
+            AvisoDAL.addAenderung(tmpId, aendart, aendText)
+
+
+            'Infotext als Vermerk:
+            If txtInfo.Text.Trim <> "" Then
+                If txtInfo.Text.Length <= 80 Then
+                    AvisoStatusFunctions.insertVermerkAllg(tmpId, txtInfo.Text.Trim, 46)
+                ElseIf txtInfo.Text.Length <= 160 Then
+                    AvisoStatusFunctions.insertVermerkAllg(tmpId, txtInfo.Text.Substring(0, 80), 46)
+                    AvisoStatusFunctions.insertVermerkAllg(tmpId, txtInfo.Text.Substring(80, 80), 46)
+                ElseIf txtInfo.Text.Length <= 240 Then
+                    AvisoStatusFunctions.insertVermerkAllg(tmpId, txtInfo.Text.Substring(0, 80), 46)
+                    AvisoStatusFunctions.insertVermerkAllg(tmpId, txtInfo.Text.Substring(80, 80), 46)
+                    AvisoStatusFunctions.insertVermerkAllg(tmpId, txtInfo.Text.Substring(160, 80), 46)
+                End If
+            End If
+
+            Me.Cursor = Cursors.Default
+            'Jetzt wird Fenster geschlossen
+            Me.Close()
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
+            frmHauptfenster.setAktDetails(tmpId, showSendungsdetails)
+            If showSendungsdetails Then
+
+            End If
+
+        Catch ex As Exception
+            Me.Cursor = Cursors.Default
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+
+
+
+
+    ''threadsicherer Aufruf
+    'Delegate Sub setCboEntryCallback(i As String)
+    'Private Sub setCboEntry(i As String)
+    '    Try
+    '        If Me.InvokeRequired Then
+    '            Dim d As New setCboEntryCallback(AddressOf setCboEntry)
+    '            Me.Invoke(d, New Object() {i})
+    '        Else
+    '            cboPrinter.Items.Add(i)
+    '        End If
+
+    '    Catch ex As Exception
+
+    '    End Try
+    'End Sub
+
+    ''threadsicherer Aufruf
+    'Delegate Sub setCboSelectedCallback(standardDrucker As String)
+    'Private Sub setCboSelected(standardDrucker As String)
+    '    If Me.InvokeRequired Then
+    '        Dim d As New setCboSelectedCallback(AddressOf setCboSelected)
+    '        Me.Invoke(d, New Object() {standardDrucker})
+    '    Else
+    '        Dim found As Boolean = False
+    '        '  For Each i In cboPrinter.Items
+    '        'If i.ToString.ToUpper.Contains("TALLY") Then
+    '        'found = True
+    '        ' cboPrinter.SelectedItem = i : Exit For
+    '        ' End If
+    '        '   Next
+
+    '        If found = False Then 'Falls kein TALLY, Standarddrucker
+    '            cboPrinter.SelectedIndex = 0
+    '            For Each i In cboPrinter.Items
+    '                If i.ToString = standardDrucker Then
+    '                    cboPrinter.SelectedItem = i
+    '                    Exit For
+    '                End If
+    '            Next
+    '        End If
+    '    End If
+
+    'End Sub
+
+
+
+
+    Private Function Platzhalter_ersetzen(hText As String, hLKW As String, hGrenzstelle As String) As String
+        If hText = "" Then
+            Platzhalter_ersetzen = hText
+            Exit Function
+        End If
+
+        'hier werden alle möglichen Platzhalter ersetzt
+        hText = hText.Replace("%LKW%", hLKW)
+        If hGrenzstelle <> "" Then
+            Dim Standorte As New cStandorteDAL
+            Dim Standort As New cStandort
+            Standort = Standorte.LesenStandort(0, hGrenzstelle, "")
+            If Not IsNothing(Standort) Then
+                hGrenzstelle = Standort.Standort_Text.Trim
+            End If
+        End If
+        hText = hText.Replace("%Standort%", hGrenzstelle)
+        hText = hText.Replace("%Uhrzeit%", Format(Now, "HH:mm"))
+        hText = hText.Replace("&", "und")
+
+        Platzhalter_ersetzen = hText
+    End Function
+
+
+
+    Private Sub txtLKW_Nr_TextChanged(sender As Object, e As EventArgs) Handles txtLKW_Nr.Leave
+        txtLKW_Nr.Text = txtLKW_Nr.Text.ToUpper
+    End Sub
+
+
+
+    Private Sub frmEintragAviso_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        'dtpAvisoEingangZeit.Focus()
+        aktiv = True
+        'If EingangsDatum > CDate("01.01.1990") Then
+        '    dtpAvisoEingangDatum.Value = EingangsDatum
+        '    dtpAvisoEingangZeit.Value = EingangsDatum
+        'End If
+
+        VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
+    End Sub
+
+
+
+    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
+        If StartFromOUTLOOK Then
+            MsgBox("Diese Funktion ist im Outlook Addin nicht verfügbar!")
+            Exit Sub
+        End If
+        ' Me.showSendungsdetails = True
+        btnOK.PerformClick()
+
+
+        'If dgvSendungen.SelectedRows.Count > 0 Then
+        'sendId = dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value
+        'End If
+        If myAviso.AvisoID > 0 Then
+
+            If Process.GetCurrentProcess().ProcessName.ToUpper() = "AVISO" Then
+                Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+                Dim frmSendungsdetails As New frmSendungsdetailsNEU(myAviso.AvisoID, -1)
+                frmSendungsdetails.ShowDialog(frmGrayOut)
+
+
+                frmGrayOut.Close()
+            Else
+                VERAG_PROG_ALLGEMEIN.cProgramFunctions.SendMessageToAviso("OpenAvisoSnd_" & myAviso.AvisoID)
+            End If
+
+
+        End If
+        'initDgvSendungen()
+    End Sub
+
+
+
+    Private Sub btnAuftraggeber_Click(sender As Object, e As EventArgs) Handles btnAuftraggeber.Click
+        If kdAuftraggeber.KdNr > 0 Then
+            Me.Cursor = Cursors.WaitCursor
+            AVISOFUNC.showKd(kdAuftraggeber.KdNr)
+            Me.Cursor = Cursors.Default
+        End If
+    End Sub
+
+
+    Private Sub dgvAnhaenge_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvAnhaenge.CellDoubleClick, dgvAnhaenge.CellContentDoubleClick
+        Try
+            If dgvAnhaenge.SelectedRows.Count > 0 Then
+                If dgvAnhaenge.SelectedRows(0).Cells(1).Value <> "" Then
+                    Process.Start(dgvAnhaenge.SelectedRows(0).Cells(1).Value)
+                End If
+            End If
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+
+    Private Sub MyComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles MyComboBox1.SelectedIndexChanged
+        Select Case MyComboBox1._value
+            Case "CBAM"
+                PictureBox1.BackgroundImage = My.Resources.cbam_s
+            Case "EUDR"
+                PictureBox1.BackgroundImage = My.Resources.eudr
+            Case "FGAS"
+                PictureBox1.BackgroundImage = My.Resources.fgas_s
+            Case "COMPLIANCE"
+                PictureBox1.BackgroundImage = My.Resources.compliance_s
+            Case Else
+                PictureBox1.BackgroundImage = Nothing
+        End Select
+
+    End Sub
+End Class
--- a/Aviso/AktenErfassung/usrCntlHauptakt_CBAM.Designer.vb
+++ b/Aviso/AktenErfassung/usrCntlHauptakt_CBAM.Designer.vb
@@ -0,0 +1,37 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class usrCntlHauptakt_CBAM
+    Inherits System.Windows.Forms.UserControl
+
+    'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.SuspendLayout()
+        '
+        'usrCntlHauptakt_CBAM
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Name = "usrCntlHauptakt_CBAM"
+        Me.Size = New System.Drawing.Size(358, 245)
+        Me.ResumeLayout(False)
+
+    End Sub
+
+End Class
--- a/Aviso/AktenErfassung/usrCntlHauptakt_CBAM.resx
+++ b/Aviso/AktenErfassung/usrCntlHauptakt_CBAM.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Aviso/AktenErfassung/usrCntlHauptakt_CBAM.vb
+++ b/Aviso/AktenErfassung/usrCntlHauptakt_CBAM.vb
@@ -0,0 +1,3 @@
+Public Class usrCntlHauptakt_CBAM
+
+End Class
--- a/Aviso/Auswertung/usrctlStatVERIMEX.vb
+++ b/Aviso/Auswertung/usrctlStatVERIMEX.vb
@@ -182,7 +182,7 @@ Public Class usrctlStatVERIMEX
            End Select


-            Dim sqlstr = "SELECT   (Select isnull(Filialen.firma,'') FROM [FMZOLL\SQLFMZOLL].VERAG.dbo.Filialen WHERE [tblSendungen].FilialenNr=Filialen.FilialenNr) Firma,
+            Dim sqlstr = "SELECT   (Select isnull(Filialen.firma,'') FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen WHERE [tblSendungen].FilialenNr=Filialen.FilialenNr) Firma,
                        mit_vname + ' ' + mit_nname as Mitarbeiter, aviso.LKW_Nr [LKW Kennzeichen],tblSnd_AvisoID [LKW-ID], Auftraggeber as Avisierer, Frächter, tblSnd_Empfaenger as Empfänger, tblSnd_Colli Colli, tblSnd_Gewicht Gewicht, tblSnd_Abfertigungsart_ID Abfertigungsart, tblSendungen.FilialenNr , tblSendungen.AbfertigungsNr, replace(Ankunft,'1899-12-30 00:00:00','') Ankunft, replace(Freigabe,'1899-12-30 00:00:00','') Freigabe
                        FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbklaerungTR_MA
                        " & innerJoinFiliale & "
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -559,6 +559,12 @@
    <Compile Include="ADMIN\frmZuordnungKd.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="AktenErfassung\usrCntlHauptakt_CBAM.Designer.vb">
+      <DependentUpon>usrCntlHauptakt_CBAM.vb</DependentUpon>
+    </Compile>
+    <Compile Include="AktenErfassung\usrCntlHauptakt_CBAM.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="Anhänge\frmAddSendnung.Designer.vb">
      <DependentUpon>frmAddSendnung.vb</DependentUpon>
    </Compile>
@@ -797,6 +803,12 @@
    <Compile Include="frmATZollEingereichtSetzen.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="AktenErfassung\frmEintragSammelakt.designer.vb">
+      <DependentUpon>frmEintragSammelakt.vb</DependentUpon>
+    </Compile>
+    <Compile Include="AktenErfassung\frmEintragSammelakt.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmEintragTvNew.Designer.vb">
      <DependentUpon>frmEintragTvNew.vb</DependentUpon>
    </Compile>
@@ -989,16 +1001,16 @@
    <Compile Include="frmDruck.vb">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="frmEintragAviso.designer.vb">
+    <Compile Include="AktenErfassung\frmEintragAviso.designer.vb">
      <DependentUpon>frmEintragAviso.vb</DependentUpon>
    </Compile>
-    <Compile Include="frmEintragAviso.vb">
+    <Compile Include="AktenErfassung\frmEintragAviso.vb">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="frmEintragAvisoInfo.designer.vb">
+    <Compile Include="AktenErfassung\frmEintragAvisoInfo.designer.vb">
      <DependentUpon>frmEintragAvisoInfo.vb</DependentUpon>
    </Compile>
-    <Compile Include="frmEintragAvisoInfo.vb">
+    <Compile Include="AktenErfassung\frmEintragAvisoInfo.vb">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="frmEintragKW.designer.vb">
@@ -1006,6 +1018,7 @@
    </Compile>
    <Compile Include="frmEintragKW.vb">
      <SubType>Form</SubType>
+      <Generator>v</Generator>
    </Compile>
    <Compile Include="frmEintragOptionen.designer.vb">
      <DependentUpon>frmEintragOptionen.vb</DependentUpon>
@@ -1258,6 +1271,12 @@
    <Compile Include="usrcntlFrachtkostenberechnung.vb">
      <SubType>UserControl</SubType>
    </Compile>
+    <Compile Include="usrCntlHauptfenster_Suche_AVISO.Designer.vb">
+      <DependentUpon>usrCntlHauptfenster_Suche_AVISO.vb</DependentUpon>
+    </Compile>
+    <Compile Include="usrCntlHauptfenster_Suche_AVISO.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="usrcntlSendungDetailsAbrechnung.Designer.vb">
      <DependentUpon>usrcntlSendungDetailsAbrechnung.vb</DependentUpon>
    </Compile>
@@ -1312,6 +1331,9 @@
    <EmbeddedResource Include="ADMIN\frmZuordnungKd.resx">
      <DependentUpon>frmZuordnungKd.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="AktenErfassung\usrCntlHauptakt_CBAM.resx">
+      <DependentUpon>usrCntlHauptakt_CBAM.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="Anhänge\frmAddSendnung.resx">
      <DependentUpon>frmAddSendnung.vb</DependentUpon>
    </EmbeddedResource>
@@ -1415,6 +1437,9 @@
    <EmbeddedResource Include="frmATZollEingereichtSetzen.resx">
      <DependentUpon>frmATZollEingereichtSetzen.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="AktenErfassung\frmEintragSammelakt.resx">
+      <DependentUpon>frmEintragSammelakt.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmEintragTvNew.resx">
      <DependentUpon>frmEintragTvNew.vb</DependentUpon>
    </EmbeddedResource>
@@ -1514,10 +1539,10 @@
    <EmbeddedResource Include="frmDruck.resx">
      <DependentUpon>frmDruck.vb</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="frmEintragAviso.resx">
+    <EmbeddedResource Include="AktenErfassung\frmEintragAviso.resx">
      <DependentUpon>frmEintragAviso.vb</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="frmEintragAvisoInfo.resx">
+    <EmbeddedResource Include="AktenErfassung\frmEintragAvisoInfo.resx">
      <DependentUpon>frmEintragAvisoInfo.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="frmEintragKW.resx">
@@ -1648,6 +1673,9 @@
    <EmbeddedResource Include="usrcntlFrachtkostenberechnung.resx">
      <DependentUpon>usrcntlFrachtkostenberechnung.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="usrCntlHauptfenster_Suche_AVISO.resx">
+      <DependentUpon>usrCntlHauptfenster_Suche_AVISO.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="usrcntlSendungDetailsAbrechnung.resx">
      <DependentUpon>usrcntlSendungDetailsAbrechnung.vb</DependentUpon>
    </EmbeddedResource>
@@ -1783,6 +1811,7 @@
  <ItemGroup>
    <Content Include="aviso.ico" />
    <Content Include="My Project\aktAlt.jpg" />
+    <None Include="Resources\zollberatung_s.png" />
    <None Include="Resources\ZwAbEinfuegen.png" />
    <None Include="Resources\unisped_aeo_DE.jpg" />
    <None Include="Resources\Unisped_DE_logo.jpg" />
@@ -1837,6 +1866,10 @@
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
    <None Include="Resources\Declarant.png" />
+    <None Include="Resources\cbam_s.png" />
+    <None Include="Resources\compliance_s.png" />
+    <None Include="Resources\eudr.png" />
+    <None Include="Resources\fgas_s.png" />
    <Content Include="Resources\FO.png">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
--- a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
+++ b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
@@ -331,6 +331,7 @@ Public Class frmAvisoWeiterleiten
            End If
        ElseIf sender Is Button2 Then
            addBtn(flpFirma, "W", "FO_WIHD", "KÖRFEZ 61", True, "VERAG")
+            addBtn(flpFirma, "W", "WO_MERIS", "MERIS", True, "VERAG")

        End If

--- a/Project/Application.myapp
+++ b/Project/Application.myapp
@@ -6,6 +6,7 @@
  <ShutdownMode>1</ShutdownMode>
  <EnableVisualStyles>true</EnableVisualStyles>
  <AuthenticationMode>0</AuthenticationMode>
+  <MinimumSplashScreenDisplayTime>0</MinimumSplashScreenDisplayTime>
  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
-  <HighDpiMpde>false</HighDpiMpde>
+  <HighDpiMode>0</HighDpiMode>
 </MyApplicationData>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("4.1.8.4")>
-<Assembly: AssemblyFileVersion("4.1.8.4")>
+<Assembly: AssemblyVersion("4.2.1.8")>
+<Assembly: AssemblyFileVersion("4.2.1.8")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -458,6 +458,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property cbam_s() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("cbam_s", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -468,6 +478,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property compliance_s() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("compliance_s", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -648,6 +668,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property eudr() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("eudr", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -688,6 +718,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property fgas_s() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("fgas_s", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -2024,6 +2064,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property zollberatung_s() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("zollberatung_s", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -118,9 +118,15 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="memories2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\memories2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="personInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\personInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="Transcode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Transcode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="stift" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -193,18 +199,21 @@
  <data name="VZ_HINDERNISS___ZOLLBESCHAU___PROTOKOLL" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\resources\vz hinderniss - zollbeschau - protokoll.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="info" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="abfetigungTR_aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\..\Diverses\miniButtons\abfetigungTR_aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="Verag_AG_Logopng" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="digitalerAkt" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\digitalerAkt.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="qr_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\qr_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="add_person" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -241,15 +250,15 @@
  <data name="mitarbeiter" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\mitarbeiter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="statusBtn_vorbereitet_Aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\statusBtn_vorbereitet_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="parkplatz" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\parkplatz.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="rhenus" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\rhenus.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="statusBtn_vorbereitet_InAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\statusBtn_vorbereitet_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="arrow_left_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\arrow-left-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -298,6 +307,9 @@
  <data name="vorauszahlung11" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\vorauszahlung11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="documents" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\documents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="Unisped_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Unisped_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -328,8 +340,8 @@
  <data name="gear2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\gear2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="qr" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\qr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="vermerkBtn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\vermerkBtn.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="GVMS-image" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\..\Diverses\GVMS-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -358,9 +370,6 @@
  <data name="personCheck_gray_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\personCheck_gray_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="email_big1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="ge_transport" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ge_transport.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -388,6 +397,12 @@
  <data name="IMEX_LOGO_simple" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="kasse1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\kasse1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="statusBtn_vorgeschrieben_InAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\statusBtn_vorgeschrieben_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="weiterleiten_small1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\weiterleiten_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -409,6 +424,9 @@
  <data name="DGS_Instructions_Export" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\resources\dgs_instructions_export.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="AMB" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\AMB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="person" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -421,9 +439,6 @@
  <data name="fragezeichen1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fragezeichen1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="handy" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="zoll_m" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\zoll_mm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -433,9 +448,6 @@
  <data name="digitalerAkt_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\digitalerAkt_small.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="kasse" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="personCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\personCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -448,6 +460,9 @@
  <data name="vorauszahlung2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\vorauszahlung2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="sprinter_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sprinter_white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="dakosy" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dakosy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -466,6 +481,9 @@
  <data name="Unisped_DE_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Unisped_DE_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="passport" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\passport.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="memories0" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\memories0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -493,15 +511,9 @@
  <data name="wheel" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="speditionsbuchAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="warning2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\warning2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="scanner" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\scanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="fakturiertInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fakturiertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -556,29 +568,29 @@
  <data name="vorauszahlung1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\vorauszahlung1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="kasse1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\kasse1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="abgeklaertInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\abgeklaertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="info" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ImageIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ImageIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="sprinter_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sprinter_white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="handy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="vermerk" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="Declarant" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Declarant.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="_3s" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="zeus" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\zeus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="documents" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\documents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="qr" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\qr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="igl" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\igl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -619,8 +631,8 @@
  <data name="NDK" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\NDK.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="AMB" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AMB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="email_big1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="vorauszahlung" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -649,23 +661,23 @@
  <data name="beleg" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\beleg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="vermerkBtn" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\vermerkBtn.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="statusBtn_vorbereitet_Aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\statusBtn_vorbereitet_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="memories2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\memories2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="abgeklaertInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\abgeklaertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="image_443x282" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\image_443x282.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="statusBtn_vorgeschrieben_InAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\statusBtn_vorgeschrieben_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="kasse" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="truck_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\truck_black.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="passport" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\passport.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="scanner" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\scanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="word1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -673,11 +685,14 @@
  <data name="evolog" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\evolog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="asdadasda5sd" xml:space="preserve">
+    <value />
+  </data>
  <data name="abklaerungTR_Inaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\abklaerungTR_Inaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="Verag_AG_Logopng" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="speditionsbuchAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="atr_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\atr_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -691,19 +706,19 @@
  <data name="abfetigungTR_inaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\..\Diverses\miniButtons\abfetigungTR_inaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="qr_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\qr_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="cbam_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cbam_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="asdadasda5sd" xml:space="preserve">
-    <value />
+  <data name="compliance_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\compliance_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="Declarant" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Declarant.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="eudr" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\eudr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="statusBtn_vorbereitet_InAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\statusBtn_vorbereitet_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="fgas_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fgas_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="Transcode" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Transcode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="zollberatung_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\zollberatung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
 </root>
--- a/Aviso/Resources/cbam_s.png
+++ b/Aviso/Resources/cbam_s.png
--- a/Aviso/Resources/compliance_s.png
+++ b/Aviso/Resources/compliance_s.png
--- a/Aviso/Resources/eudr.png
+++ b/Aviso/Resources/eudr.png
--- a/Aviso/Resources/fgas_s.png
+++ b/Aviso/Resources/fgas_s.png
--- a/Aviso/Resources/zollberatung_s.png
+++ b/Aviso/Resources/zollberatung_s.png
--- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
@@ -29,12 +29,21 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.ListeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DetaillisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ReferenzlisteZollamtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.RLZollamtBereinigtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.SaldenNeuBerechnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.SaldoZumStichtagToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.PrüfungAusPlausibilitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AusgangEingangToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.SicherheitsbetragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.PictureBox5 = New System.Windows.Forms.PictureBox()
+        Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label26 = New System.Windows.Forms.Label()
        Me.btnBisTag = New System.Windows.Forms.Button()
        Me.btnVonTag = New System.Windows.Forms.Button()
        Me.btnTag = New System.Windows.Forms.Button()
+        Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label24 = New System.Windows.Forms.Label()
        Me.btnJahr = New System.Windows.Forms.Button()
        Me.btnBisJahr = New System.Windows.Forms.Button()
@@ -45,25 +54,22 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker()
        Me.Label25 = New System.Windows.Forms.Label()
        Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker()
+        Me.cbxWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label4 = New System.Windows.Forms.Label()
+        Me.cbxStandort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.lblFiliale = New System.Windows.Forms.Label()
+        Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.Label1 = New System.Windows.Forms.Label()
+        Me.btnResetFilter = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.txtSuchbegriff = New System.Windows.Forms.TextBox()
        Me.chkOffen = New System.Windows.Forms.CheckBox()
+        Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.lblSaldo = New System.Windows.Forms.Label()
        Me.lblZollsatz = New System.Windows.Forms.Label()
        Me.lblReferenzwert = New System.Windows.Forms.Label()
-        Me.PictureBox5 = New System.Windows.Forms.PictureBox()
        Me.btnExcel = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.cbxWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.cbxStandort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.btnResetFilter = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.MehrfacheATBNrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ContextMenuStrip1.SuspendLayout()
        Me.Panel1.SuspendLayout()
        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -72,41 +78,72 @@ Partial Class frmGesamtsicherheitenMenuNEU
        '
        'ContextMenuStrip1
        '
-        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem})
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem, Me.SaldoZumStichtagToolStripMenuItem, Me.PrüfungAusPlausibilitätToolStripMenuItem})
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(192, 48)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(202, 114)
        '
        'ExportCSVToolStripMenuItem
        '
-        Me.ExportCSVToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListeToolStripMenuItem, Me.DetaillisteToolStripMenuItem, Me.ReferenzlisteZollamtToolStripMenuItem})
+        Me.ExportCSVToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListeToolStripMenuItem, Me.DetaillisteToolStripMenuItem, Me.ReferenzlisteZollamtToolStripMenuItem, Me.RLZollamtBereinigtToolStripMenuItem})
        Me.ExportCSVToolStripMenuItem.Name = "ExportCSVToolStripMenuItem"
-        Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(191, 22)
+        Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(201, 22)
        Me.ExportCSVToolStripMenuItem.Text = "Export CSV"
        '
        'ListeToolStripMenuItem
        '
        Me.ListeToolStripMenuItem.Name = "ListeToolStripMenuItem"
-        Me.ListeToolStripMenuItem.Size = New System.Drawing.Size(186, 22)
+        Me.ListeToolStripMenuItem.Size = New System.Drawing.Size(183, 22)
        Me.ListeToolStripMenuItem.Text = "Liste"
        '
        'DetaillisteToolStripMenuItem
        '
        Me.DetaillisteToolStripMenuItem.Name = "DetaillisteToolStripMenuItem"
-        Me.DetaillisteToolStripMenuItem.Size = New System.Drawing.Size(186, 22)
+        Me.DetaillisteToolStripMenuItem.Size = New System.Drawing.Size(183, 22)
        Me.DetaillisteToolStripMenuItem.Text = "Detailliste"
        '
        'ReferenzlisteZollamtToolStripMenuItem
        '
        Me.ReferenzlisteZollamtToolStripMenuItem.Name = "ReferenzlisteZollamtToolStripMenuItem"
-        Me.ReferenzlisteZollamtToolStripMenuItem.Size = New System.Drawing.Size(186, 22)
-        Me.ReferenzlisteZollamtToolStripMenuItem.Text = "Referenzliste-Zollamt"
+        Me.ReferenzlisteZollamtToolStripMenuItem.Size = New System.Drawing.Size(183, 22)
+        Me.ReferenzlisteZollamtToolStripMenuItem.Text = "RL-Zollamt"
+        '
+        'RLZollamtBereinigtToolStripMenuItem
+        '
+        Me.RLZollamtBereinigtToolStripMenuItem.Name = "RLZollamtBereinigtToolStripMenuItem"
+        Me.RLZollamtBereinigtToolStripMenuItem.Size = New System.Drawing.Size(183, 22)
+        Me.RLZollamtBereinigtToolStripMenuItem.Text = "RL-Zollamt bereinigt"
        '
        'SaldenNeuBerechnenToolStripMenuItem
        '
        Me.SaldenNeuBerechnenToolStripMenuItem.Name = "SaldenNeuBerechnenToolStripMenuItem"
-        Me.SaldenNeuBerechnenToolStripMenuItem.Size = New System.Drawing.Size(191, 22)
+        Me.SaldenNeuBerechnenToolStripMenuItem.Size = New System.Drawing.Size(201, 22)
        Me.SaldenNeuBerechnenToolStripMenuItem.Text = "Salden neu berechnen"
        '
+        'SaldoZumStichtagToolStripMenuItem
+        '
+        Me.SaldoZumStichtagToolStripMenuItem.Name = "SaldoZumStichtagToolStripMenuItem"
+        Me.SaldoZumStichtagToolStripMenuItem.Size = New System.Drawing.Size(201, 22)
+        Me.SaldoZumStichtagToolStripMenuItem.Text = "Saldo zum Stichtag"
+        '
+        'PrüfungAusPlausibilitätToolStripMenuItem
+        '
+        Me.PrüfungAusPlausibilitätToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AusgangEingangToolStripMenuItem, Me.SicherheitsbetragToolStripMenuItem, Me.MehrfacheATBNrToolStripMenuItem})
+        Me.PrüfungAusPlausibilitätToolStripMenuItem.Name = "PrüfungAusPlausibilitätToolStripMenuItem"
+        Me.PrüfungAusPlausibilitätToolStripMenuItem.Size = New System.Drawing.Size(201, 22)
+        Me.PrüfungAusPlausibilitätToolStripMenuItem.Text = "Prüfung auf Plausibilität"
+        '
+        'AusgangEingangToolStripMenuItem
+        '
+        Me.AusgangEingangToolStripMenuItem.Name = "AusgangEingangToolStripMenuItem"
+        Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.AusgangEingangToolStripMenuItem.Text = "Ausgang < Eingang"
+        '
+        'SicherheitsbetragToolStripMenuItem
+        '
+        Me.SicherheitsbetragToolStripMenuItem.Name = "SicherheitsbetragToolStripMenuItem"
+        Me.SicherheitsbetragToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.SicherheitsbetragToolStripMenuItem.Text = "Sicherheitsbetrag"
+        '
        'Panel1
        '
        Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
@@ -147,6 +184,57 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.Panel1.Size = New System.Drawing.Size(658, 288)
        Me.Panel1.TabIndex = 0
        '
+        'PictureBox5
+        '
+        Me.PictureBox5.BackColor = System.Drawing.Color.White
+        Me.PictureBox5.BackgroundImage = Global.AVISO.My.Resources.Resources.fragezeichen
+        Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox5.Location = New System.Drawing.Point(3, 3)
+        Me.PictureBox5.Name = "PictureBox5"
+        Me.PictureBox5.Size = New System.Drawing.Size(23, 22)
+        Me.PictureBox5.TabIndex = 132
+        Me.PictureBox5.TabStop = False
+        '
+        'btnOpenOver85Days
+        '
+        Me.btnOpenOver85Days.allowBorder = False
+        Me.btnOpenOver85Days.BackColor = System.Drawing.Color.White
+        Me.btnOpenOver85Days.FlatAppearance.BorderSize = 0
+        Me.btnOpenOver85Days.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnOpenOver85Days.ForeColor = System.Drawing.Color.Black
+        Me.btnOpenOver85Days.Location = New System.Drawing.Point(196, 210)
+        Me.btnOpenOver85Days.Name = "btnOpenOver85Days"
+        Me.btnOpenOver85Days.Size = New System.Drawing.Size(116, 20)
+        Me.btnOpenOver85Days.TabIndex = 32
+        Me.btnOpenOver85Days.Text = "Über 85 Tage offen"
+        Me.btnOpenOver85Days.UseVisualStyleBackColor = False
+        Me.btnOpenOver85Days.Visible = False
+        '
+        'txtDatBis
+        '
+        Me.txtDatBis._DateTimeOnly = False
+        Me.txtDatBis._numbersOnly = False
+        Me.txtDatBis._numbersOnlyKommastellen = ""
+        Me.txtDatBis._numbersOnlyTrennzeichen = True
+        Me.txtDatBis._Prozent = False
+        Me.txtDatBis._ShortDateNew = False
+        Me.txtDatBis._ShortDateOnly = True
+        Me.txtDatBis._TimeOnly = False
+        Me.txtDatBis._TimeOnly_Seconds = False
+        Me.txtDatBis._value = ""
+        Me.txtDatBis._Waehrung = False
+        Me.txtDatBis._WaehrungZeichen = True
+        Me.txtDatBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtDatBis.ForeColor = System.Drawing.Color.Black
+        Me.txtDatBis.Location = New System.Drawing.Point(62, 170)
+        Me.txtDatBis.MaxLength = 10
+        Me.txtDatBis.MaxLineLength = -1
+        Me.txtDatBis.MaxLines_Warning = ""
+        Me.txtDatBis.MaxLines_Warning_Label = Nothing
+        Me.txtDatBis.Name = "txtDatBis"
+        Me.txtDatBis.Size = New System.Drawing.Size(63, 20)
+        Me.txtDatBis.TabIndex = 25
+        '
        'Label26
        '
        Me.Label26.AutoSize = True
@@ -205,6 +293,31 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.btnTag.Text = "Heute"
        Me.btnTag.UseVisualStyleBackColor = False
        '
+        'txtDatVon
+        '
+        Me.txtDatVon._DateTimeOnly = False
+        Me.txtDatVon._numbersOnly = False
+        Me.txtDatVon._numbersOnlyKommastellen = ""
+        Me.txtDatVon._numbersOnlyTrennzeichen = True
+        Me.txtDatVon._Prozent = False
+        Me.txtDatVon._ShortDateNew = False
+        Me.txtDatVon._ShortDateOnly = True
+        Me.txtDatVon._TimeOnly = False
+        Me.txtDatVon._TimeOnly_Seconds = False
+        Me.txtDatVon._value = ""
+        Me.txtDatVon._Waehrung = False
+        Me.txtDatVon._WaehrungZeichen = True
+        Me.txtDatVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtDatVon.ForeColor = System.Drawing.Color.Black
+        Me.txtDatVon.Location = New System.Drawing.Point(62, 146)
+        Me.txtDatVon.MaxLength = 10
+        Me.txtDatVon.MaxLineLength = -1
+        Me.txtDatVon.MaxLines_Warning = ""
+        Me.txtDatVon.MaxLines_Warning_Label = Nothing
+        Me.txtDatVon.Name = "txtDatVon"
+        Me.txtDatVon.Size = New System.Drawing.Size(63, 20)
+        Me.txtDatVon.TabIndex = 18
+        '
        'Label24
        '
        Me.Label24.AutoSize = True
@@ -341,6 +454,18 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.DateTimePicker1.Size = New System.Drawing.Size(92, 20)
        Me.DateTimePicker1.TabIndex = 17
        '
+        'cbxWarenort
+        '
+        Me.cbxWarenort._allowedValuesFreiText = Nothing
+        Me.cbxWarenort._allowFreiText = False
+        Me.cbxWarenort._value = ""
+        Me.cbxWarenort.DropDownWidth = 500
+        Me.cbxWarenort.FormattingEnabled = True
+        Me.cbxWarenort.Location = New System.Drawing.Point(132, 69)
+        Me.cbxWarenort.Name = "cbxWarenort"
+        Me.cbxWarenort.Size = New System.Drawing.Size(81, 21)
+        Me.cbxWarenort.TabIndex = 8
+        '
        'Label4
        '
        Me.Label4.AutoSize = True
@@ -352,6 +477,18 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.Label4.TabIndex = 5
        Me.Label4.Text = "Warenort:"
        '
+        'cbxStandort
+        '
+        Me.cbxStandort._allowedValuesFreiText = Nothing
+        Me.cbxStandort._allowFreiText = False
+        Me.cbxStandort._value = ""
+        Me.cbxStandort.DropDownWidth = 200
+        Me.cbxStandort.FormattingEnabled = True
+        Me.cbxStandort.Location = New System.Drawing.Point(32, 69)
+        Me.cbxStandort.Name = "cbxStandort"
+        Me.cbxStandort.Size = New System.Drawing.Size(81, 21)
+        Me.cbxStandort.TabIndex = 7
+        '
        'lblFiliale
        '
        Me.lblFiliale.AutoSize = True
@@ -363,6 +500,20 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.lblFiliale.TabIndex = 4
        Me.lblFiliale.Text = "Filiale:"
        '
+        'btnSucheStarten
+        '
+        Me.btnSucheStarten.allowBorder = False
+        Me.btnSucheStarten.BackColor = System.Drawing.Color.White
+        Me.btnSucheStarten.FlatAppearance.BorderSize = 0
+        Me.btnSucheStarten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSucheStarten.ForeColor = System.Drawing.Color.Black
+        Me.btnSucheStarten.Location = New System.Drawing.Point(32, 254)
+        Me.btnSucheStarten.Name = "btnSucheStarten"
+        Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20)
+        Me.btnSucheStarten.TabIndex = 33
+        Me.btnSucheStarten.Text = "Suche starten"
+        Me.btnSucheStarten.UseVisualStyleBackColor = False
+        '
        'Label1
        '
        Me.Label1.AutoSize = True
@@ -374,6 +525,20 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.Label1.TabIndex = 0
        Me.Label1.Text = "Suche:"
        '
+        'btnResetFilter
+        '
+        Me.btnResetFilter.allowBorder = False
+        Me.btnResetFilter.BackColor = System.Drawing.Color.White
+        Me.btnResetFilter.FlatAppearance.BorderSize = 0
+        Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnResetFilter.ForeColor = System.Drawing.Color.Black
+        Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh
+        Me.btnResetFilter.Location = New System.Drawing.Point(283, 21)
+        Me.btnResetFilter.Name = "btnResetFilter"
+        Me.btnResetFilter.Size = New System.Drawing.Size(62, 33)
+        Me.btnResetFilter.TabIndex = 3
+        Me.btnResetFilter.UseVisualStyleBackColor = False
+        '
        'txtSuchbegriff
        '
        Me.txtSuchbegriff.Location = New System.Drawing.Point(32, 28)
@@ -394,6 +559,21 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.chkOffen.Text = "nur offene anzeigen"
        Me.chkOffen.UseVisualStyleBackColor = True
        '
+        'btnNeu
+        '
+        Me.btnNeu.allowBorder = False
+        Me.btnNeu.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.btnNeu.BackColor = System.Drawing.Color.White
+        Me.btnNeu.FlatAppearance.BorderSize = 0
+        Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnNeu.ForeColor = System.Drawing.Color.Black
+        Me.btnNeu.Location = New System.Drawing.Point(571, 253)
+        Me.btnNeu.Name = "btnNeu"
+        Me.btnNeu.Size = New System.Drawing.Size(75, 23)
+        Me.btnNeu.TabIndex = 34
+        Me.btnNeu.Text = "Neu"
+        Me.btnNeu.UseVisualStyleBackColor = False
+        '
        'lblSaldo
        '
        Me.lblSaldo.Anchor = System.Windows.Forms.AnchorStyles.Right
@@ -430,17 +610,6 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.lblReferenzwert.TabIndex = 6
        Me.lblReferenzwert.Text = "Referenzwert: -"
        '
-        'PictureBox5
-        '
-        Me.PictureBox5.BackColor = System.Drawing.Color.White
-        Me.PictureBox5.BackgroundImage = Global.AVISO.My.Resources.Resources.fragezeichen
-        Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox5.Location = New System.Drawing.Point(3, 3)
-        Me.PictureBox5.Name = "PictureBox5"
-        Me.PictureBox5.Size = New System.Drawing.Size(23, 22)
-        Me.PictureBox5.TabIndex = 132
-        Me.PictureBox5.TabStop = False
-        '
        'btnExcel
        '
        Me.btnExcel.allowBorder = False
@@ -471,138 +640,11 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.dgvListe.Size = New System.Drawing.Size(658, 394)
        Me.dgvListe.TabIndex = 1
        '
-        'btnOpenOver85Days
+        'MehrfacheATBNrToolStripMenuItem
        '
-        Me.btnOpenOver85Days.allowBorder = False
-        Me.btnOpenOver85Days.BackColor = System.Drawing.Color.White
-        Me.btnOpenOver85Days.FlatAppearance.BorderSize = 0
-        Me.btnOpenOver85Days.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnOpenOver85Days.ForeColor = System.Drawing.Color.Black
-        Me.btnOpenOver85Days.Location = New System.Drawing.Point(196, 210)
-        Me.btnOpenOver85Days.Name = "btnOpenOver85Days"
-        Me.btnOpenOver85Days.Size = New System.Drawing.Size(116, 20)
-        Me.btnOpenOver85Days.TabIndex = 32
-        Me.btnOpenOver85Days.Text = "Über 85 Tage offen"
-        Me.btnOpenOver85Days.UseVisualStyleBackColor = False
-        Me.btnOpenOver85Days.Visible = False
-        '
-        'txtDatBis
-        '
-        Me.txtDatBis._DateTimeOnly = False
-        Me.txtDatBis._numbersOnly = False
-        Me.txtDatBis._numbersOnlyKommastellen = ""
-        Me.txtDatBis._numbersOnlyTrennzeichen = True
-        Me.txtDatBis._Prozent = False
-        Me.txtDatBis._ShortDateNew = False
-        Me.txtDatBis._ShortDateOnly = True
-        Me.txtDatBis._TimeOnly = False
-        Me.txtDatBis._TimeOnly_Seconds = False
-        Me.txtDatBis._value = ""
-        Me.txtDatBis._Waehrung = False
-        Me.txtDatBis._WaehrungZeichen = True
-        Me.txtDatBis.Enabled = False
-        Me.txtDatBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtDatBis.ForeColor = System.Drawing.Color.Black
-        Me.txtDatBis.Location = New System.Drawing.Point(62, 170)
-        Me.txtDatBis.MaxLength = 10
-        Me.txtDatBis.MaxLineLength = -1
-        Me.txtDatBis.MaxLines_Warning = ""
-        Me.txtDatBis.MaxLines_Warning_Label = Nothing
-        Me.txtDatBis.Name = "txtDatBis"
-        Me.txtDatBis.Size = New System.Drawing.Size(63, 20)
-        Me.txtDatBis.TabIndex = 25
-        '
-        'txtDatVon
-        '
-        Me.txtDatVon._DateTimeOnly = False
-        Me.txtDatVon._numbersOnly = False
-        Me.txtDatVon._numbersOnlyKommastellen = ""
-        Me.txtDatVon._numbersOnlyTrennzeichen = True
-        Me.txtDatVon._Prozent = False
-        Me.txtDatVon._ShortDateNew = False
-        Me.txtDatVon._ShortDateOnly = True
-        Me.txtDatVon._TimeOnly = False
-        Me.txtDatVon._TimeOnly_Seconds = False
-        Me.txtDatVon._value = ""
-        Me.txtDatVon._Waehrung = False
-        Me.txtDatVon._WaehrungZeichen = True
-        Me.txtDatVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtDatVon.ForeColor = System.Drawing.Color.Black
-        Me.txtDatVon.Location = New System.Drawing.Point(62, 146)
-        Me.txtDatVon.MaxLength = 10
-        Me.txtDatVon.MaxLineLength = -1
-        Me.txtDatVon.MaxLines_Warning = ""
-        Me.txtDatVon.MaxLines_Warning_Label = Nothing
-        Me.txtDatVon.Name = "txtDatVon"
-        Me.txtDatVon.Size = New System.Drawing.Size(63, 20)
-        Me.txtDatVon.TabIndex = 18
-        '
-        'cbxWarenort
-        '
-        Me.cbxWarenort._allowedValuesFreiText = Nothing
-        Me.cbxWarenort._allowFreiText = False
-        Me.cbxWarenort._value = ""
-        Me.cbxWarenort.DropDownWidth = 500
-        Me.cbxWarenort.FormattingEnabled = True
-        Me.cbxWarenort.Location = New System.Drawing.Point(132, 69)
-        Me.cbxWarenort.Name = "cbxWarenort"
-        Me.cbxWarenort.Size = New System.Drawing.Size(81, 21)
-        Me.cbxWarenort.TabIndex = 8
-        '
-        'cbxStandort
-        '
-        Me.cbxStandort._allowedValuesFreiText = Nothing
-        Me.cbxStandort._allowFreiText = False
-        Me.cbxStandort._value = ""
-        Me.cbxStandort.DropDownWidth = 200
-        Me.cbxStandort.FormattingEnabled = True
-        Me.cbxStandort.Location = New System.Drawing.Point(32, 69)
-        Me.cbxStandort.Name = "cbxStandort"
-        Me.cbxStandort.Size = New System.Drawing.Size(81, 21)
-        Me.cbxStandort.TabIndex = 7
-        '
-        'btnSucheStarten
-        '
-        Me.btnSucheStarten.allowBorder = False
-        Me.btnSucheStarten.BackColor = System.Drawing.Color.White
-        Me.btnSucheStarten.FlatAppearance.BorderSize = 0
-        Me.btnSucheStarten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnSucheStarten.ForeColor = System.Drawing.Color.Black
-        Me.btnSucheStarten.Location = New System.Drawing.Point(32, 254)
-        Me.btnSucheStarten.Name = "btnSucheStarten"
-        Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20)
-        Me.btnSucheStarten.TabIndex = 33
-        Me.btnSucheStarten.Text = "Suche starten"
-        Me.btnSucheStarten.UseVisualStyleBackColor = False
-        '
-        'btnResetFilter
-        '
-        Me.btnResetFilter.allowBorder = False
-        Me.btnResetFilter.BackColor = System.Drawing.Color.White
-        Me.btnResetFilter.FlatAppearance.BorderSize = 0
-        Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnResetFilter.ForeColor = System.Drawing.Color.Black
-        Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh
-        Me.btnResetFilter.Location = New System.Drawing.Point(283, 21)
-        Me.btnResetFilter.Name = "btnResetFilter"
-        Me.btnResetFilter.Size = New System.Drawing.Size(62, 33)
-        Me.btnResetFilter.TabIndex = 3
-        Me.btnResetFilter.UseVisualStyleBackColor = False
-        '
-        'btnNeu
-        '
-        Me.btnNeu.allowBorder = False
-        Me.btnNeu.Anchor = System.Windows.Forms.AnchorStyles.Right
-        Me.btnNeu.BackColor = System.Drawing.Color.White
-        Me.btnNeu.FlatAppearance.BorderSize = 0
-        Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnNeu.ForeColor = System.Drawing.Color.Black
-        Me.btnNeu.Location = New System.Drawing.Point(571, 253)
-        Me.btnNeu.Name = "btnNeu"
-        Me.btnNeu.Size = New System.Drawing.Size(75, 23)
-        Me.btnNeu.TabIndex = 34
-        Me.btnNeu.Text = "Neu"
-        Me.btnNeu.UseVisualStyleBackColor = False
+        Me.MehrfacheATBNrToolStripMenuItem.Name = "MehrfacheATBNrToolStripMenuItem"
+        Me.MehrfacheATBNrToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.MehrfacheATBNrToolStripMenuItem.Text = "mehrfache ATB-Nr"
        '
        'frmGesamtsicherheitenMenuNEU
        '
@@ -667,4 +709,10 @@ Partial Class frmGesamtsicherheitenMenuNEU
    Friend WithEvents ReferenzlisteZollamtToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents DetaillisteToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents PictureBox5 As PictureBox
+    Friend WithEvents SaldoZumStichtagToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents PrüfungAusPlausibilitätToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents AusgangEingangToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents SicherheitsbetragToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents RLZollamtBereinigtToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents MehrfacheATBNrToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmGesamtsicherheitenMenuNEU.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb
@@ -317,6 +317,7 @@ Public Class frmGesamtsicherheitenMenuNEU
                DateTimePicker1.Value = JAHR
                DateTimePicker2.Value = JAHR.AddYears(1).AddDays(-1)
                'End If
+            Case "Tag"
            Case "Tag"

                DateTimePicker1.Value = TAG
@@ -499,7 +500,7 @@ Public Class frmGesamtsicherheitenMenuNEU

    End Sub

-    Private Sub ExportCSV2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReferenzlisteZollamtToolStripMenuItem.Click, DetaillisteToolStripMenuItem.Click
+    Private Sub ExportCSV2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReferenzlisteZollamtToolStripMenuItem.Click, DetaillisteToolStripMenuItem.Click, RLZollamtBereinigtToolStripMenuItem.Click

        If dgvListe.Rows.Count = 0 Then
            MsgBox("keine Daten vorhanden!")
@@ -516,16 +517,32 @@ Public Class frmGesamtsicherheitenMenuNEU
        Dim datumVon As Date = CDate(txtDatVon.Text)
        datumVon = datumVon.AddDays(-1)

+        Dim detailINfo As Boolean = True
+
+        Dim zollliste_bereinigt As Boolean = False
+
+
+        'Dim nurErstellungsdatumNotAenderungsdatum As Boolean = False
+        'If vbYes = MsgBox("Sollen nur Datensaetze angegeben werden, deren Erstellungsdatum/Änderungsdatum vom Gestellungsdatum abweicht?", vbYesNoCancel) Then
+        '    nurErstellungsdatumNotAenderungsdatum = True
+        'End If
+
        If sender.ToString = "Detailliste" Then
-            frm.LoadDataTableSicherheitenForExport2(list, datumVon.ToShortDateString, txtDatBis.Text)
-        ElseIf sender.ToString = "Referenzliste-Zollamt" Then
-            frm.LoadDataTableSicherheitenForExport(list, datumVon.ToShortDateString, txtDatBis.Text, Standort)
+            frm.LoadDataTableSicherheitenForExport(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, nurErstellungsdatumNotAenderungsdatum)
+        ElseIf sender.ToString = "RL-Zollamt" OrElse sender.ToString = "RL-Zollamt bereinigt" Then
+
+            zollliste_bereinigt = IIf(sender.ToString = "RL-Zollamt bereinigt", True, False)
+            If Not vbYes = MsgBox("Sollen interne Detailinfos mitangegeben werden?", vbYesNoCancel) Then
+                detailINfo = False
+            End If
+
+            frm.LoadDataTableSicherheitenForZollamt(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, zollliste_bereinigt)
        Else
            MsgBox("Funktion nicht definiert!")
            Exit Sub
        End If

-        SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten)
+        If Not zollliste_bereinigt Then SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten)

    End Sub

@@ -536,7 +553,7 @@ Public Class frmGesamtsicherheitenMenuNEU
    Private Sub SaldenNeuBerechnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SaldenNeuBerechnenToolStripMenuItem.Click

        lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
-        MsgBox("Salden wurden neu berechnet")
+        MsgBox("Salden wurden aktualisiert!")

    End Sub

@@ -567,4 +584,118 @@ Public Class frmGesamtsicherheitenMenuNEU
        Dim webAddress As String = "https://wiki.verag.ag/e/de/software/aviso/howtos/Gesamtsicherheiten"
        Process.Start(webAddress)
    End Sub
+
+    Private Sub SaldoZumStichtagToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SaldoZumStichtagToolStripMenuItem.Click
+
+        Dim f As New frmDatumsabfrage("Saldo zum Stichtag", False)
+        f.ShowDialog()
+        If f.DialogResult = DialogResult.OK Then
+            GesSichRef.CalcSaldo(, f.Datum, True)
+        End If
+
+
+    End Sub
+
+    Private Sub AusgangEingangToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AusgangEingangToolStripMenuItem.Click
+
+
+
+        Dim SQLPlausPruefung = "select gs_gsnr as Nr,gs_ATBNr as ATBNr, gs_Sicherheitsbetrag as Sicherheitsbetrag ,gsp_ATCNr as ATCNr , cast(gs_datum as Date) as Ausgangsdatum, cast(gsp_datum as Date) as Eingangsdatum,  [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer from tblGesamtsicherheit
+											inner join tblGesamtsicherheitsPositionen on gs_gsId = gsp_gsId
+											where cast(gsp_datum as Date) < cast(gs_datum as Date) and not ( [gs_sicherheitsbetrag] = 0.00 and [gsp_sicherheitsbetrag] = 0.00) and gs_standort = '" & Standort & "'"
+
+
+        Dim dt As New DataTable
+        dt = SQL.loadDgvBySql(SQLPlausPruefung, "AVISO", 100, True)
+
+
+        If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+
+            MsgBox(dt.Rows.Count & " Datensätze müssen korrigiert werden (Datum/Uhrzeit des Gestellungsausganges muss zeitlich NACH dem Gestellungseingang liegen)! " & vbNewLine & "Ansonsten können keine korrekten Werte über die Saldenliste ermittelt werden.")
+            SDL.cProgramFunctions.genExcelFromDT_NEW(dt)
+
+        Else
+
+            MsgBox("keine fehlerhaften Eingaben vorhanden!")
+
+        End If
+
+
+    End Sub
+
+
+    Private Sub SicherheitsbetragToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SicherheitsbetragToolStripMenuItem.Click
+
+
+        Dim SQLPlausPruefung = "SELECT 
+    gs.gs_gsnr,
+    gs.Sicherheitbetrag_Ausgang,
+    gsp.Sicherheitbetrag_Eingang,
+	gs.gs_standort
+FROM
+(
+    SELECT 
+        gs_gsnr,
+		gs_standort,
+        SUM(gs_sicherheitsbetrag) AS Sicherheitbetrag_Ausgang
+    FROM tblGesamtsicherheit
+    GROUP BY gs_standort, gs_gsnr
+) gs
+JOIN
+(
+    SELECT 
+        gsp_gsnr,
+        SUM(gsp_sicherheitsbetrag) AS Sicherheitbetrag_Eingang
+    FROM tblGesamtsicherheitsPositionen
+    GROUP BY gsp_gsnr
+) gsp
+    ON gs.gs_gsnr = gsp.gsp_gsnr WHERE gs.Sicherheitbetrag_Ausgang < gsp.Sicherheitbetrag_Eingang and gs_standort = '" & Standort & "' and gs_gsnr <> 2030  order by gs.gs_gsnr"
+
+
+        Dim dt As New DataTable
+        dt = SQL.loadDgvBySql(SQLPlausPruefung, "AVISO", 100, True)
+
+
+        If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+
+            MsgBox(dt.Rows.Count & " Datensätze müssen korrigiert werden (S-Betrag des Gestellungseinganges darf nicht größer als der des dem Gestellungsausganges)! " & vbNewLine & "Ansonsten können keine korrekten Werte über die Saldenliste ermittelt werden.")
+            SDL.cProgramFunctions.genExcelFromDT_NEW(dt)
+
+        Else
+
+            MsgBox("keine fehlerhaften Eingaben vorhanden!")
+
+        End If
+
+    End Sub
+
+    Private Sub MehrfacheATBNrToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MehrfacheATBNrToolStripMenuItem.Click
+
+
+        Dim SQLPlausPruefung = " select Temp.gs_ATBNr, Temp.gs_standort, Temp.Datum from (select gs_ATBNr, gs_standort, cast(MIN(gs_datum) as Date) as Datum from tblGesamtsicherheit 
+		where  gs_standort = '" & Standort & "' AND cast(gs_datum as Date) <=   '" & Date.Parse(txtDatBis.Text) & "'
+		group by gs_ATBNr, gs_posNr, gs_standort
+		Having count(*) > 1
+		) as Temp
+		group by Temp.gs_ATBNr, Temp.gs_standort, Temp.Datum
+		order by temp.Datum"
+
+
+
+        Dim dt As New DataTable
+        dt = SQL.loadDgvBySql(SQLPlausPruefung, "AVISO", 100, True)
+
+
+        If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+
+            MsgBox(dt.Rows.Count & " Datensätze müssen korrigiert werden (mehrfache ATB-Einträge pro ATB-Nr)! " & vbNewLine & "Ansonsten können keine korrekten Werte über die Saldenliste ermittelt werden.")
+            SDL.cProgramFunctions.genExcelFromDT_NEW(dt)
+
+        Else
+
+            MsgBox("keine fehlerhaften Eingaben vorhanden!")
+
+        End If
+
+    End Sub
 End Class
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
--- a/Aviso/frmGesamtsicherheitenNEU.resx
+++ b/Aviso/frmGesamtsicherheitenNEU.resx
@@ -124,6 +124,206 @@
    <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>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
+        bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE
+        sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs
+        AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4
+        JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR
+        3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd
+        li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF
+        ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX
+        wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF
+        hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55
+        4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ
+        VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB
+        5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC
+        qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE
+        j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I
+        1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9
+        rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG
+        fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp
+        B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ
+        yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC
+        YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln
+        yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v
+        vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp
+        vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
+        Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
+        bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
+        llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
+        ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
+        xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
+        eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
+        YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
+        XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
+        WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
+        xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
+        dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
+        V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
+        Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
+        Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb
+        PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/
+        0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h
+        /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr
+        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
+        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
+        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAAYBJREFUOE9jYKAAyLnI
+        BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb
+        Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u
+        lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow
+        gIieiEXcpTiw4tgLsc0CKgJwDegGxlyIiUbVjQbY+dmF0F0QeyG2hImViYlbklsOTbyKW4qbE90MFIBu
+        GJJmH2QDYy/ETpW0lEQJDpxAVE9UM/5S/BV0Q5GxRqRGDro+gsAwz7AV3SAQtqi1mMzIwoiunDhg32vf
+        Hn8p/ivMsLiLcWdMK0w10dWRDGLOxPyIuxj30Xm6cya6HNkgeEfwA3SxgQUqKipM1dXVytOmTTNGxhMm
+        TFCztLTEn/6gAACeTwgqe9wYrQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btnUpdateSicherheit.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
+        bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE
+        sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs
+        AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4
+        JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR
+        3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd
+        li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF
+        ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX
+        wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF
+        hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55
+        4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ
+        VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB
+        5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC
+        qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE
+        j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I
+        1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9
+        rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG
+        fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp
+        B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ
+        yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC
+        YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln
+        yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v
+        vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp
+        vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
+        Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
+        bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
+        llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
+        ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
+        xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
+        eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
+        YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
+        XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
+        WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
+        xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
+        dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
+        V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
+        Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
+        Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb
+        PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/
+        0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h
+        /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr
+        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
+        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
+        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAAYBJREFUOE9jYKAAyLnI
+        BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb
+        Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u
+        lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow
+        gIieiEXcpTiw4tgLsc0CKgJwDegGxlyIiUbVjQbY+dmF0F0QeyG2hImViYlbklsOTbyKW4qbE90MFIBu
+        GJJmH2QDYy/ETpW0lEQJDpxAVE9UM/5S/BV0Q5GxRqRGDro+gsAwz7AV3SAQtqi1mMzIwoiunDhg32vf
+        Hn8p/ivMsLiLcWdMK0w10dWRDGLOxPyIuxj30Xm6cya6HNkgeEfwA3SxgQUqKipM1dXVytOmTTNGxhMm
+        TFCztLTEn/6gAACeTwgqe9wYrQAAAABJRU5ErkJggg==
+</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="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>
  <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,5 +1,4 @@
-
-Imports System.Web.UI.WebControls.Expressions
+Imports GrapeCity.Enterprise.Data.Expressions.Tools
 Imports VERAG_PROG_ALLGEMEIN

 Public Class frmGesamtsicherheitenNEU
@@ -118,7 +117,7 @@ Public Class frmGesamtsicherheitenNEU
            End If

        Else
-                LoadDGVSicherheiten(True)
+            LoadDGVSicherheiten(True)
        End If
        LoadStandort()
        cboSicherheitATR.Enabled = currentGesSichRef.brgakto_gs_ATR
@@ -147,7 +146,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,13 +165,12 @@ 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_MRNNr").Width = 130
                        .Columns("gs_atr").HeaderText = "ATR"
                        .Columns("gs_atr").Visible = True
                        .Columns("gs_atr").Width = 35
@@ -181,14 +179,15 @@ Public Class frmGesamtsicherheitenNEU
                        .Columns("gs_ust").DefaultCellStyle.Format = "c2"

                    Case Else
-
                        If Standort = "Verag GmbH" Then
                            .Columns("gs_ATBNr").HeaderText = "Reg-Nr."
                        Else
                            .Columns("gs_ATBNr").HeaderText = "T1 MRN"
                        End If
+                        .Columns("gs_MRNNr").Width = 150
                        .Columns("gs_ATBNr").Width = 150
                End Select
+
                changeLabel(currentGesSichRef.brgakto_gs_ATR)

                .Columns("gs_posNr").Width = 35
@@ -223,44 +222,72 @@ Public Class frmGesamtsicherheitenNEU

        End If

-                calcGesamtsummen()
+        calcGesamtsummen()


    End Sub

-    Public Sub LoadDataTableSicherheitenForExport(list As List(Of Integer), datumVon As String, datumBis As String, standort As String)
+    Public Sub LoadDataTableSicherheitenForZollamt(list As List(Of Integer), datumVon As Date, datumBis As Date, standort As String, Optional detailinfo As Boolean = False, Optional ausfVonBisEingeschraenkt As Boolean = False)

        Me.Cursor = Cursors.WaitCursor

        Dim currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(standort)


-        Dim gsnr As String
-        Dim counter = 0
-        For Each n In list
-            gsnr &= n.ToString()
-            counter = counter + 1
-            If (list.Count <> 0 And counter <> list.Count) Then
-                gsnr &= ","
-            End If
+        'Dim gsnr As String
+        'Dim counter = 0
+        'For Each n In list
+        '    gsnr &= n.ToString()
+        '    counter = counter + 1
+        '    If (list.Count <> 0 And counter <> list.Count) Then
+        '        gsnr &= ","
+        '    End If

-        Next
+        'Next


-        Dim SQLStringSicherheit = "select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "','Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt'
+        'Dim SQLStringSicherheit = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & "
+        '                                    From [tblGesamtsicherheit]
+        '                                    Where [gs_gsnr] In (" & gsnr & ") and isnull(gs_warenwert,0) <> 0
+        '			UNION
+        '                                        Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") &
+        '                                    " From [tblGesamtsicherheitsPositionen] 
+        '                                    where [gsp_gsnr] In (" & gsnr & ")
+        '                                     and isnull(gsp_warenwert,0) <> 0 ) as Temp WHERE Temp.Datum > '" & datumVon.ToShortDateString & "' and Temp.Datum <= '" & datumBis.ToShortDateString & "' " & IIf(nurErstellungisNichtAenderungsdatum, " AND (Temp.Erstellungsdatum is not null AND cast(Temp.Erstellungsdatum as Date) <> cast(Temp.Datum as Date)) OR (Temp.GeänderAm is not null AND cast(Temp.GeänderAm as Date) <> cast(Temp.Datum as Date))", "") &
+        '                                    "order by Temp.Datum, Temp.Uhrzeit  "
+
+
+
+        Dim SQLStringSicherheit_new As String = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & "
                                            From [tblGesamtsicherheit]
-                                            Where [gs_gsnr] In (" & gsnr & ")
-                                            and isnull(gs_warenwert,0) <> 0
+                                            Where 
+											[gs_gsnr] In (
+												SELECT [gs_gsnr]
+                                                FROM tblGesamtsicherheit
+                                                WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) >  '" & datumVon.ToShortDateString & "'  AND cast(gs_datum as Date) <=  '" & datumBis.ToShortDateString & "'  ) 
+                                                and isnull(gs_sicherheitsbetrag,0) <> 0 
+                                                and gs_datum is not null
 											UNION
-                                                Select gsp_gsnr, [gsp_ATCNr],'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],[gsp_art],[gsp_ust]
-                                            From [tblGesamtsicherheitsPositionen] 
-                                            where [gsp_gsnr] In (" & gsnr & ")
-                                            and isnull(gsp_warenwert,0) <> 0 
-											order by Datum, Uhrzeit"
+                                                Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & " From [tblGesamtsicherheitsPositionen] 
+                                           Where gsp_gsnr In ( 
+											
+												SELECT [gs_gsnr] FROM tblGesamtsicherheit WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) >  '" & datumVon.ToShortDateString & "'  AND cast(gs_datum as Date) <=  '" & datumBis.ToShortDateString & "' 
+											
+											) and isnull(gsp_sicherheitsbetrag,0) <> 0 
+                                            and gsp_datum is not null AND cast(gsp_datum as Date) <=  '" & datumBis.ToShortDateString & "'
+                                            ) as Temp  order by Temp.Datum, Temp.Uhrzeit  "


+        Dim SQLStringSicherheit_new_new As String = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & "
+                                            From [tblGesamtsicherheit]
+                                            Where  gs_standort = '" & standort & "' AND cast(gs_datum as Date) >  '" & datumVon.ToShortDateString & "'  AND cast(gs_datum as Date) <=  '" & datumBis.ToShortDateString & "' and gs_datum is not null
+											UNION
+                                                Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & " From [tblGesamtsicherheitsPositionen] 
+                                           Where gsp_gsnr In ( SELECT [gs_gsnr] FROM tblGesamtsicherheit WHERE gs_standort = '" & standort & "'  ) 
+                                            and gsp_datum is not null AND cast(gsp_datum as Date) >=  '" & datumVon.ToShortDateString & "'
+                                            ) as Temp  order by Temp.Datum, Temp.Uhrzeit  "

-        dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit, "AVISO", 100, True)
+        dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit_new_new, "AVISO", 100, True)


        dtSicherheiten.Columns.Add("Saldo")
@@ -269,7 +296,8 @@ Public Class frmGesamtsicherheitenNEU
        drFirst.Item("Nr") = 0
        drFirst.Item("Typ") = "Uebertrag vom"
        drFirst.Item("Datum") = CDate(datumVon).ToShortDateString
-        drFirst.Item("Saldo") = SQL.getValueTxtBySql("SELECT TOP 1 isnull([gs_saldo],0) FROM [tblGesamtsicherheit] where gs_standort = '" & standort & "' AND gs_datum <'" & CDate(datumVon).ToShortDateString & "' order by gs_datum asc", "AVISO",,, currentGesSichRef.getReferenzbetrag(CDate(datumVon).ToShortDateString)) 'CDbl(dtSicherheiten.Rows(0).Item("Saldo"))
+        Dim DefaultSaldo As Double = currentGesSichRef.getReferenzbetrag(CDate(datumVon).ToShortDateString)
+        drFirst.Item("Saldo") = currentGesSichRef.CalcSaldo(, datumVon) 'SQL.getValueTxtBySql("SELECT TOP 1 isnull([gs_saldo],0) FROM [tblGesamtsicherheit] where gs_standort = '" & standort & "' AND gs_datum <'" & CDate(datumVon).ToShortDateString & "' order by gs_datum desc", "AVISO",,, DefaultSaldo) 'CDbl(dtSicherheiten.Rows(0).Item("Saldo"))

        dtSicherheiten.Rows.InsertAt(drFirst, 0)

@@ -300,8 +328,79 @@ Public Class frmGesamtsicherheitenNEU

        dtSicherheiten.Rows.InsertAt(drLast, dtSicherheiten.Rows.Count)

+        If ausfVonBisEingeschraenkt Then
+
+            Dim indexOffirstEntry As Integer = -1
+            Dim indexOflastEntry As Integer = -1
+            Dim startSaldo As Double = -1
+            Dim endSaldo As Double = -1
+            If ausfVonBisEingeschraenkt Then
+                For Each r As DataRow In dtSicherheiten.Rows
+                    If CInt(r.Item("Nr")) <> 0 AndAlso Not IsDBNull(r.Item("Datum")) AndAlso IsDate(r.Item("Datum")) AndAlso CDate(r.Item("Datum")) >= datumVon Then
+                        If indexOffirstEntry < 0 Then
+                            indexOffirstEntry = dtSicherheiten.Rows.IndexOf(r)
+                            startSaldo = r.Item("Saldo") - r.Item("Sicherheitbetrag_Calc")
+                        End If
+                    End If
+
+                    If CInt(r.Item("Nr")) <> 0 AndAlso Not IsDBNull(r.Item("Datum")) AndAlso IsDate(r.Item("Datum")) AndAlso CDate(r.Item("Datum")) >= datumVon Then
+
+                        If CDate(r.Item("Datum")) > datumBis Then
+
+                            If indexOflastEntry < 0 Then
+                                indexOflastEntry = dtSicherheiten.Rows.IndexOf(r) - 1
+                                endSaldo = r.Item("Saldo") + (r.Item("Sicherheitbetrag_Calc") * -1)
+                            End If
+                        Else
+
+
+                            indexOflastEntry = dtSicherheiten.Rows.IndexOf(r)
+                                endSaldo = r.Item("Saldo")
+
+                            End If
+
+
+                    End If
+                Next
+            End If
+
+            Dim sicherheiten_cleared As DataTable = dtSicherheiten.Clone()
+            Dim counter As Integer = 1
+
+            For Each row_insert As DataRow In dtSicherheiten.Rows
+                Dim idx As Integer = dtSicherheiten.Rows.IndexOf(row_insert)
+
+                If idx >= indexOffirstEntry AndAlso idx <= indexOflastEntry Then
+                    Dim newRow As DataRow = sicherheiten_cleared.NewRow()
+                    newRow.ItemArray = row_insert.ItemArray.Clone()
+                    sicherheiten_cleared.Rows.Add(newRow)
+
+                    counter += 1
+                End If
+            Next
+
+            Dim drFirst_new = sicherheiten_cleared.NewRow
+            drFirst_new.Item("Nr") = 0
+            drFirst_new.Item("Typ") = "Uebertrag vom"
+            drFirst_new.Item("Datum") = CDate(datumVon).ToShortDateString
+            drFirst_new.Item("Saldo") = CDbl(startSaldo)
+
+            sicherheiten_cleared.Rows.InsertAt(drFirst_new, 0)
+
+            Dim drLast_new = sicherheiten_cleared.NewRow
+
+            drLast_new.Item("Nr") = 0
+            drLast_new.Item("Typ") = "Saldo zum"
+            drLast_new.Item("Datum") = CDate(datumBis).ToShortDateString
+            drLast_new.Item("Saldo") = CDbl(endSaldo)
+
+            sicherheiten_cleared.Rows.InsertAt(drLast_new, sicherheiten_cleared.Rows.Count)
+
+            If sicherheiten_cleared.Rows.Count > 2 Then SDL.cProgramFunctions.genExcelFromDT_NEW(sicherheiten_cleared)
+
+
+        End If

-        'dtSicherheiten.Columns.Remove("Sicherheitbetrag_Calc")

        Me.Cursor = Cursors.Default

@@ -309,10 +408,12 @@ Public Class frmGesamtsicherheitenNEU



-    Public Sub LoadDataTableSicherheitenForExport2(list As List(Of Integer), datumVon As String, datumBis As String)
+    Public Sub LoadDataTableSicherheitenForExport(list As List(Of Integer), datumVon As Date, datumBis As Date, standort As String, Optional detailinfo As Boolean = False, Optional nurErstellungisNichtAenderungsdatum As Boolean = False)

        Me.Cursor = Cursors.WaitCursor

+        Dim currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(standort)
+
        Dim gsnr As String
        Dim counter = 0
        For Each n In list
@@ -324,12 +425,27 @@ Public Class frmGesamtsicherheitenNEU

        Next

-        Dim SQLStringSicherheit As String = "select  [gs_ATBNr] as 'Reg-Nr. 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_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 & ")
-                                            order by gs_gsId"
+        Dim SQLStringSicherheit As String = "select  [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, 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', gs_art,  
+                                            [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, gsp_art" &
+                                            IIf(detailinfo, ", gs_erstellungsdatum as 'Eingang erstellt am', gs_systemuser as 'von', gs_zuletztgeandert as ' Eingang geändert am',  gsp_erstellungsdatum as 'Ausgang erstellt am', gsp_systemuser as 'von_', gsp_zuletztgeandert as ' Ausgang geändert am'", "") &
+                                            "from [tblGesamtsicherheit]
+                                            left join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId
+                                             where [gs_gsnr] IN (" & gsnr & ") AND cast(gs_datum as Date) between '" & datumVon.ToShortDateString & "' and '" & datumBis.ToShortDateString & "'" & IIf(nurErstellungisNichtAenderungsdatum, "  AND (
+											 (cast(gs_datum as Date) <> cast(gs_erstellungsdatum as Date) OR gs_zuletztgeandert is not null and  cast(gs_datum as Date) <> cast(gs_zuletztgeandert as Date))
+											 OR  gsp_zuletztgeandert is not null and  cast(gsp_datum as Date) <> cast(gsp_zuletztgeandert as Date)) ", " ") & "order by gs_gsId gs_datum, gs_, gsp_datum"
+
+
+
+        Dim SQLStringSicherheit_new As String = "	select  [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, 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_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" &
+                                            IIf(detailinfo, ", gs_erstellungsdatum as 'Eingang erstellt am', gs_systemuser as 'von', gs_zuletztgeandert as ' Eingang geändert am',  gsp_erstellungsdatum as 'Ausgang erstellt am', gsp_systemuser as 'von_', gsp_zuletztgeandert as ' Ausgang geändert am'", "") &
+                                            "From tblGesamtsicherheit
+                                            Where gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0
+                                            left join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId
+                                             where [gs_gsnr] IN (SELECT gs_gsnr FROM tblGesamtsicherheit WHERE gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0 )) AND cast(gs_datum as Date) between '" & datumVon.ToShortDateString & "' and '" & datumBis.ToShortDateString & "'" & IIf(nurErstellungisNichtAenderungsdatum, "  AND (
+											 (cast(gs_datum as Date) <> cast(gs_erstellungsdatum as Date) OR gs_zuletztgeandert is not null and  cast(gs_datum as Date) <> cast(gs_zuletztgeandert as Date))
+											 OR  gsp_zuletztgeandert is not null and  cast(gsp_datum as Date) <> cast(gsp_zuletztgeandert as Date)) ", " ") & "order by gs_gsId"
+


        dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit, "AVISO", 100, True)
@@ -337,9 +453,13 @@ Public Class frmGesamtsicherheitenNEU

        dtSicherheiten.Columns.Add("SSaldo")

+        If currentGesSichRef Is Nothing Then
+            currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(standort)
+        End If
+
        Dim drFirst = dtSicherheiten.NewRow
        drFirst.Item("Reg-Nr. Verwahrlager") = "Uebertrag vom " & datumVon
-        drFirst.Item("SSaldo") = CDbl(dtSicherheiten.Rows(0).Item("Saldo"))
+        drFirst.Item("SSaldo") = currentGesSichRef.CalcSaldo(, datumVon)  'CDbl(dtSicherheiten.Rows(0).Item("Saldo"))

        dtSicherheiten.Rows.InsertAt(drFirst, 0)

@@ -354,8 +474,8 @@ Public Class frmGesamtsicherheitenNEU

            saldoStart = CDbl(dtSicherheiten.Rows(0).Item("SSaldo"))
            saldo = CDbl(dtSicherheiten.Rows(i - 1).Item("SSaldo"))
-            sicherheitsbetragATCs = CDbl(dtSicherheiten.Rows(i).Item("Sicherheitbetrag"))
-            sicherheitsbetragATBs = CDbl(dtSicherheiten.Rows(i).Item("Sicherheitsbetrag2"))
+            If Not IsDBNull(dtSicherheiten.Rows(i).Item("Sicherheitbetrag")) Then sicherheitsbetragATCs = CDbl(dtSicherheiten.Rows(i).Item("Sicherheitbetrag"))
+            If Not IsDBNull(dtSicherheiten.Rows(i).Item("Sicherheitsbetrag2")) Then sicherheitsbetragATBs = CDbl(dtSicherheiten.Rows(i).Item("Sicherheitsbetrag2"))

            c1 = saldo - sicherheitsbetragATCs + sicherheitsbetragATBs

@@ -583,7 +703,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
@@ -641,6 +761,9 @@ Public Class frmGesamtsicherheitenNEU
    Private Sub btnAddSicherheit_Click(sender As Object, e As EventArgs) Handles btnAddSicherheit.Click
        Try

+            SaldoNew = Decimal.Parse(currentGesSichRef.CalcSaldo())
+            lblSaldo.Text = "Saldo: €" & SaldoNew.ToString("N")
+
            If (txtSicherheitATBNr.Text = "") Then
                txtSicherheitATBNr.Focus()
                Exit Sub
@@ -688,6 +811,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 +839,14 @@ Public Class frmGesamtsicherheitenNEU
                    Case Else
                        With OPEN
                            .gs_posNr = getLatestPosNr(gessicherheitID, txtSicherheitATBNr.Text) + 1
+
+                            If .gs_MRNNr <> "" Then
+                                .gs_posSubNr = getLatestSubPosNr(gessicherheitID, txtSicherheitATBNr.Text, txtMRNNr.Text) + 1
+                            Else
+                                .gs_posSubNr = Nothing
+                            End If
+
+
                        End With
                        attachPosNrToExistingATB = True
                        indexGsId = OPEN.SAVEOBJECT()
@@ -736,7 +869,7 @@ Public Class frmGesamtsicherheitenNEU
                    .gsp_sicherheitsbetrag = 0
                    .gsp_freitext = ""
                    .gsp_filialenNr = OPEN.gs_filialenNr
-                    .gsp_art = "OPEN"
+                    .gsp_art = "CLOSE"
                    .gsp_abfertigungsNr = OPEN.gs_abfertigungsnr
                    .gsp_erstellungsdatum = DateTime.Now
                    .gsp_ust = ""
@@ -759,6 +892,9 @@ Public Class frmGesamtsicherheitenNEU

    Private Sub btnAddPos_Click(sender As Object, e As EventArgs) Handles btnAddPos.Click

+        SaldoNew = Decimal.Parse(currentGesSichRef.CalcSaldo())
+        lblSaldo.Text = "Saldo: €" & SaldoNew.ToString("N")
+
        If dgvGesamtsicherheit.SelectedRows.Count = 0 Then
            MsgBox("Bitte eine Gestellung markieren, zu diese eine Pos hinzugefügt/entfernt/aktualisiert werden soll")
            Exit Sub
@@ -775,6 +911,12 @@ Public Class frmGesamtsicherheitenNEU
            With OPEN
                .gs_gsNr = gessicherheitID
                .gs_ATBNr = ""
+                .gs_MRNNr = ""
+                If .gs_MRNNr <> "" Then
+                    .gs_posSubNr = Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1
+                Else
+                    .gs_posSubNr = Nothing
+                End If
                .gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
                .gs_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
                .gs_warenwert = 0
@@ -964,7 +1106,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 +1117,7 @@ Public Class frmGesamtsicherheitenNEU

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

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

        With currentSicherheit
            .gs_ATBNr = txtSicherheitATBNr.Text
+            .gs_MRNNr = txtMRNNr.Text
            .gs_posNr = Integer.Parse(setNullToZero(txtAnzahlPos.Text))
+            If .gs_MRNNr <> "" Then
+                .gs_posSubNr = IIf(Integer.Parse(setNullToZero(txtSPosNr.Text)) <> 0, Integer.Parse(setNullToZero(txtSPosNr.Text)), Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1)
+            Else
+                .gs_posSubNr = Nothing
+            End If
            .gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDat.Text, txtSicherheitTime.Text)
            .gs_warenwert = Double.Parse(txtSicherheitWarenwert.Text)
            .gs_sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text)
@@ -1013,6 +1164,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
@@ -1092,8 +1244,10 @@ Public Class frmGesamtsicherheitenNEU
            Dim posNr = currentSicherheit.gs_posNr
            Dim ATBNr = currentSicherheit.gs_ATBNr
            Dim gsNr = currentSicherheit.gs_gsNr
+            Dim subPosNr = currentSicherheit.gs_posSubNr
            currentSicherheit.Delete()
            rearangePosNr(gsNr, ATBNr, posNr)
+            'rearangeSubPosNr(gsNr, ATBNr, posNr, subPosNr)
            btnUpdateSicherheit.Visible = False
            btnAddSicherheit.Visible = True
            btnDeleteSicherheit.Visible = False
@@ -1182,6 +1336,23 @@ Public Class frmGesamtsicherheitenNEU

    End Function

+
+    Private Function getLatestSubPosNr(gs_gsnr As Integer, gs_ATBNr As String, 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 is not null and gs_MRNNr = '" & gs_MRNNr & "'  And gs_ATBNR = '" & gs_ATBNr & "'"
+        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)
@@ -1220,7 +1391,7 @@ Public Class frmGesamtsicherheitenNEU
            '    Return False
            'End If

-            If (offenerSicherheitsbetrag < 0 Or offenerSicherheitsbetrag < offenerSicherheitsbetragPos) Then
+            If (offenerSicherheitsbetrag <0 Or offenerSicherheitsbetrag <offenerSicherheitsbetragPos) Then
                If vbYes = MsgBox("Der Warenwert der Positionen übersteigt den Warenwert der Gestellung!" & vbCrLf & "Trotzdem speichen?", vbYesNo) Then
                    Return True
                Else
@@ -1594,7 +1765,7 @@ Public Class frmGesamtsicherheitenNEU

        If posNr = -1 Or posNr = 1 Then Exit Sub

-        Dim sqlq As String = "select [gs_gsId], [gs_posNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posNr > '" & posNr & "'"
+        Dim sqlq As String = "select [gs_gsId], [gs_posNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posNr >= " & posNr
        Dim dt As New DataTable
        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)

@@ -1602,10 +1773,39 @@ Public Class frmGesamtsicherheitenNEU


        For i As Integer = 0 To dt.Rows.Count - 1
-            'MsgBox("gs_gsId: " & dt.Rows(i).Item("gs_gsId").ToString & " " & "gs_posNr: " & dt.Rows(i).Item("gs_posNr").ToString)
            Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr"))
            Dim currentPos = sicherheit.gs_posNr
+
+            If sicherheit.gs_posSubNr IsNot Nothing Then
+                rearangeSubPosNr(gsNr, ATBNr, currentPos, sicherheit.gs_posSubNr)
+            End If
+
            sicherheit.gs_posNr = currentPos - 1
+
+            sicherheit.UPDATEWithNewPosNr(True)
+
+        Next
+
+
+    End Sub
+
+
+    Private Sub rearangeSubPosNr(gsNr As Integer, ATBNr As String, posNr As Integer, subposNr As Integer)
+
+        If subposNr = -1 Or subposNr = 1 Then Exit Sub
+
+        'Dim sqlq As String = "select [gs_gsId], [gs_posNr] ,[gs_posSubNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posNr >= " & posNr & " AND gs_posSubNr >= " & subposNr
+        Dim sqlq As String = "select [gs_gsId], [gs_posNr] ,[gs_posSubNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posSubNr >= " & subposNr
+        Dim dt As New DataTable
+        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
+
+        If (dt.Rows.Count = 0) Then Exit Sub
+
+
+        For i As Integer = 0 To dt.Rows.Count - 1
+            Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr"), dt.Rows(i).Item("gs_posSubNr"))
+            Dim currentPos = sicherheit.gs_posSubNr
+            sicherheit.gs_posSubNr = currentPos - 1
            sicherheit.UPDATEWithNewPosNr()

        Next
@@ -1643,6 +1843,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 +1897,51 @@ 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.Cast(Of DataGridViewRow)().OrderBy(Function(r)
+                                                                                                                               Dim v = r.Cells("gs_posNr").Value
+                                                                                                                               Return If(IsNumeric(v), CInt(v), 0)
+                                                                                                                           End Function)
+                        Dim sicherh As New cSicherheiten(row.Cells("gs_gsId").Value, row.Cells("gs_posNr").Value)
+                        sicherh.gs_MRNNr = txtATBNraendern.Text
+                        If sicherh.gs_MRNNr <> "" Then
+                            sicherh.gs_posSubNr = IIf(Integer.Parse(setNullToZero(txtSPosNr.Text)) <> 0, Integer.Parse(setNullToZero(txtSPosNr.Text)), Me.getLatestSubPosNr(sicherh.gs_gsNr, sicherh.gs_ATBNr, sicherh.gs_MRNNr) + 1)
+                        Else
+                            sicherh.gs_posSubNr = Nothing
+                        End If
+                        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
@@ -1860,7 +2093,7 @@ Public Class frmGesamtsicherheitenNEU
    Private Sub changeLabel(Optional isATR As Boolean = True)

        If Standort = "Verag GmbH" Then
-            Label1.Text = "Reg-Nr."
+            'Label1.Text = "Reg-Nr."

            If isATR Then
                Label12.Text = "Reg-Nr. / MRN"
@@ -1872,10 +2105,10 @@ Public Class frmGesamtsicherheitenNEU

        ElseIf Standort = "VERAG AG" Then
            Label12.Text = "T1 CRN"
-            Label1.Text = "T1 MRN"
+            'Label1.Text = "T1 MRN"
        Else
            Label12.Text = "EZA / T1 CRN"
-            Label1.Text = "T1 MRN"
+            'Label1.Text = "T1 MRN"
        End If

    End Sub
@@ -1883,6 +2116,9 @@ Public Class frmGesamtsicherheitenNEU
    Private Sub btnRundungsdifAusgl_Click(sender As Object, e As EventArgs) Handles btnRundungsdifAusgl.Click

        Try
+            SaldoNew = Decimal.Parse(currentGesSichRef.CalcSaldo())
+            lblSaldo.Text = "Saldo: €" & SaldoNew.ToString("N")
+
            If (rundungsdiff <> 0) AndAlso checkIfRundungsPosExists() = False Then

                Dim OPEN As New cSicherheiten()
@@ -1890,7 +2126,15 @@ 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
+
+                    If .gs_MRNNr <> "" Then
+                        .gs_posSubNr = Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1
+                    Else
+                        .gs_posSubNr = Nothing
+                    End If
+
                    .gs_datum = DateTime.Now
                    .gs_warenwert = 0
                    .gs_sicherheitsbetrag = 0
@@ -2008,4 +2252,68 @@ 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
+                    Dim subPosNr = currentSicherheit.gs_posSubNr
+
+                    If currentSicherheit.hasEntry Then
+                        currentSicherheit.Delete()
+                        rearangePosNr(gsNr, ATBNr, posNr)
+                        ' If subPosNr IsNot Nothing Then rearangeSubPosNr(gsNr, ATBNr, posNr, subPosNr)
+                    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
@@ -24,15 +24,15 @@ Partial Class frmHauptfenster
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster))
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        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 DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem()
        Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -79,6 +79,7 @@ Partial Class frmHauptfenster
        Me.RoutenverwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AnhangsartenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.SpireLizenzPrüfenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.UNBescheinigungAusTFEinlesenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
        Me.FirmaWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.VERAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -115,6 +116,7 @@ Partial Class frmHauptfenster
        Me.GesendeteSMSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.MRNBarcodedruckToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.NewsletterToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator()
        Me.tool_BRGXLS = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem()
@@ -138,6 +140,7 @@ Partial Class frmHauptfenster
        Me.toolOriginalATR = New System.Windows.Forms.ToolStripMenuItem()
        Me.SDLAbholaufträgeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem13 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.VerträgeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.VorauskassenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator11 = New System.Windows.Forms.ToolStripSeparator()
        Me.EssensbestellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -208,6 +211,8 @@ Partial Class frmHauptfenster
        Me.WOCECKLISTEZEWDHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.HandbuchToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.VERAGWIKIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.WikiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.MitarbeiterverzeichnisToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.BREXITToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.GVMSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.GVMSUKIMportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -287,11 +292,12 @@ Partial Class frmHauptfenster
        Me.lblHinweis = New System.Windows.Forms.Label()
        Me.Label20 = New System.Windows.Forms.Label()
        Me.pnlLinksOben = New System.Windows.Forms.Panel()
+        Me.Button9 = New System.Windows.Forms.Button()
+        Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem()
        Me.Label22 = New System.Windows.Forms.Label()
        Me.btnE_Aviso = New System.Windows.Forms.Button()
        Me.btnNeu = New System.Windows.Forms.Button()
-        Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem()
        Me.Button7 = New System.Windows.Forms.Button()
        Me.picAVISOMessenger = New System.Windows.Forms.PictureBox()
        Me.pic = New System.Windows.Forms.PictureBox()
@@ -413,9 +419,7 @@ Partial Class frmHauptfenster
        Me.Panel5 = New System.Windows.Forms.Panel()
        Me.Panel7 = New System.Windows.Forms.Panel()
        Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
-        Me.WikiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.MitarbeiterverzeichnisToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.VerträgeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
        Me.pnlDetailsRechts.SuspendLayout()
@@ -464,7 +468,7 @@ Partial Class frmHauptfenster
        'mnuInfo
        '
        Me.mnuInfo.Name = "mnuInfo"
-        Me.mnuInfo.Size = New System.Drawing.Size(222, 30)
+        Me.mnuInfo.Size = New System.Drawing.Size(214, 22)
        Me.mnuInfo.Text = "Info"
        '
        'conÜbernehmen
@@ -649,7 +653,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.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem})
        Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem"
        Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(213, 22)
        Me.AdministrationToolStripMenuItem.Text = "Administration"
@@ -658,99 +662,105 @@ 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"
        '
+        'UNBescheinigungAusTFEinlesenToolStripMenuItem
+        '
+        Me.UNBescheinigungAusTFEinlesenToolStripMenuItem.Name = "UNBescheinigungAusTFEinlesenToolStripMenuItem"
+        Me.UNBescheinigungAusTFEinlesenToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
+        Me.UNBescheinigungAusTFEinlesenToolStripMenuItem.Text = "UN-Bescheinigung aus TF einlesen"
+        '
        'ToolStripSeparator4
        '
        Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
@@ -915,7 +925,7 @@ Partial Class frmHauptfenster
        '
        'FunktionenToolStripMenuItem
        '
-        Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.GesamtsicherheitenToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator23, Me.toolOriginalATR, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VerträgeToolStripMenuItem, Me.VorauskassenToolStripMenuItem, Me.ToolStripSeparator11, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.ToolStripSeparator24, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem, Me.APIToolStripMenuItem, Me.FIBUSachkontenToolStripMenuItem})
+        Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.NewsletterToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.GesamtsicherheitenToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator23, Me.toolOriginalATR, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VerträgeToolStripMenuItem, Me.VorauskassenToolStripMenuItem, Me.ToolStripSeparator11, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.ToolStripSeparator24, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem, Me.APIToolStripMenuItem, Me.FIBUSachkontenToolStripMenuItem})
        Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem"
        Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 16)
        Me.FunktionenToolStripMenuItem.Text = "Funktionen"
@@ -923,26 +933,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
@@ -950,7 +960,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
@@ -968,51 +978,57 @@ 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"
        '
+        'NewsletterToolStripMenuItem
+        '
+        Me.NewsletterToolStripMenuItem.Name = "NewsletterToolStripMenuItem"
+        Me.NewsletterToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.NewsletterToolStripMenuItem.Text = "Newsletter"
+        '
        '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
        '
@@ -1020,7 +1036,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
        '
@@ -1070,25 +1086,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
@@ -1100,69 +1116,76 @@ 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
+        '
+        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
        '
@@ -1181,13 +1204,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
        '
@@ -1262,20 +1285,20 @@ Partial Class frmHauptfenster
        Me.MANAGERToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold)
        Me.MANAGERToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.android_note
        Me.MANAGERToolStripMenuItem.Name = "MANAGERToolStripMenuItem"
-        Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
        Me.MANAGERToolStripMenuItem.Text = "Formular - Manager"
        '
        'ToolStripSeparator3
        '
        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(282, 6)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(274, 6)
        '
        'MailvorlagenToolStripMenuItem
        '
        Me.MailvorlagenToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold)
        Me.MailvorlagenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.stift
        Me.MailvorlagenToolStripMenuItem.Name = "MailvorlagenToolStripMenuItem"
-        Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
        Me.MailvorlagenToolStripMenuItem.Text = "Mailvorlagen"
        Me.MailvorlagenToolStripMenuItem.Visible = False
        '
@@ -1283,7 +1306,7 @@ Partial Class frmHauptfenster
        '
        Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStrVM_de, Me.ZollvollmachtDEFiskalToolStripMenuItem, Me.toolStrVM_at, Me.toolStrVM_at4200, Me.ZollvollmachtATEVToolStripMenuItem})
        Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
-        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(285, 30)
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(277, 22)
        Me.ToolStripMenuItem2.Text = "Vollmachten"
        '
        'toolStrVM_de
@@ -1319,38 +1342,38 @@ Partial Class frmHauptfenster
        'ToolStripMenuItem7
        '
        Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7"
-        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(285, 30)
+        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(277, 22)
        Me.ToolStripMenuItem7.Text = "Gestellungsgarantien"
        '
        'ToolStripMenuItem12
        '
        Me.ToolStripMenuItem12.Name = "ToolStripMenuItem12"
-        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(285, 30)
+        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(277, 22)
        Me.ToolStripMenuItem12.Text = "Importaviso"
        '
        'ToolStripMenuItem15
        '
        Me.ToolStripMenuItem15.Name = "ToolStripMenuItem15"
-        Me.ToolStripMenuItem15.Size = New System.Drawing.Size(285, 30)
+        Me.ToolStripMenuItem15.Size = New System.Drawing.Size(277, 22)
        Me.ToolStripMenuItem15.Text = "Dispoliste"
        '
        'ToolStripMenuItem18
        '
        Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18"
-        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(285, 30)
+        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(277, 22)
        Me.ToolStripMenuItem18.Text = "Verzollungspreise"
        '
        'AuftragÜberwachungsdokumentToolStripMenuItem
        '
        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Name = "AuftragÜberwachungsdokumentToolStripMenuItem"
-        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Text = "Auftrag Überwachungsdokument"
        '
        'toolVUB
        '
        Me.toolVUB.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VUBVERAGSpeditionAGToolStripMenuItem, Me.VeragCustomsServiceToolStripMenuItem})
        Me.toolVUB.Name = "toolVUB"
-        Me.toolVUB.Size = New System.Drawing.Size(285, 30)
+        Me.toolVUB.Size = New System.Drawing.Size(277, 22)
        Me.toolVUB.Text = "VUB"
        '
        'VUBVERAGSpeditionAGToolStripMenuItem
@@ -1368,37 +1391,37 @@ Partial Class frmHauptfenster
        'toolVPCreditreform
        '
        Me.toolVPCreditreform.Name = "toolVPCreditreform"
-        Me.toolVPCreditreform.Size = New System.Drawing.Size(285, 30)
+        Me.toolVPCreditreform.Size = New System.Drawing.Size(277, 22)
        Me.toolVPCreditreform.Text = "Bonitätsauskunft (Creditreform)"
        Me.toolVPCreditreform.Visible = False
        '
        'ToolStripSeparator9
        '
        Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
-        Me.ToolStripSeparator9.Size = New System.Drawing.Size(282, 6)
+        Me.ToolStripSeparator9.Size = New System.Drawing.Size(274, 6)
        '
        'VerzollungsunterlagenToolStripMenuItem
        '
        Me.VerzollungsunterlagenToolStripMenuItem.Name = "VerzollungsunterlagenToolStripMenuItem"
-        Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
        Me.VerzollungsunterlagenToolStripMenuItem.Text = "Verzollungsunterlagen"
        '
        'ToolStripMenuItem11
        '
        Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11"
-        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(285, 30)
+        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(277, 22)
        Me.ToolStripMenuItem11.Text = "Verzollungsunterlagen BAR"
        '
        'ToolStripSeparator6
        '
        Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(282, 6)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(274, 6)
        '
        'WAIDHAUSToolStripMenuItem
        '
        Me.WAIDHAUSToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem8, Me.ToolStripMenuItem9, Me.AnnahmeblattIMPORTToolStripMenuItem, Me.AnnahmeblattEXPORTToolStripMenuItem, Me.ChecklisteVerwahrlagerToolStripMenuItem})
        Me.WAIDHAUSToolStripMenuItem.Name = "WAIDHAUSToolStripMenuItem"
-        Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
        Me.WAIDHAUSToolStripMenuItem.Text = "WAIDHAUS"
        '
        'ToolStripMenuItem8
@@ -1434,36 +1457,36 @@ Partial Class frmHauptfenster
        'ToolStripSeparator13
        '
        Me.ToolStripSeparator13.Name = "ToolStripSeparator13"
-        Me.ToolStripSeparator13.Size = New System.Drawing.Size(282, 6)
+        Me.ToolStripSeparator13.Size = New System.Drawing.Size(274, 6)
        '
        'EinheitspapierToolStripMenuItem
        '
        Me.EinheitspapierToolStripMenuItem.Name = "EinheitspapierToolStripMenuItem"
-        Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
        Me.EinheitspapierToolStripMenuItem.Text = "Einheitspapier 0777 (Vereinfachte ZA)"
        '
        'CMRToolStripMenuItem
        '
        Me.CMRToolStripMenuItem.Name = "CMRToolStripMenuItem"
-        Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
        Me.CMRToolStripMenuItem.Text = "CMR"
        '
        'Einheitspapier0735VersandverfahrenToolStripMenuItem
        '
        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Name = "Einheitspapier0735VersandverfahrenToolStripMenuItem"
-        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Text = "Einheitspapier 0735 (Versandverfahren)"
        '
        'CarnetTIRToolStripMenuItem
        '
        Me.CarnetTIRToolStripMenuItem.Name = "CarnetTIRToolStripMenuItem"
-        Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
        Me.CarnetTIRToolStripMenuItem.Text = "Carnet TIR"
        '
        'CarnetTIRALTToolStripMenuItem
        '
        Me.CarnetTIRALTToolStripMenuItem.Name = "CarnetTIRALTToolStripMenuItem"
-        Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
        Me.CarnetTIRALTToolStripMenuItem.Text = "Carnet TIR (ALT)"
        '
        'mnuFragezeichen
@@ -1479,7 +1502,7 @@ Partial Class frmHauptfenster
        '
        Me.VerfahrenshandbücherToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem})
        Me.VerfahrenshandbücherToolStripMenuItem.Name = "VerfahrenshandbücherToolStripMenuItem"
-        Me.VerfahrenshandbücherToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
+        Me.VerfahrenshandbücherToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
        Me.VerfahrenshandbücherToolStripMenuItem.Text = "Verfahrenshandbücher"
        '
        'VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem
@@ -1492,7 +1515,7 @@ Partial Class frmHauptfenster
        '
        Me.ChecklistenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ChecklisteWOCHECKLISTEZEallgemein, Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem, Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem, Me.ToolStripSeparator22, Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem, Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1, Me.ToolStripSeparator21, Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem, Me.WOCECKLISTEZEWDHToolStripMenuItem})
        Me.ChecklistenToolStripMenuItem.Name = "ChecklistenToolStripMenuItem"
-        Me.ChecklistenToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
+        Me.ChecklistenToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
        Me.ChecklistenToolStripMenuItem.Text = "DE-Warenorte/Checklisten"
        '
        'ChecklisteWOCHECKLISTEZEallgemein
@@ -1550,7 +1573,7 @@ Partial Class frmHauptfenster
        'HandbuchToolStripMenuItem
        '
        Me.HandbuchToolStripMenuItem.Name = "HandbuchToolStripMenuItem"
-        Me.HandbuchToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
+        Me.HandbuchToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
        Me.HandbuchToolStripMenuItem.Text = "Handbuch"
        '
        'VERAGWIKIToolStripMenuItem
@@ -1558,9 +1581,21 @@ Partial Class frmHauptfenster
        Me.VERAGWIKIToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.WikiToolStripMenuItem, Me.MitarbeiterverzeichnisToolStripMenuItem})
        Me.VERAGWIKIToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.wiki
        Me.VERAGWIKIToolStripMenuItem.Name = "VERAGWIKIToolStripMenuItem"
-        Me.VERAGWIKIToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
+        Me.VERAGWIKIToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
        Me.VERAGWIKIToolStripMenuItem.Text = "VERAG-WIKI"
        '
+        'WikiToolStripMenuItem
+        '
+        Me.WikiToolStripMenuItem.Name = "WikiToolStripMenuItem"
+        Me.WikiToolStripMenuItem.Size = New System.Drawing.Size(190, 22)
+        Me.WikiToolStripMenuItem.Text = "Wiki"
+        '
+        'MitarbeiterverzeichnisToolStripMenuItem
+        '
+        Me.MitarbeiterverzeichnisToolStripMenuItem.Name = "MitarbeiterverzeichnisToolStripMenuItem"
+        Me.MitarbeiterverzeichnisToolStripMenuItem.Size = New System.Drawing.Size(190, 22)
+        Me.MitarbeiterverzeichnisToolStripMenuItem.Text = "Mitarbeiterverzeichnis"
+        '
        'BREXITToolStripMenuItem
        '
        Me.BREXITToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GVMSToolStripMenuItem, Me.GVMSUKIMportToolStripMenuItem, Me.GVMSBeschreibungToolStripMenuItem, Me.ToolStripSeparator14, Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem, Me.TicketIBFBeschreibungToolStripMenuItem, Me.IBFStatusToolStripMenuItem, Me.ToolStripSeparator15, Me.FREnveloppeSmartBorderToolStripMenuItem, Me.ToolStripSeparator16, Me.PBNIrelandFähreToolStripMenuItem, Me.ToolStripSeparator20, Me.WARENORTToolStripMenuItem, Me.ToolStripMenuItem14, Me.ToolStripSeparator18, Me.EORIUKGeneriertenToolStripMenuItem, Me.KAPKentAccessPermitToolStripMenuItem})
@@ -2436,6 +2471,7 @@ Partial Class frmHauptfenster
        '
        'pnlLinksOben
        '
+        Me.pnlLinksOben.Controls.Add(Me.Button9)
        Me.pnlLinksOben.Controls.Add(Me.Label22)
        Me.pnlLinksOben.Controls.Add(Me.btnE_Aviso)
        Me.pnlLinksOben.Controls.Add(Me.btnNeu)
@@ -2446,6 +2482,36 @@ Partial Class frmHauptfenster
        Me.pnlLinksOben.Size = New System.Drawing.Size(164, 91)
        Me.pnlLinksOben.TabIndex = 1
        '
+        'Button9
+        '
+        Me.Button9.ContextMenuStrip = Me.cntxtAtilla
+        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button9.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button9.ForeColor = System.Drawing.Color.Black
+        Me.Button9.Image = CType(resources.GetObject("Button9.Image"), System.Drawing.Image)
+        Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button9.Location = New System.Drawing.Point(127, 4)
+        Me.Button9.MaximumSize = New System.Drawing.Size(121, 34)
+        Me.Button9.Name = "Button9"
+        Me.Button9.Size = New System.Drawing.Size(40, 34)
+        Me.Button9.TabIndex = 12
+        Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button9.UseVisualStyleBackColor = True
+        Me.Button9.Visible = False
+        '
+        'cntxtAtilla
+        '
+        Me.cntxtAtilla.ImageScalingSize = New System.Drawing.Size(24, 24)
+        Me.cntxtAtilla.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem17})
+        Me.cntxtAtilla.Name = "cntxt"
+        Me.cntxtAtilla.Size = New System.Drawing.Size(112, 26)
+        '
+        'ToolStripMenuItem17
+        '
+        Me.ToolStripMenuItem17.Name = "ToolStripMenuItem17"
+        Me.ToolStripMenuItem17.Size = New System.Drawing.Size(111, 22)
+        Me.ToolStripMenuItem17.Text = "ATILLA"
+        '
        'Label22
        '
        Me.Label22.BackColor = System.Drawing.Color.Red
@@ -2492,19 +2558,6 @@ Partial Class frmHauptfenster
        Me.btnNeu.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnNeu.UseVisualStyleBackColor = True
        '
-        'cntxtAtilla
-        '
-        Me.cntxtAtilla.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.cntxtAtilla.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem17})
-        Me.cntxtAtilla.Name = "cntxt"
-        Me.cntxtAtilla.Size = New System.Drawing.Size(112, 26)
-        '
-        'ToolStripMenuItem17
-        '
-        Me.ToolStripMenuItem17.Name = "ToolStripMenuItem17"
-        Me.ToolStripMenuItem17.Size = New System.Drawing.Size(111, 22)
-        Me.ToolStripMenuItem17.Text = "ATILLA"
-        '
        'Button7
        '
        Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -2604,38 +2657,38 @@ Partial Class frmHauptfenster
        Me.gridMyAviso.AllowUserToDeleteRows = False
        Me.gridMyAviso.AllowUserToOrderColumns = True
        Me.gridMyAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure
-        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
+        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
        Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
-        DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
+        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
        Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle12
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3
        Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill
        Me.gridMyAviso.Location = New System.Drawing.Point(0, 21)
        Me.gridMyAviso.Name = "gridMyAviso"
        Me.gridMyAviso.ReadOnly = True
-        DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle13
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
        Me.gridMyAviso.RowHeadersVisible = False
        Me.gridMyAviso.RowHeadersWidth = 62
        Me.gridMyAviso.Size = New System.Drawing.Size(328, 279)
@@ -3048,47 +3101,47 @@ Partial Class frmHauptfenster
        Me.gridAviso.AllowUserToAddRows = False
        Me.gridAviso.AllowUserToDeleteRows = False
        Me.gridAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle14.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
        Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray
        Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable
-        DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle15.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle15.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15
+        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6
        Me.gridAviso.ColumnHeadersHeight = 25
        Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle16
+        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle7
        Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill
        Me.gridAviso.Location = New System.Drawing.Point(0, 248)
        Me.gridAviso.MultiSelect = False
        Me.gridAviso.Name = "gridAviso"
        Me.gridAviso.ReadOnly = True
-        DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle17
+        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle8
        Me.gridAviso.RowHeadersVisible = False
        Me.gridAviso.RowHeadersWidth = 62
        Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle18
+        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle9
        Me.gridAviso.RowTemplate.ReadOnly = True
        Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
        Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -3737,7 +3790,7 @@ Partial Class frmHauptfenster
        Me.btnKasse_User.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnKasse_User.ForeColor = System.Drawing.Color.Black
        Me.btnKasse_User.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnKasse_User.Location = New System.Drawing.Point(2, 32)
+        Me.btnKasse_User.Location = New System.Drawing.Point(2, -1)
        Me.btnKasse_User.Name = "btnKasse_User"
        Me.btnKasse_User.Size = New System.Drawing.Size(109, 34)
        Me.btnKasse_User.TabIndex = 4
@@ -3751,7 +3804,7 @@ Partial Class frmHauptfenster
        Me.btnKasse_LG.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnKasse_LG.ForeColor = System.Drawing.Color.Black
        Me.btnKasse_LG.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnKasse_LG.Location = New System.Drawing.Point(2, -1)
+        Me.btnKasse_LG.Location = New System.Drawing.Point(2, 31)
        Me.btnKasse_LG.Name = "btnKasse_LG"
        Me.btnKasse_LG.Size = New System.Drawing.Size(109, 34)
        Me.btnKasse_LG.TabIndex = 3
@@ -3965,24 +4018,11 @@ Partial Class frmHauptfenster
        Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
        Me.UsrCntlTestsystem1.TabIndex = 8
        '
-        'WikiToolStripMenuItem
+        'FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem
        '
-        Me.WikiToolStripMenuItem.Name = "WikiToolStripMenuItem"
-        Me.WikiToolStripMenuItem.Size = New System.Drawing.Size(190, 22)
-        Me.WikiToolStripMenuItem.Text = "Wiki"
-        '
-        'MitarbeiterverzeichnisToolStripMenuItem
-        '
-        Me.MitarbeiterverzeichnisToolStripMenuItem.Name = "MitarbeiterverzeichnisToolStripMenuItem"
-        Me.MitarbeiterverzeichnisToolStripMenuItem.Size = New System.Drawing.Size(190, 22)
-        Me.MitarbeiterverzeichnisToolStripMenuItem.Text = "Mitarbeiterverzeichnis"
-        '
-        '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(391, 30)
-        Me.VerträgeToolStripMenuItem.Text = "Verträge"
+        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Name = "FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem"
+        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
+        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Text = "FIX SQL TIGGER (SQLGUIDE01)"
        '
        'frmHauptfenster
        '
@@ -4443,4 +4483,8 @@ Partial Class frmHauptfenster
    Friend WithEvents WikiToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents MitarbeiterverzeichnisToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents VerträgeToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents NewsletterToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents UNBescheinigungAusTFEinlesenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents Button9 As Button
+    Friend WithEvents FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmHauptfenster.resx
+++ b/Aviso/frmHauptfenster.resx
@@ -187,6 +187,14 @@
  <metadata name="cntxtAtilla.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1158, 17</value>
  </metadata>
+  <data name="Button9.Image" 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="btnNeu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -249,9 +257,6 @@
        sDvNfNUAAAAASUVORK5CYII=
 </value>
  </data>
-  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>560, 17</value>
-  </metadata>
  <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>659, 17</value>
  </metadata>
--- 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

@@ -164,6 +164,7 @@ Public Class frmHauptfenster
    Private listenerThread As System.Threading.Thread

    Private Sub StartPipeListener()
+
        listenerThread = New System.Threading.Thread(Sub()
                                                         Try

@@ -173,22 +174,23 @@ Public Class frmHauptfenster

                                                             Console.WriteLine($"Waiting for messages on pipe {pipeName}...")

+                                                             Dim server = New NamedPipeServerStream(pipeName, PipeDirection.In, 1, PipeTransmissionMode.Byte, PipeOptions.None, 0, 0, pipeSecurity) ' ← einmalig außerhalb While
+
                                                             While True
-                                                                 Using server = New NamedPipeServerStream(pipeName, PipeDirection.In, 1, PipeTransmissionMode.Byte, PipeOptions.None, 0, 0, pipeSecurity)
-                                                                     Try
-                                                                         server.WaitForConnection()

-                                                                         Using reader = New StreamReader(server, Encoding.UTF8)
-                                                                             Dim message = reader.ReadLine()
+                                                                 Try
+                                                                     server.WaitForConnection()

-                                                                             ProcessMessage(message)
-                                                                         End Using
+                                                                     Using reader = New StreamReader(server, Encoding.UTF8)
+                                                                         Dim message = reader.ReadLine()

-                                                                         server.Disconnect()
-                                                                     Catch ex As Exception
-                                                                         Console.WriteLine("Fehler im Listener: " & ex.Message)
-                                                                     End Try
-                                                                 End Using
+                                                                         ProcessMessage(message)
+                                                                     End Using
+
+                                                                     server.Disconnect()
+                                                                 Catch ex As Exception
+                                                                     Console.WriteLine("Fehler im Listener: " & ex.Message)
+                                                                 End Try
                                                             End While

                                                         Catch ex As Exception
@@ -217,6 +219,18 @@ Public Class frmHauptfenster
                       End If
                   End Sub)

+        ElseIf message.StartsWith("OpenAviso_") Then
+            Invoke(Sub()
+                       Dim split = message.ToString.Split("_")
+                       If split.Count > 1 AndAlso IsNumeric(split(1)) AndAlso split(1) > 0 Then
+
+                           If IsNumeric(split(1)) AndAlso split(1) > 0 Then
+                               VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = split(1)
+                           End If
+                           Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+                       End If
+                   End Sub)
+
        End If
    End Sub

@@ -241,6 +255,7 @@ Public Class frmHauptfenster
            If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Then
                StartPipeListener()
            End If
+            Button9.Visible = True 'CBAM..
        End If

        'MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
@@ -269,6 +284,12 @@ Public Class frmHauptfenster
        pnlSearch.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor
        UsrCntlBenachrichtigungen1.Panel3.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor

+
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then
+            Panel1.BackColor = Color.Red
+
+        End If
+
        UpdateUpdater.Interval = 5000
        UpdateUpdater.Enabled = True

@@ -698,7 +719,7 @@ Public Class frmHauptfenster
                    timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, infoMessage, timeEntryExisting,, isEndpointRunning)
                    If Not timeEntryExisting AndAlso isEndpointRunning Then

-                        Dim frm As New frmTimasabfrage(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER)
+                        Dim frm As New frmTimasabfrage(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasMehrereFirmen)
                        frm.TopMost = True
                        frm.ShowDialog()

@@ -707,6 +728,15 @@ Public Class frmHauptfenster
                                Dim f As New frmZEButtons("in", VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasFirmen)
                                f.ShowDialog()
                                f.TopMost = True
+
+                                If f.DialogResult = DialogResult.OK AndAlso f.resultCode >= 0 Then
+                                    Dim info
+                                    timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in", f.resultCode)
+                                    MsgBox(info)
+                                Else
+                                    Exit Sub
+                                End If
+
                            Else
                                Dim info
                                timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in", frm.typ)
@@ -3474,7 +3504,7 @@ ELSE_ATILLA:

        Dim path = SDL.cFinanzOnlineWebService.genUID_Formular("ATU74813856")
        If path <> "" Then
-            process.Start(path)
+            Process.Start(path)
        End If
        'If SDL.cFinanzOnlineWebService.Call_Web_Service_MethodUID_Abfrage_NEU2020(firma, "ATU74813856") = 0 Then
        '    MsgBox("HURRA2" & vbNewLine & firma)
@@ -3748,7 +3778,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
@@ -4129,7 +4159,7 @@ ELSE_ATILLA:
        For Each frm As Form In openForms
            ' Prüfe, ob das Fenster nicht das aktuelle Fenster
            If frm.GetType.ToString <> "AVISO.frmHauptfenster" And frm.GetType.ToString <> "AVISO.frmLogin" Then
-                ' Schließe das Fenster, unabhängig davon, ob es modal oder nicht ist
+                ' Schließe das Fenster, unabhängig davon, ob es modal oder nicht istFaviso
                frm.Close()
            End If
        Next
@@ -4201,8 +4231,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
@@ -5095,7 +5131,8 @@ ELSE_ATILLA:
    End Sub

    Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
-
+        'cATEZ_Greenpulse_CBAM_CostCalculation.Test()
+        Exit Sub

        ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.SendMessageToAviso("OpenAvisoSnd_1445868")

@@ -5253,7 +5290,117 @@ 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)
+    End Sub
+
+    Private Sub Button9_Click_1(sender As Object, e As EventArgs) Handles Button9.Click
+        Try
+
+            Me.Cursor = Cursors.WaitCursor
+            gridAviso.ClearSelection()
+            gridMyAviso.ClearSelection()
+            Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+            Dim f As New frmEintragSammelakt
+
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = 0
+            If Not f.IsDisposed And f IsNot Nothing And Not frmGrayOut.IsDisposed And frmGrayOut IsNot Nothing Then
+                f.ShowDialog(frmGrayOut)
+            End If
+            frmGrayOut.Close()
+            btnRefresh.PerformClick() 'Aviso_anzeigen("")
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, "LOG")
+        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Click
+        If Not VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then
+            MsgBox("Dieses Skript darf nur unter SQLGUIDE01 ausgeführt werden.", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
+        Using ofd As New OpenFileDialog()
+
+            ofd.Title = "SQL-Trigger-Skript auswählen"
+            ofd.Filter = "SQL Dateien (*.sql)|*.sql|Alle Dateien (*.*)|*.*"
+            ofd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)
+            ofd.Multiselect = False
+
+            If ofd.ShowDialog() <> DialogResult.OK Then
+                Exit Sub
+            End If
+
+            Dim filePath As String = ofd.FileName
+
+            Try
+                RunTriggerFixScript(filePath)
+                MessageBox.Show(
+                "SQL-Trigger-Skript wurde erfolgreich ausgeführt.",
+                "Fertig",
+                MessageBoxButtons.OK,
+                MessageBoxIcon.Information
+            )
+
+            Catch ex As Exception
+                MessageBox.Show(
+                "Fehler beim Ausführen des Skripts:" & vbCrLf & ex.Message,
+                "Fehler",
+                MessageBoxButtons.OK,
+                MessageBoxIcon.Error
+            )
+            End Try
+        End Using
+
+    End Sub
+    Public Sub RunTriggerFixScript(ByVal filePath As String)
+
+
+        If Not File.Exists(filePath) Then
+            Throw New FileNotFoundException("SQL-Datei nicht gefunden", filePath)
+        End If
+
+        Dim lines() As String = File.ReadAllLines(filePath, Encoding.UTF8)
+
+        Dim lineNo As Integer = 0
+
+        For Each rawLine As String In lines
+            lineNo += 1
+
+            Dim sql As String = rawLine.Trim()
+
+            ' Leere Zeilen oder Kommentare überspringen
+            If sql = "" Then Continue For
+
+            Try
+                MsgBox(sql)
+                Dim ok As Boolean = (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(sql, "SQLGUIDE_ADMIN")
+
+                If Not ok Then
+                    Throw New ApplicationException($"doSQL() lieferte False (Zeile {lineNo})" & vbNewLine & sql)
+                End If
+
+            Catch ex As Exception
+                ' Exaktes Logging inkl. Zeilennummer
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, sql, $"RunTriggerFixScript_LineByLine – Zeile {lineNo}")
+                Throw
+            End Try
+        Next
+
+    End Sub
+
 End Class
--- a/Aviso/frmHauptfensterNew.Designer.vb
+++ b/Aviso/frmHauptfensterNew.Designer.vb
--- a/Aviso/frmHauptfensterNew.resx
+++ b/Aviso/frmHauptfensterNew.resx
@@ -167,9 +167,6 @@
  <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>364, 17</value>
  </metadata>
-  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>560, 17</value>
-  </metadata>
  <data name="btnZertifikate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAgBJREFUSEvt
@@ -187,25 +184,6 @@
  <metadata name="cntxtAtilla.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1158, 17</value>
  </metadata>
-  <data name="btnNeu.Image" 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="Button7.Image" 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>
-  <metadata name="TimerAkte.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>453, 17</value>
-  </metadata>
  <data name="Button8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -249,14 +227,8 @@
        sDvNfNUAAAAASUVORK5CYII=
 </value>
  </data>
-  <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>659, 17</value>
-  </metadata>
-  <metadata name="timerStandzeit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>822, 17</value>
-  </metadata>
-  <metadata name="TimerUPDATE.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>953, 17</value>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>560, 17</value>
  </metadata>
  <data name="btnTV.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@@ -274,6 +246,15 @@
        AAAAAElFTkSuQmCC
 </value>
  </data>
+  <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>659, 17</value>
+  </metadata>
+  <metadata name="timerStandzeit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>822, 17</value>
+  </metadata>
+  <metadata name="TimerUPDATE.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>953, 17</value>
+  </metadata>
  <metadata name="cntxt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1080, 17</value>
  </metadata>
@@ -283,14 +264,14 @@
  <metadata name="ColorDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1400, 17</value>
  </metadata>
-  <metadata name="ctxtFarben.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
-  </metadata>
  <metadata name="cntVerag.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
+  <metadata name="UidAbfrageService1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>126, 56</value>
+  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>113</value>
  </metadata>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
--- a/Aviso/frmHauptfensterNew.vb
+++ b/Aviso/frmHauptfensterNew.vb
--- a/Aviso/frmLogin.vb
+++ b/Aviso/frmLogin.vb
@@ -29,6 +29,29 @@ Public Class frmLogin
            End If
            e.Handled = True
        End If
+        If e.Modifiers = Keys.Control And e.KeyCode = Keys.G Then
+            VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED = Not VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED
+            VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER = "[SQLGUIDE01.verag.ost.dmn]"
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then
+                Panel1.BackColor = Color.Red
+                Panel1.ForeColor = Color.White
+            Else
+                Panel1.BackColor = Color.White
+                Panel1.ForeColor = Color.FromArgb(0, 54, 128)
+            End If
+            e.Handled = True
+        End If
+        If e.Modifiers = Keys.Control And e.KeyCode = Keys.N Then
+            VERAG_PROG_ALLGEMEIN.cAllgemein.NEWLOGIN = Not VERAG_PROG_ALLGEMEIN.cAllgemein.NEWLOGIN
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.NEWLOGIN Then
+                Panel1.BackColor = Color.GreenYellow
+                Panel1.ForeColor = Color.White
+            Else
+                Panel1.BackColor = Color.White
+                Panel1.ForeColor = Color.FromArgb(0, 54, 128)
+            End If
+            e.Handled = True
+        End If
        If e.Modifiers = Keys.Control And e.KeyCode = Keys.A Then
            Panel2.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor
            lblVersion.ForeColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor
@@ -62,23 +85,29 @@ Public Class frmLogin
        lblVersion.ContextMenuStrip = ctxUpdate
        If Application.ProductVersion.StartsWith("0") Then lblVersion.Text += " BETA"

-         'STARTPARAMETER - DP
+        'STARTPARAMETER - DP
        Dim PARAM = ""
        Dim parameter() As String = Environment.GetCommandLineArgs().ToArray
        If (parameter.Count - 1) >= 1 Then 'Höher als 1 weil der index 0 der Pfad zum programm ist
            PARAM = parameter(1)
        End If

+        ' Dim exename = IO.Path.GetFileName(Application.ExecutablePath)
        If PARAM = "" Then 'nur wenn keinee Startparameter gesetzt sind...
-
-            If System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\f\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\install\Programme\AVISO\" OrElse
+            If Not File.Exists(Application.StartupPath & "\BACKUP.txt") Then
+                If AppDomain.CurrentDomain.BaseDirectory.ToString.StartsWith("\\") Then
+                    MsgBox("AVISO kann nur lokal gestartet werden." & vbNewLine & "Bei Fragen bitte an die EDV wenden.")
+                    Exit Sub
+                End If
+                If System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\f\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\install\Programme\AVISO\" OrElse
            System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\Programme\AVISO_INSTALL\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\f\Programme\AVISO_INSTALL\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\install\Programme\AVISO_INSTALL\" OrElse
            System.AppDomain.CurrentDomain.BaseDirectory = "F:\PROGRAMME\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "F:\PROGRAMME\AVISO_INSTALL\" OrElse
            System.AppDomain.CurrentDomain.BaseDirectory.Contains("F:\") OrElse System.AppDomain.CurrentDomain.BaseDirectory.Contains("\\share") OrElse System.AppDomain.CurrentDomain.BaseDirectory.Contains("\\install") Then
-                MsgBox("Programm kann im Quellpfad " & System.AppDomain.CurrentDomain.BaseDirectory & " nicht gestartet werden!" & vbNewLine & "Vorgang wird abgebrochen!", MsgBoxStyle.Critical)
-                Application.Exit()
-                Me.Close()
-                Exit Sub
+                    MsgBox("Programm kann im Quellpfad " & System.AppDomain.CurrentDomain.BaseDirectory & " nicht gestartet werden!" & vbNewLine & "Vorgang wird abgebrochen!", MsgBoxStyle.Critical)
+                    Application.Exit()
+                    Me.Close()
+                    Exit Sub
+                End If
            End If

        End If
@@ -119,7 +148,7 @@ Public Class frmLogin
            Try
                Dim WI = System.Security.Principal.WindowsIdentity.GetCurrent().Name
                If WI.Contains("\") Then
-                    Dim Split() = WI.split("\")
+                    Dim Split() = WI.Split("\")
                    'Dim UsernameTMP = ADMIN.getUstName_ByAD(Split(0), Split(1))
                    Dim firmaTmp = ADMIN.getUstFirma_ByAD(Split(0), Split(1))
                    If firmaTmp = "" Then
@@ -142,7 +171,7 @@ Public Class frmLogin
        ' Me.Visible = False
        ' Me.Hide()

-       
+
        If PARAM = "DIENSTPLAN" Then
            Me.ShowInTaskbar = False
            VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG"
@@ -538,10 +567,7 @@ Public Class frmLogin
        ' UPDATEUpdater

        'todo prüfung nicht aus nw-laufwerk starten (start wit \\)
-        If AppDomain.CurrentDomain.BaseDirectory.ToString.StartsWith("\\") Then
-            MsgBox("AVISO kann nur lokal gestartet werden." & vbNewLine & "Bei Fragen bitte an die EDV wenden.")
-            Exit Sub
-        End If
+

        If cProgramFunctions.updateUpdater() Then
            MsgBox("Der Aviso-Updater wurde aktualisiert. Es muss ein Update durchgeführt werden.")
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -11,6 +11,7 @@ Imports SDL
 Imports System.IO
 Imports EAGetMail
 Imports System.Globalization
+Imports iText.Layout.Element

 Public Class frmSendungsdetailsNEU
    Public AvisoId As Integer
@@ -316,6 +317,22 @@ Public Class frmSendungsdetailsNEU
                End If
            End If

+
+            If cntlAvisierer_Abf.Visible = False And
+                cntlAuftr_Abf.Visible = False And
+                cntlEmpf_Abf.Visible = False And
+                cntlAbsender_Abf.Visible = False And
+                cntlFrachtf_Abf.Visible = False Then
+
+                Dim err = "- Abfertigungskosten: Es ist kein Kunde mit passendem Offert ausgewählt."
+                rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True
+
+            End If
+
+
+
+
+
            ' pnlValidation.Visible = rtbValidierung.Text <> ""
            Return True

@@ -452,6 +469,8 @@ Public Class frmSendungsdetailsNEU
            FlowLayoutPanel.Visible = False
        End If

+
+
        Try

            Panel5.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor
@@ -492,6 +511,17 @@ Public Class frmSendungsdetailsNEU

            VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, CURRENT_INDEX, AvisoId) 'LÄDT alle SENDUNGSDATEN

+
+            If SENDUNG_LIST Is Nothing OrElse SENDUNG_LIST.Count = 0 Then
+                If vbYes = MsgBox("Der Sammelakt enthält keine Sendungen, möchten Sie die erste Sendung anlegen?", vbYesNoCancel) Then
+                    ADD_SND(False)
+                Else
+                    Me.Close()
+                    Exit Sub
+                End If
+            End If
+
+
            Dim sbWhere = ""
            Dim QSwhere = ""

@@ -653,8 +683,16 @@ Public Class frmSendungsdetailsNEU
            txtAvisierer.initKdBox(Me, txtAvisiererKdNr)
            txtFrachtfuehrer.initKdBox(Me, txtFrachtfuehrerKdNr)

+
+
            AddHandler txtAvisierer.PropertyChanged, Sub()
                                                         lblErr_AvisiererKdNr.Visible = False
+                                                         If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("CHECK_SND_AbfertigungsartOffert") Then
+                                                             cntlAvisierer_Abf.Visible = checkOfferteExistFromAbfArt(txtAvisierer.KdNr_value, cboAbfertigungsart._value)
+                                                         Else
+                                                             cntlAvisierer_Abf.Visible = True
+                                                         End If
+

                                                         btnAvisierer.BackgroundImage = IIf(txtAvisierer.KdNr > 0, My.Resources.person, My.Resources.personInaktiv)
                                                         SENDUNG_LIST(CURRENT_INDEX).tblSnd_Avisierer = txtAvisierer.Text
@@ -673,6 +711,12 @@ Public Class frmSendungsdetailsNEU
                                                     End Sub

            AddHandler txtFrachtfuehrer.PropertyChanged, Sub()
+                                                             If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("CHECK_SND_AbfertigungsartOffert") Then
+                                                                 cntlFrachtf_Abf.Visible = checkOfferteExistFromAbfArt(txtFrachtfuehrer.KdNr_value, cboAbfertigungsart._value)
+                                                             Else
+                                                                 cntlFrachtf_Abf.Visible = True
+                                                             End If
+
                                                             lblErr_FraechterKdNr.Visible = False

                                                             btnFrachtfuehrer.BackgroundImage = IIf(txtFrachtfuehrer.KdNr > 0, My.Resources.person, My.Resources.personInaktiv)
@@ -694,6 +738,12 @@ Public Class frmSendungsdetailsNEU
            txtEmpfaenger.initKdBox(Me, txtEmpfaengerKdNr)
            AddHandler txtEmpfaenger.PropertyChanged, Sub()
                                                          lblErr_EmpfKdNr.Visible = False
+                                                          If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("CHECK_SND_AbfertigungsartOffert") Then
+                                                              cntlEmpf_Abf.Visible = checkOfferteExistFromAbfArt(txtEmpfaenger.KdNr_value, cboAbfertigungsart._value)
+                                                          Else
+                                                              cntlEmpf_Abf.Visible = True
+                                                          End If
+

                                                          FlatButton1.BackgroundImage = IIf(txtEmpfaenger.KdNr > 0, My.Resources.person, My.Resources.personInaktiv)
                                                          SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger = txtEmpfaenger.Text
@@ -714,6 +764,12 @@ Public Class frmSendungsdetailsNEU
                                                          initWarnKd_AndKdInfo(txtEmpfaenger, picWarnEmpfaenger)
                                                      End Sub
            AddHandler txtAbsender.PropertyChanged, Sub()
+                                                        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("CHECK_SND_AbfertigungsartOffert") Then
+                                                            cntlAbsender_Abf.Visible = checkOfferteExistFromAbfArt(txtAbsender.KdNr_value, cboAbfertigungsart._value)
+                                                        Else
+                                                            cntlAbsender_Abf.Visible = True
+                                                        End If
+
                                                        FlatButton4.BackgroundImage = IIf(txtAbsender.KdNr > 0, My.Resources.person, My.Resources.personInaktiv)
                                                        SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender = txtAbsender.Text
                                                        SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr = txtAbsender.KdNr
@@ -727,6 +783,13 @@ Public Class frmSendungsdetailsNEU

            AddHandler txtAuftraggeber.PropertyChanged, Sub()
                                                            Try
+                                                                If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("CHECK_SND_AbfertigungsartOffert") Then
+                                                                    cntlAuftr_Abf.Visible = checkOfferteExistFromAbfArt(txtAuftraggeber.KdNr_value, cboAbfertigungsart._value)
+                                                                Else
+                                                                    cntlAuftr_Abf.Visible = True
+                                                                End If
+
+
                                                                SENDUNG_LIST(CURRENT_INDEX).tblSnd_Auftraggeber = txtAuftraggeber.Text
                                                                SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr = txtAuftraggeber.KdNr
                                                                FlatButton3.BackgroundImage = IIf(txtAuftraggeber.KdNr > 0, My.Resources.person, My.Resources.personInaktiv)
@@ -1129,44 +1192,7 @@ Public Class frmSendungsdetailsNEU
        'b_add.Font.FontFamily, 14, FontStyle.Bold)
        b_add.BackColor = Color.LightGray()
        AddHandler b_add.Click, Sub(send As Object, ev As EventArgs)
-                                    If AVISO.Abgeschlossen Then Exit Sub
-                                    '  Dim currentHisId = 0
-                                    '  Try : currentHisId = AVISO_newDataSet.tblSendungen.Select("tblSnd_PosUnterNr=MAX(tblSnd_PosUnterNr)")(0).Item("tblSnd_PosUnterNr") : Catch : End Try
-                                    '  currentHisId += 1
-
-                                    Dim filiale_tmp As Integer = 0
-
-                                    Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-                                        Case "IMEX" : filiale_tmp = 5501
-                                        Case "UNISPED" : filiale_tmp = 5601
-                                        Case "AMBAR" : filiale_tmp = 5701
-                                        Case "FRONTOFFICE" : filiale_tmp = 0 '5801
-                                        Case "VERIMEX" : filiale_tmp = 0 '6001
-                                        Case Else
-                                            Select Case AVISO.Grenzstelle
-                                                Case "SUB" : filiale_tmp = 4803
-                                                Case "SBG" : filiale_tmp = 5003
-                                                Case "WAI" : filiale_tmp = 5103
-                                                Case "NKD" : filiale_tmp = 5303
-                                                Case "SFD" : filiale_tmp = 4839
-                                            End Select
-
-                                    End Select
-
-
-                                    ' loadDataInLIST()
-                                    If SAVE_ME() Then 'aktuelle Änderungen sichern
-                                        ' Dim abfnr_tmp As Integer = IIf(filiale_tmp > 0, ADMIN.getMaxPosNrIncrement(filiale_tmp, Now.Year), 0)
-
-                                        Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(AvisoId, SENDUNG_LIST.Count + 1, filiale_tmp, Nothing, 0, 0) 'Neue Sendung erstellen
-                                        '  SENDUNG_LIST.Add(NEW_SND)
-
-                                        NEW_SND.SAVE(False) 'Insert neue Sendung
-                                        VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, CURRENT_INDEX, AvisoId, False) 'Alle Sendungen neu laden
-                                        ' initDataBinding()
-                                        LAST_SENDUNG(False) 'letzte Sendung
-                                        initButtons()
-                                    End If
+                                    ADD_SND()

                                End Sub
        FlowLayoutPanel.Controls.Add(b_add)
@@ -1182,6 +1208,52 @@ Public Class frmSendungsdetailsNEU
    End Sub


+    Public Sub ADD_SND(Optional initAfter = True)
+        If AVISO.Abgeschlossen Then Exit Sub
+        '  Dim currentHisId = 0
+        '  Try : currentHisId = AVISO_newDataSet.tblSendungen.Select("tblSnd_PosUnterNr=MAX(tblSnd_PosUnterNr)")(0).Item("tblSnd_PosUnterNr") : Catch : End Try
+        '  currentHisId += 1
+
+        Dim filiale_tmp As Integer = 0
+
+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Case "IMEX" : filiale_tmp = 5501
+            Case "UNISPED" : filiale_tmp = 5601
+            Case "AMBAR" : filiale_tmp = 5701
+            Case "FRONTOFFICE" : filiale_tmp = 0 '5801
+            Case "VERIMEX" : filiale_tmp = 0 '6001
+            Case Else
+                Select Case AVISO.Grenzstelle
+                    Case "SUB" : filiale_tmp = 4803
+                    Case "SBG" : filiale_tmp = 5003
+                    Case "WAI" : filiale_tmp = 5103
+                    Case "NKD" : filiale_tmp = 5303
+                    Case "SFD" : filiale_tmp = 4839
+                End Select
+
+        End Select
+
+
+        If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then 'Wenn noch keine Senungenen, nciht speichern
+            If Not SAVE_ME() Then Exit Sub 'Speichern, sonst abbruch
+        End If
+
+
+        ' loadDataInLIST()
+        'If SAVE_ME() Then 'aktuelle Änderungen sichern
+        ' Dim abfnr_tmp As Integer = IIf(filiale_tmp > 0, ADMIN.getMaxPosNrIncrement(filiale_tmp, Now.Year), 0)
+
+        Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(AvisoId, SENDUNG_LIST.Count + 1, filiale_tmp, Nothing, 0, 0) 'Neue Sendung erstellen
+            '  SENDUNG_LIST.Add(NEW_SND)
+
+            NEW_SND.SAVE(False) 'Insert neue Sendung
+            VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, CURRENT_INDEX, AvisoId, False) 'Alle Sendungen neu laden
+            ' initDataBinding()
+            If initAfter Then LAST_SENDUNG(False) 'letzte Sendung
+            initButtons()
+        'End If
+
+    End Sub
    Public Sub Duplicate(index)
        ' loadDataInLIST()
        SAVE_ME()
@@ -2542,11 +2614,31 @@ Public Class frmSendungsdetailsNEU
        End Select


+        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("CHECK_SND_AbfertigungsartOffert") Then
+
+
+            cntlAvisierer_Abf.Visible = checkOfferteExistFromAbfArt(txtAvisierer.KdNr_value, cboAbfertigungsart._value)
+            cntlAuftr_Abf.Visible = checkOfferteExistFromAbfArt(txtAuftraggeber.KdNr_value, cboAbfertigungsart._value)
+            cntlEmpf_Abf.Visible = checkOfferteExistFromAbfArt(txtEmpfaenger.KdNr_value, cboAbfertigungsart._value)
+            cntlAbsender_Abf.Visible = checkOfferteExistFromAbfArt(txtAbsender.KdNr_value, cboAbfertigungsart._value)
+            cntlFrachtf_Abf.Visible = checkOfferteExistFromAbfArt(txtFrachtfuehrer.KdNr_value, cboAbfertigungsart._value)
+
+        End If
+
+
        If Not isFailureShown Then VALIDATE_ME(False)
        sperrePanel()
        '  initOfferteDGV()
    End Sub

+    Function checkOfferteExistFromAbfArt(Kdnr, AbfArt) As Boolean
+        If Kdnr <= 0 Then Return False
+        If AbfArt = "" Then Return False
+        If AbfArt <= 0 Then Return False
+        Return (SQL.DLookup(" count(*) ", "offerten inner join [tblAbfertigungsartOffertenstamm] on ao_OffertenNr=OffertenNr", "KundenNr=" & Kdnr & " AND ao_Abfertigungsart='" & AbfArt & "'", "FMZOLL", "0") > 0)
+    End Function
+
+
    Sub initOfferteDGV()
        Try
            SENDUNG_LIST(CURRENT_INDEX).LOAD_ABRECHNUNG()
@@ -3941,7 +4033,7 @@ Public Class frmSendungsdetailsNEU
                Dim frmBeleg As New SDL.frmFremdbeleg(PERSONAL, PERSONAL.Mandant, PERSONAL.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat)
                frmBeleg.ShowDialog(Me)
            Case "L"
-                If B.storniert Then MsgBox("Der Beleg wurde bereits storiniert!") : Exit Sub
+                If B.storniert Then MsgBox("Der Beleg wurde bereits storniert!") : Exit Sub
                Dim frmBeleg As New SDL.frmNacherfassungLeihgeld(PERSONAL, Nothing, PERSONAL.Mandant, PERSONAL.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat)
                frmBeleg.ShowDialog(Me)
            Case Else
@@ -7630,9 +7722,9 @@ Public Class frmSendungsdetailsNEU

            For Each s As cSendungen In SENDUNG_LIST
                'nur Betrag EUR
-                If s.tblSnd_Vorpapier = vorp Then
-                    If s.tblSnd_WarenwertWaehrung = "EUR" AndAlso s.tblSnd_Warenwert > 0 AndAlso s.FilialenNr = SENDUNG_LIST(CURRENT_INDEX).FilialenNr Then
-                        calcWarenwerte += s.tblSnd_Warenwert
+                If s.tblSnd_Vorpapier = vorpT1 Then
+                    If s.tblSnd_WarenwertWaehrung = "EUR" AndAlso s.FilialenNr = SENDUNG_LIST(CURRENT_INDEX).FilialenNr Then
+                        If Not s.tblSnd_Abfertigungsart_ID = 44 Then calcWarenwerte += s.tblSnd_Warenwert
                    Else
                        MsgBox("Bei Sendung " & s.AbfertigungsNr & " ist der Warenwert nicht in EUR angegeben!")
                        Exit Sub
@@ -7642,14 +7734,14 @@ Public Class frmSendungsdetailsNEU

            Next

-            If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert Is Nothing Then
-                SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert = Math.Round(calcWarenwerte, 2)
+            If txtWarenwert.Text = "" OrElse txtWarenwert.Text = "0,00" Then
+                txtWarenwert.Text = Math.Round(calcWarenwerte, 2)
                SAVE_ME()
            End If



-            If IsNumeric(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert) AndAlso Math.Round(calcWarenwerte, 2) <> Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2) Then
+            If IsNumeric(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert) AndAlso SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert <> 0 AndAlso Math.Round(calcWarenwerte, 2) <> Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2) Then
                MsgBox("Warenwert für Gestellung stimmt nicht überein!" & vbNewLine & "Berechnerter Warenwert: " & Math.Round(calcWarenwerte, 2) & vbNewLine & "Eingetragener Warenwert: " & Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2), MsgBoxStyle.Critical)

            Else
--- a/Aviso/frmSndVorgeschriebenSetzen.vb
+++ b/Aviso/frmSndVorgeschriebenSetzen.vb
@@ -97,7 +97,7 @@
            'Offene EUST/ZOLL aus Zkteing ermitteln
            EUST = CDbl(SQL.getValueTxtBySql("SELECT isnull(SUM (Betrag),0)
                                          FROM tblSendungen INNER JOIN [tblSendAbrechnung]  on tblSnd_SendungID=sndabr_sendId
-                                          INNER JOIN [FMZOLL\SQLFMZOLL].VERAG.dbo.[Zkteing] ON (cast(FilialenNr as varchar(4)) + '/' + cast(AbfertigungsNr as varchar(8)))  LIKE ([Bezugsnummer]  + '%')
+                                          INNER JOIN " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.[Zkteing] ON (cast(FilialenNr as varchar(4)) + '/' + cast(AbfertigungsNr as varchar(8)))  LIKE ([Bezugsnummer]  + '%')
                                          WHERE sndabr_abrArt IN ('EUST','ZOLL') 
                                          AND ( 
 	                                          (tblSnd_AvisiererKdNr='" & KdNr & "' and sndabr_beteiligter='AVISIERER') OR 
--- a/Aviso/usrCntlHauptfenster_Suche_AVISO.Designer.vb
+++ b/Aviso/usrCntlHauptfenster_Suche_AVISO.Designer.vb
--- a/Aviso/usrCntlHauptfenster_Suche_AVISO.resx
+++ b/Aviso/usrCntlHauptfenster_Suche_AVISO.resx
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="Button7.Image" 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="btnNeu.Image" 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>
+  <metadata name="TimerAkte.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="ctxtFarben.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>126, 56</value>
+  </metadata>
+</root>
--- a/Aviso/usrCntlHauptfenster_Suche_AVISO.vb
+++ b/Aviso/usrCntlHauptfenster_Suche_AVISO.vb
--- a/Diverses/Hauptakt/cbam.png
+++ b/Diverses/Hauptakt/cbam.png
--- a/Diverses/Hauptakt/cbam_s.png
+++ b/Diverses/Hauptakt/cbam_s.png
--- a/Diverses/Hauptakt/compliance.png
+++ b/Diverses/Hauptakt/compliance.png
--- a/Diverses/Hauptakt/compliance_s.png
+++ b/Diverses/Hauptakt/compliance_s.png
--- a/Diverses/Hauptakt/eudr.png
+++ b/Diverses/Hauptakt/eudr.png
--- a/Diverses/Hauptakt/eudr_s.png
+++ b/Diverses/Hauptakt/eudr_s.png
--- a/Diverses/Hauptakt/f39f343c-a683-4ff7-9099-3fadea854f20.png
+++ b/Diverses/Hauptakt/f39f343c-a683-4ff7-9099-3fadea854f20.png
--- a/Diverses/Hauptakt/fgas.png
+++ b/Diverses/Hauptakt/fgas.png
--- a/Diverses/Hauptakt/fgas_s.png
+++ b/Diverses/Hauptakt/fgas_s.png
--- a/Diverses/Hauptakt/zollberatung_s.png
+++ b/Diverses/Hauptakt/zollberatung_s.png
--- a/Diverses/zauberstab.png
+++ b/Diverses/zauberstab.png
Author	SHA1	Message	Date
d.breimaier	8b9b806959	version	2026-02-05 10:19:36 +01:00
d.breimaier	b1b9274e60	version	2026-02-04 10:58:35 +01:00
d.breimaier	bf07f1bd77	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-02-04 08:37:27 +01:00
d.breimaier	a900322c20	gesamtsicherheiten, etc.	2026-02-04 08:37:21 +01:00
Andreas Luxbauer	715e765fea	merge	2026-02-04 08:24:43 +01:00
Andreas Luxbauer	2b83939944	Hauptfenster	2026-02-04 08:24:12 +01:00
d.breimaier	0f7f242839	MERIS Benachrichtigung, etc.	2026-01-30 13:41:36 +01:00
d.breimaier	2dd9b6fc37	version	2026-01-29 15:41:22 +01:00
d.breimaier	d69398eba3	version	2026-01-29 13:25:37 +01:00
d.breimaier	2897920ba5	gesamtsicherheiten, etc.	2026-01-28 12:03:17 +01:00
d.breimaier	c78a6f6f84	gesamtischerheiten, etc.	2026-01-16 15:14:13 +01:00
d.breimaier	d8d16b1aad	gesamtsicherheiten	2026-01-15 11:05:15 +01:00
d.breimaier	2412b780e7	gesamtsicherheuten	2026-01-14 09:05:45 +01:00
Andreas Luxbauer	1372e466ee	vers	2026-01-14 08:45:22 +01:00
Andreas Luxbauer	3b8623f46f	frmHauotfensterNew	2026-01-14 08:41:23 +01:00
d.breimaier	014c035521	gesamtsicherheiten	2026-01-13 17:03:10 +01:00
d.breimaier	2d0c8702fb	version	2026-01-13 16:37:16 +01:00
d.breimaier	d10963c14a	Gesamtsicherheiten, etc.	2026-01-13 16:08:20 +01:00
d.breimaier	f98821c15a	Timas, Gesamtsicherheiten, etc.	2026-01-12 16:10:07 +01:00
d.breimaier	fd0af0f843	gesamtsicherheit, calcSaldo nun auch vor einem Eintrag in die Gesamtsicherheitsliste, Auswerung, etc.	2026-01-07 13:40:03 +01:00
Andreas Luxbauer	e6f557a4c2	vers	2026-01-05 15:18:27 +01:00
Andreas Luxbauer	8a636f00c8	vers	2025-12-30 13:10:06 +01:00
Andreas Luxbauer	8abbc6b23e	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2025-12-29 14:55:38 +01:00
Andreas Luxbauer	5d7d9b28db	vers	2025-12-29 14:55:32 +01:00
d.breimaier	c05c79784c	merge	2025-12-23 11:15:21 +01:00
d.breimaier	14d00c458d	version	2025-12-23 08:51:58 +01:00
d.breimaier	4081e59579	Typo	2025-12-23 08:47:21 +01:00
Andreas Luxbauer	b7bcba621f	merge vers	2025-12-22 08:53:49 +01:00
Andreas Luxbauer	5320be9355	vers	2025-12-22 08:52:54 +01:00
d.breimaier	88efed316e	gesamtsicherheiten	2025-12-19 16:29:40 +01:00
d.breimaier	68adc5301b	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2025-12-19 10:51:45 +01:00
d.breimaier	204c9219d9	version	2025-12-19 10:51:38 +01:00
Andreas Luxbauer	12b958b6bd	merge	2025-12-19 09:11:28 +01:00
Andreas Luxbauer	8924cf6151	SQL	2025-12-19 09:10:38 +01:00
d.breimaier	636df85a8c	gesamtsicherheiut, etc.	2025-12-16 16:10:42 +01:00
d.breimaier	9af2107ea0	version	2025-12-16 11:32:26 +01:00
d.breimaier	60769f3535	Sendungsdet. etc.	2025-12-16 09:55:12 +01:00
d.breimaier	fbae19e77e	Sendungsdetails, gesamtsicherheiten, etc.	2025-12-11 11:23:35 +01:00
Andreas Luxbauer	6584411469	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2025-12-11 09:31:20 +01:00
Andreas Luxbauer	f4e3cfc29e	Abf.ARt	2025-12-11 09:31:10 +01:00
d.breimaier	636ede6a32	merge	2025-12-11 09:22:17 +01:00
d.breimaier	cad6bf2731	gesamtsicherheiten	2025-12-11 09:19:31 +01:00
d.breimaier	15d42beecf	gesamtsicherheiten, etc.	2025-12-11 09:14:50 +01:00
Andreas Luxbauer	4bdc72e908	zauberst.	2025-12-09 14:56:24 +01:00
Andreas Luxbauer	62944c6f0a	PipeListener	2025-12-03 16:44:45 +01:00