diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb
index 7132f64..14d581b 100644
--- a/Aviso/My Project/AssemblyInfo.vb	
+++ b/Aviso/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.8.3.7")>
-<Assembly: AssemblyFileVersion("3.8.3.7")>
+<Assembly: AssemblyVersion("3.8.4.0")>
+<Assembly: AssemblyFileVersion("3.8.4.0")>
diff --git a/Aviso/frmEssensbestellungen.Designer.vb b/Aviso/frmEssensbestellungen.Designer.vb
index 4922a11..47b5dca 100644
--- a/Aviso/frmEssensbestellungen.Designer.vb
+++ b/Aviso/frmEssensbestellungen.Designer.vb
@@ -41,7 +41,6 @@ Partial Class frmEssensbestellungen
         Me.lblBestellungBis = New System.Windows.Forms.Label()
         Me.cbxGebauede = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
-        Me.Button1 = New System.Windows.Forms.Button()
         Me.txtPreis = New System.Windows.Forms.Label()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Dienstag = New System.Windows.Forms.GroupBox()
@@ -78,10 +77,15 @@ Partial Class frmEssensbestellungen
         Me.rbMenuAlt_Do = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components)
         Me.rbMenu_Do = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components)
         Me.txtAnzahlMenu = New System.Windows.Forms.Label()
+        Me.Button1 = New System.Windows.Forms.Button()
         Me.dgvBestellungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.cbxMenu = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.txtAbteilung = New System.Windows.Forms.Label()
         Me.Button2 = New System.Windows.Forms.Button()
