Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

Aviso/frmATEZ_NCTS.vb

@@ -1,10 +1,4 @@
-Imports System.Web.UI.WebControls
+
-Imports com.esendex.sdk.sent
-Imports DocumentFormat.OpenXml.Drawing.Charts
-Imports DocumentFormat.OpenXml.Vml.Presentation
-Imports GrapeCity.ActiveReports.Design.DdrDesigner.Designers
-Imports GrapeCity.ActiveReports.ReportsCore.Tools
-Imports Newtonsoft.Json.Linq
 Imports SDL
 Imports VERAG_PROG_ALLGEMEIN
 
@@ -31,7 +25,7 @@ Public Class frmATEZ_NCTS
     Dim id As Integer = -1
     Dim dgv As DataGridView = Nothing
     Dim atez_data As cATEZ_NCTS_DATA
-    Dim atez = New cATEZ_NCTS_IN
+    Dim atez = New cATEZ_NCTS_IN("atez")
     Dim allSelected As Boolean = False
 
     Property BezugsNr As String = ""

Aviso/frmDigicust.vb

@@ -5,7 +5,7 @@ Imports VERAG_PROG_ALLGEMEIN
 Public Class frmDigicust
 
 
-    Dim api As cDigicustAPI
+    Dim api As New cDigicustAPI("digicust")
     Dim dig_sendung As New cDigicustSendungen
 
     Dim ART As String = ""

Aviso/frmHauptfenster.Designer.vb

@@ -153,6 +153,7 @@ Partial Class frmHauptfenster
         Me.ToolStripFormulare = New System.Windows.Forms.ToolStripMenuItem()
         Me.MANAGERToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+        Me.MailvorlagenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
         Me.toolStrVM_de = New System.Windows.Forms.ToolStripMenuItem()
         Me.ZollvollmachtDEFiskalToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -184,6 +185,21 @@ Partial Class frmHauptfenster
         Me.Einheitspapier0735VersandverfahrenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.CarnetTIRToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.CarnetTIRALTToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuFragezeichen = New System.Windows.Forms.ToolStripMenuItem()
+        Me.VerfahrenshandbücherToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ChecklistenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ChecklisteWOCHECKLISTEZEallgemein = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator22 = New System.Windows.Forms.ToolStripSeparator()
+        Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator21 = New System.Windows.Forms.ToolStripSeparator()
+        Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.WOCECKLISTEZEWDHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.HandbuchToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.VERAGWIKIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.BREXITToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GVMSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GVMSUKIMportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -209,21 +225,6 @@ Partial Class frmHauptfenster
         Me.ToolStripSeparator18 = New System.Windows.Forms.ToolStripSeparator()
         Me.EORIUKGeneriertenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.KAPKentAccessPermitToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuFragezeichen = New System.Windows.Forms.ToolStripMenuItem()
-        Me.VerfahrenshandbücherToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ChecklistenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ChecklisteWOCHECKLISTEZEallgemein = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripSeparator22 = New System.Windows.Forms.ToolStripSeparator()
-        Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripSeparator21 = New System.Windows.Forms.ToolStripSeparator()
-        Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.WOCECKLISTEZEWDHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.HandbuchToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.VERAGWIKIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.btnWoche = New System.Windows.Forms.Button()
         Me.btnGestern = New System.Windows.Forms.Button()
         Me.btnHeute = New System.Windows.Forms.Button()
@@ -285,6 +286,7 @@ Partial Class frmHauptfenster
         Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem()
         Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
+        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Button10 = New System.Windows.Forms.Button()
         Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -392,7 +394,6 @@ Partial Class frmHauptfenster
         Me.cntVerag = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
         Me.conMenuAviso.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.pnlDetailsRechts.SuspendLayout()
@@ -439,7 +440,7 @@ Partial Class frmHauptfenster
         'mnuInfo
         '
         Me.mnuInfo.Name = "mnuInfo"
-        Me.mnuInfo.Size = New System.Drawing.Size(222, 30)
+        Me.mnuInfo.Size = New System.Drawing.Size(214, 22)
         Me.mnuInfo.Text = "Info"
         '
         'conÜbernehmen
@@ -880,26 +881,26 @@ Partial Class frmHauptfenster
         'GenerelleGestellungenDurchsuchenToolStripMenuItem
         '
         Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem"
-        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen"
         Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False
         '
         'KundenVonFremdenSpeditionenToolStripMenuItem
         '
         Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem"
-        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen"
         '
         'KundenverwaltungToolStripMenuItem
         '
         Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem"
-        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung"
         '
         'MDMParkplatzkartenToolStripMenuItem
         '
         Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem"
-        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten"
         '
         'SMSSendenToolStripMenuItem
@@ -907,7 +908,7 @@ Partial Class frmHauptfenster
         Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem})
         Me.SMSSendenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.handy2
         Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem"
-        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.SMSSendenToolStripMenuItem.Text = "SMS"
         '
         'NeueSMSSendenToolStripMenuItem
@@ -925,51 +926,51 @@ Partial Class frmHauptfenster
         'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem
         '
         Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem"
-        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen"
         '
         'MRNBarcodedruckToolStripMenuItem
         '
         Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem"
-        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck"
         '
         'ToolStripSeparator12
         '
         Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
-        Me.ToolStripSeparator12.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6)
         '
         'tool_BRGXLS
         '
         Me.tool_BRGXLS.Name = "tool_BRGXLS"
-        Me.tool_BRGXLS.Size = New System.Drawing.Size(391, 30)
+        Me.tool_BRGXLS.Size = New System.Drawing.Size(383, 22)
         Me.tool_BRGXLS.Text = "Bürgschaften Excel"
         '
         'ToolStripMenuItem4
         '
         Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
-        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22)
         Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel"
         Me.ToolStripMenuItem4.Visible = False
         '
         'ToolStripMenuItem5
         '
         Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22)
         Me.ToolStripMenuItem5.Text = "AT | Gesamtsicherheit VERAG AG - Excel"
         Me.ToolStripMenuItem5.Visible = False
         '
         'BürgschaftenExcelToolStripMenuItem
         '
         Me.BürgschaftenExcelToolStripMenuItem.Name = "BürgschaftenExcelToolStripMenuItem"
