diff --git a/Aviso.sln b/Aviso.sln index 78c47da..db5a1af 100644 --- 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 diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index bc9c92e..b5d6fad 100644 --- 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")) diff --git a/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb b/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb index f080688..66ae1fa 100644 --- 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) diff --git a/Aviso/Auswertung/usrctlStatVERIMEX.vb b/Aviso/Auswertung/usrctlStatVERIMEX.vb index 21307da..1edf6db 100644 --- 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 - 'rpt.lblBis.Text = CDate(rpt.Fields.Item("bis").Value).ToShortDateString - rpt.Label2.Text = rpt.Fields.Item("Positionen").Value - rpt.lblAnzSnd.Text = rpt.Fields.Item("Versandscheine").Value - rpt.lblAnzLKW.Text = rpt.Fields.Item("LKW").Value + Dim anz_Positionen As Integer = 0 + Dim anz_Versandscheine As Integer = 0 + Dim anz_LKW As Integer = 0 + 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) - sumSnd += CInt(rpt.Fields.Item("Versandscheine").Value) - sumLKW += CInt(rpt.Fields.Item("LKW").Value) + sumPos += anz_Positionen + sumSnd += anz_Versandscheine + 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") diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 448ab6d..cd8c50a 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -252,17 +252,17 @@ ..\..\..\dll\NumericBox.dll - + False - ..\..\..\dll\Spire.PDF\2021\Spire.License.dll + ..\..\..\dll\Spire.PDF\2022\Spire.License.dll - + False - ..\..\..\dll\Spire.PDF\2021\Spire.Pdf.dll + ..\..\..\dll\Spire.PDF\2022\Spire.Pdf.dll False - ..\..\..\dll\Spire.PDF\2021\Spire.PdfViewer.Forms.dll + ..\..\..\dll\Spire.PDF\2022\Spire.PdfViewer.Forms.dll diff --git a/Aviso/My Project/Application.myapp b/Aviso/My Project/Application.myapp index be9cfcc..2677266 100644 --- a/Aviso/My Project/Application.myapp +++ b/Aviso/My Project/Application.myapp @@ -1,5 +1,5 @@  - + true frmLogin false diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 5df5943..673f225 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 8d65eb9..57b0e73 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ @@ -1773,5 +1773,15 @@ Namespace My.Resources Return CType(obj,System.Drawing.Bitmap) End Get End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + 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 diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index 7f43e3c..58c434a 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -124,8 +124,8 @@ ..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\sprinter_white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Versionsinfo.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 ..\Resources\Telefonliste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -190,15 +190,15 @@ ..\..\Diverses\miniButtons\abfetigungTR_aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\digitalerAkt.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Versionsinfo.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - ..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -217,6 +217,9 @@ F:\Grafik\VERAG\VERAG_Akten\eigAkt\FO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\..\Diverses\lorry_ummelden.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\android-clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -232,9 +235,6 @@ ..\Resources\mitarbeiter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\statusBtn_vorbereitet_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\parkplatz.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -244,6 +244,9 @@ ..\Resources\statusBtn_vorbereitet_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\android-clock_s.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow-left-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -280,8 +283,8 @@ ..\Resources\searchGG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\dgs_instructions_export_t1.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ..\Resources\Unisped_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -301,21 +304,24 @@ ..\Resources\tts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\kasse_sw_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\noAviso_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\akt_ATILLA.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\dgs_instructions_export_t1.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\uid.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\gear2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\vermerkBtn.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\..\Diverses\GVMS-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -367,12 +373,15 @@ ..\Resources\kasse1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\statusBtn_vorgeschrieben_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\weiterleiten_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\AMB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -388,8 +397,8 @@ ..\resources\dgs_instructions_export.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MUSTER.nlc;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ..\Resources\SBG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -397,6 +406,9 @@ ..\Resources\fragezeichen1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\zoll_mm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -406,9 +418,6 @@ ..\Resources\digitalerAkt_small.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\personCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -448,8 +457,8 @@ ..\Resources\zoll_mmm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\android-clock_s.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -460,9 +469,6 @@ ..\Resources\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\warning2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -514,8 +520,8 @@ ..\Resources\ImageIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\sprinter_white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -532,11 +538,8 @@ ..\Resources\igl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\MUSTER.nlc;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\kasse_sw_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AMB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\LateAviso_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -586,8 +589,8 @@ ..\Resources\beleg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\vermerkBtn.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\statusBtn_vorbereitet_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\abgeklaertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -595,8 +598,8 @@ ..\Resources\image_443x282.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\statusBtn_vorgeschrieben_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\truck_black.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -610,8 +613,8 @@ ..\Resources\abklaerungTR_Inaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\IMEX.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -625,7 +628,7 @@ ..\..\Diverses\miniButtons\abfetigungTR_inaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\..\Diverses\lorry_ummelden.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\..\Diverses\zollico.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Aviso/My Project/Settings.Designer.vb b/Aviso/My Project/Settings.Designer.vb index 4795e49..0072724 100644 --- a/Aviso/My Project/Settings.Designer.vb +++ b/Aviso/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/Aviso/My Project/license.elic.xml b/Aviso/My Project/license.elic.xml index 354b8ea..fb5cc36 100644 --- a/Aviso/My Project/license.elic.xml +++ b/Aviso/My Project/license.elic.xml @@ -1,24 +1,32 @@ - - - Runtime - VERAG Spedition AG - al@verag.ag - VERAG Spedition AG - 2021-08-11T12:00:00Z - 2022-08-11T12:00:00Z - - - Spire.PDF Platinum - 7.5 - - 1 - 1 - - - - - e-iceblue - sales@e-iceblue.com - http://www.e-iceblue.com - - + + + Runtime + VERAG Spedition AG + al@verag.ag + VERAG Spedition AG + 2022-07-12T00:00:00Z + 2023-07-12T00:00:00Z + + + Spire.PDFViewer for Forms + 7.1 + + 1 + 1 + + + + Spire.PDF Pro Edition + 8.7 + + 1 + 1 + + + + + e-iceblue + sales@e-iceblue.com + http://www.e-iceblue.com + + \ No newline at end of file diff --git a/Aviso/Resources/license.elic.xml b/Aviso/Resources/license.elic.xml index 9bba7f4..fb5cc36 100644 --- a/Aviso/Resources/license.elic.xml +++ b/Aviso/Resources/license.elic.xml @@ -1,24 +1,32 @@ - - - Runtime - VERAG Spedition AG - al@verag.ag - VERAG Spedition AG - 2019-09-12T00:00:00Z - 2020-09-12T00:00:00Z - - - Spire.PDF Platinum - 5.8 - - 1 - 1 - - - - - e-iceblue - sales@e-iceblue.com - http://www.e-iceblue.com - - + + + Runtime + VERAG Spedition AG + al@verag.ag + VERAG Spedition AG + 2022-07-12T00:00:00Z + 2023-07-12T00:00:00Z + + + Spire.PDFViewer for Forms + 7.1 + + 1 + 1 + + + + Spire.PDF Pro Edition + 8.7 + + 1 + 1 + + + + + e-iceblue + sales@e-iceblue.com + http://www.e-iceblue.com + + \ No newline at end of file diff --git a/Aviso/frmAbfertigungTR_ExportAnz.Designer.vb b/Aviso/frmAbfertigungTR_ExportAnz.Designer.vb index 1cdec83..f6b85dd 100644 --- 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 diff --git a/Aviso/frmAbfertigungTR_ExportAnz.vb b/Aviso/frmAbfertigungTR_ExportAnz.vb index 68d3935..ed31f2e 100644 --- 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 \ No newline at end of file diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 7e51f36..857b352 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -342,6 +342,12 @@ Partial Class frmHauptfenster Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BundesanzeigerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ZugelassenerAusführerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AllgemeinToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AllgemeineEinführungExportkontrolleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.BrexitToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.EmbargosLänderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GüterlisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() Me.conMenuAviso.SuspendLayout() @@ -385,13 +391,13 @@ Partial Class frmHauptfenster 'mnuInfo ' Me.mnuInfo.Name = "mnuInfo" - Me.mnuInfo.Size = New System.Drawing.Size(193, 22) + Me.mnuInfo.Size = New System.Drawing.Size(291, 34) Me.mnuInfo.Text = "Info" ' 'conÜbernehmen ' Me.conÜbernehmen.Name = "conÜbernehmen" - Me.conÜbernehmen.Size = New System.Drawing.Size(284, 22) + Me.conÜbernehmen.Size = New System.Drawing.Size(400, 32) Me.conÜbernehmen.Text = "Akt übernehmen" ' 'conMenuAviso @@ -399,74 +405,75 @@ Partial Class frmHauptfenster Me.conMenuAviso.ImageScalingSize = New System.Drawing.Size(24, 24) Me.conMenuAviso.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conÜbernehmen, Me.ToolStripSeparator5, Me.conFertig, Me.ToolStripSeparator1, Me.conVorgeschrieben, Me.conVorbereitet, Me.conAnkunft, Me.conFreigabe, Me.conNichtEingetroffen, Me.ToolStripSeparator2, Me.conÄndern}) Me.conMenuAviso.Name = "conMenuTage" - Me.conMenuAviso.Size = New System.Drawing.Size(285, 198) + Me.conMenuAviso.Size = New System.Drawing.Size(401, 278) ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(281, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(397, 6) ' 'conFertig ' Me.conFertig.Name = "conFertig" - Me.conFertig.Size = New System.Drawing.Size(284, 22) + Me.conFertig.Size = New System.Drawing.Size(400, 32) Me.conFertig.Text = "LKW ist FERTIG / nicht FERTIG" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(281, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(397, 6) ' 'conVorgeschrieben ' Me.conVorgeschrieben.Name = "conVorgeschrieben" - Me.conVorgeschrieben.Size = New System.Drawing.Size(284, 22) + Me.conVorgeschrieben.Size = New System.Drawing.Size(400, 32) Me.conVorgeschrieben.Text = "auf Status VORGESCHRIEBEN setzen" ' 'conVorbereitet ' Me.conVorbereitet.Name = "conVorbereitet" - Me.conVorbereitet.Size = New System.Drawing.Size(284, 22) + Me.conVorbereitet.Size = New System.Drawing.Size(400, 32) Me.conVorbereitet.Text = "auf Status VORBEREITET setzen" Me.conVorbereitet.Visible = False ' 'conAnkunft ' Me.conAnkunft.Name = "conAnkunft" - Me.conAnkunft.Size = New System.Drawing.Size(284, 22) + Me.conAnkunft.Size = New System.Drawing.Size(400, 32) Me.conAnkunft.Text = "auf Status ANKUNFT setzen" ' 'conFreigabe ' Me.conFreigabe.Name = "conFreigabe" - Me.conFreigabe.Size = New System.Drawing.Size(284, 22) + Me.conFreigabe.Size = New System.Drawing.Size(400, 32) Me.conFreigabe.Text = "auf Status FREIGABE setzen" ' 'conNichtEingetroffen ' Me.conNichtEingetroffen.Name = "conNichtEingetroffen" - Me.conNichtEingetroffen.Size = New System.Drawing.Size(284, 22) + Me.conNichtEingetroffen.Size = New System.Drawing.Size(400, 32) Me.conNichtEingetroffen.Text = "auf Status NICHT EINGETROFFEN setzen" ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(281, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(397, 6) ' 'conÄndern ' Me.conÄndern.Name = "conÄndern" - Me.conÄndern.Size = New System.Drawing.Size(284, 22) + Me.conÄndern.Size = New System.Drawing.Size(400, 32) Me.conÄndern.Text = "Eintrag ändern" ' 'MenuStrip1 ' Me.MenuStrip1.BackColor = System.Drawing.Color.White + Me.MenuStrip1.GripMargin = New System.Windows.Forms.Padding(2, 2, 0, 2) Me.MenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24) Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProgramm, Me.FunktionenToolStripMenuItem, Me.StatistikToolStripMenuItem, Me.ToolStripFormulare, Me.BREXITToolStripMenuItem, Me.mnuFragezeichen}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" - Me.MenuStrip1.Size = New System.Drawing.Size(1372, 24) + Me.MenuStrip1.Size = New System.Drawing.Size(2058, 54) Me.MenuStrip1.TabIndex = 3 Me.MenuStrip1.Text = "MenuStrip1" ' @@ -476,45 +483,45 @@ Partial Class frmHauptfenster Me.mnuProgramm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFirmen, Me.NeuesPasswortToolStripMenuItem, Me.OptionenToolStripMenuItem, Me.StandorteToolStripMenuItem, Me.AvisoTVToolStripMenuItem, Me.SecretAvisoToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator4, Me.FirmaWechselnToolStripMenuItem, Me.StandortWechselnToolStripMenuItem, Me.SpracheWechselnToolStripMenuItem, Me.NacherfassungToolStripMenuItem, Me.VollständigesUpdateToolStripMenuItem, Me.UpdateToolStripMenuItem, Me.LogoutToolStripMenuItem}) Me.mnuProgramm.ForeColor = System.Drawing.Color.Black Me.mnuProgramm.Name = "mnuProgramm" - Me.mnuProgramm.Size = New System.Drawing.Size(78, 20) + Me.mnuProgramm.Size = New System.Drawing.Size(116, 48) Me.mnuProgramm.Text = "Verwaltung" ' 'mnuFirmen ' Me.mnuFirmen.Name = "mnuFirmen" - Me.mnuFirmen.Size = New System.Drawing.Size(184, 22) + Me.mnuFirmen.Size = New System.Drawing.Size(282, 34) Me.mnuFirmen.Text = "Firmen" Me.mnuFirmen.Visible = False ' 'NeuesPasswortToolStripMenuItem ' Me.NeuesPasswortToolStripMenuItem.Name = "NeuesPasswortToolStripMenuItem" - Me.NeuesPasswortToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.NeuesPasswortToolStripMenuItem.Size = New System.Drawing.Size(282, 34) Me.NeuesPasswortToolStripMenuItem.Text = "Neues Passwort" ' 'OptionenToolStripMenuItem ' Me.OptionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZeilenInFarbeEinausToolStripMenuItem, Me.BerechtigungenNeuLadenToolStripMenuItem}) Me.OptionenToolStripMenuItem.Name = "OptionenToolStripMenuItem" - Me.OptionenToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.OptionenToolStripMenuItem.Size = New System.Drawing.Size(282, 34) Me.OptionenToolStripMenuItem.Text = "Optionen" ' 'ZeilenInFarbeEinausToolStripMenuItem ' Me.ZeilenInFarbeEinausToolStripMenuItem.Name = "ZeilenInFarbeEinausToolStripMenuItem" - Me.ZeilenInFarbeEinausToolStripMenuItem.Size = New System.Drawing.Size(213, 22) + Me.ZeilenInFarbeEinausToolStripMenuItem.Size = New System.Drawing.Size(319, 34) Me.ZeilenInFarbeEinausToolStripMenuItem.Text = "Zeilen in Farbe ein/aus" ' 'BerechtigungenNeuLadenToolStripMenuItem ' Me.BerechtigungenNeuLadenToolStripMenuItem.Name = "BerechtigungenNeuLadenToolStripMenuItem" - Me.BerechtigungenNeuLadenToolStripMenuItem.Size = New System.Drawing.Size(213, 22) + Me.BerechtigungenNeuLadenToolStripMenuItem.Size = New System.Drawing.Size(319, 34) Me.BerechtigungenNeuLadenToolStripMenuItem.Text = "Berechtigungen neu laden" ' 'StandorteToolStripMenuItem ' Me.StandorteToolStripMenuItem.Name = "StandorteToolStripMenuItem" - Me.StandorteToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.StandorteToolStripMenuItem.Size = New System.Drawing.Size(282, 34) Me.StandorteToolStripMenuItem.Text = "Standorte" Me.StandorteToolStripMenuItem.Visible = False ' @@ -522,204 +529,204 @@ Partial Class frmHauptfenster ' Me.AvisoTVToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.InfoTextÄndernToolStripMenuItem}) Me.AvisoTVToolStripMenuItem.Name = "AvisoTVToolStripMenuItem" - Me.AvisoTVToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.AvisoTVToolStripMenuItem.Size = New System.Drawing.Size(282, 34) Me.AvisoTVToolStripMenuItem.Text = "AvisoTV" Me.AvisoTVToolStripMenuItem.Visible = False ' 'InfoTextÄndernToolStripMenuItem ' Me.InfoTextÄndernToolStripMenuItem.Name = "InfoTextÄndernToolStripMenuItem" - Me.InfoTextÄndernToolStripMenuItem.Size = New System.Drawing.Size(156, 22) + Me.InfoTextÄndernToolStripMenuItem.Size = New System.Drawing.Size(236, 34) Me.InfoTextÄndernToolStripMenuItem.Text = "InfoText ändern" ' 'SecretAvisoToolStripMenuItem ' Me.SecretAvisoToolStripMenuItem.Name = "SecretAvisoToolStripMenuItem" - Me.SecretAvisoToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.SecretAvisoToolStripMenuItem.Size = New System.Drawing.Size(282, 34) Me.SecretAvisoToolStripMenuItem.Text = "SecretAviso" ' 'AdministrationToolStripMenuItem ' Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem}) Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem" - Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(282, 34) Me.AdministrationToolStripMenuItem.Text = "Administration" Me.AdministrationToolStripMenuItem.Visible = False ' 'KdNrZuordnenToolStripMenuItem ' Me.KdNrZuordnenToolStripMenuItem.Name = "KdNrZuordnenToolStripMenuItem" - Me.KdNrZuordnenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.KdNrZuordnenToolStripMenuItem.Size = New System.Drawing.Size(313, 34) Me.KdNrZuordnenToolStripMenuItem.Text = "KdNr Zuordnen" ' 'OptionenToolStripMenuItem1 ' Me.OptionenToolStripMenuItem1.Name = "OptionenToolStripMenuItem1" - Me.OptionenToolStripMenuItem1.Size = New System.Drawing.Size(209, 22) + Me.OptionenToolStripMenuItem1.Size = New System.Drawing.Size(313, 34) Me.OptionenToolStripMenuItem1.Text = "Optionen" ' 'VorlagenUploadToolStripMenuItem ' Me.VorlagenUploadToolStripMenuItem.Name = "VorlagenUploadToolStripMenuItem" - Me.VorlagenUploadToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.VorlagenUploadToolStripMenuItem.Size = New System.Drawing.Size(313, 34) Me.VorlagenUploadToolStripMenuItem.Text = "Vorlagen Upload" ' 'BarcodeTestToolStripMenuItem ' Me.BarcodeTestToolStripMenuItem.Name = "BarcodeTestToolStripMenuItem" - Me.BarcodeTestToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.BarcodeTestToolStripMenuItem.Size = New System.Drawing.Size(313, 34) Me.BarcodeTestToolStripMenuItem.Text = "Barcode Test" ' 'TabellenToolStripMenuItem ' Me.TabellenToolStripMenuItem.Name = "TabellenToolStripMenuItem" - Me.TabellenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.TabellenToolStripMenuItem.Size = New System.Drawing.Size(313, 34) Me.TabellenToolStripMenuItem.Text = "Tabellen" ' 'SMSTestToolStripMenuItem ' Me.SMSTestToolStripMenuItem.Name = "SMSTestToolStripMenuItem" - Me.SMSTestToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.SMSTestToolStripMenuItem.Size = New System.Drawing.Size(313, 34) Me.SMSTestToolStripMenuItem.Text = "SMS Test" ' 'QSTeamsToolStripMenuItem ' Me.QSTeamsToolStripMenuItem.Name = "QSTeamsToolStripMenuItem" - Me.QSTeamsToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.QSTeamsToolStripMenuItem.Size = New System.Drawing.Size(313, 34) Me.QSTeamsToolStripMenuItem.Text = "QS Teams" ' 'LeereRechnungToolStripMenuItem ' Me.LeereRechnungToolStripMenuItem.Name = "LeereRechnungToolStripMenuItem" - Me.LeereRechnungToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.LeereRechnungToolStripMenuItem.Size = New System.Drawing.Size(313, 34) Me.LeereRechnungToolStripMenuItem.Text = "leere Rechnung TEST" ' 'EMAILTESTToolStripMenuItem ' Me.EMAILTESTToolStripMenuItem.Name = "EMAILTESTToolStripMenuItem" - Me.EMAILTESTToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.EMAILTESTToolStripMenuItem.Size = New System.Drawing.Size(313, 34) Me.EMAILTESTToolStripMenuItem.Text = "EMAILTEST" ' 'FreigabeMailTestToolStripMenuItem ' Me.FreigabeMailTestToolStripMenuItem.Name = "FreigabeMailTestToolStripMenuItem" - Me.FreigabeMailTestToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.FreigabeMailTestToolStripMenuItem.Size = New System.Drawing.Size(313, 34) Me.FreigabeMailTestToolStripMenuItem.Text = "FreigabeMail test" ' 'SDLProgrammStartenToolStripMenuItem ' Me.SDLProgrammStartenToolStripMenuItem.Name = "SDLProgrammStartenToolStripMenuItem" - Me.SDLProgrammStartenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.SDLProgrammStartenToolStripMenuItem.Size = New System.Drawing.Size(313, 34) Me.SDLProgrammStartenToolStripMenuItem.Text = "SDL Programm starten" ' 'TESTToolStripMenuItem ' Me.TESTToolStripMenuItem.Name = "TESTToolStripMenuItem" - Me.TESTToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.TESTToolStripMenuItem.Size = New System.Drawing.Size(313, 34) Me.TESTToolStripMenuItem.Text = "TEST" ' 'AlleStatusMailsSchickenToolStripMenuItem ' Me.AlleStatusMailsSchickenToolStripMenuItem.Name = "AlleStatusMailsSchickenToolStripMenuItem" - Me.AlleStatusMailsSchickenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.AlleStatusMailsSchickenToolStripMenuItem.Size = New System.Drawing.Size(313, 34) Me.AlleStatusMailsSchickenToolStripMenuItem.Text = "Alle Status Mails schicken" ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(181, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(279, 6) ' 'FirmaWechselnToolStripMenuItem ' Me.FirmaWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VERAGToolStripMenuItem, Me.ATILLAToolStripMenuItem, Me.IMEXToolStripMenuItem, Me.UNISPEDToolStripMenuItem, Me.AMBARToolStripMenuItem, Me.FRONTOFFICEToolStripMenuItem, Me.VERIMEXToolStripMenuItem}) Me.FirmaWechselnToolStripMenuItem.Name = "FirmaWechselnToolStripMenuItem" - Me.FirmaWechselnToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.FirmaWechselnToolStripMenuItem.Size = New System.Drawing.Size(282, 34) Me.FirmaWechselnToolStripMenuItem.Text = "Firma wechseln" ' 'VERAGToolStripMenuItem ' Me.VERAGToolStripMenuItem.Name = "VERAGToolStripMenuItem" - Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(148, 22) + Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(226, 34) Me.VERAGToolStripMenuItem.Text = "VERAG" ' 'ATILLAToolStripMenuItem ' Me.ATILLAToolStripMenuItem.Name = "ATILLAToolStripMenuItem" - Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(148, 22) + Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(226, 34) Me.ATILLAToolStripMenuItem.Text = "ATILLA" ' 'IMEXToolStripMenuItem ' Me.IMEXToolStripMenuItem.Name = "IMEXToolStripMenuItem" - Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(148, 22) + Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(226, 34) Me.IMEXToolStripMenuItem.Text = "IMEX" ' 'UNISPEDToolStripMenuItem ' Me.UNISPEDToolStripMenuItem.Name = "UNISPEDToolStripMenuItem" - Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(148, 22) + Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(226, 34) Me.UNISPEDToolStripMenuItem.Text = "UNISPED" ' 'AMBARToolStripMenuItem ' Me.AMBARToolStripMenuItem.Name = "AMBARToolStripMenuItem" - Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(148, 22) + Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(226, 34) Me.AMBARToolStripMenuItem.Text = "AMBAR" ' 'FRONTOFFICEToolStripMenuItem ' Me.FRONTOFFICEToolStripMenuItem.Name = "FRONTOFFICEToolStripMenuItem" - Me.FRONTOFFICEToolStripMenuItem.Size = New System.Drawing.Size(148, 22) + Me.FRONTOFFICEToolStripMenuItem.Size = New System.Drawing.Size(226, 34) Me.FRONTOFFICEToolStripMenuItem.Text = "FRONTOFFICE" ' 'VERIMEXToolStripMenuItem ' Me.VERIMEXToolStripMenuItem.Name = "VERIMEXToolStripMenuItem" - Me.VERIMEXToolStripMenuItem.Size = New System.Drawing.Size(148, 22) + Me.VERIMEXToolStripMenuItem.Size = New System.Drawing.Size(226, 34) Me.VERIMEXToolStripMenuItem.Text = "VERIMEX" ' 'StandortWechselnToolStripMenuItem ' Me.StandortWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SUBToolStripMenuItem, Me.SBGToolStripMenuItem, Me.WAIToolStripMenuItem, Me.NKDToolStripMenuItem, Me.NEUToolStripMenuItem, Me.AMBToolStripMenuItem}) Me.StandortWechselnToolStripMenuItem.Name = "StandortWechselnToolStripMenuItem" - Me.StandortWechselnToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.StandortWechselnToolStripMenuItem.Size = New System.Drawing.Size(282, 34) Me.StandortWechselnToolStripMenuItem.Text = "Standort wechseln" Me.StandortWechselnToolStripMenuItem.Visible = False ' 'SUBToolStripMenuItem ' Me.SUBToolStripMenuItem.Name = "SUBToolStripMenuItem" - Me.SUBToolStripMenuItem.Size = New System.Drawing.Size(100, 22) + Me.SUBToolStripMenuItem.Size = New System.Drawing.Size(152, 34) Me.SUBToolStripMenuItem.Text = "SUB" ' 'SBGToolStripMenuItem ' Me.SBGToolStripMenuItem.Name = "SBGToolStripMenuItem" - Me.SBGToolStripMenuItem.Size = New System.Drawing.Size(100, 22) + Me.SBGToolStripMenuItem.Size = New System.Drawing.Size(152, 34) Me.SBGToolStripMenuItem.Text = "SBG" ' 'WAIToolStripMenuItem ' Me.WAIToolStripMenuItem.Name = "WAIToolStripMenuItem" - Me.WAIToolStripMenuItem.Size = New System.Drawing.Size(100, 22) + Me.WAIToolStripMenuItem.Size = New System.Drawing.Size(152, 34) Me.WAIToolStripMenuItem.Text = "WAI" ' 'NKDToolStripMenuItem ' Me.NKDToolStripMenuItem.Name = "NKDToolStripMenuItem" - Me.NKDToolStripMenuItem.Size = New System.Drawing.Size(100, 22) + Me.NKDToolStripMenuItem.Size = New System.Drawing.Size(152, 34) Me.NKDToolStripMenuItem.Text = "NKD" ' 'NEUToolStripMenuItem ' Me.NEUToolStripMenuItem.Name = "NEUToolStripMenuItem" - Me.NEUToolStripMenuItem.Size = New System.Drawing.Size(100, 22) + Me.NEUToolStripMenuItem.Size = New System.Drawing.Size(152, 34) Me.NEUToolStripMenuItem.Text = "NEU" ' 'AMBToolStripMenuItem ' Me.AMBToolStripMenuItem.Name = "AMBToolStripMenuItem" - Me.AMBToolStripMenuItem.Size = New System.Drawing.Size(100, 22) + Me.AMBToolStripMenuItem.Size = New System.Drawing.Size(152, 34) Me.AMBToolStripMenuItem.Text = "AMB" Me.AMBToolStripMenuItem.Visible = False ' @@ -727,44 +734,44 @@ Partial Class frmHauptfenster ' Me.SpracheWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DeutschToolStripMenuItem, Me.TürkischToolStripMenuItem}) Me.SpracheWechselnToolStripMenuItem.Name = "SpracheWechselnToolStripMenuItem" - Me.SpracheWechselnToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.SpracheWechselnToolStripMenuItem.Size = New System.Drawing.Size(282, 34) Me.SpracheWechselnToolStripMenuItem.Text = "Sprache wechseln" ' 'DeutschToolStripMenuItem ' Me.DeutschToolStripMenuItem.Name = "DeutschToolStripMenuItem" - Me.DeutschToolStripMenuItem.Size = New System.Drawing.Size(118, 22) + Me.DeutschToolStripMenuItem.Size = New System.Drawing.Size(178, 34) Me.DeutschToolStripMenuItem.Text = "Deutsch" ' 'TürkischToolStripMenuItem ' Me.TürkischToolStripMenuItem.Name = "TürkischToolStripMenuItem" - Me.TürkischToolStripMenuItem.Size = New System.Drawing.Size(118, 22) + Me.TürkischToolStripMenuItem.Size = New System.Drawing.Size(178, 34) Me.TürkischToolStripMenuItem.Text = "Türkisch" ' 'NacherfassungToolStripMenuItem ' Me.NacherfassungToolStripMenuItem.Name = "NacherfassungToolStripMenuItem" - Me.NacherfassungToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.NacherfassungToolStripMenuItem.Size = New System.Drawing.Size(282, 34) Me.NacherfassungToolStripMenuItem.Text = "Nacherfassung" Me.NacherfassungToolStripMenuItem.Visible = False ' 'VollständigesUpdateToolStripMenuItem ' Me.VollständigesUpdateToolStripMenuItem.Name = "VollständigesUpdateToolStripMenuItem" - Me.VollständigesUpdateToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.VollständigesUpdateToolStripMenuItem.Size = New System.Drawing.Size(282, 34) Me.VollständigesUpdateToolStripMenuItem.Text = "Vollständiges Update" ' 'UpdateToolStripMenuItem ' Me.UpdateToolStripMenuItem.Name = "UpdateToolStripMenuItem" - Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(282, 34) Me.UpdateToolStripMenuItem.Text = "Update" ' 'LogoutToolStripMenuItem ' Me.LogoutToolStripMenuItem.Name = "LogoutToolStripMenuItem" - Me.LogoutToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.LogoutToolStripMenuItem.Size = New System.Drawing.Size(282, 34) Me.LogoutToolStripMenuItem.Text = "Logout" Me.LogoutToolStripMenuItem.Visible = False ' @@ -772,182 +779,182 @@ Partial Class frmHauptfenster ' Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.ToolStripMenuItem3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragAGToolStripMenuItem, Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragCSToolStripMenuItem}) Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem" - Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 20) + Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(116, 48) Me.FunktionenToolStripMenuItem.Text = "Funktionen" ' 'GenerelleGestellungenDurchsuchenToolStripMenuItem ' Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem" - Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen" Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False ' 'KundenVonFremdenSpeditionenToolStripMenuItem ' Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem" - Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen" ' 'KundenverwaltungToolStripMenuItem ' Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem" - Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung" ' 'MDMParkplatzkartenToolStripMenuItem ' Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem" - Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten" ' 'SMSSendenToolStripMenuItem ' Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem}) Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem" - Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.SMSSendenToolStripMenuItem.Text = "SMS" ' 'NeueSMSSendenToolStripMenuItem ' Me.NeueSMSSendenToolStripMenuItem.Name = "NeueSMSSendenToolStripMenuItem" - Me.NeueSMSSendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22) + Me.NeueSMSSendenToolStripMenuItem.Size = New System.Drawing.Size(258, 34) Me.NeueSMSSendenToolStripMenuItem.Text = "Neue SMS senden" ' 'GesendeteSMSToolStripMenuItem ' Me.GesendeteSMSToolStripMenuItem.Name = "GesendeteSMSToolStripMenuItem" - Me.GesendeteSMSToolStripMenuItem.Size = New System.Drawing.Size(169, 22) + Me.GesendeteSMSToolStripMenuItem.Size = New System.Drawing.Size(258, 34) Me.GesendeteSMSToolStripMenuItem.Text = "SMS Verlauf" ' 'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem ' Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem" - Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen" ' 'MRNBarcodedruckToolStripMenuItem ' Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem" - Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck" ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(572, 6) ' 'ToolStripMenuItem3 ' Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" - Me.ToolStripMenuItem3.Size = New System.Drawing.Size(383, 22) + Me.ToolStripMenuItem3.Size = New System.Drawing.Size(575, 34) Me.ToolStripMenuItem3.Text = "Bürgschaften Excel" ' 'ToolStripMenuItem4 ' Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4" - Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22) + Me.ToolStripMenuItem4.Size = New System.Drawing.Size(575, 34) Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel" Me.ToolStripMenuItem4.Visible = False ' 'ToolStripMenuItem5 ' Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5" - Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22) + Me.ToolStripMenuItem5.Size = New System.Drawing.Size(575, 34) 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(383, 22) + Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel" Me.BürgschaftenExcelToolStripMenuItem.Visible = False ' 'ToolStripMenuItem6 ' Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6" - Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22) + Me.ToolStripMenuItem6.Size = New System.Drawing.Size(575, 34) Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel" Me.ToolStripMenuItem6.Visible = False ' 'ToolStripMenuItem10 ' Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10" - Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22) + Me.ToolStripMenuItem10.Size = New System.Drawing.Size(575, 34) Me.ToolStripMenuItem10.Text = "TICKET Parkplatz" ' 'TICKETWaidhausToolStripMenuItem ' Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem" - Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz" ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(572, 6) ' 'DAKOSYToolStripMenuItem ' Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem}) Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem" - Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.DAKOSYToolStripMenuItem.Text = "DAKOSY" ' 'StammreferenzenVerwaltenToolStripMenuItem ' Me.StammreferenzenVerwaltenToolStripMenuItem.Name = "StammreferenzenVerwaltenToolStripMenuItem" - Me.StammreferenzenVerwaltenToolStripMenuItem.Size = New System.Drawing.Size(221, 22) + Me.StammreferenzenVerwaltenToolStripMenuItem.Size = New System.Drawing.Size(332, 34) Me.StammreferenzenVerwaltenToolStripMenuItem.Text = "Stammreferenzen verwalten" ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(572, 6) ' 'SDLAbholaufträgeToolStripMenuItem ' Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem" - Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge" ' 'ToolStripMenuItem13 ' Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13" - Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22) + Me.ToolStripMenuItem13.Size = New System.Drawing.Size(575, 34) Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)" ' 'VorauskassenToolStripMenuItem ' Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem" - Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen" ' 'DEGesamtsicherheitVeragGmbHToolStripMenuItem ' Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Name = "DEGesamtsicherheitVeragGmbHToolStripMenuItem" - Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Text = "DE | Gesamtsicherheit Verag GmbH" Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Visible = False ' 'ATGesamtsicherheitVeragAGToolStripMenuItem ' Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Name = "ATGesamtsicherheitVeragAGToolStripMenuItem" - Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Text = "AT | Gesamtsicherheit Verag AG" Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Visible = False ' 'ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem ' Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Name = "ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem" - Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Text = "AT | Gesamtsicherheit IMEX CS GmbH" Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Visible = False ' 'ATGesamtsicherheitVeragCSToolStripMenuItem ' Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Name = "ATGesamtsicherheitVeragCSToolStripMenuItem" - Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Size = New System.Drawing.Size(575, 34) Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Text = "AT | Gesamtsicherheit Verag CS" Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Visible = False ' @@ -956,53 +963,53 @@ Partial Class frmHauptfenster Me.StatistikToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LKWBerichtToolStripMenuItem, Me.StatistikADMINToolStripMenuItem, Me.ToolStripSeparator8, Me.BürgschafrtsbuchungenFremdToolStripMenuItem, Me.LKWEingetroffenNachToolStripMenuItem, Me.ToolStripSeparator7, Me.SDLAuswertungenToolStripMenuItem, Me.SDLAuswertungenToolStripMenuItem1}) Me.StatistikToolStripMenuItem.ForeColor = System.Drawing.Color.Black Me.StatistikToolStripMenuItem.Name = "StatistikToolStripMenuItem" - Me.StatistikToolStripMenuItem.Size = New System.Drawing.Size(83, 20) + Me.StatistikToolStripMenuItem.Size = New System.Drawing.Size(123, 48) Me.StatistikToolStripMenuItem.Text = "Auswertung" ' 'LKWBerichtToolStripMenuItem ' Me.LKWBerichtToolStripMenuItem.Name = "LKWBerichtToolStripMenuItem" - Me.LKWBerichtToolStripMenuItem.Size = New System.Drawing.Size(234, 22) + Me.LKWBerichtToolStripMenuItem.Size = New System.Drawing.Size(351, 34) Me.LKWBerichtToolStripMenuItem.Text = "LKW Bericht" ' 'StatistikADMINToolStripMenuItem ' Me.StatistikADMINToolStripMenuItem.Name = "StatistikADMINToolStripMenuItem" - Me.StatistikADMINToolStripMenuItem.Size = New System.Drawing.Size(234, 22) + Me.StatistikADMINToolStripMenuItem.Size = New System.Drawing.Size(351, 34) Me.StatistikADMINToolStripMenuItem.Text = "Statistik (Aviso)" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(231, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(348, 6) ' 'BürgschafrtsbuchungenFremdToolStripMenuItem ' Me.BürgschafrtsbuchungenFremdToolStripMenuItem.Name = "BürgschafrtsbuchungenFremdToolStripMenuItem" - Me.BürgschafrtsbuchungenFremdToolStripMenuItem.Size = New System.Drawing.Size(234, 22) + Me.BürgschafrtsbuchungenFremdToolStripMenuItem.Size = New System.Drawing.Size(351, 34) Me.BürgschafrtsbuchungenFremdToolStripMenuItem.Text = "Bürgschaftsbuchungen Fremd" ' 'LKWEingetroffenNachToolStripMenuItem ' Me.LKWEingetroffenNachToolStripMenuItem.Name = "LKWEingetroffenNachToolStripMenuItem" - Me.LKWEingetroffenNachToolStripMenuItem.Size = New System.Drawing.Size(234, 22) + Me.LKWEingetroffenNachToolStripMenuItem.Size = New System.Drawing.Size(351, 34) Me.LKWEingetroffenNachToolStripMenuItem.Text = "LKW eingetroffen nach ..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(231, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(348, 6) ' 'SDLAuswertungenToolStripMenuItem ' Me.SDLAuswertungenToolStripMenuItem.Name = "SDLAuswertungenToolStripMenuItem" - Me.SDLAuswertungenToolStripMenuItem.Size = New System.Drawing.Size(234, 22) + Me.SDLAuswertungenToolStripMenuItem.Size = New System.Drawing.Size(351, 34) Me.SDLAuswertungenToolStripMenuItem.Text = "Buchhaltung" ' 'SDLAuswertungenToolStripMenuItem1 ' Me.SDLAuswertungenToolStripMenuItem1.Name = "SDLAuswertungenToolStripMenuItem1" - Me.SDLAuswertungenToolStripMenuItem1.Size = New System.Drawing.Size(234, 22) + Me.SDLAuswertungenToolStripMenuItem1.Size = New System.Drawing.Size(351, 34) Me.SDLAuswertungenToolStripMenuItem1.Text = "SDL Auswertungen" ' 'ToolStripFormulare @@ -1014,201 +1021,201 @@ Partial Class frmHauptfenster Me.ToolStripFormulare.ImageAlign = System.Drawing.ContentAlignment.BottomRight Me.ToolStripFormulare.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.ToolStripFormulare.Name = "ToolStripFormulare" - Me.ToolStripFormulare.Size = New System.Drawing.Size(73, 20) + Me.ToolStripFormulare.Size = New System.Drawing.Size(108, 48) Me.ToolStripFormulare.Text = "Formulare" ' 'MANAGERToolStripMenuItem ' Me.MANAGERToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold) Me.MANAGERToolStripMenuItem.Name = "MANAGERToolStripMenuItem" - Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(421, 34) 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(418, 6) ' '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(421, 34) Me.ToolStripMenuItem2.Text = "Vollmachten" ' 'toolStrVM_de ' Me.toolStrVM_de.Name = "toolStrVM_de" - Me.toolStrVM_de.Size = New System.Drawing.Size(204, 22) + Me.toolStrVM_de.Size = New System.Drawing.Size(307, 34) Me.toolStrVM_de.Text = "Zollvollmacht DE" ' 'ZollvollmachtDEFiskalToolStripMenuItem ' Me.ZollvollmachtDEFiskalToolStripMenuItem.Name = "ZollvollmachtDEFiskalToolStripMenuItem" - Me.ZollvollmachtDEFiskalToolStripMenuItem.Size = New System.Drawing.Size(204, 22) + Me.ZollvollmachtDEFiskalToolStripMenuItem.Size = New System.Drawing.Size(307, 34) Me.ZollvollmachtDEFiskalToolStripMenuItem.Text = "Zollvollmacht DE - Fiskal" ' 'toolStrVM_at ' Me.toolStrVM_at.Name = "toolStrVM_at" - Me.toolStrVM_at.Size = New System.Drawing.Size(204, 22) + Me.toolStrVM_at.Size = New System.Drawing.Size(307, 34) Me.toolStrVM_at.Text = "Zollvollmacht AT" ' 'toolStrVM_at4200 ' Me.toolStrVM_at4200.Name = "toolStrVM_at4200" - Me.toolStrVM_at4200.Size = New System.Drawing.Size(204, 22) + Me.toolStrVM_at4200.Size = New System.Drawing.Size(307, 34) Me.toolStrVM_at4200.Text = "Zollvollmacht AT - Fiskal" ' 'ZollvollmachtATEVToolStripMenuItem ' Me.ZollvollmachtATEVToolStripMenuItem.Name = "ZollvollmachtATEVToolStripMenuItem" - Me.ZollvollmachtATEVToolStripMenuItem.Size = New System.Drawing.Size(204, 22) + Me.ZollvollmachtATEVToolStripMenuItem.Size = New System.Drawing.Size(307, 34) Me.ZollvollmachtATEVToolStripMenuItem.Text = "Zollvollmacht AT - EV" ' 'ToolStripMenuItem7 ' Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7" - Me.ToolStripMenuItem7.Size = New System.Drawing.Size(277, 22) + Me.ToolStripMenuItem7.Size = New System.Drawing.Size(421, 34) 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(421, 34) 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(421, 34) 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(421, 34) 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(421, 34) 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(421, 34) Me.toolVUB.Text = "VUB" ' 'VUBVERAGSpeditionAGToolStripMenuItem ' Me.VUBVERAGSpeditionAGToolStripMenuItem.Name = "VUBVERAGSpeditionAGToolStripMenuItem" - Me.VUBVERAGSpeditionAGToolStripMenuItem.Size = New System.Drawing.Size(271, 22) + Me.VUBVERAGSpeditionAGToolStripMenuItem.Size = New System.Drawing.Size(411, 34) Me.VUBVERAGSpeditionAGToolStripMenuItem.Text = "VUB - VERAG Spedition AG" ' 'VeragCustomsServiceToolStripMenuItem ' Me.VeragCustomsServiceToolStripMenuItem.Name = "VeragCustomsServiceToolStripMenuItem" - Me.VeragCustomsServiceToolStripMenuItem.Size = New System.Drawing.Size(271, 22) + Me.VeragCustomsServiceToolStripMenuItem.Size = New System.Drawing.Size(411, 34) Me.VeragCustomsServiceToolStripMenuItem.Text = "VUB - VERAG Customs Service GmbH" ' 'toolVPCreditreform ' Me.toolVPCreditreform.Name = "toolVPCreditreform" - Me.toolVPCreditreform.Size = New System.Drawing.Size(277, 22) + Me.toolVPCreditreform.Size = New System.Drawing.Size(421, 34) 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(418, 6) ' 'VerzollungsunterlagenToolStripMenuItem ' Me.VerzollungsunterlagenToolStripMenuItem.Name = "VerzollungsunterlagenToolStripMenuItem" - Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(421, 34) 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(421, 34) 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(418, 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(421, 34) Me.WAIDHAUSToolStripMenuItem.Text = "WAIDHAUS" ' 'ToolStripMenuItem8 ' Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8" - Me.ToolStripMenuItem8.Size = New System.Drawing.Size(243, 22) + Me.ToolStripMenuItem8.Size = New System.Drawing.Size(370, 34) Me.ToolStripMenuItem8.Text = "Annahmeblatt IMPORT DE / TR" ' 'ToolStripMenuItem9 ' Me.ToolStripMenuItem9.Name = "ToolStripMenuItem9" - Me.ToolStripMenuItem9.Size = New System.Drawing.Size(243, 22) + Me.ToolStripMenuItem9.Size = New System.Drawing.Size(370, 34) Me.ToolStripMenuItem9.Text = "Annahmeblatt EXPORT DE / TR" ' 'AnnahmeblattIMPORTToolStripMenuItem ' Me.AnnahmeblattIMPORTToolStripMenuItem.Name = "AnnahmeblattIMPORTToolStripMenuItem" - Me.AnnahmeblattIMPORTToolStripMenuItem.Size = New System.Drawing.Size(243, 22) + Me.AnnahmeblattIMPORTToolStripMenuItem.Size = New System.Drawing.Size(370, 34) Me.AnnahmeblattIMPORTToolStripMenuItem.Text = "Annahmeblatt IMPORT DE / SRB" ' 'AnnahmeblattEXPORTToolStripMenuItem ' Me.AnnahmeblattEXPORTToolStripMenuItem.Name = "AnnahmeblattEXPORTToolStripMenuItem" - Me.AnnahmeblattEXPORTToolStripMenuItem.Size = New System.Drawing.Size(243, 22) + Me.AnnahmeblattEXPORTToolStripMenuItem.Size = New System.Drawing.Size(370, 34) Me.AnnahmeblattEXPORTToolStripMenuItem.Text = "Annahmeblatt EXPORT DE / SRB" ' 'ChecklisteVerwahrlagerToolStripMenuItem ' Me.ChecklisteVerwahrlagerToolStripMenuItem.Name = "ChecklisteVerwahrlagerToolStripMenuItem" - Me.ChecklisteVerwahrlagerToolStripMenuItem.Size = New System.Drawing.Size(243, 22) + Me.ChecklisteVerwahrlagerToolStripMenuItem.Size = New System.Drawing.Size(370, 34) Me.ChecklisteVerwahrlagerToolStripMenuItem.Text = "Checkliste Verwahrlager" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(274, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(418, 6) ' 'EinheitspapierToolStripMenuItem ' Me.EinheitspapierToolStripMenuItem.Name = "EinheitspapierToolStripMenuItem" - Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(421, 34) 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(421, 34) 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(421, 34) Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Text = "Einheitspapier 0735 (Versandverfahren)" ' '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}) Me.BREXITToolStripMenuItem.Name = "BREXITToolStripMenuItem" - Me.BREXITToolStripMenuItem.Size = New System.Drawing.Size(55, 20) + Me.BREXITToolStripMenuItem.Size = New System.Drawing.Size(83, 29) Me.BREXITToolStripMenuItem.Text = "BREXIT" Me.BREXITToolStripMenuItem.Visible = False ' @@ -1216,147 +1223,147 @@ Partial Class frmHauptfenster ' Me.GVMSToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.GVMSToolStripMenuItem.Name = "GVMSToolStripMenuItem" - Me.GVMSToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.GVMSToolStripMenuItem.Size = New System.Drawing.Size(369, 34) Me.GVMSToolStripMenuItem.Text = "GVMS" ' 'GVMSUKIMportToolStripMenuItem ' Me.GVMSUKIMportToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.GVMSUKIMportToolStripMenuItem.Name = "GVMSUKIMportToolStripMenuItem" - Me.GVMSUKIMportToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.GVMSUKIMportToolStripMenuItem.Size = New System.Drawing.Size(369, 34) Me.GVMSUKIMportToolStripMenuItem.Text = "GVMS (UK Import)" ' 'GVMSBeschreibungToolStripMenuItem ' Me.GVMSBeschreibungToolStripMenuItem.Enabled = False Me.GVMSBeschreibungToolStripMenuItem.Name = "GVMSBeschreibungToolStripMenuItem" - Me.GVMSBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.GVMSBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(369, 34) Me.GVMSBeschreibungToolStripMenuItem.Text = "GVMS Beschreibung" ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(245, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(366, 6) ' 'TicketIBFInlandBorderFacilitiesToolStripMenuItem ' Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Name = "TicketIBFInlandBorderFacilitiesToolStripMenuItem" - Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Size = New System.Drawing.Size(369, 34) Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Text = "Ticket IBF (InlandBorderFacilities)" ' 'TicketIBFBeschreibungToolStripMenuItem ' Me.TicketIBFBeschreibungToolStripMenuItem.Name = "TicketIBFBeschreibungToolStripMenuItem" - Me.TicketIBFBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.TicketIBFBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(369, 34) Me.TicketIBFBeschreibungToolStripMenuItem.Text = "Ticket IBF Beschreibung" ' 'IBFStatusToolStripMenuItem ' Me.IBFStatusToolStripMenuItem.Name = "IBFStatusToolStripMenuItem" - Me.IBFStatusToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.IBFStatusToolStripMenuItem.Size = New System.Drawing.Size(369, 34) Me.IBFStatusToolStripMenuItem.Text = "IBF Status" ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(245, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(366, 6) ' 'FREnveloppeSmartBorderToolStripMenuItem ' Me.FREnveloppeSmartBorderToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.FREnveloppeSmartBorderToolStripMenuItem.Name = "FREnveloppeSmartBorderToolStripMenuItem" - Me.FREnveloppeSmartBorderToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.FREnveloppeSmartBorderToolStripMenuItem.Size = New System.Drawing.Size(369, 34) Me.FREnveloppeSmartBorderToolStripMenuItem.Text = "FR: Enveloppe (SmartBorder)" ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(245, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(366, 6) ' 'PBNIrelandFähreToolStripMenuItem ' Me.PBNIrelandFähreToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.PBNIrelandFähreToolStripMenuItem.Name = "PBNIrelandFähreToolStripMenuItem" - Me.PBNIrelandFähreToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.PBNIrelandFähreToolStripMenuItem.Size = New System.Drawing.Size(369, 34) Me.PBNIrelandFähreToolStripMenuItem.Text = "PBN (Ireland Fähre)" ' 'ToolStripSeparator20 ' Me.ToolStripSeparator20.Name = "ToolStripSeparator20" - Me.ToolStripSeparator20.Size = New System.Drawing.Size(245, 6) + Me.ToolStripSeparator20.Size = New System.Drawing.Size(366, 6) ' 'WARENORTToolStripMenuItem ' Me.WARENORTToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATFormularZa282ToolStripMenuItem, Me.ATInfoToolStripMenuItem, Me.ToolStripSeparator17, Me.DEFormular0442ToolStripMenuItem, Me.DEInfoToolStripMenuItem}) Me.WARENORTToolStripMenuItem.Name = "WARENORTToolStripMenuItem" - Me.WARENORTToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.WARENORTToolStripMenuItem.Size = New System.Drawing.Size(369, 34) Me.WARENORTToolStripMenuItem.Text = "REX" ' 'ATFormularZa282ToolStripMenuItem ' Me.ATFormularZa282ToolStripMenuItem.Name = "ATFormularZa282ToolStripMenuItem" - Me.ATFormularZa282ToolStripMenuItem.Size = New System.Drawing.Size(172, 22) + Me.ATFormularZa282ToolStripMenuItem.Size = New System.Drawing.Size(264, 34) Me.ATFormularZa282ToolStripMenuItem.Text = "AT Formular Za278" ' 'ATInfoToolStripMenuItem ' Me.ATInfoToolStripMenuItem.Name = "ATInfoToolStripMenuItem" - Me.ATInfoToolStripMenuItem.Size = New System.Drawing.Size(172, 22) + Me.ATInfoToolStripMenuItem.Size = New System.Drawing.Size(264, 34) Me.ATInfoToolStripMenuItem.Text = "AT Info" ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(169, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(261, 6) ' 'DEFormular0442ToolStripMenuItem ' Me.DEFormular0442ToolStripMenuItem.Name = "DEFormular0442ToolStripMenuItem" - Me.DEFormular0442ToolStripMenuItem.Size = New System.Drawing.Size(172, 22) + Me.DEFormular0442ToolStripMenuItem.Size = New System.Drawing.Size(264, 34) Me.DEFormular0442ToolStripMenuItem.Text = "DE Formular 0442" ' 'DEInfoToolStripMenuItem ' Me.DEInfoToolStripMenuItem.Name = "DEInfoToolStripMenuItem" - Me.DEInfoToolStripMenuItem.Size = New System.Drawing.Size(172, 22) + Me.DEInfoToolStripMenuItem.Size = New System.Drawing.Size(264, 34) Me.DEInfoToolStripMenuItem.Text = "DE Info" ' 'ToolStripMenuItem14 ' Me.ToolStripMenuItem14.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem16, Me.ToolStripSeparator19}) Me.ToolStripMenuItem14.Name = "ToolStripMenuItem14" - Me.ToolStripMenuItem14.Size = New System.Drawing.Size(248, 22) + Me.ToolStripMenuItem14.Size = New System.Drawing.Size(369, 34) Me.ToolStripMenuItem14.Text = "WARENORT" ' 'ToolStripMenuItem16 ' Me.ToolStripMenuItem16.Name = "ToolStripMenuItem16" - Me.ToolStripMenuItem16.Size = New System.Drawing.Size(172, 22) + Me.ToolStripMenuItem16.Size = New System.Drawing.Size(264, 34) Me.ToolStripMenuItem16.Text = "AT Formular Za283" ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(169, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(261, 6) ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(245, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(366, 6) ' 'EORIUKGeneriertenToolStripMenuItem ' Me.EORIUKGeneriertenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.fragezeichen1 Me.EORIUKGeneriertenToolStripMenuItem.Name = "EORIUKGeneriertenToolStripMenuItem" - Me.EORIUKGeneriertenToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.EORIUKGeneriertenToolStripMenuItem.Size = New System.Drawing.Size(369, 34) Me.EORIUKGeneriertenToolStripMenuItem.Text = "EORI UK generierten" ' 'KAPKentAccessPermitToolStripMenuItem ' Me.KAPKentAccessPermitToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.fragezeichen Me.KAPKentAccessPermitToolStripMenuItem.Name = "KAPKentAccessPermitToolStripMenuItem" - Me.KAPKentAccessPermitToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.KAPKentAccessPermitToolStripMenuItem.Size = New System.Drawing.Size(369, 34) Me.KAPKentAccessPermitToolStripMenuItem.Text = "KAP (KentAccessPermit)" ' 'mnuFragezeichen @@ -1365,85 +1372,85 @@ Partial Class frmHauptfenster 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(24, 20) + Me.mnuFragezeichen.Size = New System.Drawing.Size(36, 48) Me.mnuFragezeichen.Text = "?" ' '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(193, 22) + Me.VerfahrenshandbücherToolStripMenuItem.Size = New System.Drawing.Size(291, 34) Me.VerfahrenshandbücherToolStripMenuItem.Text = "Verfahrenshandbücher" ' 'VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem ' Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Name = "VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem" - Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Size = New System.Drawing.Size(306, 22) + Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Size = New System.Drawing.Size(463, 34) 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(193, 22) + Me.ChecklistenToolStripMenuItem.Size = New System.Drawing.Size(291, 34) Me.ChecklistenToolStripMenuItem.Text = "Checklisten" ' 'ChecklisteWOCHECKLISTEZEallgemein ' Me.ChecklisteWOCHECKLISTEZEallgemein.Name = "ChecklisteWOCHECKLISTEZEallgemein" - Me.ChecklisteWOCHECKLISTEZEallgemein.Size = New System.Drawing.Size(381, 22) + Me.ChecklisteWOCHECKLISTEZEallgemein.Size = New System.Drawing.Size(573, 34) Me.ChecklisteWOCHECKLISTEZEallgemein.Text = "ZE WO CHECKLISTE ZE allgemein" ' 'ZEVerfahrensanleitungGestellungSumAToolStripMenuItem ' Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Name = "ZEVerfahrensanleitungGestellungSumAToolStripMenuItem" - Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Size = New System.Drawing.Size(381, 22) + Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Size = New System.Drawing.Size(573, 34) Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Text = "ZE Verfahrensanleitung Gestellung/SumA" ' 'ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem ' Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Name = "ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem" - Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Size = New System.Drawing.Size(381, 22) + Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Size = New System.Drawing.Size(573, 34) Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Text = "ZE Verfahrensanleitung Gestellung/SumA - Fremdpersonal" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(378, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(570, 6) ' 'WOCHECKLISTEZVAllgemeinToolStripMenuItem ' Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Name = "WOCHECKLISTEZVAllgemeinToolStripMenuItem" - Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Size = New System.Drawing.Size(381, 22) + Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Size = New System.Drawing.Size(573, 34) Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Text = "ZV WO CHECKLISTE ZV allgemein" ' 'ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1 ' Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Name = "ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1" - Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Size = New System.Drawing.Size(381, 22) + Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Size = New System.Drawing.Size(573, 34) Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Text = "ZV Verfahrensanleitung" ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(378, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(570, 6) ' 'WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem ' Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Name = "WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem" - Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Size = New System.Drawing.Size(381, 22) + Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Size = New System.Drawing.Size(573, 34) Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Text = "WO CHECKLISTE Abgang Verwahrungsort ZV" ' 'WOCECKLISTEZEWDHToolStripMenuItem ' Me.WOCECKLISTEZEWDHToolStripMenuItem.Name = "WOCECKLISTEZEWDHToolStripMenuItem" - Me.WOCECKLISTEZEWDHToolStripMenuItem.Size = New System.Drawing.Size(381, 22) + Me.WOCECKLISTEZEWDHToolStripMenuItem.Size = New System.Drawing.Size(573, 34) Me.WOCECKLISTEZEWDHToolStripMenuItem.Text = "WO CHECKLISTE ZE WDH" ' 'HandbuchToolStripMenuItem ' Me.HandbuchToolStripMenuItem.Name = "HandbuchToolStripMenuItem" - Me.HandbuchToolStripMenuItem.Size = New System.Drawing.Size(193, 22) + Me.HandbuchToolStripMenuItem.Size = New System.Drawing.Size(291, 34) Me.HandbuchToolStripMenuItem.Text = "Handbuch" ' 'btnWoche @@ -1502,7 +1509,7 @@ Partial Class frmHauptfenster Me.pnlDetailsRechts.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlDetailsRechts.Location = New System.Drawing.Point(0, 0) Me.pnlDetailsRechts.Name = "pnlDetailsRechts" - Me.pnlDetailsRechts.Size = New System.Drawing.Size(550, 599) + Me.pnlDetailsRechts.Size = New System.Drawing.Size(827, 855) Me.pnlDetailsRechts.TabIndex = 0 ' 'Label6 @@ -1512,7 +1519,7 @@ Partial Class frmHauptfenster Me.Label6.ForeColor = System.Drawing.Color.White Me.Label6.Location = New System.Drawing.Point(232, 55) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(81, 13) + Me.Label6.Size = New System.Drawing.Size(109, 17) Me.Label6.TabIndex = 11 Me.Label6.Text = "mind. 2 Zeichen" ' @@ -1522,7 +1529,7 @@ Partial Class frmHauptfenster Me.txtSuche.Location = New System.Drawing.Point(7, 28) Me.txtSuche.MaxLength = 30 Me.txtSuche.Name = "txtSuche" - Me.txtSuche.Size = New System.Drawing.Size(306, 26) + Me.txtSuche.Size = New System.Drawing.Size(306, 35) Me.txtSuche.TabIndex = 0 ' 'Top @@ -1543,7 +1550,7 @@ Partial Class frmHauptfenster Me.Top.Controls.Add(Me.btnKunden) Me.Top.Controls.Add(Me.btnSpedBuch) Me.Top.Dock = System.Windows.Forms.DockStyle.Top - Me.Top.Location = New System.Drawing.Point(0, 24) + Me.Top.Location = New System.Drawing.Point(0, 81) Me.Top.Name = "Top" Me.Top.Size = New System.Drawing.Size(1372, 52) Me.Top.TabIndex = 6 @@ -1804,7 +1811,7 @@ Partial Class frmHauptfenster Me.Button1.Size = New System.Drawing.Size(121, 33) Me.Button1.TabIndex = 0 Me.Button1.TabStop = False - Me.Button1.Text = "Zoll-Tarife" + Me.Button1.Text = "Zoll-Webseiten" Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button1.UseVisualStyleBackColor = True ' @@ -1828,7 +1835,7 @@ Partial Class frmHauptfenster Me.lblMitarbeiter.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) Me.lblMitarbeiter.Location = New System.Drawing.Point(2, 184) Me.lblMitarbeiter.Name = "lblMitarbeiter" - Me.lblMitarbeiter.Size = New System.Drawing.Size(126, 13) + Me.lblMitarbeiter.Size = New System.Drawing.Size(190, 20) Me.lblMitarbeiter.TabIndex = 1 Me.lblMitarbeiter.Text = "Max Mustermann (Admin)" Me.lblMitarbeiter.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -1841,7 +1848,7 @@ Partial Class frmHauptfenster Me.lblGrenzstelle.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) Me.lblGrenzstelle.Location = New System.Drawing.Point(143, 199) Me.lblGrenzstelle.Name = "lblGrenzstelle" - Me.lblGrenzstelle.Size = New System.Drawing.Size(29, 13) + Me.lblGrenzstelle.Size = New System.Drawing.Size(43, 20) Me.lblGrenzstelle.TabIndex = 0 Me.lblGrenzstelle.Text = "SUB" Me.lblGrenzstelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -1987,8 +1994,8 @@ Partial Class frmHauptfenster ' Me.SplitContainer2.Panel2.Controls.Add(Me.SplitContainer3) Me.SplitContainer2.Panel2MinSize = 650 - Me.SplitContainer2.Size = New System.Drawing.Size(815, 300) - Me.SplitContainer2.SplitterDistance = 93 + Me.SplitContainer2.Size = New System.Drawing.Size(1224, 300) + Me.SplitContainer2.SplitterDistance = 514 Me.SplitContainer2.SplitterWidth = 1 Me.SplitContainer2.TabIndex = 0 ' @@ -2005,7 +2012,7 @@ Partial Class frmHauptfenster Me.pnlLinks.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlLinks.Location = New System.Drawing.Point(0, 86) Me.pnlLinks.Name = "pnlLinks" - Me.pnlLinks.Size = New System.Drawing.Size(93, 214) + Me.pnlLinks.Size = New System.Drawing.Size(514, 214) Me.pnlLinks.TabIndex = 0 ' 'lblFimaAviso @@ -2016,7 +2023,7 @@ Partial Class frmHauptfenster Me.lblFimaAviso.ForeColor = System.Drawing.Color.Black Me.lblFimaAviso.Location = New System.Drawing.Point(67, 199) Me.lblFimaAviso.Name = "lblFimaAviso" - Me.lblFimaAviso.Size = New System.Drawing.Size(63, 13) + Me.lblFimaAviso.Size = New System.Drawing.Size(97, 20) Me.lblFimaAviso.TabIndex = 11 Me.lblFimaAviso.Text = "XXXXXXXX" ' @@ -2030,7 +2037,7 @@ Partial Class frmHauptfenster Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(93, 111) + Me.Panel2.Size = New System.Drawing.Size(514, 111) Me.Panel2.TabIndex = 10 ' 'Label7 @@ -2040,7 +2047,7 @@ Partial Class frmHauptfenster Me.Label7.ForeColor = System.Drawing.Color.Black Me.Label7.Location = New System.Drawing.Point(6, 5) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(41, 13) + Me.Label7.Size = New System.Drawing.Size(56, 20) Me.Label7.TabIndex = 3 Me.Label7.Text = "Links:" ' @@ -2052,7 +2059,7 @@ Partial Class frmHauptfenster Me.lblErrVermerk.ForeColor = System.Drawing.Color.Red Me.lblErrVermerk.Location = New System.Drawing.Point(12, 158) Me.lblErrVermerk.Name = "lblErrVermerk" - Me.lblErrVermerk.Size = New System.Drawing.Size(66, 27) + Me.lblErrVermerk.Size = New System.Drawing.Size(487, 27) Me.lblErrVermerk.TabIndex = 1 Me.lblErrVermerk.Text = "Bei diesem Status kann kein Vermerk erfasst werden!" Me.lblErrVermerk.TextAlign = System.Drawing.ContentAlignment.BottomLeft @@ -2104,7 +2111,7 @@ Partial Class frmHauptfenster Me.lblVersion.ForeColor = System.Drawing.Color.Black Me.lblVersion.Location = New System.Drawing.Point(3, 199) Me.lblVersion.Name = "lblVersion" - Me.lblVersion.Size = New System.Drawing.Size(47, 13) + Me.lblVersion.Size = New System.Drawing.Size(68, 20) Me.lblVersion.TabIndex = 6 Me.lblVersion.Text = "V1.0.0.0" ' @@ -2127,7 +2134,7 @@ Partial Class frmHauptfenster Me.pnlLinksOben.Dock = System.Windows.Forms.DockStyle.Top Me.pnlLinksOben.Location = New System.Drawing.Point(0, 0) Me.pnlLinksOben.Name = "pnlLinksOben" - Me.pnlLinksOben.Size = New System.Drawing.Size(93, 86) + Me.pnlLinksOben.Size = New System.Drawing.Size(514, 86) Me.pnlLinksOben.TabIndex = 1 ' 'Label22 @@ -2181,12 +2188,12 @@ Partial Class frmHauptfenster Me.cntxtAtilla.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtAtilla.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem17}) Me.cntxtAtilla.Name = "cntxt" - Me.cntxtAtilla.Size = New System.Drawing.Size(111, 26) + Me.cntxtAtilla.Size = New System.Drawing.Size(139, 36) ' 'ToolStripMenuItem17 ' Me.ToolStripMenuItem17.Name = "ToolStripMenuItem17" - Me.ToolStripMenuItem17.Size = New System.Drawing.Size(110, 22) + Me.ToolStripMenuItem17.Size = New System.Drawing.Size(138, 32) Me.ToolStripMenuItem17.Text = "ATILLA" ' 'SplitContainer3 @@ -2202,8 +2209,8 @@ Partial Class frmHauptfenster 'SplitContainer3.Panel2 ' Me.SplitContainer3.Panel2.Controls.Add(Me.pnl) - Me.SplitContainer3.Size = New System.Drawing.Size(721, 300) - Me.SplitContainer3.SplitterDistance = 178 + Me.SplitContainer3.Size = New System.Drawing.Size(709, 300) + Me.SplitContainer3.SplitterDistance = 174 Me.SplitContainer3.TabIndex = 3 ' 'UsrCntlBenachrichtigungen1 @@ -2212,7 +2219,7 @@ Partial Class frmHauptfenster 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(178, 300) + Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(174, 300) Me.UsrCntlBenachrichtigungen1.TabIndex = 0 ' 'pnl @@ -2223,7 +2230,7 @@ Partial Class frmHauptfenster Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(539, 300) + Me.pnl.Size = New System.Drawing.Size(531, 300) Me.pnl.TabIndex = 0 ' 'Button10 @@ -2257,7 +2264,7 @@ Partial Class frmHauptfenster Me.gridMyAviso.ReadOnly = True Me.gridMyAviso.RowHeadersVisible = False Me.gridMyAviso.RowHeadersWidth = 62 - Me.gridMyAviso.Size = New System.Drawing.Size(539, 277) + Me.gridMyAviso.Size = New System.Drawing.Size(531, 277) Me.gridMyAviso.TabIndex = 0 ' 'Panel6 @@ -2275,7 +2282,7 @@ Partial Class frmHauptfenster Me.Panel6.Dock = System.Windows.Forms.DockStyle.Top Me.Panel6.Location = New System.Drawing.Point(0, 0) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(539, 21) + Me.Panel6.Size = New System.Drawing.Size(531, 21) Me.Panel6.TabIndex = 1 ' 'lblMeineAviso @@ -2285,7 +2292,7 @@ Partial Class frmHauptfenster Me.lblMeineAviso.ForeColor = System.Drawing.Color.White Me.lblMeineAviso.Location = New System.Drawing.Point(29, 5) Me.lblMeineAviso.Name = "lblMeineAviso" - Me.lblMeineAviso.Size = New System.Drawing.Size(113, 13) + Me.lblMeineAviso.Size = New System.Drawing.Size(163, 20) Me.lblMeineAviso.TabIndex = 0 Me.lblMeineAviso.Text = "Meine Sendungen:" ' @@ -2301,9 +2308,9 @@ Partial Class frmHauptfenster Me.cboMy_Grenzstelle.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cboMy_Grenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.cboMy_Grenzstelle.FormattingEnabled = True - Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(164, 1) + Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(156, 1) Me.cboMy_Grenzstelle.Name = "cboMy_Grenzstelle" - Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 21) + Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 28) Me.cboMy_Grenzstelle.TabIndex = 26 ' 'Label18 @@ -2311,7 +2318,7 @@ Partial Class frmHauptfenster Me.Label18.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label18.AutoSize = True Me.Label18.ForeColor = System.Drawing.Color.White - Me.Label18.Location = New System.Drawing.Point(96, 4) + Me.Label18.Location = New System.Drawing.Point(88, 4) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(62, 13) Me.Label18.TabIndex = 25 @@ -2322,9 +2329,9 @@ Partial Class frmHauptfenster Me.cbx_My_LKW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.cbx_My_LKW.AutoSize = True Me.cbx_My_LKW.ForeColor = System.Drawing.Color.White - Me.cbx_My_LKW.Location = New System.Drawing.Point(40, 3) + Me.cbx_My_LKW.Location = New System.Drawing.Point(25, 3) Me.cbx_My_LKW.Name = "cbx_My_LKW" - Me.cbx_My_LKW.Size = New System.Drawing.Size(50, 17) + Me.cbx_My_LKW.Size = New System.Drawing.Size(57, 21) Me.cbx_My_LKW.TabIndex = 24 Me.cbx_My_LKW.Text = "LKW" Me.cbx_My_LKW.UseVisualStyleBackColor = True @@ -2336,9 +2343,9 @@ Partial Class frmHauptfenster Me.cboMy_QS.Checked = True Me.cboMy_QS.CheckState = System.Windows.Forms.CheckState.Indeterminate Me.cboMy_QS.ForeColor = System.Drawing.Color.White - Me.cboMy_QS.Location = New System.Drawing.Point(426, 3) + Me.cboMy_QS.Location = New System.Drawing.Point(411, 3) Me.cboMy_QS.Name = "cboMy_QS" - Me.cboMy_QS.Size = New System.Drawing.Size(15, 14) + Me.cboMy_QS.Size = New System.Drawing.Size(22, 21) Me.cboMy_QS.TabIndex = 23 Me.cboMy_QS.ThreeState = True Me.cboMy_QS.UseVisualStyleBackColor = True @@ -2350,9 +2357,9 @@ Partial Class frmHauptfenster Me.cboMy_VB.Checked = True Me.cboMy_VB.CheckState = System.Windows.Forms.CheckState.Indeterminate Me.cboMy_VB.ForeColor = System.Drawing.Color.White - Me.cboMy_VB.Location = New System.Drawing.Point(447, 3) + Me.cboMy_VB.Location = New System.Drawing.Point(432, 3) Me.cboMy_VB.Name = "cboMy_VB" - Me.cboMy_VB.Size = New System.Drawing.Size(15, 14) + Me.cboMy_VB.Size = New System.Drawing.Size(22, 21) Me.cboMy_VB.TabIndex = 22 Me.cboMy_VB.ThreeState = True Me.cboMy_VB.UseVisualStyleBackColor = True @@ -2368,9 +2375,9 @@ Partial Class frmHauptfenster Me.cboMyAvisoAnzeige.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cboMyAvisoAnzeige.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.cboMyAvisoAnzeige.FormattingEnabled = True - Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(283, 1) + Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(275, 1) Me.cboMyAvisoAnzeige.Name = "cboMyAvisoAnzeige" - Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 21) + Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 28) Me.cboMyAvisoAnzeige.TabIndex = 21 ' 'Label17 @@ -2378,7 +2385,7 @@ Partial Class frmHauptfenster Me.Label17.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label17.AutoSize = True Me.Label17.ForeColor = System.Drawing.Color.White - Me.Label17.Location = New System.Drawing.Point(234, 3) + Me.Label17.Location = New System.Drawing.Point(226, 3) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(48, 13) Me.Label17.TabIndex = 20 @@ -2388,7 +2395,7 @@ Partial Class frmHauptfenster ' Me.lblAkte.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAkte.ForeColor = System.Drawing.Color.White - Me.lblAkte.Location = New System.Drawing.Point(812, 6) + Me.lblAkte.Location = New System.Drawing.Point(804, 6) Me.lblAkte.Name = "lblAkte" Me.lblAkte.Size = New System.Drawing.Size(207, 19) Me.lblAkte.TabIndex = 1 @@ -2423,7 +2430,7 @@ Partial Class frmHauptfenster Me.tabVorgeschrieben.Location = New System.Drawing.Point(4, 34) Me.tabVorgeschrieben.Name = "tabVorgeschrieben" Me.tabVorgeschrieben.Padding = New System.Windows.Forms.Padding(3) - Me.tabVorgeschrieben.Size = New System.Drawing.Size(876, 0) + Me.tabVorgeschrieben.Size = New System.Drawing.Size(385, 0) Me.tabVorgeschrieben.TabIndex = 3 Me.tabVorgeschrieben.Text = "3.Vorgeschrieben" ' @@ -2434,7 +2441,7 @@ Partial Class frmHauptfenster Me.tabFreigegeben.Location = New System.Drawing.Point(4, 34) Me.tabFreigegeben.Name = "tabFreigegeben" Me.tabFreigegeben.Padding = New System.Windows.Forms.Padding(3) - Me.tabFreigegeben.Size = New System.Drawing.Size(876, 0) + Me.tabFreigegeben.Size = New System.Drawing.Size(385, 0) Me.tabFreigegeben.TabIndex = 5 Me.tabFreigegeben.Text = "5. Freigegeben" ' @@ -2445,7 +2452,7 @@ Partial Class frmHauptfenster Me.tabNichtEingetroffen.Location = New System.Drawing.Point(4, 34) Me.tabNichtEingetroffen.Name = "tabNichtEingetroffen" Me.tabNichtEingetroffen.Padding = New System.Windows.Forms.Padding(3) - Me.tabNichtEingetroffen.Size = New System.Drawing.Size(876, 0) + Me.tabNichtEingetroffen.Size = New System.Drawing.Size(385, 0) Me.tabNichtEingetroffen.TabIndex = 6 Me.tabNichtEingetroffen.Text = "Nicht eingetroffen" ' @@ -2456,7 +2463,7 @@ Partial Class frmHauptfenster Me.tabAnkunft.Location = New System.Drawing.Point(4, 34) Me.tabAnkunft.Name = "tabAnkunft" Me.tabAnkunft.Padding = New System.Windows.Forms.Padding(3) - Me.tabAnkunft.Size = New System.Drawing.Size(876, 0) + Me.tabAnkunft.Size = New System.Drawing.Size(385, 0) Me.tabAnkunft.TabIndex = 4 Me.tabAnkunft.Text = "4. Ankunft" ' @@ -2467,7 +2474,7 @@ Partial Class frmHauptfenster Me.tabVorbereitet.Location = New System.Drawing.Point(4, 34) Me.tabVorbereitet.Name = "tabVorbereitet" Me.tabVorbereitet.Padding = New System.Windows.Forms.Padding(3) - Me.tabVorbereitet.Size = New System.Drawing.Size(876, 0) + Me.tabVorbereitet.Size = New System.Drawing.Size(385, 0) Me.tabVorbereitet.TabIndex = 2 Me.tabVorbereitet.Text = "2.Vorbereitet QS" ' @@ -2476,7 +2483,7 @@ Partial Class frmHauptfenster Me.pnlAktOption.Dock = System.Windows.Forms.DockStyle.Top Me.pnlAktOption.Location = New System.Drawing.Point(0, 0) Me.pnlAktOption.Name = "pnlAktOption" - Me.pnlAktOption.Size = New System.Drawing.Size(815, 5) + Me.pnlAktOption.Size = New System.Drawing.Size(1224, 5) Me.pnlAktOption.TabIndex = 1 ' 'Button8 @@ -2486,7 +2493,7 @@ Partial Class frmHauptfenster Me.Button8.ForeColor = System.Drawing.Color.Black Me.Button8.Image = CType(resources.GetObject("Button8.Image"), System.Drawing.Image) Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button8.Location = New System.Drawing.Point(381, 214) + Me.Button8.Location = New System.Drawing.Point(790, 214) Me.Button8.Name = "Button8" Me.Button8.Size = New System.Drawing.Size(89, 34) Me.Button8.TabIndex = 3 @@ -2503,7 +2510,7 @@ Partial Class frmHauptfenster Me.btnFertig.ForeColor = System.Drawing.Color.Black Me.btnFertig.Image = CType(resources.GetObject("btnFertig.Image"), System.Drawing.Image) Me.btnFertig.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnFertig.Location = New System.Drawing.Point(485, 214) + Me.btnFertig.Location = New System.Drawing.Point(894, 214) Me.btnFertig.Name = "btnFertig" Me.btnFertig.Size = New System.Drawing.Size(102, 34) Me.btnFertig.TabIndex = 0 @@ -2520,7 +2527,7 @@ Partial Class frmHauptfenster Me.tabAlle.Location = New System.Drawing.Point(4, 34) Me.tabAlle.Name = "tabAlle" Me.tabAlle.Padding = New System.Windows.Forms.Padding(3) - Me.tabAlle.Size = New System.Drawing.Size(876, 0) + Me.tabAlle.Size = New System.Drawing.Size(385, 0) Me.tabAlle.TabIndex = 0 Me.tabAlle.Text = "Alle" ' @@ -2531,7 +2538,7 @@ Partial Class frmHauptfenster Me.tabErfasst.Location = New System.Drawing.Point(4, 34) Me.tabErfasst.Name = "tabErfasst" Me.tabErfasst.Padding = New System.Windows.Forms.Padding(3) - Me.tabErfasst.Size = New System.Drawing.Size(876, 0) + Me.tabErfasst.Size = New System.Drawing.Size(385, 0) Me.tabErfasst.TabIndex = 1 Me.tabErfasst.Text = "1. Erfasst" ' @@ -2552,7 +2559,7 @@ Partial Class frmHauptfenster Me.tbcntrAviso.Name = "tbcntrAviso" Me.tbcntrAviso.Padding = New System.Drawing.Point(12, 3) Me.tbcntrAviso.SelectedIndex = 0 - Me.tbcntrAviso.Size = New System.Drawing.Size(884, 32) + Me.tbcntrAviso.Size = New System.Drawing.Size(393, 32) Me.tbcntrAviso.TabIndex = 10 ' 'SplitContainer1 @@ -2560,7 +2567,7 @@ Partial Class frmHauptfenster Me.SplitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill Me.SplitContainer1.IsSplitterFixed = True - Me.SplitContainer1.Location = New System.Drawing.Point(0, 76) + Me.SplitContainer1.Location = New System.Drawing.Point(0, 159) Me.SplitContainer1.Name = "SplitContainer1" ' 'SplitContainer1.Panel1 @@ -2573,8 +2580,8 @@ Partial Class frmHauptfenster Me.SplitContainer1.Panel2.Controls.Add(Me.btnSmall) Me.SplitContainer1.Panel2.Controls.Add(Me.pnlDetailsRechts) Me.SplitContainer1.Panel2MinSize = 300 - Me.SplitContainer1.Size = New System.Drawing.Size(1372, 601) - Me.SplitContainer1.SplitterDistance = 819 + Me.SplitContainer1.Size = New System.Drawing.Size(2058, 857) + Me.SplitContainer1.SplitterDistance = 1228 Me.SplitContainer1.SplitterWidth = 1 Me.SplitContainer1.TabIndex = 7 ' @@ -2587,7 +2594,7 @@ Partial Class frmHauptfenster Me.pnlDetailsLinks.Location = New System.Drawing.Point(0, 0) Me.pnlDetailsLinks.MinimumSize = New System.Drawing.Size(324, 564) Me.pnlDetailsLinks.Name = "pnlDetailsLinks" - Me.pnlDetailsLinks.Size = New System.Drawing.Size(817, 599) + Me.pnlDetailsLinks.Size = New System.Drawing.Size(1226, 855) Me.pnlDetailsLinks.TabIndex = 0 ' 'splitMain @@ -2610,8 +2617,8 @@ Partial Class frmHauptfenster ' Me.splitMain.Panel2.Controls.Add(Me.SplitContainer2) Me.splitMain.Panel2.Controls.Add(Me.pnlAktOption) - Me.splitMain.Size = New System.Drawing.Size(815, 597) - Me.splitMain.SplitterDistance = 288 + Me.splitMain.Size = New System.Drawing.Size(1224, 853) + Me.splitMain.SplitterDistance = 544 Me.splitMain.TabIndex = 0 ' 'gridAviso @@ -2664,7 +2671,7 @@ Partial Class frmHauptfenster Me.gridAviso.RowTemplate.ReadOnly = True Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.gridAviso.Size = New System.Drawing.Size(815, 68) + Me.gridAviso.Size = New System.Drawing.Size(1224, 324) Me.gridAviso.TabIndex = 1 Me.gridAviso.TabStop = False ' @@ -2698,7 +2705,7 @@ Partial Class frmHauptfenster Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(815, 220) + Me.Panel1.Size = New System.Drawing.Size(1224, 220) Me.Panel1.TabIndex = 2 ' 'txtBestimmungszollstelle @@ -2750,7 +2757,7 @@ Partial Class frmHauptfenster Me.cboImEx.Items.AddRange(New Object() {"ALLE", "SUB", "SBG", "WAI", "NKD"}) Me.cboImEx.Location = New System.Drawing.Point(828, 3) Me.cboImEx.Name = "cboImEx" - Me.cboImEx.Size = New System.Drawing.Size(78, 24) + Me.cboImEx.Size = New System.Drawing.Size(78, 33) Me.cboImEx.TabIndex = 24 ' 'Label21 @@ -2771,7 +2778,7 @@ Partial Class frmHauptfenster Me.cbxCluster.ForeColor = System.Drawing.Color.White Me.cbxCluster.Location = New System.Drawing.Point(767, 35) Me.cbxCluster.Name = "cbxCluster" - Me.cbxCluster.Size = New System.Drawing.Size(96, 17) + Me.cbxCluster.Size = New System.Drawing.Size(103, 21) Me.cbxCluster.TabIndex = 20 Me.cbxCluster.Text = "Firmenverbund" Me.cbxCluster.UseVisualStyleBackColor = True @@ -2789,7 +2796,7 @@ Partial Class frmHauptfenster Me.cboTeams.FormattingEnabled = True Me.cboTeams.Location = New System.Drawing.Point(379, 3) Me.cboTeams.Name = "cboTeams" - Me.cboTeams.Size = New System.Drawing.Size(107, 24) + Me.cboTeams.Size = New System.Drawing.Size(107, 33) Me.cboTeams.TabIndex = 19 ' 'lblErweitereSuche @@ -2820,7 +2827,7 @@ Partial Class frmHauptfenster Me.Label8.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer)) Me.Label8.Location = New System.Drawing.Point(67, 7) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(15, 18) + Me.Label8.Size = New System.Drawing.Size(22, 26) Me.Label8.TabIndex = 15 Me.Label8.Text = "*" Me.Label8.Visible = False @@ -2830,7 +2837,7 @@ Partial Class frmHauptfenster Me.lblEintraege.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblEintraege.BackColor = System.Drawing.Color.Transparent Me.lblEintraege.ForeColor = System.Drawing.Color.White - Me.lblEintraege.Location = New System.Drawing.Point(585, 56) + Me.lblEintraege.Location = New System.Drawing.Point(994, 56) Me.lblEintraege.Name = "lblEintraege" Me.lblEintraege.Size = New System.Drawing.Size(169, 15) Me.lblEintraege.TabIndex = 14 @@ -2851,7 +2858,7 @@ Partial Class frmHauptfenster Me.cboGrenzstelle.Items.AddRange(New Object() {"ALLE", "SUB", "SBG", "WAI", "NKD", "NEU", "AMB", "???"}) Me.cboGrenzstelle.Location = New System.Drawing.Point(379, 30) Me.cboGrenzstelle.Name = "cboGrenzstelle" - Me.cboGrenzstelle.Size = New System.Drawing.Size(107, 24) + Me.cboGrenzstelle.Size = New System.Drawing.Size(107, 33) Me.cboGrenzstelle.TabIndex = 13 ' 'Label4 @@ -2878,7 +2885,7 @@ Partial Class frmHauptfenster Me.pnlTime.Controls.Add(Me.Label5) Me.pnlTime.Location = New System.Drawing.Point(446, 0) Me.pnlTime.Name = "pnlTime" - Me.pnlTime.Size = New System.Drawing.Size(437, 57) + Me.pnlTime.Size = New System.Drawing.Size(846, 57) Me.pnlTime.TabIndex = 12 ' 'MyComboBox1 @@ -2894,7 +2901,7 @@ Partial Class frmHauptfenster Me.MyComboBox1.Location = New System.Drawing.Point(46, 1) Me.MyComboBox1.MaxLength = 4 Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(98, 21) + Me.MyComboBox1.Size = New System.Drawing.Size(98, 28) Me.MyComboBox1.TabIndex = 7 ' 'pnlSearch @@ -2933,7 +2940,7 @@ Partial Class frmHauptfenster Me.txtDyRef.Location = New System.Drawing.Point(389, 61) Me.txtDyRef.MaxLength = 100 Me.txtDyRef.Name = "txtDyRef" - Me.txtDyRef.Size = New System.Drawing.Size(216, 23) + Me.txtDyRef.Size = New System.Drawing.Size(216, 30) Me.txtDyRef.TabIndex = 21 ' 'Label19 @@ -2962,7 +2969,7 @@ Partial Class frmHauptfenster Me.txtlkwId.Location = New System.Drawing.Point(79, 61) Me.txtlkwId.MaxLength = 100 Me.txtlkwId.Name = "txtlkwId" - Me.txtlkwId.Size = New System.Drawing.Size(236, 23) + Me.txtlkwId.Size = New System.Drawing.Size(236, 30) Me.txtlkwId.TabIndex = 10 ' 'cbxNE @@ -2971,7 +2978,7 @@ Partial Class frmHauptfenster Me.cbxNE.ForeColor = System.Drawing.Color.White Me.cbxNE.Location = New System.Drawing.Point(553, 86) Me.cbxNE.Name = "cbxNE" - Me.cbxNE.Size = New System.Drawing.Size(110, 17) + Me.cbxNE.Size = New System.Drawing.Size(117, 21) Me.cbxNE.TabIndex = 16 Me.cbxNE.Text = "Nicht eingetroffen" Me.cbxNE.UseVisualStyleBackColor = True @@ -2982,7 +2989,7 @@ Partial Class frmHauptfenster Me.cbxFreigabe.ForeColor = System.Drawing.Color.White Me.cbxFreigabe.Location = New System.Drawing.Point(462, 86) Me.cbxFreigabe.Name = "cbxFreigabe" - Me.cbxFreigabe.Size = New System.Drawing.Size(85, 17) + Me.cbxFreigabe.Size = New System.Drawing.Size(92, 21) Me.cbxFreigabe.TabIndex = 15 Me.cbxFreigabe.Text = "Freigegeben" Me.cbxFreigabe.UseVisualStyleBackColor = True @@ -2993,7 +3000,7 @@ Partial Class frmHauptfenster Me.cbxAnkunft.ForeColor = System.Drawing.Color.White Me.cbxAnkunft.Location = New System.Drawing.Point(393, 86) Me.cbxAnkunft.Name = "cbxAnkunft" - Me.cbxAnkunft.Size = New System.Drawing.Size(63, 17) + Me.cbxAnkunft.Size = New System.Drawing.Size(70, 21) Me.cbxAnkunft.TabIndex = 14 Me.cbxAnkunft.Text = "Ankunft" Me.cbxAnkunft.UseVisualStyleBackColor = True @@ -3004,7 +3011,7 @@ Partial Class frmHauptfenster Me.cbxVorg.ForeColor = System.Drawing.Color.White Me.cbxVorg.Location = New System.Drawing.Point(294, 86) Me.cbxVorg.Name = "cbxVorg" - Me.cbxVorg.Size = New System.Drawing.Size(100, 17) + Me.cbxVorg.Size = New System.Drawing.Size(107, 21) Me.cbxVorg.TabIndex = 13 Me.cbxVorg.Text = "Vorgeschrieben" Me.cbxVorg.UseVisualStyleBackColor = True @@ -3015,7 +3022,7 @@ Partial Class frmHauptfenster Me.cbxVorb.ForeColor = System.Drawing.Color.White Me.cbxVorb.Location = New System.Drawing.Point(193, 86) Me.cbxVorb.Name = "cbxVorb" - Me.cbxVorb.Size = New System.Drawing.Size(95, 17) + Me.cbxVorb.Size = New System.Drawing.Size(102, 21) Me.cbxVorb.TabIndex = 12 Me.cbxVorb.Text = "Vorbereitet QS" Me.cbxVorb.UseVisualStyleBackColor = True @@ -3026,7 +3033,7 @@ Partial Class frmHauptfenster Me.cbxErfasst.ForeColor = System.Drawing.Color.White Me.cbxErfasst.Location = New System.Drawing.Point(129, 86) Me.cbxErfasst.Name = "cbxErfasst" - Me.cbxErfasst.Size = New System.Drawing.Size(58, 17) + Me.cbxErfasst.Size = New System.Drawing.Size(65, 21) Me.cbxErfasst.TabIndex = 11 Me.cbxErfasst.Text = "Erfasst" Me.cbxErfasst.UseVisualStyleBackColor = True @@ -3047,7 +3054,7 @@ Partial Class frmHauptfenster Me.txtKdAuftragsnr.Location = New System.Drawing.Point(389, 35) Me.txtKdAuftragsnr.MaxLength = 100 Me.txtKdAuftragsnr.Name = "txtKdAuftragsnr" - Me.txtKdAuftragsnr.Size = New System.Drawing.Size(216, 23) + Me.txtKdAuftragsnr.Size = New System.Drawing.Size(216, 30) Me.txtKdAuftragsnr.TabIndex = 9 ' 'txtAuftraggeber @@ -3056,7 +3063,7 @@ Partial Class frmHauptfenster Me.txtAuftraggeber.Location = New System.Drawing.Point(79, 13) Me.txtAuftraggeber.MaxLength = 100 Me.txtAuftraggeber.Name = "txtAuftraggeber" - Me.txtAuftraggeber.Size = New System.Drawing.Size(236, 23) + Me.txtAuftraggeber.Size = New System.Drawing.Size(236, 30) Me.txtAuftraggeber.TabIndex = 1 ' 'lblErwKdAtrNr @@ -3101,7 +3108,7 @@ Partial Class frmHauptfenster Me.txtEmpfänger.Location = New System.Drawing.Point(79, 35) Me.txtEmpfänger.MaxLength = 100 Me.txtEmpfänger.Name = "txtEmpfänger" - Me.txtEmpfänger.Size = New System.Drawing.Size(236, 23) + Me.txtEmpfänger.Size = New System.Drawing.Size(236, 30) Me.txtEmpfänger.TabIndex = 5 ' 'cboFiliale @@ -3115,7 +3122,7 @@ Partial Class frmHauptfenster Me.cboFiliale.Location = New System.Drawing.Point(389, 13) Me.cboFiliale.MaxLength = 4 Me.cboFiliale.Name = "cboFiliale" - Me.cboFiliale.Size = New System.Drawing.Size(70, 24) + Me.cboFiliale.Size = New System.Drawing.Size(70, 33) Me.cboFiliale.TabIndex = 3 ' 'txtAbfertigungsnummer @@ -3124,7 +3131,7 @@ Partial Class frmHauptfenster Me.txtAbfertigungsnummer.Location = New System.Drawing.Point(458, 13) Me.txtAbfertigungsnummer.MaxLength = 8 Me.txtAbfertigungsnummer.Name = "txtAbfertigungsnummer" - Me.txtAbfertigungsnummer.Size = New System.Drawing.Size(147, 23) + Me.txtAbfertigungsnummer.Size = New System.Drawing.Size(147, 30) Me.txtAbfertigungsnummer.TabIndex = 4 ' 'lblErwFilialePos @@ -3153,7 +3160,7 @@ Partial Class frmHauptfenster Me.cbxAlle.ForeColor = System.Drawing.Color.White Me.cbxAlle.Location = New System.Drawing.Point(79, 86) Me.cbxAlle.Name = "cbxAlle" - Me.cbxAlle.Size = New System.Drawing.Size(43, 17) + Me.cbxAlle.Size = New System.Drawing.Size(50, 21) Me.cbxAlle.TabIndex = 10 Me.cbxAlle.Text = "Alle" Me.cbxAlle.UseVisualStyleBackColor = True @@ -3186,7 +3193,7 @@ Partial Class frmHauptfenster Me.Label9.ForeColor = System.Drawing.Color.Red Me.Label9.Location = New System.Drawing.Point(370, 5) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(438, 15) + Me.Label9.Size = New System.Drawing.Size(618, 22) Me.Label9.TabIndex = 9 Me.Label9.Text = "Es ist ein Programm-Update verfügbar, bitte das AVISO neu starten." Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -3279,22 +3286,65 @@ Partial Class frmHauptfenster 'cntxt ' Me.cntxt.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BundesanzeigerToolStripMenuItem, Me.EUTaricToolStripMenuItem}) + Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BundesanzeigerToolStripMenuItem, Me.EUTaricToolStripMenuItem, Me.ZugelassenerAusführerToolStripMenuItem}) Me.cntxt.Name = "cntxt" - Me.cntxt.Size = New System.Drawing.Size(158, 48) + Me.cntxt.Size = New System.Drawing.Size(278, 100) ' 'BundesanzeigerToolStripMenuItem ' Me.BundesanzeigerToolStripMenuItem.Name = "BundesanzeigerToolStripMenuItem" - Me.BundesanzeigerToolStripMenuItem.Size = New System.Drawing.Size(157, 22) + Me.BundesanzeigerToolStripMenuItem.Size = New System.Drawing.Size(277, 32) Me.BundesanzeigerToolStripMenuItem.Text = "Bundesanzeiger" ' 'EUTaricToolStripMenuItem ' Me.EUTaricToolStripMenuItem.Name = "EUTaricToolStripMenuItem" - Me.EUTaricToolStripMenuItem.Size = New System.Drawing.Size(157, 22) + Me.EUTaricToolStripMenuItem.Size = New System.Drawing.Size(277, 32) Me.EUTaricToolStripMenuItem.Text = "EU-Taric" ' + 'ZugelassenerAusführerToolStripMenuItem + ' + Me.ZugelassenerAusführerToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AllgemeinToolStripMenuItem, Me.AllgemeineEinführungExportkontrolleToolStripMenuItem, Me.BrexitToolStripMenuItem1, Me.EmbargosLänderToolStripMenuItem, Me.GüterlisteToolStripMenuItem}) + Me.ZugelassenerAusführerToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.zollico + Me.ZugelassenerAusführerToolStripMenuItem.Name = "ZugelassenerAusführerToolStripMenuItem" + Me.ZugelassenerAusführerToolStripMenuItem.Size = New System.Drawing.Size(277, 32) + Me.ZugelassenerAusführerToolStripMenuItem.Text = "Zugelassener Ausführer" + ' + 'AllgemeinToolStripMenuItem + ' + Me.AllgemeinToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.zollico + Me.AllgemeinToolStripMenuItem.Name = "AllgemeinToolStripMenuItem" + Me.AllgemeinToolStripMenuItem.Size = New System.Drawing.Size(419, 34) + Me.AllgemeinToolStripMenuItem.Text = "Allgemein" + ' + 'AllgemeineEinführungExportkontrolleToolStripMenuItem + ' + Me.AllgemeineEinführungExportkontrolleToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.zollico + Me.AllgemeineEinführungExportkontrolleToolStripMenuItem.Name = "AllgemeineEinführungExportkontrolleToolStripMenuItem" + Me.AllgemeineEinführungExportkontrolleToolStripMenuItem.Size = New System.Drawing.Size(419, 34) + Me.AllgemeineEinführungExportkontrolleToolStripMenuItem.Text = "Allgemeine Einführung Exportkontrolle" + ' + 'BrexitToolStripMenuItem1 + ' + Me.BrexitToolStripMenuItem1.Image = Global.AVISO.My.Resources.Resources.zollico + Me.BrexitToolStripMenuItem1.Name = "BrexitToolStripMenuItem1" + Me.BrexitToolStripMenuItem1.Size = New System.Drawing.Size(419, 34) + Me.BrexitToolStripMenuItem1.Text = "Brexit" + ' + 'EmbargosLänderToolStripMenuItem + ' + Me.EmbargosLänderToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.zollico + Me.EmbargosLänderToolStripMenuItem.Name = "EmbargosLänderToolStripMenuItem" + Me.EmbargosLänderToolStripMenuItem.Size = New System.Drawing.Size(419, 34) + Me.EmbargosLänderToolStripMenuItem.Text = "Embargos-Länder" + ' + 'GüterlisteToolStripMenuItem + ' + Me.GüterlisteToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.zollico + Me.GüterlisteToolStripMenuItem.Name = "GüterlisteToolStripMenuItem" + Me.GüterlisteToolStripMenuItem.Size = New System.Drawing.Size(419, 34) + Me.GüterlisteToolStripMenuItem.Text = "Güterliste" + ' 'Timer_REFRESH ' Me.Timer_REFRESH.Enabled = True @@ -3696,4 +3746,10 @@ Partial Class frmHauptfenster Friend WithEvents InfoTextÄndernToolStripMenuItem As ToolStripMenuItem Friend WithEvents txtBestimmungszollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox Friend WithEvents Label10 As Label + Friend WithEvents ZugelassenerAusführerToolStripMenuItem As ToolStripMenuItem + Friend WithEvents AllgemeinToolStripMenuItem As ToolStripMenuItem + Friend WithEvents AllgemeineEinführungExportkontrolleToolStripMenuItem As ToolStripMenuItem + Friend WithEvents BrexitToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents EmbargosLänderToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GüterlisteToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 4f3ab74..9736e07 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -193,9 +193,16 @@ Public Class frmHauptfenster Dim OptionenDAL As New cOptionenDAL - 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", "???")) + If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then + cboGrenzstelle.Items.Clear() + 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() - 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", "???")) + If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then + cboMy_Grenzstelle.Items.Clear() + 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() - 'MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Benutzer", "Benutzer")) - '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 + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then + cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T1-Sendungen", "T1")) 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) + cboMyAvisoAnzeige.changeItem("T1") + Else + 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 - ' inBearbeitungSQL = " Aviso.[TeamId]= " & If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId, -1) & " " - inBearbeitungSQL = " (Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId) " + If cboMyAvisoAnzeige._value <> "" Then + If cboMyAvisoAnzeige._value = "T1" Then + 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") - 'MsgBox(DS.da_id) - DS.OPEN_SINGLE_ORIG() + ' Process.Start("https://file.verag.ag:5001/oo/r/pkjsynkkXrTgPm85JLVFWAHem4NuF6IO") + Process.Start("https://file.verag.ag:5001/d/s/pkjsynkkXrTgPm85JLVFWAHem4NuF6IO/i4_Ss9mG9jR7hB4wStoIbzhvYzlJJJPv-BbegLJoGuQk") + '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 - Dim mailsTXT = "" - mailsTXT &= "TO: " & EMails & "
" - mailsTXT &= "CC: " & EMails_CC & "
" - mailsTXT &= "BCC: " & EMails_BCC & "

