neu

2022-09-01 10:38:09 +02:00
parent 505b2800c5
commit 94556d7686
56 changed files with 1303 additions and 547 deletions
--- a/Aviso.sln
+++ b/Aviso.sln
@@ -31,6 +31,10 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_TELEINFO", "VERAG_TEL
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlathosysApiWrapper", "..\..\..\SCHNITTSTELLEN\PLATHOSYS\WRAPPER\PlathosysApiWrapper-master\PlathosysApiWrapper-master\PlathosysApiWrapper\PlathosysApiWrapper.csproj", "{A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sipdotnet", "..\..\dll\Linphone\WRAPPER\sipdotnet-master\sipdotnet-master\sipdotnet.csproj", "{BCB250F8-F74C-4768-8833-0F13FC8659B8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bria_API_CSharp_SampleApp_3.0", "..\..\dll\BRIA\Bria_API_CSharp_SampleApp_3-main\Bria_API_CSharp_SampleApp_3-main\Bria_API_SampleApp_Phone\Bria_API_CSharp_SampleApp_3.0.csproj", "{1F68E194-88A8-47F2-B9F9-20E092EFA30A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -250,6 +254,38 @@ Global
 		{A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|x64.Build.0 = Release|Any CPU
 		{A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|x86.ActiveCfg = Release|Any CPU
 		{A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|x86.Build.0 = Release|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|x64.Build.0 = Debug|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|x86.Build.0 = Debug|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Release|x64.ActiveCfg = Release|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Release|x64.Build.0 = Release|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Release|x86.ActiveCfg = Release|Any CPU
 		{BCB250F8-F74C-4768-8833-0F13FC8659B8}.Release|x86.Build.0 = Release|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Debug|x64.Build.0 = Debug|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Debug|x86.Build.0 = Debug|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Release|x64.ActiveCfg = Release|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Release|x64.Build.0 = Release|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Release|x86.ActiveCfg = Release|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.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
@@ -1043,6 +1043,8 @@ Public Class frmSendungAnhangImport
        Me.Height = Screen.PrimaryScreen.WorkingArea.Height
        Me.Top = 0
        VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense()
        Try
            DirectCast(PdfViewer.Controls(0).Controls(0).Controls(0), ToolStrip).Items(0).Visible = False
            DirectCast(PdfViewer.Controls(0).Controls(0).Controls(0), ToolStrip).Items(1).Visible = False
@@ -1084,6 +1086,10 @@ Public Class frmSendungAnhangImport
            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - Atanak Rechnung", "Atanak_RG"))
        End If
        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EXPORT_DOCS", "EXPORT_DOCS"))
        End If
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges"))
--- a/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb
+++ b/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb
@@ -36,6 +36,9 @@
            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - E2", "E2"))
            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - Atanak Rechnung", "Atanak_RG"))
        End If
        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EXPORT_DOCS", "EXPORT_DOCS"))
        End If
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges"))
        txtBezeichnung.Text = nameOLD
        cboArt.changeItem(artOLD)
--- a/Aviso/Auswertung/usrctlStatVERIMEX.vb
+++ b/Aviso/Auswertung/usrctlStatVERIMEX.vb
@@ -270,17 +270,29 @@ Public Class usrctlStatVERIMEX
        AddHandler rpt.Detail.Format, Sub()
-                                          'rpt.lblVon.Text = CDate(rpt.Fields.Item("von").Value).ToShortDateString
+                                          Dim anz_Positionen As Integer = 0
-                                          'rpt.lblBis.Text = CDate(rpt.Fields.Item("bis").Value).ToShortDateString
+                                          Dim anz_Versandscheine As Integer = 0
-                                          rpt.Label2.Text = rpt.Fields.Item("Positionen").Value
+                                          Dim anz_LKW As Integer = 0
                                          rpt.lblAnzSnd.Text = rpt.Fields.Item("Versandscheine").Value
                                          rpt.lblAnzLKW.Text = rpt.Fields.Item("LKW").Value
                                          If rpt.Fields.Item("Positionen").Value IsNot DBNull.Value AndAlso IsNumeric(rpt.Fields.Item("Positionen").Value) Then
                                              anz_Positionen = CInt(rpt.Fields.Item("Positionen").Value)
                                          End If
                                          If rpt.Fields.Item("Versandscheine").Value IsNot DBNull.Value AndAlso IsNumeric(rpt.Fields.Item("Versandscheine").Value) Then
                                              anz_Versandscheine = CInt(rpt.Fields.Item("Versandscheine").Value)
                                          End If
                                          If rpt.Fields.Item("LKW").Value IsNot DBNull.Value AndAlso IsNumeric(rpt.Fields.Item("LKW").Value) Then
                                              anz_LKW = CInt(rpt.Fields.Item("LKW").Value)
                                          End If
                                          rpt.Label2.Text = anz_Positionen
                                          rpt.lblAnzSnd.Text = anz_Versandscheine
                                          rpt.lblAnzLKW.Text = anz_LKW
                                          rpt.lblMitarbeiter.Text = rpt.Fields.Item("Mitarbeiter").Value
-                                          sumPos += CInt(rpt.Fields.Item("Positionen").Value)
+                                          sumPos += anz_Positionen
-                                          sumSnd += CInt(rpt.Fields.Item("Versandscheine").Value)
+                                          sumSnd += anz_Versandscheine
-                                          sumLKW += CInt(rpt.Fields.Item("LKW").Value)
+                                          sumLKW += anz_LKW
                                      End Sub
        AddHandler rpt.GroupHeader1.Format, Sub()
                                                '  If CheckBox1.Checked Then rpt.lblFiliale.Text = SQL.getValueTxtBySql("SELECT CAST(FilialenNr as varchar (4)) + ' ' + Grenzstelle FROM filialen WHERE FilialenNr='" & rpt.Fields.Item("FilialenNr").Value & "'", "FMZOLL")
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -252,17 +252,17 @@
    <Reference Include="NumericBox">
      <HintPath>..\..\..\dll\NumericBox.dll</HintPath>
    </Reference>
-    <Reference Include="Spire.License, Version=1.4.0.46, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
+    <Reference Include="Spire.License, Version=1.3.15.46, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Spire.PDF\2021\Spire.License.dll</HintPath>
+      <HintPath>..\..\..\dll\Spire.PDF\2022\Spire.License.dll</HintPath>
    </Reference>
-    <Reference Include="Spire.Pdf, Version=7.8.2.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
+    <Reference Include="Spire.Pdf, Version=7.6.0.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Spire.PDF\2021\Spire.Pdf.dll</HintPath>
+      <HintPath>..\..\..\dll\Spire.PDF\2022\Spire.Pdf.dll</HintPath>
    </Reference>
    <Reference Include="Spire.PdfViewer.Forms, Version=6.6.0.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Spire.PDF\2021\Spire.PdfViewer.Forms.dll</HintPath>
+      <HintPath>..\..\..\dll\Spire.PDF\2022\Spire.PdfViewer.Forms.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
--- a/Project/Application.myapp
+++ b/Project/Application.myapp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<MyApplicationData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
  <MySubMain>true</MySubMain>
  <MainForm>frmLogin</MainForm>
  <SingleInstance>false</SingleInstance>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("LKW-Aviso verwalten")>
 <Assembly: AssemblyCompany("VERAG Spedition AG")>
 <Assembly: AssemblyProduct("Aviso")>
-<Assembly: AssemblyCopyright("Copyright ©  2013 VERAG Spedition AG")>
+<Assembly: AssemblyCopyright("Copyright ©  2022 VERAG Spedition AG")>
 <Assembly: AssemblyTrademark("VERAG Spedition AG")>
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
-<Assembly: AssemblyVersion("3.7.8.4")>
+<Assembly: AssemblyVersion("3.8.0.3")>
-<Assembly: AssemblyFileVersion("3.7.8.4")>
+<Assembly: AssemblyFileVersion("3.8.0.3")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -1773,5 +1773,15 @@ Namespace My.Resources
                Return CType(obj,System.Drawing.Bitmap)
            End Get
        End Property
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
        Friend ReadOnly Property zollico() As System.Drawing.Bitmap
            Get
                Dim obj As Object = ResourceManager.GetObject("zollico", resourceCulture)
                Return CType(obj,System.Drawing.Bitmap)
            End Get
        End Property
    End Module
 End Namespace
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -124,8 +124,8 @@
  <data name="stift" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="sprinter_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Versionsinfo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sprinter_white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Versionsinfo.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
  </data>
  <data name="Telefonliste" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Telefonliste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -190,15 +190,15 @@
  <data name="abfetigungTR_aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\..\Diverses\miniButtons\abfetigungTR_aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Verag_AG_Logopng" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="digitalerAkt" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\digitalerAkt.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Versionsinfo" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Versionsinfo.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
  </data>
  <data name="add_person" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -217,6 +217,9 @@
  <data name="FO" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>F:\Grafik\VERAG\VERAG_Akten\eigAkt\FO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="lorry_ummelden" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\..\Diverses\lorry_ummelden.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="android_clock" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\android-clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -232,9 +235,6 @@
  <data name="mitarbeiter" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\mitarbeiter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="statusBtn_vorbereitet_Aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\statusBtn_vorbereitet_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="parkplatz" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\parkplatz.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -244,6 +244,9 @@
  <data name="statusBtn_vorbereitet_InAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\statusBtn_vorbereitet_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="android_clock_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\android-clock_s.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="arrow_left_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\arrow-left-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -280,8 +283,8 @@
  <data name="searchGG" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\searchGG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="android-add-contact" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="DGS_Instructions_Export_T1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\resources\dgs_instructions_export_t1.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="Unisped_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Unisped_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -301,21 +304,24 @@
  <data name="tts" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\tts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="kasse_sw_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\kasse_sw_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="noAviso_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\noAviso_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="akt_ATILLA" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\akt_ATILLA.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="DGS_Instructions_Export_T1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\resources\dgs_instructions_export_t1.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="uid" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\uid.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="gear2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\gear2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="vermerkBtn" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\vermerkBtn.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="GVMS-image" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\..\Diverses\GVMS-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -367,12 +373,15 @@
  <data name="kasse1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\kasse1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="person" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="statusBtn_vorgeschrieben_InAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\statusBtn_vorgeschrieben_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="weiterleiten_small1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\weiterleiten_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="AMB" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\AMB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -388,8 +397,8 @@
  <data name="DGS_Instructions_Export" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\resources\dgs_instructions_export.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="person" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="MUSTER" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\MUSTER.nlc;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="SBG" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\SBG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -397,6 +406,9 @@
  <data name="fragezeichen1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fragezeichen1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="handy" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="zoll_m" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\zoll_mm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -406,9 +418,6 @@
  <data name="digitalerAkt_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\digitalerAkt_small.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="kasse" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="personCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\personCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -448,8 +457,8 @@
  <data name="zoll_mmm" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\zoll_mmm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="android_clock_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="android-add-contact" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\android-clock_s.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="search" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -460,9 +469,6 @@
  <data name="wheel" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="speditionsbuchAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="warning2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\warning2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -514,8 +520,8 @@
  <data name="ImageIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ImageIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="handy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="sprinter_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\sprinter_white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="vermerk" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -532,11 +538,8 @@
  <data name="igl" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\igl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="MUSTER" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="AMB" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\MUSTER.nlc;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AMB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="kasse_sw_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\kasse_sw_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="LateAviso_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\LateAviso_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -586,8 +589,8 @@
  <data name="beleg" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\beleg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="vermerkBtn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="statusBtn_vorbereitet_Aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\vermerkBtn.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\statusBtn_vorbereitet_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="abgeklaertInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\abgeklaertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -595,8 +598,8 @@
  <data name="image_443x282" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\image_443x282.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="statusBtn_vorgeschrieben_InAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="kasse" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\statusBtn_vorgeschrieben_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="truck_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\truck_black.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -610,8 +613,8 @@
  <data name="abklaerungTR_Inaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\abklaerungTR_Inaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="Verag_AG_Logopng" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="speditionsbuchAktiv" 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>
+    <value>..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="IMEX" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\IMEX.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -625,7 +628,7 @@
  <data name="abfetigungTR_inaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\..\Diverses\miniButtons\abfetigungTR_inaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="lorry_ummelden" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="zollico" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\..\Diverses\lorry_ummelden.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\..\Diverses\zollico.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
 </root>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
--- a/Project/license.elic.xml
+++ b/Project/license.elic.xml
@@ -1,24 +1,32 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8"?>
-<License Key="dwnrAQD6L5lhoO/wj5lrUwKMO33j2gTPZ1lhuN2VFgLUXnDb8AcEWtTxaNuu4w1t8fL0DTwoP9h+VLEleF1Guf+yZ6rkI+kC+jnRp7T6GE5fsm7ux01HpyEL7a3MITHLYyNC2k+k0bfe5a3tSO1TK8KY0rDtMEBqi7AcETnYXs/ZdGbvg8325stZu4wLyrcJ/nGlh/2ZutYTyZuFbySTnEr7l4E8bP/0Du0Nplk6sKhEoccc6inKb5bLs0gJenV4vQ2cXKzWuTg3hdbfVaJahRIHiJThJHrklsJQE7WbMYAvuFXCGq/1cVr3WeqNspgqMPNVsupDxdF+skTgnTVHrxIohS6tkO+PCbtRWST92AhHpDXJdTxPcqk9pvz1RjPgu2wSgBkkU8x7g9v5M5IZDJ0hlDPYg7DnZGMfftWeeRRffnPD5wRG3snFznEfFfHv1CpXjHYjYvQdMoZVQTQKlIMy1lJQVug8AGj15FcHWFQ3JSeITQGsPMPCwbPtb5mpmpuLVRAFUYEgNx6wPgA+7T/6D3BBTzeE5izFW+vSL/87EZXzw0SSiQaYRzuOF5OJeusu6n4B6cDt1r8r9Hn31Kt7xyfelv76dXVwJGXBv4wHoW4IlzKHZue6lnNC8jLzD8j0kDONv3IaNR5F5zyPglc6wW2PfLOTAfMbfkZlmSk9UTvdum4nW+WI+aJzdu4PF+2ZyVP/FOhlAa39RaJuCIPxlHHRaIhF5cxf4u4J7ScWFJMkwxlGKf+/tyDq9P9+XrrUm41cdP4SQXNsQQz7G9pivq9c7LRU5k3Wj24CxaiKNl0JxHO1epq2XlAnQLbx4xJXEzSN7jFWyA1E99bRfteEXEDle+fgi9iK4gogIdLe4StbNjSQScVlPwJhmytvrS+kBIJZPPQ37PCpXHwghv7HbZ3IDQdHVMNjoZY52RWV/2ZR0CKXlmMmscsyaOtgfu/yHNYinIRNzKq65lrImTC+3sKWobR/TLt6jjFJ7245Sgt5QiCMEJD2/WGmsKKhCwq35pth6PqSBHLGyC3oQItwqoGoVWjP6SdPxiLf1UUeJbULg3gD/4Utlg7LYOHB2WIr2vxwHl8ASrzESuF4ollJqDDxknLiG3fUN0jO+AoFEgRo8FFqtQBJHAGPwJ6F5atrcmoK+magoQ/TiOOv/nRl2R2Zzn9oalLTC7qU2c/M76J3V7l2pU6Gpa31O05r9sn9kHMFdLTqq/cBo0joFw3czGLxHWsUOw07PoZZznYPACwl7m3sVNPCs0HBAileDcI3iROONLetxPBsHl/o6xDirK0uo+wCRI/o4kWS7v2KzBRS2Q2sypumeHUdyyipaWunfW/QlamGN6h8sKB9Wmglah/z/BG0pleMVJfS3JpjIu+HpPgSNoEumzlOtNRZwXWzTiLlhCtYjq9Ip/QeC32YH02EHv6g4IE+J+bKVRshSBvXkc06PZK/WEuYBgYkgbFR8h1KmSCq/42fuKyebvuBGrOQ4Ht0" Version="1.3">
+<License xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Key="VnC5RCG4D4FSAQDEbg3Kdj15nhXcvWOrTv8UeDCLZCzJSH+iHRyhOBROr34M8sjY37YZn2WOkOlU7rHuVTImvolW+DrGwG+ozoBGhMVv1gemeCXPlLGbPL6cdC+cgfueF6VzuZ/mdE2bgS/6iAlMyT9PGl0l9fkzNAGkAbQWkfgc3oTWlxzk6mS37yfDkl5qjEHiyj8rcrtXnJYoZkQQvUaNdyegN3HhoZkFI3Wn5fmrwKKWaEvU39fRMF3bRShV4ghjUlnqMwjw0MHjQRQ1Q4q2g5j4FWzThumXAHLviPQja5E0YU6PEBMGTkrmFnjt1WeZbThVp5K47OHXtaoUzvZKsupVIrxGyO5zIghuwghmz9s2doE8wb5FhB3jgYr8cDgwG92u/vXIDXSkcWBpXjrYjLmC6R2bA3KsPW34ilUfad74RrLkt03dW9tnSaDI/5PEodfcqdgq2uULKsotC7iq7vIskCyyB7ZvpugwKtkrlM7Zr+b0Nw+r6L3CQMuUI3LwbYUc7S6mjPsDshBbRmmQ84okHjhBAkdxH5AwXCFSxCAQUMgnEtxwyT8NyoaDuktZQUBiZvfJnEj1Jk0y2raQf0nNP1xIkODCmnedmOqBNYMmN3intWHWhwd3bWq0bhofq3bF8cSSSqr4IKkMaITnv1VwWFc6NAHX/kAtrw/ax6TlziwYgDsv4nSKWpT5Hij23Inmf/6TZ1xw6Fxgc2afOqdxkmdCFEzjT4iDctnmFEUhyuRAOezJmNkmBRqalBMO4RNxntUO61e/rhg/rUcOg3PcT4UHX1AFuBEnVAk5P24MtURYWN4p3DaPbJ+KKY/WhPZeLJwOR9eF7LRrZBH4U9Ur1mke2aD9q0z3uA8hZcTiWVjwJLovshUgIlOf3nPK6+EEpIu9xgy5EXZRBdRzPp2ZDZdAd4/r81YilJs0CXyOC9iCouoC5zrluu3gl9yX2bmAO0rvscYkVpkoO2/Byb5BFzqvs4KO+iSgstQ7vbKtbFvkYiT5Yytf7Ucz4L8Y7a2Y8JP4qL5pDji/+0Q/TbDH03B36MgBFk2xgfgH72DQScvt8OqaA6lx+OPbOOLh/5spYMNTJvElRoAvF7jlBgwYJF+Baz86A8ijMhb8DeFqVvQkqbrHDl6G0JFQuU2YNK6v0bGMa45POCHKF2MLElYFEgecgck/9LrEmeEJ7+kBTwkuTQpzF6pFDy/i5pdjP1Q5+uxzsZVwi/4brVfMdFdsdHFiTB44V/0x4hOHRVK2/TQSWltroZKH2I4Awy4PLLxnL7mpqME3cl1hX+xfCmqSxs+VcuN0YaEaN28UR8LyFd2Xt8ZcQVZDuoxW19uCTZKPr22Ow28JXN9UfQkOTZo9dGIFS3Uc+Bkif9xCfarSARaDDtzvG4CgqMiPHc5OH4wGsop4eCTU1Hqcia5/xxTL5KSPCLm5d/VZhn+4a7D47f4EQ+ur1zssJABKIIn0O+LWIY/OY3y8mPub+DrRr2932Fi1t6vJIClie1HWmOeNzJJdH9E2lJML4OOmqnQC2gesCGe++eOZJs5ObZmRYnmcpU18OAwOjVGlQAsgExMI0LFpSuc1OLBYA6lCf1Gp07rfTvpyZ90ZzwmTFZTjDULKx42kgpno2QlCGkLEtEq6xKjnqLGaWzbd5Mpc1j1B034fjcU5pRlvN9dBEjJGleE9tpoHFDmHj8nPKgEok68uSOX6qHoy/Xnxu/xPvkLTNppjzAPDVAKG2RmSgNNErouNdHd1n1jqy5YZTU8u6Ayqli6KYVYN6CMk9kllJTAIHe7OKqGYZgHDA5vTgbxThfJgCy24" Version="1.3">
-    <Type>Runtime</Type>
+	<Type>Runtime</Type>
-    <Username>VERAG Spedition AG</Username>
+	<Username>VERAG Spedition AG</Username>
-    <Email>al@verag.ag</Email>
+	<Email>al@verag.ag</Email>
-    <Organization>VERAG Spedition AG</Organization>
+	<Organization>VERAG Spedition AG</Organization>
-    <LicensedDate>2021-08-11T12:00:00Z</LicensedDate>
+	<LicensedDate>2022-07-12T00:00:00Z</LicensedDate>
-    <ExpiredDate>2022-08-11T12:00:00Z</ExpiredDate>
+	<ExpiredDate>2023-07-12T00:00:00Z</ExpiredDate>
-    <Products>
+	<Products>
-        <Product>
+		<Product>
-            <Name>Spire.PDF Platinum</Name>
+			<Name>Spire.PDFViewer for Forms</Name>
-            <Version>7.5</Version>
+			<Version>7.1</Version>
-            <Subscription>
+			<Subscription>
-                <NumberOfPermittedDeveloper>1</NumberOfPermittedDeveloper>
+				<NumberOfPermittedDeveloper>1</NumberOfPermittedDeveloper>
-                <NumberOfPermittedSite>1</NumberOfPermittedSite>
+				<NumberOfPermittedSite>1</NumberOfPermittedSite>
-            </Subscription>
+			</Subscription>
-        </Product>
+		</Product>
-    </Products>
+		<Product>
-    <Issuer>
+			<Name>Spire.PDF Pro Edition</Name>
-        <Name>e-iceblue</Name>
+			<Version>8.7</Version>
-        <Email>sales@e-iceblue.com</Email>
+			<Subscription>
-        <Url>http://www.e-iceblue.com</Url>
+				<NumberOfPermittedDeveloper>1</NumberOfPermittedDeveloper>
-    </Issuer>
+				<NumberOfPermittedSite>1</NumberOfPermittedSite>
-</License>
+			</Subscription>
 		</Product>
 	</Products>
 	<Issuer>
 		<Name>e-iceblue</Name>
 		<Email>sales@e-iceblue.com</Email>
 		<Url>http://www.e-iceblue.com</Url>
 	</Issuer>
 </License>
--- a/Aviso/Resources/license.elic.xml
+++ b/Aviso/Resources/license.elic.xml
@@ -1,24 +1,32 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8"?>
-<License Key="AAEA4ntefEpzSywzIrB1dHRM7C6h6Nsn2sYvcXJNIA6FsmqQCaeptK1e4d6q+o76ymXZPk8ckHWhlikSMIjsCQ/My5ty75NnBikL4MadZGorQYNOcIRK9Kfccke0TAqCilotrOQB5jScLOFL65oHzJoQbKdg4mx2dBgPiVzLUmzBeUTx5OQguU15g7tirjDkGEdfenCVvGq19aav/xmgma1L+IAsRyKkzLH0+yBsy3Ta7u2pVXF6kiH2BaJj0qi/5kmNWcu9bxWvApxCa20ShIY9QUIN7RqvQZ4orc3/+IF+8q4VtBomcLJ7ZYHlWPVfNovMUKU62qIjD274kFGQlDpeIJ1w8VEXqsov25WugggbDpheZcEBOAGuOGKeOM53TRF4EwTWB2fvGLw1E7o5HqxrID4PcDtSnq+sAv/NRU3+0Sr1YHhD7Cvk4TH9qwcsp27Pbm0zX5+ylm7kUHC6ZVko88MiQbP/SCFe+JL32HtuD0d1XbeLw1vntsPzlo+TWCsFRnPBWHvYmhFl3Sv6jXVW/tMTFYSU3z4nInGswCLBAUgajSLLcXJI5LTDAzya9cpl5Sw5s543RsrrktILANcRYtO3giNP6G5Wn95Kq+gkfQ/W29Zx/P5+WGylUyPQXkCweIAkAkdPZGxZdhkRWsWTuKGo+JcsA/U/NH8u6lK4lEepNaaRNffXzOQXwGC3z9gIzsIklUSKU104FJXZgsmrCwI68JuH7r/TFl2ekzfPSUcPzfR1i+x175q+Mb9tQMNfUYZ+NSPy5DFvVju0+VFdua/1S811zsk47D3lAYHhC7lnoPTGCJv6SekLLRiD7eM7B7QDcdSP6bFmwTl8St40PeHZRb4YJwuqmI/d2l8RRMFQz14nB7PYkFvD5FQ/Ts22/bh3pEd7Zy7/k1EiOpX8DcpO9zn25vPLlkQqRw0QtnUMx9K7LDwYkz+LFokERjLIRImkLGfskZf5ojgR7JQE4GDk9gu4AyjLTJELQzah0fHM/Mchn74Onr95Vh64uqNgOV/2MZLBJZTXRSENXFiyoO3y6IfgPe5vpVUPnl+Yngn6BdQB9BE3wmLWw25kyByliJsEfIuBYFGIvA5t9NSyBdmtW2g1fHGgcxDtn1g5H8Rmk79dMdUFr4tIQ+qvNS6CGvozSdG/C7D3JhRm01C+a+1ZyovuGHmREtj9VrmCmbYohmqZ34mH9L6kAfNmBOes2+eb8LjbMCNnAUAU5fhRqYIDyCa8wDvsuWy7dwwXj7PPeqY6fLitcSsJNHkS2iUUXJk3RqjsnwAqNFIqX1P3TIFuzJbXAkdjEetgsn3setPcUA/Kxaakx1p2K2BZ1Mzf+mnk8ugGPzJihyxIEKmXtacYtwO8yTGR49TQRGVFPwTbePdd5zDSbohXhl02oEmg8FDuhkktFUlHtBoHYtlVazlbXWKcliNXdzdGtXJYtEf4ULtv1pQclzGIDUyr2yRot6cB0wX9lVO6iHHQeRtFr1eLURLO" Version="1.3">
+<License xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Key="VnC5RCG4D4FSAQDEbg3Kdj15nhXcvWOrTv8UeDCLZCzJSH+iHRyhOBROr34M8sjY37YZn2WOkOlU7rHuVTImvolW+DrGwG+ozoBGhMVv1gemeCXPlLGbPL6cdC+cgfueF6VzuZ/mdE2bgS/6iAlMyT9PGl0l9fkzNAGkAbQWkfgc3oTWlxzk6mS37yfDkl5qjEHiyj8rcrtXnJYoZkQQvUaNdyegN3HhoZkFI3Wn5fmrwKKWaEvU39fRMF3bRShV4ghjUlnqMwjw0MHjQRQ1Q4q2g5j4FWzThumXAHLviPQja5E0YU6PEBMGTkrmFnjt1WeZbThVp5K47OHXtaoUzvZKsupVIrxGyO5zIghuwghmz9s2doE8wb5FhB3jgYr8cDgwG92u/vXIDXSkcWBpXjrYjLmC6R2bA3KsPW34ilUfad74RrLkt03dW9tnSaDI/5PEodfcqdgq2uULKsotC7iq7vIskCyyB7ZvpugwKtkrlM7Zr+b0Nw+r6L3CQMuUI3LwbYUc7S6mjPsDshBbRmmQ84okHjhBAkdxH5AwXCFSxCAQUMgnEtxwyT8NyoaDuktZQUBiZvfJnEj1Jk0y2raQf0nNP1xIkODCmnedmOqBNYMmN3intWHWhwd3bWq0bhofq3bF8cSSSqr4IKkMaITnv1VwWFc6NAHX/kAtrw/ax6TlziwYgDsv4nSKWpT5Hij23Inmf/6TZ1xw6Fxgc2afOqdxkmdCFEzjT4iDctnmFEUhyuRAOezJmNkmBRqalBMO4RNxntUO61e/rhg/rUcOg3PcT4UHX1AFuBEnVAk5P24MtURYWN4p3DaPbJ+KKY/WhPZeLJwOR9eF7LRrZBH4U9Ur1mke2aD9q0z3uA8hZcTiWVjwJLovshUgIlOf3nPK6+EEpIu9xgy5EXZRBdRzPp2ZDZdAd4/r81YilJs0CXyOC9iCouoC5zrluu3gl9yX2bmAO0rvscYkVpkoO2/Byb5BFzqvs4KO+iSgstQ7vbKtbFvkYiT5Yytf7Ucz4L8Y7a2Y8JP4qL5pDji/+0Q/TbDH03B36MgBFk2xgfgH72DQScvt8OqaA6lx+OPbOOLh/5spYMNTJvElRoAvF7jlBgwYJF+Baz86A8ijMhb8DeFqVvQkqbrHDl6G0JFQuU2YNK6v0bGMa45POCHKF2MLElYFEgecgck/9LrEmeEJ7+kBTwkuTQpzF6pFDy/i5pdjP1Q5+uxzsZVwi/4brVfMdFdsdHFiTB44V/0x4hOHRVK2/TQSWltroZKH2I4Awy4PLLxnL7mpqME3cl1hX+xfCmqSxs+VcuN0YaEaN28UR8LyFd2Xt8ZcQVZDuoxW19uCTZKPr22Ow28JXN9UfQkOTZo9dGIFS3Uc+Bkif9xCfarSARaDDtzvG4CgqMiPHc5OH4wGsop4eCTU1Hqcia5/xxTL5KSPCLm5d/VZhn+4a7D47f4EQ+ur1zssJABKIIn0O+LWIY/OY3y8mPub+DrRr2932Fi1t6vJIClie1HWmOeNzJJdH9E2lJML4OOmqnQC2gesCGe++eOZJs5ObZmRYnmcpU18OAwOjVGlQAsgExMI0LFpSuc1OLBYA6lCf1Gp07rfTvpyZ90ZzwmTFZTjDULKx42kgpno2QlCGkLEtEq6xKjnqLGaWzbd5Mpc1j1B034fjcU5pRlvN9dBEjJGleE9tpoHFDmHj8nPKgEok68uSOX6qHoy/Xnxu/xPvkLTNppjzAPDVAKG2RmSgNNErouNdHd1n1jqy5YZTU8u6Ayqli6KYVYN6CMk9kllJTAIHe7OKqGYZgHDA5vTgbxThfJgCy24" Version="1.3">
-    <Type>Runtime</Type>
+	<Type>Runtime</Type>
-    <Username>VERAG Spedition AG</Username>
+	<Username>VERAG Spedition AG</Username>
-    <Email>al@verag.ag</Email>
+	<Email>al@verag.ag</Email>
-    <Organization>VERAG Spedition AG</Organization>
+	<Organization>VERAG Spedition AG</Organization>
-    <LicensedDate>2019-09-12T00:00:00Z</LicensedDate>
+	<LicensedDate>2022-07-12T00:00:00Z</LicensedDate>
-    <ExpiredDate>2020-09-12T00:00:00Z</ExpiredDate>
+	<ExpiredDate>2023-07-12T00:00:00Z</ExpiredDate>
-    <Products>
+	<Products>
-        <Product>
+		<Product>
-            <Name>Spire.PDF Platinum</Name>
+			<Name>Spire.PDFViewer for Forms</Name>
-            <Version>5.8</Version>
+			<Version>7.1</Version>
-            <Subscription>
+			<Subscription>
-                <NumberOfPermittedDeveloper>1</NumberOfPermittedDeveloper>
+				<NumberOfPermittedDeveloper>1</NumberOfPermittedDeveloper>
-                <NumberOfPermittedSite>1</NumberOfPermittedSite>
+				<NumberOfPermittedSite>1</NumberOfPermittedSite>
-            </Subscription>
+			</Subscription>
-        </Product>
+		</Product>
-    </Products>
+		<Product>
-    <Issuer>
+			<Name>Spire.PDF Pro Edition</Name>
-        <Name>e-iceblue</Name>
+			<Version>8.7</Version>
-        <Email>sales@e-iceblue.com</Email>
+			<Subscription>
-        <Url>http://www.e-iceblue.com</Url>
+				<NumberOfPermittedDeveloper>1</NumberOfPermittedDeveloper>
-    </Issuer>
+				<NumberOfPermittedSite>1</NumberOfPermittedSite>
-</License>
+			</Subscription>
 		</Product>
 	</Products>
 	<Issuer>
 		<Name>e-iceblue</Name>
 		<Email>sales@e-iceblue.com</Email>
 		<Url>http://www.e-iceblue.com</Url>
 	</Issuer>
 </License>
--- a/Aviso/frmAbfertigungTR_ExportAnz.Designer.vb
+++ b/Aviso/frmAbfertigungTR_ExportAnz.Designer.vb
@@ -56,10 +56,12 @@ Partial Class frmAbfertigungTR_ExportAnz
        Me.txtAnzPos._DateTimeOnly = False
        Me.txtAnzPos._numbersOnly = True
        Me.txtAnzPos._numbersOnlyKommastellen = ""
        Me.txtAnzPos._numbersOnlyTrennzeichen = True
        Me.txtAnzPos._Prozent = False
        Me.txtAnzPos._ShortDateNew = False
        Me.txtAnzPos._ShortDateOnly = False
        Me.txtAnzPos._TimeOnly = False
        Me.txtAnzPos._TimeOnly_Seconds = False
        Me.txtAnzPos._value = ""
        Me.txtAnzPos._Waehrung = False
        Me.txtAnzPos._WaehrungZeichen = True
@@ -78,10 +80,12 @@ Partial Class frmAbfertigungTR_ExportAnz
        Me.txtAnz._DateTimeOnly = False
        Me.txtAnz._numbersOnly = True
        Me.txtAnz._numbersOnlyKommastellen = ""
        Me.txtAnz._numbersOnlyTrennzeichen = True
        Me.txtAnz._Prozent = False
        Me.txtAnz._ShortDateNew = False
        Me.txtAnz._ShortDateOnly = False
        Me.txtAnz._TimeOnly = False
        Me.txtAnz._TimeOnly_Seconds = False
        Me.txtAnz._value = ""
        Me.txtAnz._Waehrung = False
        Me.txtAnz._WaehrungZeichen = True
--- a/Aviso/frmAbfertigungTR_ExportAnz.vb
+++ b/Aviso/frmAbfertigungTR_ExportAnz.vb
@@ -30,10 +30,12 @@
        Me.DialogResult = DialogResult.Cancel
    End Sub
-    Private Sub frmAnkunftSetzen_KeyDown(sender As Object, e As KeyEventArgs)
+
    Private Sub txtAnz_KeyUp(sender As Object, e As KeyEventArgs) Handles txtAnz.KeyUp, txtAnzPos.KeyUp
        If e.KeyCode = Keys.Return Then
            btn.Focus()
            btn.PerformClick()
        End If
    End Sub
 End Class
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -193,9 +193,16 @@ Public Class frmHauptfenster
        Dim OptionenDAL As New cOptionenDAL
-        cboGrenzstelle.Items.Clear()
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
-        cboGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where [grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True,, "ALLE")
+            cboGrenzstelle.Items.Clear()
-        cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("??? - Andere", "???"))
+            cboGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where grz_Grenzstelle='" & VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT & "'  AND  grz_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'   AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", False)
        Else
            cboGrenzstelle.Items.Clear()
            cboGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where ([grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True,, "ALLE")
            cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("??? - Andere", "???"))
        End If
        'cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", ""))
        'cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUB", "SUB"))
        'cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SBG", "SBG"))
@@ -219,9 +226,16 @@ Public Class frmHauptfenster
-        cboMy_Grenzstelle.Items.Clear()
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
-        cboMy_Grenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where [grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True,, "ALLE")
+            cboMy_Grenzstelle.Items.Clear()
-        cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("??? - Andere", "???"))
+            cboMy_Grenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where grz_Grenzstelle='" & VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT & "'  AND  grz_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'   AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", False)
        Else
            cboMy_Grenzstelle.Items.Clear()
            cboMy_Grenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where ([grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True,, "ALLE")
            cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("??? - Andere", "???"))
        End If
        'cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", ""))
        'cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUB", "SUB"))
        'cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SBG", "SBG"))
@@ -240,30 +254,34 @@ Public Class frmHauptfenster
        cboMyAvisoAnzeige.fillWithSQL("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", False, "ADMIN", True, False)
        cboMyAvisoAnzeige.changeItem("Benutzer")
        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
            StandortWechselnToolStripMenuItem.Visible = True
        End If
-        'MyComboBox2.Items.Clear()
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
-        'MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Benutzer", "Benutzer"))
+            cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T1-Sendungen", "T1"))
        'MyComboBox2.fillWithSQL("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", False, "ADMIN", True, False)
        'MyComboBox2.changeItem("Benutzer") 
        If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "QS" Then
            cboMy_QS.CheckState = CheckState.Unchecked
            cboMy_VB.CheckState = CheckState.Indeterminate
        Else
            cboMy_QS.CheckState = CheckState.Checked
            cboMy_VB.CheckState = CheckState.Unchecked
-        End If
+            cboMyAvisoAnzeige.changeItem("T1")
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId Is Nothing Then
+        Else
            cbx_My_LKW.Checked = True
            cboMy_QS.CheckState = CheckState.Indeterminate
            cboMy_VB.CheckState = CheckState.Indeterminate
        ElseIf IsNumeric(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId) Then
            cboMyAvisoAnzeige.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId)
            '  MyComboBox2.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId)
            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
                StandortWechselnToolStripMenuItem.Visible = True
            End If
            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "QS" Then
                cboMy_QS.CheckState = CheckState.Unchecked
                cboMy_VB.CheckState = CheckState.Indeterminate
            Else
                cboMy_QS.CheckState = CheckState.Checked
                cboMy_VB.CheckState = CheckState.Unchecked
            End If
            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId Is Nothing Then
                cbx_My_LKW.Checked = True
                cboMy_QS.CheckState = CheckState.Indeterminate
                cboMy_VB.CheckState = CheckState.Indeterminate
            ElseIf IsNumeric(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId) Then
                cboMyAvisoAnzeige.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId)
                '  MyComboBox2.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId)
            End If
        End If
        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("GESAMTSICHERHEIT", "AVISO") Then
@@ -358,7 +376,7 @@ Public Class frmHauptfenster
-        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then
            'MenuStrip1.Items.Clear()
            'MenuStrip1.Items.Remove(FunktionenToolStripMenuItem)
            ' MenuStrip1.Items.Remove(StatistikToolStripMenuItem)
@@ -412,7 +430,11 @@ Public Class frmHauptfenster
        'End Try
        'Mitarbeiterinfos anzeigen
-        VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter += "/" & SystemInformation.UserName.ToString
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("SHOW_AVISO_PCNAME") Then
            VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter += "/" & SystemInformation.UserName.ToString
        End If
        lblMitarbeiter.Text = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter
        'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Avisodaten_verwalten", Me) Then
        '    lblMitarbeiter.Text += " (Verwaltung)Then"
@@ -1033,14 +1055,21 @@ Public Class frmHauptfenster
                    sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' OR FIRMA='ATILLA' ) "
                Else
                    sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) "
                End If
            Else
                sqlStrFirma &= " AND FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'  "
            End If
            'Verimex soll keine Abgeschlossenen und keine Freigegebenen sehen:
            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then sqlStrFirma &= " AND Abgeschlossen=0 AND Status <>1  "
            If cbx_My_LKW.Checked Then
                '----------------------------------------------------------------------------------------------------------------------------------
                '--- LKW ---
                '----------------------------------------------------------------------------------------------------------------------------------
                sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], [Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe,LetzterMitarbeiterId AS maId, LetzterMitarbeiterId  ,/* CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END  as Vorbereitung,*/LetzterMitarbeiter,AvisoTVHinweis " &
                                       " FROM Aviso " &
                                       " WHERE   (  Status IN (0, 3, 4, 5)  OR ( Status = 1 AND [Abgeschlossen] = 0 )) " &
@@ -1057,10 +1086,19 @@ Public Class frmHauptfenster
                                             " when [Status] =0 then 5 " &
                                     " END, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
            Else
                '----------------------------------------------------------------------------------------------------------------------------------
                '--- Sendung ---
                '----------------------------------------------------------------------------------------------------------------------------------
                Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 "
-                If cboMyAvisoAnzeige._value <> "" And cboMyAvisoAnzeige._value <> "Benutzer" And IsNumeric(cboMyAvisoAnzeige._value) Then
+                If cboMyAvisoAnzeige._value <> "" Then
-                    '     inBearbeitungSQL = " Aviso.[TeamId]= " & If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId, -1) & " "
+                    If cboMyAvisoAnzeige._value = "T1" Then
-                    inBearbeitungSQL = " (Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId) "
+                        inBearbeitungSQL = " tblSnd_Abfertigungsart_ID=5 "
                        'NUR VERAG/IMEX:
                        inBearbeitungSQL &= " AND FilialenNr IN (SELECT FilialenNr FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen WHERE  Filialen.FilialenNr=tblSendungen.FilialenNr and Filialen.Firma IN ('VERAG','IMEX')) "
                    ElseIf cboMyAvisoAnzeige._value <> "Benutzer" And IsNumeric(cboMyAvisoAnzeige._value) Then
                        inBearbeitungSQL = " (Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId) "
                    End If
                End If
                sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], [Status],tblSendungen.LetzterMitarbeiterId,tblSendungen.LetzterMitarbeiter, LKW_Nr, VoraussichtlichesEintreffen,Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, Aviso.LetzterMitarbeiterId AS maId,AvisoTVHinweis  " &