-        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel"
         Me.BürgschaftenExcelToolStripMenuItem.Visible = False
         '
         'ToolStripMenuItem6
         '
         Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
-        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22)
         Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel"
         Me.ToolStripMenuItem6.Visible = False
         '
@@ -977,7 +978,7 @@ Partial Class frmHauptfenster
         '
         Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem})
         Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem"
-        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten"
         Me.GesamtsicherheitenToolStripMenuItem.Visible = False
         '
@@ -1014,25 +1015,25 @@ Partial Class frmHauptfenster
         'ToolStripMenuItem10
         '
         Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
-        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22)
         Me.ToolStripMenuItem10.Text = "TICKET Parkplatz"
         '
         'TICKETWaidhausToolStripMenuItem
         '
         Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem"
-        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz"
         '
         'ToolStripSeparator10
         '
         Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
-        Me.ToolStripSeparator10.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6)
         '
         'DAKOSYToolStripMenuItem
         '
         Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem})
         Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem"
-        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.DAKOSYToolStripMenuItem.Text = "DAKOSY"
         '
         'StammreferenzenVerwaltenToolStripMenuItem
@@ -1044,75 +1045,75 @@ Partial Class frmHauptfenster
         'ToolStripSeparator23
         '
         Me.ToolStripSeparator23.Name = "ToolStripSeparator23"
-        Me.ToolStripSeparator23.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator23.Size = New System.Drawing.Size(380, 6)
         '
         'toolOriginalATR
         '
         Me.toolOriginalATR.Image = Global.AVISO.My.Resources.Resources.atr
         Me.toolOriginalATR.Name = "toolOriginalATR"
-        Me.toolOriginalATR.Size = New System.Drawing.Size(391, 30)
+        Me.toolOriginalATR.Size = New System.Drawing.Size(383, 22)
         Me.toolOriginalATR.Text = "Original-ATR"
         '
         'SDLAbholaufträgeToolStripMenuItem
         '
         Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem"
-        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge"
         '
         'ToolStripMenuItem13
         '
         Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13"
-        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22)
         Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)"
         '
         'VorauskassenToolStripMenuItem
         '
         Me.VorauskassenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.vorauszahlung
         Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem"
-        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen"
         '
         'ToolStripSeparator11
         '
         Me.ToolStripSeparator11.Name = "ToolStripSeparator11"
-        Me.ToolStripSeparator11.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6)
         '
         'EssensbestellungenToolStripMenuItem
         '
         Me.EssensbestellungenToolStripMenuItem.Name = "EssensbestellungenToolStripMenuItem"
-        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.EssensbestellungenToolStripMenuItem.Text = "Essensbestellungen"
         Me.EssensbestellungenToolStripMenuItem.Visible = False
         '
         'AdministrationEssensbestellungenToolStripMenuItem
         '
         Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem"
-        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen"
         Me.AdministrationEssensbestellungenToolStripMenuItem.Visible = False
         '
         'ToolStripSeparator24
         '
         Me.ToolStripSeparator24.Name = "ToolStripSeparator24"
-        Me.ToolStripSeparator24.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator24.Size = New System.Drawing.Size(380, 6)
         '
         'WarenorteToolStripMenuItem
         '
         Me.WarenorteToolStripMenuItem.Name = "WarenorteToolStripMenuItem"
-        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.WarenorteToolStripMenuItem.Text = "Warenorte"
         '
         'DatevBuchungsexportToolStripMenuItem
         '
         Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem"
-        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev  Buchungsexport"
         Me.DatevBuchungsexportToolStripMenuItem.Visible = False
         '
         'APIToolStripMenuItem
         '
         Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem"
-        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.APIToolStripMenuItem.Text = "API"
         '
         'StatistikToolStripMenuItem
@@ -1172,7 +1173,7 @@ Partial Class frmHauptfenster
         'ToolStripFormulare
         '
         Me.ToolStripFormulare.BackColor = System.Drawing.Color.White
-        Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.CarnetTIRToolStripMenuItem, Me.CarnetTIRALTToolStripMenuItem})
+        Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.MailvorlagenToolStripMenuItem, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.CarnetTIRToolStripMenuItem, Me.CarnetTIRALTToolStripMenuItem})
         Me.ToolStripFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripFormulare.ForeColor = System.Drawing.Color.Black
         Me.ToolStripFormulare.ImageAlign = System.Drawing.ContentAlignment.BottomRight
@@ -1186,19 +1187,28 @@ Partial Class frmHauptfenster
         Me.MANAGERToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold)
         Me.MANAGERToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.android_note
         Me.MANAGERToolStripMenuItem.Name = "MANAGERToolStripMenuItem"
-        Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.MANAGERToolStripMenuItem.Text = "Formular - Manager"
         '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(282, 6)
+        '
+        'MailvorlagenToolStripMenuItem
+        '
+        Me.MailvorlagenToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold)
+        Me.MailvorlagenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.stift
+        Me.MailvorlagenToolStripMenuItem.Name = "MailvorlagenToolStripMenuItem"
+        Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.MailvorlagenToolStripMenuItem.Text = "Mailvorlagen"
+        Me.MailvorlagenToolStripMenuItem.Visible = False
         '
         'ToolStripMenuItem2
         '
         Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStrVM_de, Me.ZollvollmachtDEFiskalToolStripMenuItem, Me.toolStrVM_at, Me.toolStrVM_at4200, Me.ZollvollmachtATEVToolStripMenuItem})
         Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
-        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem2.Text = "Vollmachten"
         '
         'toolStrVM_de
@@ -1234,38 +1244,38 @@ Partial Class frmHauptfenster
         'ToolStripMenuItem7
         '
         Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7"
-        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem7.Text = "Gestellungsgarantien"
         '
         'ToolStripMenuItem12
         '
         Me.ToolStripMenuItem12.Name = "ToolStripMenuItem12"
