diff --git a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
index 1a47743..336efd5 100644
--- a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
+++ b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
@@ -223,6 +223,7 @@ Public Class frmAvisoWeiterleiten
             addBtn(flpFirma, "N", "WAI", "VERAG Waidhaus")
             addBtn(flpFirma, "N", "NKD", "VERAG Nickelsdorf")
             addBtn(flpFirma, "N", "NEU", "VERAG Neuhaus")
+            addBtn(flpFirma, "N", "DTB", "VERAG Dettelbach")
 
             addBtn(flpFirma, "A", "FISK", "VERAG Fiskal")
 
diff --git a/Aviso/Classes/cSendungsoptions.vb b/Aviso/Classes/cSendungsoptions.vb
index 38b5208..37f1c41 100644
--- a/Aviso/Classes/cSendungsoptions.vb
+++ b/Aviso/Classes/cSendungsoptions.vb
@@ -171,7 +171,9 @@ Public Class SendungOptions
 
         If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("RPT_SND_Grenzstelle") Then
             If AVISO.Zollstelle IsNot Nothing AndAlso AVISO.Zollstelle <> "" Then
-                VALUES.Grenze = VERAGSQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
+                '                VALUES.Grenze = VERAGSQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
+                VALUES.Grenze = VERAGSQL.getValueTxtBySql("SELECT Code +' - ' + [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & AVISO.Zollstelle & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
+
             Else
                 If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
                     VALUES.Grenze = ""
@@ -671,7 +673,9 @@ Public Class SendungOptions
 
     Shared Function getZSTBezeichnung(SQL As VERAG_PROG_ALLGEMEIN.SQL, o As Object) As String
         If o Is Nothing Then Return ""
-        Dim tmp = SQL.getValueTxtBySql("select isnull([basncd_name],'') as Dienststelle FROM atlas.dbo.basncd WHERE [basncd_dstnr]='" & o & "'", "ATLAS")
+        '        Dim tmp = SQL.getValueTxtBySql("select isnull([basncd_name],'') as Dienststelle FROM atlas.dbo.basncd WHERE [basncd_dstnr]='" & o & "'", "ATLAS")
+        Dim tmp = SQL.getValueTxtBySql("select isnull([Description],'') as Dienststelle FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE [Code]='" & o & "'  AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
+
         Return If(tmp <> "", tmp, o)
     End Function
 
diff --git a/Aviso/frmAnkunftAendern.vb b/Aviso/frmAnkunftAendern.vb
index c3eb310..ea3dcc2 100644
--- a/Aviso/frmAnkunftAendern.vb
+++ b/Aviso/frmAnkunftAendern.vb
@@ -25,7 +25,8 @@
         If AVISO Is Nothing Then Exit Sub
         If AVISO.Grenzstelle.Replace("???", "") = "" Then
             If AVISO.Zollstelle IsNot Nothing Then
-                btnAktGrenze.Text = SQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
+                ' btnAktGrenze.Text = SQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
+                btnAktGrenze.Text = SQL.getValueTxtBySql("SELECT Code +' - ' + [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & AVISO.Zollstelle & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
             Else
                 btnAktGrenze.Text = AVISO.Grenzstelle
             End If
diff --git a/Aviso/frmEintragAviso.vb b/Aviso/frmEintragAviso.vb
index f8ee448..42eb195 100644
--- a/Aviso/frmEintragAviso.vb
+++ b/Aviso/frmEintragAviso.vb
@@ -141,7 +141,8 @@ Public Class frmEintragAviso
                 Label1.Visible = True
                 cboImEx.Visible = True
 
-                txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+                'txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+                txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
                 'txtBestimmungszollstelle.Visible = True
                 'lblZA.Visible = True
                 pnl.Visible = True
@@ -156,7 +157,8 @@ Public Class frmEintragAviso
                 Label1.Visible = True
                 cboImEx.Visible = True
 
-                txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+                '   txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+                txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
 
                 pnl.Visible = True
             Case "VERAG"
@@ -1697,7 +1699,8 @@ Public Class frmEintragAviso
             Case "VERAG", "FRONTOFFICE", "UNISPED", "IMEX", "AMBAR"
 
                 If cboGrenzstelle._value = "???" Then
-                    txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+                    'txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+                    txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
                     'txtBestimmungszollstelle.Visible = True
                     'lblZA.Visible = True
                     pnl.Visible = True
diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb
index 8ed3b29..6dc4608 100644
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -216,7 +216,8 @@ Public Class frmHauptfenster
         'cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
         cboGrenzstelle.changeItem("")
 
-        txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+        '  txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+        txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
 
         cboImEx.Items.Clear()
         cboImEx.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
@@ -2639,8 +2640,26 @@ Public Class frmHauptfenster
 
     End Function
     Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click
+        Try
 
 
+            Dim MIC = New VERAG_PROG_ALLGEMEIN.MIC_IMPORT.InsertImportShipment
+            MIC.ImportShipmentMessage.ImportShipment.Shipment.company = "UK"
+            MIC.SaveToFile("C:\VeragTMP\Test2.xml")
+
+            'Dim MIC = VERAG_PROG_ALLGEMEIN.MIC_IMPORT.InsertImportShipment.LoadFromFile("C:\VeragTMP\Test.xml")
+            ''Dim MIC = VERAG_PROG_ALLGEMEIN.MIC_IMPORT.InsertImportShipment.LoadFromFile("C:\VeragTMP\MicCustImportShipment_Sample.xml")
+
+            'MsgBox(MIC.ImportShipmentMessage.ImportShipment.Shipment.company)
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+
+
+
+        Exit Sub
+
 
         Dim rpt As New rptTEST
 
@@ -3302,7 +3321,7 @@ Public Class frmHauptfenster
     End Sub
 
     Private Sub ATILLAToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATILLAToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "ATILLA")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "ATILLA", "SUB", True)) Then
             showMeNew()
         Else
             MsgBox("Keine Berechtigung!")