@@ -1117,7 +1155,7 @@ Public Class frmHauptfenster
            Dim errOcc = False
-
+            'MsgBox(sqlStr)
            gridMyAviso.DataSource = VERAGSQL.loadDgvBySql_Param(sqlStr, "AVISO", 1500, list, False, errOcc)
            If errOcc Then
                pic.Visible = True
@@ -1499,7 +1537,7 @@ Public Class frmHauptfenster
                If (gridAviso.Rows(e.RowIndex).Cells("Ankunft").Value Is DBNull.Value OrElse gridAviso.Rows(e.RowIndex).Cells("Ankunft").Value = LeerDatum) AndAlso gridAviso.Rows(e.RowIndex).Cells("TageBisEintreffen").Value IsNot DBNull.Value AndAlso gridAviso.Rows(e.RowIndex).Cells("TageBisEintreffen").Value <= 1 Then
                    'gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.ForeColor = Color.Red
-                    gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Bold)
+                        gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Bold)
                End If
        End Select
@@ -2594,6 +2632,9 @@ Public Class frmHauptfenster
    End Function
    Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click
        Dim rpt As New rptTEST
@@ -3400,9 +3441,10 @@ Public Class frmHauptfenster
    Private Sub ToolStripMenuItem4_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem4.Click
-        Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Gesamtsicherheit_VERAG_GmbH")
+        ' Process.Start("https://file.verag.ag:5001/oo/r/pkjsynkkXrTgPm85JLVFWAHem4NuF6IO")
-        'MsgBox(DS.da_id)
+        Process.Start("https://file.verag.ag:5001/d/s/pkjsynkkXrTgPm85JLVFWAHem4NuF6IO/i4_Ss9mG9jR7hB4wStoIbzhvYzlJJJPv-BbegLJoGuQk")
-        DS.OPEN_SINGLE_ORIG()
+        'Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Gesamtsicherheit_VERAG_GmbH")
        'DS.OPEN_SINGLE_ORIG()
    End Sub
    Private Sub ToolStripMenuItem5_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem5.Click