-        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem12.Text = "Importaviso"
         '
         'ToolStripMenuItem15
         '
         Me.ToolStripMenuItem15.Name = "ToolStripMenuItem15"
-        Me.ToolStripMenuItem15.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem15.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem15.Text = "Dispoliste"
         '
         'ToolStripMenuItem18
         '
         Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18"
-        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem18.Text = "Verzollungspreise"
         '
         'AuftragÜberwachungsdokumentToolStripMenuItem
         '
         Me.AuftragÜberwachungsdokumentToolStripMenuItem.Name = "AuftragÜberwachungsdokumentToolStripMenuItem"
-        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.AuftragÜberwachungsdokumentToolStripMenuItem.Text = "Auftrag Überwachungsdokument"
         '
         'toolVUB
         '
         Me.toolVUB.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VUBVERAGSpeditionAGToolStripMenuItem, Me.VeragCustomsServiceToolStripMenuItem})
         Me.toolVUB.Name = "toolVUB"
-        Me.toolVUB.Size = New System.Drawing.Size(277, 22)
+        Me.toolVUB.Size = New System.Drawing.Size(285, 30)
         Me.toolVUB.Text = "VUB"
         '
         'VUBVERAGSpeditionAGToolStripMenuItem
@@ -1283,37 +1293,37 @@ Partial Class frmHauptfenster
         'toolVPCreditreform
         '
         Me.toolVPCreditreform.Name = "toolVPCreditreform"
-        Me.toolVPCreditreform.Size = New System.Drawing.Size(277, 22)
+        Me.toolVPCreditreform.Size = New System.Drawing.Size(285, 30)
         Me.toolVPCreditreform.Text = "Bonitätsauskunft (Creditreform)"
         Me.toolVPCreditreform.Visible = False
         '
         'ToolStripSeparator9
         '
         Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
-        Me.ToolStripSeparator9.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator9.Size = New System.Drawing.Size(282, 6)
         '
         'VerzollungsunterlagenToolStripMenuItem
         '
         Me.VerzollungsunterlagenToolStripMenuItem.Name = "VerzollungsunterlagenToolStripMenuItem"
-        Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.VerzollungsunterlagenToolStripMenuItem.Text = "Verzollungsunterlagen"
         '
         'ToolStripMenuItem11
         '
         Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11"
-        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem11.Text = "Verzollungsunterlagen BAR"
         '
         'ToolStripSeparator6
         '
         Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(282, 6)
         '
         'WAIDHAUSToolStripMenuItem
         '
         Me.WAIDHAUSToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem8, Me.ToolStripMenuItem9, Me.AnnahmeblattIMPORTToolStripMenuItem, Me.AnnahmeblattEXPORTToolStripMenuItem, Me.ChecklisteVerwahrlagerToolStripMenuItem})
         Me.WAIDHAUSToolStripMenuItem.Name = "WAIDHAUSToolStripMenuItem"
-        Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.WAIDHAUSToolStripMenuItem.Text = "WAIDHAUS"
         '
         'ToolStripMenuItem8
@@ -1349,38 +1359,132 @@ Partial Class frmHauptfenster
         'ToolStripSeparator13
         '
         Me.ToolStripSeparator13.Name = "ToolStripSeparator13"
-        Me.ToolStripSeparator13.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator13.Size = New System.Drawing.Size(282, 6)
         '
         'EinheitspapierToolStripMenuItem
         '
         Me.EinheitspapierToolStripMenuItem.Name = "EinheitspapierToolStripMenuItem"
-        Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.EinheitspapierToolStripMenuItem.Text = "Einheitspapier 0777 (Vereinfachte ZA)"
         '
         'CMRToolStripMenuItem
         '
         Me.CMRToolStripMenuItem.Name = "CMRToolStripMenuItem"
-        Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.CMRToolStripMenuItem.Text = "CMR"
         '
         'Einheitspapier0735VersandverfahrenToolStripMenuItem
         '
         Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Name = "Einheitspapier0735VersandverfahrenToolStripMenuItem"
-        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Text = "Einheitspapier 0735 (Versandverfahren)"
         '
         'CarnetTIRToolStripMenuItem
         '
         Me.CarnetTIRToolStripMenuItem.Name = "CarnetTIRToolStripMenuItem"
-        Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.CarnetTIRToolStripMenuItem.Text = "Carnet TIR"
         '
         'CarnetTIRALTToolStripMenuItem
         '
         Me.CarnetTIRALTToolStripMenuItem.Name = "CarnetTIRALTToolStripMenuItem"
-        Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.CarnetTIRALTToolStripMenuItem.Text = "Carnet TIR (ALT)"
         '