+        Me.txtMA = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+        Me.Label1 = New System.Windows.Forms.Label()
         Me.MyPanel1.SuspendLayout()
         Me.Dienstag.SuspendLayout()
         CType(Me.pbDienstag, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -94,6 +98,7 @@ Partial Class frmEssensbestellungen
         Me.GroupBox4.SuspendLayout()
         CType(Me.pbDonnerstag, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvBestellungen, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'lblWochenkarte
@@ -124,10 +129,26 @@ Partial Class frmEssensbestellungen
         Me.lblDatum.TabIndex = 11
         Me.lblDatum.Text = "Datum:"
         '
+        'ToolTipInfoMo
+        '
+        Me.ToolTipInfoMo.BackColor = System.Drawing.Color.White
+        '
+        'ToolTipInfoDi
+        '
+        '
+        'ToolTipInfoMi
+        '
+        '
+        'ToolTipInfoDo
+        '
+        '
+        'ToolTipInfoFr
+        '
+        '
         'lblAbteilung
         '
         Me.lblAbteilung.AutoSize = True
-        Me.lblAbteilung.Location = New System.Drawing.Point(511, 9)
+        Me.lblAbteilung.Location = New System.Drawing.Point(511, 23)
         Me.lblAbteilung.Name = "lblAbteilung"
         Me.lblAbteilung.Size = New System.Drawing.Size(54, 13)
         Me.lblAbteilung.TabIndex = 18
@@ -136,7 +157,7 @@ Partial Class frmEssensbestellungen
         'lblGebaeude
         '
         Me.lblGebaeude.AutoSize = True
-        Me.lblGebaeude.Location = New System.Drawing.Point(511, 27)
+        Me.lblGebaeude.Location = New System.Drawing.Point(511, 41)
         Me.lblGebaeude.Name = "lblGebaeude"
         Me.lblGebaeude.Size = New System.Drawing.Size(54, 13)
         Me.lblGebaeude.TabIndex = 19
@@ -145,7 +166,7 @@ Partial Class frmEssensbestellungen
         'lblBestellungen
         '
         Me.lblBestellungen.AutoSize = True
-        Me.lblBestellungen.Location = New System.Drawing.Point(15, 335)
+        Me.lblBestellungen.Location = New System.Drawing.Point(15, 297)
         Me.lblBestellungen.Name = "lblBestellungen"
         Me.lblBestellungen.Size = New System.Drawing.Size(100, 13)
         Me.lblBestellungen.TabIndex = 20
@@ -167,18 +188,18 @@ Partial Class frmEssensbestellungen
         Me.cbxGebauede._value = ""
         Me.cbxGebauede.DropDownWidth = 150
         Me.cbxGebauede.FormattingEnabled = True
-        Me.cbxGebauede.Location = New System.Drawing.Point(584, 24)
+        Me.cbxGebauede.Location = New System.Drawing.Point(584, 38)
         Me.cbxGebauede.Name = "cbxGebauede"
         Me.cbxGebauede.Size = New System.Drawing.Size(95, 21)
         Me.cbxGebauede.TabIndex = 21
         '
         'MyPanel1
         '
-        Me.MyPanel1.Controls.Add(Me.Button1)
         Me.MyPanel1.Controls.Add(Me.txtPreis)
         Me.MyPanel1.Controls.Add(Me.Label2)
         Me.MyPanel1.Controls.Add(Me.Dienstag)
         Me.MyPanel1.Controls.Add(Me.lbl1)
+        Me.MyPanel1.Controls.Add(Me.Button1)
         Me.MyPanel1.Controls.Add(Me.GroupBox1)
         Me.MyPanel1.Controls.Add(Me.GroupBox5)
         Me.MyPanel1.Controls.Add(Me.txtAnzahlLaCart)
@@ -188,19 +209,9 @@ Partial Class frmEssensbestellungen
         Me.MyPanel1.Controls.Add(Me.txtAnzahlMenu)
         Me.MyPanel1.Location = New System.Drawing.Point(12, 67)
         Me.MyPanel1.Name = "MyPanel1"
-        Me.MyPanel1.Size = New System.Drawing.Size(667, 240)
+        Me.MyPanel1.Size = New System.Drawing.Size(667, 210)
         Me.MyPanel1.TabIndex = 18
         '
-        'Button1
-        '
-        Me.Button1.Image = Global.AVISO.My.Resources.Resources.pdf1
-        Me.Button1.Location = New System.Drawing.Point(590, 147)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(61, 57)
-        Me.Button1.TabIndex = 20
-        Me.Button1.UseVisualStyleBackColor = True
-        Me.Button1.Visible = False
-        '
         'txtPreis
         '
         Me.txtPreis.AutoSize = True
@@ -236,9 +247,9 @@ Partial Class frmEssensbestellungen
         'pbDienstag
         '
         Me.pbDienstag.Image = Global.AVISO.My.Resources.Resources.documents
-        Me.pbDienstag.Location = New System.Drawing.Point(61, 23)
+        Me.pbDienstag.Location = New System.Drawing.Point(61, 19)
         Me.pbDienstag.Name = "pbDienstag"
-        Me.pbDienstag.Size = New System.Drawing.Size(17, 13)
+        Me.pbDienstag.Size = New System.Drawing.Size(26, 26)
         Me.pbDienstag.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
         Me.pbDienstag.TabIndex = 5
         Me.pbDienstag.TabStop = False
@@ -327,9 +338,9 @@ Partial Class frmEssensbestellungen
         'pbMontag
         '
         Me.pbMontag.Image = Global.AVISO.My.Resources.Resources.documents
-        Me.pbMontag.Location = New System.Drawing.Point(61, 23)
+        Me.pbMontag.Location = New System.Drawing.Point(61, 19)
         Me.pbMontag.Name = "pbMontag"
-        Me.pbMontag.Size = New System.Drawing.Size(17, 13)
+        Me.pbMontag.Size = New System.Drawing.Size(26, 26)
         Me.pbMontag.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
         Me.pbMontag.TabIndex = 4
         Me.pbMontag.TabStop = False
@@ -409,9 +420,9 @@ Partial Class frmEssensbestellungen
         'pbFreitag
         '
         Me.pbFreitag.Image = Global.AVISO.My.Resources.Resources.documents
-        Me.pbFreitag.Location = New System.Drawing.Point(61, 23)
+        Me.pbFreitag.Location = New System.Drawing.Point(67, 19)
         Me.pbFreitag.Name = "pbFreitag"
-        Me.pbFreitag.Size = New System.Drawing.Size(17, 13)
+        Me.pbFreitag.Size = New System.Drawing.Size(26, 26)
         Me.pbFreitag.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
         Me.pbFreitag.TabIndex = 8
         Me.pbFreitag.TabStop = False
@@ -509,9 +520,9 @@ Partial Class frmEssensbestellungen
         'pbMittwoch
         '
         Me.pbMittwoch.Image = Global.AVISO.My.Resources.Resources.documents
-        Me.pbMittwoch.Location = New System.Drawing.Point(56, 23)
+        Me.pbMittwoch.Location = New System.Drawing.Point(61, 19)
         Me.pbMittwoch.Name = "pbMittwoch"
-        Me.pbMittwoch.Size = New System.Drawing.Size(17, 13)
+        Me.pbMittwoch.Size = New System.Drawing.Size(26, 26)
         Me.pbMittwoch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
         Me.pbMittwoch.TabIndex = 6
         Me.pbMittwoch.TabStop = False
@@ -591,9 +602,9 @@ Partial Class frmEssensbestellungen
         'pbDonnerstag
         '
         Me.pbDonnerstag.Image = Global.AVISO.My.Resources.Resources.documents
-        Me.pbDonnerstag.Location = New System.Drawing.Point(56, 21)
+        Me.pbDonnerstag.Location = New System.Drawing.Point(56, 19)
         Me.pbDonnerstag.Name = "pbDonnerstag"
-        Me.pbDonnerstag.Size = New System.Drawing.Size(17, 13)
+        Me.pbDonnerstag.Size = New System.Drawing.Size(26, 26)
         Me.pbDonnerstag.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
         Me.pbDonnerstag.TabIndex = 7
         Me.pbDonnerstag.TabStop = False
@@ -665,6 +676,16 @@ Partial Class frmEssensbestellungen
         Me.txtAnzahlMenu.TabIndex = 16
         Me.txtAnzahlMenu.Text = "0"
         '
+        'Button1
+        '
+        Me.Button1.Image = Global.AVISO.My.Resources.Resources.pdf
+        Me.Button1.Location = New System.Drawing.Point(599, 133)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(54, 57)
+        Me.Button1.TabIndex = 20
+        Me.Button1.UseVisualStyleBackColor = True
+        Me.Button1.Visible = False
+        '
         'dgvBestellungen
         '
         Me.dgvBestellungen.AKTUALISIERUNGS_INTERVALL = -1
@@ -691,7 +712,7 @@ Partial Class frmEssensbestellungen
         DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
         DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
         Me.dgvBestellungen.DefaultCellStyle = DataGridViewCellStyle2
-        Me.dgvBestellungen.Location = New System.Drawing.Point(16, 351)
+        Me.dgvBestellungen.Location = New System.Drawing.Point(16, 313)
         Me.dgvBestellungen.Name = "dgvBestellungen"
         Me.dgvBestellungen.ReadOnly = True
         DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
@@ -704,7 +725,7 @@ Partial Class frmEssensbestellungen
         Me.dgvBestellungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
         Me.dgvBestellungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvBestellungen.ShowEditingIcon = False
-        Me.dgvBestellungen.Size = New System.Drawing.Size(663, 127)
+        Me.dgvBestellungen.Size = New System.Drawing.Size(663, 165)
         Me.dgvBestellungen.TabIndex = 2
         '
         'cbxMenu
@@ -722,7 +743,7 @@ Partial Class frmEssensbestellungen
         'txtAbteilung
         '
         Me.txtAbteilung.AutoSize = True
-        Me.txtAbteilung.Location = New System.Drawing.Point(581, 9)
+        Me.txtAbteilung.Location = New System.Drawing.Point(581, 23)
         Me.txtAbteilung.Name = "txtAbteilung"
         Me.txtAbteilung.Size = New System.Drawing.Size(29, 13)
         Me.txtAbteilung.TabIndex = 23
@@ -730,18 +751,58 @@ Partial Class frmEssensbestellungen
         '
         'Button2
         '
-        Me.Button2.Location = New System.Drawing.Point(499, 324)
+        Me.Button2.Location = New System.Drawing.Point(499, 286)
         Me.Button2.Name = "Button2"
         Me.Button2.Size = New System.Drawing.Size(180, 21)
         Me.Button2.TabIndex = 25
-        Me.Button2.Text = "alle Bestellungen anzeigen"
+        Me.Button2.Text = "meine Bestellungen anzeigen"
         Me.Button2.UseVisualStyleBackColor = True
         '
+        'txtMA
+        '
+        Me.txtMA.AutoSize = True
+        Me.txtMA.Location = New System.Drawing.Point(581, 4)
+        Me.txtMA.Name = "txtMA"
+        Me.txtMA.Size = New System.Drawing.Size(0, 13)
+        Me.txtMA.TabIndex = 27
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(511, 4)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(59, 13)
+        Me.Label3.TabIndex = 26
+        Me.Label3.Text = "Mitarbeiter:"
+        '
+        'PictureBox1
+        '
+        Me.PictureBox1.Image = Global.AVISO.My.Resources.Resources.documents
+        Me.PictureBox1.Location = New System.Drawing.Point(446, 22)
+        Me.PictureBox1.Name = "PictureBox1"
+        Me.PictureBox1.Size = New System.Drawing.Size(42, 37)
+        Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+        Me.PictureBox1.TabIndex = 7
+        Me.PictureBox1.TabStop = False
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(450, 6)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(34, 13)
+        Me.Label1.TabIndex = 28
+        Me.Label1.Text = "Menü"
+        '
         'frmEssensbestellungen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(687, 518)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.PictureBox1)
+        Me.Controls.Add(Me.txtMA)
+        Me.Controls.Add(Me.Label3)
         Me.Controls.Add(Me.Button2)
         Me.Controls.Add(Me.txtAbteilung)
         Me.Controls.Add(Me.lblBestellungBis)
@@ -777,6 +838,7 @@ Partial Class frmEssensbestellungen
         Me.GroupBox4.PerformLayout()
         CType(Me.pbDonnerstag, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.dgvBestellungen, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -837,4 +899,8 @@ Partial Class frmEssensbestellungen
     Friend WithEvents Button1 As Button
     Friend WithEvents txtAbteilung As Label
     Friend WithEvents Button2 As Button
+    Friend WithEvents txtMA As Label
+    Friend WithEvents Label3 As Label
+    Friend WithEvents PictureBox1 As PictureBox
+    Friend WithEvents Label1 As Label
 End Class
diff --git a/Aviso/frmEssensbestellungen.vb b/Aviso/frmEssensbestellungen.vb
index 2cbeefc..48bcc25 100644
--- a/Aviso/frmEssensbestellungen.vb
+++ b/Aviso/frmEssensbestellungen.vb
@@ -7,6 +7,8 @@ Public Class frmEssensbestellungen
     Dim essen As New cEssensbestellung()
     Dim dt As New DataTable
     Dim ttMontag, ttDienstag, ttMittwoch, ttDonnerstag, ttFreitag As New ToolTip()
+    Private ToolTipFont As New Font("Courier New", 12)
+    Dim essenMontag As String = ""
 
 
 
@@ -14,6 +16,7 @@ Public Class frmEssensbestellungen
 
         cbxMenu.fillWithSQL("SELECT Distinct Top 10 (MenuTitel), MenuDateVon from tblEBMenu order by MenuDateVon desc", True, "AVISO", True) '/ where MenuDateVon >= GETDATE() 
 
+        txtMA.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
         txtAbteilung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG
         loadDGVBestellungen()
 
@@ -107,17 +110,19 @@ Public Class frmEssensbestellungen
     Private Sub cbxMenu_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxMenu.SelectedValueChanged
 
         If cbxMenu._value Is Nothing Or cbxMenu._value = "" Then
-            Button1.Visible = False
+            'Button1.Visible = False
             lblDatum.Text = "Datum: "
             lblBestellungBis.Text = ""
             loadDGVBestellungen()
             btnSave.Enabled = False
+
             For Each comp As System.ComponentModel.Component In Me.components.Components
                 If TypeOf comp Is ToolTip Then
                     Dim tip = DirectCast(comp, ToolTip)
                     tip.RemoveAll()
                 End If
             Next
+
             Exit Sub
         End If
 
@@ -319,7 +324,6 @@ Public Class frmEssensbestellungen
 
         If dt.Rows(0).Item("MenuEssenMo") IsNot Nothing Then
             pbMontag.Visible = True
-
             ttMontag.SetToolTip(pbMontag, dt.Rows(0).Item("MenuEssenMo").ToString)
         Else
             pbMontag.Visible = False
@@ -328,8 +332,8 @@ Public Class frmEssensbestellungen
 
         If dt.Rows(0).Item("MenuEssenDi") IsNot Nothing Then
             pbDienstag.Visible = True
-
             ttDienstag.SetToolTip(pbDienstag, dt.Rows(0).Item("MenuEssenDi").ToString)
+
         Else
             pbDienstag.Visible = False
         End If
@@ -432,9 +436,30 @@ Public Class frmEssensbestellungen
 
     End Sub
 
-    Private Function checkIfOrderIsPossible() As Boolean
+    Private Sub ToolTipInfoMo_Draw(sender As Object, e As DrawToolTipEventArgs) Handles ToolTipInfoMo.Draw, ToolTipInfoDi.Draw, ToolTipInfoMi.Draw, ToolTipInfoDo.Draw, ToolTipInfoFr.Draw
+        e.DrawBackground()
+        e.DrawBorder()
+        e.Graphics.DrawString(e.ToolTipText,
+                          Me.ToolTipFont,
+                          Brushes.Black,
+                          e.Bounds)
 
-        Dim isPossible As Boolean = False
+
+    End Sub
+
+    Private Sub ToolTipInfoMo_Popup(sender As Object, e As PopupEventArgs) Handles ToolTipInfoMo.Popup
+
+        e.ToolTipSize = TextRenderer.MeasureText(Me.ToolTipInfoMo.GetToolTip(e.AssociatedControl), Me.ToolTipFont)
+
+    End Sub
+
+    Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click
+
+        Dim webAddress As String = "http://www.highway-118.de/speisekarte/speisekarte.html"
+        Process.Start(webAddress)
+    End Sub
+
+    Private Function checkIfOrderIsPossible() As Boolean
 
         If dt.Rows.Count = 0 Then Return False
 
@@ -443,12 +468,12 @@ Public Class frmEssensbestellungen
 
 
             Dim newTime As New TimeSpan(14, 30, 0)
-            Dim timeToOrderLimit = startMenu.AddDays(-5) + newTime
+            Dim timeToOrderLimit = startMenu.AddDays(20) + newTime '-5
             lblBestellungBis.Text = "Bestellung möglich bis: " & timeToOrderLimit.ToShortDateString & " - " & timeToOrderLimit.ToShortTimeString
 
             If Now >= timeToOrderLimit Then
                 lblBestellungBis.ForeColor = Color.Red
-                Return True 'zu testzwecken -> muss dann wieder auf false gesetzt werden!!!!
+                Return False
             Else
                 lblBestellungBis.ForeColor = Color.Black
                 Return True
@@ -465,7 +490,9 @@ Public Class frmEssensbestellungen
     End Sub
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        'If cbxMenu._value Is Nothing Then Exit Sub
         'Process.Start("\\YM5T001348\Gastro\FTPUpload\Menues\" & cbxMenu._value & ".pdf")
+
     End Sub
 
 
diff --git a/Aviso/frmFrachtkostenBerechnen.vb b/Aviso/frmFrachtkostenBerechnen.vb
index f18a0ae..d9d6542 100644
--- a/Aviso/frmFrachtkostenBerechnen.vb
+++ b/Aviso/frmFrachtkostenBerechnen.vb
@@ -92,8 +92,8 @@ Public Class frmFrachtkostenBerechnen
         'resetInputFields()
         setControlEUAnteile()
 
-        origin = IIf(cbxLandVon._value <> "", cbxLandVon._value, "") & " " & IIf(txbVonPLZ._value <> "", txbVonPLZ._value, "") & " " & IIf(txbVonOrt._value <> "", txbVonOrt._value, "")
-        destination = IIf(cbxLandNach._value <> "", cbxLandNach._value, "") & " " & IIf(txbNachPLZ._value <> "", txbNachPLZ._value, "") & " " & IIf(txbNachOrt._value <> "", txbNachOrt._value, "")
+        origin = IIf(cbxLandVon._value <> "", cbxLandVon.Text.Replace(cbxLandVon._value & " -", "").Trim(), "") & " " & IIf(txbVonPLZ._value <> "", txbVonPLZ._value, "") & " " & IIf(txbVonOrt._value <> "", txbVonOrt._value, "")
+        destination = IIf(cbxLandNach._value <> "", cbxLandNach.Text.Replace(cbxLandNach._value & " -", "").Trim(), "") & " " & IIf(txbNachPLZ._value <> "", txbNachPLZ._value, "") & " " & IIf(txbNachOrt._value <> "", txbNachOrt._value, "")
 
         Dim getValues = True
         Dim twoRouteRequest As Boolean = False
@@ -249,13 +249,13 @@ Public Class frmFrachtkostenBerechnen
             'Hinweis INPUT false
         End If
 
-        If (txbVonOrt._value = "" Or txbVonPLZ._value = "") Then
+        If (txbVonOrt._value = "" And txbVonPLZ._value = "") Then
             lblWarningAbgangort.Visible = True
             btnOK.DialogResult = DialogResult.OK
             isFilled = False
         End If
 
-        If (txbNachOrt._value = "" Or txbNachPLZ._value = "") Then
+        If (txbNachOrt._value = "" And txbNachPLZ._value = "") Then
             lblWarningBestimmungsort.Visible = True
             btnOK.DialogResult = DialogResult.OK
             isFilled = False
diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb
index 4bef73f..335f687 100644
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -1540,11 +1540,4 @@ Public Class frmGesamtsicherheitenNEU
 
     End Sub
 
-    Private Sub txtSicherheitFreitext_TextChanged(sender As Object, e As EventArgs) Handles txtSicherheitFreitext.TextChanged
-
-    End Sub
-
-    Private Sub Label6_Click(sender As Object, e As EventArgs) Handles Label6.Click
-
-    End Sub
 End Class
diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb
index 1649217..469f3be 100644
--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
@@ -202,35 +202,10 @@ Partial Class frmSendungsdetailsNEU
         Me.btnAvisierer = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.Button4 = New System.Windows.Forms.Button()
         Me.Button1 = New System.Windows.Forms.Button()
-        Me.cntlFrachtfuehrer_Sonst = New AVISO.usrcntlCheckBox()
-        Me.cntlAbsender_Sonst = New AVISO.usrcntlCheckBox()
-        Me.cntlEmpfaenger_Sonst = New AVISO.usrcntlCheckBox()
-        Me.cntlAuftraggeber_Sonst = New AVISO.usrcntlCheckBox()
-        Me.cntlAvisierer_Sonst = New AVISO.usrcntlCheckBox()
         Me.lblSonstigesKosten = New System.Windows.Forms.Label()
         Me.btnAufschub_Atr = New System.Windows.Forms.Button()
         Me.btnAufschub_Empf = New System.Windows.Forms.Button()
         Me.btnAufschub_VERAG = New System.Windows.Forms.Button()
-        Me.cntlFrachtf_Clear = New AVISO.usrcntlCheckBox()
-        Me.cntlFrachtf_Abf = New AVISO.usrcntlCheckBox()
-        Me.cntlFrachtf_Eust = New AVISO.usrcntlCheckBox()
-        Me.cntlFrachtf_Zoll = New AVISO.usrcntlCheckBox()
-        Me.cntlAbsender_Clear = New AVISO.usrcntlCheckBox()
-        Me.cntlAbsender_Abf = New AVISO.usrcntlCheckBox()
-        Me.cntlAbsender_Eust = New AVISO.usrcntlCheckBox()
-        Me.cntlAbsender_Zoll = New AVISO.usrcntlCheckBox()
-        Me.cntlEmpf_Clear = New AVISO.usrcntlCheckBox()
-        Me.cntlEmpf_Abf = New AVISO.usrcntlCheckBox()
-        Me.cntlEmpf_Eust = New AVISO.usrcntlCheckBox()
-        Me.cntlEmpf_Zoll = New AVISO.usrcntlCheckBox()
-        Me.cntlAuftr_Clear = New AVISO.usrcntlCheckBox()
-        Me.cntlAuftr_Abf = New AVISO.usrcntlCheckBox()
-        Me.cntlAuftr_Eust = New AVISO.usrcntlCheckBox()
-        Me.cntlAuftr_Zoll = New AVISO.usrcntlCheckBox()
-        Me.cntlAvisierer_Clear = New AVISO.usrcntlCheckBox()
-        Me.cntlAvisierer_Abf = New AVISO.usrcntlCheckBox()
-        Me.cntlAvisierer_Eust = New AVISO.usrcntlCheckBox()
-        Me.cntlAvisierer_Zoll = New AVISO.usrcntlCheckBox()
         Me.Panel15 = New System.Windows.Forms.Panel()
         Me.txtAvisierer = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
         Me.txtAuftraggeber = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
@@ -243,7 +218,6 @@ Partial Class frmSendungsdetailsNEU
         Me.lblEmpfAufschubEust = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.lblFrachtfuehrer = New System.Windows.Forms.Label()
         Me.pnlT1 = New System.Windows.Forms.Panel()
-        Me.UsrCntlSND_NCTSGestellungsadresse1 = New AVISO.usrCntlSND_NCTSGestellungsadresse()
         Me.Label43 = New System.Windows.Forms.Label()
         Me.lblAbsender = New System.Windows.Forms.Label()
         Me.txtAbsenderKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -379,6 +353,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ExportT1ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AMBARZollbeschauToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AMBARZollbeschauNEUToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem15 = New System.Windows.Forms.ToolStripMenuItem()
         Me.T1BestätigungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -398,9 +373,36 @@ Partial Class frmSendungsdetailsNEU
         Me.GVMSInfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AlleEIDRSendungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AktuelleSendungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.WarenortAMBARToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem()
         Me.NurÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.cntlFrachtfuehrer_Sonst = New AVISO.usrcntlCheckBox()
+        Me.cntlAbsender_Sonst = New AVISO.usrcntlCheckBox()
+        Me.cntlEmpfaenger_Sonst = New AVISO.usrcntlCheckBox()
+        Me.cntlAuftraggeber_Sonst = New AVISO.usrcntlCheckBox()
+        Me.cntlAvisierer_Sonst = New AVISO.usrcntlCheckBox()
+        Me.cntlFrachtf_Clear = New AVISO.usrcntlCheckBox()
+        Me.cntlFrachtf_Abf = New AVISO.usrcntlCheckBox()
+        Me.cntlFrachtf_Eust = New AVISO.usrcntlCheckBox()
+        Me.cntlFrachtf_Zoll = New AVISO.usrcntlCheckBox()
+        Me.cntlAbsender_Clear = New AVISO.usrcntlCheckBox()
+        Me.cntlAbsender_Abf = New AVISO.usrcntlCheckBox()
+        Me.cntlAbsender_Eust = New AVISO.usrcntlCheckBox()
+        Me.cntlAbsender_Zoll = New AVISO.usrcntlCheckBox()
+        Me.cntlEmpf_Clear = New AVISO.usrcntlCheckBox()
+        Me.cntlEmpf_Abf = New AVISO.usrcntlCheckBox()
+        Me.cntlEmpf_Eust = New AVISO.usrcntlCheckBox()
+        Me.cntlEmpf_Zoll = New AVISO.usrcntlCheckBox()
+        Me.cntlAuftr_Clear = New AVISO.usrcntlCheckBox()
+        Me.cntlAuftr_Abf = New AVISO.usrcntlCheckBox()
+        Me.cntlAuftr_Eust = New AVISO.usrcntlCheckBox()
+        Me.cntlAuftr_Zoll = New AVISO.usrcntlCheckBox()
+        Me.cntlAvisierer_Clear = New AVISO.usrcntlCheckBox()
+        Me.cntlAvisierer_Abf = New AVISO.usrcntlCheckBox()
+        Me.cntlAvisierer_Eust = New AVISO.usrcntlCheckBox()
+        Me.cntlAvisierer_Zoll = New AVISO.usrcntlCheckBox()
+        Me.UsrCntlSND_NCTSGestellungsadresse1 = New AVISO.usrCntlSND_NCTSGestellungsadresse()
         Me.pnl.SuspendLayout()
         Me.Panel4.SuspendLayout()
         Me.TabControl1.SuspendLayout()
@@ -892,7 +894,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem8.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripMenuItem8.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8"
-        Me.ToolStripMenuItem8.Size = New System.Drawing.Size(101, 30)
+        Me.ToolStripMenuItem8.Size = New System.Drawing.Size(93, 22)
         Me.ToolStripMenuItem8.Text = "T1"
         '
         'ToolStripMenuItem9
@@ -900,7 +902,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem9.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripMenuItem9.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem9.Name = "ToolStripMenuItem9"
-        Me.ToolStripMenuItem9.Size = New System.Drawing.Size(101, 30)
+        Me.ToolStripMenuItem9.Size = New System.Drawing.Size(93, 22)
         Me.ToolStripMenuItem9.Text = "T2"
         '
         'ToolStripMenuItem10
@@ -908,7 +910,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem10.Enabled = False
         Me.ToolStripMenuItem10.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
-        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(101, 30)
+        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(93, 22)
         Me.ToolStripMenuItem10.Text = "Ü-T"
         Me.ToolStripMenuItem10.Visible = False
         '
@@ -946,7 +948,7 @@ Partial Class frmSendungsdetailsNEU
         '
         Me.ToolStripMenuItem20.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem20.Name = "ToolStripMenuItem20"
-        Me.ToolStripMenuItem20.Size = New System.Drawing.Size(103, 30)
+        Me.ToolStripMenuItem20.Size = New System.Drawing.Size(95, 22)
         Me.ToolStripMenuItem20.Text = "EZA"
         '
         'ToolStripMenuItem18
@@ -955,7 +957,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem18.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripMenuItem18.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18"
-        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(103, 30)
+        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(95, 22)
         Me.ToolStripMenuItem18.Text = "T1"
         '
         'ToolStripMenuItem19
@@ -964,7 +966,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem19.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripMenuItem19.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19"
-        Me.ToolStripMenuItem19.Size = New System.Drawing.Size(103, 30)
+        Me.ToolStripMenuItem19.Size = New System.Drawing.Size(95, 22)
         Me.ToolStripMenuItem19.Text = "T2"
         '
         'ToolStripMenuItem21
@@ -981,7 +983,7 @@ Partial Class frmSendungsdetailsNEU
         '
         Me.ToolStripMenuItem22.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1
         Me.ToolStripMenuItem22.Name = "ToolStripMenuItem22"
-        Me.ToolStripMenuItem22.Size = New System.Drawing.Size(184, 30)
+        Me.ToolStripMenuItem22.Size = New System.Drawing.Size(176, 22)
         Me.ToolStripMenuItem22.Text = "MIC Import senden"
         '
         'ToolStripMenuItem23
@@ -989,7 +991,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem23.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripMenuItem23.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1
         Me.ToolStripMenuItem23.Name = "ToolStripMenuItem23"
-        Me.ToolStripMenuItem23.Size = New System.Drawing.Size(184, 30)
+        Me.ToolStripMenuItem23.Size = New System.Drawing.Size(176, 22)
         Me.ToolStripMenuItem23.Text = "MIC Transit senden"
         '
         'ToolStripMenuItem24
@@ -998,7 +1000,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem24.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripMenuItem24.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1
         Me.ToolStripMenuItem24.Name = "ToolStripMenuItem24"
-        Me.ToolStripMenuItem24.Size = New System.Drawing.Size(184, 30)
+        Me.ToolStripMenuItem24.Size = New System.Drawing.Size(176, 22)
         Me.ToolStripMenuItem24.Text = "MIC Export senden"
         '
         'ToolStripMenuItem12
@@ -2878,66 +2880,6 @@ Partial Class frmSendungsdetailsNEU
         Me.Button1.Text = "BAR - Beleg"
         Me.Button1.UseVisualStyleBackColor = False
         '
-        'cntlFrachtfuehrer_Sonst
-        '
-        Me.cntlFrachtfuehrer_Sonst._abrArt = "SONST"
-        Me.cntlFrachtfuehrer_Sonst._beteiligter = "FRACHTF"
-        Me.cntlFrachtfuehrer_Sonst._readOnly = True
-        Me.cntlFrachtfuehrer_Sonst.Location = New System.Drawing.Point(632, 168)
-        Me.cntlFrachtfuehrer_Sonst.Name = "cntlFrachtfuehrer_Sonst"
-        Me.cntlFrachtfuehrer_Sonst.Size = New System.Drawing.Size(21, 20)
-        Me.cntlFrachtfuehrer_Sonst.TabIndex = 82
-        Me.cntlFrachtfuehrer_Sonst.TabStop = False
-        Me.cntlFrachtfuehrer_Sonst.value = ""
-        '
-        'cntlAbsender_Sonst
-        '
-        Me.cntlAbsender_Sonst._abrArt = "SONST"
-        Me.cntlAbsender_Sonst._beteiligter = "ABS"
-        Me.cntlAbsender_Sonst._readOnly = True
-        Me.cntlAbsender_Sonst.Location = New System.Drawing.Point(632, 133)
-        Me.cntlAbsender_Sonst.Name = "cntlAbsender_Sonst"
-        Me.cntlAbsender_Sonst.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAbsender_Sonst.TabIndex = 68
-        Me.cntlAbsender_Sonst.TabStop = False
-        Me.cntlAbsender_Sonst.value = ""
-        '
-        'cntlEmpfaenger_Sonst
-        '
-        Me.cntlEmpfaenger_Sonst._abrArt = "SONST"
-        Me.cntlEmpfaenger_Sonst._beteiligter = "EMPF"
-        Me.cntlEmpfaenger_Sonst._readOnly = True
-        Me.cntlEmpfaenger_Sonst.Location = New System.Drawing.Point(632, 94)
-        Me.cntlEmpfaenger_Sonst.Name = "cntlEmpfaenger_Sonst"
-        Me.cntlEmpfaenger_Sonst.Size = New System.Drawing.Size(21, 20)
-        Me.cntlEmpfaenger_Sonst.TabIndex = 53
-        Me.cntlEmpfaenger_Sonst.TabStop = False
-        Me.cntlEmpfaenger_Sonst.value = ""
-        '
-        'cntlAuftraggeber_Sonst
-        '
-        Me.cntlAuftraggeber_Sonst._abrArt = "SONST"
-        Me.cntlAuftraggeber_Sonst._beteiligter = "AUFTR"
-        Me.cntlAuftraggeber_Sonst._readOnly = True
-        Me.cntlAuftraggeber_Sonst.Location = New System.Drawing.Point(632, 57)
-        Me.cntlAuftraggeber_Sonst.Name = "cntlAuftraggeber_Sonst"
-        Me.cntlAuftraggeber_Sonst.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAuftraggeber_Sonst.TabIndex = 36
-        Me.cntlAuftraggeber_Sonst.TabStop = False
-        Me.cntlAuftraggeber_Sonst.value = ""
-        '
-        'cntlAvisierer_Sonst
-        '
-        Me.cntlAvisierer_Sonst._abrArt = "SONST"
-        Me.cntlAvisierer_Sonst._beteiligter = "AVISIERER"
-        Me.cntlAvisierer_Sonst._readOnly = True
-        Me.cntlAvisierer_Sonst.Location = New System.Drawing.Point(632, 20)
-        Me.cntlAvisierer_Sonst.Name = "cntlAvisierer_Sonst"
-        Me.cntlAvisierer_Sonst.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAvisierer_Sonst.TabIndex = 21
-        Me.cntlAvisierer_Sonst.TabStop = False
-        Me.cntlAvisierer_Sonst.value = ""
-        '
         'lblSonstigesKosten
         '
         Me.lblSonstigesKosten.AutoSize = True
@@ -3005,246 +2947,6 @@ Partial Class frmSendungsdetailsNEU
         Me.btnAufschub_VERAG.UseVisualStyleBackColor = False
         Me.btnAufschub_VERAG.Visible = False
         '
-        'cntlFrachtf_Clear
-        '
-        Me.cntlFrachtf_Clear._abrArt = "CLEARING"
-        Me.cntlFrachtf_Clear._beteiligter = "FRACHTF"
-        Me.cntlFrachtf_Clear._readOnly = False
-        Me.cntlFrachtf_Clear.Location = New System.Drawing.Point(600, 168)
-        Me.cntlFrachtf_Clear.Name = "cntlFrachtf_Clear"
-        Me.cntlFrachtf_Clear.Size = New System.Drawing.Size(21, 20)
-        Me.cntlFrachtf_Clear.TabIndex = 81
-        Me.cntlFrachtf_Clear.TabStop = False
-        Me.cntlFrachtf_Clear.value = ""
-        '
-        'cntlFrachtf_Abf
-        '
-        Me.cntlFrachtf_Abf._abrArt = "ABFKOST"
-        Me.cntlFrachtf_Abf._beteiligter = "FRACHTF"
-        Me.cntlFrachtf_Abf._readOnly = False
-        Me.cntlFrachtf_Abf.Location = New System.Drawing.Point(569, 168)
-        Me.cntlFrachtf_Abf.Name = "cntlFrachtf_Abf"
-        Me.cntlFrachtf_Abf.Size = New System.Drawing.Size(21, 20)
-        Me.cntlFrachtf_Abf.TabIndex = 80
-        Me.cntlFrachtf_Abf.TabStop = False
-        Me.cntlFrachtf_Abf.value = ""
-        '
-        'cntlFrachtf_Eust
-        '
-        Me.cntlFrachtf_Eust._abrArt = "EUST"
-        Me.cntlFrachtf_Eust._beteiligter = "FRACHTF"
-        Me.cntlFrachtf_Eust._readOnly = False
-        Me.cntlFrachtf_Eust.Location = New System.Drawing.Point(538, 168)
-        Me.cntlFrachtf_Eust.Name = "cntlFrachtf_Eust"
-        Me.cntlFrachtf_Eust.Size = New System.Drawing.Size(21, 20)
-        Me.cntlFrachtf_Eust.TabIndex = 79
-        Me.cntlFrachtf_Eust.TabStop = False
-        Me.cntlFrachtf_Eust.value = ""
-        '
-        'cntlFrachtf_Zoll
-        '
-        Me.cntlFrachtf_Zoll._abrArt = "ZOLL"
-        Me.cntlFrachtf_Zoll._beteiligter = "FRACHTF"
-        Me.cntlFrachtf_Zoll._readOnly = False
-        Me.cntlFrachtf_Zoll.Location = New System.Drawing.Point(507, 168)
-        Me.cntlFrachtf_Zoll.Name = "cntlFrachtf_Zoll"
-        Me.cntlFrachtf_Zoll.Size = New System.Drawing.Size(21, 20)
-        Me.cntlFrachtf_Zoll.TabIndex = 78
-        Me.cntlFrachtf_Zoll.TabStop = False
-        Me.cntlFrachtf_Zoll.value = ""
-        '
-        'cntlAbsender_Clear
-        '
-        Me.cntlAbsender_Clear._abrArt = "CLEARING"
-        Me.cntlAbsender_Clear._beteiligter = "ABS"
-        Me.cntlAbsender_Clear._readOnly = False
-        Me.cntlAbsender_Clear.Location = New System.Drawing.Point(600, 133)
-        Me.cntlAbsender_Clear.Name = "cntlAbsender_Clear"
-        Me.cntlAbsender_Clear.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAbsender_Clear.TabIndex = 67
-        Me.cntlAbsender_Clear.TabStop = False
-        Me.cntlAbsender_Clear.value = ""
-        '
-        'cntlAbsender_Abf
-        '
-        Me.cntlAbsender_Abf._abrArt = "ABFKOST"
-        Me.cntlAbsender_Abf._beteiligter = "ABS"
-        Me.cntlAbsender_Abf._readOnly = False
-        Me.cntlAbsender_Abf.Location = New System.Drawing.Point(569, 133)
-        Me.cntlAbsender_Abf.Name = "cntlAbsender_Abf"
-        Me.cntlAbsender_Abf.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAbsender_Abf.TabIndex = 66
-        Me.cntlAbsender_Abf.TabStop = False
-        Me.cntlAbsender_Abf.value = ""
-        '
-        'cntlAbsender_Eust
-        '
-        Me.cntlAbsender_Eust._abrArt = "EUST"
-        Me.cntlAbsender_Eust._beteiligter = "ABS"
-        Me.cntlAbsender_Eust._readOnly = False
-        Me.cntlAbsender_Eust.Location = New System.Drawing.Point(538, 133)
-        Me.cntlAbsender_Eust.Name = "cntlAbsender_Eust"
-        Me.cntlAbsender_Eust.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAbsender_Eust.TabIndex = 65
-        Me.cntlAbsender_Eust.TabStop = False
-        Me.cntlAbsender_Eust.value = ""
-        '
-        'cntlAbsender_Zoll
-        '
-        Me.cntlAbsender_Zoll._abrArt = "ZOLL"
-        Me.cntlAbsender_Zoll._beteiligter = "ABS"
-        Me.cntlAbsender_Zoll._readOnly = False
-        Me.cntlAbsender_Zoll.Location = New System.Drawing.Point(507, 133)
-        Me.cntlAbsender_Zoll.Name = "cntlAbsender_Zoll"
-        Me.cntlAbsender_Zoll.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAbsender_Zoll.TabIndex = 64
-        Me.cntlAbsender_Zoll.TabStop = False
-        Me.cntlAbsender_Zoll.value = ""
-        '
-        'cntlEmpf_Clear
-        '
-        Me.cntlEmpf_Clear._abrArt = "CLEARING"
-        Me.cntlEmpf_Clear._beteiligter = "EMPF"
-        Me.cntlEmpf_Clear._readOnly = False
-        Me.cntlEmpf_Clear.Location = New System.Drawing.Point(600, 94)
-        Me.cntlEmpf_Clear.Name = "cntlEmpf_Clear"
-        Me.cntlEmpf_Clear.Size = New System.Drawing.Size(21, 20)
-        Me.cntlEmpf_Clear.TabIndex = 52
-        Me.cntlEmpf_Clear.TabStop = False
-        Me.cntlEmpf_Clear.value = ""
-        '
-        'cntlEmpf_Abf
-        '
-        Me.cntlEmpf_Abf._abrArt = "ABFKOST"
-        Me.cntlEmpf_Abf._beteiligter = "EMPF"
-        Me.cntlEmpf_Abf._readOnly = False
-        Me.cntlEmpf_Abf.Location = New System.Drawing.Point(569, 94)
-        Me.cntlEmpf_Abf.Name = "cntlEmpf_Abf"
-        Me.cntlEmpf_Abf.Size = New System.Drawing.Size(21, 20)
-        Me.cntlEmpf_Abf.TabIndex = 51
-        Me.cntlEmpf_Abf.TabStop = False
-        Me.cntlEmpf_Abf.value = ""
-        '
-        'cntlEmpf_Eust
-        '
-        Me.cntlEmpf_Eust._abrArt = "EUST"
-        Me.cntlEmpf_Eust._beteiligter = "EMPF"
-        Me.cntlEmpf_Eust._readOnly = False
-        Me.cntlEmpf_Eust.Location = New System.Drawing.Point(538, 94)
-        Me.cntlEmpf_Eust.Name = "cntlEmpf_Eust"
-        Me.cntlEmpf_Eust.Size = New System.Drawing.Size(21, 20)
-        Me.cntlEmpf_Eust.TabIndex = 50
-        Me.cntlEmpf_Eust.TabStop = False
-        Me.cntlEmpf_Eust.value = ""
-        '
-        'cntlEmpf_Zoll
-        '
-        Me.cntlEmpf_Zoll._abrArt = "ZOLL"
-        Me.cntlEmpf_Zoll._beteiligter = "EMPF"
-        Me.cntlEmpf_Zoll._readOnly = False
-        Me.cntlEmpf_Zoll.Location = New System.Drawing.Point(507, 94)
-        Me.cntlEmpf_Zoll.Name = "cntlEmpf_Zoll"
-        Me.cntlEmpf_Zoll.Size = New System.Drawing.Size(21, 20)
-        Me.cntlEmpf_Zoll.TabIndex = 49
-        Me.cntlEmpf_Zoll.TabStop = False
-        Me.cntlEmpf_Zoll.value = ""
-        '
-        'cntlAuftr_Clear
-        '
-        Me.cntlAuftr_Clear._abrArt = "CLEARING"
-        Me.cntlAuftr_Clear._beteiligter = "AUFTR"
-        Me.cntlAuftr_Clear._readOnly = False
-        Me.cntlAuftr_Clear.Location = New System.Drawing.Point(600, 57)
-        Me.cntlAuftr_Clear.Name = "cntlAuftr_Clear"
-        Me.cntlAuftr_Clear.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAuftr_Clear.TabIndex = 35
-        Me.cntlAuftr_Clear.TabStop = False
-        Me.cntlAuftr_Clear.value = ""
-        '
-        'cntlAuftr_Abf
-        '
-        Me.cntlAuftr_Abf._abrArt = "ABFKOST"
-        Me.cntlAuftr_Abf._beteiligter = "AUFTR"
-        Me.cntlAuftr_Abf._readOnly = False
-        Me.cntlAuftr_Abf.Location = New System.Drawing.Point(569, 57)
-        Me.cntlAuftr_Abf.Name = "cntlAuftr_Abf"
-        Me.cntlAuftr_Abf.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAuftr_Abf.TabIndex = 34
-        Me.cntlAuftr_Abf.TabStop = False
-        Me.cntlAuftr_Abf.value = ""
-        '
-        'cntlAuftr_Eust
-        '
-        Me.cntlAuftr_Eust._abrArt = "EUST"
-        Me.cntlAuftr_Eust._beteiligter = "AUFTR"
-        Me.cntlAuftr_Eust._readOnly = False
-        Me.cntlAuftr_Eust.Location = New System.Drawing.Point(538, 57)
-        Me.cntlAuftr_Eust.Name = "cntlAuftr_Eust"
-        Me.cntlAuftr_Eust.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAuftr_Eust.TabIndex = 33
-        Me.cntlAuftr_Eust.TabStop = False
-        Me.cntlAuftr_Eust.value = ""
-        '
-        'cntlAuftr_Zoll
-        '
-        Me.cntlAuftr_Zoll._abrArt = "ZOLL"
-        Me.cntlAuftr_Zoll._beteiligter = "AUFTR"
-        Me.cntlAuftr_Zoll._readOnly = False
-        Me.cntlAuftr_Zoll.Location = New System.Drawing.Point(507, 57)
-        Me.cntlAuftr_Zoll.Name = "cntlAuftr_Zoll"
-        Me.cntlAuftr_Zoll.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAuftr_Zoll.TabIndex = 32
-        Me.cntlAuftr_Zoll.TabStop = False
-        Me.cntlAuftr_Zoll.value = ""
-        '
-        'cntlAvisierer_Clear
-        '
-        Me.cntlAvisierer_Clear._abrArt = "CLEARING"
-        Me.cntlAvisierer_Clear._beteiligter = "AVISIERER"
-        Me.cntlAvisierer_Clear._readOnly = False
-        Me.cntlAvisierer_Clear.Location = New System.Drawing.Point(600, 20)
-        Me.cntlAvisierer_Clear.Name = "cntlAvisierer_Clear"
-        Me.cntlAvisierer_Clear.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAvisierer_Clear.TabIndex = 20
-        Me.cntlAvisierer_Clear.TabStop = False
-        Me.cntlAvisierer_Clear.value = ""
-        '
-        'cntlAvisierer_Abf
-        '
-        Me.cntlAvisierer_Abf._abrArt = "ABFKOST"
-        Me.cntlAvisierer_Abf._beteiligter = "AVISIERER"
-        Me.cntlAvisierer_Abf._readOnly = False
-        Me.cntlAvisierer_Abf.Location = New System.Drawing.Point(569, 20)
-        Me.cntlAvisierer_Abf.Name = "cntlAvisierer_Abf"
-        Me.cntlAvisierer_Abf.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAvisierer_Abf.TabIndex = 19
-        Me.cntlAvisierer_Abf.TabStop = False
-        Me.cntlAvisierer_Abf.value = ""
-        '
-        'cntlAvisierer_Eust
-        '
-        Me.cntlAvisierer_Eust._abrArt = "EUST"
-        Me.cntlAvisierer_Eust._beteiligter = "AVISIERER"
-        Me.cntlAvisierer_Eust._readOnly = False
-        Me.cntlAvisierer_Eust.Location = New System.Drawing.Point(538, 20)
-        Me.cntlAvisierer_Eust.Name = "cntlAvisierer_Eust"
-        Me.cntlAvisierer_Eust.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAvisierer_Eust.TabIndex = 18
-        Me.cntlAvisierer_Eust.TabStop = False
-        Me.cntlAvisierer_Eust.value = ""
-        '
-        'cntlAvisierer_Zoll
-        '
-        Me.cntlAvisierer_Zoll._abrArt = "ZOLL"
-        Me.cntlAvisierer_Zoll._beteiligter = "AVISIERER"
-        Me.cntlAvisierer_Zoll._readOnly = False
-        Me.cntlAvisierer_Zoll.Location = New System.Drawing.Point(507, 20)
-        Me.cntlAvisierer_Zoll.Name = "cntlAvisierer_Zoll"
-        Me.cntlAvisierer_Zoll.Size = New System.Drawing.Size(21, 20)
-        Me.cntlAvisierer_Zoll.TabIndex = 17
-        Me.cntlAvisierer_Zoll.TabStop = False
-        Me.cntlAvisierer_Zoll.value = ""
-        '
         'Panel15
         '
         Me.Panel15.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
@@ -3433,14 +3135,6 @@ Partial Class frmSendungsdetailsNEU
         Me.pnlT1.Size = New System.Drawing.Size(549, 92)
         Me.pnlT1.TabIndex = 86
         '
-        'UsrCntlSND_NCTSGestellungsadresse1
-        '
-        Me.UsrCntlSND_NCTSGestellungsadresse1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlSND_NCTSGestellungsadresse1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrCntlSND_NCTSGestellungsadresse1.Name = "UsrCntlSND_NCTSGestellungsadresse1"
-        Me.UsrCntlSND_NCTSGestellungsadresse1.Size = New System.Drawing.Size(549, 92)
-        Me.UsrCntlSND_NCTSGestellungsadresse1.TabIndex = 0
-        '
         'Label43
         '
         Me.Label43.AutoSize = True
@@ -4367,7 +4061,7 @@ Partial Class frmSendungsdetailsNEU
         Me.Panel2.Location = New System.Drawing.Point(0, 0)
         Me.Panel2.MaximumSize = New System.Drawing.Size(0, 510)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(1214, 55)
+        Me.Panel2.Size = New System.Drawing.Size(0, 55)
         Me.Panel2.TabIndex = 0
         '
         'FlowLayoutPanel
@@ -4379,7 +4073,7 @@ Partial Class frmSendungsdetailsNEU
         Me.FlowLayoutPanel.MaximumSize = New System.Drawing.Size(0, 550)
         Me.FlowLayoutPanel.MinimumSize = New System.Drawing.Size(0, 53)
         Me.FlowLayoutPanel.Name = "FlowLayoutPanel"
-        Me.FlowLayoutPanel.Size = New System.Drawing.Size(1214, 55)
+        Me.FlowLayoutPanel.Size = New System.Drawing.Size(0, 55)
         Me.FlowLayoutPanel.TabIndex = 0
         '
         'FlatButton2
@@ -4892,7 +4586,6 @@ Partial Class frmSendungsdetailsNEU
         '
         Me.BindingNavigatorPositionItem.AccessibleName = "Position"
         Me.BindingNavigatorPositionItem.AutoSize = False
-        Me.BindingNavigatorPositionItem.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem"
         Me.BindingNavigatorPositionItem.Size = New System.Drawing.Size(50, 23)
         Me.BindingNavigatorPositionItem.Text = "0"
@@ -4978,9 +4671,9 @@ Partial Class frmSendungsdetailsNEU
         'ctxtWeitereFormulare
         '
         Me.ctxtWeitereFormulare.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.ctxtWeitereFormulare.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolGelangensbestätigung, Me.toolOriginalSendungsunterlagen, Me.LaufzettelDruckenToolStripMenuItem, Me.ZollstoppAMBARToolStripMenuItem, Me.ATANAKToolStripMenuItem, Me.AMBARZollbeschauToolStripMenuItem})
+        Me.ctxtWeitereFormulare.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolGelangensbestätigung, Me.toolOriginalSendungsunterlagen, Me.LaufzettelDruckenToolStripMenuItem, Me.ZollstoppAMBARToolStripMenuItem, Me.ATANAKToolStripMenuItem, Me.AMBARZollbeschauToolStripMenuItem, Me.AMBARZollbeschauNEUToolStripMenuItem})
         Me.ctxtWeitereFormulare.Name = "cntxt"