@@ -3564,6 +3606,22 @@ Public Class frmHauptfenster
    Private Sub cboMyAvisoAnzeige_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboMyAvisoAnzeige.SelectedIndexChanged, cbx_My_LKW.CheckedChanged, cboMy_Grenzstelle.SelectedIndexChanged, cboMy_QS.CheckStateChanged, cboMy_VB.CheckStateChanged
        If Grid_aktiv Then
            'Wenn VERIMEX/T1 und cboMyAvisoAnzeige geändert --> Checkboxes richtig setzen
            If sender Is cboMyAvisoAnzeige Then
                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
                    Grid_aktiv = False
                    If cboMyAvisoAnzeige._value = "T1" Then
                        cboMy_QS.CheckState = CheckState.Checked
                        cboMy_VB.CheckState = CheckState.Unchecked
                    Else
                        cboMy_QS.CheckState = CheckState.Indeterminate
                        cboMy_VB.CheckState = CheckState.Indeterminate
                    End If
                    Grid_aktiv = True
                End If
            End If
            'DGV anzeigen: 
            meineAviso_anzeigen()
        End If
        cboMy_QS.Visible = Not cbx_My_LKW.Checked
@@ -3914,6 +3972,26 @@ Public Class frmHauptfenster
            Aviso_anzeigen("")
        End If
    End Sub
    Private Sub AllgemeinToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AllgemeinToolStripMenuItem.Click
        Process.Start("https://www.bafa.de/DE/Aussenwirtschaft/Ausfuhrkontrolle/ausfuhrkontrolle_node.html")
    End Sub
    Private Sub AllgemeineEinführungExportkontrolleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AllgemeineEinführungExportkontrolleToolStripMenuItem.Click
        Process.Start("https://www.bafa.de/DE/Aussenwirtschaft/Ausfuhrkontrolle/Allgemeine_Einfuehrung/allgemeine_einfuehrung_node.html")
    End Sub
    Private Sub BrexitToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles BrexitToolStripMenuItem1.Click
        Process.Start("https://www.bafa.de/DE/Aussenwirtschaft/Ausfuhrkontrolle/Brexit/brexit_node.html")
    End Sub
    Private Sub EmbargosLänderToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EmbargosLänderToolStripMenuItem.Click
        Process.Start("https://www.bafa.de/DE/Aussenwirtschaft/Ausfuhrkontrolle/Embargos/embargos_node.html")
    End Sub
    Private Sub GüterlisteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GüterlisteToolStripMenuItem.Click
        Process.Start("https://www.bafa.de/DE/Aussenwirtschaft/Ausfuhrkontrolle/Gueterlisten/gueterlisten_node.html")
    End Sub
 End Class
 Public Class AvisoStatusFunctions