+        'mnuFragezeichen
+        '
+        Me.mnuFragezeichen.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuInfo, Me.VerfahrenshandbücherToolStripMenuItem, Me.ChecklistenToolStripMenuItem, Me.HandbuchToolStripMenuItem, Me.VERAGWIKIToolStripMenuItem})
+        Me.mnuFragezeichen.ForeColor = System.Drawing.Color.Black
+        Me.mnuFragezeichen.ImageTransparentColor = System.Drawing.Color.Brown
+        Me.mnuFragezeichen.Name = "mnuFragezeichen"
+        Me.mnuFragezeichen.Size = New System.Drawing.Size(111, 21)
+        Me.mnuFragezeichen.Text = "Info/Handbücher"
+        '
+        'VerfahrenshandbücherToolStripMenuItem
+        '
+        Me.VerfahrenshandbücherToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem})
+        Me.VerfahrenshandbücherToolStripMenuItem.Name = "VerfahrenshandbücherToolStripMenuItem"
+        Me.VerfahrenshandbücherToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
+        Me.VerfahrenshandbücherToolStripMenuItem.Text = "Verfahrenshandbücher"
+        '
+        'VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem
+        '
+        Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Name = "VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem"
+        Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Size = New System.Drawing.Size(306, 22)
+        Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Text = "Verfahrenshandbuch VERAG GmbH Zoll WO"
+        '
+        'ChecklistenToolStripMenuItem
+        '
+        Me.ChecklistenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ChecklisteWOCHECKLISTEZEallgemein, Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem, Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem, Me.ToolStripSeparator22, Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem, Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1, Me.ToolStripSeparator21, Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem, Me.WOCECKLISTEZEWDHToolStripMenuItem})
+        Me.ChecklistenToolStripMenuItem.Name = "ChecklistenToolStripMenuItem"
+        Me.ChecklistenToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
+        Me.ChecklistenToolStripMenuItem.Text = "DE-Warenorte/Checklisten"
+        '
+        'ChecklisteWOCHECKLISTEZEallgemein
+        '
+        Me.ChecklisteWOCHECKLISTEZEallgemein.Name = "ChecklisteWOCHECKLISTEZEallgemein"
+        Me.ChecklisteWOCHECKLISTEZEallgemein.Size = New System.Drawing.Size(381, 22)
+        Me.ChecklisteWOCHECKLISTEZEallgemein.Text = "ZE WO CHECKLISTE ZE allgemein"
+        '
+        'ZEVerfahrensanleitungGestellungSumAToolStripMenuItem
+        '
+        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Name = "ZEVerfahrensanleitungGestellungSumAToolStripMenuItem"
+        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Size = New System.Drawing.Size(381, 22)
+        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Text = "ZE Verfahrensanleitung Gestellung/SumA"
+        '
+        'ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem
+        '
+        Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Name = "ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem"
+        Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Size = New System.Drawing.Size(381, 22)
+        Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Text = "ZE Verfahrensanleitung Gestellung/SumA - Fremdpersonal"
+        '
+        'ToolStripSeparator22
+        '
+        Me.ToolStripSeparator22.Name = "ToolStripSeparator22"
+        Me.ToolStripSeparator22.Size = New System.Drawing.Size(378, 6)
+        '
+        'WOCHECKLISTEZVAllgemeinToolStripMenuItem
+        '
+        Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Name = "WOCHECKLISTEZVAllgemeinToolStripMenuItem"
+        Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Size = New System.Drawing.Size(381, 22)
+        Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Text = "ZV WO CHECKLISTE ZV allgemein"
+        '
+        'ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1
+        '
+        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Name = "ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1"
+        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Size = New System.Drawing.Size(381, 22)
+        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Text = "ZV Verfahrensanleitung"
+        '
+        'ToolStripSeparator21
+        '
+        Me.ToolStripSeparator21.Name = "ToolStripSeparator21"
+        Me.ToolStripSeparator21.Size = New System.Drawing.Size(378, 6)
+        '
+        'WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem
+        '
+        Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Name = "WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem"
+        Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Size = New System.Drawing.Size(381, 22)
+        Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Text = "WO CHECKLISTE Abgang Verwahrungsort ZV"
+        '
+        'WOCECKLISTEZEWDHToolStripMenuItem
+        '
+        Me.WOCECKLISTEZEWDHToolStripMenuItem.Name = "WOCECKLISTEZEWDHToolStripMenuItem"
+        Me.WOCECKLISTEZEWDHToolStripMenuItem.Size = New System.Drawing.Size(381, 22)
+        Me.WOCECKLISTEZEWDHToolStripMenuItem.Text = "WO CHECKLISTE ZE WDH"
+        '
+        'HandbuchToolStripMenuItem
+        '
+        Me.HandbuchToolStripMenuItem.Name = "HandbuchToolStripMenuItem"
+        Me.HandbuchToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
+        Me.HandbuchToolStripMenuItem.Text = "Handbuch"
+        '
+        'VERAGWIKIToolStripMenuItem
+        '
+        Me.VERAGWIKIToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.wiki
+        Me.VERAGWIKIToolStripMenuItem.Name = "VERAGWIKIToolStripMenuItem"
+        Me.VERAGWIKIToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
+        Me.VERAGWIKIToolStripMenuItem.Text = "VERAG-WIKI"
+        '
         'BREXITToolStripMenuItem
         '
         Me.BREXITToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GVMSToolStripMenuItem, Me.GVMSUKIMportToolStripMenuItem, Me.GVMSBeschreibungToolStripMenuItem, Me.ToolStripSeparator14, Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem, Me.TicketIBFBeschreibungToolStripMenuItem, Me.IBFStatusToolStripMenuItem, Me.ToolStripSeparator15, Me.FREnveloppeSmartBorderToolStripMenuItem, Me.ToolStripSeparator16, Me.PBNIrelandFähreToolStripMenuItem, Me.ToolStripSeparator20, Me.WARENORTToolStripMenuItem, Me.ToolStripMenuItem14, Me.ToolStripSeparator18, Me.EORIUKGeneriertenToolStripMenuItem, Me.KAPKentAccessPermitToolStripMenuItem})
@@ -1536,100 +1640,6 @@ Partial Class frmHauptfenster
         Me.KAPKentAccessPermitToolStripMenuItem.Size = New System.Drawing.Size(248, 22)
         Me.KAPKentAccessPermitToolStripMenuItem.Text = "KAP (KentAccessPermit)"
         '