-        Me.ctxtWeitereFormulare.Size = New System.Drawing.Size(263, 136)
+        Me.ctxtWeitereFormulare.Size = New System.Drawing.Size(263, 158)
         '
         'toolGelangensbestätigung
         '
@@ -5049,13 +4742,21 @@ Partial Class frmSendungsdetailsNEU
         Me.AMBARZollbeschauToolStripMenuItem.Name = "AMBARZollbeschauToolStripMenuItem"
         Me.AMBARZollbeschauToolStripMenuItem.Size = New System.Drawing.Size(262, 22)
         Me.AMBARZollbeschauToolStripMenuItem.Text = "AMBAR - Zollbeschau"
+        Me.AMBARZollbeschauToolStripMenuItem.Visible = False
+        '
+        'AMBARZollbeschauNEUToolStripMenuItem
+        '
+        Me.AMBARZollbeschauNEUToolStripMenuItem.Name = "AMBARZollbeschauNEUToolStripMenuItem"
+        Me.AMBARZollbeschauNEUToolStripMenuItem.Size = New System.Drawing.Size(262, 22)
+        Me.AMBARZollbeschauNEUToolStripMenuItem.Text = "AMBAR - Zollbeschau NEU"
+        Me.AMBARZollbeschauNEUToolStripMenuItem.Visible = False
         '
         'ContextMenuStrip1
         '
         Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem15, Me.T1BestätigungToolStripMenuItem, Me.SpeditionSUBENToolStripMenuItem, Me.ToolStripMenuItem16, Me.AuftragATANAKToolStripMenuItem, Me.ToolStripMenuItem26, Me.ToolStripMenuItem27, Me.ToolStripMenuItem25, Me.GVMSInfoToolStripMenuItem})
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem15, Me.T1BestätigungToolStripMenuItem, Me.SpeditionSUBENToolStripMenuItem, Me.ToolStripMenuItem16, Me.AuftragATANAKToolStripMenuItem, Me.ToolStripMenuItem26, Me.ToolStripMenuItem27, Me.ToolStripMenuItem25, Me.GVMSInfoToolStripMenuItem, Me.WarenortAMBARToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "cntxtAnh"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(223, 274)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(223, 304)
         '
         'ToolStripMenuItem15
         '
