neu

2020-12-16 09:31:14 +01:00
parent 56fe11bc97
commit f25ff457b2
16 changed files with 1112 additions and 1055 deletions
--- a/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb
+++ b/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb
@@ -29,31 +29,31 @@ Partial Class frmSendungAnhangImport
        Me.UsrCntlSendungAnhangElement1 = New AVISO.usrCntlSendungAnhangElement()
        Me.UsrCntlSendungAnhangElement2 = New AVISO.usrCntlSendungAnhangElement()
        Me.flpnlSendungen = New System.Windows.Forms.FlowLayoutPanel()
-        Me.Label2 = New System.Windows.Forms.Label()
+        Me.lblSendungen = New System.Windows.Forms.Label()
-        Me.Label3 = New System.Windows.Forms.Label()
+        Me.lblImport = New System.Windows.Forms.Label()
        Me.pnlAnfuegen = New System.Windows.Forms.Panel()
        Me.cbxAlternativePDFAnsicht = New System.Windows.Forms.CheckBox()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.txtBezeichnung = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Label1 = New System.Windows.Forms.Label()
+        Me.lblBezeichnung = New System.Windows.Forms.Label()
-        Me.Button6 = New System.Windows.Forms.Button()
+        Me.btnSeitenLoeschen = New System.Windows.Forms.Button()
        Me.btnAnfuegenAll = New System.Windows.Forms.Button()
        Me.txtDateiname = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Label7 = New System.Windows.Forms.Label()
+        Me.lblDatei = New System.Windows.Forms.Label()
        Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Label6 = New System.Windows.Forms.Label()
+        Me.lblSendung = New System.Windows.Forms.Label()
-        Me.Label5 = New System.Windows.Forms.Label()
+        Me.lblArt = New System.Windows.Forms.Label()
        Me.cboArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.btnAnfuegen = New System.Windows.Forms.Button()
        Me.txtSeiten = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Label4 = New System.Windows.Forms.Label()
+        Me.lblSeiten = New System.Windows.Forms.Label()
        Me.cbxDelPDF = New System.Windows.Forms.CheckBox()
-        Me.btn = New System.Windows.Forms.Button()
+        Me.btnAdd = New System.Windows.Forms.Button()
        Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DateiHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DateiScannenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AusZwischenablageeinfügenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Button2 = New System.Windows.Forms.Button()
+        Me.btnDel = New System.Windows.Forms.Button()
        Me.pnl = New System.Windows.Forms.Panel()
        Me.Button5 = New System.Windows.Forms.Button()
        Me.PdfViewer = New Spire.PdfViewer.Forms.PdfViewer()
@@ -143,24 +143,24 @@ Partial Class frmSendungAnhangImport
        Me.flpnlSendungen.Size = New System.Drawing.Size(230, 643)
        Me.flpnlSendungen.TabIndex = 10
        '
-        'Label2
+        'lblSendungen
        '
-        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblSendungen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label2.AutoSize = True
+        Me.lblSendungen.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(1070, 14)
+        Me.lblSendungen.Location = New System.Drawing.Point(1070, 14)
-        Me.Label2.Name = "Label2"
+        Me.lblSendungen.Name = "lblSendungen"
-        Me.Label2.Size = New System.Drawing.Size(65, 13)
+        Me.lblSendungen.Size = New System.Drawing.Size(65, 13)
-        Me.Label2.TabIndex = 6
+        Me.lblSendungen.TabIndex = 6
-        Me.Label2.Text = "Sendungen:"
+        Me.lblSendungen.Text = "Sendungen:"
        '
-        'Label3
+        'lblImport
        '
-        Me.Label3.AutoSize = True
+        Me.lblImport.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(221, 14)
+        Me.lblImport.Location = New System.Drawing.Point(221, 14)
-        Me.Label3.Name = "Label3"
+        Me.lblImport.Name = "lblImport"
-        Me.Label3.Size = New System.Drawing.Size(39, 13)
+        Me.lblImport.Size = New System.Drawing.Size(39, 13)
-        Me.Label3.TabIndex = 5
+        Me.lblImport.TabIndex = 5
-        Me.Label3.Text = "Import:"
+        Me.lblImport.Text = "Import:"
        '
        'pnlAnfuegen
        '
@@ -171,18 +171,18 @@ Partial Class frmSendungAnhangImport
        Me.pnlAnfuegen.Controls.Add(Me.cbxAlternativePDFAnsicht)
        Me.pnlAnfuegen.Controls.Add(Me.Button1)
        Me.pnlAnfuegen.Controls.Add(Me.txtBezeichnung)
-        Me.pnlAnfuegen.Controls.Add(Me.Label1)
+        Me.pnlAnfuegen.Controls.Add(Me.lblBezeichnung)
-        Me.pnlAnfuegen.Controls.Add(Me.Button6)
+        Me.pnlAnfuegen.Controls.Add(Me.btnSeitenLoeschen)
        Me.pnlAnfuegen.Controls.Add(Me.btnAnfuegenAll)
        Me.pnlAnfuegen.Controls.Add(Me.txtDateiname)
-        Me.pnlAnfuegen.Controls.Add(Me.Label7)
+        Me.pnlAnfuegen.Controls.Add(Me.lblDatei)
        Me.pnlAnfuegen.Controls.Add(Me.MyTextBox2)
-        Me.pnlAnfuegen.Controls.Add(Me.Label6)
+        Me.pnlAnfuegen.Controls.Add(Me.lblSendung)
-        Me.pnlAnfuegen.Controls.Add(Me.Label5)
+        Me.pnlAnfuegen.Controls.Add(Me.lblArt)
        Me.pnlAnfuegen.Controls.Add(Me.cboArt)
        Me.pnlAnfuegen.Controls.Add(Me.btnAnfuegen)
        Me.pnlAnfuegen.Controls.Add(Me.txtSeiten)
-        Me.pnlAnfuegen.Controls.Add(Me.Label4)
+        Me.pnlAnfuegen.Controls.Add(Me.lblSeiten)
        Me.pnlAnfuegen.Controls.Add(Me.cbxDelPDF)
        Me.pnlAnfuegen.Location = New System.Drawing.Point(221, 30)
        Me.pnlAnfuegen.Name = "pnlAnfuegen"
@@ -234,25 +234,25 @@ Partial Class frmSendungAnhangImport
        Me.txtBezeichnung.Size = New System.Drawing.Size(453, 26)
        Me.txtBezeichnung.TabIndex = 7
        '
-        'Label1
+        'lblBezeichnung
        '
-        Me.Label1.AutoSize = True
+        Me.lblBezeichnung.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(3, 113)
+        Me.lblBezeichnung.Location = New System.Drawing.Point(3, 113)
-        Me.Label1.Name = "Label1"
+        Me.lblBezeichnung.Name = "lblBezeichnung"
-        Me.Label1.Size = New System.Drawing.Size(63, 13)
+        Me.lblBezeichnung.Size = New System.Drawing.Size(63, 13)
-        Me.Label1.TabIndex = 10
+        Me.lblBezeichnung.TabIndex = 10
-        Me.Label1.Text = "Bezeichng.:"
+        Me.lblBezeichnung.Text = "Bezeichng.:"
        '
-        'Button6
+        'btnSeitenLoeschen
        '
-        Me.Button6.BackColor = System.Drawing.Color.Wheat
+        Me.btnSeitenLoeschen.BackColor = System.Drawing.Color.Wheat
-        Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSeitenLoeschen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button6.Location = New System.Drawing.Point(523, 105)
+        Me.btnSeitenLoeschen.Location = New System.Drawing.Point(523, 105)
-        Me.Button6.Name = "Button6"
+        Me.btnSeitenLoeschen.Name = "btnSeitenLoeschen"
-        Me.Button6.Size = New System.Drawing.Size(277, 28)
+        Me.btnSeitenLoeschen.Size = New System.Drawing.Size(277, 28)
-        Me.Button6.TabIndex = 11
+        Me.btnSeitenLoeschen.TabIndex = 11
-        Me.Button6.Text = "Seiten löschen"
+        Me.btnSeitenLoeschen.Text = "Seiten löschen"
-        Me.Button6.UseVisualStyleBackColor = False
+        Me.btnSeitenLoeschen.UseVisualStyleBackColor = False
        '
        'btnAnfuegenAll
        '
@@ -287,14 +287,14 @@ Partial Class frmSendungAnhangImport
        Me.txtDateiname.Size = New System.Drawing.Size(732, 20)
        Me.txtDateiname.TabIndex = 1
        '
-        'Label7
+        'lblDatei
        '
-        Me.Label7.AutoSize = True
+        Me.lblDatei.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(3, 14)
+        Me.lblDatei.Location = New System.Drawing.Point(3, 14)
-        Me.Label7.Name = "Label7"
+        Me.lblDatei.Name = "lblDatei"
-        Me.Label7.Size = New System.Drawing.Size(35, 13)
+        Me.lblDatei.Size = New System.Drawing.Size(35, 13)
-        Me.Label7.TabIndex = 0
+        Me.lblDatei.TabIndex = 0
-        Me.Label7.Text = "Datei:"
+        Me.lblDatei.Text = "Datei:"
        '
        'MyTextBox2
        '
@@ -318,23 +318,23 @@ Partial Class frmSendungAnhangImport
        Me.MyTextBox2.Size = New System.Drawing.Size(453, 20)
        Me.MyTextBox2.TabIndex = 13
        '
-        'Label6
+        'lblSendung
        '
-        Me.Label6.AutoSize = True
+        Me.lblSendung.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(3, 140)
+        Me.lblSendung.Location = New System.Drawing.Point(3, 140)
-        Me.Label6.Name = "Label6"
+        Me.lblSendung.Name = "lblSendung"
-        Me.Label6.Size = New System.Drawing.Size(53, 13)
+        Me.lblSendung.Size = New System.Drawing.Size(53, 13)
-        Me.Label6.TabIndex = 12
+        Me.lblSendung.TabIndex = 12
-        Me.Label6.Text = "Sendung:"
+        Me.lblSendung.Text = "Sendung:"
        '
-        'Label5
+        'lblArt
        '
-        Me.Label5.AutoSize = True
+        Me.lblArt.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(3, 83)
+        Me.lblArt.Location = New System.Drawing.Point(3, 83)
-        Me.Label5.Name = "Label5"
+        Me.lblArt.Name = "lblArt"
-        Me.Label5.Size = New System.Drawing.Size(23, 13)
+        Me.lblArt.Size = New System.Drawing.Size(23, 13)
-        Me.Label5.TabIndex = 5
+        Me.lblArt.TabIndex = 5
-        Me.Label5.Text = "Art:"
+        Me.lblArt.Text = "Art:"
        '
        'cboArt
        '
@@ -384,14 +384,14 @@ Partial Class frmSendungAnhangImport
        Me.txtSeiten.Size = New System.Drawing.Size(242, 26)
        Me.txtSeiten.TabIndex = 4
        '
-        'Label4
+        'lblSeiten
        '
-        Me.Label4.AutoSize = True
+        Me.lblSeiten.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(3, 55)
+        Me.lblSeiten.Location = New System.Drawing.Point(3, 55)
-        Me.Label4.Name = "Label4"
+        Me.lblSeiten.Name = "lblSeiten"
-        Me.Label4.Size = New System.Drawing.Size(40, 13)
+        Me.lblSeiten.Size = New System.Drawing.Size(40, 13)
-        Me.Label4.TabIndex = 3
+        Me.lblSeiten.TabIndex = 3
-        Me.Label4.Text = "Seiten:"
+        Me.lblSeiten.Text = "Seiten:"
        '
        'cbxDelPDF
        '
@@ -405,16 +405,16 @@ Partial Class frmSendungAnhangImport
        Me.cbxDelPDF.Text = "angefügte Dateien aus Original PDF entfernen"
        Me.cbxDelPDF.UseVisualStyleBackColor = True
        '
-        'btn
+        'btnAdd
        '
-        Me.btn.ContextMenuStrip = Me.cntxt
+        Me.btnAdd.ContextMenuStrip = Me.cntxt
-        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btn.Location = New System.Drawing.Point(71, 3)
+        Me.btnAdd.Location = New System.Drawing.Point(71, 3)
-        Me.btn.Name = "btn"
+        Me.btnAdd.Name = "btnAdd"
-        Me.btn.Size = New System.Drawing.Size(75, 25)
+        Me.btnAdd.Size = New System.Drawing.Size(75, 25)
-        Me.btn.TabIndex = 3
+        Me.btnAdd.TabIndex = 3
-        Me.btn.Text = "Hinzufügen"
+        Me.btnAdd.Text = "Hinzufügen"
-        Me.btn.UseVisualStyleBackColor = True
+        Me.btnAdd.UseVisualStyleBackColor = True
        '
        'cntxt
        '
@@ -443,15 +443,15 @@ Partial Class frmSendungAnhangImport
        Me.AusZwischenablageeinfügenToolStripMenuItem.Size = New System.Drawing.Size(249, 22)
        Me.AusZwischenablageeinfügenToolStripMenuItem.Text = "Aus Zwischenablage (einfügen)..."
        '
-        'Button2
+        'btnDel
        '
-        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Location = New System.Drawing.Point(152, 3)
+        Me.btnDel.Location = New System.Drawing.Point(152, 3)
-        Me.Button2.Name = "Button2"
+        Me.btnDel.Name = "btnDel"
-        Me.Button2.Size = New System.Drawing.Size(63, 25)
+        Me.btnDel.Size = New System.Drawing.Size(63, 25)
-        Me.Button2.TabIndex = 4
+        Me.btnDel.TabIndex = 4
-        Me.Button2.Text = "Löschen"
+        Me.btnDel.Text = "Löschen"
-        Me.Button2.UseVisualStyleBackColor = True
+        Me.btnDel.UseVisualStyleBackColor = True
        '
        'pnl
        '
@@ -644,11 +644,11 @@ Partial Class frmSendungAnhangImport
        Me.Controls.Add(Me.btnSndDel)
        Me.Controls.Add(Me.Button3)
        Me.Controls.Add(Me.cboSendungen)
-        Me.Controls.Add(Me.Button2)
+        Me.Controls.Add(Me.btnDel)
-        Me.Controls.Add(Me.btn)
+        Me.Controls.Add(Me.btnAdd)
        Me.Controls.Add(Me.pnlAnfuegen)