-        'mnuFragezeichen
-        '
-        Me.mnuFragezeichen.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuInfo, Me.VerfahrenshandbücherToolStripMenuItem, Me.ChecklistenToolStripMenuItem, Me.HandbuchToolStripMenuItem, Me.VERAGWIKIToolStripMenuItem})
-        Me.mnuFragezeichen.ForeColor = System.Drawing.Color.Black
-        Me.mnuFragezeichen.ImageTransparentColor = System.Drawing.Color.Brown
-        Me.mnuFragezeichen.Name = "mnuFragezeichen"
-        Me.mnuFragezeichen.Size = New System.Drawing.Size(111, 21)
-        Me.mnuFragezeichen.Text = "Info/Handbücher"
-        '
-        'VerfahrenshandbücherToolStripMenuItem
-        '
-        Me.VerfahrenshandbücherToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem})
-        Me.VerfahrenshandbücherToolStripMenuItem.Name = "VerfahrenshandbücherToolStripMenuItem"
-        Me.VerfahrenshandbücherToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
-        Me.VerfahrenshandbücherToolStripMenuItem.Text = "Verfahrenshandbücher"
-        '
-        'VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem
-        '
-        Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Name = "VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem"
-        Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Size = New System.Drawing.Size(306, 22)
-        Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Text = "Verfahrenshandbuch VERAG GmbH Zoll WO"
-        '
-        'ChecklistenToolStripMenuItem
-        '
-        Me.ChecklistenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ChecklisteWOCHECKLISTEZEallgemein, Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem, Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem, Me.ToolStripSeparator22, Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem, Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1, Me.ToolStripSeparator21, Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem, Me.WOCECKLISTEZEWDHToolStripMenuItem})
-        Me.ChecklistenToolStripMenuItem.Name = "ChecklistenToolStripMenuItem"
-        Me.ChecklistenToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
-        Me.ChecklistenToolStripMenuItem.Text = "DE-Warenorte/Checklisten"
-        '
-        'ChecklisteWOCHECKLISTEZEallgemein
-        '
-        Me.ChecklisteWOCHECKLISTEZEallgemein.Name = "ChecklisteWOCHECKLISTEZEallgemein"
-        Me.ChecklisteWOCHECKLISTEZEallgemein.Size = New System.Drawing.Size(381, 22)
-        Me.ChecklisteWOCHECKLISTEZEallgemein.Text = "ZE WO CHECKLISTE ZE allgemein"
-        '
-        'ZEVerfahrensanleitungGestellungSumAToolStripMenuItem
-        '
-        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Name = "ZEVerfahrensanleitungGestellungSumAToolStripMenuItem"
-        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Size = New System.Drawing.Size(381, 22)
-        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Text = "ZE Verfahrensanleitung Gestellung/SumA"
-        '
-        'ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem
-        '
-        Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Name = "ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem"
-        Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Size = New System.Drawing.Size(381, 22)
-        Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Text = "ZE Verfahrensanleitung Gestellung/SumA - Fremdpersonal"
-        '
-        'ToolStripSeparator22
-        '
-        Me.ToolStripSeparator22.Name = "ToolStripSeparator22"
-        Me.ToolStripSeparator22.Size = New System.Drawing.Size(378, 6)
-        '
-        'WOCHECKLISTEZVAllgemeinToolStripMenuItem
-        '
-        Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Name = "WOCHECKLISTEZVAllgemeinToolStripMenuItem"
-        Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Size = New System.Drawing.Size(381, 22)
-        Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Text = "ZV WO CHECKLISTE ZV allgemein"
-        '
-        'ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1
-        '
-        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Name = "ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1"
-        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Size = New System.Drawing.Size(381, 22)
-        Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Text = "ZV Verfahrensanleitung"
-        '
-        'ToolStripSeparator21
-        '
-        Me.ToolStripSeparator21.Name = "ToolStripSeparator21"
-        Me.ToolStripSeparator21.Size = New System.Drawing.Size(378, 6)
-        '
-        'WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem
-        '
-        Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Name = "WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem"
-        Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Size = New System.Drawing.Size(381, 22)
-        Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Text = "WO CHECKLISTE Abgang Verwahrungsort ZV"
-        '
-        'WOCECKLISTEZEWDHToolStripMenuItem
-        '
-        Me.WOCECKLISTEZEWDHToolStripMenuItem.Name = "WOCECKLISTEZEWDHToolStripMenuItem"
-        Me.WOCECKLISTEZEWDHToolStripMenuItem.Size = New System.Drawing.Size(381, 22)
-        Me.WOCECKLISTEZEWDHToolStripMenuItem.Text = "WO CHECKLISTE ZE WDH"
-        '
-        'HandbuchToolStripMenuItem
-        '
-        Me.HandbuchToolStripMenuItem.Name = "HandbuchToolStripMenuItem"
-        Me.HandbuchToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
-        Me.HandbuchToolStripMenuItem.Text = "Handbuch"
-        '
-        'VERAGWIKIToolStripMenuItem
-        '
-        Me.VERAGWIKIToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.wiki
-        Me.VERAGWIKIToolStripMenuItem.Name = "VERAGWIKIToolStripMenuItem"
-        Me.VERAGWIKIToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
-        Me.VERAGWIKIToolStripMenuItem.Text = "VERAG-WIKI"
-        '
         'btnWoche
         '
         Me.btnWoche.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -2447,6 +2457,15 @@ Partial Class frmHauptfenster
         Me.SplitContainer3.SplitterDistance = 158
         Me.SplitContainer3.TabIndex = 3
         '
+        'UsrCntlBenachrichtigungen1
+        '
+        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
+        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(158, 300)
+        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
+        '
         'pnl
         '
         Me.pnl.Controls.Add(Me.Button10)
@@ -3496,6 +3515,9 @@ Partial Class frmHauptfenster
         Me.btnSmall.Text = ">"
         Me.btnSmall.UseVisualStyleBackColor = False
         '
+        'BackgroundWorker1
+        '
+        '
         'timerStandzeit
         '
         Me.timerStandzeit.Interval = 300000
@@ -3734,15 +3756,6 @@ Partial Class frmHauptfenster
         Me.HomepageToolStripMenuItem.Size = New System.Drawing.Size(133, 22)
         Me.HomepageToolStripMenuItem.Text = "Homepage"
         '
-        'UsrCntlBenachrichtigungen1
-        '
-        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
-        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(158, 300)
-        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
-        '
         'frmHauptfenster
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -4176,4 +4189,5 @@ Partial Class frmHauptfenster
     Friend WithEvents DEVeragGmbHToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ATUnispedGmbHToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents AnhangsartenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents MailvorlagenToolStripMenuItem As ToolStripMenuItem
 End Class

Aviso/frmHauptfenster.vb