@@ -3310,7 +3329,7 @@ Public Class frmHauptfenster
     End Sub
 
     Private Sub IMEXToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles IMEXToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "IMEX")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "IMEX", "SUB", True)) Then
             showMeNew()
         Else
             MsgBox("Keine Berechtigung!")
@@ -3318,13 +3337,13 @@ Public Class frmHauptfenster
     End Sub
 
     Private Sub VERAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VERAGToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "VERAG")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "VERAG", "SUB", True)) Then
             showMeNew()
         End If
     End Sub
     Sub showMeNew()
-        VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_DATA()
-        VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_BER()
+        'VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_DATA()
+        'VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_BER()
         closeOK = True
 
         For Each ft As Form In Application.OpenForms
@@ -3517,7 +3536,7 @@ Public Class frmHauptfenster
     End Sub
 
     Private Sub UNISPEDToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UNISPEDToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "UNISPED")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "UNISPED", "SUB", True)) Then
             showMeNew()
         Else
             MsgBox("Keine Berechtigung!")
@@ -3525,7 +3544,7 @@ Public Class frmHauptfenster
     End Sub
 
     Private Sub AMBARToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AMBARToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "AMBAR")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "AMBAR", "AMB", True)) Then
             showMeNew()
         Else
             MsgBox("Keine Berechtigung!")
@@ -3748,7 +3767,7 @@ Public Class frmHauptfenster
     End Sub
 
     Private Sub FRONTOFFICEToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FRONTOFFICEToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "FRONTOFFICE")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "FRONTOFFICE", "SUB", True)) Then
             showMeNew()
         Else
             MsgBox("Keine Berechtigung!")
@@ -3756,7 +3775,7 @@ Public Class frmHauptfenster
     End Sub
 
     Private Sub VERIMEXToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VERIMEXToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "VERIMEX")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "VERIMEX", "", True)) Then
             showMeNew()
         Else
             MsgBox("Keine Berechtigung!")
@@ -5794,7 +5813,9 @@ Public Class AvisoStatusFunctions
             End If
         Else
             If AVISO.Zollstelle IsNot Nothing AndAlso AVISO.Zollstelle.ToString <> "" Then