-        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.lblImport)
-        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.lblSendungen)
        Me.Controls.Add(Me.flpnlAviso)
        Me.Controls.Add(Me.lbl)
        Me.Controls.Add(Me.pnl)
@@ -671,22 +671,22 @@ Partial Class frmSendungAnhangImport
    Friend WithEvents lbl As Label
    Friend WithEvents flpnlAviso As FlowLayoutPanel
    Friend WithEvents flpnlSendungen As FlowLayoutPanel
-    Friend WithEvents Label2 As Label
+    Friend WithEvents lblSendungen As Label
-    Friend WithEvents Label3 As Label
+    Friend WithEvents lblImport As Label
    Friend WithEvents pnlAnfuegen As Panel
-    Friend WithEvents Label4 As Label
+    Friend WithEvents lblSeiten As Label
-    Friend WithEvents btn As Button
+    Friend WithEvents btnAdd As Button
    Friend WithEvents btnAnfuegen As Button
    Friend WithEvents txtSeiten As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents UsrCntlSendungAnhangElement1 As usrCntlSendungAnhangElement
    Friend WithEvents MyTextBox2 As VERAG_PROG_ALLGEMEIN.MyTextBox
-    Friend WithEvents Label6 As Label
+    Friend WithEvents lblSendung As Label
-    Friend WithEvents Label5 As Label
+    Friend WithEvents lblArt As Label
    Friend WithEvents cboArt As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents txtDateiname As VERAG_PROG_ALLGEMEIN.MyTextBox
-    Friend WithEvents Label7 As Label
+    Friend WithEvents lblDatei As Label
    Friend WithEvents UsrCntlSendungAnhangElement2 As usrCntlSendungAnhangElement
-    Friend WithEvents Button2 As Button
+    Friend WithEvents btnDel As Button
    Friend WithEvents pnl As Panel
    Friend WithEvents cbxDelPDF As CheckBox
    Friend WithEvents cboSendungen As VERAG_PROG_ALLGEMEIN.MyComboBox
@@ -702,9 +702,9 @@ Partial Class frmSendungAnhangImport
    Friend WithEvents btnAddSnd As Button
    Friend WithEvents Button5 As Button
    Friend WithEvents AusZwischenablageeinfügenToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents Button6 As Button
+    Friend WithEvents btnSeitenLoeschen As Button
    Friend WithEvents txtBezeichnung As VERAG_PROG_ALLGEMEIN.MyTextBox
-    Friend WithEvents Label1 As Label
+    Friend WithEvents lblBezeichnung As Label
    Friend WithEvents Button1 As Button
    Friend WithEvents lblSendungsdetails As Label
    Friend WithEvents lblWarenbeichnung As Label
--- a/Aviso/Anhänge/frmSendungAnhangImport.vb
+++ b/Aviso/Anhänge/frmSendungAnhangImport.vb
@@ -1009,7 +1009,7 @@ Public Class frmSendungAnhangImport
        Return True
    End Function
-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnDel.Click
        deleteActiveElement(flpnlAviso)
    End Sub
@@ -1077,6 +1077,8 @@ Public Class frmSendungAnhangImport
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UID-Prüfung", "UID"))
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Prüfung", "EORI"))
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges"))
        cboArt._TRANSLATE()
        initSendungen()
        '   cboSendungen.changeItem(-1)
@@ -1085,6 +1087,7 @@ Public Class frmSendungAnhangImport
    Private Sub frmSendungAnhangImport_Shown(sender As Object, e As EventArgs) Handles Me.Shown
        txtSeiten.Focus()
        VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
    End Sub
    Private Sub txtSeiten_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSeiten.KeyDown, cboArt.KeyDown, txtBezeichnung.KeyDown
@@ -1290,7 +1293,7 @@ Public Class frmSendungAnhangImport
        flpnlAviso.Controls.Add(USRCNTL)
    End Sub
-    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
+    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btnAdd.Click
        cntxt.Show(Cursor.Position)
    End Sub
@@ -1524,7 +1527,7 @@ Public Class frmSendungAnhangImport
    End Sub
-    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
+    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles btnSeitenLoeschen.Click
        If txtSeiten.Text = "" Then Exit Sub
        '   If cboArt._value = "" Then Exit Sub
        ' If cboSendungen._value = "" Then Exit Sub