@@ -379,6 +379,9 @@ Public Class frmHauptfenster
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("RECHNUNGSSUCHE", "SDL") Then
             btnRg.Visible = True
         End If
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MAILVORLAGEN", "SDL") Then
+            MailvorlagenToolStripMenuItem.Visible = True
+        End If
 
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MITARBEITER_VERZEICHNIS", "SDL") Then
             btnMAVerzeichnis.Visible = True
@@ -488,7 +491,8 @@ Public Class frmHauptfenster
 
         'zuerst noch prüfen, ob unerledigte Aviso auf nicht eingetroffen gesetzt werden können
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Avisodaten_verwalten", Me) Then
-            Dim hSQL As String = "Select * FROM Aviso WHERE Status In (0,4,5) And Datum < " & SQLDatum(Now.AddDays(-21)) & "  And dateadd(DAY,10,VoraussichtlichesEintreffen) < GETDATE() and  Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND Grenzstelle IN ('AMB','NKD','SBG','SUB','WAI')  "
+            'Dim hSQL As String = "Select * FROM Aviso WHERE Status In (0,4,5) And Datum < " & SQLDatum(Now.AddDays(-21)) & "  And dateadd(DAY,10,VoraussichtlichesEintreffen) < GETDATE() and  Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND Grenzstelle IN ('AMB','NKD','SBG','SUB','WAI')  "
+            Dim hSQL As String = "Select * FROM Aviso WHERE Status In (0,4,5) And Datum < " & SQLDatum(Now.AddDays(-21)) & " AND Grenzstelle IN ('AMB','NKD','SBG','SUB','WAI') and  Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'  and ((Transportmittelart = 'CONTAINER' and dateadd(DAY,20,VoraussichtlichesEintreffen) < GETDATE()) or (Transportmittelart <> 'CONTAINER' and dateadd(DAY,10,VoraussichtlichesEintreffen) < GETDATE()))"
             'dateadd(DAY,10,VoraussichtlichesEintreffen)  --> Voraussichtliches Eintreffen muss zudem um 10 Tage überschritten sein --> Container/Hafen haben lange Vorlaufzeiten
             Dim anz As Integer = AvisoDAL.Check_Nicht_eingetroffen(hSQL)
             If anz > 0 Then
@@ -590,7 +594,7 @@ Public Class frmHauptfenster
 
             If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
                 If Not VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasNichtStempeln Then
-                    Dim timas As New cTimasAPI
+                    Dim timas As New cTimasAPI("timas")
                     Dim infoMessage As New DataTable
                     Dim timeEntryExisting As Boolean = False
                     Dim isEndpointRunning As Boolean = True
@@ -2878,6 +2882,36 @@ Public Class frmHauptfenster
 
 
     Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click
+
+        Try
+            If False Then
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
+                    If Not VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasNichtStempeln Then
+                        Dim timas As New cTimasAPI("timas")
+                        Dim infoMessage As New DataTable
+                        Dim timeEntryExisting As Boolean = False
+                        Dim isEndpointRunning As Boolean = True
+                        Dim isPresent = timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, infoMessage, timeEntryExisting,, isEndpointRunning)
+                        If timeEntryExisting AndAlso isEndpointRunning AndAlso isPresent Then
+                            Dim a As MsgBoxResult = MsgBox("Soll " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " ausgestempelt werden?" & vbNewLine & Now.ToString() & " als Endzeit erfassen?", vbYesNo)
+                            If a = vbYes Then
+                                Dim info
+                                timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "out")
+                                MsgBox(info)
+                            Else
+
+                            End If
+
+                        End If
+
+                    End If
+                End If
+            End If
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+
+
         Me.Close()
     End Sub
 
@@ -4554,6 +4588,15 @@ Public Class frmHauptfenster
         Dim f = New frmAvisoAnhangsarten("tblAvisoAnhangsArten", "AVISO")
         f.Show()
     End Sub