@@ -5181,6 +4882,14 @@ Partial Class frmSendungsdetailsNEU
         Me.AktuelleSendungToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
         Me.AktuelleSendungToolStripMenuItem.Text = "Aktuelle Sendung"
         '
+        'WarenortAMBARToolStripMenuItem
+        '
+        Me.WarenortAMBARToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.email_big1
+        Me.WarenortAMBARToolStripMenuItem.Name = "WarenortAMBARToolStripMenuItem"
+        Me.WarenortAMBARToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
+        Me.WarenortAMBARToolStripMenuItem.Text = "Warenort (AMBAR) "
+        Me.WarenortAMBARToolStripMenuItem.Visible = False
+        '
         'ContextMenuStrip2
         '
         Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -5203,6 +4912,314 @@ Partial Class frmSendungsdetailsNEU
         Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(255, 30)
         Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen"
         '
+        'cntlFrachtfuehrer_Sonst
+        '
+        Me.cntlFrachtfuehrer_Sonst._abrArt = "SONST"
+        Me.cntlFrachtfuehrer_Sonst._beteiligter = "FRACHTF"
+        Me.cntlFrachtfuehrer_Sonst._readOnly = True
+        Me.cntlFrachtfuehrer_Sonst.Location = New System.Drawing.Point(632, 168)
+        Me.cntlFrachtfuehrer_Sonst.Name = "cntlFrachtfuehrer_Sonst"
+        Me.cntlFrachtfuehrer_Sonst.Size = New System.Drawing.Size(21, 20)
+        Me.cntlFrachtfuehrer_Sonst.TabIndex = 82
+        Me.cntlFrachtfuehrer_Sonst.TabStop = False
+        Me.cntlFrachtfuehrer_Sonst.value = ""
+        '
+        'cntlAbsender_Sonst
+        '
+        Me.cntlAbsender_Sonst._abrArt = "SONST"
+        Me.cntlAbsender_Sonst._beteiligter = "ABS"
+        Me.cntlAbsender_Sonst._readOnly = True
+        Me.cntlAbsender_Sonst.Location = New System.Drawing.Point(632, 133)
+        Me.cntlAbsender_Sonst.Name = "cntlAbsender_Sonst"
+        Me.cntlAbsender_Sonst.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAbsender_Sonst.TabIndex = 68
+        Me.cntlAbsender_Sonst.TabStop = False
+        Me.cntlAbsender_Sonst.value = ""
+        '
+        'cntlEmpfaenger_Sonst
+        '
+        Me.cntlEmpfaenger_Sonst._abrArt = "SONST"
+        Me.cntlEmpfaenger_Sonst._beteiligter = "EMPF"
+        Me.cntlEmpfaenger_Sonst._readOnly = True
+        Me.cntlEmpfaenger_Sonst.Location = New System.Drawing.Point(632, 94)
+        Me.cntlEmpfaenger_Sonst.Name = "cntlEmpfaenger_Sonst"
+        Me.cntlEmpfaenger_Sonst.Size = New System.Drawing.Size(21, 20)
+        Me.cntlEmpfaenger_Sonst.TabIndex = 53
+        Me.cntlEmpfaenger_Sonst.TabStop = False
+        Me.cntlEmpfaenger_Sonst.value = ""
+        '
+        'cntlAuftraggeber_Sonst
+        '
+        Me.cntlAuftraggeber_Sonst._abrArt = "SONST"
+        Me.cntlAuftraggeber_Sonst._beteiligter = "AUFTR"
+        Me.cntlAuftraggeber_Sonst._readOnly = True
+        Me.cntlAuftraggeber_Sonst.Location = New System.Drawing.Point(632, 57)
+        Me.cntlAuftraggeber_Sonst.Name = "cntlAuftraggeber_Sonst"
+        Me.cntlAuftraggeber_Sonst.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAuftraggeber_Sonst.TabIndex = 36
+        Me.cntlAuftraggeber_Sonst.TabStop = False
+        Me.cntlAuftraggeber_Sonst.value = ""
+        '
+        'cntlAvisierer_Sonst
+        '
+        Me.cntlAvisierer_Sonst._abrArt = "SONST"
+        Me.cntlAvisierer_Sonst._beteiligter = "AVISIERER"
+        Me.cntlAvisierer_Sonst._readOnly = True
+        Me.cntlAvisierer_Sonst.Location = New System.Drawing.Point(632, 20)
+        Me.cntlAvisierer_Sonst.Name = "cntlAvisierer_Sonst"
+        Me.cntlAvisierer_Sonst.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAvisierer_Sonst.TabIndex = 21
+        Me.cntlAvisierer_Sonst.TabStop = False
+        Me.cntlAvisierer_Sonst.value = ""
+        '
+        'cntlFrachtf_Clear
+        '
+        Me.cntlFrachtf_Clear._abrArt = "CLEARING"
+        Me.cntlFrachtf_Clear._beteiligter = "FRACHTF"
+        Me.cntlFrachtf_Clear._readOnly = False
+        Me.cntlFrachtf_Clear.Location = New System.Drawing.Point(600, 168)
+        Me.cntlFrachtf_Clear.Name = "cntlFrachtf_Clear"
+        Me.cntlFrachtf_Clear.Size = New System.Drawing.Size(21, 20)
+        Me.cntlFrachtf_Clear.TabIndex = 81
+        Me.cntlFrachtf_Clear.TabStop = False
+        Me.cntlFrachtf_Clear.value = ""
+        '
+        'cntlFrachtf_Abf
+        '
+        Me.cntlFrachtf_Abf._abrArt = "ABFKOST"
+        Me.cntlFrachtf_Abf._beteiligter = "FRACHTF"
+        Me.cntlFrachtf_Abf._readOnly = False
+        Me.cntlFrachtf_Abf.Location = New System.Drawing.Point(569, 168)
+        Me.cntlFrachtf_Abf.Name = "cntlFrachtf_Abf"
+        Me.cntlFrachtf_Abf.Size = New System.Drawing.Size(21, 20)
+        Me.cntlFrachtf_Abf.TabIndex = 80
+        Me.cntlFrachtf_Abf.TabStop = False
+        Me.cntlFrachtf_Abf.value = ""
+        '
+        'cntlFrachtf_Eust
+        '
+        Me.cntlFrachtf_Eust._abrArt = "EUST"
+        Me.cntlFrachtf_Eust._beteiligter = "FRACHTF"
+        Me.cntlFrachtf_Eust._readOnly = False
+        Me.cntlFrachtf_Eust.Location = New System.Drawing.Point(538, 168)
+        Me.cntlFrachtf_Eust.Name = "cntlFrachtf_Eust"
+        Me.cntlFrachtf_Eust.Size = New System.Drawing.Size(21, 20)
+        Me.cntlFrachtf_Eust.TabIndex = 79
+        Me.cntlFrachtf_Eust.TabStop = False
+        Me.cntlFrachtf_Eust.value = ""
+        '
+        'cntlFrachtf_Zoll
+        '
+        Me.cntlFrachtf_Zoll._abrArt = "ZOLL"
+        Me.cntlFrachtf_Zoll._beteiligter = "FRACHTF"
+        Me.cntlFrachtf_Zoll._readOnly = False
+        Me.cntlFrachtf_Zoll.Location = New System.Drawing.Point(507, 168)
+        Me.cntlFrachtf_Zoll.Name = "cntlFrachtf_Zoll"
+        Me.cntlFrachtf_Zoll.Size = New System.Drawing.Size(21, 20)
+        Me.cntlFrachtf_Zoll.TabIndex = 78
+        Me.cntlFrachtf_Zoll.TabStop = False
+        Me.cntlFrachtf_Zoll.value = ""
+        '
+        'cntlAbsender_Clear
+        '
+        Me.cntlAbsender_Clear._abrArt = "CLEARING"
+        Me.cntlAbsender_Clear._beteiligter = "ABS"
+        Me.cntlAbsender_Clear._readOnly = False
+        Me.cntlAbsender_Clear.Location = New System.Drawing.Point(600, 133)
+        Me.cntlAbsender_Clear.Name = "cntlAbsender_Clear"
+        Me.cntlAbsender_Clear.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAbsender_Clear.TabIndex = 67
+        Me.cntlAbsender_Clear.TabStop = False
+        Me.cntlAbsender_Clear.value = ""
+        '
+        'cntlAbsender_Abf
+        '
+        Me.cntlAbsender_Abf._abrArt = "ABFKOST"
+        Me.cntlAbsender_Abf._beteiligter = "ABS"
+        Me.cntlAbsender_Abf._readOnly = False
+        Me.cntlAbsender_Abf.Location = New System.Drawing.Point(569, 133)
+        Me.cntlAbsender_Abf.Name = "cntlAbsender_Abf"
+        Me.cntlAbsender_Abf.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAbsender_Abf.TabIndex = 66
+        Me.cntlAbsender_Abf.TabStop = False
+        Me.cntlAbsender_Abf.value = ""
+        '
+        'cntlAbsender_Eust
+        '
+        Me.cntlAbsender_Eust._abrArt = "EUST"
+        Me.cntlAbsender_Eust._beteiligter = "ABS"
+        Me.cntlAbsender_Eust._readOnly = False
+        Me.cntlAbsender_Eust.Location = New System.Drawing.Point(538, 133)
+        Me.cntlAbsender_Eust.Name = "cntlAbsender_Eust"
+        Me.cntlAbsender_Eust.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAbsender_Eust.TabIndex = 65
+        Me.cntlAbsender_Eust.TabStop = False
+        Me.cntlAbsender_Eust.value = ""
+        '
+        'cntlAbsender_Zoll
+        '
+        Me.cntlAbsender_Zoll._abrArt = "ZOLL"
+        Me.cntlAbsender_Zoll._beteiligter = "ABS"
+        Me.cntlAbsender_Zoll._readOnly = False
+        Me.cntlAbsender_Zoll.Location = New System.Drawing.Point(507, 133)
+        Me.cntlAbsender_Zoll.Name = "cntlAbsender_Zoll"
+        Me.cntlAbsender_Zoll.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAbsender_Zoll.TabIndex = 64
+        Me.cntlAbsender_Zoll.TabStop = False
+        Me.cntlAbsender_Zoll.value = ""
+        '
+        'cntlEmpf_Clear
+        '
+        Me.cntlEmpf_Clear._abrArt = "CLEARING"
+        Me.cntlEmpf_Clear._beteiligter = "EMPF"
+        Me.cntlEmpf_Clear._readOnly = False
+        Me.cntlEmpf_Clear.Location = New System.Drawing.Point(600, 94)
+        Me.cntlEmpf_Clear.Name = "cntlEmpf_Clear"
+        Me.cntlEmpf_Clear.Size = New System.Drawing.Size(21, 20)
+        Me.cntlEmpf_Clear.TabIndex = 52
+        Me.cntlEmpf_Clear.TabStop = False
+        Me.cntlEmpf_Clear.value = ""
+        '
+        'cntlEmpf_Abf
+        '
+        Me.cntlEmpf_Abf._abrArt = "ABFKOST"
+        Me.cntlEmpf_Abf._beteiligter = "EMPF"
+        Me.cntlEmpf_Abf._readOnly = False
+        Me.cntlEmpf_Abf.Location = New System.Drawing.Point(569, 94)
+        Me.cntlEmpf_Abf.Name = "cntlEmpf_Abf"
+        Me.cntlEmpf_Abf.Size = New System.Drawing.Size(21, 20)
+        Me.cntlEmpf_Abf.TabIndex = 51
+        Me.cntlEmpf_Abf.TabStop = False
+        Me.cntlEmpf_Abf.value = ""
+        '
+        'cntlEmpf_Eust
+        '
+        Me.cntlEmpf_Eust._abrArt = "EUST"
+        Me.cntlEmpf_Eust._beteiligter = "EMPF"
+        Me.cntlEmpf_Eust._readOnly = False
+        Me.cntlEmpf_Eust.Location = New System.Drawing.Point(538, 94)
+        Me.cntlEmpf_Eust.Name = "cntlEmpf_Eust"
+        Me.cntlEmpf_Eust.Size = New System.Drawing.Size(21, 20)
+        Me.cntlEmpf_Eust.TabIndex = 50
+        Me.cntlEmpf_Eust.TabStop = False
+        Me.cntlEmpf_Eust.value = ""
+        '
+        'cntlEmpf_Zoll
+        '
+        Me.cntlEmpf_Zoll._abrArt = "ZOLL"
+        Me.cntlEmpf_Zoll._beteiligter = "EMPF"
+        Me.cntlEmpf_Zoll._readOnly = False
+        Me.cntlEmpf_Zoll.Location = New System.Drawing.Point(507, 94)
+        Me.cntlEmpf_Zoll.Name = "cntlEmpf_Zoll"
+        Me.cntlEmpf_Zoll.Size = New System.Drawing.Size(21, 20)
+        Me.cntlEmpf_Zoll.TabIndex = 49
+        Me.cntlEmpf_Zoll.TabStop = False
+        Me.cntlEmpf_Zoll.value = ""
+        '
+        'cntlAuftr_Clear
+        '
+        Me.cntlAuftr_Clear._abrArt = "CLEARING"
+        Me.cntlAuftr_Clear._beteiligter = "AUFTR"
+        Me.cntlAuftr_Clear._readOnly = False
+        Me.cntlAuftr_Clear.Location = New System.Drawing.Point(600, 57)
+        Me.cntlAuftr_Clear.Name = "cntlAuftr_Clear"
+        Me.cntlAuftr_Clear.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAuftr_Clear.TabIndex = 35
+        Me.cntlAuftr_Clear.TabStop = False
+        Me.cntlAuftr_Clear.value = ""
+        '
+        'cntlAuftr_Abf
+        '
+        Me.cntlAuftr_Abf._abrArt = "ABFKOST"
+        Me.cntlAuftr_Abf._beteiligter = "AUFTR"
+        Me.cntlAuftr_Abf._readOnly = False
+        Me.cntlAuftr_Abf.Location = New System.Drawing.Point(569, 57)
+        Me.cntlAuftr_Abf.Name = "cntlAuftr_Abf"
+        Me.cntlAuftr_Abf.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAuftr_Abf.TabIndex = 34
+        Me.cntlAuftr_Abf.TabStop = False
+        Me.cntlAuftr_Abf.value = ""
+        '
+        'cntlAuftr_Eust
+        '
+        Me.cntlAuftr_Eust._abrArt = "EUST"
+        Me.cntlAuftr_Eust._beteiligter = "AUFTR"
+        Me.cntlAuftr_Eust._readOnly = False
+        Me.cntlAuftr_Eust.Location = New System.Drawing.Point(538, 57)
+        Me.cntlAuftr_Eust.Name = "cntlAuftr_Eust"
+        Me.cntlAuftr_Eust.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAuftr_Eust.TabIndex = 33
+        Me.cntlAuftr_Eust.TabStop = False
+        Me.cntlAuftr_Eust.value = ""
+        '
+        'cntlAuftr_Zoll
+        '
+        Me.cntlAuftr_Zoll._abrArt = "ZOLL"
+        Me.cntlAuftr_Zoll._beteiligter = "AUFTR"
+        Me.cntlAuftr_Zoll._readOnly = False
+        Me.cntlAuftr_Zoll.Location = New System.Drawing.Point(507, 57)
+        Me.cntlAuftr_Zoll.Name = "cntlAuftr_Zoll"
+        Me.cntlAuftr_Zoll.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAuftr_Zoll.TabIndex = 32
+        Me.cntlAuftr_Zoll.TabStop = False
+        Me.cntlAuftr_Zoll.value = ""
+        '
+        'cntlAvisierer_Clear
+        '
+        Me.cntlAvisierer_Clear._abrArt = "CLEARING"
+        Me.cntlAvisierer_Clear._beteiligter = "AVISIERER"
+        Me.cntlAvisierer_Clear._readOnly = False
+        Me.cntlAvisierer_Clear.Location = New System.Drawing.Point(600, 20)
+        Me.cntlAvisierer_Clear.Name = "cntlAvisierer_Clear"
+        Me.cntlAvisierer_Clear.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAvisierer_Clear.TabIndex = 20
+        Me.cntlAvisierer_Clear.TabStop = False
+        Me.cntlAvisierer_Clear.value = ""
+        '
+        'cntlAvisierer_Abf
+        '
+        Me.cntlAvisierer_Abf._abrArt = "ABFKOST"
+        Me.cntlAvisierer_Abf._beteiligter = "AVISIERER"
+        Me.cntlAvisierer_Abf._readOnly = False
+        Me.cntlAvisierer_Abf.Location = New System.Drawing.Point(569, 20)
+        Me.cntlAvisierer_Abf.Name = "cntlAvisierer_Abf"
+        Me.cntlAvisierer_Abf.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAvisierer_Abf.TabIndex = 19
+        Me.cntlAvisierer_Abf.TabStop = False
+        Me.cntlAvisierer_Abf.value = ""
+        '
+        'cntlAvisierer_Eust
+        '
+        Me.cntlAvisierer_Eust._abrArt = "EUST"
+        Me.cntlAvisierer_Eust._beteiligter = "AVISIERER"
+        Me.cntlAvisierer_Eust._readOnly = False
+        Me.cntlAvisierer_Eust.Location = New System.Drawing.Point(538, 20)
+        Me.cntlAvisierer_Eust.Name = "cntlAvisierer_Eust"
+        Me.cntlAvisierer_Eust.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAvisierer_Eust.TabIndex = 18
+        Me.cntlAvisierer_Eust.TabStop = False
+        Me.cntlAvisierer_Eust.value = ""
+        '
+        'cntlAvisierer_Zoll
+        '
+        Me.cntlAvisierer_Zoll._abrArt = "ZOLL"
+        Me.cntlAvisierer_Zoll._beteiligter = "AVISIERER"
+        Me.cntlAvisierer_Zoll._readOnly = False
+        Me.cntlAvisierer_Zoll.Location = New System.Drawing.Point(507, 20)
+        Me.cntlAvisierer_Zoll.Name = "cntlAvisierer_Zoll"
+        Me.cntlAvisierer_Zoll.Size = New System.Drawing.Size(21, 20)
+        Me.cntlAvisierer_Zoll.TabIndex = 17
+        Me.cntlAvisierer_Zoll.TabStop = False
+        Me.cntlAvisierer_Zoll.value = ""
+        '
+        'UsrCntlSND_NCTSGestellungsadresse1
+        '
+        Me.UsrCntlSND_NCTSGestellungsadresse1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlSND_NCTSGestellungsadresse1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrCntlSND_NCTSGestellungsadresse1.Name = "UsrCntlSND_NCTSGestellungsadresse1"
+        Me.UsrCntlSND_NCTSGestellungsadresse1.Size = New System.Drawing.Size(549, 92)
+        Me.UsrCntlSND_NCTSGestellungsadresse1.TabIndex = 0
+        '
         'frmSendungsdetailsNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -5674,4 +5691,6 @@ Partial Class frmSendungsdetailsNEU
     Friend WithEvents T1BestätigungToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents MitGestellungsgarantieToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents OhneGestellungsgarantieToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents AMBARZollbeschauNEUToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents WarenortAMBARToolStripMenuItem As ToolStripMenuItem
 End Class
diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb
index 780f4bb..24f794b 100644
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -8,7 +8,6 @@ Imports iTextSharp.text.pdf
 Imports Microsoft.Office.Interop
 Imports DocumentFormat.OpenXml.Presentation
 
-
 Public Class frmSendungsdetailsNEU
     Public AvisoId As Integer
     Public SendungID As Integer = -1
@@ -644,6 +643,12 @@ Public Class frmSendungsdetailsNEU
 
             If VERAG_PROG_ALLGEMEIN.cAllgemein.AUTO_ABF_NR Then btnNeueAbfertigungNrVergeben.Visible = True
 
+            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                Case "AMBAR"
+                    AMBARZollbeschauToolStripMenuItem.Visible = True
+                    AMBARZollbeschauNEUToolStripMenuItem.Visible = True
+                    WarenortAMBARToolStripMenuItem.Visible = True
+            End Select
             initDataBinding()
 
         Catch ex As Exception
@@ -3617,6 +3622,7 @@ Public Class frmSendungsdetailsNEU
         End If
         Select Case FormularArt
             Case SDL.FormularManagerArten.Importaviso_VK : SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Importaviso_VK, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO, ROLLE})
+            Case SDL.FormularManagerArten.Zollbeschau_Protokoll : SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Zollbeschau_Protokoll, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO, ROLLE})
             Case SDL.FormularManagerArten.Importaviso
                 Dim f As SDL.frmFormulare = Nothing
                 SDL.FormularManagerNEU.OPEN_FORM_Byref(SDL.FormularManagerArten.Importaviso, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO, ROLLE},, f)