-                hGrenzstelle = VERAGSQL.getValueTxtBySql("SELECT  [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
+                '                hGrenzstelle = VERAGSQL.getValueTxtBySql("SELECT  [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
+                hGrenzstelle = VERAGSQL.getValueTxtBySql("SELECT  [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & AVISO.Zollstelle & "' AND  ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))  order by left(Code,2), Description ", "FMZOLL")
+
             End If
         End If
 
diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb
index 69dcc8b..37ac16e 100644
--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
@@ -365,6 +365,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ImportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ExportT1ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AMBARZollbeschauToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem15 = New System.Windows.Forms.ToolStripMenuItem()
         Me.SpeditionSUBENToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -381,7 +382,9 @@ Partial Class frmSendungsdetailsNEU
         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.AMBARZollbeschauToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.lblErr_AvisiererKdNr = New System.Windows.Forms.Label()
+        Me.lblErr_EmpfKdNr = New System.Windows.Forms.Label()
+        Me.lblErr_FraechterKdNr = New System.Windows.Forms.Label()
         Me.pnl.SuspendLayout()
         Me.Panel4.SuspendLayout()
         Me.TabControl1.SuspendLayout()
@@ -1204,6 +1207,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtAtlasBezNrEZA2._DateTimeOnly = False
         Me.txtAtlasBezNrEZA2._numbersOnly = False
         Me.txtAtlasBezNrEZA2._numbersOnlyKommastellen = ""
+        Me.txtAtlasBezNrEZA2._numbersOnlyTrennzeichen = True
         Me.txtAtlasBezNrEZA2._Prozent = False
         Me.txtAtlasBezNrEZA2._ShortDateNew = False
         Me.txtAtlasBezNrEZA2._ShortDateOnly = False
@@ -1227,6 +1231,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtAtlasBezNrNCTS2._DateTimeOnly = False
         Me.txtAtlasBezNrNCTS2._numbersOnly = False
         Me.txtAtlasBezNrNCTS2._numbersOnlyKommastellen = ""
+        Me.txtAtlasBezNrNCTS2._numbersOnlyTrennzeichen = True
         Me.txtAtlasBezNrNCTS2._Prozent = False
         Me.txtAtlasBezNrNCTS2._ShortDateNew = False
         Me.txtAtlasBezNrNCTS2._ShortDateOnly = False
@@ -1299,6 +1304,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtAtlasBezNrEZA._DateTimeOnly = False
         Me.txtAtlasBezNrEZA._numbersOnly = False
         Me.txtAtlasBezNrEZA._numbersOnlyKommastellen = ""
+        Me.txtAtlasBezNrEZA._numbersOnlyTrennzeichen = True
         Me.txtAtlasBezNrEZA._Prozent = False
         Me.txtAtlasBezNrEZA._ShortDateNew = False
         Me.txtAtlasBezNrEZA._ShortDateOnly = False
@@ -1321,6 +1327,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtAtlasBezNrNCTS._DateTimeOnly = False
         Me.txtAtlasBezNrNCTS._numbersOnly = False
         Me.txtAtlasBezNrNCTS._numbersOnlyKommastellen = ""
+        Me.txtAtlasBezNrNCTS._numbersOnlyTrennzeichen = True
         Me.txtAtlasBezNrNCTS._Prozent = False
         Me.txtAtlasBezNrNCTS._ShortDateNew = False
         Me.txtAtlasBezNrNCTS._ShortDateOnly = False
@@ -1513,6 +1520,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtFrachtkosten._DateTimeOnly = False
         Me.txtFrachtkosten._numbersOnly = False
         Me.txtFrachtkosten._numbersOnlyKommastellen = ""
+        Me.txtFrachtkosten._numbersOnlyTrennzeichen = True
         Me.txtFrachtkosten._Prozent = False
         Me.txtFrachtkosten._ShortDateNew = False
         Me.txtFrachtkosten._ShortDateOnly = False
@@ -1590,6 +1598,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtWarenwert._DateTimeOnly = False
         Me.txtWarenwert._numbersOnly = True
         Me.txtWarenwert._numbersOnlyKommastellen = ""
+        Me.txtWarenwert._numbersOnlyTrennzeichen = True
         Me.txtWarenwert._Prozent = False
         Me.txtWarenwert._ShortDateNew = False
         Me.txtWarenwert._ShortDateOnly = False
@@ -1708,6 +1717,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtGewicht._DateTimeOnly = False
         Me.txtGewicht._numbersOnly = True
         Me.txtGewicht._numbersOnlyKommastellen = "1"
+        Me.txtGewicht._numbersOnlyTrennzeichen = True
         Me.txtGewicht._Prozent = False
         Me.txtGewicht._ShortDateNew = False
         Me.txtGewicht._ShortDateOnly = False
@@ -1780,6 +1790,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtColli._DateTimeOnly = False
         Me.txtColli._numbersOnly = True
         Me.txtColli._numbersOnlyKommastellen = "0"
+        Me.txtColli._numbersOnlyTrennzeichen = True
         Me.txtColli._Prozent = False
         Me.txtColli._ShortDateNew = False
         Me.txtColli._ShortDateOnly = False
@@ -1873,6 +1884,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtBARzuKassieren._DateTimeOnly = False
         Me.txtBARzuKassieren._numbersOnly = False
         Me.txtBARzuKassieren._numbersOnlyKommastellen = ""
+        Me.txtBARzuKassieren._numbersOnlyTrennzeichen = True
         Me.txtBARzuKassieren._Prozent = False
         Me.txtBARzuKassieren._ShortDateNew = False
         Me.txtBARzuKassieren._ShortDateOnly = False
@@ -1947,6 +1959,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtVK_Preis._DateTimeOnly = False
         Me.txtVK_Preis._numbersOnly = True
         Me.txtVK_Preis._numbersOnlyKommastellen = ""
+        Me.txtVK_Preis._numbersOnlyTrennzeichen = True
         Me.txtVK_Preis._Prozent = False
         Me.txtVK_Preis._ShortDateNew = False
         Me.txtVK_Preis._ShortDateOnly = False
@@ -1970,6 +1983,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtVK_Leistung._DateTimeOnly = False
         Me.txtVK_Leistung._numbersOnly = False
         Me.txtVK_Leistung._numbersOnlyKommastellen = ""
+        Me.txtVK_Leistung._numbersOnlyTrennzeichen = True
         Me.txtVK_Leistung._Prozent = False
         Me.txtVK_Leistung._ShortDateNew = False
         Me.txtVK_Leistung._ShortDateOnly = False
@@ -1993,6 +2007,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtVK_Firma._DateTimeOnly = False
         Me.txtVK_Firma._numbersOnly = False
         Me.txtVK_Firma._numbersOnlyKommastellen = ""
+        Me.txtVK_Firma._numbersOnlyTrennzeichen = True
         Me.txtVK_Firma._Prozent = False
         Me.txtVK_Firma._ShortDateNew = False
         Me.txtVK_Firma._ShortDateOnly = False
@@ -2147,6 +2162,11 @@ Partial Class frmSendungsdetailsNEU
         Me.Panel6.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Panel6.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.Panel6.Controls.Add(Me.txtFrachtfuehrer)
+        Me.Panel6.Controls.Add(Me.Panel12)
+        Me.Panel6.Controls.Add(Me.lblErr_FraechterKdNr)
+        Me.Panel6.Controls.Add(Me.lblErr_EmpfKdNr)
+        Me.Panel6.Controls.Add(Me.lblErr_AvisiererKdNr)
         Me.Panel6.Controls.Add(Me.picKdAtrNr_Fraechter)
         Me.Panel6.Controls.Add(Me.picKdAtrNr_Empfänger)
         Me.Panel6.Controls.Add(Me.picKdAtrNr_Auftraggeber)
@@ -2206,7 +2226,6 @@ Partial Class frmSendungsdetailsNEU
         Me.Panel6.Controls.Add(Me.txtAvisierer)
         Me.Panel6.Controls.Add(Me.txtAuftraggeber)
         Me.Panel6.Controls.Add(Me.Panel13)
-        Me.Panel6.Controls.Add(Me.Panel12)
         Me.Panel6.Controls.Add(Me.Panel11)
         Me.Panel6.Controls.Add(Me.Panel10)
         Me.Panel6.Controls.Add(Me.txtFrachtfuehrerKdNr)
@@ -2216,7 +2235,6 @@ Partial Class frmSendungsdetailsNEU
         Me.Panel6.Controls.Add(Me.lblFrachtfuehrer)
         Me.Panel6.Controls.Add(Me.pnlT1)
         Me.Panel6.Controls.Add(Me.Label43)
-        Me.Panel6.Controls.Add(Me.txtFrachtfuehrer)
         Me.Panel6.Controls.Add(Me.lblAbsender)
         Me.Panel6.Controls.Add(Me.txtAbsenderKdNr)
         Me.Panel6.Controls.Add(Me.Label41)
@@ -2455,6 +2473,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtKdAuftragsNrFrachtfuehrer._DateTimeOnly = False
         Me.txtKdAuftragsNrFrachtfuehrer._numbersOnly = False
         Me.txtKdAuftragsNrFrachtfuehrer._numbersOnlyKommastellen = ""
+        Me.txtKdAuftragsNrFrachtfuehrer._numbersOnlyTrennzeichen = True
         Me.txtKdAuftragsNrFrachtfuehrer._Prozent = False
         Me.txtKdAuftragsNrFrachtfuehrer._ShortDateNew = False
         Me.txtKdAuftragsNrFrachtfuehrer._ShortDateOnly = False
@@ -2478,6 +2497,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtKdAuftragsNrEmpfaenger._DateTimeOnly = False
         Me.txtKdAuftragsNrEmpfaenger._numbersOnly = False
         Me.txtKdAuftragsNrEmpfaenger._numbersOnlyKommastellen = ""
+        Me.txtKdAuftragsNrEmpfaenger._numbersOnlyTrennzeichen = True
         Me.txtKdAuftragsNrEmpfaenger._Prozent = False
         Me.txtKdAuftragsNrEmpfaenger._ShortDateNew = False
         Me.txtKdAuftragsNrEmpfaenger._ShortDateOnly = False
@@ -2501,6 +2521,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtKdAuftragsNrAvisierer._DateTimeOnly = False
         Me.txtKdAuftragsNrAvisierer._numbersOnly = False
         Me.txtKdAuftragsNrAvisierer._numbersOnlyKommastellen = ""
+        Me.txtKdAuftragsNrAvisierer._numbersOnlyTrennzeichen = True
         Me.txtKdAuftragsNrAvisierer._Prozent = False
         Me.txtKdAuftragsNrAvisierer._ShortDateNew = False
         Me.txtKdAuftragsNrAvisierer._ShortDateOnly = False
@@ -3124,6 +3145,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtFrachtfuehrerKdNr._DateTimeOnly = False
         Me.txtFrachtfuehrerKdNr._numbersOnly = False
         Me.txtFrachtfuehrerKdNr._numbersOnlyKommastellen = ""
+        Me.txtFrachtfuehrerKdNr._numbersOnlyTrennzeichen = True
         Me.txtFrachtfuehrerKdNr._Prozent = False
         Me.txtFrachtfuehrerKdNr._ShortDateNew = False
         Me.txtFrachtfuehrerKdNr._ShortDateOnly = False
@@ -3168,6 +3190,7 @@ Partial Class frmSendungsdetailsNEU
         Me.lblEmpfAufschubEust._DateTimeOnly = False
         Me.lblEmpfAufschubEust._numbersOnly = False
         Me.lblEmpfAufschubEust._numbersOnlyKommastellen = ""
+        Me.lblEmpfAufschubEust._numbersOnlyTrennzeichen = True
         Me.lblEmpfAufschubEust._Prozent = False
         Me.lblEmpfAufschubEust._ShortDateNew = False
         Me.lblEmpfAufschubEust._ShortDateOnly = False
@@ -3275,6 +3298,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtAbsenderKdNr._DateTimeOnly = False
         Me.txtAbsenderKdNr._numbersOnly = False
         Me.txtAbsenderKdNr._numbersOnlyKommastellen = ""
+        Me.txtAbsenderKdNr._numbersOnlyTrennzeichen = True
         Me.txtAbsenderKdNr._Prozent = False
         Me.txtAbsenderKdNr._ShortDateNew = False
         Me.txtAbsenderKdNr._ShortDateOnly = False
@@ -3312,6 +3336,7 @@ Partial Class frmSendungsdetailsNEU
         Me.MyTextBox1._DateTimeOnly = False
         Me.MyTextBox1._numbersOnly = False
         Me.MyTextBox1._numbersOnlyKommastellen = ""
+        Me.MyTextBox1._numbersOnlyTrennzeichen = True
         Me.MyTextBox1._Prozent = False
         Me.MyTextBox1._ShortDateNew = False
         Me.MyTextBox1._ShortDateOnly = False
@@ -3361,6 +3386,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtEmpfaengerKdNr._DateTimeOnly = False
         Me.txtEmpfaengerKdNr._numbersOnly = False
         Me.txtEmpfaengerKdNr._numbersOnlyKommastellen = ""
+        Me.txtEmpfaengerKdNr._numbersOnlyTrennzeichen = True
         Me.txtEmpfaengerKdNr._Prozent = False
         Me.txtEmpfaengerKdNr._ShortDateNew = False
         Me.txtEmpfaengerKdNr._ShortDateOnly = False
@@ -3466,6 +3492,7 @@ Partial Class frmSendungsdetailsNEU
         Me.lblAtrAufschubEust._DateTimeOnly = False
         Me.lblAtrAufschubEust._numbersOnly = False
         Me.lblAtrAufschubEust._numbersOnlyKommastellen = ""
+        Me.lblAtrAufschubEust._numbersOnlyTrennzeichen = True
         Me.lblAtrAufschubEust._Prozent = False
         Me.lblAtrAufschubEust._ShortDateNew = False
         Me.lblAtrAufschubEust._ShortDateOnly = False
@@ -3525,6 +3552,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtAuftraggeberKdNr._DateTimeOnly = False
         Me.txtAuftraggeberKdNr._numbersOnly = False
         Me.txtAuftraggeberKdNr._numbersOnlyKommastellen = ""
+        Me.txtAuftraggeberKdNr._numbersOnlyTrennzeichen = True
         Me.txtAuftraggeberKdNr._Prozent = False
         Me.txtAuftraggeberKdNr._ShortDateNew = False
         Me.txtAuftraggeberKdNr._ShortDateOnly = False
@@ -3643,6 +3671,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtAvisiererKdNr._DateTimeOnly = False
         Me.txtAvisiererKdNr._numbersOnly = False
         Me.txtAvisiererKdNr._numbersOnlyKommastellen = ""
+        Me.txtAvisiererKdNr._numbersOnlyTrennzeichen = True
         Me.txtAvisiererKdNr._Prozent = False
         Me.txtAvisiererKdNr._ShortDateNew = False
         Me.txtAvisiererKdNr._ShortDateOnly = False
@@ -3668,6 +3697,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtKdAuftragsNr._DateTimeOnly = False
         Me.txtKdAuftragsNr._numbersOnly = False
         Me.txtKdAuftragsNr._numbersOnlyKommastellen = ""
+        Me.txtKdAuftragsNr._numbersOnlyTrennzeichen = True
         Me.txtKdAuftragsNr._Prozent = False
         Me.txtKdAuftragsNr._ShortDateNew = False
         Me.txtKdAuftragsNr._ShortDateOnly = False
@@ -3731,6 +3761,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtAnzahlPos._DateTimeOnly = False
         Me.txtAnzahlPos._numbersOnly = True
         Me.txtAnzahlPos._numbersOnlyKommastellen = ""
+        Me.txtAnzahlPos._numbersOnlyTrennzeichen = True
         Me.txtAnzahlPos._Prozent = False
         Me.txtAnzahlPos._ShortDateNew = False
         Me.txtAnzahlPos._ShortDateOnly = False
@@ -3907,6 +3938,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtFremdEmpfKdNR._DateTimeOnly = False
         Me.txtFremdEmpfKdNR._numbersOnly = False
         Me.txtFremdEmpfKdNR._numbersOnlyKommastellen = ""
+        Me.txtFremdEmpfKdNR._numbersOnlyTrennzeichen = True
         Me.txtFremdEmpfKdNR._Prozent = False
         Me.txtFremdEmpfKdNR._ShortDateNew = False
         Me.txtFremdEmpfKdNR._ShortDateOnly = False
@@ -3987,6 +4019,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtAnzahl._DateTimeOnly = False
         Me.txtAnzahl._numbersOnly = True
         Me.txtAnzahl._numbersOnlyKommastellen = ""
+        Me.txtAnzahl._numbersOnlyTrennzeichen = True
         Me.txtAnzahl._Prozent = False
         Me.txtAnzahl._ShortDateNew = False
         Me.txtAnzahl._ShortDateOnly = False
@@ -4046,6 +4079,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtUnterNr._DateTimeOnly = False
         Me.txtUnterNr._numbersOnly = False
         Me.txtUnterNr._numbersOnlyKommastellen = ""
+        Me.txtUnterNr._numbersOnlyTrennzeichen = True
         Me.txtUnterNr._Prozent = False
         Me.txtUnterNr._ShortDateNew = False
         Me.txtUnterNr._ShortDateOnly = False
@@ -4105,6 +4139,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtAbfertigungsnummer._DateTimeOnly = False
         Me.txtAbfertigungsnummer._numbersOnly = False
         Me.txtAbfertigungsnummer._numbersOnlyKommastellen = ""
+        Me.txtAbfertigungsnummer._numbersOnlyTrennzeichen = True
         Me.txtAbfertigungsnummer._Prozent = False
         Me.txtAbfertigungsnummer._ShortDateNew = False
         Me.txtAbfertigungsnummer._ShortDateOnly = False
@@ -4564,7 +4599,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem4.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripMenuItem4.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
-        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(101, 30)
+        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(93, 22)
         Me.ToolStripMenuItem4.Text = "T1"
         '
         'ToolStripMenuItem5
@@ -4572,7 +4607,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem5.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripMenuItem5.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(101, 30)
+        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(93, 22)
         Me.ToolStripMenuItem5.Text = "T2"
         '
         'ÜTToolStripMenuItem
@@ -4580,7 +4615,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ÜTToolStripMenuItem.Enabled = False
         Me.ÜTToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ÜTToolStripMenuItem.Name = "ÜTToolStripMenuItem"
-        Me.ÜTToolStripMenuItem.Size = New System.Drawing.Size(101, 30)
+        Me.ÜTToolStripMenuItem.Size = New System.Drawing.Size(93, 22)
         Me.ÜTToolStripMenuItem.Text = "Ü-T"
         '
         'NeueZollanmeldungToolStripMenuItem
@@ -4794,21 +4829,27 @@ Partial Class frmSendungsdetailsNEU
         'ImportToolStripMenuItem
         '
         Me.ImportToolStripMenuItem.Name = "ImportToolStripMenuItem"
-        Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(123, 22)
         Me.ImportToolStripMenuItem.Text = "Import"
         '
         'ExportToolStripMenuItem
         '
         Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem"
-        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(123, 22)
         Me.ExportToolStripMenuItem.Text = "Export"
         '
         'ExportT1ToolStripMenuItem
         '
         Me.ExportT1ToolStripMenuItem.Name = "ExportT1ToolStripMenuItem"
-        Me.ExportT1ToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ExportT1ToolStripMenuItem.Size = New System.Drawing.Size(123, 22)
         Me.ExportT1ToolStripMenuItem.Text = "Export T1"
         '
+        'AMBARZollbeschauToolStripMenuItem
+        '
+        Me.AMBARZollbeschauToolStripMenuItem.Name = "AMBARZollbeschauToolStripMenuItem"
+        Me.AMBARZollbeschauToolStripMenuItem.Size = New System.Drawing.Size(262, 22)
+        Me.AMBARZollbeschauToolStripMenuItem.Text = "AMBAR - Zollbeschau"
+        '
         'ContextMenuStrip1
         '
         Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -4888,14 +4929,14 @@ Partial Class frmSendungsdetailsNEU
         '
         Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Image = CType(resources.GetObject("AktuelleSendungAnhängeWählenToolStripMenuItem.Image"), System.Drawing.Image)
         Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Name = "AktuelleSendungAnhängeWählenToolStripMenuItem"
-        Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Size = New System.Drawing.Size(275, 30)
+        Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Size = New System.Drawing.Size(267, 22)
         Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Text = "Aktuelle Sendung (Anhänge wählen)"
         '
         'AlleLEXSendungenLKWToolStripMenuItem
         '
         Me.AlleLEXSendungenLKWToolStripMenuItem.Image = CType(resources.GetObject("AlleLEXSendungenLKWToolStripMenuItem.Image"), System.Drawing.Image)
         Me.AlleLEXSendungenLKWToolStripMenuItem.Name = "AlleLEXSendungenLKWToolStripMenuItem"
-        Me.AlleLEXSendungenLKWToolStripMenuItem.Size = New System.Drawing.Size(275, 30)
+        Me.AlleLEXSendungenLKWToolStripMenuItem.Size = New System.Drawing.Size(267, 22)
         Me.AlleLEXSendungenLKWToolStripMenuItem.Text = "Alle LEX Sendungen (LKW)"
         '
         'ContextMenuStrip2
@@ -4920,11 +4961,41 @@ Partial Class frmSendungsdetailsNEU
         Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(255, 30)
         Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen"
         '
-        'AMBARZollbeschauToolStripMenuItem
+        'lblErr_AvisiererKdNr
         '
-        Me.AMBARZollbeschauToolStripMenuItem.Name = "AMBARZollbeschauToolStripMenuItem"
-        Me.AMBARZollbeschauToolStripMenuItem.Size = New System.Drawing.Size(262, 22)
-        Me.AMBARZollbeschauToolStripMenuItem.Text = "AMBAR - Zollbeschau"
+        Me.lblErr_AvisiererKdNr.AutoSize = True
+        Me.lblErr_AvisiererKdNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold)
+        Me.lblErr_AvisiererKdNr.ForeColor = System.Drawing.Color.Red
+        Me.lblErr_AvisiererKdNr.Location = New System.Drawing.Point(120, 7)
+        Me.lblErr_AvisiererKdNr.Name = "lblErr_AvisiererKdNr"
+        Me.lblErr_AvisiererKdNr.Size = New System.Drawing.Size(143, 13)
+        Me.lblErr_AvisiererKdNr.TabIndex = 18
+        Me.lblErr_AvisiererKdNr.Text = "Avisierer Kdnr angeben!"
+        Me.lblErr_AvisiererKdNr.Visible = False
+        '
+        'lblErr_EmpfKdNr
+        '
+        Me.lblErr_EmpfKdNr.AutoSize = True
+        Me.lblErr_EmpfKdNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold)
+        Me.lblErr_EmpfKdNr.ForeColor = System.Drawing.Color.Red
+        Me.lblErr_EmpfKdNr.Location = New System.Drawing.Point(120, 81)
+        Me.lblErr_EmpfKdNr.Name = "lblErr_EmpfKdNr"
+        Me.lblErr_EmpfKdNr.Size = New System.Drawing.Size(154, 13)
+        Me.lblErr_EmpfKdNr.TabIndex = 95
+        Me.lblErr_EmpfKdNr.Text = "Empfänger Kdnr angeben!"
+        Me.lblErr_EmpfKdNr.Visible = False
+        '
+        'lblErr_FraechterKdNr
+        '
+        Me.lblErr_FraechterKdNr.AutoSize = True
+        Me.lblErr_FraechterKdNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold)
+        Me.lblErr_FraechterKdNr.ForeColor = System.Drawing.Color.Red
+        Me.lblErr_FraechterKdNr.Location = New System.Drawing.Point(117, 156)
+        Me.lblErr_FraechterKdNr.Name = "lblErr_FraechterKdNr"
+        Me.lblErr_FraechterKdNr.Size = New System.Drawing.Size(141, 13)
+        Me.lblErr_FraechterKdNr.TabIndex = 96
+        Me.lblErr_FraechterKdNr.Text = "Frächter Kdnr angeben!"
+        Me.lblErr_FraechterKdNr.Visible = False
         '
         'frmSendungsdetailsNEU
         '