+
+    Private Sub BackgroundWorker1_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorker1.DoWork
+
+    End Sub
+
+    Private Sub MailvorlagenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MailvorlagenToolStripMenuItem.Click
+        Dim f As New SDL.frmdynMailvorlage(VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", "SDL"))
+        f.ShowDialog(Me)
+    End Sub
 End Class
 
 Public Class AvisoStatusFunctions

Aviso/frmNCTSRouten.Designer.vb

@@ -150,9 +150,9 @@ Partial Class frmNCTSRouten
         Me.lblWarningTransportmittel.ForeColor = System.Drawing.Color.Red
         Me.lblWarningTransportmittel.Location = New System.Drawing.Point(356, 156)
         Me.lblWarningTransportmittel.Name = "lblWarningTransportmittel"
-        Me.lblWarningTransportmittel.Size = New System.Drawing.Size(105, 13)
+        Me.lblWarningTransportmittel.Size = New System.Drawing.Size(132, 13)
         Me.lblWarningTransportmittel.TabIndex = 42
-        Me.lblWarningTransportmittel.Text = "Bitte Route angeben"
+        Me.lblWarningTransportmittel.Text = "Bitte Transportm. angeben"
         Me.lblWarningTransportmittel.Visible = False
         '
         'Label5

Aviso/frmSendungsdetailsNEU.resx

@@ -1531,9 +1531,6 @@
         mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>296, 17</value>
-  </metadata>
   <data name="Button6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
@@ -1654,18 +1651,6 @@
   <metadata name="clmnPreis.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="clmnVK_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clmnFirma.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clmnLeistung.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clmnPreis.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="Button9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAHtJREFUSEvt
@@ -1764,9 +1749,44 @@
         eWpiMRXkm9o//9k=
 </value>
   </data>
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>404, 17</value>
+  </metadata>
   <metadata name="cntxt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>765, 17</value>
   </metadata>
+  <data name="FlatButton4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
+        AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
+        BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
+        GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
+        AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
+        AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
+        w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
+        VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
+        CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
+        8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
+        ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
+        KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
+</value>
+  </data>
+  <data name="FlatButton1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
+        AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
+        BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
+        GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
+        AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
+        AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
+        w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
+        VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
+        CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
+        8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
+        ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
+        KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
+</value>
+  </data>
   <data name="btnDelQS.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -2039,9 +2059,6 @@
   <metadata name="cntxtOptions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>174, 17</value>
   </metadata>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>404, 17</value>
-  </metadata>
   <metadata name="ctxtWeitereFormulare.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>596, 17</value>
   </metadata>
@@ -2497,40 +2514,8 @@
   <metadata name="ContextMenuStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>129, 56</value>
   </metadata>
-  <data name="FlatButton1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>
+    <value>286, 56</value>
-        /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
-        AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
-        BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
-        GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
-        AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
-        AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
-        w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
-        VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
-        CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
-        8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
-        ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
-        KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
-</value>
-  </data>
-  <data name="FlatButton4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
-        AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
-        BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
-        GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
-        AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
-        AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
-        w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
-        VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
-        CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
-        8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
-        ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
-        KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
-</value>
-  </data>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>404, 17</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

Aviso/frmSendungsdetailsNEU.vb

@@ -34,6 +34,7 @@ Public Class frmSendungsdetailsNEU
     Dim usrcntl_ATA As usrCntlSND_Handling
     Dim usrcntl_ATB As usrCntlSND_ATBGestellung
     Dim usrcntl_AUSFUHR As usrCntlSND_Ausfuhr
+    Dim listOfTextconserven
 
 
     Sub New()
@@ -479,6 +480,7 @@ Public Class frmSendungsdetailsNEU
                         Case "IMEX" : cboFiliale._allowedValuesFreiText = {"5501"}
                         Case "UNISPED" : cboFiliale._allowedValuesFreiText = {"5601"}
                         Case "AMBAR" : cboFiliale._allowedValuesFreiText = {"5701"}
+
                         Case "ATILLA" : cboFiliale._allowedValuesFreiText = Nothing
                     End Select
             End Select
@@ -708,7 +710,7 @@ Public Class frmSendungsdetailsNEU
                 Case "AMBAR"
                     AMBARZollbeschauToolStripMenuItem.Visible = True
                     AMBARZollbeschauNEUToolStripMenuItem.Visible = True
-                    WarenortAMBARToolStripMenuItem.Visible = True
+                    dynMailsToolStripMenuItem.Visible = True
             End Select
             initDataBinding()
 
@@ -4108,7 +4110,8 @@ Public Class frmSendungsdetailsNEU
         End If
     End Sub
 
-    Private Sub EMailAnfügenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EMailAnfügenToolStripMenuItem.Click, ToolStripMenuItem15.Click, WarenortAMBARToolStripMenuItem.Click
+    Private Sub EMailAnfügenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EMailAnfügenToolStripMenuItem.Click, ToolStripMenuItem15.Click
+
 
         Try
             VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath("ClipBoard_TMP")
@@ -4155,31 +4158,8 @@ Public Class frmSendungsdetailsNEU
                         Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & TextHTML & SDL.cFakturierung.getSignature("DE") & "</div>"
 
                         AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "ATA-Nr fehlt (Fremdanmeldung) - angefordert", 33)
-
-                    ElseIf sender Is WarenortAMBARToolStripMenuItem Then
-
-                        Mail.Subject = AVISO.LKW_Nr
-                        If If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger, "") <> "" Then Mail.Subject &= " / " & SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger
-
-                        Dim TextHTML = ""
-                        TextHTML &= "Sehr geehrte Damen und Herren,<br>"
-                        TextHTML &= "<br>"
-                        TextHTML &= "der LKW meldet sich mit der Ware lt. Anhang bei uns am Warenort Zollamt " & lblGrenze.Text.Replace(vbNewLine, " ") & ", bitte um Vorbereitung der Verzollung. <br>"
-                        TextHTML &= "<br>"
-                        TextHTML &= "Wir melden uns bei LKW-Ankunft mit der ATB Nummer.<br>"
-                        TextHTML &= "<br>"
-                        TextHTML &= "Mit freundlichen Grüßen<br>"
-                        TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
-                        TextHTML &= "<br>"
-
-                        AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "An Fremdspediteur avisiert (Warenort)", 98)
-
-                        Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & TextHTML & SDL.cFakturierung.getSignature("DE",,,,,, False) & "</div>"
-
                     End If
 
-
-
                     Mail.Display()
 
                 Catch ex As Exception
@@ -4339,7 +4319,24 @@ Public Class frmSendungsdetailsNEU
     End Sub
 
     Private Sub Button22_Click(sender As Object, e As EventArgs) Handles btnMailVorlage.Click
