From 3789fdec0ec72113d51aa5444f58c07e96c09501 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 19 Sep 2024 13:14:44 +0200 Subject: [PATCH] =?UTF-8?q?div.=20=C3=84nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DAKOSY_Worker/DAKOSY_Worker_lib.vbproj | 3 +- .../My Project/Resources.Designer.vb | 2 +- DAKOSY_Worker/My Project/Settings.Designer.vb | 2 +- MDM_Worker/MDM_Worker_lib.vbproj | 12 +- MDM_Worker/My Project/Resources.Designer.vb | 2 +- MDM_Worker/My Project/Settings.Designer.vb | 2 +- MailSender/App.config | 20 +- MailSender/MailSender.vbproj | 3 +- MailSender/My Project/Settings.Designer.vb | 2 +- RKSV_DE/RKSV_DE.vbproj | 4 +- RKSV_DE/cRKSV_DE.vb | 6 +- .../My Project/Resources.Designer.vb | 2 +- .../My Project/Settings.Designer.vb | 2 +- TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj | 12 +- UID/ADMIN.vbproj | 10 +- UID/App.config | 82 +- UID/DataSet1.Designer.vb | 32 +- UID/DataSetBerechtigungen.Designer.vb | 198 ++-- UID/Mitarbeiter/frmMitarbDetails.Designer.vb | 70 +- UID/Mitarbeiter/frmMitarbDetails.vb | 11 +- UID/Mitarbeiter/usrCntlMitarbeiter.vb | 2 +- UID/My Project/Settings.Designer.vb | 2 +- UID/frmAPI.Designer.vb | 122 +- UID/frmAPI.vb | 35 +- UID/frmAPIEinstellungen.vb | 48 +- UID/frmMain.Designer.vb | 32 +- UID/packages.config | 2 +- UID/usrCntlAPI.Designer.vb | 91 +- UID/usrCntlAPI.vb | 8 +- UID/usrCntlERS.vb | 2 +- .../My Project/Application.Designer.vb | 8 +- .../My Project/Resources.Designer.vb | 47 +- .../My Project/Settings.Designer.vb | 60 +- cNCTSPartnerWorker/NCTSPartnerWorker.vbproj | 4 +- initATLASAufschubkonten/App.config | 2 +- .../My Project/Application.Designer.vb | 3 +- .../My Project/Resources.Designer.vb | 2 +- .../My Project/Settings.Designer.vb | 2 +- initATLASAufschubkonten/RoutineManager.vbproj | 3 +- initATLASAufschubkonten/cUTA.vb | 4 +- .../frmDYNachrichtenVerarbeitung.vb | 4 + .../frmNachrichtenVerarbeitung_MDM_divers.vb | 27 +- .../frmStartOptions.Designer.vb | 1052 +++++++++-------- initATLASAufschubkonten/frmStartOptions.vb | 20 +- 44 files changed, 1181 insertions(+), 878 deletions(-) diff --git a/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj b/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj index 1c8a7fa..d2f2982 100644 --- a/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj +++ b/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj @@ -10,7 +10,7 @@ DAKOSY_Worker 512 Windows - v4.7 + v4.8 @@ -167,6 +167,7 @@ True Application.myapp + True True diff --git a/DAKOSY_Worker/My Project/Resources.Designer.vb b/DAKOSY_Worker/My Project/Resources.Designer.vb index 70a586f..a201e43 100644 --- a/DAKOSY_Worker/My Project/Resources.Designer.vb +++ b/DAKOSY_Worker/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/DAKOSY_Worker/My Project/Settings.Designer.vb b/DAKOSY_Worker/My Project/Settings.Designer.vb index ad4ccf8..53b3936 100644 --- a/DAKOSY_Worker/My Project/Settings.Designer.vb +++ b/DAKOSY_Worker/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/MDM_Worker/MDM_Worker_lib.vbproj b/MDM_Worker/MDM_Worker_lib.vbproj index 6114c44..049bb39 100644 --- a/MDM_Worker/MDM_Worker_lib.vbproj +++ b/MDM_Worker/MDM_Worker_lib.vbproj @@ -10,7 +10,7 @@ MDM_Worker 512 Windows - v4.7 + v4.8 true @@ -52,9 +52,6 @@ - - ..\..\..\Aviso\AVISO\Aviso\bin\Debug\VERAG_PROG_ALLGEMEIN.dll - @@ -76,6 +73,7 @@ True Application.myapp + True True @@ -107,5 +105,11 @@ Settings.Designer.vb + + + {a3b497bd-842c-4a2b-b398-ed1976849df1} + VERAG_PROG_ALLGEMEIN + + \ No newline at end of file diff --git a/MDM_Worker/My Project/Resources.Designer.vb b/MDM_Worker/My Project/Resources.Designer.vb index a64133c..4a7f365 100644 --- a/MDM_Worker/My Project/Resources.Designer.vb +++ b/MDM_Worker/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/MDM_Worker/My Project/Settings.Designer.vb b/MDM_Worker/My Project/Settings.Designer.vb index 94af05c..27b03ad 100644 --- a/MDM_Worker/My Project/Settings.Designer.vb +++ b/MDM_Worker/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/MailSender/App.config b/MailSender/App.config index d0a84d3..b857fff 100644 --- a/MailSender/App.config +++ b/MailSender/App.config @@ -1,25 +1,25 @@ - + - + - - + + - - + + - - + + - - + + diff --git a/MailSender/MailSender.vbproj b/MailSender/MailSender.vbproj index c471987..220e907 100644 --- a/MailSender/MailSender.vbproj +++ b/MailSender/MailSender.vbproj @@ -11,7 +11,7 @@ MailSender 512 Console - v4.7 + v4.8 @@ -85,6 +85,7 @@ True Application.myapp + True True diff --git a/MailSender/My Project/Settings.Designer.vb b/MailSender/My Project/Settings.Designer.vb index 141c83e..a502e3b 100644 --- a/MailSender/My Project/Settings.Designer.vb +++ b/MailSender/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/RKSV_DE/RKSV_DE.vbproj b/RKSV_DE/RKSV_DE.vbproj index d0a4757..e5b0550 100644 --- a/RKSV_DE/RKSV_DE.vbproj +++ b/RKSV_DE/RKSV_DE.vbproj @@ -48,8 +48,8 @@ On - - ..\..\..\..\RKSV DE\KsVCom.dll + + F:\PROGRAMMIERUNG\dll\ITGRKSVCom.dll diff --git a/RKSV_DE/cRKSV_DE.vb b/RKSV_DE/cRKSV_DE.vb index 4df7845..faebbcc 100644 --- a/RKSV_DE/cRKSV_DE.vb +++ b/RKSV_DE/cRKSV_DE.vb @@ -1,4 +1,6 @@ -Imports ItgKsV +Imports ITGRKSVCom +Imports RKSVComComplete + Public Class cRKSV_DE Private Function SurroundingSub() @@ -7,7 +9,9 @@ Public Class cRKSV_DE ' COM-Objekt anlegen Dim licenseKey As String = "MEUCIQDg2GSwFrgOMHLzKBO7Sac+D3xBh9Ct+QRBXarDFPtdNgIgQyvotBil11sRfqQgdY+spD3aUve/HZS9cF7MS0D720w=" + Dim m_ksv As ItgKsV.KsVCom = New ItgKsV.KsVCom() + Dim result As Integer = m_ksv.InitialiseLibrary("F:", "SwissbitDemo", "12345", licenseKey) If result <> &H0 Then diff --git a/TELOTEK_Worker_lib/My Project/Resources.Designer.vb b/TELOTEK_Worker_lib/My Project/Resources.Designer.vb index 19eda60..8a22911 100644 --- a/TELOTEK_Worker_lib/My Project/Resources.Designer.vb +++ b/TELOTEK_Worker_lib/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/TELOTEK_Worker_lib/My Project/Settings.Designer.vb b/TELOTEK_Worker_lib/My Project/Settings.Designer.vb index 157af87..9bca1e9 100644 --- a/TELOTEK_Worker_lib/My Project/Settings.Designer.vb +++ b/TELOTEK_Worker_lib/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/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj b/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj index a7b94ff..e3d306e 100644 --- a/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj +++ b/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj @@ -10,7 +10,7 @@ TELOTEC_Worker 512 Windows - v4.7 + v4.8 true @@ -53,6 +53,9 @@ + + ..\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll + @@ -74,6 +77,7 @@ True Application.myapp + True True @@ -109,11 +113,5 @@ Designer - - - {a3b497bd-842c-4a2b-b398-ed1976849df1} - VERAG_PROG_ALLGEMEIN - - \ No newline at end of file diff --git a/UID/ADMIN.vbproj b/UID/ADMIN.vbproj index 3d36ce2..a6ebab7 100644 --- a/UID/ADMIN.vbproj +++ b/UID/ADMIN.vbproj @@ -11,7 +11,7 @@ ADMIN 512 WindowsForms - v4.7 + v4.8 false @@ -286,6 +286,9 @@ + + ..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll + @@ -605,6 +608,7 @@ True Application.myapp + True True @@ -1125,10 +1129,6 @@ - - {a3b497bd-842c-4a2b-b398-ed1976849df1} - VERAG_PROG_ALLGEMEIN - {50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f} DAKOSY_Worker_lib diff --git a/UID/App.config b/UID/App.config index 72cae6e..de0bde4 100644 --- a/UID/App.config +++ b/UID/App.config @@ -1,16 +1,16 @@ - + -
+
- - + + - + @@ -26,145 +26,145 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/UID/DataSet1.Designer.vb b/UID/DataSet1.Designer.vb index 8b84794..1532138 100644 --- a/UID/DataSet1.Designer.vb +++ b/UID/DataSet1.Designer.vb @@ -28,7 +28,7 @@ Partial Public Class DataSet1 Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub New() MyBase.New Me.BeginInit @@ -40,7 +40,7 @@ Partial Public Class DataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context, false) If (Me.IsBinarySerialized(info, context) = true) Then @@ -72,7 +72,7 @@ Partial Public Class DataSet1 End Sub _ Public Overrides Property SchemaSerializationMode() As Global.System.Data.SchemaSerializationMode @@ -85,7 +85,7 @@ Partial Public Class DataSet1 End Property _ Public Shadows ReadOnly Property Tables() As Global.System.Data.DataTableCollection Get @@ -94,7 +94,7 @@ Partial Public Class DataSet1 End Property _ Public Shadows ReadOnly Property Relations() As Global.System.Data.DataRelationCollection Get @@ -103,7 +103,7 @@ Partial Public Class DataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Sub InitializeDerivedDataSet() Me.BeginInit Me.InitClass @@ -111,7 +111,7 @@ Partial Public Class DataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataSet Dim cln As DataSet1 = CType(MyBase.Clone,DataSet1) cln.InitVars @@ -120,19 +120,19 @@ Partial Public Class DataSet1 End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function ShouldSerializeTables() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function ShouldSerializeRelations() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Sub ReadXmlSerializable(ByVal reader As Global.System.Xml.XmlReader) If (Me.DetermineSchemaSerializationMode(reader) = Global.System.Data.SchemaSerializationMode.IncludeSchema) Then Me.Reset @@ -153,7 +153,7 @@ Partial Public Class DataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function GetSchemaSerializable() As Global.System.Xml.Schema.XmlSchema Dim stream As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() Me.WriteXmlSchema(New Global.System.Xml.XmlTextWriter(stream, Nothing)) @@ -162,18 +162,18 @@ Partial Public Class DataSet1 End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Overloads Sub InitVars() Me.InitVars(true) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Overloads Sub InitVars(ByVal initTable As Boolean) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitClass() Me.DataSetName = "DataSet1" Me.Prefix = "" @@ -183,7 +183,7 @@ Partial Public Class DataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) If (e.Action = Global.System.ComponentModel.CollectionChangeAction.Remove) Then Me.InitVars @@ -191,7 +191,7 @@ Partial Public Class DataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Shared Function GetTypedDataSetSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim ds As DataSet1 = New DataSet1() Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() diff --git a/UID/DataSetBerechtigungen.Designer.vb b/UID/DataSetBerechtigungen.Designer.vb index 0d0de63..7826f38 100644 --- a/UID/DataSetBerechtigungen.Designer.vb +++ b/UID/DataSetBerechtigungen.Designer.vb @@ -30,7 +30,7 @@ Partial Public Class DataSetBerechtigungen Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub New() MyBase.New Me.BeginInit @@ -42,7 +42,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context, false) If (Me.IsBinarySerialized(info, context) = true) Then @@ -77,7 +77,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ Public ReadOnly Property tblBerechtigungen() As tblBerechtigungenDataTable @@ -87,7 +87,7 @@ Partial Public Class DataSetBerechtigungen End Property _ Public Overrides Property SchemaSerializationMode() As Global.System.Data.SchemaSerializationMode @@ -100,7 +100,7 @@ Partial Public Class DataSetBerechtigungen End Property _ Public Shadows ReadOnly Property Tables() As Global.System.Data.DataTableCollection Get @@ -109,7 +109,7 @@ Partial Public Class DataSetBerechtigungen End Property _ Public Shadows ReadOnly Property Relations() As Global.System.Data.DataRelationCollection Get @@ -118,7 +118,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Sub InitializeDerivedDataSet() Me.BeginInit Me.InitClass @@ -126,7 +126,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataSet Dim cln As DataSetBerechtigungen = CType(MyBase.Clone,DataSetBerechtigungen) cln.InitVars @@ -135,19 +135,19 @@ Partial Public Class DataSetBerechtigungen End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function ShouldSerializeTables() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function ShouldSerializeRelations() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Sub ReadXmlSerializable(ByVal reader As Global.System.Xml.XmlReader) If (Me.DetermineSchemaSerializationMode(reader) = Global.System.Data.SchemaSerializationMode.IncludeSchema) Then Me.Reset @@ -171,7 +171,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function GetSchemaSerializable() As Global.System.Xml.Schema.XmlSchema Dim stream As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() Me.WriteXmlSchema(New Global.System.Xml.XmlTextWriter(stream, Nothing)) @@ -180,13 +180,13 @@ Partial Public Class DataSetBerechtigungen End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Overloads Sub InitVars() Me.InitVars(true) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Overloads Sub InitVars(ByVal initTable As Boolean) Me.tabletblBerechtigungen = CType(MyBase.Tables("tblBerechtigungen"),tblBerechtigungenDataTable) If (initTable = true) Then @@ -197,7 +197,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitClass() Me.DataSetName = "DataSetBerechtigungen" Me.Prefix = "" @@ -209,13 +209,13 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Function ShouldSerializetblBerechtigungen() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) If (e.Action = Global.System.ComponentModel.CollectionChangeAction.Remove) Then Me.InitVars @@ -223,7 +223,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Shared Function GetTypedDataSetSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim ds As DataSetBerechtigungen = New DataSetBerechtigungen() Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() @@ -272,7 +272,7 @@ Partial Public Class DataSetBerechtigungen Return type End Function - _ + _ Public Delegate Sub tblBerechtigungenRowChangeEventHandler(ByVal sender As Object, ByVal e As tblBerechtigungenRowChangeEvent) ''' @@ -292,7 +292,7 @@ Partial Public Class DataSetBerechtigungen Private columnber_progId As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "tblBerechtigungen" @@ -302,7 +302,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -320,14 +320,14 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public ReadOnly Property ber_idColumn() As Global.System.Data.DataColumn Get Return Me.columnber_id @@ -335,7 +335,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public ReadOnly Property ber_nameColumn() As Global.System.Data.DataColumn Get Return Me.columnber_name @@ -343,7 +343,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public ReadOnly Property ber_sicherheitsstufeColumn() As Global.System.Data.DataColumn Get Return Me.columnber_sicherheitsstufe @@ -351,7 +351,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public ReadOnly Property ber_progIdColumn() As Global.System.Data.DataColumn Get Return Me.columnber_progId @@ -359,7 +359,7 @@ Partial Public Class DataSetBerechtigungen End Property _ Public ReadOnly Property Count() As Integer Get @@ -368,33 +368,33 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As tblBerechtigungenRow Get Return CType(Me.Rows(index),tblBerechtigungenRow) End Get End Property - _ + _ Public Event tblBerechtigungenRowChanging As tblBerechtigungenRowChangeEventHandler - _ + _ Public Event tblBerechtigungenRowChanged As tblBerechtigungenRowChangeEventHandler - _ + _ Public Event tblBerechtigungenRowDeleting As tblBerechtigungenRowChangeEventHandler - _ + _ Public Event tblBerechtigungenRowDeleted As tblBerechtigungenRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Overloads Sub AddtblBerechtigungenRow(ByVal row As tblBerechtigungenRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Overloads Function AddtblBerechtigungenRow(ByVal ber_name As String, ByVal ber_sicherheitsstufe As Integer, ByVal ber_progId As Integer) As tblBerechtigungenRow Dim rowtblBerechtigungenRow As tblBerechtigungenRow = CType(Me.NewRow,tblBerechtigungenRow) Dim columnValuesArray() As Object = New Object() {Nothing, ber_name, ber_sicherheitsstufe, ber_progId} @@ -404,13 +404,13 @@ Partial Public Class DataSetBerechtigungen End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Function FindByber_id(ByVal ber_id As Integer) As tblBerechtigungenRow Return CType(Me.Rows.Find(New Object() {ber_id}),tblBerechtigungenRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As tblBerechtigungenDataTable = CType(MyBase.Clone,tblBerechtigungenDataTable) cln.InitVars @@ -418,13 +418,13 @@ Partial Public Class DataSetBerechtigungen End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New tblBerechtigungenDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Sub InitVars() Me.columnber_id = MyBase.Columns("ber_id") Me.columnber_name = MyBase.Columns("ber_name") @@ -433,7 +433,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitClass() Me.columnber_id = New Global.System.Data.DataColumn("ber_id", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnber_id) @@ -454,25 +454,25 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Function NewtblBerechtigungenRow() As tblBerechtigungenRow Return CType(Me.NewRow,tblBerechtigungenRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New tblBerechtigungenRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(tblBerechtigungenRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.tblBerechtigungenRowChangedEvent) Is Nothing) Then @@ -481,7 +481,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.tblBerechtigungenRowChangingEvent) Is Nothing) Then @@ -490,7 +490,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.tblBerechtigungenRowDeletedEvent) Is Nothing) Then @@ -499,7 +499,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.tblBerechtigungenRowDeletingEvent) Is Nothing) Then @@ -508,13 +508,13 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub RemovetblBerechtigungenRow(ByVal row As tblBerechtigungenRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -589,14 +589,14 @@ Partial Public Class DataSetBerechtigungen Private tabletblBerechtigungen As tblBerechtigungenDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tabletblBerechtigungen = CType(Me.Table,tblBerechtigungenDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property ber_id() As Integer Get Return CType(Me(Me.tabletblBerechtigungen.ber_idColumn),Integer) @@ -607,7 +607,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property ber_name() As String Get Try @@ -622,7 +622,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property ber_sicherheitsstufe() As Integer Get Try @@ -638,7 +638,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property ber_progId() As Integer Get Try @@ -653,37 +653,37 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Function Isber_nameNull() As Boolean Return Me.IsNull(Me.tabletblBerechtigungen.ber_nameColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub Setber_nameNull() Me(Me.tabletblBerechtigungen.ber_nameColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Function Isber_sicherheitsstufeNull() As Boolean Return Me.IsNull(Me.tabletblBerechtigungen.ber_sicherheitsstufeColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub Setber_sicherheitsstufeNull() Me(Me.tabletblBerechtigungen.ber_sicherheitsstufeColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Function Isber_progIdNull() As Boolean Return Me.IsNull(Me.tabletblBerechtigungen.ber_progIdColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub Setber_progIdNull() Me(Me.tabletblBerechtigungen.ber_progIdColumn) = Global.System.Convert.DBNull End Sub @@ -692,7 +692,7 @@ Partial Public Class DataSetBerechtigungen ''' '''Row event argument class ''' - _ + _ Public Class tblBerechtigungenRowChangeEvent Inherits Global.System.EventArgs @@ -701,7 +701,7 @@ Partial Public Class DataSetBerechtigungen Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub New(ByVal row As tblBerechtigungenRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -709,7 +709,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public ReadOnly Property Row() As tblBerechtigungenRow Get Return Me.eventRow @@ -717,7 +717,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -751,14 +751,14 @@ Namespace DataSetBerechtigungenTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -769,7 +769,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -799,7 +799,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -827,7 +827,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -838,7 +838,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -849,7 +849,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -910,14 +910,14 @@ Namespace DataSetBerechtigungenTableAdapters End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() Me._connection.ConnectionString = Global.ADMIN.My.MySettings.Default.connToAdminDEV End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -928,7 +928,7 @@ Namespace DataSetBerechtigungenTableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As DataSetBerechtigungen.tblBerechtigungenDataTable) As Integer @@ -941,7 +941,7 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ Public Overloads Overridable Function GetData() As DataSetBerechtigungen.tblBerechtigungenDataTable @@ -952,35 +952,35 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As DataSetBerechtigungen.tblBerechtigungenDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As DataSetBerechtigungen) As Integer Return Me.Adapter.Update(dataSet, "tblBerechtigungen") End Function _ Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) End Function _ Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function _ Public Overloads Overridable Function Delete(ByVal Original_ber_id As Integer, ByVal Original_ber_name As String, ByVal Original_ber_sicherheitsstufe As Global.System.Nullable(Of Integer), ByVal Original_ber_progId As Global.System.Nullable(Of Integer)) As Integer @@ -1022,7 +1022,7 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ Public Overloads Overridable Function Insert(ByVal ber_name As String, ByVal ber_sicherheitsstufe As Global.System.Nullable(Of Integer), ByVal ber_progId As Global.System.Nullable(Of Integer)) As Integer @@ -1057,7 +1057,7 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal ber_name As String, ByVal ber_sicherheitsstufe As Global.System.Nullable(Of Integer), ByVal ber_progId As Global.System.Nullable(Of Integer), ByVal Original_ber_id As Integer, ByVal Original_ber_name As String, ByVal Original_ber_sicherheitsstufe As Global.System.Nullable(Of Integer), ByVal Original_ber_progId As Global.System.Nullable(Of Integer), ByVal ber_id As Integer) As Integer @@ -1115,7 +1115,7 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal ber_name As String, ByVal ber_sicherheitsstufe As Global.System.Nullable(Of Integer), ByVal ber_progId As Global.System.Nullable(Of Integer), ByVal Original_ber_id As Integer, ByVal Original_ber_name As String, ByVal Original_ber_sicherheitsstufe As Global.System.Nullable(Of Integer), ByVal Original_ber_progId As Global.System.Nullable(Of Integer)) As Integer @@ -1143,7 +1143,7 @@ Namespace DataSetBerechtigungenTableAdapters Private _connection As Global.System.Data.IDbConnection _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property UpdateOrder() As UpdateOrderOption Get Return Me._updateOrder @@ -1154,7 +1154,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ @@ -1168,7 +1168,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property BackupDataSetBeforeUpdate() As Boolean Get Return Me._backupDataSetBeforeUpdate @@ -1179,7 +1179,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ Public Property Connection() As Global.System.Data.IDbConnection Get @@ -1198,7 +1198,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ Public ReadOnly Property TableAdapterInstanceCount() As Integer Get @@ -1214,7 +1214,7 @@ Namespace DataSetBerechtigungenTableAdapters '''Update rows in top-down order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Function UpdateUpdatedRows(ByVal dataSet As DataSetBerechtigungen, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow), ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tblBerechtigungenTableAdapter) Is Nothing) Then @@ -1233,7 +1233,7 @@ Namespace DataSetBerechtigungenTableAdapters '''Insert rows in top-down order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Function UpdateInsertedRows(ByVal dataSet As DataSetBerechtigungen, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tblBerechtigungenTableAdapter) Is Nothing) Then @@ -1251,7 +1251,7 @@ Namespace DataSetBerechtigungenTableAdapters '''Delete rows in bottom-up order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As DataSetBerechtigungen, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tblBerechtigungenTableAdapter) Is Nothing) Then @@ -1269,7 +1269,7 @@ Namespace DataSetBerechtigungenTableAdapters '''Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Function GetRealUpdatedRows(ByVal updatedRows() As Global.System.Data.DataRow, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Global.System.Data.DataRow() If ((updatedRows Is Nothing) _ OrElse (updatedRows.Length < 1)) Then @@ -1295,7 +1295,7 @@ Namespace DataSetBerechtigungenTableAdapters '''Update all changes to the dataset. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Overridable Function UpdateAll(ByVal dataSet As DataSetBerechtigungen) As Integer If (dataSet Is Nothing) Then Throw New Global.System.ArgumentNullException("dataSet") @@ -1430,13 +1430,13 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overridable Sub SortSelfReferenceRows(ByVal rows() As Global.System.Data.DataRow, ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) Global.System.Array.Sort(Of Global.System.Data.DataRow)(rows, New SelfReferenceComparer(relation, childFirst)) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overridable Function MatchTableAdapterConnection(ByVal inputConnection As Global.System.Data.IDbConnection) As Boolean If (Not (Me._connection) Is Nothing) Then Return true @@ -1454,7 +1454,7 @@ Namespace DataSetBerechtigungenTableAdapters ''' '''Update Order Option ''' - _ + _ Public Enum UpdateOrderOption InsertUpdateDelete = 0 @@ -1465,7 +1465,7 @@ Namespace DataSetBerechtigungenTableAdapters ''' '''Used to sort self-referenced table's rows ''' - _ + _ Private Class SelfReferenceComparer Inherits Object Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow) @@ -1475,7 +1475,7 @@ Namespace DataSetBerechtigungenTableAdapters Private _childFirst As Integer _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Sub New(ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) MyBase.New Me._relation = relation @@ -1487,7 +1487,7 @@ Namespace DataSetBerechtigungenTableAdapters End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Function GetRoot(ByVal row As Global.System.Data.DataRow, ByRef distance As Integer) As Global.System.Data.DataRow Global.System.Diagnostics.Debug.Assert((Not (row) Is Nothing)) Dim root As Global.System.Data.DataRow = row @@ -1526,7 +1526,7 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Function Compare(ByVal row1 As Global.System.Data.DataRow, ByVal row2 As Global.System.Data.DataRow) As Integer Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow).Compare If Object.ReferenceEquals(row1, row2) Then Return 0 diff --git a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb index 0a426fd..ded31a0 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb @@ -125,10 +125,8 @@ Partial Class frmMitarbDetails Me.cboNiederlassung = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label9 = New System.Windows.Forms.Label() Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.cbxTimasNichtStempeln1 = New System.Windows.Forms.CheckBox() Me.txtprivateEMail = New System.Windows.Forms.TextBox() Me.Label64 = New System.Windows.Forms.Label() - Me.cbxHO = New System.Windows.Forms.CheckBox() Me.cbxChatBenutzer = New System.Windows.Forms.CheckBox() Me.cbxTestaccount = New System.Windows.Forms.CheckBox() Me.cbxGebDat = New System.Windows.Forms.CheckBox() @@ -232,6 +230,9 @@ Partial Class frmMitarbDetails Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Label66 = New System.Windows.Forms.Label() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.cbxHO = New System.Windows.Forms.CheckBox() + Me.cbxBeiBeendenAusstempeln = New System.Windows.Forms.CheckBox() + Me.cbxTimasNichtStempeln1 = New System.Windows.Forms.CheckBox() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.TabControl2.SuspendLayout() @@ -1394,10 +1395,8 @@ Partial Class frmMitarbDetails ' 'GroupBox1 ' - Me.GroupBox1.Controls.Add(Me.cbxTimasNichtStempeln1) Me.GroupBox1.Controls.Add(Me.txtprivateEMail) Me.GroupBox1.Controls.Add(Me.Label64) - Me.GroupBox1.Controls.Add(Me.cbxHO) Me.GroupBox1.Controls.Add(Me.cbxChatBenutzer) Me.GroupBox1.Controls.Add(Me.cbxTestaccount) Me.GroupBox1.Controls.Add(Me.cbxGebDat) @@ -1433,17 +1432,6 @@ Partial Class frmMitarbDetails Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Person" ' - 'cbxTimasNichtStempeln1 - ' - Me.cbxTimasNichtStempeln1.AutoSize = True - Me.cbxTimasNichtStempeln1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxTimasNichtStempeln1.Location = New System.Drawing.Point(523, 182) - Me.cbxTimasNichtStempeln1.Name = "cbxTimasNichtStempeln1" - Me.cbxTimasNichtStempeln1.Size = New System.Drawing.Size(164, 17) - Me.cbxTimasNichtStempeln1.TabIndex = 97 - Me.cbxTimasNichtStempeln1.Text = "Zeiterfassung: Kein Stempeln" - Me.cbxTimasNichtStempeln1.UseVisualStyleBackColor = True - ' 'txtprivateEMail ' Me.txtprivateEMail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -1462,17 +1450,6 @@ Partial Class frmMitarbDetails Me.Label64.TabIndex = 96 Me.Label64.Text = "private EMail (für ZE-Daten):" ' - 'cbxHO - ' - Me.cbxHO.AutoSize = True - Me.cbxHO.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxHO.Location = New System.Drawing.Point(295, 202) - Me.cbxHO.Name = "cbxHO" - Me.cbxHO.Size = New System.Drawing.Size(80, 17) - Me.cbxHO.TabIndex = 94 - Me.cbxHO.Text = "Homeoffice" - Me.cbxHO.UseVisualStyleBackColor = True - ' 'cbxChatBenutzer ' Me.cbxChatBenutzer.AutoSize = True @@ -2253,6 +2230,9 @@ Partial Class frmMitarbDetails ' 'TabPage8 ' + Me.TabPage8.Controls.Add(Me.cbxTimasNichtStempeln1) + Me.TabPage8.Controls.Add(Me.cbxBeiBeendenAusstempeln) + Me.TabPage8.Controls.Add(Me.cbxHO) Me.TabPage8.Controls.Add(Me.Button7) Me.TabPage8.Controls.Add(Me.TabControl3) Me.TabPage8.Controls.Add(Me.rtfInfoTimas) @@ -2589,6 +2569,39 @@ Partial Class frmMitarbDetails Me.ContextMenuStrip1.Name = "ContextMenuStrip1" Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4) ' + 'cbxHO + ' + Me.cbxHO.AutoSize = True + Me.cbxHO.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxHO.Location = New System.Drawing.Point(569, 9) + Me.cbxHO.Name = "cbxHO" + Me.cbxHO.Size = New System.Drawing.Size(80, 17) + Me.cbxHO.TabIndex = 151 + Me.cbxHO.Text = "Homeoffice" + Me.cbxHO.UseVisualStyleBackColor = True + ' + 'cbxBeiBeendenAusstempeln + ' + Me.cbxBeiBeendenAusstempeln.AutoSize = True + Me.cbxBeiBeendenAusstempeln.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxBeiBeendenAusstempeln.Location = New System.Drawing.Point(569, 32) + Me.cbxBeiBeendenAusstempeln.Name = "cbxBeiBeendenAusstempeln" + Me.cbxBeiBeendenAusstempeln.Size = New System.Drawing.Size(144, 17) + Me.cbxBeiBeendenAusstempeln.TabIndex = 152 + Me.cbxBeiBeendenAusstempeln.Text = "Bei Beenden austempeln" + Me.cbxBeiBeendenAusstempeln.UseVisualStyleBackColor = True + ' + 'cbxTimasNichtStempeln1 + ' + Me.cbxTimasNichtStempeln1.AutoSize = True + Me.cbxTimasNichtStempeln1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxTimasNichtStempeln1.Location = New System.Drawing.Point(569, 55) + Me.cbxTimasNichtStempeln1.Name = "cbxTimasNichtStempeln1" + Me.cbxTimasNichtStempeln1.Size = New System.Drawing.Size(164, 17) + Me.cbxTimasNichtStempeln1.TabIndex = 153 + Me.cbxTimasNichtStempeln1.Text = "Zeiterfassung: Kein Stempeln" + Me.cbxTimasNichtStempeln1.UseVisualStyleBackColor = True + ' 'frmMitarbDetails ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2812,10 +2825,8 @@ Partial Class frmMitarbDetails Friend WithEvents lbSprachen As VERAG_PROG_ALLGEMEIN.MyListBox Friend WithEvents Label62 As Label Friend WithEvents cboEZOLL_SB_UNISPED As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents cbxHO As CheckBox Friend WithEvents txtprivateEMail As TextBox Friend WithEvents Label64 As Label - Friend WithEvents cbxTimasNichtStempeln1 As CheckBox Friend WithEvents TabPage8 As TabPage Friend WithEvents Label68 As Label Friend WithEvents cbabwJahresurlaub As CheckBox @@ -2846,4 +2857,7 @@ Partial Class frmMitarbDetails Friend WithEvents rtfInfoTimas As RichTextBox Friend WithEvents dgvData As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents Button7 As Button + Friend WithEvents cbxTimasNichtStempeln1 As CheckBox + Friend WithEvents cbxBeiBeendenAusstempeln As CheckBox + Friend WithEvents cbxHO As CheckBox End Class diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb index 5502fc3..3d05b87 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.vb @@ -306,6 +306,7 @@ Public Class frmMitarbDetails cbxHO.Checked = mitarbeiter.mit_homeoffice cbxTimasNichtStempeln1.Checked = mitarbeiter.mit_timasNichtStempeln + cbxBeiBeendenAusstempeln.Checked = mitarbeiter.mit_ausstempelnBeiBeenden @@ -581,6 +582,7 @@ Public Class frmMitarbDetails mitarbeiter.mit_PersonalNr = txtLohnNr.Text mitarbeiter.mit_telefonnr = txtTelNr.Text mitarbeiter.mit_homeoffice = cbxHO.Checked + mitarbeiter.mit_ausstempelnBeiBeenden = cbxBeiBeendenAusstempeln.Checked mitarbeiter.mit_timasNichtStempeln = cbxTimasNichtStempeln1.Checked mitarbeiter.mit_emailprivat = txtprivateEMail.Text @@ -1426,7 +1428,7 @@ Public Class frmMitarbDetails Dim dtbereitsausgezahlteUE As DataTable - Dim bereitsgezahlteueberstunden = "select uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am, cast (case when isnull([uest_ignorePayoutDate],0) = 0 then 0 else 1 end as bit) as ignoreAuszahlungsdatum + Dim bereitsgezahlteueberstunden = "select uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am, cast (case when isnull([uest_ignorePayoutDate],0) = 0 then 0 else 1 end as bit) ignoreAuszahlungsdatum FROM [ADMIN].[dbo].[tblUeberstunden] where uest_deleted = 0 and uest_maId = " & mitarbeiter.mit_id & " Order by uest_date" @@ -1453,5 +1455,12 @@ Public Class frmMitarbDetails End Sub + Private Sub cbxBeiBeendenAusstempeln_CheckedChanged(sender As Object, e As EventArgs) Handles cbxBeiBeendenAusstempeln.CheckedChanged + + End Sub + + Private Sub cbxHO_CheckedChanged(sender As Object, e As EventArgs) Handles cbxHO.CheckedChanged + + End Sub End Class diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.vb index a12e6c5..dc81768 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb @@ -290,7 +290,7 @@ Public Class usrCntlMitarbeiter .Columns("mit_gekuendigt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter .Columns("mit_DAKOSY").Width = 100 - .Columns("mit_DAKOSY").HeaderText = "Dakosy-Zugang" + .Columns("mit_DAKOSY").HeaderText = "DY-Zugang" .Columns("mit_DAKOSY").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight diff --git a/UID/My Project/Settings.Designer.vb b/UID/My Project/Settings.Designer.vb index 5cd9710..fde2271 100644 --- a/UID/My Project/Settings.Designer.vb +++ b/UID/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/UID/frmAPI.Designer.vb b/UID/frmAPI.Designer.vb index 4dedf2a..11bcdae 100644 --- a/UID/frmAPI.Designer.vb +++ b/UID/frmAPI.Designer.vb @@ -22,7 +22,7 @@ Partial Class frmAPI 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmERS)) + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAPI)) Me.Label4 = New System.Windows.Forms.Label() Me.rtferrStack = New System.Windows.Forms.RichTextBox() Me.txtDatetime = New System.Windows.Forms.TextBox() @@ -40,12 +40,20 @@ Partial Class frmAPI Me.lblFirma = New System.Windows.Forms.Label() Me.txtMail = New System.Windows.Forms.TextBox() Me.Label1 = New System.Windows.Forms.Label() + Me.txtMailCC = New System.Windows.Forms.TextBox() + Me.Label3 = New System.Windows.Forms.Label() + Me.txtMailBCC = New System.Windows.Forms.TextBox() + Me.Label5 = New System.Windows.Forms.Label() + Me.txtSubject = New System.Windows.Forms.TextBox() + Me.Label6 = New System.Windows.Forms.Label() + Me.txtAnhCount = New System.Windows.Forms.TextBox() + Me.Label7 = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(9, 462) + Me.Label4.Location = New System.Drawing.Point(9, 508) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(63, 13) Me.Label4.TabIndex = 114 @@ -53,9 +61,11 @@ Partial Class frmAPI ' 'rtferrStack ' - Me.rtferrStack.Location = New System.Drawing.Point(12, 478) + Me.rtferrStack.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.rtferrStack.Location = New System.Drawing.Point(12, 524) Me.rtferrStack.Name = "rtferrStack" - Me.rtferrStack.Size = New System.Drawing.Size(358, 305) + Me.rtferrStack.Size = New System.Drawing.Size(796, 305) Me.rtferrStack.TabIndex = 113 Me.rtferrStack.Text = "" ' @@ -101,15 +111,17 @@ Partial Class frmAPI Me.lblErrMsg.AutoSize = True Me.lblErrMsg.Location = New System.Drawing.Point(12, 210) Me.lblErrMsg.Name = "lblErrMsg" - Me.lblErrMsg.Size = New System.Drawing.Size(78, 13) + Me.lblErrMsg.Size = New System.Drawing.Size(102, 13) Me.lblErrMsg.TabIndex = 120 - Me.lblErrMsg.Text = "Error Message:" + Me.lblErrMsg.Text = "Error Message/Mail:" ' 'rtferrMsg ' + Me.rtferrMsg.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.rtferrMsg.Location = New System.Drawing.Point(12, 226) Me.rtferrMsg.Name = "rtferrMsg" - Me.rtferrMsg.Size = New System.Drawing.Size(361, 209) + Me.rtferrMsg.Size = New System.Drawing.Size(796, 279) Me.rtferrMsg.TabIndex = 119 Me.rtferrMsg.Text = "" ' @@ -146,7 +158,7 @@ Partial Class frmAPI Me.txtType.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtType.Location = New System.Drawing.Point(188, 82) Me.txtType.Name = "txtType" - Me.txtType.Size = New System.Drawing.Size(108, 20) + Me.txtType.Size = New System.Drawing.Size(185, 20) Me.txtType.TabIndex = 126 ' 'Label2 @@ -197,11 +209,91 @@ Partial Class frmAPI Me.Label1.TabIndex = 131 Me.Label1.Text = "EMail:" ' - 'frmERS + 'txtMailCC + ' + Me.txtMailCC.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtMailCC.Location = New System.Drawing.Point(396, 121) + Me.txtMailCC.Name = "txtMailCC" + Me.txtMailCC.Size = New System.Drawing.Size(185, 20) + Me.txtMailCC.TabIndex = 132 + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label3.Location = New System.Drawing.Point(393, 105) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(53, 13) + Me.Label3.TabIndex = 133 + Me.Label3.Text = "EMail CC:" + ' + 'txtMailBCC + ' + Me.txtMailBCC.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtMailBCC.Location = New System.Drawing.Point(623, 121) + Me.txtMailBCC.Name = "txtMailBCC" + Me.txtMailBCC.Size = New System.Drawing.Size(185, 20) + Me.txtMailBCC.TabIndex = 134 + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label5.Location = New System.Drawing.Point(620, 105) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(60, 13) + Me.Label5.TabIndex = 135 + Me.Label5.Text = "EMail BCC:" + ' + 'txtSubject + ' + Me.txtSubject.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSubject.Location = New System.Drawing.Point(396, 82) + Me.txtSubject.Name = "txtSubject" + Me.txtSubject.Size = New System.Drawing.Size(412, 20) + Me.txtSubject.TabIndex = 136 + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label6.Location = New System.Drawing.Point(393, 66) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(41, 13) + Me.Label6.TabIndex = 137 + Me.Label6.Text = "Betreff:" + ' + 'txtAnhCount + ' + Me.txtAnhCount.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtAnhCount.Location = New System.Drawing.Point(396, 169) + Me.txtAnhCount.Name = "txtAnhCount" + Me.txtAnhCount.Size = New System.Drawing.Size(38, 20) + Me.txtAnhCount.TabIndex = 138 + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label7.Location = New System.Drawing.Point(393, 153) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(29, 13) + Me.Label7.TabIndex = 139 + Me.Label7.Text = "Anh:" + ' + 'frmAPI ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(391, 841) + Me.ClientSize = New System.Drawing.Size(820, 841) + Me.Controls.Add(Me.txtAnhCount) + Me.Controls.Add(Me.Label7) + Me.Controls.Add(Me.txtSubject) + Me.Controls.Add(Me.Label6) + Me.Controls.Add(Me.txtMailBCC) + Me.Controls.Add(Me.Label5) + Me.Controls.Add(Me.txtMailCC) + Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.txtMail) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.lblFirma) @@ -220,7 +312,7 @@ Partial Class frmAPI Me.Controls.Add(Me.txtMethode) Me.Controls.Add(Me.lblProgramm) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.Name = "frmERS" + Me.Name = "frmAPI" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Error" Me.ResumeLayout(False) @@ -245,4 +337,12 @@ Partial Class frmAPI Friend WithEvents lblFirma As Label Friend WithEvents txtMail As TextBox Friend WithEvents Label1 As Label + Friend WithEvents txtMailCC As TextBox + Friend WithEvents Label3 As Label + Friend WithEvents txtMailBCC As TextBox + Friend WithEvents Label5 As Label + Friend WithEvents txtSubject As TextBox + Friend WithEvents Label6 As Label + Friend WithEvents txtAnhCount As TextBox + Friend WithEvents Label7 As Label End Class diff --git a/UID/frmAPI.vb b/UID/frmAPI.vb index c2d57d5..533d433 100644 --- a/UID/frmAPI.vb +++ b/UID/frmAPI.vb @@ -1,6 +1,6 @@ Public Class frmAPI - Public id, progId, progName, maid, datetime, testsystem, type, mail, userName, firma, errorCode, errStack, errMessage, errMethodName, progVersion + Public id, progId, progName, maid, datetime, testsystem, type, mail, userName, firma, errorCode, errStack, errMessage, errMethodName, progVersion, mailcc, mailbcc, subject, mailtext, mailAnh @@ -23,12 +23,35 @@ txtDatetime.Text = IIf(datetime IsNot DBNull.Value, datetime, "") txtMail.Text = IIf(mail IsNot DBNull.Value, mail, "") - rtferrMsg.Text = IIf(errMessage IsNot DBNull.Value, errMessage, "") - rtferrStack.Text = IIf(errStack IsNot DBNull.Value, errStack, "") + txtAnhCount.Text = IIf(mailAnh IsNot DBNull.Value, mailAnh, "0") + txtMailCC.Text = IIf(mailcc IsNot DBNull.Value, mailcc, "") + txtMailBCC.Text = IIf(mailbcc IsNot DBNull.Value, mailbcc, "") + txtSubject.Text = IIf(subject IsNot DBNull.Value, subject, "") + + If errMessage IsNot DBNull.Value Then rtferrMsg.Text = errMessage + + If errStack IsNot DBNull.Value Then rtferrStack.Text = errStack + + + ' Public Enum cAPI_Status + ' [NEW] = 0 ' Neu, noch nicht verarbeitet + ' OK = 1 ' Erfolg! :) + ' ERR = 90 ' Fehlversuch :( + ' ERR_FINAL = 99 'Hier sollte kein Verarbeitungs-Versuch mehr gestartet werden + 'End Enum + + Select Case errorCode + Case 0 + lblErrMsg.Text &= " (Error Code: " & errorCode & " - Neu, noch nicht verarbeitet)" + Case 1 + lblErrMsg.Text &= " (Error Code: " & errorCode & " - OK)" + Case 90 + lblErrMsg.Text &= " (Error Code: " & errorCode & " - Fehlversuch)" + Case 99 + lblErrMsg.Text &= " (Error Code: " & errorCode & " - zu viele Fehler, kein Versuch mehr)" + End Select + - If errorCode > 0 Then - lblErrMsg.Text &= " (Error Code: " & errorCode & ")" - End If If testsystem IsNot Nothing Then cbxTestsysten.Checked = testsystem diff --git a/UID/frmAPIEinstellungen.vb b/UID/frmAPIEinstellungen.vb index 72aa03d..2f89821 100644 --- a/UID/frmAPIEinstellungen.vb +++ b/UID/frmAPIEinstellungen.vb @@ -235,18 +235,54 @@ Public Class frmAPIEinstellungen Dim path As New System.IO.DirectoryInfo(DataGridView.CurrentRow.Cells("api_debugpath").Value) If DataGridView.CurrentRow.Cells("api_debugpath").Value IsNot DBNull.Value AndAlso path.Exists Then - Process.Start(DataGridView.CurrentRow.Cells("api_debugpath").Value) - End If + Process.Start(DataGridView.CurrentRow.Cells("api_debugpath").Value) End If - - Else - End If - Me.Cursor = Cursors.Default + + ElseIf DataGridView.Columns(e.ColumnIndex).Name = "api_program" Then + If DataGridView.CurrentRow.Cells("api_program").Value <> "" AndAlso DataGridView.CurrentRow.Cells("api_program").Value.ToString.ToLower = "creditsafe" Then + openCreditsafeRequests() + End If + + + End If + Me.Cursor = Cursors.Default End Sub Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click Dim webAddress As String = "https://wiki.verag.ag/de/software/Offene_Punkte#aviso-schnittstellen-zu-fremdsystemen" Process.Start(webAddress) End Sub + + Private Sub openCreditsafeRequests() + Try + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim frm As New Form + Dim dgv As New DataGridView() + Dim dt As New DataTable + Dim cs = New cCreditSafeAPI("creditsafe") + cs.authenticate() + cs.getSubscriptionCountries(dt) + dgv.DataSource = dt + If dgv IsNot Nothing Then + frm.Size = New Size(1400, 1000) + dgv.Size = New Size(frm.Size.Width - 50, frm.Size.Height - 50) + dgv.Dock = DockStyle.Fill + dgv.Anchor = AnchorStyles.Left + dgv.Anchor = AnchorStyles.Top + dgv.ReadOnly = True + frm.Controls.Add(dgv) + frm.StartPosition = FormStartPosition.CenterScreen + frm.ShowDialog() + End If + + + Catch ex As System.Exception + + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + + End Sub End Class \ No newline at end of file diff --git a/UID/frmMain.Designer.vb b/UID/frmMain.Designer.vb index b2e43c9..5a4ad7a 100644 --- a/UID/frmMain.Designer.vb +++ b/UID/frmMain.Designer.vb @@ -33,6 +33,7 @@ Partial Class frmMain Me.TableAdapterManager1 = New ADMIN.DataSetBerechtigungenTableAdapters.TableAdapterManager() Me.pnlMain = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() + Me.Button3 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() Me.btnFehler = New System.Windows.Forms.Button() Me.btnAPI = New System.Windows.Forms.Button() @@ -47,7 +48,6 @@ Partial Class frmMain Me.btnMitarbeiter = New System.Windows.Forms.Button() Me.Panel2 = New System.Windows.Forms.Panel() Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.Button3 = New System.Windows.Forms.Button() Me.Panel3.SuspendLayout() Me.Panel2.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -104,7 +104,7 @@ Partial Class frmMain Me.pnlMain.BackColor = System.Drawing.Color.White Me.pnlMain.Location = New System.Drawing.Point(137, 70) Me.pnlMain.Name = "pnlMain" - Me.pnlMain.Size = New System.Drawing.Size(1026, 801) + Me.pnlMain.Size = New System.Drawing.Size(1740, 801) Me.pnlMain.TabIndex = 26 ' 'Panel3 @@ -129,6 +129,18 @@ Partial Class frmMain Me.Panel3.Size = New System.Drawing.Size(137, 801) Me.Panel3.TabIndex = 32 ' + 'Button3 + ' + Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button3.Location = New System.Drawing.Point(12, 437) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(94, 33) + Me.Button3.TabIndex = 42 + Me.Button3.Text = "Zugänge API" + Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button3.UseVisualStyleBackColor = True + ' 'Button2 ' Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -276,7 +288,7 @@ Partial Class frmMain 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(1163, 70) + Me.Panel2.Size = New System.Drawing.Size(1877, 70) Me.Panel2.TabIndex = 33 ' 'PictureBox1 @@ -290,23 +302,11 @@ Partial Class frmMain Me.PictureBox1.TabIndex = 31 Me.PictureBox1.TabStop = False ' - 'Button3 - ' - Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button3.Location = New System.Drawing.Point(12, 437) - Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(94, 33) - Me.Button3.TabIndex = 42 - Me.Button3.Text = "Zugänge API" - Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button3.UseVisualStyleBackColor = True - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1163, 871) + Me.ClientSize = New System.Drawing.Size(1877, 871) Me.Controls.Add(Me.pnlMain) Me.Controls.Add(Me.Panel3) Me.Controls.Add(Me.Panel2) diff --git a/UID/packages.config b/UID/packages.config index a5d6485..8194a9e 100644 --- a/UID/packages.config +++ b/UID/packages.config @@ -1,7 +1,7 @@  - + diff --git a/UID/usrCntlAPI.Designer.vb b/UID/usrCntlAPI.Designer.vb index c424e5e..a54536d 100644 --- a/UID/usrCntlAPI.Designer.vb +++ b/UID/usrCntlAPI.Designer.vb @@ -26,6 +26,10 @@ Partial Class usrCntlAPI Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.pnlSearch = New System.Windows.Forms.Panel() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() + Me.txtSuche = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label15 = New System.Windows.Forms.Label() + Me.cboProgram = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label14 = New System.Windows.Forms.Label() Me.cboPartnersystem = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button1 = New System.Windows.Forms.Button() Me.Label11 = New System.Windows.Forms.Label() @@ -82,8 +86,6 @@ Partial Class usrCntlAPI Me.Panel3 = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() Me.Button11 = New System.Windows.Forms.Button() - Me.cboProgram = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.Label14 = New System.Windows.Forms.Label() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() @@ -139,6 +141,8 @@ Partial Class usrCntlAPI ' 'SplitContainer1.Panel1 ' + Me.SplitContainer1.Panel1.Controls.Add(Me.txtSuche) + Me.SplitContainer1.Panel1.Controls.Add(Me.Label15) Me.SplitContainer1.Panel1.Controls.Add(Me.cboProgram) Me.SplitContainer1.Panel1.Controls.Add(Me.Label14) Me.SplitContainer1.Panel1.Controls.Add(Me.cboPartnersystem) @@ -192,6 +196,62 @@ Partial Class usrCntlAPI Me.SplitContainer1.SplitterDistance = 125 Me.SplitContainer1.TabIndex = 0 ' + 'txtSuche + ' + Me.txtSuche._DateTimeOnly = False + Me.txtSuche._numbersOnly = False + Me.txtSuche._numbersOnlyKommastellen = "" + Me.txtSuche._numbersOnlyTrennzeichen = False + Me.txtSuche._Prozent = False + Me.txtSuche._ShortDateNew = False + Me.txtSuche._ShortDateOnly = False + Me.txtSuche._TimeOnly = False + Me.txtSuche._TimeOnly_Seconds = False + Me.txtSuche._value = "" + Me.txtSuche._Waehrung = False + Me.txtSuche._WaehrungZeichen = False + Me.txtSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSuche.ForeColor = System.Drawing.Color.Black + Me.txtSuche.Location = New System.Drawing.Point(633, 72) + Me.txtSuche.MaxLineLength = -1 + Me.txtSuche.MaxLines_Warning = "" + Me.txtSuche.MaxLines_Warning_Label = Nothing + Me.txtSuche.Name = "txtSuche" + Me.txtSuche.Size = New System.Drawing.Size(159, 20) + Me.txtSuche.TabIndex = 58 + ' + 'Label15 + ' + Me.Label15.AutoSize = True + Me.Label15.Location = New System.Drawing.Point(559, 77) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(65, 13) + Me.Label15.TabIndex = 57 + Me.Label15.Text = "Email-Empf.:" + ' + 'cboProgram + ' + Me.cboProgram._allowedValuesFreiText = Nothing + Me.cboProgram._allowFreiText = False + Me.cboProgram._value = "" + Me.cboProgram.DropDownWidth = 250 + Me.cboProgram.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboProgram.FormattingEnabled = True + Me.cboProgram.Location = New System.Drawing.Point(324, 72) + Me.cboProgram.Name = "cboProgram" + Me.cboProgram.Size = New System.Drawing.Size(73, 22) + Me.cboProgram.TabIndex = 56 + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label14.Location = New System.Drawing.Point(321, 54) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(62, 13) + Me.Label14.TabIndex = 55 + Me.Label14.Text = "Programm" + ' 'cboPartnersystem ' Me.cboPartnersystem._allowedValuesFreiText = Nothing @@ -207,6 +267,7 @@ Partial Class usrCntlAPI ' 'Button1 ' + Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -521,6 +582,7 @@ Partial Class usrCntlAPI ' 'btnSuche ' + Me.btnSuche.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnSuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -978,29 +1040,6 @@ Partial Class usrCntlAPI Me.Button11.TabIndex = 4 Me.Button11.UseVisualStyleBackColor = True ' - 'cboProgram - ' - Me.cboProgram._allowedValuesFreiText = Nothing - Me.cboProgram._allowFreiText = False - Me.cboProgram._value = "" - Me.cboProgram.DropDownWidth = 250 - Me.cboProgram.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboProgram.FormattingEnabled = True - Me.cboProgram.Location = New System.Drawing.Point(324, 72) - Me.cboProgram.Name = "cboProgram" - Me.cboProgram.Size = New System.Drawing.Size(73, 22) - Me.cboProgram.TabIndex = 56 - ' - 'Label14 - ' - Me.Label14.AutoSize = True - Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label14.Location = New System.Drawing.Point(321, 54) - Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(62, 13) - Me.Label14.TabIndex = 55 - Me.Label14.Text = "Programm" - ' 'usrCntlAPI ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1087,4 +1126,6 @@ Partial Class usrCntlAPI Friend WithEvents Label12 As Label Friend WithEvents cboProgram As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label14 As Label + Friend WithEvents txtSuche As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label15 As Label End Class diff --git a/UID/usrCntlAPI.vb b/UID/usrCntlAPI.vb index c7fe6c1..21ed976 100644 --- a/UID/usrCntlAPI.vb +++ b/UID/usrCntlAPI.vb @@ -233,6 +233,7 @@ Public Class usrCntlAPI If txtSendungsId.Text <> "" Then sqlstr &= " AND [api_SendungsId] LIKE @SendungsId " If txtZollBelegNr.Text <> "" Then sqlstr &= " AND [api_Zollbelegnummer] LIKE @ZollBelegNr " If txtBezugsNr.Text <> "" Then sqlstr &= " AND [api_BezugsNr] LIKE @BezugsNr " + If txtSuche.Text <> "" Then sqlstr &= " AND ([api_EMail] LIKE @api_EMail OR [api_EMailCC] LIKE @api_EMail OR [api_EMailBCC] LIKE @api_EMail)" Return sqlstr @@ -264,6 +265,7 @@ Public Class usrCntlAPI list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SendungsId", txtSendungsId.Text)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ZollBelegNr", txtZollBelegNr.Text.Replace("*", "%").ToUpper)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BezugsNr", txtBezugsNr.Text.Replace("*", "%").ToUpper)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("api_EMail", txtSuche.Text.Replace("*", "%"))) Return list End Function @@ -304,10 +306,14 @@ Public Class usrCntlAPI .mail = sender.CurrentRow.Cells("api_EMail").Value, .maid = sender.CurrentRow.Cells("api_MaId").Value, .userName = sender.CurrentRow.Cells("api_Username").Value, + .mailAnh = sender.CurrentRow.Cells("api_EMailAttCnt").Value, .firma = sender.CurrentRow.Cells("api_Firma").Value, + .subject = sender.CurrentRow.Cells("api_EMailSubject").Value, + .mailcc = sender.CurrentRow.Cells("api_EMailCC").Value, + .mailbcc = sender.CurrentRow.Cells("api_EMailBCC").Value, .errorCode = sender.CurrentRow.Cells("api_status").Value, .errStack = IIf(sender.CurrentRow.Cells("api_errTstmp").Value IsNot DBNull.Value, "Datum: " & sender.CurrentRow.Cells("api_errTstmp").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_errMethodName").Value IsNot DBNull.Value, "Methode: " & sender.CurrentRow.Cells("api_errMethodName").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_errMessage").Value IsNot DBNull.Value, "Message: " & sender.CurrentRow.Cells("api_errMessage").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_errStack").Value IsNot DBNull.Value, "Stack: " & sender.CurrentRow.Cells("api_errStack").Value & vbNewLine, ""), - .errMessage = IIf(sender.CurrentRow.Cells("api_EMailFrom").Value IsNot DBNull.Value, "Mail von : " & sender.CurrentRow.Cells("api_EMailFrom").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_EMail").Value IsNot DBNull.Value, "E-Mail: " & sender.CurrentRow.Cells("api_EMail").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_KundenNr").Value IsNot DBNull.Value, "Kunde: " & sender.CurrentRow.Cells("api_KundenNr").Value & vbNewLine, ""), + .errMessage = IIf(sender.CurrentRow.Cells("api_EMailFrom").Value IsNot DBNull.Value, "Mail von : " & sender.CurrentRow.Cells("api_EMailFrom").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_EMail").Value IsNot DBNull.Value, "E-Mail: " & sender.CurrentRow.Cells("api_EMail").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_EMailText").Value IsNot DBNull.Value, "E-MailText: " & sender.CurrentRow.Cells("api_EMailText").Value & vbNewLine, ""), .errMethodName = IIf(sender.CurrentRow.Cells("api_BezugsNr").Value IsNot DBNull.Value, "BezugsNr: " & sender.CurrentRow.Cells("api_BezugsNr").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_BezugsNr").Value IsNot DBNull.Value, "AVISO-ID: " & sender.CurrentRow.Cells("api_AvisoId").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_KundenNr").Value IsNot DBNull.Value, "Kunde: " & sender.CurrentRow.Cells("api_KundenNr").Value & vbNewLine, "") } err.Show(Me) diff --git a/UID/usrCntlERS.vb b/UID/usrCntlERS.vb index 5da1b01..e20532c 100644 --- a/UID/usrCntlERS.vb +++ b/UID/usrCntlERS.vb @@ -263,7 +263,7 @@ Public Class usrCntlERS .firma = sender.CurrentRow.Cells("ers_firma").Value, .errorCode = sender.CurrentRow.Cells("ers_progId").Value, .errStack = sender.CurrentRow.Cells("ers_errStack").Value, - .errMessage = sender.CurrentRow.Cells("ers_errMessage").Value, + .errMessage = sender.CurrentRow.Cells("ers_errMessage").Value & IIf(sender.CurrentRow.Cells("ers_infotext").Value <> "", vbNewLine & vbNewLine & "SQL-QUERY:" & vbNewLine & sender.CurrentRow.Cells("ers_infotext").Value, ""), .errMethodName = sender.CurrentRow.Cells("ers_errMethodName").Value } diff --git a/cNCTSPartnerWorker/My Project/Application.Designer.vb b/cNCTSPartnerWorker/My Project/Application.Designer.vb index 88dd01c..8ab460b 100644 --- a/cNCTSPartnerWorker/My Project/Application.Designer.vb +++ b/cNCTSPartnerWorker/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ diff --git a/cNCTSPartnerWorker/My Project/Resources.Designer.vb b/cNCTSPartnerWorker/My Project/Resources.Designer.vb index 1006731..035044d 100644 --- a/cNCTSPartnerWorker/My Project/Resources.Designer.vb +++ b/cNCTSPartnerWorker/My Project/Resources.Designer.vb @@ -1,40 +1,41 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ Option Strict On Option Explicit On +Imports System Namespace My.Resources - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ + _ Friend Module Resources - + Private resourceMan As Global.System.Resources.ResourceManager - + Private resourceCulture As Global.System.Globalization.CultureInfo - + ''' - ''' Returns the cached ResourceManager instance used by this class. + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' - _ + _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then @@ -44,17 +45,17 @@ Namespace My.Resources Return resourceMan End Get End Property - + ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' - _ + _ Friend Property Culture() As Global.System.Globalization.CultureInfo Get Return resourceCulture End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) + Set resourceCulture = value End Set End Property diff --git a/cNCTSPartnerWorker/My Project/Settings.Designer.vb b/cNCTSPartnerWorker/My Project/Settings.Designer.vb index e848905..db7fabe 100644 --- a/cNCTSPartnerWorker/My Project/Settings.Designer.vb +++ b/cNCTSPartnerWorker/My Project/Settings.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -13,42 +13,42 @@ Option Explicit On Namespace My - - _ + + _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - -#Region "My.Settings Auto-Save Functionality" + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + +#Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance End Get diff --git a/cNCTSPartnerWorker/NCTSPartnerWorker.vbproj b/cNCTSPartnerWorker/NCTSPartnerWorker.vbproj index ce804ee..163e31f 100644 --- a/cNCTSPartnerWorker/NCTSPartnerWorker.vbproj +++ b/cNCTSPartnerWorker/NCTSPartnerWorker.vbproj @@ -10,8 +10,9 @@ cNCTSPartnerWorker 512 Windows - v4.7 + v4.8 true + true @@ -74,6 +75,7 @@ True Application.myapp + True True diff --git a/initATLASAufschubkonten/App.config b/initATLASAufschubkonten/App.config index 5f70bbd..a86c646 100644 --- a/initATLASAufschubkonten/App.config +++ b/initATLASAufschubkonten/App.config @@ -1,6 +1,6 @@ - + diff --git a/initATLASAufschubkonten/My Project/Application.Designer.vb b/initATLASAufschubkonten/My Project/Application.Designer.vb index 782bb50..2584a6d 100644 --- a/initATLASAufschubkonten/My Project/Application.Designer.vb +++ b/initATLASAufschubkonten/My Project/Application.Designer.vb @@ -1,6 +1,5 @@ '------------------------------------------------------------------------------ -' +' ' Dieser Code wurde von einem Tool generiert. ' Laufzeitversion:4.0.30319.42000 ' diff --git a/initATLASAufschubkonten/My Project/Resources.Designer.vb b/initATLASAufschubkonten/My Project/Resources.Designer.vb index 18f953a..a1c2d79 100644 --- a/initATLASAufschubkonten/My Project/Resources.Designer.vb +++ b/initATLASAufschubkonten/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/initATLASAufschubkonten/My Project/Settings.Designer.vb b/initATLASAufschubkonten/My Project/Settings.Designer.vb index e234f82..687997e 100644 --- a/initATLASAufschubkonten/My Project/Settings.Designer.vb +++ b/initATLASAufschubkonten/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/initATLASAufschubkonten/RoutineManager.vbproj b/initATLASAufschubkonten/RoutineManager.vbproj index 6c80c60..db32ba3 100644 --- a/initATLASAufschubkonten/RoutineManager.vbproj +++ b/initATLASAufschubkonten/RoutineManager.vbproj @@ -11,7 +11,7 @@ RoutineManager 512 WindowsForms - v4.7 + v4.8 @@ -216,6 +216,7 @@ True Application.myapp + True True diff --git a/initATLASAufschubkonten/cUTA.vb b/initATLASAufschubkonten/cUTA.vb index 97b76c4..e5db4c5 100644 --- a/initATLASAufschubkonten/cUTA.vb +++ b/initATLASAufschubkonten/cUTA.vb @@ -246,6 +246,7 @@ Public Class cUTA Property Leistungsort_verlagerbar As Char Property abgerechnetDatum As Object Property abgerechnet As Boolean = False + Property daId As Object Public hasEntry = False @@ -348,6 +349,7 @@ Public Class cUTA list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Leistungsort_verlagerbar", Leistungsort_verlagerbar)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("abgerechnetDatum", abgerechnetDatum)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("abgerechnet", abgerechnet)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("daId", daId)) Return list End Function @@ -1240,7 +1242,7 @@ Public Class cUTA ERROR_PFAD = cUTA.Paramter.GET_PARAM_ByName("ERROR_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) ARCHIV_PFAD = cUTA.Paramter.GET_PARAM_ByName("ARCHIV_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) - VERARBEITUNG_PFAD = cUTA.Paramter.GET_PARAM_ByName("VERARBEITUNG_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) + VERARBEITUNG_PFAD = cUTA.Paramter.GET_PARAM_ByName("VERARBEITUNGS_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) ZIEL_PFAD = cUTA.Paramter.GET_PARAM_ByName("ZIEL_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) If Not IO.Directory.Exists(VERARBEITUNG_PFAD) Then IO.Directory.CreateDirectory(VERARBEITUNG_PFAD) diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb index 523ebaa..3b24a60 100644 --- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb @@ -6076,6 +6076,9 @@ Public Class frmDYNachrichtenVerarbeitung Next + 'TODO: SET_FIRMA + tryGetFirmaNiederlassung(EZA.eza_firma, EZA.eza_niederlassung, (EZA.eza_AnmeldenderBearbeiterEMail, "").ToString, EZA.eza_ObjectName) + End If @@ -6084,6 +6087,7 @@ Public Class frmDYNachrichtenVerarbeitung + If EZA.SAVE_ALL() Then If If(EZA.eza_Status, 0) <= 5 Then DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_TMP, DAKOSY_Worker.cDY_Statusliste.S_05) Else diff --git a/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb b/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb index e99ca0e..9a14349 100644 --- a/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb +++ b/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb @@ -226,7 +226,10 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers Dim targetFile As SftpFile For Each file As SftpFile In files - If file.IsRegularFile AndAlso file.Name.ToLower.EndsWith(".uta") AndAlso file.Length > 0 AndAlso IIf(renameAfterDownload, Not file.Name.ToLower.StartsWith("_"), True) Then + + 'If file.IsRegularFile AndAlso file.Name.ToLower.EndsWith(".uta") AndAlso file.Length > 0 AndAlso IIf(renameAfterDownload, Not file.Name.ToLower.StartsWith("_"), True) Then + + If file.IsRegularFile AndAlso file.Name.ToLower.EndsWith(".uta") AndAlso file.Length > 0 AndAlso IIf(renameAfterDownload, Not file.Name.ToLower.StartsWith("_"), Not file.Name.ToLower.StartsWith("_")) Then Dim remoteFileName = "/" & file.Name Dim filePath = uta.VERARBEITUNG_PFAD & If(IO.File.Exists(uta.VERARBEITUNG_PFAD & file.Name), Name.Replace(".UTA", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".UTA", file.Name) @@ -400,8 +403,28 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers '------------------------------------------ '------------------ .PDF ------------------ '------------------------------------------ + 'PDFs über EEA + If fi.Extension.ToLower = ".pdf" Then + + If Not IO.Directory.Exists(zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(zielpfad & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") + + If fi.Name.ToString.StartsWith("invoice_") Then + + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "UTA", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(d)) + + DS.uploadDataToDATENSERVER(d,,,,,, True) + + 'TO DO -> ÄNDERN---------------------- + ' SQL.doSQL("Update [tblUTAImport] SET [daId]='" & DS.da_id & "' where [rmc_pdfFileName] = '" & DS.da_name & "' and [rmc_importDatum] > DATEADD(DAY,-4,getdate()) ", "FMZOLL") + 'TO DO -> ÄNDERN---------------------- + + End If + End If + + frmStartOptions.moveFile_DateBack(d, zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") + If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name) + dgvEinarbeitung.Refresh() - 'AKTUELL NOCH KEINE PDFs -> HIER LOGIK FÜR UTA_PDFs dgvEinarbeitung.Refresh() diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 6b7a6d7..fd8e283 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -28,7 +28,6 @@ Partial Class frmStartOptions Me.buchungenAMBAR = New System.Windows.Forms.Button() Me.PictureBox23 = New System.Windows.Forms.PictureBox() Me.Label27 = New System.Windows.Forms.Label() - Me.MyTextBox3 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.LinkLabel51 = New System.Windows.Forms.LinkLabel() Me.PictureBox22 = New System.Windows.Forms.PictureBox() Me.Button22 = New System.Windows.Forms.Button() @@ -46,20 +45,16 @@ Partial Class frmStartOptions Me.Label20 = New System.Windows.Forms.Label() Me.Label19 = New System.Windows.Forms.Label() Me.Label18 = New System.Windows.Forms.Label() - Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.LinkLabel36 = New System.Windows.Forms.LinkLabel() Me.Button13 = New System.Windows.Forms.Button() Me.Button12 = New System.Windows.Forms.Button() Me.cbxSyskaWdh = New System.Windows.Forms.CheckBox() - Me.txtSyskaWdhDateiname = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button10 = New System.Windows.Forms.Button() Me.piceZollAnh = New System.Windows.Forms.PictureBox() - Me.txtEZOLLAnhDat = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblEZOLLDat = New System.Windows.Forms.LinkLabel() Me.Button6 = New System.Windows.Forms.Button() Me.CheckBox6 = New System.Windows.Forms.CheckBox() Me.Button7 = New System.Windows.Forms.Button() - Me.cboSYSKAFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.CheckBox7 = New System.Windows.Forms.CheckBox() Me.Label16 = New System.Windows.Forms.Label() Me.LinkLabel33 = New System.Windows.Forms.LinkLabel() @@ -68,7 +63,6 @@ Partial Class frmStartOptions Me.Button4 = New System.Windows.Forms.Button() Me.CheckBox5 = New System.Windows.Forms.CheckBox() Me.Button3 = New System.Windows.Forms.Button() - Me.cboBMDUnispedFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.CheckBox4 = New System.Windows.Forms.CheckBox() Me.Label13 = New System.Windows.Forms.Label() Me.CheckBox3 = New System.Windows.Forms.CheckBox() @@ -98,11 +92,8 @@ Partial Class frmStartOptions Me.Label2 = New System.Windows.Forms.Label() Me.LinkLabel5 = New System.Windows.Forms.LinkLabel() Me.LinkLabel6 = New System.Windows.Forms.LinkLabel() - Me.LinkLabel23 = New System.Windows.Forms.LinkLabel() Me.LinkLabel7 = New System.Windows.Forms.LinkLabel() - Me.LinkLabel24 = New System.Windows.Forms.LinkLabel() Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.Label5 = New System.Windows.Forms.Label() Me.LinkLabel8 = New System.Windows.Forms.LinkLabel() Me.LinkLabel21 = New System.Windows.Forms.LinkLabel() Me.PictureBox2 = New System.Windows.Forms.PictureBox() @@ -145,15 +136,6 @@ Partial Class frmStartOptions Me.Label6 = New System.Windows.Forms.Label() Me.PictureBox15 = New System.Windows.Forms.PictureBox() Me.PictureBox14 = New System.Windows.Forms.PictureBox() - Me.dgvMRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.clmnMRN = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.txtVRGOut_MRN = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtVRGOut_FilialenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtVRGOut_AbfertigungsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtVRGOutEZA_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtVRGOut_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.TabPage3 = New System.Windows.Forms.TabPage() Me.LinkLabel50 = New System.Windows.Forms.LinkLabel() Me.Label26 = New System.Windows.Forms.Label() @@ -169,17 +151,19 @@ Partial Class frmStartOptions Me.LinkLabel30 = New System.Windows.Forms.LinkLabel() Me.Label11 = New System.Windows.Forms.Label() Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.Label5 = New System.Windows.Forms.Label() + Me.LinkLabel23 = New System.Windows.Forms.LinkLabel() + Me.LinkLabel24 = New System.Windows.Forms.LinkLabel() + Me.cbxOnlyBilledTransactions = New System.Windows.Forms.CheckBox() Me.LinkLabel62 = New System.Windows.Forms.LinkLabel() Me.LinkLabel60 = New System.Windows.Forms.LinkLabel() Me.LinkLabel61 = New System.Windows.Forms.LinkLabel() Me.Label40 = New System.Windows.Forms.Label() - Me.txtTransactionID = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.LinkLabel59 = New System.Windows.Forms.LinkLabel() Me.Label39 = New System.Windows.Forms.Label() Me.Label38 = New System.Windows.Forms.Label() Me.Label37 = New System.Windows.Forms.Label() Me.LinkLabel58 = New System.Windows.Forms.LinkLabel() - Me.txtBatchNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.LinkLabel57 = New System.Windows.Forms.LinkLabel() Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker() Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() @@ -217,9 +201,6 @@ Partial Class frmStartOptions Me.LinkLabel43 = New System.Windows.Forms.LinkLabel() Me.LinkLabel44 = New System.Windows.Forms.LinkLabel() Me.Label24 = New System.Windows.Forms.Label() - Me.cbxRMC = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtTBLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtTWLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.CheckBox2 = New System.Windows.Forms.CheckBox() Me.LinkLabel25 = New System.Windows.Forms.LinkLabel() Me.CheckBox1 = New System.Windows.Forms.CheckBox() @@ -227,7 +208,6 @@ Partial Class frmStartOptions Me.cbxKd = New System.Windows.Forms.CheckBox() Me.Button9 = New System.Windows.Forms.Button() Me.Label3 = New System.Windows.Forms.Label() - Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox12 = New System.Windows.Forms.PictureBox() Me.LinkLabel20 = New System.Windows.Forms.LinkLabel() Me.PictureBox11 = New System.Windows.Forms.PictureBox() @@ -243,9 +223,31 @@ Partial Class frmStartOptions Me.LinkLabel3 = New System.Windows.Forms.LinkLabel() Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel() Me.lblRoutineManager = New System.Windows.Forms.Label() - Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button21 = New System.Windows.Forms.Button() - Me.cbxOnlyBilledTransactions = New System.Windows.Forms.CheckBox() + Me.MyTextBox3 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtSyskaWdhDateiname = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtEZOLLAnhDat = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cboSYSKAFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboBMDUnispedFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.dgvMRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.clmnMRN = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.txtVRGOut_MRN = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtVRGOut_FilialenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtVRGOut_AbfertigungsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtVRGOutEZA_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtVRGOut_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtBatchNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxMSEBatchNr = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtTransactionID = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxRMC = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtTBLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtTWLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxUploadDA = New System.Windows.Forms.CheckBox() Me.pnl.SuspendLayout() CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox22, System.ComponentModel.ISupportInitialize).BeginInit() @@ -269,7 +271,6 @@ Partial Class frmStartOptions Me.TabPage2.SuspendLayout() CType(Me.PictureBox15, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage3.SuspendLayout() Me.TabPage4.SuspendLayout() CType(Me.PictureBox21, System.ComponentModel.ISupportInitialize).BeginInit() @@ -279,6 +280,7 @@ Partial Class frmStartOptions CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnl @@ -360,7 +362,7 @@ Partial Class frmStartOptions 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(861, 992) + Me.pnl.Size = New System.Drawing.Size(1168, 992) Me.pnl.TabIndex = 0 ' 'buchungenAMBAR @@ -395,29 +397,6 @@ Partial Class frmStartOptions Me.Label27.TabIndex = 87 Me.Label27.Text = "älter als Tage" ' - 'MyTextBox3 - ' - Me.MyTextBox3._DateTimeOnly = False - Me.MyTextBox3._numbersOnly = True - Me.MyTextBox3._numbersOnlyKommastellen = "" - Me.MyTextBox3._numbersOnlyTrennzeichen = True - Me.MyTextBox3._Prozent = False - Me.MyTextBox3._ShortDateNew = False - Me.MyTextBox3._ShortDateOnly = False - Me.MyTextBox3._TimeOnly = False - Me.MyTextBox3._TimeOnly_Seconds = False - Me.MyTextBox3._value = "" - Me.MyTextBox3._Waehrung = False - Me.MyTextBox3._WaehrungZeichen = True - Me.MyTextBox3.ForeColor = System.Drawing.Color.Red - Me.MyTextBox3.Location = New System.Drawing.Point(127, 208) - Me.MyTextBox3.MaxLineLength = -1 - Me.MyTextBox3.MaxLines_Warning = "" - Me.MyTextBox3.MaxLines_Warning_Label = Nothing - Me.MyTextBox3.Name = "MyTextBox3" - Me.MyTextBox3.Size = New System.Drawing.Size(53, 20) - Me.MyTextBox3.TabIndex = 86 - ' 'LinkLabel51 ' Me.LinkLabel51.AutoSize = True @@ -607,29 +586,6 @@ Partial Class frmStartOptions Me.Label18.TabIndex = 64 Me.Label18.Text = "Max" ' - 'MyTextBox2 - ' - Me.MyTextBox2._DateTimeOnly = False - Me.MyTextBox2._numbersOnly = True - Me.MyTextBox2._numbersOnlyKommastellen = "" - Me.MyTextBox2._numbersOnlyTrennzeichen = True - Me.MyTextBox2._Prozent = False - Me.MyTextBox2._ShortDateNew = False - Me.MyTextBox2._ShortDateOnly = False - Me.MyTextBox2._TimeOnly = False - Me.MyTextBox2._TimeOnly_Seconds = False - Me.MyTextBox2._value = "" - Me.MyTextBox2._Waehrung = False - Me.MyTextBox2._WaehrungZeichen = True - Me.MyTextBox2.ForeColor = System.Drawing.Color.Red - Me.MyTextBox2.Location = New System.Drawing.Point(151, 152) - Me.MyTextBox2.MaxLineLength = -1 - Me.MyTextBox2.MaxLines_Warning = "" - Me.MyTextBox2.MaxLines_Warning_Label = Nothing - Me.MyTextBox2.Name = "MyTextBox2" - Me.MyTextBox2.Size = New System.Drawing.Size(53, 20) - Me.MyTextBox2.TabIndex = 63 - ' 'LinkLabel36 ' Me.LinkLabel36.AutoSize = True @@ -676,30 +632,6 @@ Partial Class frmStartOptions Me.cbxSyskaWdh.Text = "Buchungen wiederh." Me.cbxSyskaWdh.UseVisualStyleBackColor = True ' - 'txtSyskaWdhDateiname - ' - Me.txtSyskaWdhDateiname._DateTimeOnly = False - Me.txtSyskaWdhDateiname._numbersOnly = False - Me.txtSyskaWdhDateiname._numbersOnlyKommastellen = "" - Me.txtSyskaWdhDateiname._numbersOnlyTrennzeichen = True - Me.txtSyskaWdhDateiname._Prozent = False - Me.txtSyskaWdhDateiname._ShortDateNew = False - Me.txtSyskaWdhDateiname._ShortDateOnly = False - Me.txtSyskaWdhDateiname._TimeOnly = False - Me.txtSyskaWdhDateiname._TimeOnly_Seconds = False - Me.txtSyskaWdhDateiname._value = "" - Me.txtSyskaWdhDateiname._Waehrung = False - Me.txtSyskaWdhDateiname._WaehrungZeichen = True - Me.txtSyskaWdhDateiname.ForeColor = System.Drawing.Color.Black - Me.txtSyskaWdhDateiname.Location = New System.Drawing.Point(692, 318) - Me.txtSyskaWdhDateiname.MaxLength = 50 - Me.txtSyskaWdhDateiname.MaxLineLength = -1 - Me.txtSyskaWdhDateiname.MaxLines_Warning = "" - Me.txtSyskaWdhDateiname.MaxLines_Warning_Label = Nothing - Me.txtSyskaWdhDateiname.Name = "txtSyskaWdhDateiname" - Me.txtSyskaWdhDateiname.Size = New System.Drawing.Size(136, 20) - Me.txtSyskaWdhDateiname.TabIndex = 58 - ' 'Button10 ' Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -724,30 +656,6 @@ Partial Class frmStartOptions Me.piceZollAnh.TabStop = False Me.piceZollAnh.Visible = False ' - 'txtEZOLLAnhDat - ' - Me.txtEZOLLAnhDat._DateTimeOnly = False - Me.txtEZOLLAnhDat._numbersOnly = False - Me.txtEZOLLAnhDat._numbersOnlyKommastellen = "" - Me.txtEZOLLAnhDat._numbersOnlyTrennzeichen = True - Me.txtEZOLLAnhDat._Prozent = False - Me.txtEZOLLAnhDat._ShortDateNew = True - Me.txtEZOLLAnhDat._ShortDateOnly = False - Me.txtEZOLLAnhDat._TimeOnly = False - Me.txtEZOLLAnhDat._TimeOnly_Seconds = False - Me.txtEZOLLAnhDat._value = "" - Me.txtEZOLLAnhDat._Waehrung = False - Me.txtEZOLLAnhDat._WaehrungZeichen = True - Me.txtEZOLLAnhDat.ForeColor = System.Drawing.Color.Black - Me.txtEZOLLAnhDat.Location = New System.Drawing.Point(408, 190) - Me.txtEZOLLAnhDat.MaxLength = 10 - Me.txtEZOLLAnhDat.MaxLineLength = -1 - Me.txtEZOLLAnhDat.MaxLines_Warning = "" - Me.txtEZOLLAnhDat.MaxLines_Warning_Label = Nothing - Me.txtEZOLLAnhDat.Name = "txtEZOLLAnhDat" - Me.txtEZOLLAnhDat.Size = New System.Drawing.Size(87, 20) - Me.txtEZOLLAnhDat.TabIndex = 55 - ' 'lblEZOLLDat ' Me.lblEZOLLDat.AutoSize = True @@ -796,17 +704,6 @@ Partial Class frmStartOptions Me.Button7.Text = "Buchungen --> Syska" Me.Button7.UseVisualStyleBackColor = True ' - 'cboSYSKAFirma - ' - Me.cboSYSKAFirma._allowedValuesFreiText = Nothing - Me.cboSYSKAFirma._allowFreiText = False - Me.cboSYSKAFirma._value = "" - Me.cboSYSKAFirma.FormattingEnabled = True - Me.cboSYSKAFirma.Location = New System.Drawing.Point(564, 299) - Me.cboSYSKAFirma.Name = "cboSYSKAFirma" - Me.cboSYSKAFirma.Size = New System.Drawing.Size(129, 21) - Me.cboSYSKAFirma.TabIndex = 51 - ' 'CheckBox7 ' Me.CheckBox7.AutoSize = True @@ -899,17 +796,6 @@ Partial Class frmStartOptions Me.Button3.Text = "Buchungen --> BMD" Me.Button3.UseVisualStyleBackColor = True ' - 'cboBMDUnispedFirma - ' - Me.cboBMDUnispedFirma._allowedValuesFreiText = Nothing - Me.cboBMDUnispedFirma._allowFreiText = False - Me.cboBMDUnispedFirma._value = "" - Me.cboBMDUnispedFirma.FormattingEnabled = True - Me.cboBMDUnispedFirma.Location = New System.Drawing.Point(268, 276) - Me.cboBMDUnispedFirma.Name = "cboBMDUnispedFirma" - Me.cboBMDUnispedFirma.Size = New System.Drawing.Size(124, 21) - Me.cboBMDUnispedFirma.TabIndex = 42 - ' 'CheckBox4 ' Me.CheckBox4.AutoSize = True @@ -951,7 +837,7 @@ Partial Class frmStartOptions Me.tbcntr.Location = New System.Drawing.Point(0, 488) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(859, 502) + Me.tbcntr.Size = New System.Drawing.Size(1166, 502) Me.tbcntr.TabIndex = 19 ' 'TabPage1 @@ -980,11 +866,8 @@ Partial Class frmStartOptions Me.TabPage1.Controls.Add(Me.Label2) Me.TabPage1.Controls.Add(Me.LinkLabel5) Me.TabPage1.Controls.Add(Me.LinkLabel6) - Me.TabPage1.Controls.Add(Me.LinkLabel23) Me.TabPage1.Controls.Add(Me.LinkLabel7) - Me.TabPage1.Controls.Add(Me.LinkLabel24) Me.TabPage1.Controls.Add(Me.PictureBox1) - Me.TabPage1.Controls.Add(Me.Label5) Me.TabPage1.Controls.Add(Me.LinkLabel8) Me.TabPage1.Controls.Add(Me.LinkLabel21) Me.TabPage1.Controls.Add(Me.PictureBox2) @@ -1008,7 +891,7 @@ Partial Class frmStartOptions Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(851, 476) + Me.TabPage1.Size = New System.Drawing.Size(1158, 476) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Zollverfahren" Me.TabPage1.UseVisualStyleBackColor = True @@ -1283,17 +1166,6 @@ Partial Class frmStartOptions Me.LinkLabel6.TabStop = True Me.LinkLabel6.Text = "VERAG Kundendaten senden TEST" ' - 'LinkLabel23 - ' - Me.LinkLabel23.AutoSize = True - Me.LinkLabel23.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel23.Location = New System.Drawing.Point(295, 333) - Me.LinkLabel23.Name = "LinkLabel23" - Me.LinkLabel23.Size = New System.Drawing.Size(180, 13) - Me.LinkLabel23.TabIndex = 21 - Me.LinkLabel23.TabStop = True - Me.LinkLabel23.Text = "Eingangsnachrichten abrufen PROD" - ' 'LinkLabel7 ' Me.LinkLabel7.AutoSize = True @@ -1305,17 +1177,6 @@ Partial Class frmStartOptions Me.LinkLabel7.TabStop = True Me.LinkLabel7.Text = "C0017 - Packstücke (Verpackungsart)" ' - 'LinkLabel24 - ' - Me.LinkLabel24.AutoSize = True - Me.LinkLabel24.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel24.Location = New System.Drawing.Point(295, 308) - Me.LinkLabel24.Name = "LinkLabel24" - Me.LinkLabel24.Size = New System.Drawing.Size(177, 13) - Me.LinkLabel24.TabIndex = 19 - Me.LinkLabel24.TabStop = True - Me.LinkLabel24.Text = "Eingangsnachrichten abrufen TEST" - ' 'PictureBox1 ' Me.PictureBox1.BackgroundImage = CType(resources.GetObject("PictureBox1.BackgroundImage"), System.Drawing.Image) @@ -1327,16 +1188,6 @@ Partial Class frmStartOptions Me.PictureBox1.TabStop = False Me.PictureBox1.Visible = False ' - 'Label5 - ' - Me.Label5.AutoSize = True - Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(295, 281) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(184, 13) - Me.Label5.TabIndex = 17 - Me.Label5.Text = "MDM Nachrichtenverarbeitung:" - ' 'LinkLabel8 ' Me.LinkLabel8.AutoSize = True @@ -1589,7 +1440,7 @@ Partial Class frmStartOptions Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(851, 476) + Me.TabPage2.Size = New System.Drawing.Size(1158, 476) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "VERAG Interface" Me.TabPage2.UseVisualStyleBackColor = True @@ -1829,165 +1680,6 @@ Partial Class frmStartOptions Me.PictureBox14.TabStop = False Me.PictureBox14.Visible = False ' - 'dgvMRN - ' - Me.dgvMRN.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvMRN.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvMRN.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnMRN}) - Me.dgvMRN.Location = New System.Drawing.Point(637, 63) - Me.dgvMRN.Name = "dgvMRN" - Me.dgvMRN.RowHeadersWidth = 62 - Me.dgvMRN.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvMRN.Size = New System.Drawing.Size(207, 134) - Me.dgvMRN.TabIndex = 75 - ' - 'clmnMRN - ' - Me.clmnMRN.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.clmnMRN.HeaderText = "MRN" - Me.clmnMRN.MinimumWidth = 8 - Me.clmnMRN.Name = "clmnMRN" - ' - 'txtVRGOut_MRN - ' - Me.txtVRGOut_MRN._DateTimeOnly = False - Me.txtVRGOut_MRN._numbersOnly = False - Me.txtVRGOut_MRN._numbersOnlyKommastellen = "" - Me.txtVRGOut_MRN._numbersOnlyTrennzeichen = True - Me.txtVRGOut_MRN._Prozent = False - Me.txtVRGOut_MRN._ShortDateNew = False - Me.txtVRGOut_MRN._ShortDateOnly = False - Me.txtVRGOut_MRN._TimeOnly = False - Me.txtVRGOut_MRN._TimeOnly_Seconds = False - Me.txtVRGOut_MRN._value = "" - Me.txtVRGOut_MRN._Waehrung = False - Me.txtVRGOut_MRN._WaehrungZeichen = False - Me.txtVRGOut_MRN.ForeColor = System.Drawing.Color.Red - Me.txtVRGOut_MRN.Location = New System.Drawing.Point(359, 84) - Me.txtVRGOut_MRN.MaxLineLength = -1 - Me.txtVRGOut_MRN.MaxLines_Warning = "" - Me.txtVRGOut_MRN.MaxLines_Warning_Label = Nothing - Me.txtVRGOut_MRN.Name = "txtVRGOut_MRN" - Me.txtVRGOut_MRN.Size = New System.Drawing.Size(153, 20) - Me.txtVRGOut_MRN.TabIndex = 73 - ' - 'txtVRGOut_FilialenNr - ' - Me.txtVRGOut_FilialenNr._DateTimeOnly = False - Me.txtVRGOut_FilialenNr._numbersOnly = False - Me.txtVRGOut_FilialenNr._numbersOnlyKommastellen = "" - Me.txtVRGOut_FilialenNr._numbersOnlyTrennzeichen = True - Me.txtVRGOut_FilialenNr._Prozent = False - Me.txtVRGOut_FilialenNr._ShortDateNew = False - Me.txtVRGOut_FilialenNr._ShortDateOnly = False - Me.txtVRGOut_FilialenNr._TimeOnly = False - Me.txtVRGOut_FilialenNr._TimeOnly_Seconds = False - Me.txtVRGOut_FilialenNr._value = "" - Me.txtVRGOut_FilialenNr._Waehrung = False - Me.txtVRGOut_FilialenNr._WaehrungZeichen = False - Me.txtVRGOut_FilialenNr.ForeColor = System.Drawing.Color.Red - Me.txtVRGOut_FilialenNr.Location = New System.Drawing.Point(398, 176) - Me.txtVRGOut_FilialenNr.MaxLineLength = -1 - Me.txtVRGOut_FilialenNr.MaxLines_Warning = "" - Me.txtVRGOut_FilialenNr.MaxLines_Warning_Label = Nothing - Me.txtVRGOut_FilialenNr.Multiline = True - Me.txtVRGOut_FilialenNr.Name = "txtVRGOut_FilialenNr" - Me.txtVRGOut_FilialenNr.Size = New System.Drawing.Size(56, 21) - Me.txtVRGOut_FilialenNr.TabIndex = 71 - ' - 'txtVRGOut_AbfertigungsNr - ' - Me.txtVRGOut_AbfertigungsNr._DateTimeOnly = False - Me.txtVRGOut_AbfertigungsNr._numbersOnly = False - Me.txtVRGOut_AbfertigungsNr._numbersOnlyKommastellen = "" - Me.txtVRGOut_AbfertigungsNr._numbersOnlyTrennzeichen = True - Me.txtVRGOut_AbfertigungsNr._Prozent = False - Me.txtVRGOut_AbfertigungsNr._ShortDateNew = False - Me.txtVRGOut_AbfertigungsNr._ShortDateOnly = False - Me.txtVRGOut_AbfertigungsNr._TimeOnly = False - Me.txtVRGOut_AbfertigungsNr._TimeOnly_Seconds = False - Me.txtVRGOut_AbfertigungsNr._value = "" - Me.txtVRGOut_AbfertigungsNr._Waehrung = False - Me.txtVRGOut_AbfertigungsNr._WaehrungZeichen = False - Me.txtVRGOut_AbfertigungsNr.ForeColor = System.Drawing.Color.Red - Me.txtVRGOut_AbfertigungsNr.Location = New System.Drawing.Point(453, 176) - Me.txtVRGOut_AbfertigungsNr.MaxLineLength = -1 - Me.txtVRGOut_AbfertigungsNr.MaxLines_Warning = "" - Me.txtVRGOut_AbfertigungsNr.MaxLines_Warning_Label = Nothing - Me.txtVRGOut_AbfertigungsNr.Multiline = True - Me.txtVRGOut_AbfertigungsNr.Name = "txtVRGOut_AbfertigungsNr" - Me.txtVRGOut_AbfertigungsNr.Size = New System.Drawing.Size(137, 21) - Me.txtVRGOut_AbfertigungsNr.TabIndex = 70 - ' - 'MyComboBox2 - ' - Me.MyComboBox2._allowedValuesFreiText = Nothing - Me.MyComboBox2._allowFreiText = False - Me.MyComboBox2._value = "" - Me.MyComboBox2.FormattingEnabled = True - Me.MyComboBox2.Location = New System.Drawing.Point(298, 252) - Me.MyComboBox2.Name = "MyComboBox2" - Me.MyComboBox2.Size = New System.Drawing.Size(62, 21) - Me.MyComboBox2.TabIndex = 64 - ' - 'txtVRGOutEZA_BezugsNr - ' - Me.txtVRGOutEZA_BezugsNr._DateTimeOnly = False - Me.txtVRGOutEZA_BezugsNr._numbersOnly = False - Me.txtVRGOutEZA_BezugsNr._numbersOnlyKommastellen = "" - Me.txtVRGOutEZA_BezugsNr._numbersOnlyTrennzeichen = True - Me.txtVRGOutEZA_BezugsNr._Prozent = False - Me.txtVRGOutEZA_BezugsNr._ShortDateNew = False - Me.txtVRGOutEZA_BezugsNr._ShortDateOnly = False - Me.txtVRGOutEZA_BezugsNr._TimeOnly = False - Me.txtVRGOutEZA_BezugsNr._TimeOnly_Seconds = False - Me.txtVRGOutEZA_BezugsNr._value = "" - Me.txtVRGOutEZA_BezugsNr._Waehrung = False - Me.txtVRGOutEZA_BezugsNr._WaehrungZeichen = False - Me.txtVRGOutEZA_BezugsNr.ForeColor = System.Drawing.Color.Red - Me.txtVRGOutEZA_BezugsNr.Location = New System.Drawing.Point(359, 252) - Me.txtVRGOutEZA_BezugsNr.MaxLineLength = -1 - Me.txtVRGOutEZA_BezugsNr.MaxLines_Warning = "" - Me.txtVRGOutEZA_BezugsNr.MaxLines_Warning_Label = Nothing - Me.txtVRGOutEZA_BezugsNr.Multiline = True - Me.txtVRGOutEZA_BezugsNr.Name = "txtVRGOutEZA_BezugsNr" - Me.txtVRGOutEZA_BezugsNr.Size = New System.Drawing.Size(153, 21) - Me.txtVRGOutEZA_BezugsNr.TabIndex = 65 - ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(298, 62) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(62, 21) - Me.MyComboBox1.TabIndex = 4 - ' - 'txtVRGOut_BezugsNr - ' - Me.txtVRGOut_BezugsNr._DateTimeOnly = False - Me.txtVRGOut_BezugsNr._numbersOnly = False - Me.txtVRGOut_BezugsNr._numbersOnlyKommastellen = "" - Me.txtVRGOut_BezugsNr._numbersOnlyTrennzeichen = True - Me.txtVRGOut_BezugsNr._Prozent = False - Me.txtVRGOut_BezugsNr._ShortDateNew = False - Me.txtVRGOut_BezugsNr._ShortDateOnly = False - Me.txtVRGOut_BezugsNr._TimeOnly = False - Me.txtVRGOut_BezugsNr._TimeOnly_Seconds = False - Me.txtVRGOut_BezugsNr._value = "" - Me.txtVRGOut_BezugsNr._Waehrung = False - Me.txtVRGOut_BezugsNr._WaehrungZeichen = False - Me.txtVRGOut_BezugsNr.ForeColor = System.Drawing.Color.Red - Me.txtVRGOut_BezugsNr.Location = New System.Drawing.Point(359, 62) - Me.txtVRGOut_BezugsNr.MaxLineLength = -1 - Me.txtVRGOut_BezugsNr.MaxLines_Warning = "" - Me.txtVRGOut_BezugsNr.MaxLines_Warning_Label = Nothing - Me.txtVRGOut_BezugsNr.Name = "txtVRGOut_BezugsNr" - Me.txtVRGOut_BezugsNr.Size = New System.Drawing.Size(153, 20) - Me.txtVRGOut_BezugsNr.TabIndex = 5 - ' 'TabPage3 ' Me.TabPage3.Controls.Add(Me.LinkLabel50) @@ -2005,7 +1697,7 @@ Partial Class frmStartOptions Me.TabPage3.Controls.Add(Me.Label11) Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(851, 476) + Me.TabPage3.Size = New System.Drawing.Size(1158, 476) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Partner-Systeme" Me.TabPage3.UseVisualStyleBackColor = True @@ -2148,6 +1840,12 @@ Partial Class frmStartOptions ' 'TabPage4 ' + Me.TabPage4.Controls.Add(Me.cbxUploadDA) + Me.TabPage4.Controls.Add(Me.txtBatchNr) + Me.TabPage4.Controls.Add(Me.Label5) + Me.TabPage4.Controls.Add(Me.LinkLabel23) + Me.TabPage4.Controls.Add(Me.LinkLabel24) + Me.TabPage4.Controls.Add(Me.cbxMSEBatchNr) Me.TabPage4.Controls.Add(Me.cbxOnlyBilledTransactions) Me.TabPage4.Controls.Add(Me.LinkLabel62) Me.TabPage4.Controls.Add(Me.LinkLabel60) @@ -2159,7 +1857,6 @@ Partial Class frmStartOptions Me.TabPage4.Controls.Add(Me.Label38) Me.TabPage4.Controls.Add(Me.Label37) Me.TabPage4.Controls.Add(Me.LinkLabel58) - Me.TabPage4.Controls.Add(Me.txtBatchNr) Me.TabPage4.Controls.Add(Me.LinkLabel57) Me.TabPage4.Controls.Add(Me.DateTimePicker2) Me.TabPage4.Controls.Add(Me.DateTimePicker1) @@ -2202,11 +1899,57 @@ Partial Class frmStartOptions Me.TabPage4.Controls.Add(Me.txtTWLNr) Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Size = New System.Drawing.Size(851, 476) + Me.TabPage4.Size = New System.Drawing.Size(1158, 476) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "VERAG 360" Me.TabPage4.UseVisualStyleBackColor = True ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label5.ForeColor = System.Drawing.Color.Red + Me.Label5.Location = New System.Drawing.Point(879, 39) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(56, 16) + Me.Label5.TabIndex = 126 + Me.Label5.Text = "PLOSE" + ' + 'LinkLabel23 + ' + Me.LinkLabel23.AutoSize = True + Me.LinkLabel23.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel23.Location = New System.Drawing.Point(879, 117) + Me.LinkLabel23.Name = "LinkLabel23" + Me.LinkLabel23.Size = New System.Drawing.Size(180, 13) + Me.LinkLabel23.TabIndex = 125 + Me.LinkLabel23.TabStop = True + Me.LinkLabel23.Text = "Eingangsnachrichten abrufen PROD" + ' + 'LinkLabel24 + ' + Me.LinkLabel24.AutoSize = True + Me.LinkLabel24.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel24.Location = New System.Drawing.Point(879, 92) + Me.LinkLabel24.Name = "LinkLabel24" + Me.LinkLabel24.Size = New System.Drawing.Size(177, 13) + Me.LinkLabel24.TabIndex = 124 + Me.LinkLabel24.TabStop = True + Me.LinkLabel24.Text = "Eingangsnachrichten abrufen TEST" + ' + 'cbxOnlyBilledTransactions + ' + Me.cbxOnlyBilledTransactions.AutoSize = True + Me.cbxOnlyBilledTransactions.Checked = True + Me.cbxOnlyBilledTransactions.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxOnlyBilledTransactions.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxOnlyBilledTransactions.Location = New System.Drawing.Point(670, 84) + Me.cbxOnlyBilledTransactions.Name = "cbxOnlyBilledTransactions" + Me.cbxOnlyBilledTransactions.Size = New System.Drawing.Size(172, 17) + Me.cbxOnlyBilledTransactions.TabIndex = 121 + Me.cbxOnlyBilledTransactions.Text = "nur verrechnete Transaktionen" + Me.cbxOnlyBilledTransactions.UseVisualStyleBackColor = True + ' 'LinkLabel62 ' Me.LinkLabel62.AutoSize = True @@ -2250,33 +1993,6 @@ Partial Class frmStartOptions Me.Label40.TabIndex = 116 Me.Label40.Text = "ID" ' - 'txtTransactionID - ' - Me.txtTransactionID._DateTimeOnly = False - Me.txtTransactionID._numbersOnly = True - Me.txtTransactionID._numbersOnlyKommastellen = "" - Me.txtTransactionID._numbersOnlyTrennzeichen = False - Me.txtTransactionID._Prozent = False - Me.txtTransactionID._ShortDateNew = False - Me.txtTransactionID._ShortDateOnly = False - Me.txtTransactionID._TimeOnly = False - Me.txtTransactionID._TimeOnly_Seconds = False - Me.txtTransactionID._value = "" - Me.txtTransactionID._Waehrung = False - Me.txtTransactionID._WaehrungZeichen = True - Me.txtTransactionID.BackColor = System.Drawing.SystemColors.Window - Me.txtTransactionID.ForeColor = System.Drawing.Color.Black - Me.txtTransactionID.Location = New System.Drawing.Point(691, 232) - Me.txtTransactionID.MaxLength = 10 - Me.txtTransactionID.MaxLineLength = -1 - Me.txtTransactionID.MaxLines_Warning = "" - Me.txtTransactionID.MaxLines_Warning_Label = Nothing - Me.txtTransactionID.Name = "txtTransactionID" - Me.txtTransactionID.Size = New System.Drawing.Size(85, 20) - Me.txtTransactionID.TabIndex = 115 - Me.txtTransactionID.Text = "1001723285" - Me.txtTransactionID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - ' 'LinkLabel59 ' Me.LinkLabel59.AutoSize = True @@ -2329,33 +2045,6 @@ Partial Class frmStartOptions Me.LinkLabel58.TabStop = True Me.LinkLabel58.Text = "Neueste Kunden abrufen" ' - 'txtBatchNr - ' - Me.txtBatchNr._DateTimeOnly = False - Me.txtBatchNr._numbersOnly = True - Me.txtBatchNr._numbersOnlyKommastellen = "" - Me.txtBatchNr._numbersOnlyTrennzeichen = False - Me.txtBatchNr._Prozent = False - Me.txtBatchNr._ShortDateNew = False - Me.txtBatchNr._ShortDateOnly = False - Me.txtBatchNr._TimeOnly = False - Me.txtBatchNr._TimeOnly_Seconds = False - Me.txtBatchNr._value = "" - Me.txtBatchNr._Waehrung = False - Me.txtBatchNr._WaehrungZeichen = True - Me.txtBatchNr.BackColor = System.Drawing.SystemColors.Window - Me.txtBatchNr.ForeColor = System.Drawing.Color.Black - Me.txtBatchNr.Location = New System.Drawing.Point(666, 182) - Me.txtBatchNr.MaxLength = 3 - Me.txtBatchNr.MaxLineLength = -1 - Me.txtBatchNr.MaxLines_Warning = "" - Me.txtBatchNr.MaxLines_Warning_Label = Nothing - Me.txtBatchNr.Name = "txtBatchNr" - Me.txtBatchNr.Size = New System.Drawing.Size(30, 20) - Me.txtBatchNr.TabIndex = 109 - Me.txtBatchNr.Text = "0" - Me.txtBatchNr.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - ' 'LinkLabel57 ' Me.LinkLabel57.AutoSize = True @@ -2749,65 +2438,6 @@ Partial Class frmStartOptions Me.Label24.TabIndex = 30 Me.Label24.Text = "Import" ' - 'cbxRMC - ' - Me.cbxRMC._allowedValuesFreiText = Nothing - Me.cbxRMC._allowFreiText = False - Me.cbxRMC._value = "" - Me.cbxRMC.FormattingEnabled = True - Me.cbxRMC.Location = New System.Drawing.Point(241, 168) - Me.cbxRMC.Name = "cbxRMC" - Me.cbxRMC.Size = New System.Drawing.Size(80, 21) - Me.cbxRMC.TabIndex = 90 - ' - 'txtTBLNr - ' - Me.txtTBLNr._DateTimeOnly = False - Me.txtTBLNr._numbersOnly = True - Me.txtTBLNr._numbersOnlyKommastellen = "" - Me.txtTBLNr._numbersOnlyTrennzeichen = False - Me.txtTBLNr._Prozent = False - Me.txtTBLNr._ShortDateNew = False - Me.txtTBLNr._ShortDateOnly = False - Me.txtTBLNr._TimeOnly = False - Me.txtTBLNr._TimeOnly_Seconds = False - Me.txtTBLNr._value = "" - Me.txtTBLNr._Waehrung = False - Me.txtTBLNr._WaehrungZeichen = True - Me.txtTBLNr.ForeColor = System.Drawing.Color.Red - Me.txtTBLNr.Location = New System.Drawing.Point(165, 246) - Me.txtTBLNr.MaxLineLength = -1 - Me.txtTBLNr.MaxLines_Warning = "" - Me.txtTBLNr.MaxLines_Warning_Label = Nothing - Me.txtTBLNr.Name = "txtTBLNr" - Me.txtTBLNr.ReadOnly = True - Me.txtTBLNr.Size = New System.Drawing.Size(53, 20) - Me.txtTBLNr.TabIndex = 79 - ' - 'txtTWLNr - ' - Me.txtTWLNr._DateTimeOnly = False - Me.txtTWLNr._numbersOnly = True - Me.txtTWLNr._numbersOnlyKommastellen = "" - Me.txtTWLNr._numbersOnlyTrennzeichen = False - Me.txtTWLNr._Prozent = False - Me.txtTWLNr._ShortDateNew = False - Me.txtTWLNr._ShortDateOnly = False - Me.txtTWLNr._TimeOnly = False - Me.txtTWLNr._TimeOnly_Seconds = False - Me.txtTWLNr._value = "" - Me.txtTWLNr._Waehrung = False - Me.txtTWLNr._WaehrungZeichen = True - Me.txtTWLNr.ForeColor = System.Drawing.Color.Red - Me.txtTWLNr.Location = New System.Drawing.Point(165, 218) - Me.txtTWLNr.MaxLineLength = -1 - Me.txtTWLNr.MaxLines_Warning = "" - Me.txtTWLNr.MaxLines_Warning_Label = Nothing - Me.txtTWLNr.Name = "txtTWLNr" - Me.txtTWLNr.ReadOnly = True - Me.txtTWLNr.Size = New System.Drawing.Size(53, 20) - Me.txtTWLNr.TabIndex = 78 - ' 'CheckBox2 ' Me.CheckBox2.AutoSize = True @@ -2886,30 +2516,6 @@ Partial Class frmStartOptions Me.Label3.TabIndex = 14 Me.Label3.Text = "Routine Manager IMEX" ' - 'MyTextBox1 - ' - Me.MyTextBox1._DateTimeOnly = False - Me.MyTextBox1._numbersOnly = True - Me.MyTextBox1._numbersOnlyKommastellen = "" - Me.MyTextBox1._numbersOnlyTrennzeichen = True - Me.MyTextBox1._Prozent = False - Me.MyTextBox1._ShortDateNew = False - Me.MyTextBox1._ShortDateOnly = False - Me.MyTextBox1._TimeOnly = False - Me.MyTextBox1._TimeOnly_Seconds = False - Me.MyTextBox1._value = "100000" - Me.MyTextBox1._Waehrung = False - Me.MyTextBox1._WaehrungZeichen = True - Me.MyTextBox1.ForeColor = System.Drawing.Color.Black - Me.MyTextBox1.Location = New System.Drawing.Point(151, 132) - Me.MyTextBox1.MaxLineLength = -1 - Me.MyTextBox1.MaxLines_Warning = "" - Me.MyTextBox1.MaxLines_Warning_Label = Nothing - Me.MyTextBox1.Name = "MyTextBox1" - Me.MyTextBox1.Size = New System.Drawing.Size(53, 20) - Me.MyTextBox1.TabIndex = 11 - Me.MyTextBox1.Text = "100000" - ' 'PictureBox12 ' Me.PictureBox12.BackgroundImage = CType(resources.GetObject("PictureBox12.BackgroundImage"), System.Drawing.Image) @@ -3016,7 +2622,7 @@ Partial Class frmStartOptions Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btn.ForeColor = System.Drawing.Color.White - Me.btn.Location = New System.Drawing.Point(786, -1) + Me.btn.Location = New System.Drawing.Point(1093, -1) Me.btn.Margin = New System.Windows.Forms.Padding(0) Me.btn.Name = "btn" Me.btn.Size = New System.Drawing.Size(75, 22) @@ -3078,6 +2684,442 @@ Partial Class frmStartOptions Me.lblRoutineManager.TabIndex = 1 Me.lblRoutineManager.Text = "Routine Manager" ' + 'Button21 + ' + Me.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button21.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button21.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button21.Location = New System.Drawing.Point(581, 346) + Me.Button21.Name = "Button21" + Me.Button21.Size = New System.Drawing.Size(211, 24) + Me.Button21.TabIndex = 81 + Me.Button21.Text = "AAS Sendung 24h" + Me.Button21.UseVisualStyleBackColor = True + ' + 'MyTextBox3 + ' + Me.MyTextBox3._DateTimeOnly = False + Me.MyTextBox3._numbersOnly = True + Me.MyTextBox3._numbersOnlyKommastellen = "" + Me.MyTextBox3._numbersOnlyTrennzeichen = True + Me.MyTextBox3._Prozent = False + Me.MyTextBox3._ShortDateNew = False + Me.MyTextBox3._ShortDateOnly = False + Me.MyTextBox3._TimeOnly = False + Me.MyTextBox3._TimeOnly_Seconds = False + Me.MyTextBox3._value = "" + Me.MyTextBox3._Waehrung = False + Me.MyTextBox3._WaehrungZeichen = True + Me.MyTextBox3.ForeColor = System.Drawing.Color.Red + Me.MyTextBox3.Location = New System.Drawing.Point(127, 208) + Me.MyTextBox3.MaxLineLength = -1 + Me.MyTextBox3.MaxLines_Warning = "" + Me.MyTextBox3.MaxLines_Warning_Label = Nothing + Me.MyTextBox3.Name = "MyTextBox3" + Me.MyTextBox3.Size = New System.Drawing.Size(53, 20) + Me.MyTextBox3.TabIndex = 86 + ' + 'MyTextBox2 + ' + Me.MyTextBox2._DateTimeOnly = False + Me.MyTextBox2._numbersOnly = True + Me.MyTextBox2._numbersOnlyKommastellen = "" + Me.MyTextBox2._numbersOnlyTrennzeichen = True + Me.MyTextBox2._Prozent = False + Me.MyTextBox2._ShortDateNew = False + Me.MyTextBox2._ShortDateOnly = False + Me.MyTextBox2._TimeOnly = False + Me.MyTextBox2._TimeOnly_Seconds = False + Me.MyTextBox2._value = "" + Me.MyTextBox2._Waehrung = False + Me.MyTextBox2._WaehrungZeichen = True + Me.MyTextBox2.ForeColor = System.Drawing.Color.Red + Me.MyTextBox2.Location = New System.Drawing.Point(151, 152) + Me.MyTextBox2.MaxLineLength = -1 + Me.MyTextBox2.MaxLines_Warning = "" + Me.MyTextBox2.MaxLines_Warning_Label = Nothing + Me.MyTextBox2.Name = "MyTextBox2" + Me.MyTextBox2.Size = New System.Drawing.Size(53, 20) + Me.MyTextBox2.TabIndex = 63 + ' + 'txtSyskaWdhDateiname + ' + Me.txtSyskaWdhDateiname._DateTimeOnly = False + Me.txtSyskaWdhDateiname._numbersOnly = False + Me.txtSyskaWdhDateiname._numbersOnlyKommastellen = "" + Me.txtSyskaWdhDateiname._numbersOnlyTrennzeichen = True + Me.txtSyskaWdhDateiname._Prozent = False + Me.txtSyskaWdhDateiname._ShortDateNew = False + Me.txtSyskaWdhDateiname._ShortDateOnly = False + Me.txtSyskaWdhDateiname._TimeOnly = False + Me.txtSyskaWdhDateiname._TimeOnly_Seconds = False + Me.txtSyskaWdhDateiname._value = "" + Me.txtSyskaWdhDateiname._Waehrung = False + Me.txtSyskaWdhDateiname._WaehrungZeichen = True + Me.txtSyskaWdhDateiname.ForeColor = System.Drawing.Color.Black + Me.txtSyskaWdhDateiname.Location = New System.Drawing.Point(692, 318) + Me.txtSyskaWdhDateiname.MaxLength = 50 + Me.txtSyskaWdhDateiname.MaxLineLength = -1 + Me.txtSyskaWdhDateiname.MaxLines_Warning = "" + Me.txtSyskaWdhDateiname.MaxLines_Warning_Label = Nothing + Me.txtSyskaWdhDateiname.Name = "txtSyskaWdhDateiname" + Me.txtSyskaWdhDateiname.Size = New System.Drawing.Size(136, 20) + Me.txtSyskaWdhDateiname.TabIndex = 58 + ' + 'txtEZOLLAnhDat + ' + Me.txtEZOLLAnhDat._DateTimeOnly = False + Me.txtEZOLLAnhDat._numbersOnly = False + Me.txtEZOLLAnhDat._numbersOnlyKommastellen = "" + Me.txtEZOLLAnhDat._numbersOnlyTrennzeichen = True + Me.txtEZOLLAnhDat._Prozent = False + Me.txtEZOLLAnhDat._ShortDateNew = True + Me.txtEZOLLAnhDat._ShortDateOnly = False + Me.txtEZOLLAnhDat._TimeOnly = False + Me.txtEZOLLAnhDat._TimeOnly_Seconds = False + Me.txtEZOLLAnhDat._value = "" + Me.txtEZOLLAnhDat._Waehrung = False + Me.txtEZOLLAnhDat._WaehrungZeichen = True + Me.txtEZOLLAnhDat.ForeColor = System.Drawing.Color.Black + Me.txtEZOLLAnhDat.Location = New System.Drawing.Point(408, 190) + Me.txtEZOLLAnhDat.MaxLength = 10 + Me.txtEZOLLAnhDat.MaxLineLength = -1 + Me.txtEZOLLAnhDat.MaxLines_Warning = "" + Me.txtEZOLLAnhDat.MaxLines_Warning_Label = Nothing + Me.txtEZOLLAnhDat.Name = "txtEZOLLAnhDat" + Me.txtEZOLLAnhDat.Size = New System.Drawing.Size(87, 20) + Me.txtEZOLLAnhDat.TabIndex = 55 + ' + 'cboSYSKAFirma + ' + Me.cboSYSKAFirma._allowedValuesFreiText = Nothing + Me.cboSYSKAFirma._allowFreiText = False + Me.cboSYSKAFirma._value = "" + Me.cboSYSKAFirma.FormattingEnabled = True + Me.cboSYSKAFirma.Location = New System.Drawing.Point(564, 299) + Me.cboSYSKAFirma.Name = "cboSYSKAFirma" + Me.cboSYSKAFirma.Size = New System.Drawing.Size(129, 21) + Me.cboSYSKAFirma.TabIndex = 51 + ' + 'cboBMDUnispedFirma + ' + Me.cboBMDUnispedFirma._allowedValuesFreiText = Nothing + Me.cboBMDUnispedFirma._allowFreiText = False + Me.cboBMDUnispedFirma._value = "" + Me.cboBMDUnispedFirma.FormattingEnabled = True + Me.cboBMDUnispedFirma.Location = New System.Drawing.Point(268, 276) + Me.cboBMDUnispedFirma.Name = "cboBMDUnispedFirma" + Me.cboBMDUnispedFirma.Size = New System.Drawing.Size(124, 21) + Me.cboBMDUnispedFirma.TabIndex = 42 + ' + 'dgvMRN + ' + Me.dgvMRN.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvMRN.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvMRN.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnMRN}) + Me.dgvMRN.Location = New System.Drawing.Point(637, 63) + Me.dgvMRN.Name = "dgvMRN" + Me.dgvMRN.RowHeadersWidth = 62 + Me.dgvMRN.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvMRN.Size = New System.Drawing.Size(207, 134) + Me.dgvMRN.TabIndex = 75 + ' + 'clmnMRN + ' + Me.clmnMRN.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.clmnMRN.HeaderText = "MRN" + Me.clmnMRN.MinimumWidth = 8 + Me.clmnMRN.Name = "clmnMRN" + ' + 'txtVRGOut_MRN + ' + Me.txtVRGOut_MRN._DateTimeOnly = False + Me.txtVRGOut_MRN._numbersOnly = False + Me.txtVRGOut_MRN._numbersOnlyKommastellen = "" + Me.txtVRGOut_MRN._numbersOnlyTrennzeichen = True + Me.txtVRGOut_MRN._Prozent = False + Me.txtVRGOut_MRN._ShortDateNew = False + Me.txtVRGOut_MRN._ShortDateOnly = False + Me.txtVRGOut_MRN._TimeOnly = False + Me.txtVRGOut_MRN._TimeOnly_Seconds = False + Me.txtVRGOut_MRN._value = "" + Me.txtVRGOut_MRN._Waehrung = False + Me.txtVRGOut_MRN._WaehrungZeichen = False + Me.txtVRGOut_MRN.ForeColor = System.Drawing.Color.Red + Me.txtVRGOut_MRN.Location = New System.Drawing.Point(359, 84) + Me.txtVRGOut_MRN.MaxLineLength = -1 + Me.txtVRGOut_MRN.MaxLines_Warning = "" + Me.txtVRGOut_MRN.MaxLines_Warning_Label = Nothing + Me.txtVRGOut_MRN.Name = "txtVRGOut_MRN" + Me.txtVRGOut_MRN.Size = New System.Drawing.Size(153, 20) + Me.txtVRGOut_MRN.TabIndex = 73 + ' + 'txtVRGOut_FilialenNr + ' + Me.txtVRGOut_FilialenNr._DateTimeOnly = False + Me.txtVRGOut_FilialenNr._numbersOnly = False + Me.txtVRGOut_FilialenNr._numbersOnlyKommastellen = "" + Me.txtVRGOut_FilialenNr._numbersOnlyTrennzeichen = True + Me.txtVRGOut_FilialenNr._Prozent = False + Me.txtVRGOut_FilialenNr._ShortDateNew = False + Me.txtVRGOut_FilialenNr._ShortDateOnly = False + Me.txtVRGOut_FilialenNr._TimeOnly = False + Me.txtVRGOut_FilialenNr._TimeOnly_Seconds = False + Me.txtVRGOut_FilialenNr._value = "" + Me.txtVRGOut_FilialenNr._Waehrung = False + Me.txtVRGOut_FilialenNr._WaehrungZeichen = False + Me.txtVRGOut_FilialenNr.ForeColor = System.Drawing.Color.Red + Me.txtVRGOut_FilialenNr.Location = New System.Drawing.Point(398, 176) + Me.txtVRGOut_FilialenNr.MaxLineLength = -1 + Me.txtVRGOut_FilialenNr.MaxLines_Warning = "" + Me.txtVRGOut_FilialenNr.MaxLines_Warning_Label = Nothing + Me.txtVRGOut_FilialenNr.Multiline = True + Me.txtVRGOut_FilialenNr.Name = "txtVRGOut_FilialenNr" + Me.txtVRGOut_FilialenNr.Size = New System.Drawing.Size(56, 21) + Me.txtVRGOut_FilialenNr.TabIndex = 71 + ' + 'txtVRGOut_AbfertigungsNr + ' + Me.txtVRGOut_AbfertigungsNr._DateTimeOnly = False + Me.txtVRGOut_AbfertigungsNr._numbersOnly = False + Me.txtVRGOut_AbfertigungsNr._numbersOnlyKommastellen = "" + Me.txtVRGOut_AbfertigungsNr._numbersOnlyTrennzeichen = True + Me.txtVRGOut_AbfertigungsNr._Prozent = False + Me.txtVRGOut_AbfertigungsNr._ShortDateNew = False + Me.txtVRGOut_AbfertigungsNr._ShortDateOnly = False + Me.txtVRGOut_AbfertigungsNr._TimeOnly = False + Me.txtVRGOut_AbfertigungsNr._TimeOnly_Seconds = False + Me.txtVRGOut_AbfertigungsNr._value = "" + Me.txtVRGOut_AbfertigungsNr._Waehrung = False + Me.txtVRGOut_AbfertigungsNr._WaehrungZeichen = False + Me.txtVRGOut_AbfertigungsNr.ForeColor = System.Drawing.Color.Red + Me.txtVRGOut_AbfertigungsNr.Location = New System.Drawing.Point(453, 176) + Me.txtVRGOut_AbfertigungsNr.MaxLineLength = -1 + Me.txtVRGOut_AbfertigungsNr.MaxLines_Warning = "" + Me.txtVRGOut_AbfertigungsNr.MaxLines_Warning_Label = Nothing + Me.txtVRGOut_AbfertigungsNr.Multiline = True + Me.txtVRGOut_AbfertigungsNr.Name = "txtVRGOut_AbfertigungsNr" + Me.txtVRGOut_AbfertigungsNr.Size = New System.Drawing.Size(137, 21) + Me.txtVRGOut_AbfertigungsNr.TabIndex = 70 + ' + 'MyComboBox2 + ' + Me.MyComboBox2._allowedValuesFreiText = Nothing + Me.MyComboBox2._allowFreiText = False + Me.MyComboBox2._value = "" + Me.MyComboBox2.FormattingEnabled = True + Me.MyComboBox2.Location = New System.Drawing.Point(298, 252) + Me.MyComboBox2.Name = "MyComboBox2" + Me.MyComboBox2.Size = New System.Drawing.Size(62, 21) + Me.MyComboBox2.TabIndex = 64 + ' + 'txtVRGOutEZA_BezugsNr + ' + Me.txtVRGOutEZA_BezugsNr._DateTimeOnly = False + Me.txtVRGOutEZA_BezugsNr._numbersOnly = False + Me.txtVRGOutEZA_BezugsNr._numbersOnlyKommastellen = "" + Me.txtVRGOutEZA_BezugsNr._numbersOnlyTrennzeichen = True + Me.txtVRGOutEZA_BezugsNr._Prozent = False + Me.txtVRGOutEZA_BezugsNr._ShortDateNew = False + Me.txtVRGOutEZA_BezugsNr._ShortDateOnly = False + Me.txtVRGOutEZA_BezugsNr._TimeOnly = False + Me.txtVRGOutEZA_BezugsNr._TimeOnly_Seconds = False + Me.txtVRGOutEZA_BezugsNr._value = "" + Me.txtVRGOutEZA_BezugsNr._Waehrung = False + Me.txtVRGOutEZA_BezugsNr._WaehrungZeichen = False + Me.txtVRGOutEZA_BezugsNr.ForeColor = System.Drawing.Color.Red + Me.txtVRGOutEZA_BezugsNr.Location = New System.Drawing.Point(359, 252) + Me.txtVRGOutEZA_BezugsNr.MaxLineLength = -1 + Me.txtVRGOutEZA_BezugsNr.MaxLines_Warning = "" + Me.txtVRGOutEZA_BezugsNr.MaxLines_Warning_Label = Nothing + Me.txtVRGOutEZA_BezugsNr.Multiline = True + Me.txtVRGOutEZA_BezugsNr.Name = "txtVRGOutEZA_BezugsNr" + Me.txtVRGOutEZA_BezugsNr.Size = New System.Drawing.Size(153, 21) + Me.txtVRGOutEZA_BezugsNr.TabIndex = 65 + ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.Location = New System.Drawing.Point(298, 62) + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(62, 21) + Me.MyComboBox1.TabIndex = 4 + ' + 'txtVRGOut_BezugsNr + ' + Me.txtVRGOut_BezugsNr._DateTimeOnly = False + Me.txtVRGOut_BezugsNr._numbersOnly = False + Me.txtVRGOut_BezugsNr._numbersOnlyKommastellen = "" + Me.txtVRGOut_BezugsNr._numbersOnlyTrennzeichen = True + Me.txtVRGOut_BezugsNr._Prozent = False + Me.txtVRGOut_BezugsNr._ShortDateNew = False + Me.txtVRGOut_BezugsNr._ShortDateOnly = False + Me.txtVRGOut_BezugsNr._TimeOnly = False + Me.txtVRGOut_BezugsNr._TimeOnly_Seconds = False + Me.txtVRGOut_BezugsNr._value = "" + Me.txtVRGOut_BezugsNr._Waehrung = False + Me.txtVRGOut_BezugsNr._WaehrungZeichen = False + Me.txtVRGOut_BezugsNr.ForeColor = System.Drawing.Color.Red + Me.txtVRGOut_BezugsNr.Location = New System.Drawing.Point(359, 62) + Me.txtVRGOut_BezugsNr.MaxLineLength = -1 + Me.txtVRGOut_BezugsNr.MaxLines_Warning = "" + Me.txtVRGOut_BezugsNr.MaxLines_Warning_Label = Nothing + Me.txtVRGOut_BezugsNr.Name = "txtVRGOut_BezugsNr" + Me.txtVRGOut_BezugsNr.Size = New System.Drawing.Size(153, 20) + Me.txtVRGOut_BezugsNr.TabIndex = 5 + ' + 'txtBatchNr + ' + Me.txtBatchNr._DateTimeOnly = False + Me.txtBatchNr._numbersOnly = True + Me.txtBatchNr._numbersOnlyKommastellen = "" + Me.txtBatchNr._numbersOnlyTrennzeichen = False + Me.txtBatchNr._Prozent = False + Me.txtBatchNr._ShortDateNew = False + Me.txtBatchNr._ShortDateOnly = False + Me.txtBatchNr._TimeOnly = False + Me.txtBatchNr._TimeOnly_Seconds = False + Me.txtBatchNr._value = "" + Me.txtBatchNr._Waehrung = False + Me.txtBatchNr._WaehrungZeichen = True + Me.txtBatchNr.BackColor = System.Drawing.SystemColors.Window + Me.txtBatchNr.ForeColor = System.Drawing.Color.Red + Me.txtBatchNr.Location = New System.Drawing.Point(721, 181) + Me.txtBatchNr.MaxLength = 10 + Me.txtBatchNr.MaxLineLength = -1 + Me.txtBatchNr.MaxLines_Warning = "" + Me.txtBatchNr.MaxLines_Warning_Label = Nothing + Me.txtBatchNr.Name = "txtBatchNr" + Me.txtBatchNr.Size = New System.Drawing.Size(36, 20) + Me.txtBatchNr.TabIndex = 127 + Me.txtBatchNr.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + ' + 'cbxMSEBatchNr + ' + Me.cbxMSEBatchNr._allowedValuesFreiText = Nothing + Me.cbxMSEBatchNr._allowFreiText = True + Me.cbxMSEBatchNr._value = "" + Me.cbxMSEBatchNr.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cbxMSEBatchNr.DropDownWidth = 20 + Me.cbxMSEBatchNr.FormattingEnabled = True + Me.cbxMSEBatchNr.Location = New System.Drawing.Point(670, 181) + Me.cbxMSEBatchNr.Name = "cbxMSEBatchNr" + Me.cbxMSEBatchNr.Size = New System.Drawing.Size(44, 21) + Me.cbxMSEBatchNr.TabIndex = 122 + ' + 'txtTransactionID + ' + Me.txtTransactionID._DateTimeOnly = False + Me.txtTransactionID._numbersOnly = True + Me.txtTransactionID._numbersOnlyKommastellen = "" + Me.txtTransactionID._numbersOnlyTrennzeichen = False + Me.txtTransactionID._Prozent = False + Me.txtTransactionID._ShortDateNew = False + Me.txtTransactionID._ShortDateOnly = False + Me.txtTransactionID._TimeOnly = False + Me.txtTransactionID._TimeOnly_Seconds = False + Me.txtTransactionID._value = "" + Me.txtTransactionID._Waehrung = False + Me.txtTransactionID._WaehrungZeichen = True + Me.txtTransactionID.BackColor = System.Drawing.SystemColors.Window + Me.txtTransactionID.ForeColor = System.Drawing.Color.Black + Me.txtTransactionID.Location = New System.Drawing.Point(691, 232) + Me.txtTransactionID.MaxLength = 10 + Me.txtTransactionID.MaxLineLength = -1 + Me.txtTransactionID.MaxLines_Warning = "" + Me.txtTransactionID.MaxLines_Warning_Label = Nothing + Me.txtTransactionID.Name = "txtTransactionID" + Me.txtTransactionID.Size = New System.Drawing.Size(85, 20) + Me.txtTransactionID.TabIndex = 115 + Me.txtTransactionID.Text = "1001723285" + Me.txtTransactionID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + ' + 'cbxRMC + ' + Me.cbxRMC._allowedValuesFreiText = Nothing + Me.cbxRMC._allowFreiText = False + Me.cbxRMC._value = "" + Me.cbxRMC.FormattingEnabled = True + Me.cbxRMC.Location = New System.Drawing.Point(241, 168) + Me.cbxRMC.Name = "cbxRMC" + Me.cbxRMC.Size = New System.Drawing.Size(80, 21) + Me.cbxRMC.TabIndex = 90 + ' + 'txtTBLNr + ' + Me.txtTBLNr._DateTimeOnly = False + Me.txtTBLNr._numbersOnly = True + Me.txtTBLNr._numbersOnlyKommastellen = "" + Me.txtTBLNr._numbersOnlyTrennzeichen = False + Me.txtTBLNr._Prozent = False + Me.txtTBLNr._ShortDateNew = False + Me.txtTBLNr._ShortDateOnly = False + Me.txtTBLNr._TimeOnly = False + Me.txtTBLNr._TimeOnly_Seconds = False + Me.txtTBLNr._value = "" + Me.txtTBLNr._Waehrung = False + Me.txtTBLNr._WaehrungZeichen = True + Me.txtTBLNr.ForeColor = System.Drawing.Color.Red + Me.txtTBLNr.Location = New System.Drawing.Point(165, 246) + Me.txtTBLNr.MaxLineLength = -1 + Me.txtTBLNr.MaxLines_Warning = "" + Me.txtTBLNr.MaxLines_Warning_Label = Nothing + Me.txtTBLNr.Name = "txtTBLNr" + Me.txtTBLNr.ReadOnly = True + Me.txtTBLNr.Size = New System.Drawing.Size(53, 20) + Me.txtTBLNr.TabIndex = 79 + ' + 'txtTWLNr + ' + Me.txtTWLNr._DateTimeOnly = False + Me.txtTWLNr._numbersOnly = True + Me.txtTWLNr._numbersOnlyKommastellen = "" + Me.txtTWLNr._numbersOnlyTrennzeichen = False + Me.txtTWLNr._Prozent = False + Me.txtTWLNr._ShortDateNew = False + Me.txtTWLNr._ShortDateOnly = False + Me.txtTWLNr._TimeOnly = False + Me.txtTWLNr._TimeOnly_Seconds = False + Me.txtTWLNr._value = "" + Me.txtTWLNr._Waehrung = False + Me.txtTWLNr._WaehrungZeichen = True + Me.txtTWLNr.ForeColor = System.Drawing.Color.Red + Me.txtTWLNr.Location = New System.Drawing.Point(165, 218) + Me.txtTWLNr.MaxLineLength = -1 + Me.txtTWLNr.MaxLines_Warning = "" + Me.txtTWLNr.MaxLines_Warning_Label = Nothing + Me.txtTWLNr.Name = "txtTWLNr" + Me.txtTWLNr.ReadOnly = True + Me.txtTWLNr.Size = New System.Drawing.Size(53, 20) + Me.txtTWLNr.TabIndex = 78 + ' + 'MyTextBox1 + ' + Me.MyTextBox1._DateTimeOnly = False + Me.MyTextBox1._numbersOnly = True + Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._numbersOnlyTrennzeichen = True + Me.MyTextBox1._Prozent = False + Me.MyTextBox1._ShortDateNew = False + Me.MyTextBox1._ShortDateOnly = False + Me.MyTextBox1._TimeOnly = False + Me.MyTextBox1._TimeOnly_Seconds = False + Me.MyTextBox1._value = "100000" + Me.MyTextBox1._Waehrung = False + Me.MyTextBox1._WaehrungZeichen = True + Me.MyTextBox1.ForeColor = System.Drawing.Color.Black + Me.MyTextBox1.Location = New System.Drawing.Point(151, 132) + Me.MyTextBox1.MaxLineLength = -1 + Me.MyTextBox1.MaxLines_Warning = "" + Me.MyTextBox1.MaxLines_Warning_Label = Nothing + Me.MyTextBox1.Name = "MyTextBox1" + Me.MyTextBox1.Size = New System.Drawing.Size(53, 20) + Me.MyTextBox1.TabIndex = 11 + Me.MyTextBox1.Text = "100000" + ' 'txtGJ_UNISPED ' Me.txtGJ_UNISPED._DateTimeOnly = False @@ -3102,37 +3144,23 @@ Partial Class frmStartOptions Me.txtGJ_UNISPED.Size = New System.Drawing.Size(53, 20) Me.txtGJ_UNISPED.TabIndex = 68 ' - 'Button21 + 'cbxUploadDA ' - Me.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button21.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button21.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button21.Location = New System.Drawing.Point(581, 346) - Me.Button21.Name = "Button21" - Me.Button21.Size = New System.Drawing.Size(211, 24) - Me.Button21.TabIndex = 81 - Me.Button21.Text = "AAS Sendung 24h" - Me.Button21.UseVisualStyleBackColor = True - ' - 'cbxOnlyBilledTransactions - ' - Me.cbxOnlyBilledTransactions.AutoSize = True - Me.cbxOnlyBilledTransactions.Checked = True - Me.cbxOnlyBilledTransactions.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxOnlyBilledTransactions.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxOnlyBilledTransactions.Location = New System.Drawing.Point(670, 84) - Me.cbxOnlyBilledTransactions.Name = "cbxOnlyBilledTransactions" - Me.cbxOnlyBilledTransactions.Size = New System.Drawing.Size(172, 17) - Me.cbxOnlyBilledTransactions.TabIndex = 121 - Me.cbxOnlyBilledTransactions.Text = "nur verrechnete Transaktionen" - Me.cbxOnlyBilledTransactions.UseVisualStyleBackColor = True + Me.cbxUploadDA.AutoSize = True + Me.cbxUploadDA.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxUploadDA.Location = New System.Drawing.Point(772, 324) + Me.cbxUploadDA.Name = "cbxUploadDA" + Me.cbxUploadDA.Size = New System.Drawing.Size(81, 17) + Me.cbxUploadDA.TabIndex = 128 + Me.cbxUploadDA.Text = "PDF ins DS" + Me.cbxUploadDA.UseVisualStyleBackColor = True ' 'frmStartOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(861, 992) + Me.ClientSize = New System.Drawing.Size(1168, 992) Me.Controls.Add(Me.pnl) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -3166,7 +3194,6 @@ Partial Class frmStartOptions Me.TabPage2.PerformLayout() CType(Me.PictureBox15, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage3.ResumeLayout(False) Me.TabPage3.PerformLayout() Me.TabPage4.ResumeLayout(False) @@ -3178,6 +3205,7 @@ Partial Class frmStartOptions CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -3230,9 +3258,6 @@ Partial Class frmStartOptions Friend WithEvents LinkLabel21 As LinkLabel Friend WithEvents LinkLabel22 As LinkLabel Friend WithEvents Label4 As Label - Friend WithEvents LinkLabel23 As LinkLabel - Friend WithEvents LinkLabel24 As LinkLabel - Friend WithEvents Label5 As Label Friend WithEvents LinkLabel25 As LinkLabel Friend WithEvents CheckBox2 As CheckBox Friend WithEvents PictureBox13 As PictureBox @@ -3390,7 +3415,6 @@ Partial Class frmStartOptions Friend WithEvents LinkLabel56 As LinkLabel Friend WithEvents DateTimePicker2 As DateTimePicker Friend WithEvents DateTimePicker1 As DateTimePicker - Friend WithEvents txtBatchNr As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents LinkLabel57 As LinkLabel Friend WithEvents LinkLabel58 As LinkLabel Friend WithEvents Label40 As Label @@ -3403,4 +3427,10 @@ Partial Class frmStartOptions Friend WithEvents LinkLabel60 As LinkLabel Friend WithEvents LinkLabel62 As LinkLabel Friend WithEvents cbxOnlyBilledTransactions As CheckBox + Friend WithEvents cbxMSEBatchNr As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label5 As Label + Friend WithEvents LinkLabel23 As LinkLabel + Friend WithEvents LinkLabel24 As LinkLabel + Friend WithEvents txtBatchNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents cbxUploadDA As CheckBox End Class diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 628737d..8fdd422 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -520,10 +520,11 @@ Public Class frmStartOptions Case "ABGLEICH_KUNDENUEMSAETZE" VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - Dim lastyears = 2 + Dim lastyears As Integer = 2 If DELETE_Kundenumsaetze(lastyears) Then INSERT_Kundenumsaetze(lastyears) End If + closeMe() Case "AMBAR_VERAG_BUCHUNGEN" VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False @@ -4307,7 +4308,7 @@ Public Class frmStartOptions Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked - txtBatchNr.Text = CInt(SQL.getValueTxtBySql("SELECT max([batch_seq_nr]) FROM [VERAG].[dbo].[tblMSETransactions] ", "FMZOLL",,, 0)) + cbxMSEBatchNr.DataSource = SQL.loadCboBySql("SELECT distinct([batch_seq_nr]) FROM [VERAG].[dbo].[tblMSETransactions]", "FMZOLL") End Sub @@ -4376,7 +4377,6 @@ Public Class frmStartOptions Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) Return False - End Try End Function @@ -4474,7 +4474,7 @@ Public Class frmStartOptions If fehler <> "" Then MsgBox(fehler) Else - fehler = mse.getInvoices(token, invoice, datVon.Value, datVon.Value) + fehler = mse.getInvoices(token, invoice, datVon.Value, datVon.Value, cbxUploadDA.Checked) If fehler <> "" Then MsgBox(fehler) Me.Visible = True @@ -4567,9 +4567,13 @@ Public Class frmStartOptions Private Sub LinkLabel57_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel57.LinkClicked + If txtBatchNr.Text <> "" Then + If Not IsNumeric(txtBatchNr.Text) Then Exit Sub + If CInt(txtBatchNr.Text) < 1 AndAlso CInt(txtBatchNr.Text) > 1000 Then Exit Sub + End If - If Not IsNumeric(txtBatchNr.Text) Then Exit Sub - If CInt(txtBatchNr.Text) < 1 AndAlso CInt(txtBatchNr.Text) > 100 Then Exit Sub + If Not IsNumeric(cbxMSEBatchNr._value) Then Exit Sub + If CInt(cbxMSEBatchNr._value) < 1 AndAlso CInt(cbxMSEBatchNr._value) > 1000 Then Exit Sub Me.Visible = False VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked @@ -4585,7 +4589,7 @@ Public Class frmStartOptions Else Dim totalPages = 1 - Dim batchrequestNr = CInt(txtBatchNr.Text) + Dim batchrequestNr = IIf(txtBatchNr.Text <> "", CInt(txtBatchNr.Text), CInt(cbxMSEBatchNr._value)) fehler = mse.getTransactionsFromBatchNrAndPage(token, transactions, batchrequestNr, totalPages, 0) If fehler <> "" Then @@ -4692,7 +4696,7 @@ Public Class frmStartOptions ElseIf sender Is LinkLabel61 Then - dtTransactionID = SQL.loadDgvBySql("select [transaction_id], CAST(1 AS BIT) as found FROM [VERAG].[dbo].[tblMSESettlements] where [invoice_date] = '" & datVon.Value & "' AND [transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions])", "FMZOLL") + dtTransactionID = SQL.loadDgvBySql("select [transaction_id], CAST(1 AS BIT) as found FROM [VERAG].[dbo].[tblMSESettlements] where [invoice_date] = '" & Date.Parse(datVon.Value).ToShortDateString & "' AND [transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions])", "FMZOLL") If dtTransactionID.Rows.Count = 0 Then MsgBox("Zu diesem Rechnungsdatum gibt es keine Rechnung!") Me.Visible = True