--- 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("3.5.8.7")>
+<Assembly: AssemblyVersion("3.5.8.9")>
-<Assembly: AssemblyFileVersion("3.5.8.7")>
+<Assembly: AssemblyFileVersion("3.5.8.9")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -599,15 +599,6 @@ Namespace My.Resources
            End Get
        End Property
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
        '''</summary>
        Friend ReadOnly Property gghtf5fgh5454fghhgf() As String
            Get
                Return ResourceManager.GetString("gghtf5fgh5454fghhgf", resourceCulture)
            End Get
        End Property
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -708,6 +699,15 @@ Namespace My.Resources
            End Get
        End Property
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
        '''</summary>
        Friend ReadOnly Property jkjjk8jkl87978978jh() As String
            Get
                Return ResourceManager.GetString("jkjjk8jkl87978978jh", resourceCulture)
            End Get
        End Property
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -1458,7 +1458,7 @@ Namespace My.Resources
        End Property
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 3.5.8.7 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 3.5.8.9 ähnelt.
        '''</summary>
        Friend ReadOnly Property Version() As String
            Get
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -536,7 +536,7 @@
    <value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Version" xml:space="preserve">
-    <value>3.5.8.7</value>
+    <value>3.5.8.9</value>
  </data>
  <data name="statusBtn_vorgeschrieben_Aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -592,7 +592,7 @@
  <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="gghtf5fgh5454fghhgf" xml:space="preserve">
+  <data name="jkjjk8jkl87978978jh" xml:space="preserve">
    <value />
  </data>
 </root>
--- a/Aviso/frmAnkunftSetzen.vb
+++ b/Aviso/frmAnkunftSetzen.vb
@@ -55,7 +55,7 @@
        Me.DialogResult = DialogResult.Cancel
    End Sub
-    Private Sub frmAnkunftSetzen_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown
+    Private Sub frmAnkunftSetzen_KeyDown(sender As Object, e As KeyEventArgs) Handles txtFahrerHandy.KeyDown
        If e.KeyCode = Keys.Return Then
            btn.PerformClick()
        End If
--- a/Aviso/frmEintragAviso.designer.vb
+++ b/Aviso/frmEintragAviso.designer.vb
@@ -25,15 +25,15 @@ Partial Class frmEintragAviso
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmEintragAviso))
        Me.btnOK = New System.Windows.Forms.Button()
-        Me.Label2 = New System.Windows.Forms.Label()
+        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.Label4 = New System.Windows.Forms.Label()
+        Me.lblFraecher = New System.Windows.Forms.Label()
-        Me.Label5 = New System.Windows.Forms.Label()
+        Me.lblAvisierer = New System.Windows.Forms.Label()
-        Me.Label6 = New System.Windows.Forms.Label()
+        Me.lblLkwKennzeichen = New System.Windows.Forms.Label()
        Me.txtÄnderungen = New System.Windows.Forms.TextBox()
-        Me.Label9 = New System.Windows.Forms.Label()
+        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()
@@ -61,7 +61,7 @@ Partial Class frmEintragAviso
        Me.Label8 = New System.Windows.Forms.Label()
        Me.lblFreigabe = New System.Windows.Forms.Label()
        Me.lblAnkunft = New System.Windows.Forms.Label()
-        Me.Label11 = New System.Windows.Forms.Label()
+        Me.lblGrenze = New System.Windows.Forms.Label()
        Me.dtpAvisoEingangDatum = New System.Windows.Forms.DateTimePicker()
        Me.Label10 = New System.Windows.Forms.Label()
        Me.dtpAvisoEingangZeit = New System.Windows.Forms.DateTimePicker()
@@ -73,24 +73,24 @@ Partial Class frmEintragAviso
        Me.Label12 = New System.Windows.Forms.Label()
        Me.cbxHandling = New System.Windows.Forms.CheckBox()
        Me.cboGrenzstelle = New System.Windows.Forms.ComboBox()
-        Me.Label15 = New System.Windows.Forms.Label()
+        Me.lblAktenuebersicht = New System.Windows.Forms.Label()
        Me.grpAviso = New System.Windows.Forms.GroupBox()
        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
        Me.lblErr_KdNr = New System.Windows.Forms.Label()
        Me.Button5 = New System.Windows.Forms.Button()
        Me.lblErrVorraussuchtlEintreffen = New System.Windows.Forms.Label()
        Me.txtAvisiererAuftragsNr = New System.Windows.Forms.TextBox()
-        Me.Label23 = New System.Windows.Forms.Label()
+        Me.lblAvisiererAtrNr = New System.Windows.Forms.Label()
        Me.kdAuftraggeber = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
        Me.kdAvisierer = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
        Me.kdFrächter = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
        Me.Button4 = New System.Windows.Forms.Button()
        Me.sbLkwNationalitaet = New VERAG_PROG_ALLGEMEIN.MySearchBox()
-        Me.Label18 = New System.Windows.Forms.Label()
+        Me.lblNat = New System.Windows.Forms.Label()
        Me.txtFahrerHandy = New System.Windows.Forms.TextBox()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.pic = New System.Windows.Forms.PictureBox()
-        Me.Label16 = New System.Windows.Forms.Label()
+        Me.lblFahrerHandyNr = New System.Windows.Forms.Label()
        Me.cbxFrächterUnbekannt = New System.Windows.Forms.CheckBox()
        Me.btnAuftraggeber = New System.Windows.Forms.Button()
        Me.btnAvisiererKd = New System.Windows.Forms.Button()
@@ -109,7 +109,7 @@ Partial Class frmEintragAviso
        Me.Label17 = New System.Windows.Forms.Label()
        Me.cbxAuftraggeberfurAlleSendungen = New System.Windows.Forms.CheckBox()
        Me.Label22 = New System.Windows.Forms.Label()
-        Me.Label24 = New System.Windows.Forms.Label()
+        Me.lblVoraussEintreff = New System.Windows.Forms.Label()
        Me.datVoraussichtlichesEintreffen = New System.Windows.Forms.DateTimePicker()
        Me.pnl = New System.Windows.Forms.Panel()
        Me.cbxWarenort = New System.Windows.Forms.CheckBox()
@@ -171,14 +171,14 @@ Partial Class frmEintragAviso
        Me.btnOK.Text = "OK"
        Me.btnOK.UseVisualStyleBackColor = True
        '
-        'Label2
+        'lblErfAm
        '
-        Me.Label2.AutoSize = True
+        Me.lblErfAm.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(220, 14)
+        Me.lblErfAm.Location = New System.Drawing.Point(220, 14)
-        Me.Label2.Name = "Label2"
+        Me.lblErfAm.Name = "lblErfAm"
-        Me.Label2.Size = New System.Drawing.Size(59, 13)
+        Me.lblErfAm.Size = New System.Drawing.Size(59, 13)
-        Me.Label2.TabIndex = 1
+        Me.lblErfAm.TabIndex = 1
-        Me.Label2.Text = "Erfasst am:"
+        Me.lblErfAm.Text = "Erfasst am:"
        '
        'btnAbbruch
        '
@@ -214,32 +214,32 @@ Partial Class frmEintragAviso
        Me.Label3.TabIndex = 48
        Me.Label3.Text = "Info"
        '
-        'Label4
+        'lblFraecher
        '
-        Me.Label4.AutoSize = True
+        Me.lblFraecher.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(6, 199)
+        Me.lblFraecher.Location = New System.Drawing.Point(6, 199)
-        Me.Label4.Name = "Label4"
+        Me.lblFraecher.Name = "lblFraecher"
-        Me.Label4.Size = New System.Drawing.Size(46, 13)
+        Me.lblFraecher.Size = New System.Drawing.Size(46, 13)
-        Me.Label4.TabIndex = 24
+        Me.lblFraecher.TabIndex = 24
-        Me.Label4.Text = "Frächter"
+        Me.lblFraecher.Text = "Frächter"
        '
-        'Label5
+        'lblAvisierer
        '
-        Me.Label5.AutoSize = True
+        Me.lblAvisierer.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(6, 238)
+        Me.lblAvisierer.Location = New System.Drawing.Point(6, 238)
-        Me.Label5.Name = "Label5"
+        Me.lblAvisierer.Name = "lblAvisierer"
-        Me.Label5.Size = New System.Drawing.Size(47, 13)
+        Me.lblAvisierer.Size = New System.Drawing.Size(47, 13)
-        Me.Label5.TabIndex = 30
+        Me.lblAvisierer.TabIndex = 30
-        Me.Label5.Text = "Avisierer"
+        Me.lblAvisierer.Text = "Avisierer"
        '
-        'Label6
+        'lblLkwKennzeichen
        '
-        Me.Label6.AutoSize = True
+        Me.lblLkwKennzeichen.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(25, 125)
+        Me.lblLkwKennzeichen.Location = New System.Drawing.Point(25, 125)
-        Me.Label6.Name = "Label6"
+        Me.lblLkwKennzeichen.Name = "lblLkwKennzeichen"
-        Me.Label6.Size = New System.Drawing.Size(48, 13)
+        Me.lblLkwKennzeichen.Size = New System.Drawing.Size(48, 13)
-        Me.Label6.TabIndex = 13
+        Me.lblLkwKennzeichen.TabIndex = 13
-        Me.Label6.Text = "LKW-Nr:"
+        Me.lblLkwKennzeichen.Text = "LKW-Nr:"
        '
        'txtÄnderungen
        '
@@ -258,14 +258,14 @@ Partial Class frmEintragAviso
        Me.txtÄnderungen.TabIndex = 13
        Me.txtÄnderungen.TabStop = False
        '
-        'Label9
+        'lblAenderungen
        '
-        Me.Label9.AutoSize = True
+        Me.lblAenderungen.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(426, 232)
+        Me.lblAenderungen.Location = New System.Drawing.Point(426, 232)
-        Me.Label9.Name = "Label9"
+        Me.lblAenderungen.Name = "lblAenderungen"
-        Me.Label9.Size = New System.Drawing.Size(65, 13)
+        Me.lblAenderungen.Size = New System.Drawing.Size(65, 13)
-        Me.Label9.TabIndex = 10
+        Me.lblAenderungen.TabIndex = 10
-        Me.Label9.Text = "Änderungen"
+        Me.lblAenderungen.Text = "Änderungen"
        '
        'dtpDatum
        '
@@ -576,15 +576,15 @@ Partial Class frmEintragAviso
        Me.lblAnkunft.TabIndex = 16
        Me.lblAnkunft.Text = "Ankunft"
        '
-        'Label11
+        'lblGrenze
        '
-        Me.Label11.AutoSize = True
+        Me.lblGrenze.AutoSize = True
-        Me.Label11.ForeColor = System.Drawing.Color.Black
+        Me.lblGrenze.ForeColor = System.Drawing.Color.Black
-        Me.Label11.Location = New System.Drawing.Point(240, 125)
+        Me.lblGrenze.Location = New System.Drawing.Point(240, 125)
-        Me.Label11.Name = "Label11"
+        Me.lblGrenze.Name = "lblGrenze"
-        Me.Label11.Size = New System.Drawing.Size(59, 13)
+        Me.lblGrenze.Size = New System.Drawing.Size(59, 13)
-        Me.Label11.TabIndex = 16
+        Me.lblGrenze.TabIndex = 16
-        Me.Label11.Text = "Grenzstelle"
+        Me.lblGrenze.Text = "Grenzstelle"
        '
        'dtpAvisoEingangDatum
        '
@@ -706,15 +706,15 @@ Partial Class frmEintragAviso
        Me.cboGrenzstelle.Size = New System.Drawing.Size(74, 28)
        Me.cboGrenzstelle.TabIndex = 20
        '
-        'Label15
+        'lblAktenuebersicht
        '
-        Me.Label15.AutoSize = True
+        Me.lblAktenuebersicht.AutoSize = True
-        Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAktenuebersicht.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label15.Location = New System.Drawing.Point(12, 9)
+        Me.lblAktenuebersicht.Location = New System.Drawing.Point(12, 9)
-        Me.Label15.Name = "Label15"
+        Me.lblAktenuebersicht.Name = "lblAktenuebersicht"
-        Me.Label15.Size = New System.Drawing.Size(130, 20)
+        Me.lblAktenuebersicht.Size = New System.Drawing.Size(130, 20)
-        Me.Label15.TabIndex = 0
+        Me.lblAktenuebersicht.TabIndex = 0
-        Me.Label15.Text = "Aktenübersicht"
+        Me.lblAktenuebersicht.Text = "Aktenübersicht"
        '
        'grpAviso
        '
@@ -723,18 +723,18 @@ Partial Class frmEintragAviso
        Me.grpAviso.Controls.Add(Me.Button5)
        Me.grpAviso.Controls.Add(Me.lblErrVorraussuchtlEintreffen)
        Me.grpAviso.Controls.Add(Me.txtAvisiererAuftragsNr)
-        Me.grpAviso.Controls.Add(Me.Label23)
+        Me.grpAviso.Controls.Add(Me.lblAvisiererAtrNr)
        Me.grpAviso.Controls.Add(Me.kdAuftraggeber)
        Me.grpAviso.Controls.Add(Me.kdAvisierer)
        Me.grpAviso.Controls.Add(Me.kdFrächter)
        Me.grpAviso.Controls.Add(Me.txtLKW_Nr)
        Me.grpAviso.Controls.Add(Me.Button4)
        Me.grpAviso.Controls.Add(Me.sbLkwNationalitaet)
-        Me.grpAviso.Controls.Add(Me.Label18)
+        Me.grpAviso.Controls.Add(Me.lblNat)
        Me.grpAviso.Controls.Add(Me.txtFahrerHandy)
        Me.grpAviso.Controls.Add(Me.Button2)
        Me.grpAviso.Controls.Add(Me.pic)
-        Me.grpAviso.Controls.Add(Me.Label16)
+        Me.grpAviso.Controls.Add(Me.lblFahrerHandyNr)
        Me.grpAviso.Controls.Add(Me.cbxFrächterUnbekannt)
        Me.grpAviso.Controls.Add(Me.btnAuftraggeber)
        Me.grpAviso.Controls.Add(Me.btnAvisiererKd)
@@ -755,16 +755,16 @@ Partial Class frmEintragAviso
        Me.grpAviso.Controls.Add(Me.optOhneAviso)
        Me.grpAviso.Controls.Add(Me.optAvisoEingang)
        Me.grpAviso.Controls.Add(Me.dtpAvisoEingangZeit)
-        Me.grpAviso.Controls.Add(Me.Label11)
+        Me.grpAviso.Controls.Add(Me.lblGrenze)
-        Me.grpAviso.Controls.Add(Me.Label4)
+        Me.grpAviso.Controls.Add(Me.lblFraecher)
        Me.grpAviso.Controls.Add(Me.lblAtrAvis)
        Me.grpAviso.Controls.Add(Me.lblAtr)
        Me.grpAviso.Controls.Add(Me.Label17)
-        Me.grpAviso.Controls.Add(Me.Label5)
+        Me.grpAviso.Controls.Add(Me.lblAvisierer)
        Me.grpAviso.Controls.Add(Me.cbxAuftraggeberfurAlleSendungen)
-        Me.grpAviso.Controls.Add(Me.Label6)
+        Me.grpAviso.Controls.Add(Me.lblLkwKennzeichen)
        Me.grpAviso.Controls.Add(Me.Label22)
-        Me.grpAviso.Controls.Add(Me.Label24)
+        Me.grpAviso.Controls.Add(Me.lblVoraussEintreff)
        Me.grpAviso.Controls.Add(Me.datVoraussichtlichesEintreffen)
        Me.grpAviso.Controls.Add(Me.pnl)
        Me.grpAviso.Location = New System.Drawing.Point(12, 45)
@@ -828,14 +828,14 @@ Partial Class frmEintragAviso
        Me.txtAvisiererAuftragsNr.Size = New System.Drawing.Size(388, 20)
        Me.txtAvisiererAuftragsNr.TabIndex = 47
        '
-        'Label23
+        'lblAvisiererAtrNr
        '
-        Me.Label23.AutoSize = True
+        Me.lblAvisiererAtrNr.AutoSize = True
-        Me.Label23.Location = New System.Drawing.Point(6, 356)
+        Me.lblAvisiererAtrNr.Location = New System.Drawing.Point(6, 356)
-        Me.Label23.Name = "Label23"
+        Me.lblAvisiererAtrNr.Name = "lblAvisiererAtrNr"
-        Me.Label23.Size = New System.Drawing.Size(106, 13)
+        Me.lblAvisiererAtrNr.Size = New System.Drawing.Size(106, 13)
-        Me.Label23.TabIndex = 46
+        Me.lblAvisiererAtrNr.TabIndex = 46
-        Me.Label23.Text = "Avisierer-AuftragsNr.:"
+        Me.lblAvisiererAtrNr.Text = "Avisierer-AuftragsNr.:"
        '
        'kdAuftraggeber
        '
@@ -962,14 +962,14 @@ Partial Class frmEintragAviso
        Me.sbLkwNationalitaet.TabIndex = 19
        Me.sbLkwNationalitaet.usrcntl = Nothing
        '
-        'Label18
+        'lblNat
        '
-        Me.Label18.AutoSize = True
+        Me.lblNat.AutoSize = True
-        Me.Label18.Location = New System.Drawing.Point(187, 125)
+        Me.lblNat.Location = New System.Drawing.Point(187, 125)
-        Me.Label18.Name = "Label18"
+        Me.lblNat.Name = "lblNat"
-        Me.Label18.Size = New System.Drawing.Size(27, 13)
+        Me.lblNat.Size = New System.Drawing.Size(27, 13)
-        Me.Label18.TabIndex = 15
+        Me.lblNat.TabIndex = 15
-        Me.Label18.Text = "Nat."
+        Me.lblNat.Text = "Nat."
        '
        'txtFahrerHandy
        '
@@ -1006,14 +1006,14 @@ Partial Class frmEintragAviso
        Me.pic.TabIndex = 40
        Me.pic.TabStop = False
        '
-        'Label16
+        'lblFahrerHandyNr
        '
-        Me.Label16.AutoSize = True
+        Me.lblFahrerHandyNr.AutoSize = True
-        Me.Label16.Location = New System.Drawing.Point(6, 318)
+        Me.lblFahrerHandyNr.Location = New System.Drawing.Point(6, 318)
-        Me.Label16.Name = "Label16"
+        Me.lblFahrerHandyNr.Name = "lblFahrerHandyNr"
-        Me.Label16.Size = New System.Drawing.Size(116, 13)
+        Me.lblFahrerHandyNr.Size = New System.Drawing.Size(116, 13)
-        Me.Label16.TabIndex = 43
+        Me.lblFahrerHandyNr.TabIndex = 43
-        Me.Label16.Text = "Fahrer Handy-Nummer:"
+        Me.lblFahrerHandyNr.Text = "Fahrer Handy-Nummer:"
        '
        'cbxFrächterUnbekannt
        '
@@ -1238,15 +1238,15 @@ Partial Class frmEintragAviso
        Me.Label22.TabIndex = 26
        Me.Label22.Text = "= Avisierer"
        '
-        'Label24
+        'lblVoraussEintreff
        '
-        Me.Label24.AutoSize = True
+        Me.lblVoraussEintreff.AutoSize = True
-        Me.Label24.Location = New System.Drawing.Point(25, 51)
+        Me.lblVoraussEintreff.Location = New System.Drawing.Point(25, 51)
-        Me.Label24.Name = "Label24"
+        Me.lblVoraussEintreff.Name = "lblVoraussEintreff"
-        Me.Label24.Size = New System.Drawing.Size(140, 13)
+        Me.lblVoraussEintreff.Size = New System.Drawing.Size(140, 13)
-        Me.Label24.TabIndex = 5
+        Me.lblVoraussEintreff.TabIndex = 5
-        Me.Label24.Text = "Voraussichtliches Eintreffen:"
+        Me.lblVoraussEintreff.Text = "Voraussichtliches Eintreffen:"
-        Me.Label24.Visible = False
+        Me.lblVoraussEintreff.Visible = False
        '
        'datVoraussichtlichesEintreffen
        '
@@ -1750,15 +1750,15 @@ Partial Class frmEintragAviso
        Me.Controls.Add(Me.Button3)
        Me.Controls.Add(Me.grpAktVerzollung)
        Me.Controls.Add(Me.grpAviso)
-        Me.Controls.Add(Me.Label15)
+        Me.Controls.Add(Me.lblAktenuebersicht)
        Me.Controls.Add(Me.lblStatus)
        Me.Controls.Add(Me.lblStatus2)
-        Me.Controls.Add(Me.Label2)
+        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.UsrCntlTestsystem1)
-        Me.Controls.Add(Me.Label9)
+        Me.Controls.Add(Me.lblAenderungen)
        Me.Controls.Add(Me.btnOK)
        Me.Controls.Add(Me.cbxAktenzettelDrucken)
        Me.Controls.Add(Me.UsrCntlEintragAvisoAtilla)
@@ -1795,15 +1795,15 @@ Partial Class frmEintragAviso
    End Sub
    Friend WithEvents btnOK As System.Windows.Forms.Button
-    Friend WithEvents Label2 As System.Windows.Forms.Label
+    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 Label4 As System.Windows.Forms.Label
+    Friend WithEvents lblFraecher As System.Windows.Forms.Label
-    Friend WithEvents Label5 As System.Windows.Forms.Label
+    Friend WithEvents lblAvisierer As System.Windows.Forms.Label
-    Friend WithEvents Label6 As System.Windows.Forms.Label
+    Friend WithEvents lblLkwKennzeichen As System.Windows.Forms.Label
    Friend WithEvents txtÄnderungen As System.Windows.Forms.TextBox
-    Friend WithEvents Label9 As System.Windows.Forms.Label
+    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
@@ -1825,7 +1825,7 @@ Partial Class frmEintragAviso
    Friend WithEvents dtpAvisoEingangDatum As System.Windows.Forms.DateTimePicker
    Friend WithEvents Label10 As System.Windows.Forms.Label
    Friend WithEvents dtpAvisoEingangZeit As System.Windows.Forms.DateTimePicker
-    Friend WithEvents Label11 As System.Windows.Forms.Label
+    Friend WithEvents lblGrenze As System.Windows.Forms.Label
    Friend WithEvents optOhneAviso As System.Windows.Forms.RadioButton
    Friend WithEvents optAvisoEingang As System.Windows.Forms.RadioButton
    Friend WithEvents Label7 As System.Windows.Forms.Label
@@ -1844,7 +1844,7 @@ Partial Class frmEintragAviso
    Friend WithEvents cbxHandling As System.Windows.Forms.CheckBox
    Friend WithEvents dtpDatum As System.Windows.Forms.DateTimePicker
    Friend WithEvents cboGrenzstelle As System.Windows.Forms.ComboBox
-    Friend WithEvents Label15 As System.Windows.Forms.Label
+    Friend WithEvents lblAktenuebersicht As System.Windows.Forms.Label
    Friend WithEvents grpAviso As System.Windows.Forms.GroupBox
    Friend WithEvents grpAktVerzollung As System.Windows.Forms.GroupBox
    Friend WithEvents lnlSendungText As System.Windows.Forms.Label
@@ -1891,10 +1891,10 @@ Partial Class frmEintragAviso
    Friend WithEvents kdAuftraggeber As VERAG_PROG_ALLGEMEIN.KdSearchBox
    Friend WithEvents lblAtr As System.Windows.Forms.Label
    Friend WithEvents cbxFrächterUnbekannt As System.Windows.Forms.CheckBox
-    Friend WithEvents Label16 As System.Windows.Forms.Label
+    Friend WithEvents lblFahrerHandyNr As System.Windows.Forms.Label
    Friend WithEvents txtFahrerHandy As System.Windows.Forms.TextBox
    Friend WithEvents pic As System.Windows.Forms.PictureBox
-    Friend WithEvents Label18 As System.Windows.Forms.Label
+    Friend WithEvents lblNat As System.Windows.Forms.Label
    Friend WithEvents sbLkwNationalitaet As VERAG_PROG_ALLGEMEIN.MySearchBox
    Friend WithEvents Button4 As System.Windows.Forms.Button
    Friend WithEvents lblZA As Label
@@ -1906,10 +1906,10 @@ Partial Class frmEintragAviso
    Friend WithEvents Label22 As Label
    Friend WithEvents dgvAnhaenge As VERAG_PROG_ALLGEMEIN.MyDatagridview
    Friend WithEvents txtAvisiererAuftragsNr As TextBox
-    Friend WithEvents Label23 As Label
+    Friend WithEvents lblAvisiererAtrNr As Label
    Friend WithEvents lblErrVorraussuchtlEintreffen As Label
    Friend WithEvents Button5 As Button
-    Friend WithEvents Label24 As Label
+    Friend WithEvents lblVoraussEintreff As Label
    Friend WithEvents datVoraussichtlichesEintreffen As DateTimePicker
    Friend WithEvents columnName As DataGridViewTextBoxColumn
    Friend WithEvents clmnPfad As DataGridViewTextBoxColumn
--- a/Aviso/frmEintragAviso.vb
+++ b/Aviso/frmEintragAviso.vb
@@ -215,7 +215,7 @@ Public Class frmEintragAviso
        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
            cbxFrächterUnbekannt.Visible = True
            cboGrenzstelle.Visible = False
-            Label11.Visible = False
+            lblGrenze.Visible = False
            grpAktVerzollung.Visible = False
            cbxSendungsvorlagen.Visible = False
            Button3.Visible = False
@@ -223,7 +223,7 @@ Public Class frmEintragAviso
            cbxAuftraggeberfurAlleSendungen.Visible = False
            If ATILLA_NEUERAKTENDECKEL Then
                UsrCntlEintragAvisoAtilla.Visible = True
-                Label9.Visible = False
+                lblAenderungen.Visible = False
                txtÄnderungen.Visible = False
                cbxAktenzettelDrucken.Visible = True ': cbxAktenzettelDrucken.Checked = True --> checked, wenn ohne AVISO
            End If
@@ -1499,6 +1499,9 @@ Public Class frmEintragAviso
            optOhneAviso.PerformClick()
            txtLKW_Nr.Focus()
        End If
        VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
    End Sub
@@ -1662,7 +1665,7 @@ Public Class frmEintragAviso
    Private Sub optAvisoEingang_CheckedChanged(sender As Object, e As EventArgs) Handles optAvisoEingang.CheckedChanged
        datVoraussichtlichesEintreffen.Visible = optAvisoEingang.Checked
        '  Button5.Visible = optAvisoEingang.Checked
-        Label24.Visible = optAvisoEingang.Checked
+        lblVoraussEintreff.Visible = optAvisoEingang.Checked
        If optOhneAviso.Checked Then cbxAktenzettelDrucken.Checked = False
    End Sub
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -24,12 +24,12 @@ 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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 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)
@@ -81,6 +81,9 @@ Partial Class frmHauptfenster
        Me.NKDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.NEUToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AMBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.SpracheWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DeutschToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.TürkischToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.NacherfassungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.VollständigesUpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.UpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -243,7 +246,7 @@ Partial Class frmHauptfenster
        Me.Label21 = New System.Windows.Forms.Label()
        Me.cbxCluster = New System.Windows.Forms.CheckBox()
        Me.cboTeams = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.lklErweitereSuche = New System.Windows.Forms.LinkLabel()
+        Me.lblErweitereSuche = New System.Windows.Forms.LinkLabel()
        Me.Label16 = New System.Windows.Forms.Label()
        Me.Label8 = New System.Windows.Forms.Label()
        Me.lblEintraege = New System.Windows.Forms.Label()
@@ -254,7 +257,7 @@ Partial Class frmHauptfenster
        Me.pnlSearch = New System.Windows.Forms.Panel()
        Me.txtDyRef = New System.Windows.Forms.TextBox()
        Me.Label19 = New System.Windows.Forms.Label()
-        Me.Label15 = New System.Windows.Forms.Label()
+        Me.lblErwLKWID = New System.Windows.Forms.Label()
        Me.txtlkwId = New System.Windows.Forms.TextBox()
        Me.cbxNE = New System.Windows.Forms.CheckBox()
        Me.cbxFreigabe = New System.Windows.Forms.CheckBox()
@@ -265,14 +268,14 @@ Partial Class frmHauptfenster
        Me.Label14 = New System.Windows.Forms.Label()
        Me.txtKdAuftragsnr = New System.Windows.Forms.TextBox()
        Me.txtAuftraggeber = New System.Windows.Forms.TextBox()
-        Me.Label10 = New System.Windows.Forms.Label()
+        Me.lblErwKdAtrNr = New System.Windows.Forms.Label()
        Me.Button4 = New System.Windows.Forms.Button()
-        Me.Label12 = New System.Windows.Forms.Label()
+        Me.lblErwEmpfänger = New System.Windows.Forms.Label()
        Me.txtEmpfänger = New System.Windows.Forms.TextBox()
        Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.txtAbfertigungsnummer = New System.Windows.Forms.TextBox()
-        Me.Label11 = New System.Windows.Forms.Label()
+        Me.lblErwFilialePos = New System.Windows.Forms.Label()
-        Me.Label13 = New System.Windows.Forms.Label()
+        Me.lblErwAuftraggeber = New System.Windows.Forms.Label()
        Me.cbxAlle = New System.Windows.Forms.CheckBox()
        Me.btnSmall = New System.Windows.Forms.Button()
        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
@@ -419,7 +422,7 @@ Partial Class frmHauptfenster
        'mnuProgramm
        '
        Me.mnuProgramm.BackColor = System.Drawing.Color.Transparent
-        Me.mnuProgramm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFirmen, Me.NeuesPasswortToolStripMenuItem, Me.OptionenToolStripMenuItem, Me.StandorteToolStripMenuItem, Me.SecretAvisoToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator4, Me.FirmaWechselnToolStripMenuItem, Me.StandortWechselnToolStripMenuItem, Me.NacherfassungToolStripMenuItem, Me.VollständigesUpdateToolStripMenuItem, Me.UpdateToolStripMenuItem, Me.LogoutToolStripMenuItem})
+        Me.mnuProgramm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFirmen, Me.NeuesPasswortToolStripMenuItem, Me.OptionenToolStripMenuItem, Me.StandorteToolStripMenuItem, Me.SecretAvisoToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator4, Me.FirmaWechselnToolStripMenuItem, Me.StandortWechselnToolStripMenuItem, Me.SpracheWechselnToolStripMenuItem, Me.NacherfassungToolStripMenuItem, Me.VollständigesUpdateToolStripMenuItem, Me.UpdateToolStripMenuItem, Me.LogoutToolStripMenuItem})
        Me.mnuProgramm.ForeColor = System.Drawing.Color.Black
        Me.mnuProgramm.Name = "mnuProgramm"
        Me.mnuProgramm.Size = New System.Drawing.Size(78, 20)
@@ -649,6 +652,25 @@ Partial Class frmHauptfenster
        Me.AMBToolStripMenuItem.Text = "AMB"
        Me.AMBToolStripMenuItem.Visible = False
        '
        'SpracheWechselnToolStripMenuItem
        '
        Me.SpracheWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DeutschToolStripMenuItem, Me.TürkischToolStripMenuItem})
        Me.SpracheWechselnToolStripMenuItem.Name = "SpracheWechselnToolStripMenuItem"
        Me.SpracheWechselnToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
        Me.SpracheWechselnToolStripMenuItem.Text = "Sprache wechseln"
        '
        'DeutschToolStripMenuItem
        '
        Me.DeutschToolStripMenuItem.Name = "DeutschToolStripMenuItem"
        Me.DeutschToolStripMenuItem.Size = New System.Drawing.Size(119, 22)
        Me.DeutschToolStripMenuItem.Text = "Deutsch"
        '
        'TürkischToolStripMenuItem
        '
        Me.TürkischToolStripMenuItem.Name = "TürkischToolStripMenuItem"
        Me.TürkischToolStripMenuItem.Size = New System.Drawing.Size(119, 22)
        Me.TürkischToolStripMenuItem.Text = "Türkisch"
        '
        'NacherfassungToolStripMenuItem
        '
        Me.NacherfassungToolStripMenuItem.Name = "NacherfassungToolStripMenuItem"
@@ -1858,8 +1880,8 @@ Partial Class frmHauptfenster
        Me.gridMyAviso.AllowUserToDeleteRows = False
        Me.gridMyAviso.AllowUserToOrderColumns = True
        Me.gridMyAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.Azure
-        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
        Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White
        Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Top
@@ -2229,45 +2251,45 @@ Partial Class frmHauptfenster
        Me.gridAviso.AllowUserToAddRows = False
        Me.gridAviso.AllowUserToDeleteRows = False
        Me.gridAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
        Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray
        Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable
-        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle3.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle9.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle3
+        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9
        Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle4
+        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle10
        Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill
        Me.gridAviso.Location = New System.Drawing.Point(0, 208)
        Me.gridAviso.MultiSelect = False
        Me.gridAviso.Name = "gridAviso"
        Me.gridAviso.ReadOnly = True
-        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle5
+        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle11
        Me.gridAviso.RowHeadersVisible = False
        Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle6
+        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle12
        Me.gridAviso.RowTemplate.ReadOnly = True
        Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
        Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -2282,7 +2304,7 @@ Partial Class frmHauptfenster
        Me.Panel1.Controls.Add(Me.Label21)
        Me.Panel1.Controls.Add(Me.cbxCluster)
        Me.Panel1.Controls.Add(Me.cboTeams)
-        Me.Panel1.Controls.Add(Me.lklErweitereSuche)
+        Me.Panel1.Controls.Add(Me.lblErweitereSuche)
        Me.Panel1.Controls.Add(Me.Label16)
        Me.Panel1.Controls.Add(Me.Label8)
        Me.Panel1.Controls.Add(Me.lblEintraege)
@@ -2360,16 +2382,16 @@ Partial Class frmHauptfenster
        Me.cboTeams.Size = New System.Drawing.Size(107, 24)
        Me.cboTeams.TabIndex = 19
        '
-        'lklErweitereSuche
+        'lblErweitereSuche
        '
-        Me.lklErweitereSuche.AutoSize = True
+        Me.lblErweitereSuche.AutoSize = True
-        Me.lklErweitereSuche.LinkColor = System.Drawing.Color.White
+        Me.lblErweitereSuche.LinkColor = System.Drawing.Color.White
-        Me.lklErweitereSuche.Location = New System.Drawing.Point(6, 54)
+        Me.lblErweitereSuche.Location = New System.Drawing.Point(6, 54)
-        Me.lklErweitereSuche.Name = "lklErweitereSuche"
+        Me.lblErweitereSuche.Name = "lblErweitereSuche"
-        Me.lklErweitereSuche.Size = New System.Drawing.Size(87, 13)
+        Me.lblErweitereSuche.Size = New System.Drawing.Size(87, 13)
-        Me.lklErweitereSuche.TabIndex = 17
+        Me.lblErweitereSuche.TabIndex = 17
-        Me.lklErweitereSuche.TabStop = True
+        Me.lblErweitereSuche.TabStop = True
-        Me.lklErweitereSuche.Text = "erweiterte Suche"
+        Me.lblErweitereSuche.Text = "erweiterte Suche"
        '
        'Label16
        '
@@ -2468,7 +2490,7 @@ Partial Class frmHauptfenster
        '
        Me.pnlSearch.Controls.Add(Me.txtDyRef)
        Me.pnlSearch.Controls.Add(Me.Label19)
-        Me.pnlSearch.Controls.Add(Me.Label15)
+        Me.pnlSearch.Controls.Add(Me.lblErwLKWID)
        Me.pnlSearch.Controls.Add(Me.txtlkwId)
        Me.pnlSearch.Controls.Add(Me.cbxNE)
        Me.pnlSearch.Controls.Add(Me.cbxFreigabe)
@@ -2479,14 +2501,14 @@ Partial Class frmHauptfenster
        Me.pnlSearch.Controls.Add(Me.Label14)
        Me.pnlSearch.Controls.Add(Me.txtKdAuftragsnr)
        Me.pnlSearch.Controls.Add(Me.txtAuftraggeber)
-        Me.pnlSearch.Controls.Add(Me.Label10)
+        Me.pnlSearch.Controls.Add(Me.lblErwKdAtrNr)
        Me.pnlSearch.Controls.Add(Me.Button4)
-        Me.pnlSearch.Controls.Add(Me.Label12)
+        Me.pnlSearch.Controls.Add(Me.lblErwEmpfänger)
        Me.pnlSearch.Controls.Add(Me.txtEmpfänger)
        Me.pnlSearch.Controls.Add(Me.cboFiliale)
        Me.pnlSearch.Controls.Add(Me.txtAbfertigungsnummer)
-        Me.pnlSearch.Controls.Add(Me.Label11)
+        Me.pnlSearch.Controls.Add(Me.lblErwFilialePos)
-        Me.pnlSearch.Controls.Add(Me.Label13)
+        Me.pnlSearch.Controls.Add(Me.lblErwAuftraggeber)
        Me.pnlSearch.Controls.Add(Me.cbxAlle)
        Me.pnlSearch.Location = New System.Drawing.Point(-2, 69)
        Me.pnlSearch.Name = "pnlSearch"
@@ -2513,15 +2535,15 @@ Partial Class frmHauptfenster
        Me.Label19.TabIndex = 20
        Me.Label19.Text = "DY-Ref.:"
        '
-        'Label15
+        'lblErwLKWID
        '
-        Me.Label15.AutoSize = True
+        Me.lblErwLKWID.AutoSize = True
-        Me.Label15.ForeColor = System.Drawing.Color.White
+        Me.lblErwLKWID.ForeColor = System.Drawing.Color.White
-        Me.Label15.Location = New System.Drawing.Point(8, 64)
+        Me.lblErwLKWID.Location = New System.Drawing.Point(8, 64)
-        Me.Label15.Name = "Label15"
+        Me.lblErwLKWID.Name = "lblErwLKWID"
-        Me.Label15.Size = New System.Drawing.Size(46, 13)
+        Me.lblErwLKWID.Size = New System.Drawing.Size(46, 13)
-        Me.Label15.TabIndex = 19
+        Me.lblErwLKWID.TabIndex = 19
-        Me.Label15.Text = "LKW-Id:"
+        Me.lblErwLKWID.Text = "LKW-Id:"
        '
        'txtlkwId
        '
@@ -2626,15 +2648,15 @@ Partial Class frmHauptfenster
        Me.txtAuftraggeber.Size = New System.Drawing.Size(236, 23)
        Me.txtAuftraggeber.TabIndex = 1
        '
-        'Label10
+        'lblErwKdAtrNr
        '
-        Me.Label10.AutoSize = True
+        Me.lblErwKdAtrNr.AutoSize = True
-        Me.Label10.ForeColor = System.Drawing.Color.White
+        Me.lblErwKdAtrNr.ForeColor = System.Drawing.Color.White
-        Me.Label10.Location = New System.Drawing.Point(316, 38)
+        Me.lblErwKdAtrNr.Location = New System.Drawing.Point(316, 38)
-        Me.Label10.Name = "Label10"
+        Me.lblErwKdAtrNr.Name = "lblErwKdAtrNr"
-        Me.Label10.Size = New System.Drawing.Size(65, 13)
+        Me.lblErwKdAtrNr.Size = New System.Drawing.Size(65, 13)
-        Me.Label10.TabIndex = 0
+        Me.lblErwKdAtrNr.TabIndex = 0
-        Me.Label10.Text = "Kd-Auftr.Nr.:"
+        Me.lblErwKdAtrNr.Text = "Kd-Auftr.Nr.:"
        '
        'Button4
        '
@@ -2652,15 +2674,15 @@ Partial Class frmHauptfenster
        Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.Button4.UseVisualStyleBackColor = True
        '
-        'Label12
+        'lblErwEmpfänger
        '
-        Me.Label12.AutoSize = True
+        Me.lblErwEmpfänger.AutoSize = True
-        Me.Label12.ForeColor = System.Drawing.Color.White
+        Me.lblErwEmpfänger.ForeColor = System.Drawing.Color.White
-        Me.Label12.Location = New System.Drawing.Point(8, 38)
+        Me.lblErwEmpfänger.Location = New System.Drawing.Point(8, 38)
-        Me.Label12.Name = "Label12"
+        Me.lblErwEmpfänger.Name = "lblErwEmpfänger"
-        Me.Label12.Size = New System.Drawing.Size(61, 13)
+        Me.lblErwEmpfänger.Size = New System.Drawing.Size(61, 13)
-        Me.Label12.TabIndex = 6
+        Me.lblErwEmpfänger.TabIndex = 6
-        Me.Label12.Text = "Empfänger:"
+        Me.lblErwEmpfänger.Text = "Empfänger:"
        '
        'txtEmpfänger
        '
@@ -2694,25 +2716,25 @@ Partial Class frmHauptfenster
        Me.txtAbfertigungsnummer.Size = New System.Drawing.Size(147, 23)
        Me.txtAbfertigungsnummer.TabIndex = 4
        '
-        'Label11
+        'lblErwFilialePos
        '
-        Me.Label11.AutoSize = True
+        Me.lblErwFilialePos.AutoSize = True
-        Me.Label11.ForeColor = System.Drawing.Color.White
+        Me.lblErwFilialePos.ForeColor = System.Drawing.Color.White
-        Me.Label11.Location = New System.Drawing.Point(316, 16)
+        Me.lblErwFilialePos.Location = New System.Drawing.Point(316, 16)
-        Me.Label11.Name = "Label11"
+        Me.lblErwFilialePos.Name = "lblErwFilialePos"
-        Me.Label11.Size = New System.Drawing.Size(73, 13)
+        Me.lblErwFilialePos.Size = New System.Drawing.Size(73, 13)
-        Me.Label11.TabIndex = 2
+        Me.lblErwFilialePos.TabIndex = 2
-        Me.Label11.Text = "Filiale/PosNr.:"
+        Me.lblErwFilialePos.Text = "Filiale/PosNr.:"
        '
-        'Label13
+        'lblErwAuftraggeber
        '
-        Me.Label13.AutoSize = True
+        Me.lblErwAuftraggeber.AutoSize = True
-        Me.Label13.ForeColor = System.Drawing.Color.White
+        Me.lblErwAuftraggeber.ForeColor = System.Drawing.Color.White
-        Me.Label13.Location = New System.Drawing.Point(8, 17)
+        Me.lblErwAuftraggeber.Location = New System.Drawing.Point(8, 17)
-        Me.Label13.Name = "Label13"
+        Me.lblErwAuftraggeber.Name = "lblErwAuftraggeber"
-        Me.Label13.Size = New System.Drawing.Size(71, 13)
+        Me.lblErwAuftraggeber.Size = New System.Drawing.Size(71, 13)
-        Me.Label13.TabIndex = 7
+        Me.lblErwAuftraggeber.TabIndex = 7
-        Me.Label13.Text = "Auftraggeber:"
+        Me.lblErwAuftraggeber.Text = "Auftraggeber:"
        '
        'cbxAlle
        '
@@ -3084,16 +3106,16 @@ Partial Class frmHauptfenster
    Friend WithEvents pnlSearch As System.Windows.Forms.Panel
    Friend WithEvents cboFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents txtAbfertigungsnummer As System.Windows.Forms.TextBox
-    Friend WithEvents Label11 As System.Windows.Forms.Label
+    Friend WithEvents lblErwFilialePos As System.Windows.Forms.Label
-    Friend WithEvents Label10 As System.Windows.Forms.Label
+    Friend WithEvents lblErwKdAtrNr As System.Windows.Forms.Label
    Friend WithEvents txtKdAuftragsnr As System.Windows.Forms.TextBox
-    Friend WithEvents lklErweitereSuche As System.Windows.Forms.LinkLabel
+    Friend WithEvents lblErweitereSuche As System.Windows.Forms.LinkLabel
-    Friend WithEvents Label12 As System.Windows.Forms.Label
+    Friend WithEvents lblErwEmpfänger As System.Windows.Forms.Label
    Friend WithEvents txtEmpfänger As System.Windows.Forms.TextBox
    Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents txtAuftraggeber As System.Windows.Forms.TextBox
    Friend WithEvents Button4 As System.Windows.Forms.Button
-    Friend WithEvents Label13 As System.Windows.Forms.Label
+    Friend WithEvents lblErwAuftraggeber As System.Windows.Forms.Label
    Friend WithEvents cbxAlle As System.Windows.Forms.CheckBox
    Friend WithEvents Label14 As System.Windows.Forms.Label
    Friend WithEvents cbxNE As System.Windows.Forms.CheckBox
@@ -3102,7 +3124,7 @@ Partial Class frmHauptfenster
    Friend WithEvents cbxVorg As System.Windows.Forms.CheckBox
    Friend WithEvents cbxVorb As System.Windows.Forms.CheckBox
    Friend WithEvents cbxErfasst As System.Windows.Forms.CheckBox
-    Friend WithEvents Label15 As System.Windows.Forms.Label
+    Friend WithEvents lblErwLKWID As System.Windows.Forms.Label
    Friend WithEvents txtlkwId As System.Windows.Forms.TextBox
    Friend WithEvents btnDienstplan As System.Windows.Forms.Button
    Friend WithEvents MDMParkplatzkartenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
@@ -3210,4 +3232,7 @@ Partial Class frmHauptfenster
    Friend WithEvents AMBToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents MRNBarcodedruckToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents SecretAvisoToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents SpracheWechselnToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents DeutschToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents TürkischToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmHauptfenster.resx
+++ b/Aviso/frmHauptfenster.resx
@@ -225,6 +225,9 @@
        pOTzPwAAAABJRU5ErkJggg==
 </value>
  </data>
  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>598, 17</value>
  </metadata>
  <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>697, 17</value>
  </metadata>
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -150,6 +150,8 @@ Public Class frmHauptfenster
    End Sub
    Private Sub frmMain_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
        'MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
        Me.AutoScaleMode = AutoScaleMode.Dpi
        hideErr.Interval = 3000
@@ -253,7 +255,7 @@ Public Class frmHauptfenster
        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "ATILLA" ' Case "VERAG", "IMEX"
-                lklErweitereSuche.Visible = False
+                lblErweitereSuche.Visible = False
                MDMParkplatzkartenToolStripMenuItem.Visible = False
                Button10.Visible = False
@@ -596,7 +598,7 @@ Public Class frmHauptfenster
            '.Columns(12).HeaderText = "Änderungen"
            initDauerLKWFertig()
-
+            ._TRANSLATE()
        End With
    End Sub
@@ -1284,6 +1286,7 @@ Public Class frmHauptfenster
                '.Sort(.Columns(3), System.ComponentModel.ListSortDirection.Descending)
                .SelectionMode = DataGridViewSelectionMode.FullRowSelect
                .ClearSelection()
                ._TRANSLATE()
            End With
        Catch ex As Exception
@@ -2330,6 +2333,7 @@ Public Class frmHauptfenster
        End If
        tbcntrAviso.Width = Panel1.Width
        VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
    End Sub
    WithEvents timerStart As New Timer
@@ -2930,7 +2934,7 @@ Public Class frmHauptfenster
-    Private Sub lklErweitereSuche_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lklErweitereSuche.LinkClicked
+    Private Sub lklErweitereSuche_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lblErweitereSuche.LinkClicked
        initPnlSearch()
    End Sub
    Sub initPnlSearch()
@@ -3578,6 +3582,24 @@ Public Class frmHauptfenster
        Dim frmSecretAviso As New frmSecretAviso
        frmSecretAviso.Show(Me)
    End Sub
    Private Sub DeutschToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DeutschToolStripMenuItem.Click
        If True Then
            VERAG_PROG_ALLGEMEIN.cAllgemein._LAN = "DE"
            showMeNew()
        Else
            MsgBox("Keine Berechtigung!")
        End If
    End Sub
    Private Sub TürkischToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TürkischToolStripMenuItem.Click
        If True Then
            VERAG_PROG_ALLGEMEIN.cAllgemein._LAN = "TR"
            showMeNew()
        Else
            MsgBox("Keine Berechtigung!")
        End If
    End Sub
 End Class
 Public Class AvisoStatusFunctions
--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
--- a/Aviso/frmSendungsdetailsNEU.resx
+++ b/Aviso/frmSendungsdetailsNEU.resx
@@ -1456,7 +1456,7 @@
        AAAASUVORK5CYII=
 </value>
  </data>
-  <data name="Button20.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnOptionen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
@@ -1464,7 +1464,7 @@
        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
 </value>
  </data>
-  <data name="Button19.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnDirektAnfuegen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
@@ -1472,7 +1472,7 @@
        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
 </value>
  </data>
-  <data name="Button18.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnImportAssi.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
@@ -1750,7 +1750,7 @@
        WVpa4k9/YMDAAACeTwgq7o2S0AAAAABJRU5ErkJggg==
 </value>
  </data>
-  <data name="btn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnSpedBuch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -1780,7 +1780,7 @@ Public Class frmSendungsdetailsNEU
        Return b
    End Function
-    Private Sub btn_Click_1(sender As Object, e As EventArgs) Handles btn.Click
+    Private Sub btn_Click_1(sender As Object, e As EventArgs) Handles btnSpedBuch.Click
        'loadDataInLIST()
        If Not SAVE_ME() Then
@@ -2659,7 +2659,7 @@ Public Class frmSendungsdetailsNEU
        ' TabControl1.Enabled = Not sperren
        Panel6.Enabled = Not sperren
        Panel16.Enabled = Not sperren
-        btn.Enabled = Not sperren
+        btnSpedBuch.Enabled = Not sperren
        '  Panel5.Enabled = Not sperren
        '  cboAbfertigungsart.Enabled = Not sperren
        txtAnzahl.Enabled = Not sperren
@@ -3584,7 +3584,7 @@ Public Class frmSendungsdetailsNEU
    End Sub
-    Private Sub Button17_Click(sender As Object, e As EventArgs) Handles Button17.Click
+    Private Sub Button17_Click(sender As Object, e As EventArgs) Handles btnVermerk.Click
        Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
        Dim sv As New frmAddSendungsvermerkShort(AvisoId, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) ', dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value)
        sv.Location = Me.PointToClient(Cursor.Position)
@@ -3608,7 +3608,7 @@ Public Class frmSendungsdetailsNEU
    End Sub
-    Private Sub Button18_Click(sender As Object, e As EventArgs) Handles Button18.Click
+    Private Sub Button18_Click(sender As Object, e As EventArgs) Handles btnImportAssi.Click
        'loadDataInLIST()
        SAVE_ME()
@@ -3630,7 +3630,7 @@ Public Class frmSendungsdetailsNEU
        Next
    End Sub
-    Private Sub Button20_Click(sender As Object, e As EventArgs) Handles Button20.Click
+    Private Sub Button20_Click(sender As Object, e As EventArgs) Handles btnOptionen.Click
        cntxtAnh.Show(Cursor.Position)
    End Sub
@@ -3749,7 +3749,7 @@ Public Class frmSendungsdetailsNEU
        Next
    End Sub
-    Private Sub Button22_Click(sender As Object, e As EventArgs) Handles Button22.Click
+    Private Sub Button22_Click(sender As Object, e As EventArgs) Handles btnMailVorlage.Click
        ContextMenuStrip1.Show(Cursor.Position)
    End Sub
@@ -3759,7 +3759,7 @@ Public Class frmSendungsdetailsNEU
        initGesColliGewicht()
    End Sub
-    Private Sub Button23_Click(sender As Object, e As EventArgs) Handles Button23.Click
+    Private Sub Button23_Click(sender As Object, e As EventArgs) Handles btnPDFZusammenfueren.Click
        ' ContextMenuStrip2.Show(Cursor.Position)
        If dgvAnhang.SelectedRows.Count >= 1 Then
            Try
--- a/Aviso/usrcntlAktDetails.Designer.vb
+++ b/Aviso/usrcntlAktDetails.Designer.vb
@@ -45,13 +45,17 @@ Partial Class usrcntlAktDetails
        Me.cboGrenzstelle = New System.Windows.Forms.ComboBox()
        Me.Label11 = New System.Windows.Forms.Label()
        Me.lnlSendungText = New System.Windows.Forms.Label()
        Me.txtSendungen = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.pnlSBG = New System.Windows.Forms.Panel()
        Me.lblSndFremd = New System.Windows.Forms.Label()
        Me.Label21 = New System.Windows.Forms.Label()
        Me.txtSndFremd = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label20 = New System.Windows.Forms.Label()
        Me.Label19 = New System.Windows.Forms.Label()
        Me.lblFiskde = New System.Windows.Forms.Label()
        Me.txtSndFiskalDE = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.lblFiskAT = New System.Windows.Forms.Label()
        Me.txtSndFiskalAT = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.cbxSammelakt = New System.Windows.Forms.CheckBox()
        Me.Button5 = New System.Windows.Forms.Button()
        Me.Button3 = New System.Windows.Forms.Button()
@@ -60,28 +64,32 @@ Partial Class usrcntlAktDetails
        Me.Panel7 = New System.Windows.Forms.Panel()
        Me.picArrowDown = New System.Windows.Forms.PictureBox()
        Me.Panel4 = New System.Windows.Forms.Panel()
        Me.cbxVPSplit = New System.Windows.Forms.CheckBox()
        Me.Button15 = New System.Windows.Forms.Button()
        Me.btnSendungslisteUNISPED = New System.Windows.Forms.Button()
        Me.cbxAlleFirmen = New System.Windows.Forms.CheckBox()
        Me.Button12 = New System.Windows.Forms.Button()
        Me.Button11 = New System.Windows.Forms.Button()
        Me.btnKasse_User = New System.Windows.Forms.Button()
        Me.cboFormulareRgAn = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.Button8 = New System.Windows.Forms.Button()
        Me.Button10 = New System.Windows.Forms.Button()
        Me.Button9 = New System.Windows.Forms.Button()
        Me.btnKasse_LG = New System.Windows.Forms.Button()
        Me.cbxLZRg = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
        Me.cbxLZT1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
        Me.Button18 = New System.Windows.Forms.Button()
        Me.gridVermerke = New System.Windows.Forms.DataGridView()
        Me.pnlVermerkeTop = New System.Windows.Forms.Panel()
        Me.Panel1 = New System.Windows.Forms.Panel()
-        Me.Button6 = New System.Windows.Forms.Button()
+        Me.btnVerpflErkl = New System.Windows.Forms.Button()
        Me.btnFormulare = New System.Windows.Forms.Button()
        Me.pnlVermLeft = New System.Windows.Forms.Panel()
        Me.tbcntlVermerke = New System.Windows.Forms.TabControl()
-        Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.tbAlle = New System.Windows.Forms.TabPage()
-        Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.tbAkenvermerk = New System.Windows.Forms.TabPage()
-        Me.TabPage3 = New System.Windows.Forms.TabPage()
+        Me.tbSndvermerk = New System.Windows.Forms.TabPage()
        Me.tbAnhang = New System.Windows.Forms.TabPage()
        Me.addVermerk = New System.Windows.Forms.Button()
        Me.pnlMAInfo = New System.Windows.Forms.Panel()
@@ -93,19 +101,19 @@ Partial Class usrcntlAktDetails
        Me.txtMAinfo_VorbereitetQs = New System.Windows.Forms.TextBox()
        Me.Panel8 = New System.Windows.Forms.Panel()
        Me.lblBarZuKassierenSumme = New System.Windows.Forms.Label()
-        Me.Button4 = New System.Windows.Forms.Button()
+        Me.btnAktUebernehmen = New System.Windows.Forms.Button()
        Me.Button7 = New System.Windows.Forms.Button()
        Me.btnLkwBeleg = New System.Windows.Forms.Button()
-        Me.Label1 = New System.Windows.Forms.Label()
+        Me.lblLKWId = New System.Windows.Forms.Label()
        Me.btnFertig = New System.Windows.Forms.Button()
        Me.lblIMEX = New System.Windows.Forms.Label()
        Me.cbxHandling = New System.Windows.Forms.Label()
        Me.btnAktAbschliessen = New System.Windows.Forms.Button()
-        Me.Button2 = New System.Windows.Forms.Button()
+        Me.btnOptionen = New System.Windows.Forms.Button()
        Me.txtAktMA = New System.Windows.Forms.TextBox()
        Me.Label3 = New System.Windows.Forms.Label()
-        Me.Label10 = New System.Windows.Forms.Label()
+        Me.lblFraechter = New System.Windows.Forms.Label()
-        Me.Label9 = New System.Windows.Forms.Label()
+        Me.lblAvisierer = New System.Windows.Forms.Label()
        Me.txtFrächter = New System.Windows.Forms.TextBox()
        Me.txtAuftraggeber = New System.Windows.Forms.TextBox()
        Me.pnlAbgeschlossen = New System.Windows.Forms.Panel()
@@ -151,14 +159,6 @@ Partial Class usrcntlAktDetails
        Me.btnLöschen = New System.Windows.Forms.Button()
        Me.btnÄndern = New System.Windows.Forms.Button()
        Me.btnTV = New System.Windows.Forms.Button()
        Me.cbxVPSplit = New System.Windows.Forms.CheckBox()
        Me.txtSendungen = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtSndFremd = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtSndFiskalDE = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtSndFiskalAT = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.cboFormulareRgAn = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cbxLZRg = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
        Me.cbxLZT1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
        Me.pnlDetailsRechts.SuspendLayout()
        Me.Panel3.SuspendLayout()
        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -349,6 +349,30 @@ Partial Class usrcntlAktDetails
        Me.lnlSendungText.TabIndex = 2
        Me.lnlSendungText.Text = "Sendung"
        '
        'txtSendungen
        '
        Me.txtSendungen._DateTimeOnly = False
        Me.txtSendungen._numbersOnly = True
        Me.txtSendungen._numbersOnlyKommastellen = ""
        Me.txtSendungen._Prozent = False
        Me.txtSendungen._ShortDateNew = False
        Me.txtSendungen._ShortDateOnly = False
        Me.txtSendungen._TimeOnly = False
        Me.txtSendungen._value = ""
        Me.txtSendungen._Waehrung = False
        Me.txtSendungen._WaehrungZeichen = True
        Me.txtSendungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtSendungen.ForeColor = System.Drawing.Color.Black
        Me.txtSendungen.Location = New System.Drawing.Point(22, 17)
        Me.txtSendungen.MaxLineLength = -1
        Me.txtSendungen.MaxLines_Warning = ""
        Me.txtSendungen.MaxLines_Warning_Label = Nothing
        Me.txtSendungen.Name = "txtSendungen"
        Me.txtSendungen.Size = New System.Drawing.Size(32, 26)
        Me.txtSendungen.TabIndex = 1
        Me.txtSendungen.Text = "1"
        Me.txtSendungen.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        '
        'pnlSBG
        '
        Me.pnlSBG.Controls.Add(Me.lblSndFremd)
@@ -385,6 +409,31 @@ Partial Class usrcntlAktDetails
        Me.Label21.Text = "1"
        Me.Label21.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
        'txtSndFremd
        '
        Me.txtSndFremd._DateTimeOnly = False
        Me.txtSndFremd._numbersOnly = True
        Me.txtSndFremd._numbersOnlyKommastellen = ""
        Me.txtSndFremd._Prozent = False
        Me.txtSndFremd._ShortDateNew = False
        Me.txtSndFremd._ShortDateOnly = False
        Me.txtSndFremd._TimeOnly = False
        Me.txtSndFremd._value = ""
        Me.txtSndFremd._Waehrung = False
        Me.txtSndFremd._WaehrungZeichen = True
        Me.txtSndFremd.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtSndFremd.ForeColor = System.Drawing.Color.Black
        Me.txtSndFremd.Location = New System.Drawing.Point(149, 5)
        Me.txtSndFremd.MaxLineLength = -1
        Me.txtSndFremd.MaxLines_Warning = ""
        Me.txtSndFremd.MaxLines_Warning_Label = Nothing
        Me.txtSndFremd.Name = "txtSndFremd"
        Me.txtSndFremd.Size = New System.Drawing.Size(32, 26)
        Me.txtSndFremd.TabIndex = 83
        Me.txtSndFremd.Text = "0"
        Me.txtSndFremd.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        Me.txtSndFremd.Visible = False
        '
        'Label20
        '
        Me.Label20.AutoSize = True
@@ -412,6 +461,30 @@ Partial Class usrcntlAktDetails
        Me.lblFiskde.TabIndex = 6
        Me.lblFiskde.Text = "Fiskal DE"
        '
        'txtSndFiskalDE
        '
        Me.txtSndFiskalDE._DateTimeOnly = False
        Me.txtSndFiskalDE._numbersOnly = True
        Me.txtSndFiskalDE._numbersOnlyKommastellen = ""
        Me.txtSndFiskalDE._Prozent = False
        Me.txtSndFiskalDE._ShortDateNew = False
        Me.txtSndFiskalDE._ShortDateOnly = False
        Me.txtSndFiskalDE._TimeOnly = False
        Me.txtSndFiskalDE._value = ""
        Me.txtSndFiskalDE._Waehrung = False
        Me.txtSndFiskalDE._WaehrungZeichen = True
        Me.txtSndFiskalDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtSndFiskalDE.ForeColor = System.Drawing.Color.Black
        Me.txtSndFiskalDE.Location = New System.Drawing.Point(16, 34)
        Me.txtSndFiskalDE.MaxLineLength = -1
        Me.txtSndFiskalDE.MaxLines_Warning = ""
        Me.txtSndFiskalDE.MaxLines_Warning_Label = Nothing
        Me.txtSndFiskalDE.Name = "txtSndFiskalDE"
        Me.txtSndFiskalDE.Size = New System.Drawing.Size(32, 26)
        Me.txtSndFiskalDE.TabIndex = 5
        Me.txtSndFiskalDE.Text = "0"
        Me.txtSndFiskalDE.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        '
        'lblFiskAT
        '
        Me.lblFiskAT.AutoSize = True
@@ -421,6 +494,30 @@ Partial Class usrcntlAktDetails
        Me.lblFiskAT.TabIndex = 4
        Me.lblFiskAT.Text = "Fiskal AT"
        '
        'txtSndFiskalAT
        '
        Me.txtSndFiskalAT._DateTimeOnly = False
        Me.txtSndFiskalAT._numbersOnly = True
        Me.txtSndFiskalAT._numbersOnlyKommastellen = ""
        Me.txtSndFiskalAT._Prozent = False
        Me.txtSndFiskalAT._ShortDateNew = False
        Me.txtSndFiskalAT._ShortDateOnly = False
        Me.txtSndFiskalAT._TimeOnly = False
        Me.txtSndFiskalAT._value = ""
        Me.txtSndFiskalAT._Waehrung = False
        Me.txtSndFiskalAT._WaehrungZeichen = True
        Me.txtSndFiskalAT.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtSndFiskalAT.ForeColor = System.Drawing.Color.Black
        Me.txtSndFiskalAT.Location = New System.Drawing.Point(16, 5)
        Me.txtSndFiskalAT.MaxLineLength = -1
        Me.txtSndFiskalAT.MaxLines_Warning = ""
        Me.txtSndFiskalAT.MaxLines_Warning_Label = Nothing
        Me.txtSndFiskalAT.Name = "txtSndFiskalAT"
        Me.txtSndFiskalAT.Size = New System.Drawing.Size(32, 26)
        Me.txtSndFiskalAT.TabIndex = 3
        Me.txtSndFiskalAT.Text = "0"
        Me.txtSndFiskalAT.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        '
        'cbxSammelakt
        '
        Me.cbxSammelakt.AutoSize = True
@@ -578,6 +675,17 @@ Partial Class usrcntlAktDetails
        Me.Panel4.TabIndex = 102
        Me.Panel4.Visible = False
        '
        'cbxVPSplit
        '
        Me.cbxVPSplit.AutoSize = True
        Me.cbxVPSplit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cbxVPSplit.Location = New System.Drawing.Point(207, 5)
        Me.cbxVPSplit.Name = "cbxVPSplit"
        Me.cbxVPSplit.Size = New System.Drawing.Size(51, 17)
        Me.cbxVPSplit.TabIndex = 116
        Me.cbxVPSplit.Text = "je VP"
        Me.cbxVPSplit.UseVisualStyleBackColor = True
        '
        'Button15
        '
        Me.Button15.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -673,6 +781,17 @@ Partial Class usrcntlAktDetails
        Me.btnKasse_User.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.btnKasse_User.UseVisualStyleBackColor = False
        '
        'cboFormulareRgAn
        '
        Me.cboFormulareRgAn._allowedValuesFreiText = Nothing
        Me.cboFormulareRgAn._allowFreiText = False
        Me.cboFormulareRgAn._value = ""
        Me.cboFormulareRgAn.FormattingEnabled = True
        Me.cboFormulareRgAn.Location = New System.Drawing.Point(40, 2)
        Me.cboFormulareRgAn.Name = "cboFormulareRgAn"
        Me.cboFormulareRgAn.Size = New System.Drawing.Size(88, 21)
        Me.cboFormulareRgAn.TabIndex = 108
        '
        'Label4
        '
        Me.Label4.AutoSize = True
@@ -747,6 +866,35 @@ Partial Class usrcntlAktDetails
        Me.btnKasse_LG.Text = "Dispo.Haft" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(nur T1/T2)"
        Me.btnKasse_LG.UseVisualStyleBackColor = False
        '
        'cbxLZRg
        '
        Me.cbxLZRg._value = ""
        Me.cbxLZRg.AutoSize = True
        Me.cbxLZRg.Checked = True
        Me.cbxLZRg.Checked_value = False
        Me.cbxLZRg.CheckedValue = False
        Me.cbxLZRg.CheckState = System.Windows.Forms.CheckState.Checked
        Me.cbxLZRg.Location = New System.Drawing.Point(134, 93)
        Me.cbxLZRg.Name = "cbxLZRg"
        Me.cbxLZRg.Size = New System.Drawing.Size(88, 17)
        Me.cbxLZRg.TabIndex = 115
        Me.cbxLZRg.Text = "Rechnungen"
        Me.cbxLZRg.UseVisualStyleBackColor = True
        '
        'cbxLZT1
        '
        Me.cbxLZT1._value = ""
        Me.cbxLZT1.AutoSize = True
        Me.cbxLZT1.Checked_value = False
        Me.cbxLZT1.CheckedValue = False
        Me.cbxLZT1.Location = New System.Drawing.Point(223, 93)
        Me.cbxLZT1.Name = "cbxLZT1"
        Me.cbxLZT1.Size = New System.Drawing.Size(39, 17)
        Me.cbxLZT1.TabIndex = 114
        Me.cbxLZT1.Text = "T1"
        Me.cbxLZT1.UseVisualStyleBackColor = True
        Me.cbxLZT1.Visible = False
        '
        'Button18
        '
        Me.Button18.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -830,7 +978,7 @@ Partial Class usrcntlAktDetails
        '
        'Panel1
        '
-        Me.Panel1.Controls.Add(Me.Button6)
+        Me.Panel1.Controls.Add(Me.btnVerpflErkl)
        Me.Panel1.Controls.Add(Me.btnFormulare)
        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right
        Me.Panel1.Location = New System.Drawing.Point(300, 0)
@@ -838,21 +986,21 @@ Partial Class usrcntlAktDetails
        Me.Panel1.Size = New System.Drawing.Size(275, 30)
        Me.Panel1.TabIndex = 104
        '
-        'Button6
+        'btnVerpflErkl
        '
-        Me.Button6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnVerpflErkl.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnVerpflErkl.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button6.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+        Me.btnVerpflErkl.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
-        Me.Button6.ForeColor = System.Drawing.Color.Black
+        Me.btnVerpflErkl.ForeColor = System.Drawing.Color.Black
-        Me.Button6.Image = Global.AVISO.My.Resources.Resources.spedbuch_small
+        Me.btnVerpflErkl.Image = Global.AVISO.My.Resources.Resources.spedbuch_small
-        Me.Button6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnVerpflErkl.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button6.Location = New System.Drawing.Point(168, 2)
+        Me.btnVerpflErkl.Location = New System.Drawing.Point(168, 2)
-        Me.Button6.Name = "Button6"
+        Me.btnVerpflErkl.Name = "btnVerpflErkl"
-        Me.Button6.Size = New System.Drawing.Size(106, 25)
+        Me.btnVerpflErkl.Size = New System.Drawing.Size(106, 25)
-        Me.Button6.TabIndex = 105
+        Me.btnVerpflErkl.TabIndex = 105
-        Me.Button6.Text = "Verpfl.Fahrer"
+        Me.btnVerpflErkl.Text = "Verpfl.Fahrer"
-        Me.Button6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnVerpflErkl.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button6.UseVisualStyleBackColor = True
+        Me.btnVerpflErkl.UseVisualStyleBackColor = True
        '
        'btnFormulare
        '
@@ -881,9 +1029,9 @@ Partial Class usrcntlAktDetails
        '
        'tbcntlVermerke
        '
-        Me.tbcntlVermerke.Controls.Add(Me.TabPage1)
+        Me.tbcntlVermerke.Controls.Add(Me.tbAlle)
-        Me.tbcntlVermerke.Controls.Add(Me.TabPage2)
+        Me.tbcntlVermerke.Controls.Add(Me.tbAkenvermerk)
-        Me.tbcntlVermerke.Controls.Add(Me.TabPage3)
+        Me.tbcntlVermerke.Controls.Add(Me.tbSndvermerk)
        Me.tbcntlVermerke.Controls.Add(Me.tbAnhang)
        Me.tbcntlVermerke.Dock = System.Windows.Forms.DockStyle.Fill
        Me.tbcntlVermerke.ImeMode = System.Windows.Forms.ImeMode.Disable
@@ -894,34 +1042,34 @@ Partial Class usrcntlAktDetails
        Me.tbcntlVermerke.Size = New System.Drawing.Size(571, 30)
        Me.tbcntlVermerke.TabIndex = 71
        '
-        'TabPage1
+        'tbAlle
        '
-        Me.TabPage1.Location = New System.Drawing.Point(4, 30)
+        Me.tbAlle.Location = New System.Drawing.Point(4, 30)
-        Me.TabPage1.Name = "TabPage1"
+        Me.tbAlle.Name = "tbAlle"
-        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
+        Me.tbAlle.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(563, 0)
+        Me.tbAlle.Size = New System.Drawing.Size(563, 0)
-        Me.TabPage1.TabIndex = 0
+        Me.tbAlle.TabIndex = 0
-        Me.TabPage1.Text = "Alle"
+        Me.tbAlle.Text = "Alle"
-        Me.TabPage1.UseVisualStyleBackColor = True
+        Me.tbAlle.UseVisualStyleBackColor = True
        '
-        'TabPage2
+        'tbAkenvermerk
        '
-        Me.TabPage2.Location = New System.Drawing.Point(4, 30)
+        Me.tbAkenvermerk.Location = New System.Drawing.Point(4, 30)
-        Me.TabPage2.Name = "TabPage2"
+        Me.tbAkenvermerk.Name = "tbAkenvermerk"
-        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
+        Me.tbAkenvermerk.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(563, 0)
+        Me.tbAkenvermerk.Size = New System.Drawing.Size(563, 0)
-        Me.TabPage2.TabIndex = 1
+        Me.tbAkenvermerk.TabIndex = 1
-        Me.TabPage2.Text = "Aktenvermerke"
+        Me.tbAkenvermerk.Text = "Aktenvermerke"
-        Me.TabPage2.UseVisualStyleBackColor = True
+        Me.tbAkenvermerk.UseVisualStyleBackColor = True
        '
-        'TabPage3
+        'tbSndvermerk
        '
-        Me.TabPage3.Location = New System.Drawing.Point(4, 30)
+        Me.tbSndvermerk.Location = New System.Drawing.Point(4, 30)
-        Me.TabPage3.Name = "TabPage3"
+        Me.tbSndvermerk.Name = "tbSndvermerk"
-        Me.TabPage3.Size = New System.Drawing.Size(563, 0)
+        Me.tbSndvermerk.Size = New System.Drawing.Size(563, 0)
-        Me.TabPage3.TabIndex = 2
+        Me.tbSndvermerk.TabIndex = 2
-        Me.TabPage3.Text = "Sendungsvermerke"
+        Me.tbSndvermerk.Text = "Sendungsvermerke"
-        Me.TabPage3.UseVisualStyleBackColor = True
+        Me.tbSndvermerk.UseVisualStyleBackColor = True
        '
        'tbAnhang
        '
@@ -1046,19 +1194,19 @@ Partial Class usrcntlAktDetails
        '
        Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.Panel8.Controls.Add(Me.lblBarZuKassierenSumme)
-        Me.Panel8.Controls.Add(Me.Button4)
+        Me.Panel8.Controls.Add(Me.btnAktUebernehmen)
        Me.Panel8.Controls.Add(Me.Button7)
        Me.Panel8.Controls.Add(Me.btnLkwBeleg)
-        Me.Panel8.Controls.Add(Me.Label1)
+        Me.Panel8.Controls.Add(Me.lblLKWId)
        Me.Panel8.Controls.Add(Me.btnFertig)
        Me.Panel8.Controls.Add(Me.lblIMEX)
        Me.Panel8.Controls.Add(Me.cbxHandling)
        Me.Panel8.Controls.Add(Me.btnAktAbschliessen)
-        Me.Panel8.Controls.Add(Me.Button2)
+        Me.Panel8.Controls.Add(Me.btnOptionen)
        Me.Panel8.Controls.Add(Me.txtAktMA)
        Me.Panel8.Controls.Add(Me.Label3)
-        Me.Panel8.Controls.Add(Me.Label10)
+        Me.Panel8.Controls.Add(Me.lblFraechter)
-        Me.Panel8.Controls.Add(Me.Label9)
+        Me.Panel8.Controls.Add(Me.lblAvisierer)
        Me.Panel8.Controls.Add(Me.txtFrächter)
        Me.Panel8.Controls.Add(Me.txtAuftraggeber)
        Me.Panel8.Controls.Add(Me.pnlAbgeschlossen)
@@ -1084,21 +1232,21 @@ Partial Class usrcntlAktDetails
        Me.lblBarZuKassierenSumme.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
        Me.lblBarZuKassierenSumme.Visible = False
        '
-        'Button4
+        'btnAktUebernehmen
        '
-        Me.Button4.BackColor = System.Drawing.Color.WhiteSmoke
+        Me.btnAktUebernehmen.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAktUebernehmen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+        Me.btnAktUebernehmen.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.Button4.ForeColor = System.Drawing.Color.Black
+        Me.btnAktUebernehmen.ForeColor = System.Drawing.Color.Black
-        Me.Button4.Image = Global.AVISO.My.Resources.Resources.personCheck_small
+        Me.btnAktUebernehmen.Image = Global.AVISO.My.Resources.Resources.personCheck_small
-        Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnAktUebernehmen.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button4.Location = New System.Drawing.Point(4, 78)
+        Me.btnAktUebernehmen.Location = New System.Drawing.Point(4, 78)
-        Me.Button4.Name = "Button4"
+        Me.btnAktUebernehmen.Name = "btnAktUebernehmen"
-        Me.Button4.Size = New System.Drawing.Size(162, 35)
+        Me.btnAktUebernehmen.Size = New System.Drawing.Size(162, 35)
-        Me.Button4.TabIndex = 101
+        Me.btnAktUebernehmen.TabIndex = 101
-        Me.Button4.Text = "Akt übernehmen"
+        Me.btnAktUebernehmen.Text = "Akt übernehmen"
-        Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnAktUebernehmen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button4.UseVisualStyleBackColor = False
+        Me.btnAktUebernehmen.UseVisualStyleBackColor = False
        '
        'Button7
        '
@@ -1133,16 +1281,16 @@ Partial Class usrcntlAktDetails
        Me.btnLkwBeleg.Text = "BAR"
        Me.btnLkwBeleg.UseVisualStyleBackColor = False
        '
-        'Label1
+        'lblLKWId
        '
-        Me.Label1.AutoSize = True
+        Me.lblLKWId.AutoSize = True
-        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblLKWId.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.ForeColor = System.Drawing.Color.Black
+        Me.lblLKWId.ForeColor = System.Drawing.Color.Black
-        Me.Label1.Location = New System.Drawing.Point(2, 9)
+        Me.lblLKWId.Location = New System.Drawing.Point(2, 9)
-        Me.Label1.Name = "Label1"
+        Me.lblLKWId.Name = "lblLKWId"
-        Me.Label1.Size = New System.Drawing.Size(58, 17)
+        Me.lblLKWId.Size = New System.Drawing.Size(58, 17)
-        Me.Label1.TabIndex = 104
+        Me.lblLKWId.TabIndex = 104
-        Me.Label1.Text = "LKW-Id:"
+        Me.lblLKWId.Text = "LKW-Id:"
        '
        'btnFertig
        '
@@ -1207,21 +1355,21 @@ Partial Class usrcntlAktDetails
        Me.btnAktAbschliessen.UseVisualStyleBackColor = False
        Me.btnAktAbschliessen.Visible = False
        '
-        'Button2
+        'btnOptionen
        '
-        Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnOptionen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnOptionen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+        Me.btnOptionen.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.Button2.ForeColor = System.Drawing.Color.Black
+        Me.btnOptionen.ForeColor = System.Drawing.Color.Black
-        Me.Button2.Image = Global.AVISO.My.Resources.Resources.gear2
+        Me.btnOptionen.Image = Global.AVISO.My.Resources.Resources.gear2
-        Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnOptionen.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button2.Location = New System.Drawing.Point(436, 0)
+        Me.btnOptionen.Location = New System.Drawing.Point(436, 0)
-        Me.Button2.Name = "Button2"
+        Me.btnOptionen.Name = "btnOptionen"
-        Me.Button2.Size = New System.Drawing.Size(134, 36)
+        Me.btnOptionen.Size = New System.Drawing.Size(134, 36)
-        Me.Button2.TabIndex = 94
+        Me.btnOptionen.TabIndex = 94
-        Me.Button2.Text = "Optionen "
+        Me.btnOptionen.Text = "Optionen "
-        Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnOptionen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button2.UseVisualStyleBackColor = True
+        Me.btnOptionen.UseVisualStyleBackColor = True
        '
        'txtAktMA
        '
@@ -1250,27 +1398,27 @@ Partial Class usrcntlAktDetails
        Me.Label3.TabIndex = 96
        Me.Label3.Text = "akt. MA:"
        '
-        'Label10
+        'lblFraechter
        '
-        Me.Label10.AutoSize = True
+        Me.lblFraechter.AutoSize = True
-        Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblFraechter.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label10.ForeColor = System.Drawing.Color.Black
+        Me.lblFraechter.ForeColor = System.Drawing.Color.Black
-        Me.Label10.Location = New System.Drawing.Point(2, 31)
+        Me.lblFraechter.Location = New System.Drawing.Point(2, 31)
-        Me.Label10.Name = "Label10"
+        Me.lblFraechter.Name = "lblFraechter"
-        Me.Label10.Size = New System.Drawing.Size(65, 17)
+        Me.lblFraechter.Size = New System.Drawing.Size(65, 17)
-        Me.Label10.TabIndex = 84
+        Me.lblFraechter.TabIndex = 84
-        Me.Label10.Text = "Frächter:"
+        Me.lblFraechter.Text = "Frächter:"
        '
-        'Label9
+        'lblAvisierer
        '
-        Me.Label9.AutoSize = True
+        Me.lblAvisierer.AutoSize = True
-        Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAvisierer.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label9.ForeColor = System.Drawing.Color.Black
+        Me.lblAvisierer.ForeColor = System.Drawing.Color.Black
-        Me.Label9.Location = New System.Drawing.Point(2, 55)
+        Me.lblAvisierer.Location = New System.Drawing.Point(2, 55)
-        Me.Label9.Name = "Label9"
+        Me.lblAvisierer.Name = "lblAvisierer"
-        Me.Label9.Size = New System.Drawing.Size(67, 17)
+        Me.lblAvisierer.Size = New System.Drawing.Size(67, 17)
-        Me.Label9.TabIndex = 88
+        Me.lblAvisierer.TabIndex = 88
-        Me.Label9.Text = "Avisierer:"
+        Me.lblAvisierer.Text = "Avisierer:"
        '
        'txtFrächter
        '
@@ -1830,154 +1978,6 @@ Partial Class usrcntlAktDetails
        Me.btnTV.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnTV.UseVisualStyleBackColor = False
        '
        'cbxVPSplit
        '
        Me.cbxVPSplit.AutoSize = True
        Me.cbxVPSplit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cbxVPSplit.Location = New System.Drawing.Point(207, 5)
        Me.cbxVPSplit.Name = "cbxVPSplit"
        Me.cbxVPSplit.Size = New System.Drawing.Size(51, 17)
        Me.cbxVPSplit.TabIndex = 116
        Me.cbxVPSplit.Text = "je VP"
        Me.cbxVPSplit.UseVisualStyleBackColor = True
        '
        'txtSendungen
        '
        Me.txtSendungen._DateTimeOnly = False
        Me.txtSendungen._numbersOnly = True
        Me.txtSendungen._numbersOnlyKommastellen = ""
        Me.txtSendungen._Prozent = False
        Me.txtSendungen._ShortDateNew = False
        Me.txtSendungen._ShortDateOnly = False
        Me.txtSendungen._TimeOnly = False
        Me.txtSendungen._value = ""
        Me.txtSendungen._Waehrung = False
        Me.txtSendungen._WaehrungZeichen = True
        Me.txtSendungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtSendungen.ForeColor = System.Drawing.Color.Black
        Me.txtSendungen.Location = New System.Drawing.Point(22, 17)
        Me.txtSendungen.MaxLineLength = -1
        Me.txtSendungen.MaxLines_Warning = ""
        Me.txtSendungen.MaxLines_Warning_Label = Nothing
        Me.txtSendungen.Name = "txtSendungen"
        Me.txtSendungen.Size = New System.Drawing.Size(32, 26)
        Me.txtSendungen.TabIndex = 1
        Me.txtSendungen.Text = "1"
        Me.txtSendungen.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        '
        'txtSndFremd
        '
        Me.txtSndFremd._DateTimeOnly = False
        Me.txtSndFremd._numbersOnly = True
        Me.txtSndFremd._numbersOnlyKommastellen = ""
        Me.txtSndFremd._Prozent = False
        Me.txtSndFremd._ShortDateNew = False
        Me.txtSndFremd._ShortDateOnly = False
        Me.txtSndFremd._TimeOnly = False
        Me.txtSndFremd._value = ""
        Me.txtSndFremd._Waehrung = False
        Me.txtSndFremd._WaehrungZeichen = True
        Me.txtSndFremd.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtSndFremd.ForeColor = System.Drawing.Color.Black
        Me.txtSndFremd.Location = New System.Drawing.Point(149, 5)
        Me.txtSndFremd.MaxLineLength = -1
        Me.txtSndFremd.MaxLines_Warning = ""
        Me.txtSndFremd.MaxLines_Warning_Label = Nothing
        Me.txtSndFremd.Name = "txtSndFremd"
        Me.txtSndFremd.Size = New System.Drawing.Size(32, 26)
        Me.txtSndFremd.TabIndex = 83
        Me.txtSndFremd.Text = "0"
        Me.txtSndFremd.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        Me.txtSndFremd.Visible = False
        '
        'txtSndFiskalDE
        '
        Me.txtSndFiskalDE._DateTimeOnly = False
        Me.txtSndFiskalDE._numbersOnly = True
        Me.txtSndFiskalDE._numbersOnlyKommastellen = ""
        Me.txtSndFiskalDE._Prozent = False
        Me.txtSndFiskalDE._ShortDateNew = False
        Me.txtSndFiskalDE._ShortDateOnly = False
        Me.txtSndFiskalDE._TimeOnly = False
        Me.txtSndFiskalDE._value = ""
        Me.txtSndFiskalDE._Waehrung = False
        Me.txtSndFiskalDE._WaehrungZeichen = True
        Me.txtSndFiskalDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtSndFiskalDE.ForeColor = System.Drawing.Color.Black
        Me.txtSndFiskalDE.Location = New System.Drawing.Point(16, 34)
        Me.txtSndFiskalDE.MaxLineLength = -1
        Me.txtSndFiskalDE.MaxLines_Warning = ""
        Me.txtSndFiskalDE.MaxLines_Warning_Label = Nothing
        Me.txtSndFiskalDE.Name = "txtSndFiskalDE"
        Me.txtSndFiskalDE.Size = New System.Drawing.Size(32, 26)
        Me.txtSndFiskalDE.TabIndex = 5
        Me.txtSndFiskalDE.Text = "0"
        Me.txtSndFiskalDE.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        '
        'txtSndFiskalAT
        '
        Me.txtSndFiskalAT._DateTimeOnly = False
        Me.txtSndFiskalAT._numbersOnly = True
        Me.txtSndFiskalAT._numbersOnlyKommastellen = ""
        Me.txtSndFiskalAT._Prozent = False
        Me.txtSndFiskalAT._ShortDateNew = False
        Me.txtSndFiskalAT._ShortDateOnly = False
        Me.txtSndFiskalAT._TimeOnly = False
        Me.txtSndFiskalAT._value = ""
        Me.txtSndFiskalAT._Waehrung = False
        Me.txtSndFiskalAT._WaehrungZeichen = True
        Me.txtSndFiskalAT.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtSndFiskalAT.ForeColor = System.Drawing.Color.Black
        Me.txtSndFiskalAT.Location = New System.Drawing.Point(16, 5)
        Me.txtSndFiskalAT.MaxLineLength = -1
        Me.txtSndFiskalAT.MaxLines_Warning = ""
        Me.txtSndFiskalAT.MaxLines_Warning_Label = Nothing
        Me.txtSndFiskalAT.Name = "txtSndFiskalAT"
        Me.txtSndFiskalAT.Size = New System.Drawing.Size(32, 26)
        Me.txtSndFiskalAT.TabIndex = 3
        Me.txtSndFiskalAT.Text = "0"
        Me.txtSndFiskalAT.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        '
        'cboFormulareRgAn
        '
        Me.cboFormulareRgAn._allowedValuesFreiText = Nothing
        Me.cboFormulareRgAn._allowFreiText = False
        Me.cboFormulareRgAn._value = ""
        Me.cboFormulareRgAn.FormattingEnabled = True
        Me.cboFormulareRgAn.Location = New System.Drawing.Point(40, 2)
        Me.cboFormulareRgAn.Name = "cboFormulareRgAn"
        Me.cboFormulareRgAn.Size = New System.Drawing.Size(88, 21)
        Me.cboFormulareRgAn.TabIndex = 108
        '
        'cbxLZRg
        '
        Me.cbxLZRg._value = ""
        Me.cbxLZRg.AutoSize = True
        Me.cbxLZRg.Checked = True
        Me.cbxLZRg.Checked_value = False
        Me.cbxLZRg.CheckedValue = False
        Me.cbxLZRg.CheckState = System.Windows.Forms.CheckState.Checked
        Me.cbxLZRg.Location = New System.Drawing.Point(134, 93)
        Me.cbxLZRg.Name = "cbxLZRg"
        Me.cbxLZRg.Size = New System.Drawing.Size(88, 17)
        Me.cbxLZRg.TabIndex = 115
        Me.cbxLZRg.Text = "Rechnungen"
        Me.cbxLZRg.UseVisualStyleBackColor = True
        '
        'cbxLZT1
        '
        Me.cbxLZT1._value = ""
        Me.cbxLZT1.AutoSize = True
        Me.cbxLZT1.Checked_value = False
        Me.cbxLZT1.CheckedValue = False
        Me.cbxLZT1.Location = New System.Drawing.Point(223, 93)
        Me.cbxLZT1.Name = "cbxLZT1"
        Me.cbxLZT1.Size = New System.Drawing.Size(39, 17)
        Me.cbxLZT1.TabIndex = 114
        Me.cbxLZT1.Text = "T1"
        Me.cbxLZT1.UseVisualStyleBackColor = True
        Me.cbxLZT1.Visible = False
        '
        'usrcntlAktDetails
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -2046,13 +2046,13 @@ Partial Class usrcntlAktDetails
    Friend WithEvents dgvSendungen As System.Windows.Forms.DataGridView
    Friend WithEvents Panel7 As System.Windows.Forms.Panel
    Friend WithEvents tbcntlVermerke As System.Windows.Forms.TabControl
-    Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
+    Friend WithEvents tbAlle As System.Windows.Forms.TabPage
-    Friend WithEvents TabPage2 As System.Windows.Forms.TabPage
+    Friend WithEvents tbAkenvermerk As System.Windows.Forms.TabPage
-    Friend WithEvents TabPage3 As System.Windows.Forms.TabPage
+    Friend WithEvents tbSndvermerk As System.Windows.Forms.TabPage
    Friend WithEvents gridVermerke As System.Windows.Forms.DataGridView
    Friend WithEvents Panel8 As System.Windows.Forms.Panel
-    Friend WithEvents Label10 As System.Windows.Forms.Label
+    Friend WithEvents lblFraechter As System.Windows.Forms.Label
-    Friend WithEvents Label9 As System.Windows.Forms.Label
+    Friend WithEvents lblAvisierer As System.Windows.Forms.Label
    Friend WithEvents txtFrächter As System.Windows.Forms.TextBox
    Friend WithEvents txtAuftraggeber As System.Windows.Forms.TextBox
    Friend WithEvents FlowLayoutPanel As System.Windows.Forms.FlowLayoutPanel
@@ -2078,7 +2078,7 @@ Partial Class usrcntlAktDetails
    Friend WithEvents conVermerkLöschen As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents pnlStatus As System.Windows.Forms.Panel
    Friend WithEvents lblStatus As System.Windows.Forms.Label
-    Friend WithEvents Button2 As System.Windows.Forms.Button
+    Friend WithEvents btnOptionen As System.Windows.Forms.Button
    Friend WithEvents txtAktMA As System.Windows.Forms.TextBox
    Friend WithEvents Label3 As System.Windows.Forms.Label
    Friend WithEvents lblIMEX As System.Windows.Forms.Label
@@ -2089,7 +2089,7 @@ Partial Class usrcntlAktDetails
    Friend WithEvents DispolisteENToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents btnAktAbschliessen As System.Windows.Forms.Button
    Friend WithEvents addVermerk As System.Windows.Forms.Button
-    Friend WithEvents Button4 As System.Windows.Forms.Button
+    Friend WithEvents btnAktUebernehmen As System.Windows.Forms.Button
    Friend WithEvents lblAktUebernommen As System.Windows.Forms.Label
    Friend WithEvents pnlAbgeschlossen As System.Windows.Forms.Panel
    Friend WithEvents Label2 As System.Windows.Forms.Label
@@ -2124,10 +2124,10 @@ Partial Class usrcntlAktDetails
    Friend WithEvents Label11 As System.Windows.Forms.Label
    Friend WithEvents lblSndFremd As System.Windows.Forms.Label
    Friend WithEvents txtSndFremd As VERAG_PROG_ALLGEMEIN.MyTextBox
-    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents lblLKWId As System.Windows.Forms.Label
    Friend WithEvents txtLKWID As System.Windows.Forms.TextBox
    Friend WithEvents Panel1 As System.Windows.Forms.Panel
-    Friend WithEvents Button6 As System.Windows.Forms.Button
+    Friend WithEvents btnVerpflErkl As System.Windows.Forms.Button
    Friend WithEvents btnFormulare As System.Windows.Forms.Button
    Friend WithEvents btnLkwBeleg As System.Windows.Forms.Button
    Friend WithEvents Button7 As System.Windows.Forms.Button
--- a/Aviso/usrcntlAktDetails.vb
+++ b/Aviso/usrcntlAktDetails.vb
@@ -206,6 +206,7 @@ Public Class usrcntlAktDetails
        If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "WAI" Then
            Button8.Text = "Gest.Liste"
        End If
        VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
    End Sub
    Sub setVisible(b As Control, v As Boolean) ' damit die Anzeige nicht flackert
@@ -1771,11 +1772,11 @@ Public Class usrcntlAktDetails
        ' MsgBox("laodButton1")
    End Sub
-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnOptionen.Click
        pnlOptionen.Height = 157 '125
        pnlOptionen.Visible = Not pnlOptionen.Visible
-        If pnlOptionen.Visible Then pnlOptionen.Location = New Point(pnlOptionen.Location.X, Button2.Height + pnl.Height + FlowLayoutPanel.Height)
+        If pnlOptionen.Visible Then pnlOptionen.Location = New Point(pnlOptionen.Location.X, btnOptionen.Height + pnl.Height + FlowLayoutPanel.Height)
    End Sub
    Private Sub txtFrächter_TextChanged(sender As Object, e As EventArgs) Handles txtFrächter.Click
@@ -2190,7 +2191,7 @@ Public Class usrcntlAktDetails
-    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
+    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles btnAktUebernehmen.Click
        If AVISO.LetzterMitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID Then
            Dim f As New frmAvisoWeiterleiten("A", AvisoID) '--> Weitereliten
            If f.ShowDialog(Me) = DialogResult.OK Then
@@ -2209,11 +2210,11 @@ Public Class usrcntlAktDetails
    Sub intiAktUebernehmenBtn()
        If AVISO.LetzterMitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID Then
-            Button4.Image = My.Resources.weiterleiten_small1
+            btnAktUebernehmen.Image = My.Resources.weiterleiten_small1
-            Button4.Text = "Akt weiterleiten..."
+            btnAktUebernehmen.Text = "Akt weiterleiten..."
        Else
-            Button4.Image = My.Resources.personCheck_small
+            btnAktUebernehmen.Image = My.Resources.personCheck_small
-            Button4.Text = "Akt übernehmen"
+            btnAktUebernehmen.Text = "Akt übernehmen"
        End If
    End Sub
    Public Sub showInfo(t As String, s As Double)
@@ -2485,7 +2486,7 @@ Public Class usrcntlAktDetails
    End Sub
-    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
+    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles btnVerpflErkl.Click
        SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.VerpflichtungserklärungFahrer, FraechterKdNr, {AvisoID}, True)
    End Sub