" + If ForceMail <> "" Then + Dim mailsTXT = "" + mailsTXT &= "TO: " & EMails & "
" + mailsTXT &= "CC: " & EMails_CC & "
" + mailsTXT &= "BCC: " & EMails_BCC & "

" - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(ForceMail, hBetreff, mailsTXT & hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, "", "", anhaenge, art) Then - API.UPDTAE_OK() - Else - API.UPDTAE_ERR() - End If + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(ForceMail, hBetreff, mailsTXT & hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, "", "", anhaenge, art) Then + API.UPDTAE_OK() + Else + API.UPDTAE_ERR() + 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")) - Else - SENDUNG_TMP.tblSnd_Vorbereitet = Nothing + 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 + 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 diff --git a/Aviso/frmLogin.designer.vb b/Aviso/frmLogin.designer.vb index a740bcc..90fca42 100644 --- 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 diff --git a/Aviso/frmLogin.vb b/Aviso/frmLogin.vb index 87f6437..5ddacdb 100644 --- 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" diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 94bf80e..700cd3c 100644 --- 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 - setCboSelected(VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD) - Else - setCboSelected(oPS.PrinterName) - End If + ' If Not setCboSelected(VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD) Then + ' 'nicht gefunden + ' setCboSelected(oPS.PrinterName) + ' 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) - Private Sub setCboSelected(standardDrucker As String) + Delegate Function setCboSelectedCallback(standardDruckerAviso As String, standardDrucker As String) As Boolean + 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 - - End Sub + Return False + 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,
" TextHTML &= "
" - TextHTML &= "beiliegend senden wir Ihnen die Sendungsunterlagen für den o.g. LKW/Container. Wir bitten um Zusendung der ATA-Nummer.
" - TextHTML &= "
" + TextHTML &= "beiliegend senden wir Ihnen die Sendungsunterlagen für den o.g. LKW/Container. Wir bitten um Zusendung der ATA-Nummer.
" + TextHTML &= "
" - TextHTML &= "Mit freundlichen Grüßen
" - TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "
" - TextHTML &= "
" + TextHTML &= "Mit freundlichen Grüßen
" + TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "
" + TextHTML &= "
" - Mail.HTMLBody = "
" & TextHTML & SDL.cFakturierung.getSignature("DE") & "
" + Mail.HTMLBody = "
" & TextHTML & SDL.cFakturierung.getSignature("DE") & "
" - 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 &= "" TextHTML &= "" & cnt & "" @@ -5036,7 +5059,18 @@ Public Class frmSendungsdetailsNEU TextHTML &= "" & SND.tblSnd_Absender & "" TextHTML &= "" & SND.tblSnd_Empfaenger & "" TextHTML &= "" & SND.tblSnd_Colli & " Pk. " & SND.tblSnd_Warenbezeichnung & " - " & SND.tblSnd_Gewicht & " kg " - TextHTML &= "VERAG" '?????? + + TextHTML &= "" + 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 &= "" Select Case SND.tblSnd_Abfertigungsart_ID Case "38", "1" @@ -5053,6 +5087,11 @@ Public Class frmSendungsdetailsNEU TextHTML &= "-" TextHTML &= "-" End If + Case "5", "6" + gestellungsadresseTmp = SND.getNCTSAdress().Trim + TextHTML &= "-" + TextHTML &= "-" + TextHTML &= "-" Case Else TextHTML &= "-" TextHTML &= "-" @@ -5061,6 +5100,13 @@ Public Class frmSendungsdetailsNEU TextHTML &= "" + If gestellungsadresseTmp <> "" Then + TextHTML &= "" + TextHTML &= "" + TextHTML &= "NCTS-Gestellungsadresse:" + TextHTML &= "" & gestellungsadresseTmp & "" + TextHTML &= "" + 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) diff --git a/Aviso/usrcntlAktDetails.Designer.vb b/Aviso/usrcntlAktDetails.Designer.vb index 97f4b8b..67ad520 100644 --- 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.SplitterDistance = 228 + Me.SplitContainer.Size = New System.Drawing.Size(575, 509) + 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 diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 93fd19c..77faecf 100644 --- 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 oPS As New System.Drawing.Printing.PrinterSettings - Try - Printername = oPS.PrinterName - Catch ex As System.Exception - End Try + 'Dim Printername = "" + 'Dim oPS As New System.Drawing.Printing.PrinterSettings + 'Try + ' Printername = oPS.PrinterName + 'Catch ex As System.Exception + '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 diff --git a/AvisoTV/frmAnzeige.vb b/AvisoTV/frmAnzeige.vb index 11be957..1e0b895 100644 --- 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 diff --git a/Diverses/zollico.ico b/Diverses/zollico.ico new file mode 100644 index 0000000..21aeb58 Binary files /dev/null and b/Diverses/zollico.ico differ diff --git a/Gemeinsames/subRptSendungenZollpruefung.Designer.vb b/Gemeinsames/subRptSendungenZollpruefung.Designer.vb index 795f56d..fc69744 100644 --- 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 ' diff --git a/VERAG_TELEINFO/App.config b/VERAG_TELEINFO/App.config index 8ccef15..a86c646 100644 --- a/VERAG_TELEINFO/App.config +++ b/VERAG_TELEINFO/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/VERAG_TELEINFO/VERAG_TELEINFO.vbproj b/VERAG_TELEINFO/VERAG_TELEINFO.vbproj index a9b87c2..cc505f7 100644 --- a/VERAG_TELEINFO/VERAG_TELEINFO.vbproj +++ b/VERAG_TELEINFO/VERAG_TELEINFO.vbproj @@ -11,9 +11,10 @@ VERAG_TELEINFO 512 WindowsFormsWithCustomSubMain - v4.7 + v4.8 true true + AnyCPU @@ -111,6 +112,9 @@ ..\..\..\dll\Tapi3\VBTAPI.dll False + + ..\..\..\dll\ZOIPER\zdk.net_Windows_x86_64_v2.0.17.0\zdk.net_Windows_x86_64_v2.0.17.0\RunTest\zdk.net.dll + @@ -124,6 +128,7 @@ + @@ -141,6 +146,12 @@ Form + + frmCamera.vb + + + Form + frmTapi.vb @@ -180,9 +191,87 @@ + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + Always + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + MyApplicationCodeGenerator @@ -220,6 +309,10 @@ {a4a15e4a-9d83-4fd5-807b-63fc87ca4f0f} PlathosysApiWrapper + + {1f68e194-88a8-47f2-b9f9-20e092efa30a} + Bria_API_CSharp_SampleApp_3.0 + {A3B497BD-842C-4A2B-B398-ED1976849DF1} VERAG_PROG_ALLGEMEIN @@ -229,6 +322,12 @@ 2018.3.9 + + 5.2.0-alpha.156 + + + + \ No newline at end of file diff --git a/VERAG_TELEINFO/antlr3c.dll b/VERAG_TELEINFO/antlr3c.dll new file mode 100644 index 0000000..117a847 Binary files /dev/null and b/VERAG_TELEINFO/antlr3c.dll differ diff --git a/VERAG_TELEINFO/avcodec-53.dll b/VERAG_TELEINFO/avcodec-53.dll new file mode 100644 index 0000000..4e0fd65 Binary files /dev/null and b/VERAG_TELEINFO/avcodec-53.dll differ diff --git a/VERAG_TELEINFO/avutil-51.dll b/VERAG_TELEINFO/avutil-51.dll new file mode 100644 index 0000000..faff2f0 Binary files /dev/null and b/VERAG_TELEINFO/avutil-51.dll differ diff --git a/VERAG_TELEINFO/bctoolbox.dll b/VERAG_TELEINFO/bctoolbox.dll new file mode 100644 index 0000000..6ccd15e Binary files /dev/null and b/VERAG_TELEINFO/bctoolbox.dll differ diff --git a/VERAG_TELEINFO/belcard.dll b/VERAG_TELEINFO/belcard.dll new file mode 100644 index 0000000..7c34b14 Binary files /dev/null and b/VERAG_TELEINFO/belcard.dll differ diff --git a/VERAG_TELEINFO/bellesip.dll b/VERAG_TELEINFO/bellesip.dll new file mode 100644 index 0000000..6428798 Binary files /dev/null and b/VERAG_TELEINFO/bellesip.dll differ diff --git a/VERAG_TELEINFO/belr.dll b/VERAG_TELEINFO/belr.dll new file mode 100644 index 0000000..f17cc78 Binary files /dev/null and b/VERAG_TELEINFO/belr.dll differ diff --git a/VERAG_TELEINFO/bv16.dll b/VERAG_TELEINFO/bv16.dll new file mode 100644 index 0000000..f5147aa Binary files /dev/null and b/VERAG_TELEINFO/bv16.dll differ diff --git a/VERAG_TELEINFO/bzrtp.dll b/VERAG_TELEINFO/bzrtp.dll new file mode 100644 index 0000000..0c690b3 Binary files /dev/null and b/VERAG_TELEINFO/bzrtp.dll differ diff --git a/VERAG_TELEINFO/frmCamera.Designer.vb b/VERAG_TELEINFO/frmCamera.Designer.vb new file mode 100644 index 0000000..0fe8fd5 --- /dev/null +++ b/VERAG_TELEINFO/frmCamera.Designer.vb @@ -0,0 +1,30 @@ + _ +Partial Class frmCamera + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + 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. + _ + 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 diff --git a/VERAG_TELEINFO/frmCamera.vb b/VERAG_TELEINFO/frmCamera.vb new file mode 100644 index 0000000..73d3f2b --- /dev/null +++ b/VERAG_TELEINFO/frmCamera.vb @@ -0,0 +1,3 @@ +Public Class frmCamera + +End Class \ No newline at end of file diff --git a/VERAG_TELEINFO/frmTapi.Designer.vb b/VERAG_TELEINFO/frmTapi.Designer.vb index 7010ea0..7ee29ae 100644 --- 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 diff --git a/VERAG_TELEINFO/frmTapi.vb b/VERAG_TELEINFO/frmTapi.vb index 5267033..bcae8f9 100644 --- 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($"HookPttInfo? {HookPttInfo}") + ' Console.WriteLine($"ReadHook? {ReadHook}") + ' 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) - ' MsgBox("PICKUP!!!") + 'makePhoneCall(PhoneNumber) + 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 \ No newline at end of file diff --git a/VERAG_TELEINFO/gsm.dll b/VERAG_TELEINFO/gsm.dll new file mode 100644 index 0000000..ce94e94 Binary files /dev/null and b/VERAG_TELEINFO/gsm.dll differ diff --git a/VERAG_TELEINFO/libbcg729.dll b/VERAG_TELEINFO/libbcg729.dll new file mode 100644 index 0000000..161c170 Binary files /dev/null and b/VERAG_TELEINFO/libbcg729.dll differ diff --git a/VERAG_TELEINFO/linphone.dll b/VERAG_TELEINFO/linphone.dll new file mode 100644 index 0000000..a4e69fc Binary files /dev/null and b/VERAG_TELEINFO/linphone.dll differ diff --git a/VERAG_TELEINFO/mbedcrypto.dll b/VERAG_TELEINFO/mbedcrypto.dll new file mode 100644 index 0000000..ea5c0bb Binary files /dev/null and b/VERAG_TELEINFO/mbedcrypto.dll differ diff --git a/VERAG_TELEINFO/mbedtls.dll b/VERAG_TELEINFO/mbedtls.dll new file mode 100644 index 0000000..27da1f3 Binary files /dev/null and b/VERAG_TELEINFO/mbedtls.dll differ diff --git a/VERAG_TELEINFO/mbedx509.dll b/VERAG_TELEINFO/mbedx509.dll new file mode 100644 index 0000000..8daae18 Binary files /dev/null and b/VERAG_TELEINFO/mbedx509.dll differ diff --git a/VERAG_TELEINFO/mediastreamer_base.dll b/VERAG_TELEINFO/mediastreamer_base.dll new file mode 100644 index 0000000..fe2bf75 Binary files /dev/null and b/VERAG_TELEINFO/mediastreamer_base.dll differ diff --git a/VERAG_TELEINFO/mediastreamer_voip.dll b/VERAG_TELEINFO/mediastreamer_voip.dll new file mode 100644 index 0000000..fd502d6 Binary files /dev/null and b/VERAG_TELEINFO/mediastreamer_voip.dll differ diff --git a/VERAG_TELEINFO/opus.dll b/VERAG_TELEINFO/opus.dll new file mode 100644 index 0000000..229e674 Binary files /dev/null and b/VERAG_TELEINFO/opus.dll differ diff --git a/VERAG_TELEINFO/ortp.dll b/VERAG_TELEINFO/ortp.dll new file mode 100644 index 0000000..6814ba0 Binary files /dev/null and b/VERAG_TELEINFO/ortp.dll differ diff --git a/VERAG_TELEINFO/speex.dll b/VERAG_TELEINFO/speex.dll new file mode 100644 index 0000000..df6fa36 Binary files /dev/null and b/VERAG_TELEINFO/speex.dll differ diff --git a/VERAG_TELEINFO/speexdsp.dll b/VERAG_TELEINFO/speexdsp.dll new file mode 100644 index 0000000..334980d Binary files /dev/null and b/VERAG_TELEINFO/speexdsp.dll differ diff --git a/VERAG_TELEINFO/sqlite3.dll b/VERAG_TELEINFO/sqlite3.dll new file mode 100644 index 0000000..87cf80f Binary files /dev/null and b/VERAG_TELEINFO/sqlite3.dll differ diff --git a/VERAG_TELEINFO/srtp.dll b/VERAG_TELEINFO/srtp.dll new file mode 100644 index 0000000..555781b Binary files /dev/null and b/VERAG_TELEINFO/srtp.dll differ diff --git a/VERAG_TELEINFO/swscale-2.dll b/VERAG_TELEINFO/swscale-2.dll new file mode 100644 index 0000000..a36db3e Binary files /dev/null and b/VERAG_TELEINFO/swscale-2.dll differ diff --git a/VERAG_TELEINFO/xml2.dll b/VERAG_TELEINFO/xml2.dll new file mode 100644 index 0000000..7abc3d9 Binary files /dev/null and b/VERAG_TELEINFO/xml2.dll differ diff --git a/VERAG_TELEINFO/zlib.dll b/VERAG_TELEINFO/zlib.dll new file mode 100644 index 0000000..73a7451 Binary files /dev/null and b/VERAG_TELEINFO/zlib.dll differ