@@ -3964,7 +3970,7 @@ Public Class frmSendungsdetailsNEU
         End If
     End Sub
 
-    Private Sub EMailAnfügenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EMailAnfügenToolStripMenuItem.Click, ToolStripMenuItem15.Click
+    Private Sub EMailAnfügenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EMailAnfügenToolStripMenuItem.Click, ToolStripMenuItem15.Click, WarenortAMBARToolStripMenuItem.Click
 
         Try
             VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath("ClipBoard_TMP")
@@ -3989,29 +3995,53 @@ Public Class frmSendungsdetailsNEU
                         ' Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.copyToTmp_KeepFilenameByDS(ii.coll_pfad, ii.coll_bezeichnung), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
                         Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
                     Next
-                    Mail.Subject = "Kennzeichen: " & AVISO.LKW_Nr
 
+                    Mail.Subject = "Kennzeichen: " & AVISO.LKW_Nr
 
                     'ATA FREMD!!!
                     If sender Is ToolStripMenuItem15 Then
-                        Mail.Subject = "Kennzeichen: " & AVISO.LKW_Nr & "  |  Grenze: " & lblGrenze.Text
-                        If If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender, "") <> "" Then Mail.Subject &= "  |  Absender: " & SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender
-                        If If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, "") <> "" Then Mail.Subject &= "  |  Gewicht: " & SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht
+                                Mail.Subject = "Kennzeichen: " & AVISO.LKW_Nr & "  |  Grenze: " & lblGrenze.Text
+                                If If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender, "") <> "" Then Mail.Subject &= "  |  Absender: " & SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender
+                                If If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, "") <> "" Then Mail.Subject &= "  |  Gewicht: " & SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht
+
+                                Dim TextHTML = ""
+                                TextHTML &= "Sehr geehrte Damen und Herren,<br>"
+                                TextHTML &= "<br>"
+                                TextHTML &= "beiliegend senden wir Ihnen die Sendungsunterlagen für den o.g. LKW/Container. Wir bitten um Zusendung der ATA-Nummer.<br>"
+                                TextHTML &= "<br>"
+
+                                TextHTML &= "Mit freundlichen Grüßen<br>"
+                                TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
+                                TextHTML &= "<br>"
+
+                                Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & TextHTML & SDL.cFakturierung.getSignature("DE") & "</div>"
+
+                                AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "ATA-Nr fehlt (Fremdanmeldung) - angefordert", 33)
+
+                    ElseIf sender Is WarenortAMBARToolStripMenuItem Then
+
+                        Mail.Subject = AVISO.LKW_Nr
+                        If If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger, "") <> "" Then Mail.Subject &= " / " & SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger
 
                         Dim TextHTML = ""
                         TextHTML &= "Sehr geehrte Damen und Herren,<br>"
                         TextHTML &= "<br>"
