neu

2020-05-31 22:24:36 +02:00
parent 2d28680ad0
commit bf4f36a8f2
22 changed files with 3963 additions and 527 deletions
--- a/Aviso.sln
+++ b/Aviso.sln
@@ -23,6 +23,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TELOTEC_Worker_lib", "..\..
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AVISO_INFO", "AVISO_INFO\AVISO_INFO.vbproj", "{A734141E-2C4E-4D70-81E8-A88184282AF5}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "NCTSPartnerWorker", "..\..\ADMIN\ADMIN\cNCTSPartnerWorker\NCTSPartnerWorker.vbproj", "{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -137,6 +139,18 @@ Global
 		{A734141E-2C4E-4D70-81E8-A88184282AF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A734141E-2C4E-4D70-81E8-A88184282AF5}.Release|x86.ActiveCfg = Release|Any CPU
 		{A734141E-2C4E-4D70-81E8-A88184282AF5}.Release|x86.Build.0 = Release|Any CPU
+		{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Debug|x86.Build.0 = Debug|Any CPU
+		{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|x86.ActiveCfg = Release|Any CPU
+		{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/Aviso/Anhänge/frmSendungAnhangImport.vb
+++ b/Aviso/Anhänge/frmSendungAnhangImport.vb
@@ -1231,6 +1231,13 @@ Public Class frmSendungAnhangImport
                    btnSndEdit.PerformClick()
                    e.IsInputKey = True ' Damit Event abgefangen ist, sonst steht "+" im Feld
                End If
+            ElseIf e.Modifiers = Keys.Shift Then ' PDFs durchlaufen
+                If e.KeyCode = Keys.PageDown Then
+                    nextART()
+                End If
+                If e.KeyCode = Keys.PageUp Then
+                    prevART()
+                End If
            Else
                If e.KeyCode = Keys.PageDown Then
                    PdfViewer.GoToPage(PdfViewer.CurrentPageNumber + 1)
@@ -1269,6 +1276,28 @@ Public Class frmSendungAnhangImport
            ctmp = c
        Next
    End Sub
+    Sub nextART()
+        If cboArt.Items Is Nothing Or cboArt.Items.Count = 0 Then Exit Sub
+        Dim bool_next = False
+        If cboArt.SelectedItem Is Nothing Then cboArt.SelectedItem = cboArt.Items(0) : Exit Sub
+
+        If cboArt.Items.Count > cboArt.SelectedIndex + 1 Then
+            cboArt.SelectedItem = cboArt.Items(cboArt.SelectedIndex + 1)
+        End If
+
+    End Sub
+
+    Sub prevART()
+        If cboArt.Items Is Nothing Or cboArt.Items.Count = 0 Then Exit Sub
+
+        If cboArt.SelectedItem Is Nothing Then cboArt.SelectedItem = cboArt.Items(cboArt.Items.Count - 1) : Exit Sub
+
+        If cboArt.SelectedIndex - 1 > 0 Then
+            cboArt.SelectedItem = cboArt.Items(cboArt.SelectedIndex - 1)
+        End If
+
+    End Sub
+

    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
        If txtSeiten.Text = "" Then Exit Sub
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -368,6 +368,12 @@
    <Compile Include="Dokumentenbeschriftung\rptSUBWESTIIAkt.vb">
      <SubType>Component</SubType>
    </Compile>
+    <Compile Include="eAviso\frm_eAVISO.Designer.vb">
+      <DependentUpon>frm_eAVISO.vb</DependentUpon>
+    </Compile>
+    <Compile Include="eAviso\frm_eAVISO.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmAddAktenvermerkShort.Designer.vb">
      <DependentUpon>frmAddAktenvermerkShort.vb</DependentUpon>
    </Compile>
@@ -380,6 +386,12 @@
    <Compile Include="frmAddSendungsvermerkShort.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmAnkunftAendern.Designer.vb">
+      <DependentUpon>frmAnkunftAendern.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmAnkunftAendern.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmAvisoSettings.Designer.vb">
      <DependentUpon>frmAvisoSettings.vb</DependentUpon>
    </Compile>
@@ -777,12 +789,18 @@
    <EmbeddedResource Include="Dokumentenbeschriftung\rptSUBWESTIIAkt.resx">
      <DependentUpon>rptSUBWESTIIAkt.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="eAviso\frm_eAVISO.resx">
+      <DependentUpon>frm_eAVISO.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmAddAktenvermerkShort.resx">
      <DependentUpon>frmAddAktenvermerkShort.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="frmAddSendungsvermerkShort.resx">
      <DependentUpon>frmAddSendungsvermerkShort.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmAnkunftAendern.resx">
+      <DependentUpon>frmAnkunftAendern.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmAvisoSettings.resx">
      <DependentUpon>frmAvisoSettings.vb</DependentUpon>
    </EmbeddedResource>
@@ -991,10 +1009,18 @@
    <None Include="Resources\Versionsinfo.txt" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\..\..\ADMIN\ADMIN\cNCTSPartnerWorker\NCTSPartnerWorker.vbproj">
+      <Project>{2bbd7643-82a1-481f-a014-eb7fcdeed3b5}</Project>
+      <Name>NCTSPartnerWorker</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\ADMIN\ADMIN\DAKOSY_Worker\DAKOSY_Worker_lib.vbproj">
      <Project>{50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f}</Project>
      <Name>DAKOSY_Worker_lib</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj">
+      <Project>{5b947a66-009a-4bb6-b925-f84a01045095}</Project>
+      <Name>TELOTEC_Worker_lib</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\SDL\SDL\SDL\SDL.vbproj">
      <Project>{289bcd77-bc00-4ba1-95ed-a79176d99525}</Project>
      <Name>SDL</Name>
@@ -1066,6 +1092,8 @@
    <None Include="Resources\Logo_blue_globe_Horizontal.jpg" />
    <None Include="Resources\fakturiertInaktiv.jpg" />
    <None Include="Resources\fakturiertAktiv.jpg" />
+    <None Include="Resources\mitarbeiter.png" />
+    <None Include="Resources\mitarbeiter_s.png" />
    <Content Include="Resources\UNISPED.png">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
--- a/Aviso/Classes/cSendungsoptions.vb
+++ b/Aviso/Classes/cSendungsoptions.vb
@@ -182,8 +182,10 @@ Public Class SendungOptions
            End If
        End If

-        VALUES.Avisierer_KdNr = IIf(AVISO.Auftraggeber_KdNr > 0, AVISO.Auftraggeber_KdNr, "")
-        VALUES.Avisierer_Firma = AVISO.Auftraggeber
+        'VALUES.Avisierer_KdNr = IIf(AVISO.Auftraggeber_KdNr > 0, AVISO.Auftraggeber_KdNr, "")
+        'VALUES.Avisierer_Firma = AVISO.Auftraggeber
+        VALUES.Avisierer_KdNr = IIf(SENDUNG.tblSnd_AvisiererKdNr > 0, SENDUNG.tblSnd_AvisiererKdNr, "")
+        VALUES.Avisierer_Firma = SENDUNG.tblSnd_Avisierer

        VALUES.Auftraggeber_KdNr = IIf(SENDUNG.tblSnd_AuftraggeberKdNr > 0, SENDUNG.tblSnd_AuftraggeberKdNr, "")
        VALUES.Auftraggeber_Firma = SENDUNG.tblSnd_Auftraggeber
@@ -212,8 +214,10 @@ Public Class SendungOptions
        VALUES.Absender_KdNr = IIf(SENDUNG.tblSnd_AbsenderKdNr > 0, SENDUNG.tblSnd_AbsenderKdNr, "")
        VALUES.Absender_Firma = SENDUNG.tblSnd_Absender

-        VALUES.Frachtfuehrer_KdNr = IIf(AVISO.Frächter_KdNr > 0, AVISO.Frächter_KdNr, "")
-        VALUES.Frachtfuehrer_Firma = AVISO.Frächter
+        'VALUES.Frachtfuehrer_KdNr = IIf(AVISO.Frächter_KdNr > 0, AVISO.Frächter_KdNr, "")
+        ' VALUES.Frachtfuehrer_Firma = AVISO.Frächter
+        VALUES.Frachtfuehrer_KdNr = IIf(SENDUNG.tblSnd_FrachtfuehrerKdNr > 0, SENDUNG.tblSnd_FrachtfuehrerKdNr, "")
+        VALUES.Frachtfuehrer_Firma = SENDUNG.tblSnd_Frachtfuehrer

        VALUES.LKWKennzeichen = AVISO.LKW_Nr
        VALUES.Warenbezeichnung = SENDUNG.tblSnd_Warenbezeichnung
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("3.4.6.3")>
-<Assembly: AssemblyFileVersion("3.4.6.3")>
+<Assembly: AssemblyVersion("3.4.9.4")>
+<Assembly: AssemblyFileVersion("3.4.9.4")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -202,9 +202,9 @@ Namespace My.Resources
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
        '''</summary>
-        Friend ReadOnly Property asdasd3dsasdasdasd() As String
+        Friend ReadOnly Property asdasdsad2asda1sd1asd2asd1as21d() As String
            Get
-                Return ResourceManager.GetString("asdasd3dsasdasdasd", resourceCulture)
+                Return ResourceManager.GetString("asdasdsad2asda1sd1asd2asd1as21d", resourceCulture)
            End Get
        End Property
        
@@ -728,6 +728,26 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property mitarbeiter() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("mitarbeiter", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property mitarbeiter_s() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("mitarbeiter_s", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Byte[].
        '''</summary>
@@ -1348,7 +1368,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 3.4.6.3 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 3.4.9.4 ähnelt.
        '''</summary>
        Friend ReadOnly Property Version() As String
            Get
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -344,7 +344,7 @@
    <value>..\Resources\akt_ATILLA.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Version" xml:space="preserve">
-    <value>3.4.6.3</value>
+    <value>3.4.9.4</value>
  </data>
  <data name="Verag_AG_Logopng" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -559,7 +559,13 @@
  <data name="fakturiertInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fakturiertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="asdasd3dsasdasdasd" xml:space="preserve">
+  <data name="mitarbeiter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mitarbeiter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="mitarbeiter_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mitarbeiter_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="asdasdsad2asda1sd1asd2asd1as21d" xml:space="preserve">
    <value />
  </data>
 </root>
--- a/Aviso/Resources/mitarbeiter.png
+++ b/Aviso/Resources/mitarbeiter.png
--- a/Aviso/Resources/mitarbeiter_s.png
+++ b/Aviso/Resources/mitarbeiter_s.png
--- a/Aviso/eAviso/frm_eAVISO.Designer.vb
+++ b/Aviso/eAviso/frm_eAVISO.Designer.vb
@@ -0,0 +1,221 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frm_eAVISO
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frm_eAVISO))
+        Me.pnl = New System.Windows.Forms.Panel()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.lbl = New System.Windows.Forms.Label()
+        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.SplitContainer = New System.Windows.Forms.SplitContainer()
+        Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.MyDatagridview2 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.Button12 = New System.Windows.Forms.Button()
+        Me.pnl.SuspendLayout()
+        Me.Panel1.SuspendLayout()
+        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SplitContainer.Panel1.SuspendLayout()
+        Me.SplitContainer.Panel2.SuspendLayout()
+        Me.SplitContainer.SuspendLayout()
+        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.MyDatagridview2, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel2.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'pnl
+        '
+        Me.pnl.Controls.Add(Me.Label1)
+        Me.pnl.Controls.Add(Me.MyComboBox2)
+        Me.pnl.Controls.Add(Me.lbl)
+        Me.pnl.Controls.Add(Me.MyComboBox1)
+        Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
+        Me.pnl.Location = New System.Drawing.Point(0, 0)
+        Me.pnl.Name = "pnl"
+        Me.pnl.Size = New System.Drawing.Size(1145, 77)
+        Me.pnl.TabIndex = 1
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(12, 45)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(74, 13)
+        Me.Label1.TabIndex = 3
+        Me.Label1.Text = "Niederlassung"
+        '
+        'MyComboBox2
+        '
+        Me.MyComboBox2._allowedValuesFreiText = Nothing
+        Me.MyComboBox2._allowFreiText = False
+        Me.MyComboBox2._value = ""
+        Me.MyComboBox2.FormattingEnabled = True
+        Me.MyComboBox2.Location = New System.Drawing.Point(92, 42)
+        Me.MyComboBox2.Name = "MyComboBox2"
+        Me.MyComboBox2.Size = New System.Drawing.Size(121, 21)
+        Me.MyComboBox2.TabIndex = 2
+        '
+        'lbl
+        '
+        Me.lbl.AutoSize = True
+        Me.lbl.Location = New System.Drawing.Point(12, 18)
+        Me.lbl.Name = "lbl"
+        Me.lbl.Size = New System.Drawing.Size(35, 13)
+        Me.lbl.TabIndex = 1
+        Me.lbl.Text = "Firma:"
+        '
+        'MyComboBox1
+        '
+        Me.MyComboBox1._allowedValuesFreiText = Nothing
+        Me.MyComboBox1._allowFreiText = False
+        Me.MyComboBox1._value = ""
+        Me.MyComboBox1.FormattingEnabled = True
+        Me.MyComboBox1.Location = New System.Drawing.Point(92, 15)
+        Me.MyComboBox1.Name = "MyComboBox1"
+        Me.MyComboBox1.Size = New System.Drawing.Size(121, 21)
+        Me.MyComboBox1.TabIndex = 0
+        '
+        'Panel1
+        '
+        Me.Panel1.Controls.Add(Me.SplitContainer)
+        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Panel1.Location = New System.Drawing.Point(0, 77)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(1145, 580)
+        Me.Panel1.TabIndex = 2
+        '
+        'SplitContainer
+        '
+        Me.SplitContainer.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SplitContainer.Location = New System.Drawing.Point(0, 0)
+        Me.SplitContainer.Name = "SplitContainer"
+        '
+        'SplitContainer.Panel1
+        '
+        Me.SplitContainer.Panel1.Controls.Add(Me.MyDatagridview1)
+        '
+        'SplitContainer.Panel2
+        '
+        Me.SplitContainer.Panel2.Controls.Add(Me.MyDatagridview2)
+        Me.SplitContainer.Size = New System.Drawing.Size(1145, 580)
+        Me.SplitContainer.SplitterDistance = 541
+        Me.SplitContainer.TabIndex = 2
+        '
+        'MyDatagridview1
+        '
+        Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1
+        Me.MyDatagridview1.AllowUserToAddRows = False
+        Me.MyDatagridview1.AllowUserToDeleteRows = False
+        Me.MyDatagridview1.AllowUserToResizeRows = False
+        Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.MyDatagridview1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MyDatagridview1.Location = New System.Drawing.Point(0, 0)
+        Me.MyDatagridview1.Name = "MyDatagridview1"
+        Me.MyDatagridview1.ReadOnly = True
+        Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.MyDatagridview1.Size = New System.Drawing.Size(541, 580)
+        Me.MyDatagridview1.TabIndex = 1
+        '
+        'MyDatagridview2
+        '
+        Me.MyDatagridview2.AKTUALISIERUNGS_INTERVALL = -1
+        Me.MyDatagridview2.AllowUserToAddRows = False
+        Me.MyDatagridview2.AllowUserToDeleteRows = False
+        Me.MyDatagridview2.AllowUserToResizeRows = False
+        Me.MyDatagridview2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.MyDatagridview2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MyDatagridview2.Location = New System.Drawing.Point(0, 0)
+        Me.MyDatagridview2.Name = "MyDatagridview2"
+        Me.MyDatagridview2.ReadOnly = True
+        Me.MyDatagridview2.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.MyDatagridview2.Size = New System.Drawing.Size(600, 580)
+        Me.MyDatagridview2.TabIndex = 2
+        '
+        'Panel2
+        '
+        Me.Panel2.Controls.Add(Me.Button12)
+        Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.Panel2.Location = New System.Drawing.Point(0, 657)
+        Me.Panel2.Name = "Panel2"
+        Me.Panel2.Size = New System.Drawing.Size(1145, 100)
+        Me.Panel2.TabIndex = 2
+        '
+        'Button12
+        '
+        Me.Button12.AutoSize = True
+        Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button12.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button12.ForeColor = System.Drawing.Color.Black
+        Me.Button12.Image = Global.AVISO.My.Resources.Resources.lorry
+        Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button12.Location = New System.Drawing.Point(777, 35)
+        Me.Button12.Name = "Button12"
+        Me.Button12.Size = New System.Drawing.Size(204, 53)
+        Me.Button12.TabIndex = 2
+        Me.Button12.Text = "AVISO erstellen"
+        Me.Button12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button12.UseVisualStyleBackColor = True
+        '
+        'frm_eAVISO
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.BackColor = System.Drawing.Color.White
+        Me.ClientSize = New System.Drawing.Size(1145, 757)
+        Me.Controls.Add(Me.Panel1)
+        Me.Controls.Add(Me.pnl)
+        Me.Controls.Add(Me.Panel2)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frm_eAVISO"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "eAVISO"
+        Me.pnl.ResumeLayout(False)
+        Me.pnl.PerformLayout()
+        Me.Panel1.ResumeLayout(False)
+        Me.SplitContainer.Panel1.ResumeLayout(False)
+        Me.SplitContainer.Panel2.ResumeLayout(False)
+        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainer.ResumeLayout(False)
+        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.MyDatagridview2, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Panel2.ResumeLayout(False)
+        Me.Panel2.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents pnl As Panel
+    Friend WithEvents Label1 As Label
+    Friend WithEvents MyComboBox2 As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents lbl As Label
+    Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents SplitContainer As SplitContainer
+    Friend WithEvents MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents Panel2 As Panel
+    Friend WithEvents Button12 As Button
+    Friend WithEvents MyDatagridview2 As VERAG_PROG_ALLGEMEIN.MyDatagridview
+End Class
--- a/Aviso/eAviso/frm_eAVISO.resx
+++ b/Aviso/eAviso/frm_eAVISO.resx
--- a/Aviso/eAviso/frm_eAVISO.vb
+++ b/Aviso/eAviso/frm_eAVISO.vb
@@ -0,0 +1,217 @@
+Public Class frm_eAVISO
+
+    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+
+    Sub intiDGV_Vorpapier()
+
+        With MyDatagridview1
+            .DataSource = SQL.loadDgvBySql("SELECT [ncts_Id],[ncts_Partnersystem],[ncts_dyaArt],[ncts_MRN],[ncts_Erstellung],[ncts_Befoerderungsmittel_KennzeichenAbgang] Kennzeichen,[ncts_SumA_Befoerderer_Name]Befoerderer   FROM [tblNCTS_TR]", "FMZOLL")
+
+            If .Columns.Count = 0 Then Exit Sub
+
+            .Columns("ncts_Id").Visible = False
+            '  .Columns("ncts_Erstellung").Visible = False
+
+            .Columns("ncts_Partnersystem").HeaderText = "Partner"
+            .Columns("ncts_Partnersystem").Width = 60
+
+            .Columns("ncts_dyaArt").HeaderText = "Art"
+            .Columns("ncts_dyaArt").Width = 30
+
+            .Columns("ncts_MRN").HeaderText = "Nr"
+            .Columns("ncts_MRN").Width = 150
+
+            .Columns("Kennzeichen").HeaderText = "Kennzeichen"
+            .Columns("Kennzeichen").Width = 80
+
+            .Columns("ncts_Erstellung").HeaderText = "Datum"
+            .Columns("ncts_Erstellung").Width = 80
+
+
+            .Columns("Befoerderer").HeaderText = "Befoerderer"
+            .Columns("Befoerderer").MinimumWidth = 30
+            .Columns("Befoerderer").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+
+        End With
+    End Sub
+
+
+    Sub intiDGV_Shipments(Partnersystem, VorpapierArt, VorpapierNr)
+
+        With MyDatagridview2
+            .DataSource = SQL.loadDgvBySql("SELECT [shTr_id],[TotPackage],[TotGrossWeight],[InvoiceAmount],[InvoiceCurrency],(SELECT TOP 1 [Name1] FROM tblTR_Shipment_Adressen WHERE [shTrAd_ShTrId]=[shTr_id] and AddressCode='CN')Empfaenger FROM [tblTR_Shipment] where shTr_Partnersystem='ATEZ' AND [PrePaperCode]='" & VorpapierArt & "' and  [PrePaperNr]='" & VorpapierNr & "'", "FMZOLL")
+
+            If .Columns.Count = 0 Then Exit Sub
+
+            .Columns("shTr_id").Visible = False
+
+            .Columns("TotPackage").HeaderText = "Packstücke"
+            .Columns("TotPackage").Width = 60
+
+            .Columns("TotGrossWeight").HeaderText = "Gewicht"
+            .Columns("TotGrossWeight").Width = 80
+
+            .Columns("InvoiceAmount").HeaderText = "RgBetrag"
+            .Columns("InvoiceAmount").Width = 100
+
+            .Columns("InvoiceCurrency").HeaderText = "RgWähr"
+            .Columns("InvoiceCurrency").Width = 50
+
+            .Columns("Empfaenger").HeaderText = "Empfänger"
+            .Columns("Empfaenger").MinimumWidth = 30
+            .Columns("Empfaenger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+
+
+            '.Columns("Befoerderer").HeaderText = "Befoerderer"
+            '.Columns("Befoerderer").MinimumWidth = 30
+            '.Columns("Befoerderer").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+
+        End With
+
+    End Sub
+    Private Sub frm_eAVISO_Load(sender As Object, e As EventArgs) Handles Me.Load
+        intiDGV_Vorpapier()
+    End Sub
+
+
+
+    Private Sub MyDatagridview1_SelectionChanged(sender As Object, e As EventArgs) Handles MyDatagridview1.SelectionChanged
+        MyDatagridview2.Columns.Clear()
+        If MyDatagridview1.SelectedRows.Count > 0 Then
+            Dim r As DataGridViewRow = MyDatagridview1.SelectedRows(0)
+            intiDGV_Shipments(r.Cells("ncts_Partnersystem").Value, r.Cells("ncts_dyaArt").Value, r.Cells("ncts_MRN").Value)
+        End If
+
+    End Sub
+
+    Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click
+        If MyDatagridview1.SelectedRows.Count > 0 Then
+            Dim r As DataGridViewRow = MyDatagridview1.SelectedRows(0)
+
+
+            Dim AvisoDAL = New VERAG_PROG_ALLGEMEIN.cAvisoDAL
+
+            Dim AVISO As New VERAG_PROG_ALLGEMEIN.cAviso
+            Dim PREPAPER As New cNCTSPartnerWorker.cNCTS_TR(r.Cells("ncts_Id").Value)
+
+            AVISO.LKW_Nr = PREPAPER.ncts_Befoerderungsmittel_KennzeichenAbgang
+            AVISO.LKW_Nationalitaet = PREPAPER.ncts_Befoerderungsmittel_SttaszugehoerigkeitAbgangCode
+
+
+
+            AVISO.Datum = Now
+            AVISO.VoraussichtlichesEintreffen = Nothing
+            AVISO.Telefonisch = "digital"
+            'AVISO.Telefonisch As String
+            'AVISO.Änderungen As String
+            'AVISO.Info As String
+            AVISO.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Erfasst
+            AVISO.Ankunft = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.LeerDatum
+            AVISO.Freigabe = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.LeerDatum
+            AVISO.Vorbereitet = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.LeerDatum
+            AVISO.Vorgeschrieben = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.LeerDatum
+            AVISO.Dauer = 0
+            AVISO.Auftraggeber = "X"
+            'AVISO.Auftraggeber_KdNr As String = ""
+            AVISO.Frächter = "X"
+            'AVISO.Frächter_KdNr As String = ""
+            AVISO.Info = ""
+            AVISO.letzterMitarbeiter = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter
+            AVISO.TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
+            AVISO.LetzterMitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
+            'AVISO.Ankunft As Date
+            'AVISO.Freigabe As Date
+            'AVISO.Vorbereitet As Date
+            ' AVISO.Vorgeschrieben As Date
+            ' AVISO.Dauer As Integer
+            AVISO.AvisoEingang = PREPAPER.ncts_Erstellung
+            AVISO.Grenzstelle = "" '--> BEST.ZSTR
+            AVISO.LKW_fertig = False
+            'AVISO.Handling As Boolean = False
+            'AVISO.AvisoTVHinweis As String = ""
+            'AVISO.Sendungen_Gesamtanzahl As Integer = 0
+            'AVISO.Sammelakt As Boolean = False
+            'AVISO.Buero As String = ""
+            AVISO.ImEx = "IMPORT"
+            'AVISO.Abgeschlossen As Boolean = False
+            AVISO.FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            AVISO.Cluster = If(VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER, "")
+
+            'AVISO.Durchgangszollstelle1 As Object = Nothing
+            'AVISO.Durchgangszollstelle2 As Object = Nothing
+            'AVISO.Durchgangszollstelle3 As Object = Nothing
+            'AVISO.Durchgangszollstelle4 As Object = Nothing
+            'AVISO.Durchgangszollstelle5 As Object = Nothing
+            ''AVISO.Durchgangszollstelle6 As Object = Nothing
+            'AVISO.Ausgangszollstelle As Object = Nothing
+            'AVISO.Zollstelle As Object = Nothing--> ???
+
+
+            'AVISO.TransportTemperatur As Object = Nothing
+            'AVISO.Zugmaschine As Object = Nothing
+            'AVISO.FahrerHandy As Object = Nothing
+            'AVISO.LKW_Nationalitaet As Object = Nothing
+            'AVISO.DakosyRef As Object = Nothing
+            'AVISO.TeamId As Object = Nothing
+            'AVISO.Cluster As Object = Nothing --> ???
+            'AVISO.Freigabe_Info As String = ""
+
+
+            'AVISO.KdAuftragsNr_Avisierer As Object = Nothing
+            '     AVISO.KdAuftragsNr_Frachtfuehrer As Object = Nothing
+            '     AVISO.FreigabeFiliale As Object = Nothing
+            'If PREPAPER.ncts_Erstellung IsNot Nothing Then
+            'AVISO.VoraussichtlichesEintreffen = PREPAPER.ncts_Erstellung.AddDays(4) ??????????????
+            ' End If
+
+            'AVISO.VORSYSTEM As Object = Nothing
+            AVISO.Änderungen = "Digitales Aviso: Neuanlage von " & AVISO.letzterMitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")
+            Dim aendart = "Neuanlage"
+            Dim aendText = "Neuanlage von " & AVISO.letzterMitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")
+
+
+
+            Dim tmpId = AvisoDAL.SpeichernAviso(AVISO)
+            AVISO.AvisoID = tmpId
+            AvisoDAL.addAenderung(tmpId, aendart, aendText)
+
+
+            Dim cnt = 1
+            If tmpId > 0 Then
+
+                For Each SHIPMENT In PREPAPER.GET_SHIPMENTS(r.Cells("ncts_Partnersystem").Value, r.Cells("ncts_dyaArt").Value, r.Cells("ncts_MRN").Value)
+
+                    Dim SENDUNG As New VERAG_PROG_ALLGEMEIN.cSendungen(tmpId, cnt)
+
+                    If SENDUNG IsNot Nothing Then
+
+                        SENDUNG.tblSnd_Colli = SHIPMENT.EZA.TotPackage
+                        SENDUNG.tblSnd_Gewicht = SHIPMENT.EZA.TotGrossWeight
+                        'SENDUNG.tblSnd_Warenbezeichnung = SHIPMENT.
+
+                        If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then
+                            SENDUNG.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
+                        Else
+                            SENDUNG.tblSnd_QS_MA = Nothing
+                        End If
+
+                        SENDUNG.LetzterMitarbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
+                        SENDUNG.LetzterMitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
+
+                        SENDUNG.VORSYSTEM = SHIPMENT.shTr_Partnersystem
+                        SENDUNG.VORSYSTEM_Id = SHIPMENT.shTr_id
+                        SENDUNG.tblSnd_anzahlHandling = 0
+
+
+                        SENDUNG.SAVE()
+                        cnt += 1
+                    End If
+                Next
+
+            End If
+
+        End If
+
+
+    End Sub
+End Class
--- a/Aviso/frmAnkunftAendern.Designer.vb
+++ b/Aviso/frmAnkunftAendern.Designer.vb
@@ -0,0 +1,139 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmAnkunftAendern
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAnkunftAendern))
+        Me.pnl = New System.Windows.Forms.Panel()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.lbl = New System.Windows.Forms.Label()
+        Me.btnAktGrenze = New System.Windows.Forms.Button()
+        Me.btnNeuGrenze = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.pnl.SuspendLayout()
+        Me.Panel1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'pnl
+        '
+        Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnl.Controls.Add(Me.btnNeuGrenze)
+        Me.pnl.Controls.Add(Me.Label1)
+        Me.pnl.Controls.Add(Me.btnAktGrenze)
+        Me.pnl.Controls.Add(Me.lbl)
+        Me.pnl.Controls.Add(Me.Panel1)
+        Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.pnl.Location = New System.Drawing.Point(0, 0)
+        Me.pnl.Name = "pnl"
+        Me.pnl.Size = New System.Drawing.Size(482, 152)
+        Me.pnl.TabIndex = 0
+        '
+        'Panel1
+        '
+        Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Panel1.Controls.Add(Me.Label2)
+        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
+        Me.Panel1.Location = New System.Drawing.Point(0, 0)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(480, 29)
+        Me.Panel1.TabIndex = 0
+        '
+        'lbl
+        '
+        Me.lbl.AutoSize = True
+        Me.lbl.Location = New System.Drawing.Point(11, 47)
+        Me.lbl.Name = "lbl"
+        Me.lbl.Size = New System.Drawing.Size(129, 13)
+        Me.lbl.TabIndex = 1
+        Me.lbl.Text = "Aktuelle Grenze behalten:"
+        '
+        'btnAktGrenze
+        '
+        Me.btnAktGrenze.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAktGrenze.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold)
+        Me.btnAktGrenze.Location = New System.Drawing.Point(14, 63)
+        Me.btnAktGrenze.Name = "btnAktGrenze"
+        Me.btnAktGrenze.Size = New System.Drawing.Size(204, 64)
+        Me.btnAktGrenze.TabIndex = 2
+        Me.btnAktGrenze.Text = "SUB"
+        Me.btnAktGrenze.UseVisualStyleBackColor = True
+        '
+        'btnNeuGrenze
+        '
+        Me.btnNeuGrenze.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnNeuGrenze.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold)
+        Me.btnNeuGrenze.Location = New System.Drawing.Point(259, 63)
+        Me.btnNeuGrenze.Name = "btnNeuGrenze"
+        Me.btnNeuGrenze.Size = New System.Drawing.Size(204, 64)
+        Me.btnNeuGrenze.TabIndex = 4
+        Me.btnNeuGrenze.Text = "SUB"
+        Me.btnNeuGrenze.UseVisualStyleBackColor = True
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(256, 47)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(64, 13)
+        Me.Label1.TabIndex = 3
+        Me.Label1.Text = "Neu setzen:"
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.ForeColor = System.Drawing.Color.White
+        Me.Label2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Label2.Location = New System.Drawing.Point(11, 8)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(279, 13)
+        Me.Label2.TabIndex = 2
+        Me.Label2.Text = "Grenzstelle stimmt nicht mit der Grenzstelle im Akt überein:"
+        '
+        'frmAnkunftAendern
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.BackColor = System.Drawing.Color.White
+        Me.ClientSize = New System.Drawing.Size(482, 152)
+        Me.Controls.Add(Me.pnl)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frmAnkunftAendern"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "frmAnkunftAendern"
+        Me.pnl.ResumeLayout(False)
+        Me.pnl.PerformLayout()
+        Me.Panel1.ResumeLayout(False)
+        Me.Panel1.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents pnl As Panel
+    Friend WithEvents btnNeuGrenze As Button
+    Friend WithEvents Label1 As Label
+    Friend WithEvents btnAktGrenze As Button
+    Friend WithEvents lbl As Label
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents Label2 As Label
+End Class
--- a/Aviso/frmAnkunftAendern.resx
+++ b/Aviso/frmAnkunftAendern.resx
--- a/Aviso/frmAnkunftAendern.vb
+++ b/Aviso/frmAnkunftAendern.vb
@@ -0,0 +1,50 @@
+Public Class frmAnkunftAendern
+
+    Public AVISO As VERAG_PROG_ALLGEMEIN.cAviso = Nothing
+    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+
+    Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso)
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+        Me.AVISO = AVISO
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+
+    End Sub
+    Private Sub btnAktGrenze_Click(sender As Object, e As EventArgs) Handles btnAktGrenze.Click
+        Me.Close()
+    End Sub
+
+    Private Sub btnNeuGrenze_Click(sender As Object, e As EventArgs) Handles btnNeuGrenze.Click
+        AVISO.Grenzstelle = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
+        Me.Close()
+    End Sub
+
+    Private Sub frmAnkunftAendern_Load(sender As Object, e As EventArgs) Handles Me.Load
+        MsgBox(AVISO.Grenzstelle)
+        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")
+            Else
+                btnAktGrenze.Text = AVISO.Grenzstelle
+            End If
+        Else
+            btnAktGrenze.Text = getGrenzeName(AVISO.Grenzstelle)
+        End If
+        btnAktGrenze.Tag = AVISO.Grenzstelle
+        btnNeuGrenze.Text = getGrenzeName(VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG)
+    End Sub
+
+    Function getGrenzeName(Grenzstelle) As String
+        Select Case Grenzstelle
+            Case "SUB" : Return "SUBEN"
+            Case "SBG" : Return "BAD REICHENHALL"
+            Case "WAI" : Return "WAIDHAUS"
+            Case "NKD" : Return "NICKELSDORF"
+            Case "NEU" : Return "NEUHAUS"
+            Case "SFD" : Return "SPIELFELD"
+            Case Else : Return Grenzstelle
+        End Select
+    End Function
+End Class
--- a/Aviso/frmEintragAviso.vb
+++ b/Aviso/frmEintragAviso.vb
@@ -1534,13 +1534,16 @@ Public Class frmEintragAviso
        ' cboImEx.Visible = (cboGrenzstelle.Text = "WAI" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED")
        Label1.Visible = (cboGrenzstelle.Text = "WAI" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED")

-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
-            If cboGrenzstelle.Text = "???" 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.Visible = True
-                lblZA.Visible = True
-            End If
-        End If
+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Case "VERAG", "FRONTOFFICE", "UNISPED"
+
+                If cboGrenzstelle.Text = "???" 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.Visible = True
+                    lblZA.Visible = True
+
+                End If
+        End Select
    End Sub

    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles btnFraechterKd.Click
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -24,12 +24,12 @@ Partial Class frmHauptfenster
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster))
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem()
        Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -89,6 +89,7 @@ Partial Class frmHauptfenster
        Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem()
        Me.BürgschaftenExcelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem10 = New System.Windows.Forms.ToolStripMenuItem()
        Me.TICKETWaidhausToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator()
@@ -149,6 +150,7 @@ Partial Class frmHauptfenster
        Me.Label6 = New System.Windows.Forms.Label()
        Me.txtSuche = New System.Windows.Forms.TextBox()
        Me.Top = New System.Windows.Forms.Panel()
+        Me.btnMAVerzeichnis = New System.Windows.Forms.Button()
        Me.Button9 = New System.Windows.Forms.Button()
        Me.Button5 = New System.Windows.Forms.Button()
        Me.btnFakturierung = New System.Windows.Forms.Button()
@@ -190,6 +192,8 @@ Partial Class frmHauptfenster
        Me.lblVersion = New System.Windows.Forms.Label()
        Me.pic = New System.Windows.Forms.PictureBox()
        Me.pnlLinksOben = New System.Windows.Forms.Panel()
+        Me.Label22 = New System.Windows.Forms.Label()
+        Me.Button12 = New System.Windows.Forms.Button()
        Me.btnNeu = New System.Windows.Forms.Button()
        Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
@@ -276,7 +280,6 @@ Partial Class frmHauptfenster
        Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
        Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
-        Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
        Me.Top.SuspendLayout()
@@ -608,33 +611,33 @@ Partial Class frmHauptfenster
        'GenerelleGestellungenDurchsuchenToolStripMenuItem
        '
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem"
-        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(354, 22)
+        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen"
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False
        '
        'KundenVonFremdenSpeditionenToolStripMenuItem
        '
        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem"
-        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(354, 22)
+        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen"
        '
        'KundenverwaltungToolStripMenuItem
        '
        Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem"
-        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(354, 22)
+        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung"
        '
        'MDMParkplatzkartenToolStripMenuItem
        '
        Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem"
-        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(354, 22)
+        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten"
        '
        'SMSSendenToolStripMenuItem
        '
        Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem})
        Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem"
-        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(354, 22)
+        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.SMSSendenToolStripMenuItem.Text = "SMS"
        '
        'NeueSMSSendenToolStripMenuItem
@@ -652,63 +655,70 @@ Partial Class frmHauptfenster
        'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem
        '
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem"
-        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(354, 22)
+        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen"
        '
        'ToolStripSeparator12
        '
        Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
-        Me.ToolStripSeparator12.Size = New System.Drawing.Size(351, 6)
+        Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6)
        '
        'ToolStripMenuItem3
        '
        Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
-        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(354, 22)
+        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem3.Text = "Bürgschaften Excel"
        '
        'ToolStripMenuItem4
        '
        Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
-        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(354, 22)
+        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel"
        Me.ToolStripMenuItem4.Visible = False
        '
        'ToolStripMenuItem5
        '
        Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(354, 22)
+        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem5.Text = "AT | Gesamtsicherheit VERAG AG - Excel"
        Me.ToolStripMenuItem5.Visible = False
        '
        'BürgschaftenExcelToolStripMenuItem
        '
        Me.BürgschaftenExcelToolStripMenuItem.Name = "BürgschaftenExcelToolStripMenuItem"
-        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(354, 22)
+        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel"
        Me.BürgschaftenExcelToolStripMenuItem.Visible = False
        '
+        'ToolStripMenuItem6
+        '
+        Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
+        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel"
+        Me.ToolStripMenuItem6.Visible = False
+        '
        'ToolStripMenuItem10
        '
        Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
-        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(354, 22)
+        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem10.Text = "TICKET Parkplatz"
        '
        'TICKETWaidhausToolStripMenuItem
        '
        Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem"
-        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(354, 22)
+        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz"
        '
        'ToolStripSeparator10
        '
        Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
-        Me.ToolStripSeparator10.Size = New System.Drawing.Size(351, 6)
+        Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6)
        '
        'DAKOSYToolStripMenuItem
        '
        Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem})
        Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem"
-        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(354, 22)
+        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.DAKOSYToolStripMenuItem.Text = "DAKOSY"
        '
        'StammreferenzenVerwaltenToolStripMenuItem
@@ -720,24 +730,24 @@ Partial Class frmHauptfenster
        'ToolStripSeparator11
        '
        Me.ToolStripSeparator11.Name = "ToolStripSeparator11"
-        Me.ToolStripSeparator11.Size = New System.Drawing.Size(351, 6)
+        Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6)
        '
        'SDLAbholaufträgeToolStripMenuItem
        '
        Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem"
-        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(354, 22)
+        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge"
        '
        'ToolStripMenuItem13
        '
        Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13"
-        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(354, 22)
+        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)"
        '
        'VorauskassenToolStripMenuItem
        '
        Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem"
-        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(354, 22)
+        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen"
        '
        'StatistikToolStripMenuItem
@@ -1090,6 +1100,7 @@ Partial Class frmHauptfenster
        'Top
        '
        Me.Top.BackColor = System.Drawing.Color.White
+        Me.Top.Controls.Add(Me.btnMAVerzeichnis)
        Me.Top.Controls.Add(Me.Button9)
        Me.Top.Controls.Add(Me.Button5)
        Me.Top.Controls.Add(Me.btnFakturierung)
@@ -1108,6 +1119,24 @@ Partial Class frmHauptfenster
        Me.Top.Size = New System.Drawing.Size(1372, 52)
        Me.Top.TabIndex = 6
        '
+        'btnMAVerzeichnis
+        '
+        Me.btnMAVerzeichnis.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnMAVerzeichnis.Cursor = System.Windows.Forms.Cursors.Default
+        Me.btnMAVerzeichnis.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnMAVerzeichnis.ForeColor = System.Drawing.Color.Black
+        Me.btnMAVerzeichnis.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s
+        Me.btnMAVerzeichnis.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnMAVerzeichnis.Location = New System.Drawing.Point(1025, 6)
+        Me.btnMAVerzeichnis.Name = "btnMAVerzeichnis"
+        Me.btnMAVerzeichnis.Size = New System.Drawing.Size(107, 39)
+        Me.btnMAVerzeichnis.TabIndex = 13
+        Me.btnMAVerzeichnis.TabStop = False
+        Me.btnMAVerzeichnis.Text = "Mitarbeiter Verzeichnis"
+        Me.btnMAVerzeichnis.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnMAVerzeichnis.UseVisualStyleBackColor = True
+        Me.btnMAVerzeichnis.Visible = False
+        '
        'Button9
        '
        Me.Button9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1532,9 +1561,9 @@ Partial Class frmHauptfenster
        Me.pnlLinks.Controls.Add(Me.lblVersion)
        Me.pnlLinks.Controls.Add(Me.pic)
        Me.pnlLinks.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pnlLinks.Location = New System.Drawing.Point(0, 43)
+        Me.pnlLinks.Location = New System.Drawing.Point(0, 86)
        Me.pnlLinks.Name = "pnlLinks"
-        Me.pnlLinks.Size = New System.Drawing.Size(234, 255)
+        Me.pnlLinks.Size = New System.Drawing.Size(234, 212)
        Me.pnlLinks.TabIndex = 0
        '
        'Panel2
@@ -1547,7 +1576,7 @@ Partial Class frmHauptfenster
        Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top
        Me.Panel2.Location = New System.Drawing.Point(0, 0)
        Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(234, 169)
+        Me.Panel2.Size = New System.Drawing.Size(234, 111)
        Me.Panel2.TabIndex = 10
        '
        'Label7
@@ -1567,7 +1596,7 @@ Partial Class frmHauptfenster
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblErrVermerk.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.lblErrVermerk.ForeColor = System.Drawing.Color.Red
-        Me.lblErrVermerk.Location = New System.Drawing.Point(12, 216)
+        Me.lblErrVermerk.Location = New System.Drawing.Point(12, 158)
        Me.lblErrVermerk.Name = "lblErrVermerk"
        Me.lblErrVermerk.Size = New System.Drawing.Size(208, 27)
        Me.lblErrVermerk.TabIndex = 1
@@ -1592,7 +1621,7 @@ Partial Class frmHauptfenster
        Me.Label20.BackColor = System.Drawing.Color.Red
        Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label20.ForeColor = System.Drawing.Color.White
-        Me.Label20.Location = New System.Drawing.Point(49, 223)
+        Me.Label20.Location = New System.Drawing.Point(49, 180)
        Me.Label20.Name = "Label20"
        Me.Label20.Size = New System.Drawing.Size(28, 19)
        Me.Label20.TabIndex = 9
@@ -1606,7 +1635,7 @@ Partial Class frmHauptfenster
        Me.picAVISOMessenger.BackgroundImage = Global.AVISO.My.Resources.Resources.aviso_messenger
        Me.picAVISOMessenger.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.picAVISOMessenger.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.picAVISOMessenger.Location = New System.Drawing.Point(1, 175)
+        Me.picAVISOMessenger.Location = New System.Drawing.Point(1, 132)
        Me.picAVISOMessenger.Name = "picAVISOMessenger"
        Me.picAVISOMessenger.Size = New System.Drawing.Size(59, 55)
        Me.picAVISOMessenger.TabIndex = 7
@@ -1619,7 +1648,7 @@ Partial Class frmHauptfenster
        Me.lblVersion.AutoSize = True
        Me.lblVersion.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lblVersion.ForeColor = System.Drawing.Color.Black
-        Me.lblVersion.Location = New System.Drawing.Point(3, 242)
+        Me.lblVersion.Location = New System.Drawing.Point(3, 199)
        Me.lblVersion.Name = "lblVersion"
        Me.lblVersion.Size = New System.Drawing.Size(47, 13)
        Me.lblVersion.TabIndex = 6
@@ -1629,7 +1658,7 @@ Partial Class frmHauptfenster
        '
        Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.disconnect
        Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.pic.Location = New System.Drawing.Point(169, 192)
+        Me.pic.Location = New System.Drawing.Point(170, 117)
        Me.pic.Name = "pic"
        Me.pic.Size = New System.Drawing.Size(59, 50)
        Me.pic.TabIndex = 5
@@ -1638,13 +1667,44 @@ Partial Class frmHauptfenster
        '
        'pnlLinksOben
        '
+        Me.pnlLinksOben.Controls.Add(Me.Label22)
+        Me.pnlLinksOben.Controls.Add(Me.Button12)
        Me.pnlLinksOben.Controls.Add(Me.btnNeu)
        Me.pnlLinksOben.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnlLinksOben.Location = New System.Drawing.Point(0, 0)
        Me.pnlLinksOben.Name = "pnlLinksOben"
-        Me.pnlLinksOben.Size = New System.Drawing.Size(234, 43)
+        Me.pnlLinksOben.Size = New System.Drawing.Size(234, 86)
        Me.pnlLinksOben.TabIndex = 1
        '
+        'Label22
+        '
+        Me.Label22.BackColor = System.Drawing.Color.Red
+        Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label22.ForeColor = System.Drawing.Color.White
+        Me.Label22.Location = New System.Drawing.Point(92, 53)
+        Me.Label22.Name = "Label22"
+        Me.Label22.Size = New System.Drawing.Size(28, 19)
+        Me.Label22.TabIndex = 10
+        Me.Label22.Text = "99"
+        Me.Label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Me.Label22.Visible = False
+        '
+        'Button12
+        '
+        Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button12.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button12.ForeColor = System.Drawing.Color.Black
+        Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button12.Location = New System.Drawing.Point(3, 44)
+        Me.Button12.MaximumSize = New System.Drawing.Size(121, 34)
+        Me.Button12.Name = "Button12"
+        Me.Button12.Size = New System.Drawing.Size(121, 34)
+        Me.Button12.TabIndex = 1
+        Me.Button12.Text = "eAVISO"
+        Me.Button12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button12.UseVisualStyleBackColor = True
+        Me.Button12.Visible = False
+        '
        'btnNeu
        '
        Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -1718,8 +1778,8 @@ Partial Class frmHauptfenster
        Me.gridMyAviso.AllowUserToDeleteRows = False
        Me.gridMyAviso.AllowUserToOrderColumns = True
        Me.gridMyAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.Azure
-        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
+        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
        Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White
        Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Top
@@ -2089,45 +2149,45 @@ Partial Class frmHauptfenster
        Me.gridAviso.AllowUserToAddRows = False
        Me.gridAviso.AllowUserToDeleteRows = False
        Me.gridAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle8.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
        Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray
        Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable
-        DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle9.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle3
        Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle10
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle4
        Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill
        Me.gridAviso.Location = New System.Drawing.Point(0, 208)
        Me.gridAviso.MultiSelect = False
        Me.gridAviso.Name = "gridAviso"
        Me.gridAviso.ReadOnly = True
-        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle11
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle5
        Me.gridAviso.RowHeadersVisible = False
        Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle12
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle6
        Me.gridAviso.RowTemplate.ReadOnly = True
        Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
        Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -2737,13 +2797,6 @@ Partial Class frmHauptfenster
        Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
        Me.UsrCntlTestsystem1.TabIndex = 8
        '
-        'ToolStripMenuItem6
-        '
-        Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
-        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22)
-        Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel"
-        Me.ToolStripMenuItem6.Visible = False
-        '
        'frmHauptfenster
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3063,4 +3116,7 @@ Partial Class frmHauptfenster
    Friend WithEvents Button10 As Button
    Friend WithEvents Panel2 As Panel
    Friend WithEvents ToolStripMenuItem6 As ToolStripMenuItem
+    Friend WithEvents btnMAVerzeichnis As Button
+    Friend WithEvents Label22 As Label
+    Friend WithEvents Button12 As Button
 End Class
--- a/Aviso/frmHauptfenster.resx
+++ b/Aviso/frmHauptfenster.resx
@@ -225,9 +225,6 @@
        pOTzPwAAAABJRU5ErkJggg==
 </value>
  </data>
-  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>598, 17</value>
-  </metadata>
  <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>697, 17</value>
  </metadata>
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -262,6 +262,9 @@ Public Class frmHauptfenster
            AdministrationToolStripMenuItem.Visible = True
            lblMitarbeiter.Text += " (Admin)"

+            Button12.Visible = True
+            Label22.Visible = True
+            Label22.Text = "XX"
        End If
        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MESSENGER", "AVISO") Then
            picAVISOMessenger.Visible = True
@@ -274,6 +277,10 @@ Public Class frmHauptfenster
            btnRg.Visible = True
        End If

+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MITARBEITER_VERZEICHNIS", "SDL") Then
+            btnMAVerzeichnis.Visible = True
+        End If
+
        'If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Speditionsbuch", "AVISO") Then
        '    btnSpedBuch.Visible = False
        'End If
@@ -3386,6 +3393,18 @@ Public Class frmHauptfenster
        'MsgBox(DS.da_id)
        DS.OPEN_SINGLE_ORIG()
    End Sub
+
+    Private Sub Button11_Click(sender As Object, e As EventArgs) Handles btnMAVerzeichnis.Click
+        Dim f As New VERAG_PROG_ALLGEMEIN.frmMitarbeitersuche
+        f.Show()
+    End Sub
+
+    Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click, Label22.Click
+        Dim f As New frm_eAVISO
+        f.Show()
+    End Sub
+
+
 End Class

 Public Class AvisoStatusFunctions
@@ -3463,11 +3482,21 @@ Public Class AvisoStatusFunctions
            Aviso.Ankunft = getAnkunftDateNow()
        End If

-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
-            If Aviso.Grenzstelle.Replace("???", "") <> "" Then
-                If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "" Then Aviso.Grenzstelle = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
+        'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
+        '    If Aviso.Grenzstelle.Replace("???", "") <> "" Then
+        '        If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "" Then Aviso.Grenzstelle = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
+        '    End If
+        'End If
+        ' If Aviso.Grenzstelle.Replace("???", "") <> "" Then
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "" Then
+                If Aviso.Grenzstelle <> VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG Then
+                    Dim f As New frmAnkunftAendern(Aviso)
+                If f.ShowDialog() Then
+                    Aviso.Grenzstelle = f.AVISO.Grenzstelle
+                End If
            End If
-        End If
+            End If
+        ' End If

        Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft
        Aviso.Änderungen = "auf ANKUNFT gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm") & vbCrLf & Trim(VarToStr(Aviso.Änderungen))
@@ -4085,6 +4114,8 @@ Public Class AvisoStatusFunctions
                    End Select
                    AvisoDAL.addAenderung(AvisoID, "AKT abgeschlossen", "auf 'AKT ABGESCHLOSSEN' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))

+                    'Benachrichtigungen erledigen
+                    VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.BESTAETIGEN_BENACHRICHTIGUNG_ALL(Aviso.AvisoID)
                Else
                    Aviso.Abgeschlossen = value
                    AvisoDAL.SpeichernAviso(Aviso)
@@ -4299,6 +4330,9 @@ Public Class AvisoStatusFunctions
            'End If 
            Aviso.FreigabeFiliale = VERAG_PROG_ALLGEMEIN.cAllgemein.getSTAMMFILIALE

+            'Speditionsbuch aktualisieren
+            SQL.doSQL("UPDATE Speditionsbuch SET FilialenNrHandling='" & VERAG_PROG_ALLGEMEIN.cAllgemein.getSTAMMFILIALE & "' WHERE AvisoId='" & Aviso.AvisoID & "'", "FMZOLL")
+
            tmpid = AvisoDAL.SpeichernAviso(Aviso)
            AvisoDAL.addAenderung(tmpid, "auf FREIGABE gesetzt", "auf FREIGABE gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
            If Not Aviso.LKW_fertig Then
@@ -4386,6 +4420,7 @@ Public Class AvisoStatusFunctions
            MsgBox("Keine Berechtigung!")
            Exit Sub
        End If
+        Dim ZOLL_IMPORT As New DAKOSY_Worker.cZOLL_IMPORT

        Try
            CONTROL.FindForm.Cursor = Cursors.WaitCursor
@@ -4402,7 +4437,6 @@ Public Class AvisoStatusFunctions
                        Dim SPEDITIONSBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(s.FilialenNr, s.AbfertigungsNr)
                        If Not SPEDITIONSBUCH.hasEntry Then

-                            Dim ZOLL_IMPORT As New DAKOSY_Worker.cZOLL_IMPORT
                            Dim notFound As Boolean = True

                            SPEDITIONSBUCH = ZOLL_IMPORT.IMPORT(SPEDITIONSBUCH, AvisoID, s.tblSnd_SendungID, "", "", "", "", "", notFound, True, Personalnummer)
@@ -4413,6 +4447,16 @@ Public Class AvisoStatusFunctions
                                    s.SAVE()
                                End If
                            End If
+                        Else
+                            Dim SPEDBUCH_LIST As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuchList(s.FilialenNr, s.AbfertigungsNr) 'Liste laden, falls merhrere Einträge
+                            If SPEDBUCH_LIST IsNot Nothing AndAlso SPEDBUCH_LIST.LIST IsNot Nothing Then
+                                For Each SB In SPEDBUCH_LIST.LIST
+                                    If Not SPEDITIONSBUCH.Bar Then
+                                        ZOLL_IMPORT.SetBarKassiert(SB) ' BAR-Häckchen setzen, wenn kassiert wurde! (durch auto-Nacherfassung of nicht gesetzt)
+                                    End If
+                                Next
+
+                            End If

                        End If
                        'If ZOLL_IMPORT.AUTO_IMPORT(s.tblSnd_SendungID) Then
--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
--- a/Aviso/frmSendungsdetailsNEU.resx
+++ b/Aviso/frmSendungsdetailsNEU.resx
@@ -117,7 +117,45 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <metadata name="cntxtAnh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>496, 17</value>
+  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="Button20.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
+        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
+        fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
+        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="Button19.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
+        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
+        fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
+        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="Button18.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
+        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
+        fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
+        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="Button6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
+        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
+        fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
+        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>296, 17</value>
+  </metadata>
  <data name="Button3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABGdBTUEAALGPC/xhBQAACQpJREFUaEPl
@@ -196,47 +234,6 @@
        AElFTkSuQmCC
 </value>
  </data>
-  <metadata name="cntxtAnh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>496, 17</value>
-  </metadata>
-  <data name="Button20.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
-        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
-        fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
-        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="Button19.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
-        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
-        fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
-        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="Button18.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
-        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
-        fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
-        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>296, 17</value>
-  </metadata>
-  <data name="Button6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
-        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
-        fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
-        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>296, 17</value>
-  </metadata>
  <data name="Button9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAHtJREFUSEvt
@@ -466,9 +463,6 @@
  <metadata name="cntxtOptions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>174, 17</value>
  </metadata>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>404, 17</value>
-  </metadata>
  <metadata name="ctxtWeitereFormulare.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>596, 17</value>
  </metadata>
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -1158,6 +1158,9 @@ Public Class frmSendungsdetailsNEU
            cboSachbearbeiter.changeItem("")
            cbxNCTST.Checked = False

+            pnlEAviso.Visible = (SENDUNG_LIST(CURRENT_INDEX).VORSYSTEM IsNot Nothing)
+            lblVorsystem.Text = If(SENDUNG_LIST(CURRENT_INDEX).VORSYSTEM, "")
+
            initRbtn()
            cboAbfertigungsart.Focus()
            setQS()
@@ -2523,7 +2526,6 @@ Public Class frmSendungsdetailsNEU
            If txtAbfertigungsnummer.Text <> "" And txtAbfertigungsnummer.Text <> "0" Then btnNeueAbfertigungNrVergeben.Visible = False
        End If

-
        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "UNISPED"
            Case Else
@@ -3776,4 +3778,19 @@ Public Class frmSendungsdetailsNEU
    Private Sub VERAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VERAGToolStripMenuItem.Click
        open_Mail_NeuerLKW("VERAG")
    End Sub
+
+    Private Sub ToolStripMenuItem18_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem18.Click
+
+    End Sub
+
+    Private Sub ToolStripMenuItem20_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem20.Click
+        ' Me.loadDataInLIST()
+        SAVE_ME()
+        If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
+        Dim frMZA As New SDL.frmTCZollanmeldung("EZA", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"))
+        frMZA.Show()
+        AddHandler frMZA.FormClosed, Sub()
+                                         initdgvZollAnmeldungen()
+                                     End Sub
+    End Sub
 End Class