@@ -4389,40 +4467,39 @@ Public Class AvisoStatusFunctions
                API.api_EMailAttCnt = anhaenge.Count
-                If ForceMail <> "" Then
+            If ForceMail <> "" Then
-                    Dim mailsTXT = ""
+                Dim mailsTXT = ""
-                    mailsTXT &= "TO: " & EMails & "<br>"
+                mailsTXT &= "TO: " & EMails & "<br>"
-                    mailsTXT &= "CC: " & EMails_CC & "<br>"
+                mailsTXT &= "CC: " & EMails_CC & "<br>"
-                    mailsTXT &= "BCC: " & EMails_BCC & "<br><br>"
+                mailsTXT &= "BCC: " & EMails_BCC & "<br><br>"
-                    If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(ForceMail, hBetreff, mailsTXT & hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, "", "", anhaenge, art) Then
+                If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(ForceMail, hBetreff, mailsTXT & hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, "", "", anhaenge, art) Then
-                        API.UPDTAE_OK()
+                    API.UPDTAE_OK()
-                    Else
+                Else
-                        API.UPDTAE_ERR()
+                    API.UPDTAE_ERR()
-                    End If
+                End If
            Else
                EMails_BCC &= If(EMails_BCC <> "", ";", "") & VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getBCCEmail() 'Damit Mails gespeichert werden.
                Dim MailArt = ""
                Select Case art
                    Case 1, 3 : MailArt = "Ankunft"
                    Case 2, 4 : MailArt = "Freigabe"
                    Case 5 : MailArt = "Status"
                End Select
                If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, hBetreff, hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, EMails_CC, EMails_BCC, anhaenge, art) Then
                    API.UPDTAE_OK()
                    Dim txt = " E-Mail gesendet an: " & EMails
                    If EMails_CC.ToString.Trim <> "" Then txt &= " CC: " & EMails_CC
                    If EMails_BCC.ToString.Trim <> "" Then txt &= " BCC: " & EMails_BCC
                    AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, MailArt & txt, 46, , "(AUTO)")
                Else
                    EMails_BCC &= If(EMails_BCC <> "", ";", "") & VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail() 'Damit Mails gespeichert werden.
                    Dim MailArt = ""
                    Select Case art
                        Case 1, 3 : MailArt = "Ankunft"
                        Case 2, 4 : MailArt = "Freigabe"
                        Case 5 : MailArt = "Status"
                    End Select
                    If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, hBetreff, hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, EMails_CC, EMails_BCC, anhaenge, art) Then
                        API.UPDTAE_OK()
                        Dim txt = " E-Mail gesendet an: " & EMails
                        If EMails_CC.ToString.Trim <> "" Then txt &= " CC: " & EMails_CC
                        If EMails_BCC.ToString.Trim <> "" Then txt &= " BCC: " & EMails_BCC
                        AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, MailArt & txt, 46, , "(AUTO)")
                    Else
                        API.UPDTAE_ERR()
                        AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, "ERR: " & MailArt & " E-Mail konnte nicht gesendet werden!", 46, , "(AUTO)")
                    End If