-                        TextHTML &= "beiliegend senden wir Ihnen die Sendungsunterlagen für den o.g. LKW/Container. Wir bitten um Zusendung der ATA-Nummer.<br>"
+                        TextHTML &= "der LKW meldet sich mit der Ware lt. Anhang bei uns am Warenort Zollamt " & lblGrenze.Text & ", bitte um Vorbereitung der Verzollung. <br>"
+                        TextHTML &= "<br>"
+                        TextHTML &= "Wir melden uns bei LKW-Ankunft mit der ATB Nummer.<br>"
                         TextHTML &= "<br>"
-
                         TextHTML &= "Mit freundlichen Grüßen<br>"
                         TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
                         TextHTML &= "<br>"
 
+                        AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "An Fremdspediteur avisiert (Warenort)", 98)
+
                         Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & TextHTML & SDL.cFakturierung.getSignature("DE") & "</div>"
 
-                        AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "ATA-Nr fehlt (Fremdanmeldung) - angefordert", 33)
                     End If
+
+
+
                     Mail.Display()
 
                 Catch ex As Exception
@@ -5740,11 +5770,15 @@ Public Class frmSendungsdetailsNEU
 
     End Sub
 
-    Private Sub OhneGestellungsgarantieToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OhneGestellungsgarantieToolStripMenuItem.Click
+    Private Sub AMBARZollbeschauNEUToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AMBARZollbeschauNEUToolStripMenuItem.Click
+        Try
+            FormularArt = SDL.FormularManagerArten.Zollbeschau_Protokoll
+            cntxtVorauskasse.Show(Cursor.Position)
+
+        Catch ex As Exception
+
+        End Try
 
     End Sub
 
-    Private Sub MitGestellungsgarantieToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MitGestellungsgarantieToolStripMenuItem.Click
-
-    End Sub
 End Class