@@ -5377,4 +5448,7 @@ Partial Class frmSendungsdetailsNEU
     Friend WithEvents ToolStripMenuItem26 As ToolStripMenuItem
     Friend WithEvents ToolStripMenuItem27 As ToolStripMenuItem
     Friend WithEvents AMBARZollbeschauToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents lblErr_FraechterKdNr As Label
+    Friend WithEvents lblErr_EmpfKdNr As Label
+    Friend WithEvents lblErr_AvisiererKdNr As Label
 End Class
diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb
index 700cd3c..598a0dc 100644
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -131,6 +131,19 @@ Public Class frmSendungsdetailsNEU
 
     Function VALIDATE_ME() As Boolean
         Dim FilialeAktFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(SENDUNG_LIST(CURRENT_INDEX).FilialenNr,, "")
+        lblErr_AvisiererKdNr.Visible = False
+        lblErr_EmpfKdNr.Visible = False
+        lblErr_FraechterKdNr.Visible = False
+
+        Select Case CInt((SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID))
+            Case <= 0, 10
+            Case Else
+                If CInt(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr, "0")) <= 0 Then lblErr_AvisiererKdNr.Visible = True : Return False
+                If SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr <= 0 Then lblErr_EmpfKdNr.Visible = True : Return False
+                If CInt(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr, "0")) <= 0 Then lblErr_FraechterKdNr.Visible = True : Return False
+        End Select
+        If Not txtAvisierer.checkFirma(FilialeAktFirma) Then MsgBox("Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False
+
 
         If SENDUNG_LIST(CURRENT_INDEX).FilialenNr = 5801 Or (SENDUNG_LIST(CURRENT_INDEX).FilialenNr.ToString = VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER) Then
             'Firma=Cluster, zB Front-Office --> darf alle Firmen auswählen.
@@ -262,10 +275,12 @@ Public Class frmSendungsdetailsNEU
 
             AVISO = AvisoDAL.LesenAviso(AvisoId, "")
 
-            txtWarenwertWaehrung.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land FROM tbl_DY_ZollDE_I0400_Waehrungsliste", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 150, 200)
+            txtWarenwertWaehrung.initSearchBox(Me.FindForm, " [Code] ,[Description] As Land FROM tbl_DY_ZollDE_I0400_Waehrungsliste", {"Code", "Description"}, " (StartDate Is null Or StartDate< GETDATE()) And (EndDate Is null Or EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 150, 200)
 
             If AVISO.Grenzstelle.Replace("???", "") = "" Then
-                lblGrenze.Text = SQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS")
+                'lblGrenze.Text = SQL.getValueTxtBySql("Select basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS")
+                lblGrenze.Text = SQL.getValueTxtBySql("SELECT Code +' - ' + [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
+
             Else
 
 
@@ -422,6 +437,8 @@ Public Class frmSendungsdetailsNEU
             txtFrachtfuehrer.initKdBox(Me, txtFrachtfuehrerKdNr)
 
             AddHandler txtAvisierer.PropertyChanged, Sub()
+                                                         lblErr_AvisiererKdNr.Visible = False
+
                                                          btnAvisierer.BackgroundImage = IIf(txtAvisierer.KdNr > 0, My.Resources.person, My.Resources.personInaktiv)
                                                          SENDUNG_LIST(CURRENT_INDEX).tblSnd_Avisierer = txtAvisierer.Text
                                                          SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr = txtAvisierer.KdNr
@@ -439,6 +456,8 @@ Public Class frmSendungsdetailsNEU
                                                      End Sub
 
             AddHandler txtFrachtfuehrer.PropertyChanged, Sub()
+                                                             lblErr_FraechterKdNr.Visible = False
+
                                                              btnFrachtfuehrer.BackgroundImage = IIf(txtFrachtfuehrer.KdNr > 0, My.Resources.person, My.Resources.personInaktiv)
                                                              SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer = txtFrachtfuehrer.Text
                                                              SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr = txtFrachtfuehrer.KdNr
@@ -457,6 +476,8 @@ Public Class frmSendungsdetailsNEU
 
             txtEmpfaenger.initKdBox(Me, txtEmpfaengerKdNr)
             AddHandler txtEmpfaenger.PropertyChanged, Sub()
+                                                          lblErr_EmpfKdNr.Visible = False
+
                                                           FlatButton1.BackgroundImage = IIf(txtEmpfaenger.KdNr > 0, My.Resources.person, My.Resources.personInaktiv)
                                                           SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger = txtEmpfaenger.Text
                                                           SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr = txtEmpfaenger.KdNr
@@ -4702,7 +4723,9 @@ Public Class frmSendungsdetailsNEU
                     TextHTML &= "<table style=""font-family:Calibri, Arial;font-size:15px;"">"
                     TextHTML &= "<tr><td>ETA:</td><td><b>" & If(AVISO.VoraussichtlichesEintreffen IsNot Nothing, CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString, "") & "</b></td></tr>"
                     TextHTML &= "<tr><td>Truck:</td><td><b>" & AVISO.LKW_Nr & "</b></td></tr>"
-                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") & "</b></td></tr>"
+                    ' TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") & "</b></td></tr>"
+                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ) ", "FMZOLL") & "</b></td></tr>"
+
                     TextHTML &= "</table>"
                     TextHTML &= "<br>"
                     TextHTML &= "<br>"
@@ -4754,7 +4777,9 @@ Public Class frmSendungsdetailsNEU
                     TextHTML &= "<table style=""font-family:Calibri, Arial;font-size:15px;"">"
                     TextHTML &= "<tr><td>ETA:</td><td><b>" & If(AVISO.VoraussichtlichesEintreffen IsNot Nothing, CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString, "") & "</b></td></tr>"
                     TextHTML &= "<tr><td>Truck:</td><td><b>" & AVISO.LKW_Nr & "</b></td></tr>"
-                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") & "</b></td></tr>"
+                    '                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") & "</b></td></tr>"
+                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ) ", "FMZOLL") & "</b></td></tr>"
+
                     TextHTML &= "</table>"
                     TextHTML &= "<br>"
                     TextHTML &= "<br>"
@@ -4806,7 +4831,10 @@ Public Class frmSendungsdetailsNEU
                     TextHTML &= "<table style=""font-family:Calibri, Arial;font-size:15px;"">"
                     TextHTML &= "<tr><td>ETA:</td><td><b>" & If(AVISO.VoraussichtlichesEintreffen IsNot Nothing, CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString, "") & "</b></td></tr>"
                     TextHTML &= "<tr><td>Truck:</td><td><b>" & AVISO.LKW_Nr & "</b></td></tr>"
-                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") & "</b></td></tr>"
+                    '                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") & "</b></td></tr>"
+                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ) ", "FMZOLL") & "</b></td></tr>"
+
+
                     TextHTML &= "</table>"
                     TextHTML &= "<br>"
                     TextHTML &= "<br>"