@@ -4534,13 +4611,13 @@ Public Class AvisoStatusFunctions
        'Status ist offen - jetzt auf VORBEREITET setzen
        Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Vorbereitet
        Aviso.Änderungen = "auf VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm") & vbCrLf & Trim(VarToStr(Aviso.Änderungen))
        Aviso.letzterMitarbeiter = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter
        Aviso.TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
        Dim tmpid = AvisoDAL.SpeichernAviso(Aviso)
        AvisoDAL.addAenderung(tmpid, "auf VORBEREITET gesetzt", "auf VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
        '  SQL.doSQL("UPDATE tblSendungen SET tblSnd_Vorbereitet=getDate()  WHERE tblSnd_Vorbereitet IS NULL AND  tblSnd_AvisoID='" & AvisoID & "'", "AVISO")
        If False Then
@@ -5515,7 +5592,9 @@ Public Class AvisoStatusFunctions
        If SENDUNG_TMP.tblSnd_Vorgeschrieben Is Nothing Then
            SENDUNG_TMP.tblSnd_VG_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERIMEX" Then
                If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
            End If
            SENDUNG_TMP.tblSnd_Vorgeschrieben = Now                     'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn..
            AvisoDAL.addAenderung(AvisoID, "Sendung auf VORGESCHRIEBEN gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf VORGESCHRIEBEN gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
@@ -5549,12 +5628,14 @@ Public Class AvisoStatusFunctions
            'If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then
            '    SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
            'End If
            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERIMEX" Then
                If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
            End If
            SENDUNG_TMP.tblSnd_Vorbereitet = Now                     'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn..
-            AvisoDAL.addAenderung(AvisoID, "Sendung auf VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
+                AvisoDAL.addAenderung(AvisoID, "Sendung auf VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
-        Else
+            Else
-            SENDUNG_TMP.tblSnd_Vorbereitet = Nothing
+                SENDUNG_TMP.tblSnd_Vorbereitet = Nothing
            AvisoDAL.addAenderung(AvisoID, "Sendung auf NICHT VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
        End If
        Return SENDUNG_TMP.SAVE()
@@ -5588,7 +5669,7 @@ Public Class AvisoStatusFunctions
            'If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then
            '    SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
            'End If
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
+            'If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
            SENDUNG_TMP.tblSnd_AbklaerungTR = Now                     'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn..
            AvisoDAL.addAenderung(AvisoID, "Sendung auf ABGEKLÄRT (TR) gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf ABGEKLÄRT (TR) gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
@@ -5629,7 +5710,7 @@ Public Class AvisoStatusFunctions
            'If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then
            '    SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
            'End If
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
+            ' If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
            SENDUNG_TMP.tblSnd_AbfertigungTR = Now                     'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn..
            AvisoDAL.addAenderung(AvisoID, "Sendung auf ABGEFERTIGT (TR) gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf ABGEFERTIGT (TR) gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
@@ -5818,7 +5899,7 @@ Public Class AvisoStatusFunctions
                                                If PathTmp <> "" Then anhaengeVersand.Add(PathTmp) : found = True
                                                '---------------------------------------------------------
-                                                'AMBAR: BEI T2 auch Rechnung, CMR; Ausfuhr mitschicken!
+                                                'AMBAR: BEI T2 auch EXPORT_DOCS mitschicken! ' ------------------------'''Rechnung, CMR; Ausfuhr 
                                                '---------------------------------------------------------
                                                If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("FREIGABEMAIL_T2_ANHAENGER") Then '--> nur bei AMBAR gesetzt
                                                    Select Case s.tblSnd_Abfertigungsart_ID
@@ -5827,7 +5908,8 @@ Public Class AvisoStatusFunctions
                                                            VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST, s.tblSnd_SendungID) 'LÄDT alle Aviso-Anhänge
                                                            For Each l In ANH_LIST
                                                                Select Case l.anh_Art.ToString.ToUpper
-                                                                    Case "RECHNUNG", "CMR", "AUSFUHR", "COO", "PACKLISTE"
+                                                                   ' Case "RECHNUNG", "CMR", "AUSFUHR", "COO", "PACKLISTE"
                                                                    Case "EXPORT_DOCS"
                                                                        Dim PathTmpANH = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(l.anh_docId)).GET_TOP1_PATH(False)
                                                                        If PathTmpANH <> "" Then anhaengeVersand.Add(PathTmpANH) : found = True
                                                                End Select
@@ -6155,9 +6237,9 @@ Public Class AvisoStatusFunctions
        '        Exit Sub
        '    End If
        'End If
-        ''  Next
+        ''  Next 
        Dim zoll As New SDL.frmKundenUebersichtZOLL(kdnr)
-        zoll.Show()
+        If zoll IsNot Nothing Then zoll.Show()
    End Sub
--- a/Aviso/frmLogin.designer.vb
+++ b/Aviso/frmLogin.designer.vb
@@ -55,6 +55,7 @@ Partial Class frmLogin
        Me.UpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
        Me.cboWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Panel1.SuspendLayout()
        Me.Panel2.SuspendLayout()
        Me.ContextMenuStrip2.SuspendLayout()
@@ -110,6 +111,7 @@ Partial Class frmLogin
        '
        Me.Panel1.BackColor = System.Drawing.Color.White
        Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.Panel1.Controls.Add(Me.cboWarenort)
        Me.Panel1.Controls.Add(Me.lblTESTSYSTEM)
        Me.Panel1.Controls.Add(Me.FlatButton1)
        Me.Panel1.Controls.Add(Me.Panel2)
@@ -185,81 +187,81 @@ Partial Class frmLogin
        '
        Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem2, Me.TESTSYSTEMToolStripMenuItem, Me.UpdateToolStripMenuItem1})
        Me.ContextMenuStrip2.Name = "ctxUpdate"
-        Me.ContextMenuStrip2.Size = New System.Drawing.Size(144, 70)
+        Me.ContextMenuStrip2.Size = New System.Drawing.Size(141, 70)
        '
        'ToolStripMenuItem2
        '
        Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VERAGToolStripMenuItem, Me.ATILLAToolStripMenuItem, Me.IMEXToolStripMenuItem, Me.FRONTOFFICEToolStripMenuItem, Me.UNISPEDToolStripMenuItem, Me.AMBARToolStripMenuItem, Me.VERIMEXToolStripMenuItem})
        Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
-        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(143, 22)
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(140, 22)
        Me.ToolStripMenuItem2.Text = "FIRMA"
        '
        'VERAGToolStripMenuItem
        '
        Me.VERAGToolStripMenuItem.Name = "VERAGToolStripMenuItem"
-        Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(154, 22)
        Me.VERAGToolStripMenuItem.Text = "VERAG"
        '
        'ATILLAToolStripMenuItem
        '
        Me.ATILLAToolStripMenuItem.Name = "ATILLAToolStripMenuItem"
-        Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(154, 22)
        Me.ATILLAToolStripMenuItem.Text = "ATILLA"
        '
        'IMEXToolStripMenuItem
        '
        Me.IMEXToolStripMenuItem.Name = "IMEXToolStripMenuItem"
-        Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(154, 22)
        Me.IMEXToolStripMenuItem.Text = "IMEX"
        '
        'FRONTOFFICEToolStripMenuItem
        '
        Me.FRONTOFFICEToolStripMenuItem.Name = "FRONTOFFICEToolStripMenuItem"
-        Me.FRONTOFFICEToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.FRONTOFFICEToolStripMenuItem.Size = New System.Drawing.Size(154, 22)
        Me.FRONTOFFICEToolStripMenuItem.Text = "FRONT-OFFICE"
        '
        'UNISPEDToolStripMenuItem
        '
        Me.UNISPEDToolStripMenuItem.Name = "UNISPEDToolStripMenuItem"
-        Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(154, 22)
        Me.UNISPEDToolStripMenuItem.Text = "UNISPED"
        '
        'AMBARToolStripMenuItem
        '
        Me.AMBARToolStripMenuItem.Name = "AMBARToolStripMenuItem"
-        Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(154, 22)
        Me.AMBARToolStripMenuItem.Text = "AMBAR"
        '
        'VERIMEXToolStripMenuItem
        '
        Me.VERIMEXToolStripMenuItem.Name = "VERIMEXToolStripMenuItem"
-        Me.VERIMEXToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.VERIMEXToolStripMenuItem.Size = New System.Drawing.Size(154, 22)
        Me.VERIMEXToolStripMenuItem.Text = "VERIMEX"
        '
        'TESTSYSTEMToolStripMenuItem
        '
        Me.TESTSYSTEMToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PRODUKTIVToolStripMenuItem, Me.TESTSYSTEMToolStripMenuItem1})
        Me.TESTSYSTEMToolStripMenuItem.Name = "TESTSYSTEMToolStripMenuItem"
-        Me.TESTSYSTEMToolStripMenuItem.Size = New System.Drawing.Size(143, 22)
+        Me.TESTSYSTEMToolStripMenuItem.Size = New System.Drawing.Size(140, 22)
        Me.TESTSYSTEMToolStripMenuItem.Text = "TESTSYSTEM"
        Me.TESTSYSTEMToolStripMenuItem.Visible = False
        '
        'PRODUKTIVToolStripMenuItem
        '
        Me.PRODUKTIVToolStripMenuItem.Name = "PRODUKTIVToolStripMenuItem"
-        Me.PRODUKTIVToolStripMenuItem.Size = New System.Drawing.Size(143, 22)
+        Me.PRODUKTIVToolStripMenuItem.Size = New System.Drawing.Size(140, 22)
        Me.PRODUKTIVToolStripMenuItem.Text = "PRODUKTIV"
        '
        'TESTSYSTEMToolStripMenuItem1
        '
        Me.TESTSYSTEMToolStripMenuItem1.Name = "TESTSYSTEMToolStripMenuItem1"
-        Me.TESTSYSTEMToolStripMenuItem1.Size = New System.Drawing.Size(143, 22)
+        Me.TESTSYSTEMToolStripMenuItem1.Size = New System.Drawing.Size(140, 22)
        Me.TESTSYSTEMToolStripMenuItem1.Text = "TESTSYSTEM"
        '
        'UpdateToolStripMenuItem1
        '
        Me.UpdateToolStripMenuItem1.Name = "UpdateToolStripMenuItem1"
-        Me.UpdateToolStripMenuItem1.Size = New System.Drawing.Size(143, 22)
+        Me.UpdateToolStripMenuItem1.Size = New System.Drawing.Size(140, 22)
        Me.UpdateToolStripMenuItem1.Text = "Update"
        '
        'Label3
@@ -338,6 +340,18 @@ Partial Class frmLogin
        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(112, 22)
        Me.ToolStripMenuItem1.Text = "Update"
        '
        'cboWarenort
        '
        Me.cboWarenort._allowedValuesFreiText = Nothing
        Me.cboWarenort._allowFreiText = False
        Me.cboWarenort._value = ""
        Me.cboWarenort.FormattingEnabled = True
        Me.cboWarenort.Location = New System.Drawing.Point(11, 35)
        Me.cboWarenort.Name = "cboWarenort"
        Me.cboWarenort.Size = New System.Drawing.Size(288, 21)
        Me.cboWarenort.TabIndex = 13
        Me.cboWarenort.Visible = False
        '
        'frmLogin
        '
        Me.AcceptButton = Me.btnOK
@@ -396,4 +410,5 @@ Partial Class frmLogin
    Friend WithEvents UNISPEDToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents AMBARToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents VERIMEXToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents cboWarenort As VERAG_PROG_ALLGEMEIN.MyComboBox
 End Class
--- a/Aviso/frmLogin.vb
+++ b/Aviso/frmLogin.vb
@@ -45,7 +45,8 @@ Public Class frmLogin
                Case "UNISPED" : firma = "AMBAR"
                Case "AMBAR" : firma = "FRONTOFFICE"
                Case "FRONTOFFICE" : firma = "VERIMEX"
-                Case "VERIMEX" : firma = "VERAG"
+                Case "VERIMEX" : firma = "WARENORT"
                Case "WARENORT" : firma = "VERAG"
            End Select
            ' firma = If(firma = "VERAG", "ATILLA", If(firma = "ATILLA", "IMEX", "VERAG"))
@@ -67,9 +68,17 @@ Public Class frmLogin
        Dim pfadDatei As String = Application.StartupPath & "\Standort.txt"
        firma = "VERAG"
        VERAG_PROG_ALLGEMEIN.cAllgemein.PROGNAME = "AVISO_NEW"
        VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID = 16
        VERAG_PROG_ALLGEMEIN.cAllgemein.PROGVERSION = Application.ProductVersion
        'initCBOWarenort
        Dim testSysTMP = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM
        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
        cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO]  FROM [tblGrenzstelle] where [grz_Warenort]=1", False, "AVISO")
        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = testSysTMP
        If File.Exists(pfadDatei) Then
            Dim fs As New FileStream(pfadDatei, FileMode.Open, FileAccess.Read)
            Dim strmReader As New StreamReader(fs)
@@ -191,6 +200,7 @@ Public Class frmLogin
    Sub initstart(Optional secret = False)
        picLogin.Size = New Size(picLogin.Width, 50)
        cboWarenort.Visible = False
        Select Case firma
            Case "VERAG"
                '  cGlobal.ConnStrFMZOLL = VERAG_PROG_ALLGEMEIN.My.MySettings.Default.FMZOLL_PRODConnectionString
@@ -217,6 +227,11 @@ Public Class frmLogin
            Case "FRONTOFFICE"
                picLogin.Size = New Size(picLogin.Width, 71)
                picLogin.Image = My.Resources.FrontOfficeSUB
            Case "WARENORT"
                picLogin.Size = New Size(picLogin.Width, 71)
                picLogin.Image = Nothing
                cboWarenort.Visible = True
            Case "VERIMEX"
                picLogin.Size = New Size(picLogin.Width, 71)
                picLogin.Image = My.Resources.verimex
@@ -256,7 +271,22 @@ Public Class frmLogin
    End Sub
    Private Sub btnOK_Click(sender As System.Object, e As System.EventArgs) Handles btnOK.Click
        VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG = False
        'Auf WARENORT UMSTELLEN
        If firma = "WARENORT" Then
            VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG = True
            VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT = cboWarenort._value
            Dim testSysTMP = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM
            VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
            Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
            firma = SQL.DLookup("grz_Firma", "tblGrenzstelle", "grz_Grenzstelle='" & cboWarenort._value & "'", "AVISO", "")
            If firma = "" Then firma = "WARENORT" : Exit Sub
            'NIEDERLASSUNG?
            VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = testSysTMP
        End If
        If firma = "ATILLA" Then
            Dim büroDatei As String = "C:\VERAG\büro.txt"
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -1781,6 +1781,7 @@ Public Class frmSendungsdetailsNEU
    Sub initDrucker()
        ' SDL.cProgramFunctions.initDrucker(cboPrinter)
        Try
            ' alle installierten Drucker ermitteln und 
@@ -1811,13 +1812,19 @@ Public Class frmSendungsdetailsNEU
                    setCboEntry(sPrinters(i)) ' cboPrinter.Items.Add(sPrinters(i))
                End If
            Next
            '  Console.WriteLine("SSSSSSSSSSSSSSSSS - " & (VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD.ToUpper))
            setCboSelected(VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD, oPS.PrinterName)
            'If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD <> String.Empty Then
            '    Console.WriteLine(setCboSelected(VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD))
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD <> String.Empty Then
+            '    If Not setCboSelected(VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD) Then
-                setCboSelected(VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD)
+            '        'nicht gefunden
-            Else
+            '        setCboSelected(oPS.PrinterName)
-                setCboSelected(oPS.PrinterName)
+            '    End If
-            End If
+            'Else
            '    setCboSelected(oPS.PrinterName)
            'End If
        Catch ex As Exception
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim initialisieren der Drucker!")
@@ -1841,12 +1848,12 @@ Public Class frmSendungsdetailsNEU
    End Sub
    'threadsicherer Aufruf
-    Delegate Sub setCboSelectedCallback(standardDrucker As String)
+    Delegate Function setCboSelectedCallback(standardDruckerAviso As String, standardDrucker As String) As Boolean
-    Private Sub setCboSelected(standardDrucker As String)
+    Private Function setCboSelected(standardDruckerAviso As String, standardDrucker As String) As Boolean
        If Me.InvokeRequired Then
            Dim d As New setCboSelectedCallback(AddressOf setCboSelected)
            Try
-                Me.Invoke(d, New Object() {standardDrucker})
+                Me.Invoke(d, New Object() {standardDruckerAviso, standardDrucker})
            Catch ex As Exception : End Try
        Else
            Dim found As Boolean = False
@@ -1859,16 +1866,28 @@ Public Class frmSendungsdetailsNEU
            If found = False Then 'Falls kein TALLY, Standarddrucker
                cboPrinter.SelectedIndex = 0
                If standardDruckerAviso <> "" Then
                    For Each i In cboPrinter.Items
                        If i.ToString.ToUpper.Contains(standardDruckerAviso.ToUpper) Then  '  If i.ToString = standardDrucker Then ' Contains, weil sonst \\dc02\ stört   
                            cboPrinter.SelectedItem = i
                            Return True ' Exit For
                        End If
                    Next
                End If
                'nciht gefunden --> Standard
                For Each i In cboPrinter.Items
                    If i.ToString.ToUpper.Contains(standardDrucker.ToUpper) Then  '  If i.ToString = standardDrucker Then ' Contains, weil sonst \\dc02\ stört   
                        cboPrinter.SelectedItem = i
-                        Exit For
+                        Return True ' Exit For
                    End If
                Next
            End If
        End If
-
+        Return False
-    End Sub
+    End Function
@@ -3876,24 +3895,26 @@ Public Class frmSendungsdetailsNEU
                    'ATA FREMD!!!
                    If sender Is ToolStripMenuItem15 Then
                        Mail.Subject = "Kennzeichen: " & AVISO.LKW_Nr & "  |  Grenze: " & lblGrenze.Text
                        If If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender, "") <> "" Then Mail.Subject &= "  |  Absender: " & SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender
                        If If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, "") <> "" Then Mail.Subject &= "  |  Gewicht: " & SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht
                        Dim TextHTML = ""
                        TextHTML &= "Sehr geehrte Damen und Herren,<br>"
                        TextHTML &= "<br>"
-                        TextHTML &= "beiliegend senden wir Ihnen die Sendungsunterlagen für den o.g. LKW/Container. Wir bitten um Zusendung der ATA-Nummer.<br>"
+                            TextHTML &= "beiliegend senden wir Ihnen die Sendungsunterlagen für den o.g. LKW/Container. Wir bitten um Zusendung der ATA-Nummer.<br>"
-                        TextHTML &= "<br>"
+                            TextHTML &= "<br>"
-                        TextHTML &= "Mit freundlichen Grüßen<br>"
+                            TextHTML &= "Mit freundlichen Grüßen<br>"
-                        TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
+                            TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
-                        TextHTML &= "<br>"
+                            TextHTML &= "<br>"
-                        Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & TextHTML & SDL.cFakturierung.getSignature("DE") & "</div>"
+                            Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & TextHTML & SDL.cFakturierung.getSignature("DE") & "</div>"
-                        AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "ATA-Nr fehlt (Fremdanmeldung) - angefordert", 33)
+                            AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "ATA-Nr fehlt (Fremdanmeldung) - angefordert", 33)
-                    End If
+                        End If
-                    Mail.Display()
+                        Mail.Display()
                Catch ex As Exception
                    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
@@ -3985,10 +4006,12 @@ Public Class frmSendungsdetailsNEU
                    pnlKundenInfo.AutoScrollMinSize = New Size(c.Width, c.Height)
                    pnlKundenInfo.Controls.Add(c)
                End If
                DirectCast(pnlKundenInfo.Controls(0), SDL.usrCntlKundenuebersicht).setKD(kdNr)
                DirectCast(pnlKundenInfo.Controls(0), SDL.usrCntlKundenuebersicht).Visible = True
            Else
                If pnlKundenInfo.Controls.Count > 0 Then
                    DirectCast(pnlKundenInfo.Controls(0), SDL.usrCntlKundenuebersicht).setKD(kdNr)
                    DirectCast(pnlKundenInfo.Controls(0), SDL.usrCntlKundenuebersicht).Visible = True
                End If
            Else
                    If pnlKundenInfo.Controls.Count > 0 Then
                    DirectCast(pnlKundenInfo.Controls(0), SDL.usrCntlKundenuebersicht).Visible = False
                End If
            End If
@@ -5027,7 +5050,7 @@ Public Class frmSendungsdetailsNEU
                    Dim ANH_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge)
                    Dim cnt = 1
                    For Each SND In SENDUNG_LIST
-
+                        Dim gestellungsadresseTmp = ""
                        If (OnylSND >= 0 AndAlso SND Is SENDUNG_LIST(OnylSND)) Or (OnylSND < 0 And SND.FilialenNr = 4839) Then
                            TextHTML &= "<tr>"
                            TextHTML &= "<td><b>" & cnt & "</b></td>"
@@ -5036,7 +5059,18 @@ Public Class frmSendungsdetailsNEU
                            TextHTML &= "<td><b>" & SND.tblSnd_Absender & "</b></td>"
                            TextHTML &= "<td><b>" & SND.tblSnd_Empfaenger & "</b></td>"
                            TextHTML &= "<td><b>" & SND.tblSnd_Colli & " Pk. " & SND.tblSnd_Warenbezeichnung & "   -  " & SND.tblSnd_Gewicht & " kg </b></td>"
-                            TextHTML &= "<td><b>VERAG</b></td>" '??????
+
                            TextHTML &= "<td><b>"
                            If SND.tblSnd_BARzuKassieren IsNot Nothing Then
                                If IsNumeric(SND.tblSnd_BARzuKassieren) AndAlso SND.tblSnd_BARzuKassieren <> 0 Then
                                    TextHTML &= "BAR kassieren:" & CDbl(SND.tblSnd_BARzuKassieren).ToString("C2")
                                Else
                                    TextHTML &= "BAR kassieren:" & SND.tblSnd_BARzuKassieren 'falls keine Zahl
                                End If
                            Else
                                TextHTML &= "VERAG"
                            End If
                            TextHTML &= "</b></td>"
                            Select Case SND.tblSnd_Abfertigungsart_ID
                                Case "38", "1"
@@ -5053,6 +5087,11 @@ Public Class frmSendungsdetailsNEU
                                        TextHTML &= "<td><b>-</b></td>"
                                        TextHTML &= "<td><b>-</b></td>"
                                    End If
                                Case "5", "6"
                                    gestellungsadresseTmp = SND.getNCTSAdress().Trim
                                    TextHTML &= "<td><b>-</b></td>"
                                    TextHTML &= "<td><b>-</b></td>"
                                    TextHTML &= "<td><b>-</b></td>"
                                Case Else
                                    TextHTML &= "<td><b>-</b></td>"
                                    TextHTML &= "<td><b>-</b></td>"
@@ -5061,6 +5100,13 @@ Public Class frmSendungsdetailsNEU
                            TextHTML &= "</tr>"
                            If gestellungsadresseTmp <> "" Then
                                TextHTML &= "<tr>"
                                TextHTML &= "<td colspan=2><b></b></td>"
                                TextHTML &= "<td colspan=2>NCTS-Gestellungsadresse:</td>"
                                TextHTML &= "<td colspan=6><b>" & gestellungsadresseTmp & "</b></td>"
                                TextHTML &= "</tr>"
                            End If
                            '....
                            'For Each r As DataGridViewRow In dgvAnhang.SelectedRows
                            '    Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
--- a/Aviso/usrcntlAktDetails.Designer.vb
+++ b/Aviso/usrcntlAktDetails.Designer.vb
@@ -95,6 +95,8 @@ Partial Class usrcntlAktDetails
        Me.tbAnhang = New System.Windows.Forms.TabPage()
        Me.addVermerk = New System.Windows.Forms.Button()
        Me.pnlMAInfo = New System.Windows.Forms.Panel()
        Me.picMAinfo_TRVorgeschrieben = New System.Windows.Forms.PictureBox()
        Me.txtMAinfo_TRVorgeschrieben = New System.Windows.Forms.TextBox()
        Me.picMAinfo_AbklaerungTR = New System.Windows.Forms.PictureBox()
        Me.picMAinfo_Vorgeschrieben = New System.Windows.Forms.PictureBox()
        Me.picMAinfo_VorbereitetQs = New System.Windows.Forms.PictureBox()
@@ -156,6 +158,8 @@ Partial Class usrcntlAktDetails
        Me.DispolisteTRToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DispolisteENToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.pnlOptionen = New System.Windows.Forms.Panel()
        Me.Button16 = New System.Windows.Forms.Button()
        Me.Button15 = New System.Windows.Forms.Button()
        Me.Button6 = New System.Windows.Forms.Button()
        Me.Button4 = New System.Windows.Forms.Button()
        Me.btnWlanTicket = New System.Windows.Forms.Button()
@@ -165,7 +169,6 @@ Partial Class usrcntlAktDetails
        Me.btnÄndern = New System.Windows.Forms.Button()
        Me.btnTV = New System.Windows.Forms.Button()
        Me.Button10 = New System.Windows.Forms.Button()
        Me.Button15 = New System.Windows.Forms.Button()
        Me.pnlDetailsRechts.SuspendLayout()
        Me.Panel3.SuspendLayout()
        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -183,6 +186,7 @@ Partial Class usrcntlAktDetails
        Me.Panel1.SuspendLayout()
        Me.tbcntlVermerke.SuspendLayout()
        Me.pnlMAInfo.SuspendLayout()
        CType(Me.picMAinfo_TRVorgeschrieben, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.picMAinfo_AbklaerungTR, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.picMAinfo_Vorgeschrieben, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.picMAinfo_VorbereitetQs, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -215,7 +219,7 @@ Partial Class usrcntlAktDetails
        Me.pnlDetailsRechts.Location = New System.Drawing.Point(0, 0)
        Me.pnlDetailsRechts.MinimumSize = New System.Drawing.Size(200, 0)
        Me.pnlDetailsRechts.Name = "pnlDetailsRechts"
-        Me.pnlDetailsRechts.Size = New System.Drawing.Size(575, 721)
+        Me.pnlDetailsRechts.Size = New System.Drawing.Size(575, 734)
        Me.pnlDetailsRechts.TabIndex = 81
        '
        'Panel3
@@ -226,7 +230,7 @@ Partial Class usrcntlAktDetails
        Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill
        Me.Panel3.Location = New System.Drawing.Point(0, 105)
        Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(575, 616)
+        Me.Panel3.Size = New System.Drawing.Size(575, 629)
        Me.Panel3.TabIndex = 91
        '
        'SplitContainer
@@ -254,8 +258,8 @@ Partial Class usrcntlAktDetails
        Me.SplitContainer.Panel2.Controls.Add(Me.pnlVermerkeTop)
        Me.SplitContainer.Panel2.Controls.Add(Me.addVermerk)
        Me.SplitContainer.Panel2.Controls.Add(Me.pnlMAInfo)
-        Me.SplitContainer.Size = New System.Drawing.Size(575, 496)
+        Me.SplitContainer.Size = New System.Drawing.Size(575, 509)
-        Me.SplitContainer.SplitterDistance = 228
+        Me.SplitContainer.SplitterDistance = 233
        Me.SplitContainer.TabIndex = 91
        '
        'pnlAlt
@@ -268,7 +272,7 @@ Partial Class usrcntlAktDetails
        Me.pnlAlt.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlAlt.Location = New System.Drawing.Point(0, 0)
        Me.pnlAlt.Name = "pnlAlt"
-        Me.pnlAlt.Size = New System.Drawing.Size(575, 228)
+        Me.pnlAlt.Size = New System.Drawing.Size(575, 233)
        Me.pnlAlt.TabIndex = 72
        Me.pnlAlt.Visible = False
        '
@@ -362,6 +366,7 @@ Partial Class usrcntlAktDetails
        Me.txtSendungen._DateTimeOnly = False
        Me.txtSendungen._numbersOnly = True
        Me.txtSendungen._numbersOnlyKommastellen = ""
        Me.txtSendungen._numbersOnlyTrennzeichen = True
        Me.txtSendungen._Prozent = False
        Me.txtSendungen._ShortDateNew = False
        Me.txtSendungen._ShortDateOnly = False
@@ -423,6 +428,7 @@ Partial Class usrcntlAktDetails
        Me.txtSndFremd._DateTimeOnly = False
        Me.txtSndFremd._numbersOnly = True
        Me.txtSndFremd._numbersOnlyKommastellen = ""
        Me.txtSndFremd._numbersOnlyTrennzeichen = True
        Me.txtSndFremd._Prozent = False
        Me.txtSndFremd._ShortDateNew = False
        Me.txtSndFremd._ShortDateOnly = False
@@ -476,6 +482,7 @@ Partial Class usrcntlAktDetails
        Me.txtSndFiskalDE._DateTimeOnly = False
        Me.txtSndFiskalDE._numbersOnly = True
        Me.txtSndFiskalDE._numbersOnlyKommastellen = ""
        Me.txtSndFiskalDE._numbersOnlyTrennzeichen = True
        Me.txtSndFiskalDE._Prozent = False
        Me.txtSndFiskalDE._ShortDateNew = False
        Me.txtSndFiskalDE._ShortDateOnly = False
@@ -510,6 +517,7 @@ Partial Class usrcntlAktDetails
        Me.txtSndFiskalAT._DateTimeOnly = False
        Me.txtSndFiskalAT._numbersOnly = True
        Me.txtSndFiskalAT._numbersOnlyKommastellen = ""
        Me.txtSndFiskalAT._numbersOnlyTrennzeichen = True
        Me.txtSndFiskalAT._Prozent = False
        Me.txtSndFiskalAT._ShortDateNew = False
        Me.txtSndFiskalAT._ShortDateOnly = False
@@ -635,7 +643,7 @@ Partial Class usrcntlAktDetails
        Me.dgvSendungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.dgvSendungen.ShowCellErrors = False
        Me.dgvSendungen.ShowRowErrors = False
-        Me.dgvSendungen.Size = New System.Drawing.Size(575, 228)
+        Me.dgvSendungen.Size = New System.Drawing.Size(575, 233)
        Me.dgvSendungen.TabIndex = 71
        Me.dgvSendungen.TabStop = False
        '
@@ -647,7 +655,7 @@ Partial Class usrcntlAktDetails
        Me.Panel7.Location = New System.Drawing.Point(4, 19)
        Me.Panel7.MaximumSize = New System.Drawing.Size(2, 250)
        Me.Panel7.Name = "Panel7"
-        Me.Panel7.Size = New System.Drawing.Size(1, 103)
+        Me.Panel7.Size = New System.Drawing.Size(1, 108)
        Me.Panel7.TabIndex = 15
        '
        'btnQuckScan
@@ -656,7 +664,7 @@ Partial Class usrcntlAktDetails
        Me.btnQuckScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnQuckScan.Image = CType(resources.GetObject("btnQuckScan.Image"), System.Drawing.Image)
        Me.btnQuckScan.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnQuckScan.Location = New System.Drawing.Point(468, 194)
+        Me.btnQuckScan.Location = New System.Drawing.Point(468, 202)
        Me.btnQuckScan.Name = "btnQuckScan"
        Me.btnQuckScan.Size = New System.Drawing.Size(107, 34)
        Me.btnQuckScan.TabIndex = 107
@@ -671,7 +679,7 @@ Partial Class usrcntlAktDetails
        Me.picArrowDown.BackgroundImage = Global.AVISO.My.Resources.Resources.arrow_down_orange
        Me.picArrowDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
        Me.picArrowDown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.picArrowDown.Location = New System.Drawing.Point(1, 226)
+        Me.picArrowDown.Location = New System.Drawing.Point(1, 234)
        Me.picArrowDown.Name = "picArrowDown"
        Me.picArrowDown.Size = New System.Drawing.Size(34, 34)
        Me.picArrowDown.TabIndex = 104
@@ -950,7 +958,7 @@ Partial Class usrcntlAktDetails
        Me.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button18.Image = CType(resources.GetObject("Button18.Image"), System.Drawing.Image)
        Me.Button18.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button18.Location = New System.Drawing.Point(447, 226)
+        Me.Button18.Location = New System.Drawing.Point(447, 235)
        Me.Button18.Name = "Button18"
        Me.Button18.Size = New System.Drawing.Size(128, 34)
        Me.Button18.TabIndex = 103
@@ -1010,7 +1018,7 @@ Partial Class usrcntlAktDetails
        Me.gridVermerke.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.gridVermerke.ShowCellErrors = False
        Me.gridVermerke.ShowRowErrors = False
-        Me.gridVermerke.Size = New System.Drawing.Size(575, 206)
+        Me.gridVermerke.Size = New System.Drawing.Size(575, 214)
        Me.gridVermerke.TabIndex = 70
        Me.gridVermerke.TabStop = False
        '
@@ -1151,6 +1159,8 @@ Partial Class usrcntlAktDetails
        '
        'pnlMAInfo
        '
        Me.pnlMAInfo.Controls.Add(Me.picMAinfo_TRVorgeschrieben)
        Me.pnlMAInfo.Controls.Add(Me.txtMAinfo_TRVorgeschrieben)
        Me.pnlMAInfo.Controls.Add(Me.picMAinfo_AbklaerungTR)
        Me.pnlMAInfo.Controls.Add(Me.picMAinfo_Vorgeschrieben)
        Me.pnlMAInfo.Controls.Add(Me.picMAinfo_VorbereitetQs)
@@ -1158,11 +1168,39 @@ Partial Class usrcntlAktDetails
        Me.pnlMAInfo.Controls.Add(Me.txtMAinfo_Vorgeschrieben)
        Me.pnlMAInfo.Controls.Add(Me.txtMAinfo_VorbereitetQs)
        Me.pnlMAInfo.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnlMAInfo.Location = New System.Drawing.Point(0, 236)
+        Me.pnlMAInfo.Location = New System.Drawing.Point(0, 244)
        Me.pnlMAInfo.Name = "pnlMAInfo"
        Me.pnlMAInfo.Size = New System.Drawing.Size(575, 28)
        Me.pnlMAInfo.TabIndex = 106
        '
        'picMAinfo_TRVorgeschrieben
        '
        Me.picMAinfo_TRVorgeschrieben.BackgroundImage = Global.AVISO.My.Resources.Resources.statusBtn_vorgeschrieben_InAktiv
        Me.picMAinfo_TRVorgeschrieben.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.picMAinfo_TRVorgeschrieben.Location = New System.Drawing.Point(437, 3)
        Me.picMAinfo_TRVorgeschrieben.Name = "picMAinfo_TRVorgeschrieben"
        Me.picMAinfo_TRVorgeschrieben.Size = New System.Drawing.Size(26, 21)
        Me.picMAinfo_TRVorgeschrieben.TabIndex = 111
        Me.picMAinfo_TRVorgeschrieben.TabStop = False
        Me.picMAinfo_TRVorgeschrieben.Visible = False
        '
        'txtMAinfo_TRVorgeschrieben
        '
        Me.txtMAinfo_TRVorgeschrieben.BackColor = System.Drawing.Color.WhiteSmoke
        Me.txtMAinfo_TRVorgeschrieben.BorderStyle = System.Windows.Forms.BorderStyle.None
        Me.txtMAinfo_TRVorgeschrieben.Cursor = System.Windows.Forms.Cursors.Hand
        Me.txtMAinfo_TRVorgeschrieben.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
        Me.txtMAinfo_TRVorgeschrieben.ForeColor = System.Drawing.Color.Black
        Me.txtMAinfo_TRVorgeschrieben.Location = New System.Drawing.Point(469, 5)
        Me.txtMAinfo_TRVorgeschrieben.MaxLength = 0
        Me.txtMAinfo_TRVorgeschrieben.Name = "txtMAinfo_TRVorgeschrieben"
        Me.txtMAinfo_TRVorgeschrieben.ReadOnly = True
        Me.txtMAinfo_TRVorgeschrieben.Size = New System.Drawing.Size(105, 14)
        Me.txtMAinfo_TRVorgeschrieben.TabIndex = 112
        Me.txtMAinfo_TRVorgeschrieben.TabStop = False
        Me.txtMAinfo_TRVorgeschrieben.Text = "-"
        Me.txtMAinfo_TRVorgeschrieben.Visible = False
        '
        'picMAinfo_AbklaerungTR
        '
        Me.picMAinfo_AbklaerungTR.BackgroundImage = Global.AVISO.My.Resources.Resources.abklaerungTR_Inaktiv
@@ -1940,6 +1978,7 @@ Partial Class usrcntlAktDetails
        Me.pnlOptionen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.pnlOptionen.BackColor = System.Drawing.Color.Black
        Me.pnlOptionen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.pnlOptionen.Controls.Add(Me.Button16)
        Me.pnlOptionen.Controls.Add(Me.Button15)
        Me.pnlOptionen.Controls.Add(Me.Button6)
        Me.pnlOptionen.Controls.Add(Me.Button4)
@@ -1956,6 +1995,38 @@ Partial Class usrcntlAktDetails
        Me.pnlOptionen.TabIndex = 82
        Me.pnlOptionen.Visible = False
        '
        'Button16
        '
        Me.Button16.BackColor = System.Drawing.Color.White
        Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.Button16.ForeColor = System.Drawing.Color.Black
        Me.Button16.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.Button16.Location = New System.Drawing.Point(72, 185)
        Me.Button16.Name = "Button16"
        Me.Button16.Size = New System.Drawing.Size(39, 28)
        Me.Button16.TabIndex = 108
        Me.Button16.TabStop = False
        Me.Button16.Text = "Link"
        Me.Button16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.Button16.UseVisualStyleBackColor = False
        '
        'Button15
        '
        Me.Button15.BackColor = System.Drawing.Color.White
        Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.Button15.ForeColor = System.Drawing.Color.Black
        Me.Button15.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.Button15.Location = New System.Drawing.Point(72, 214)
        Me.Button15.Name = "Button15"
        Me.Button15.Size = New System.Drawing.Size(39, 28)
        Me.Button15.TabIndex = 107
        Me.Button15.TabStop = False
        Me.Button15.Text = "To"
        Me.Button15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.Button15.UseVisualStyleBackColor = False
        '
        'Button6
        '
        Me.Button6.BackColor = System.Drawing.Color.White
@@ -1981,10 +2052,10 @@ Partial Class usrcntlAktDetails
        Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.Button4.Location = New System.Drawing.Point(3, 185)
        Me.Button4.Name = "Button4"
-        Me.Button4.Size = New System.Drawing.Size(109, 28)
+        Me.Button4.Size = New System.Drawing.Size(71, 28)
        Me.Button4.TabIndex = 104
        Me.Button4.TabStop = False
-        Me.Button4.Text = "Status SMS"
+        Me.Button4.Text = "Stat. SMS"
        Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.Button4.UseVisualStyleBackColor = False
        '
@@ -2098,29 +2169,13 @@ Partial Class usrcntlAktDetails
        Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.Button10.UseVisualStyleBackColor = False
        '
        'Button15
        '
        Me.Button15.BackColor = System.Drawing.Color.White
        Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.Button15.ForeColor = System.Drawing.Color.Black
        Me.Button15.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.Button15.Location = New System.Drawing.Point(72, 214)
        Me.Button15.Name = "Button15"
        Me.Button15.Size = New System.Drawing.Size(39, 28)
        Me.Button15.TabIndex = 107
        Me.Button15.TabStop = False
        Me.Button15.Text = "To"
        Me.Button15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.Button15.UseVisualStyleBackColor = False
        '
        'usrcntlAktDetails
        '
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
        Me.Controls.Add(Me.pnlOptionen)
        Me.Controls.Add(Me.pnlDetailsRechts)
        Me.Name = "usrcntlAktDetails"
-        Me.Size = New System.Drawing.Size(575, 721)
+        Me.Size = New System.Drawing.Size(575, 734)
        Me.pnlDetailsRechts.ResumeLayout(False)
        Me.pnlDetailsRechts.PerformLayout()
        Me.Panel3.ResumeLayout(False)
@@ -2144,6 +2199,7 @@ Partial Class usrcntlAktDetails
        Me.tbcntlVermerke.ResumeLayout(False)
        Me.pnlMAInfo.ResumeLayout(False)
        Me.pnlMAInfo.PerformLayout()
        CType(Me.picMAinfo_TRVorgeschrieben, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.picMAinfo_AbklaerungTR, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.picMAinfo_Vorgeschrieben, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.picMAinfo_VorbereitetQs, System.ComponentModel.ISupportInitialize).EndInit()
@@ -2306,4 +2362,7 @@ Partial Class usrcntlAktDetails
    Friend WithEvents Button6 As Button
    Friend WithEvents Button10 As Button
    Friend WithEvents Button15 As Button
    Friend WithEvents Button16 As Button
    Friend WithEvents picMAinfo_TRVorgeschrieben As PictureBox
    Friend WithEvents txtMAinfo_TRVorgeschrieben As TextBox
 End Class
--- a/Aviso/usrcntlAktDetails.vb
+++ b/Aviso/usrcntlAktDetails.vb
@@ -793,6 +793,12 @@ Public Class usrcntlAktDetails
                    txtMAinfo_AbklaerungTR.Text = "-"
                    txtMAinfo_AbklaerungTR.Tag = ""
                    picMAinfo_TRVorgeschrieben.BackgroundImage = My.Resources.abfetigungTR_inaktiv
                    txtMAinfo_TRVorgeschrieben.Text = "-"
                    txtMAinfo_TRVorgeschrieben.Tag = ""
                    txtMAinfo_TRVorgeschrieben.Visible = False
                    picMAinfo_TRVorgeschrieben.Visible = False
                    'picMAinfo_AbfertigungTR.BackgroundImage = My.Resources.AbfertigungTR_Inaktiv
                    'txtMAinfo_AbfertigungTR.Text = "-"
                    'txtMAinfo_AbfertigungTR.Tag = ""
@@ -837,6 +843,16 @@ Public Class usrcntlAktDetails
                            txtMAinfo_Vorgeschrieben.Tag = dgvSendungen.SelectedRows(0).Cells("tblSnd_VG_MA").Value
                        End If
                        '---------------------------------------------------------
                        'AbfertigungTR
                        If dgvSendungen.SelectedRows(0).Cells("tblSnd_AbfertigungTR").Value IsNot DBNull.Value Then
                            picMAinfo_TRVorgeschrieben.BackgroundImage = My.Resources.abfetigungTR_aktiv
                            txtMAinfo_TRVorgeschrieben.Text = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_AbfertigungTR_MA").Value & "'", "ADMIN", "-")
                            txtMAinfo_TRVorgeschrieben.Tag = dgvSendungen.SelectedRows(0).Cells("tblSnd_AbfertigungTR_MA").Value
                            txtMAinfo_TRVorgeschrieben.Visible = True
                            picMAinfo_TRVorgeschrieben.Visible = True
                        End If
                        '---------------------------------------------------------
                    Else
                        sendwhere = " AND 1=0 " ' 1=0, damit keine Zeile angezeigt wird, wenn keine Sendung ausgewählt
                    End If
@@ -1784,8 +1800,24 @@ Public Class usrcntlAktDetails
            Case "StatusAbfertigungTR"
                sendAktiv = False
                Me.Cursor = Cursors.WaitCursor
-                If FUNC.setSendungAbfertigungTR(SendungsId, AvisoID) Then
+
-                    initDgvSendungen()
+                Dim anzahl As String = "0"
                Dim anzahlPos As String = "0"
                Dim doStatus = True
                If dgvSendungen.Rows(e.RowIndex).Cells("tblSnd_AbfertigungTR").Value Is DBNull.Value Then
                    Dim f As New frmAbfertigungTR_ExportAnz
                    If f.ShowDialog = DialogResult.OK Then
                        anzahl = f.txtAnz._value
                        anzahlPos = f.txtAnzPos._value
                    Else
                        doStatus = False
                    End If
                End If
                If doStatus Then
                    If FUNC.setSendungAbfertigungTR(SendungsId, AvisoID, anzahl, anzahlPos) Then
                        initDgvSendungen()
                    End If
                End If
                Me.Cursor = Cursors.Default
@@ -3141,12 +3173,12 @@ Public Class usrcntlAktDetails
                    End If
                End If
-                Dim Printername = ""
+                'Dim Printername = ""
-                Dim oPS As New System.Drawing.Printing.PrinterSettings
+                'Dim oPS As New System.Drawing.Printing.PrinterSettings
-                Try
+                'Try
-                    Printername = oPS.PrinterName
+                '    Printername = oPS.PrinterName
-                Catch ex As System.Exception
+                'Catch ex As System.Exception
-                End Try
+                'End Try
                For Each s In SPEDBUCHLIST
                    If s.DokumentId_Steuerbeleg IsNot Nothing AndAlso s.DokumentId_Steuerbeleg > 0 Then
@@ -3364,7 +3396,7 @@ Public Class usrcntlAktDetails
        ArrowDown_ShowHide()
    End Sub
-    Private Sub txtMAinfo_VorbereitetQs_TextChanged(sender As Object, e As EventArgs) Handles txtMAinfo_VorbereitetQs.Click, txtMAinfo_Vorgeschrieben.Click, txtMAinfo_AbklaerungTR.Click
+    Private Sub txtMAinfo_VorbereitetQs_TextChanged(sender As Object, e As EventArgs) Handles txtMAinfo_VorbereitetQs.Click, txtMAinfo_Vorgeschrieben.Click, txtMAinfo_AbklaerungTR.Click, txtMAinfo_TRVorgeschrieben.Click
        If sender.tag IsNot DBNull.Value AndAlso sender.tag IsNot Nothing Then
            If IsNumeric(sender.tag) Then
                Dim f As New VERAG_PROG_ALLGEMEIN.frmMitarbeitersuche(sender.tag)
@@ -3465,5 +3497,9 @@ Public Class usrcntlAktDetails
            AvisoStatusFunctions.SendStatusEmail(AVISO, mailTo)
        End If
    End Sub
    Private Sub Button16_Click(sender As Object, e As EventArgs) Handles Button16.Click
        Process.Start("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID))
    End Sub
 End Class
--- a/AvisoTV/frmAnzeige.vb
+++ b/AvisoTV/frmAnzeige.vb
@@ -480,7 +480,7 @@ Public Class frmAnzeige
            If StandortATILLA Then
                AvisoTV = AvisoTVDAL.LesenAvisoTV(-1, "", "ATILLA", Special)
            Else
-                AvisoTV = AvisoTVDAL.LesenAvisoTV(-1, "", Standort, Special)
+                AvisoTV = AvisoTVDAL.LesenAvisoTV(-1, "", Standort.Replace("AMBAR", "AMB"), Special)
            End If
            Dim lblBigInfoVisible = False
            lblBigInfo.Visible = False
--- a/Diverses/zollico.ico
+++ b/Diverses/zollico.ico
--- a/Gemeinsames/subRptSendungenZollpruefung.Designer.vb
+++ b/Gemeinsames/subRptSendungenZollpruefung.Designer.vb
@@ -178,6 +178,7 @@ Partial Public Class subRptSendungenZollpruefung
        Me.TextBox4.Text = "Absender:"
        Me.TextBox4.Top = 1.266142!
        Me.TextBox4.Width = 0.8811023!
        Me.TextBox4.Visible = False
        '
        'TextBox5
        '
@@ -211,6 +212,7 @@ Partial Public Class subRptSendungenZollpruefung
        Me.txtAbsender.Text = Nothing
        Me.txtAbsender.Top = 1.266143!
        Me.txtAbsender.Width = 3.150787!
        Me.txtAbsender.Visible = False
        '
        'txtEmpfaenger
        '
@@ -244,6 +246,7 @@ Partial Public Class subRptSendungenZollpruefung
        Me.TextBox7.Text = "Vertreter:"
        Me.TextBox7.Top = 1.70315!
        Me.TextBox7.Width = 0.8811023!
        Me.TextBox7.Visible = False
        '
        'txtVertreter
        '
@@ -255,6 +258,7 @@ Partial Public Class subRptSendungenZollpruefung
        Me.txtVertreter.Text = Nothing
        Me.txtVertreter.Top = 1.70315!
        Me.txtVertreter.Width = 3.150787!
        Me.txtVertreter.Visible = False
        '
        'txtVerBestLandZst
        '
--- a/VERAG_TELEINFO/App.config
+++ b/VERAG_TELEINFO/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
    </startup>
-</configuration>
+</configuration>
--- a/VERAG_TELEINFO/VERAG_TELEINFO.vbproj
+++ b/VERAG_TELEINFO/VERAG_TELEINFO.vbproj
@@ -11,9 +11,10 @@
    <AssemblyName>VERAG_TELEINFO</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>WindowsFormsWithCustomSubMain</MyType>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <Deterministic>true</Deterministic>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -111,6 +112,9 @@
      <HintPath>..\..\..\dll\Tapi3\VBTAPI.dll</HintPath>
      <EmbedInteropTypes>False</EmbedInteropTypes>
    </Reference>
    <Reference Include="zdk.net">
      <HintPath>..\..\..\dll\ZOIPER\zdk.net_Windows_x86_64_v2.0.17.0\zdk.net_Windows_x86_64_v2.0.17.0\RunTest\zdk.net.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Import Include="Microsoft.VisualBasic" />
@@ -124,6 +128,7 @@
    <Import Include="System.Linq" />
    <Import Include="System.Xml.Linq" />
    <Import Include="System.Threading.Tasks" />
    <Import Include="ZDK_NET" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Form1.vb">
@@ -141,6 +146,12 @@
    <Compile Include="Form2.vb">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="frmCamera.Designer.vb">
      <DependentUpon>frmCamera.vb</DependentUpon>
    </Compile>
    <Compile Include="frmCamera.vb">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="frmTapi.Designer.vb">
      <DependentUpon>frmTapi.vb</DependentUpon>
    </Compile>
@@ -180,9 +191,87 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <Content Include="antlr3c.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="avcodec-53.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="avutil-51.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="bctoolbox.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="belcard.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="bellesip.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="belr.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="bv16.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="bzrtp.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="gsm.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="libbcg729.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="linphone.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="mbedcrypto.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="mbedtls.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="mbedx509.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="mediastreamer_base.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="mediastreamer_voip.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="opus.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="ortp.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="PlathosysApiWrapper.pdb">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="speex.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="speexdsp.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="sqlite3.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="srtp.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="swscale-2.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="xml2.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="zlib.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <None Include="My Project\app.manifest" />
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
@@ -220,6 +309,10 @@
      <Project>{a4a15e4a-9d83-4fd5-807b-63fc87ca4f0f}</Project>
      <Name>PlathosysApiWrapper</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\..\dll\BRIA\Bria_API_CSharp_SampleApp_3-main\Bria_API_CSharp_SampleApp_3-main\Bria_API_SampleApp_Phone\Bria_API_CSharp_SampleApp_3.0.csproj">
      <Project>{1f68e194-88a8-47f2-b9f9-20e092efa30a}</Project>
      <Name>Bria_API_CSharp_SampleApp_3.0</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
      <Project>{A3B497BD-842C-4A2B-B398-ED1976849DF1}</Project>
      <Name>VERAG_PROG_ALLGEMEIN</Name>
@@ -229,6 +322,12 @@
    <PackageReference Include="ATAPI">
      <Version>2018.3.9</Version>
    </PackageReference>
    <PackageReference Include="LinphoneSDK.Windows">
      <Version>5.2.0-alpha.156</Version>
    </PackageReference>
  </ItemGroup>
  <ItemGroup>
    <Folder Include="lib\" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/VERAG_TELEINFO/antlr3c.dll
+++ b/VERAG_TELEINFO/antlr3c.dll
--- a/VERAG_TELEINFO/avcodec-53.dll
+++ b/VERAG_TELEINFO/avcodec-53.dll
--- a/VERAG_TELEINFO/avutil-51.dll
+++ b/VERAG_TELEINFO/avutil-51.dll
--- a/VERAG_TELEINFO/bctoolbox.dll
+++ b/VERAG_TELEINFO/bctoolbox.dll
--- a/VERAG_TELEINFO/belcard.dll
+++ b/VERAG_TELEINFO/belcard.dll
--- a/VERAG_TELEINFO/bellesip.dll
+++ b/VERAG_TELEINFO/bellesip.dll
--- a/VERAG_TELEINFO/belr.dll
+++ b/VERAG_TELEINFO/belr.dll
--- a/VERAG_TELEINFO/bv16.dll
+++ b/VERAG_TELEINFO/bv16.dll
--- a/VERAG_TELEINFO/bzrtp.dll
+++ b/VERAG_TELEINFO/bzrtp.dll
--- a/VERAG_TELEINFO/frmCamera.Designer.vb
+++ b/VERAG_TELEINFO/frmCamera.Designer.vb
@@ -0,0 +1,30 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
 Partial Class frmCamera
    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()
        components = New System.ComponentModel.Container
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(800, 450)
        Me.Text = "frmCamera"
    End Sub
 End Class
--- a/VERAG_TELEINFO/frmCamera.vb
+++ b/VERAG_TELEINFO/frmCamera.vb
@@ -0,0 +1,3 @@
 Public Class frmCamera
 End Class
--- a/VERAG_TELEINFO/frmTapi.Designer.vb
+++ b/VERAG_TELEINFO/frmTapi.Designer.vb
@@ -30,21 +30,22 @@ Partial Class frmTapi
        Me.Timer = New System.Windows.Forms.Timer(Me.components)
        Me.pnl = New System.Windows.Forms.Panel()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.picCallState = New System.Windows.Forms.PictureBox()
        Me.pic = New System.Windows.Forms.PictureBox()
        Me.lblCallState = New System.Windows.Forms.Label()
        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
        Me.Panel2 = New System.Windows.Forms.Panel()
        Me.lblClose = New System.Windows.Forms.Label()
        Me.pic = New System.Windows.Forms.PictureBox()
        Me.lblClock = New System.Windows.Forms.Label()
        Me.lbl = New System.Windows.Forms.Label()
        Me.Panel = New System.Windows.Forms.Panel()
        Me.pnl.SuspendLayout()
        Me.Panel1.SuspendLayout()
        CType(Me.picCallState, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel2.SuspendLayout()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'btn
@@ -102,6 +103,7 @@ Partial Class frmTapi
        'Panel1
        '
        Me.Panel1.BackColor = System.Drawing.Color.White
        Me.Panel1.Controls.Add(Me.Button2)
        Me.Panel1.Controls.Add(Me.picCallState)
        Me.Panel1.Controls.Add(Me.pic)
        Me.Panel1.Controls.Add(Me.lblCallState)
@@ -114,6 +116,15 @@ Partial Class frmTapi
        Me.Panel1.Size = New System.Drawing.Size(1318, 893)
        Me.Panel1.TabIndex = 5
        '
        'Button2
        '
        Me.Button2.Location = New System.Drawing.Point(88, 411)
        Me.Button2.Name = "Button2"
        Me.Button2.Size = New System.Drawing.Size(75, 23)
        Me.Button2.TabIndex = 11
        Me.Button2.Text = "Button2"
        Me.Button2.UseVisualStyleBackColor = True
        '
        'picCallState
        '
        Me.picCallState.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
@@ -126,6 +137,16 @@ Partial Class frmTapi
        Me.picCallState.TabIndex = 10
        Me.picCallState.TabStop = False
        '
        'pic
        '
        Me.pic.BackgroundImage = Global.VERAG_TELEINFO.My.Resources.Resources.Logo_blue_globe_Horizontal_eG
        Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.pic.Location = New System.Drawing.Point(3, 110)
        Me.pic.Name = "pic"
        Me.pic.Size = New System.Drawing.Size(332, 104)
        Me.pic.TabIndex = 8
        Me.pic.TabStop = False
        '
        'lblCallState
        '
        Me.lblCallState.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
@@ -179,16 +200,6 @@ Partial Class frmTapi
        Me.lblClose.Text = "X"
        Me.lblClose.TextAlign = System.Drawing.ContentAlignment.TopCenter
        '
        'pic
        '
        Me.pic.BackgroundImage = Global.VERAG_TELEINFO.My.Resources.Resources.Logo_blue_globe_Horizontal_eG
        Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.pic.Location = New System.Drawing.Point(3, 110)
        Me.pic.Name = "pic"
        Me.pic.Size = New System.Drawing.Size(332, 104)
        Me.pic.TabIndex = 8
        Me.pic.TabStop = False
        '
        'lblClock
        '
        Me.lblClock.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
@@ -240,10 +251,10 @@ Partial Class frmTapi
        Me.pnl.PerformLayout()
        Me.Panel1.ResumeLayout(False)
        CType(Me.picCallState, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel2.ResumeLayout(False)
        Me.Panel2.PerformLayout()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
    End Sub
@@ -264,4 +275,5 @@ Partial Class frmTapi
    Friend WithEvents picCallState As PictureBox
    Friend WithEvents lblCallState As Label
    Friend WithEvents lblClose As Label
    Friend WithEvents Button2 As Button
 End Class
--- a/VERAG_TELEINFO/frmTapi.vb
+++ b/VERAG_TELEINFO/frmTapi.vb
@@ -1,6 +1,10 @@
-Imports System.ComponentModel
+Imports sipdotnet
 Imports System.ComponentModel
 Imports System.Text
 Imports TAPI3Lib
 Imports Bria_API_CSharp_SampleApp
 Imports Bria_API_CSharp_SampleApp.BriaPhoneRemoteControl
 Imports Bria_API_CSharp_SampleApp.CallHistoryView
 Public Class frmTapi
@@ -14,6 +18,11 @@ Public Class frmTapi
    Private oAddress As ITAddress
    Private RegCookie As Integer
    Dim briaAPI As BriaAPI
    Private phoneLines As PhoneLine() = New PhoneLine(5) {}
    Sub New()
        Try
            InitializeComponent()
@@ -249,6 +258,20 @@ Public Class frmTapi
            MsgBox(ex.Message & ex.StackTrace)
        End Try
    End Sub
    Sub makeVideoCallBRIA(PhoneNumber As String)
        Try
            Dim connected = True
            If connected Then
                briaAPI.RequestPlaceCall(PhoneNumber, Bria_API_CSharp_SampleApp.BriaAPI.CallTypes.video)
            End If
        Catch ex As Exception
            MsgBox(ex.Message & ex.StackTrace)
        End Try
    End Sub
    Sub makeVideoCall2(PhoneNumber As String)
@@ -554,8 +577,8 @@ Public Class frmTapi
            Dim HookPttInfo = -1
            Dim ReadHook = PlathosysApiWrapper.Plathosys.ReadHookAndPTT(HookPttInfo)
-            Console.WriteLine($"ReadHook? {ReadHook}")
+            '   Console.WriteLine($"ReadHook? {ReadHook}")
-            Console.WriteLine($"HookPttInfo? {HookPttInfo}")
+            '    Console.WriteLine($"HookPttInfo? {HookPttInfo}")
            'Dim HookAndPTTState = PlathosysApiWrapper.Plathosys.InitHookAndPTTState()
            'Console.WriteLine($"HookAndPTTState? {HookAndPTTState}")
@@ -570,10 +593,12 @@ Public Class frmTapi
                        'picCallState.BackgroundImage = Nothing
                        'picCallState.Image = My.Resources._call
                        lblCallState.Text = "Anruf wird gestartet..."
-                        Dim PhoneNumber As String = "00436644178557"
+                        Dim PhoneNumber As String = "800" '"00436644178557"
                        '   Dim PhoneNumber As String = "147"
-                        makePhoneCall(PhoneNumber)
+                        'makePhoneCall(PhoneNumber)
-                        '  MsgBox("PICKUP!!!") 
+                        endCall()
                        makeVideoCallBRIA(PhoneNumber)
                    End If
                Case Else
                    If STATE = "PICKUP" Then
@@ -583,7 +608,12 @@ Public Class frmTapi
                        'picCallState.BackgroundImage = My.Resources.PLATHOSYS
                        'picCallState.Image = Nothing
                        lblCallState.Text = "Bitte heben Sie den Höhrer ab, um den Anruf zu starten."
-                        CURRENTCALL.Disconnect(DISCONNECT_CODE.DC_NORMAL)
+                        'CURRENTCALL.Disconnect(DISCONNECT_CODE.DC_NORMAL)
                        endCall()
                        'briaAPI.Stop()
                        '  MsgBox("PICKUP DOWN!!!")
                    End If
            End Select
@@ -593,9 +623,104 @@ Public Class frmTapi
        End If
    End Sub
    Private Sub endCall()
        Try
            ' briaAPI. 
            For Each phoneLine As PhoneLine In phoneLines
                If (phoneLine IsNot Nothing) Then
                    MsgBox(phoneLine.Id)
                    briaAPI.RequestEndCall(phoneLine.Id)
                End If
            Next
        Catch ex As Exception
            MsgBox(ex.Message & ex.StackTrace)
        End Try
    End Sub
    Private Sub frmTapi_Load(sender As Object, e As EventArgs) Handles Me.Load
        'allFunc()
        Timer.Enabled = True
        'SipLinphone()
        Try
            briaAPI = New Bria_API_CSharp_SampleApp.BriaAPI()
            briaAPI.Start()
            'AddHandler briaAPI.OnCallStatus, AddressOf OnCallOptionsStatus(Me, aes As  BriaAPI.CallOptionsStatusEventArgs)
            'AddHandler briaAPI.OnCallStatus, AddressOf MainThread_OnCallStatus(New BriaAPI.CallStatusEventArgs)
            '  AddHandler briaAPI.OnCallOptionsStatus, AddressOf OnCallStatus
            AddHandler briaAPI.OnCallStatus, AddressOf OnCallStatus
            ' briaAPI.OnCallOptionsStatus += New EventHandler(Of BriaAPI.CallOptionsStatusEventArgs)(OnCallOptionsStatus)
        Catch ex As Exception
        End Try
    End Sub
    Private Delegate Sub OnCallStatusDelegate() ' As OnCallOptionsStatusDelegateEv
    Private Event OnCallStatusDelegateEv(ByVal args As BriaAPI.CallStatusEventArgs)
    'Private Delegate Sub OnCallOptionsStatus() As OnCallOptionsStatusDelegate
    'Private Event OnCallOptionsStatusDelegate(ByVal args As BriaAPI.CallStatusEventArgs)
    'Private Delegate void OnCallOptionsStatusDelegate(BriaAPI.CallOptionsStatusEventArgs args);
    '  Private OnCallOptionsStatusDelegate onCallOptionsStatusDelegate;
    Private Sub OnCallStatus(ByVal sender As Object, ByVal args As BriaAPI.CallStatusEventArgs)
        Dim lineInUse As Boolean() = New Boolean(5) {}
        Dim callList As List(Of BriaAPI.[Call]) = args.CallList
        phoneLines = New PhoneLine(5) {}
        Dim cnt = 0
        For Each [call] As BriaAPI.[Call] In callList
            Dim existingCall As Boolean = False
            Dim phoneLine As PhoneLine = Nothing
            Dim newPhoneLine As PhoneLine = New PhoneLine([call].CallId)
            phoneLines(cnt) = newPhoneLine
            phoneLine.HoldState = [call].HoldState
            For Each participant As BriaAPI.CallParticipant In [call].ParticipantList
                Dim remoteParty As RemoteParty = New RemoteParty()
                remoteParty.Number = participant.Number
                remoteParty.DisplayName = participant.DisplayName
                remoteParty.TimeInitiated = participant.TimeInitiated
                remoteParty.State = participant.CallState
                phoneLine.RemoteParties.Add(remoteParty)
                If (phoneLine.RemoteParties.Count = 1) AndAlso (remoteParty.State = BriaAPI.CallStates.Ringing) Then
                    phoneLine.IsRinging = True
                Else
                    phoneLine.IsRinging = False
                End If
            Next
        Next
        For i As Integer = 0 To 6 - 1
            If lineInUse(i) = False Then
                phoneLines(i) = Nothing
            End If
        Next
        UpdateCallStates()
    End Sub
    Private Sub lblClose_Click(sender As Object, e As EventArgs) Handles lblClose.Click
@@ -611,4 +736,71 @@ Public Class frmTapi
        lblClose.BackColor = Panel2.BackColor
        lblClose.ForeColor = Panel2.BackColor
    End Sub
    'Private Sub SurroundingSub()
    '    Dim callee As Address = Factory.Instance.CreateAddress("sip:janedoe@sip.example.org")
    '    Dim callParams As CallParams = Core.CreateCallParams(Nothing)
    '    callParams.MediaEncryption = MediaEncryption.SRTP
    '    callParams.VideoEnabled = True
    '    Dim [call] As [Call] = Core.InviteAddressWithParams(callee, callParams)
    '    [call].Listener.OnStateChanged += Function(ByVal delegateCall As [Call], ByVal state As CallState, ByVal message As String)
    '                                          Select Case state
    '                                              Case CallState.Connected
    '                                                  loggingService.Message("Call is connected")
    '                                              Case Else
    '                                                  loggingService.Message("Call is " & state.ToString())
    '                                          End Select
    '                                      End Function
    'End Sub
    'Sub SipLinphone()
    '    Dim account As Account = New Account("0p6ou3lEGC", "WarT4jO5Us", "sip:verag.3cx.at")
    '    Dim phone As Phone = New Phone(account)
    '    AddHandler phone.PhoneConnectedEvent, Sub()
    '                                              Console.WriteLine("Phone connected. Calling...")
    '                                              ' phone.MakeCallAndRecord("phonenumber", "/tmp/filename.wav")
    '                                              phone.MakeCall("phonenumber")
    '                                          End Sub
    '    AddHandler phone.CallActiveEvent, Sub()
    '                                          Console.WriteLine("Answered. Call is active!")
    '                                      End Sub
    '    AddHandler phone.CallCompletedEvent, Sub()
    '                                             Console.WriteLine("Completed.")
    '                                         End Sub
    '    AddHandler phone.PhoneConnectedEvent, Sub()
    '                                              Console.WriteLine("Connected.")
    '                                          End Sub
    '    AddHandler phone.PhoneDisconnectedEvent, Sub()
    '                                                 Console.WriteLine("Disonnected.")
    '                                             End Sub
    '    Console.WriteLine("Go....")
    '    phone.Connect() ' // connecting
    '    Console.WriteLine(phone.CurrentConnectState)
    '    'phone.MakeCall("800")
    '    'Console.ReadLine()
    '    'phone.Disconnect() ' // terminate all calls And disconnect
    'End Sub
    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
    End Sub
    Private Sub UpdateCallStates()
        'Dim active1 As Boolean = UpdatePhoneLine(Me.PhoneLine1Status_Text, Me.PhoneLine1Hold_Button, Me.PhoneLine1Resume_Button, Me.PhoneLine1End_Button, phoneLines(0))
        'Dim active2 As Boolean = UpdatePhoneLine(Me.PhoneLine2Status_Text, Me.PhoneLine2Hold_Button, Me.PhoneLine2Resume_Button, Me.PhoneLine2End_Button, phoneLines(1))
        'Dim active3 As Boolean = UpdatePhoneLine(Me.PhoneLine3Status_Text, Me.PhoneLine3Hold_Button, Me.PhoneLine3Resume_Button, Me.PhoneLine3End_Button, phoneLines(2))
        'Dim active4 As Boolean = UpdatePhoneLine(Me.PhoneLine4Status_Text, Me.PhoneLine4Hold_Button, Me.PhoneLine4Resume_Button, Me.PhoneLine4End_Button, phoneLines(3))
        'Dim active5 As Boolean = UpdatePhoneLine(Me.PhoneLine5Status_Text, Me.PhoneLine5Hold_Button, Me.PhoneLine5Resume_Button, Me.PhoneLine5End_Button, phoneLines(4))
        'Dim active6 As Boolean = UpdatePhoneLine(Me.PhoneLine6Status_Text, Me.PhoneLine6Hold_Button, Me.PhoneLine6Resume_Button, Me.PhoneLine6End_Button, phoneLines(5))
        'm_IsActiveOnThePhone = active1 OrElse active2 OrElse active3 OrElse active4 OrElse active5 OrElse active6
        'UpdatePhoneState()
        Me.Update()
    End Sub
 End Class
--- a/VERAG_TELEINFO/gsm.dll
+++ b/VERAG_TELEINFO/gsm.dll
--- a/VERAG_TELEINFO/libbcg729.dll
+++ b/VERAG_TELEINFO/libbcg729.dll
--- a/VERAG_TELEINFO/linphone.dll
+++ b/VERAG_TELEINFO/linphone.dll
--- a/VERAG_TELEINFO/mbedcrypto.dll
+++ b/VERAG_TELEINFO/mbedcrypto.dll
--- a/VERAG_TELEINFO/mbedtls.dll
+++ b/VERAG_TELEINFO/mbedtls.dll
--- a/VERAG_TELEINFO/mbedx509.dll
+++ b/VERAG_TELEINFO/mbedx509.dll
--- a/VERAG_TELEINFO/mediastreamer_base.dll
+++ b/VERAG_TELEINFO/mediastreamer_base.dll
--- a/VERAG_TELEINFO/mediastreamer_voip.dll
+++ b/VERAG_TELEINFO/mediastreamer_voip.dll
--- a/VERAG_TELEINFO/opus.dll
+++ b/VERAG_TELEINFO/opus.dll
--- a/VERAG_TELEINFO/ortp.dll
+++ b/VERAG_TELEINFO/ortp.dll
--- a/VERAG_TELEINFO/speex.dll
+++ b/VERAG_TELEINFO/speex.dll
--- a/VERAG_TELEINFO/speexdsp.dll
+++ b/VERAG_TELEINFO/speexdsp.dll
--- a/VERAG_TELEINFO/sqlite3.dll
+++ b/VERAG_TELEINFO/sqlite3.dll
--- a/VERAG_TELEINFO/srtp.dll
+++ b/VERAG_TELEINFO/srtp.dll
--- a/VERAG_TELEINFO/swscale-2.dll
+++ b/VERAG_TELEINFO/swscale-2.dll
--- a/VERAG_TELEINFO/xml2.dll
+++ b/VERAG_TELEINFO/xml2.dll
--- a/VERAG_TELEINFO/zlib.dll
+++ b/VERAG_TELEINFO/zlib.dll