-        ContextMenuStrip1.Show(Cursor.Position)
+
+        listOfTextconserven = New cTextkonserve_LIST("FRM_MNGR_MailText", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+
+        If listOfTextconserven.LIST.Count = 0 Then
+            ContextMenuStrip1.Show(Cursor.Position)
+        Else
+            For Each r In listOfTextconserven.LIST
+
+                If Not dynMailsToolStripMenuItem.DropDownItems.ContainsKey(r.txt_id) Then
+                    Dim menuItem = New ToolStripMenuItem() With {.Text = r.txt_bezeichnung, .Name = r.txt_id}
+                    dynMailsToolStripMenuItem.DropDownItems.Add(menuItem)
+                    AddHandler menuItem.Click, AddressOf mnuItem_Clicked
+                End If
+            Next
+            ContextMenuStrip1.Show(Cursor.Position)
+        End If
+
+
     End Sub
 
 
@@ -5334,7 +5331,7 @@ Public Class frmSendungsdetailsNEU
             Dim found = False
 
 
-            If SND.ABRECHNUNG.Exists(Function(x) x.sndabr_beteiligter = "EMPF") Then ' Wenn barechnugn an Empf
+            If SND.ABRECHNUNG.Exists(Function(x) x.sndabr_beteiligter = "EMPF") Then ' Wenn barechnugn an EmpfFambar
                 TmpKdNr = SND.tblSnd_EmpfaengerKdNr
                 If Not listKdNr.Contains(TmpKdNr) Then
                     f = New AVISO.frmSndVorgeschriebenSetzen(AVISO, SND, TmpKdNr)
@@ -6614,7 +6611,7 @@ Public Class frmSendungsdetailsNEU
 
     Private Sub StatusAbrufenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles StatusAbrufenToolStripMenuItem.Click
         Dim digiSendung As New cDigicustSendungen(dgvDigicust.SelectedRows(0).Cells("Id").Value)
-        Dim API = New cDigicustAPI()
+        Dim API = New cDigicustAPI("digicust")
         API.fetchingCase(digiSendung)
 
         initdgvDigicust(SENDUNG_LIST(CURRENT_INDEX))
@@ -6691,18 +6688,18 @@ Public Class frmSendungsdetailsNEU
 
 
         Try
-                Dim outl As New Outlook.Application
+            Dim outl As New Outlook.Application
-                Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+            Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
-                Mail = outl.CreateItem(0)
+            Mail = outl.CreateItem(0)
 
             Mail.Subject &= AVISO.LKW_Nr & " Fiskal CMR/packing List"
 
             Dim firstTextHTMLDE = ""
-                firstTextHTMLDE &= "Sehr geehrte Damen und Herren,<br>"
+            firstTextHTMLDE &= "Sehr geehrte Damen und Herren,<br>"
-                firstTextHTMLDE &= "<br>"
+            firstTextHTMLDE &= "<br>"
-                firstTextHTMLDE &= "o.g. LKW ist bei uns zur Zollabfertigung eingetroffen.<br>"
+            firstTextHTMLDE &= "o.g. LKW ist bei uns zur Zollabfertigung eingetroffen.<br>"
-                firstTextHTMLDE &= "Um die Ware im Zollverfahren 4200 (Fiskal) abfertigen zu können, ist es notwendig dass Sie beigefügten CMR im Feld 22 gegenstempeln und unterzeichnen.<br>"
+            firstTextHTMLDE &= "Um die Ware im Zollverfahren 4200 (Fiskal) abfertigen zu können, ist es notwendig dass Sie beigefügten CMR im Feld 22 gegenstempeln und unterzeichnen.<br>"
-                firstTextHTMLDE &= "Es ist von äußerster Wichtigkeit, dass Sie den angefügten CMR verwenden. Bitte verwenden Sie keinen anderen CMR.<br>"
+            firstTextHTMLDE &= "Es ist von äußerster Wichtigkeit, dass Sie den angefügten CMR verwenden. Bitte verwenden Sie keinen anderen CMR.<br>"
 
             firstTextHTMLDE &= "Alternativ können Sie uns auch eine Packliste mit Original-Stempel und Signatur per Mail übersenden.<br>"
             firstTextHTMLDE &= " Auf der Packliste müssen folgende Merkmale vorhanden sein:<br>"
@@ -6764,4 +6761,94 @@ Public Class frmSendungsdetailsNEU
     End Sub
 
 
+
+    Private Sub mnuItem_Clicked(sender As Object, e As EventArgs)
+        ContextMenuStrip1.Hide()
+        Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem)
+
+        If item IsNot Nothing Then
+
+            For Each r As cTextkonserve In listOfTextconserven.LIST
+
+                If item.Name = r.txt_Id.ToString Then
+
+                    Dim outl As New Outlook.Application
+                    Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+                    Mail = outl.CreateItem(0)
+
+                    If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
+                        Try
+                            Mail.SentOnBehalfOfName = SDL.cFakturierung.getDefaultMail("AMBAR")
+                            Mail.HTMLBody &= cFakturierung.getSignature(r.txt_sprache, 24, True, True)
+                        Catch ex2 As Exception
+                            MsgBox(ex2.Message)
+                        End Try
+
+
+                    End If
+
+
+                    Mail.Subject = r.txt_betreff
+
+                    Dim TextHTML = ""
+                    TextHTML &= r.txt_text
+                    TextHTML &= "<br>"
+                    TextHTML &= "<br>"
+                    TextHTML &= "Mit freundlichen Grüßen<br>"
+                    TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
+                    TextHTML &= "<br>"
+                    TextHTML &= cFakturierung.getSignature(r.txt_sprache, r.txt_firmaSig, True, True)
+
+                    If lblGrenze.Text <> "" Then
+                        TextHTML = TextHTML.Replace("%VAR-GRENZE%", lblGrenze.Text & "<br>")
+                    Else
+                        TextHTML = TextHTML.Replace("%VAR-GRENZE%", "")
+                    End If
+
+
+                    Mail.HTMLBody = "<div style=""font-family:Calibri, Arial"">" & TextHTML & "</div>"
+
+
+
+                    If AVISO IsNot Nothing Then
+                        Mail.Subject = Mail.Subject.Replace("%LKW%", AVISO.LKW_Nr)
+                        Mail.Subject = Mail.Subject.Replace("%LKWKennzeichen%", AVISO.LKW_Nr)
+                    End If
+
+                    If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger IsNot Nothing Then
+                        Mail.Subject = Mail.Subject.Replace("%Empfaenger%", SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger)
+                    End If
+
+                    Mail.Subject = Mail.Subject.Replace("%LKW%", "")
+                    Mail.Subject = Mail.Subject.Replace("%LKWKennzeichen%", "")
+                    Mail.Subject = Mail.Subject.Replace("% - Empfaenger%", "")
+                    Mail.Subject = Mail.Subject.Replace("% Empfaenger%", "")
+
+
+
+
+
+
+                    For Each anh As DataGridViewRow In dgvAnhang.SelectedRows
+                        Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(anh.Cells("anh_docId").Value), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+                    Next
+                    Mail.Display()
+                    If False Then
+                        AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "An Fremdspediteur avisiert (Warenort)", 98)
+                    End If
+                    Exit For
+                End If
+
+
+            Next
+
+        End If
+
+    End Sub
+
+
+
+
+
+
 End Class