diff --git a/Aviso/usrCntlEintragAvisoAtilla.vb b/Aviso/usrCntlEintragAvisoAtilla.vb
index 947299f..a989ec9 100644
--- a/Aviso/usrCntlEintragAvisoAtilla.vb
+++ b/Aviso/usrCntlEintragAvisoAtilla.vb
@@ -1,12 +1,19 @@
 Public Class usrCntlEintragAvisoAtilla
 
     Private Sub usrCntlEintragAvisoAtilla_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        sbDurchgangszollstelle1.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
-        sbDurchgangszollstelle2.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
-        sbDurchgangszollstelle3.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
-        sbDurchgangszollstelle4.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
-        sbDurchgangszollstelle5.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
-        sbDurchgangszollstelle6.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+        'sbDurchgangszollstelle1.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+        'sbDurchgangszollstelle2.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+        'sbDurchgangszollstelle3.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+        'sbDurchgangszollstelle4.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+        'sbDurchgangszollstelle5.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+        'sbDurchgangszollstelle6.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+
+        sbDurchgangszollstelle1.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+        sbDurchgangszollstelle2.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+        sbDurchgangszollstelle3.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+        sbDurchgangszollstelle4.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+        sbDurchgangszollstelle5.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+        sbDurchgangszollstelle6.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
 
     End Sub
 
diff --git a/Aviso/usrCntlSND_NCTSGestellungsadresse.vb b/Aviso/usrCntlSND_NCTSGestellungsadresse.vb
index 638f35d..7a92ec1 100644
--- a/Aviso/usrCntlSND_NCTSGestellungsadresse.vb
+++ b/Aviso/usrCntlSND_NCTSGestellungsadresse.vb
@@ -85,7 +85,9 @@
         Else : setValues() : End If
 
 
-        txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+        '   txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+        txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+
         sbT1VerzollungsadresseLand.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code] display   FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200)
         txtT1Verzollungsadresse.initSearchBox(Me.FindForm, " [nga_id] ,[nga_name] as Name,isnull(nga_ort,'') as Ort   FROM tblNCTSGestellungsadressen", {"nga_id", "nga_name", "nga_ort", "nga_strasse", "nga_bestZollst", "nga_EORI"}, " nga_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' ", "nga_id", "nga_id", "Name", "FMZOLL", , 400, 200, {"nga_id"})
     End Sub