diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb
index 7ce08c1..77df200 100644
--- a/MailSender/MAILSender.vb
+++ b/MailSender/MAILSender.vb
@@ -234,7 +234,7 @@ Module Mail
Dim KdNr As String = "714869"
System.Console.WriteLine("OPTION erkannt: ZF _ Erstellt eine monaltiche Auswertung der DAKSOY-Abfertigungen für ZF.")
System.Console.WriteLine("Auswertung Details gestartet...")
- If SendEmail_ZF("robert.buchbauer@zf.com; christina.eggerl@zf.com; teresa.elster@zf.com", KdNr, von, bis) Then
+ If SendEmail_ZF("robert.buchbauer@zf.com; teresa.elster@zf.com", KdNr, von, bis) Then
System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...")
End If
Case "QS_AUFTEILUNG"
diff --git a/initATLASAufschubkonten/RoutineManager.vbproj b/initATLASAufschubkonten/RoutineManager.vbproj
index 08a615d..449f150 100644
--- a/initATLASAufschubkonten/RoutineManager.vbproj
+++ b/initATLASAufschubkonten/RoutineManager.vbproj
@@ -92,6 +92,9 @@
True
C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Excel\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Excel.dll
+
+ True
+
False
True
diff --git a/initATLASAufschubkonten/cWorker_Verwahrung.vb b/initATLASAufschubkonten/cWorker_Verwahrung.vb
index 5d72a1c..fa6bea7 100644
--- a/initATLASAufschubkonten/cWorker_Verwahrung.vb
+++ b/initATLASAufschubkonten/cWorker_Verwahrung.vb
@@ -1,6 +1,8 @@
Imports System.Globalization
Imports System.IO
Imports System.Xml
+Imports com.sun.org.apache.xpath.internal.operations
+Imports com.sun.tools.doclets.internal.toolkit.util
Imports DAKOSY_Worker
Imports DocumentFormat.OpenXml
Imports DocumentFormat.OpenXml.Spreadsheet
@@ -17,56 +19,137 @@ Public Class cWorker_Verwahrung
Shared Function readVW_SumAVerwahrungsinfo(FORM As frmDYNachrichtenVerarbeitung, d As String) As String
Try
- Dim NCTS As DAKOSY_Worker.ErledigungsmeldungNCTSDE.ErledigungsmeldungMOTyp = DAKOSY_Worker.ErledigungsmeldungNCTSDE.ErledigungsmeldungMOTyp.LoadFromFile(d)
- Dim MRN = ""
- Dim tstmp As Object = Nothing
+ Dim VWI As DAKOSY_Worker.SumAVerwahrungsinfo_009.SumAVerwahrungsinfoSVTyp = DAKOSY_Worker.SumAVerwahrungsinfo_009.SumAVerwahrungsinfoSVTyp.LoadFromFile(d)
+ Dim Vorpapiernummer = ""
+ Dim RegistriernummerATLAS = ""
+ Dim ankungsdatum As Object = Nothing
+ Dim gestellungsdatum As Object = Nothing
readVW_SumAVerwahrungsinfo = ""
- If NCTS IsNot Nothing Then
- If NCTS.EinzelErledigungsmeldung IsNot Nothing Then
- If NCTS.EinzelErledigungsmeldung.ObjektIdentifizierung IsNot Nothing Then
- If NCTS.EinzelErledigungsmeldung.ObjektIdentifizierung.ObjektName IsNot Nothing Then
- readVW_SumAVerwahrungsinfo = NCTS.EinzelErledigungsmeldung.ObjektIdentifizierung.ObjektName
+ If VWI IsNot Nothing Then
+ If VWI.EinzelSumAVerwahrungsinfo IsNot Nothing Then
+ If VWI.EinzelSumAVerwahrungsinfo.ObjektIdentifizierung IsNot Nothing Then
+ If VWI.EinzelSumAVerwahrungsinfo.ObjektIdentifizierung.ObjektName IsNot Nothing Then
+ readVW_SumAVerwahrungsinfo = VWI.EinzelSumAVerwahrungsinfo.ObjektIdentifizierung.ObjektName 'Nur ObjektAntragsart VV (SumA Vorgang) /NE (NCTS-Vorgang )
End If
End If
- If NCTS.EinzelErledigungsmeldung.KopfDaten IsNot Nothing Then
- If NCTS.EinzelErledigungsmeldung.KopfDaten.MRN IsNot Nothing Then
- MRN = NCTS.EinzelErledigungsmeldung.KopfDaten.MRN
+ If VWI.EinzelSumAVerwahrungsinfo.KopfDaten IsNot Nothing Then
+ If VWI.EinzelSumAVerwahrungsinfo.KopfDaten.Vorpapiernummer IsNot Nothing Then
+ Vorpapiernummer = VWI.EinzelSumAVerwahrungsinfo.KopfDaten.Vorpapiernummer
End If
- If NCTS.EinzelErledigungsmeldung.KopfDaten.ZeitpunktErledigung > "01.01.2000" Then
- tstmp = NCTS.EinzelErledigungsmeldung.KopfDaten.ZeitpunktErledigung
- End If
- End If
- End If
- End If
- If readVW_SumAVerwahrungsinfo <> "" And MRN <> "" Then 'BEZUGSNR vorhanden
- Dim STATUS As DAKOSY_Worker.cDakosy_Statusmeldungen = FORM.getStatusCheckTransID(NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit)
+ If VWI.EinzelSumAVerwahrungsinfo.KopfDaten.RegistriernummerATLAS IsNot Nothing Then
+ RegistriernummerATLAS = VWI.EinzelSumAVerwahrungsinfo.KopfDaten.RegistriernummerATLAS
+ End If
+ If VWI.EinzelSumAVerwahrungsinfo.KopfDaten.GestellungDatum > "01.01.2000" Then
+ gestellungsdatum = VWI.EinzelSumAVerwahrungsinfo.KopfDaten.GestellungDatum
+ End If
+ If VWI.EinzelSumAVerwahrungsinfo.KopfDaten.Ankunftsdatum > "01.01.2000" Then
+ ankungsdatum = VWI.EinzelSumAVerwahrungsinfo.KopfDaten.Ankunftsdatum
+ End If
+
+ If VWI.EinzelSumAVerwahrungsinfo.Position IsNot Nothing Then
+ For Each POS In VWI.EinzelSumAVerwahrungsinfo.Position
+ If POS.Positionsnummer IsNot Nothing Then
+
+ End If
+
+
+
+ Next
+ End If
+ End If
+
+ End If
+ End If
+
+
+ If readVW_SumAVerwahrungsinfo <> "" And Vorpapiernummer <> "" Then 'BEZUGSNR vorhanden
+ Dim STATUS As DAKOSY_Worker.cDakosy_Statusmeldungen = FORM.getStatusCheckTransID(VWI.Transaktion.IOReferenz, VWI.Transaktion.IODatumZeit)
STATUS.dySt_BezugsNr = readVW_SumAVerwahrungsinfo
STATUS.dySt_artMitteilung = "VW_INFO"
- STATUS.dySt_dyArt = "VW" '"NCTS" 'T1/T2
+ STATUS.dySt_dyArt = "VW"
STATUS.dySt_status = DAKOSY_Worker.cDY_Statusliste.V_50
- STATUS.dySt_ergCode = "TSTMP"
+ STATUS.dySt_ergCode = "GSTDATUM"
STATUS.dySt_ergMitteilung = ""
- If tstmp IsNot Nothing Then STATUS.dySt_ergZeitpunkt = tstmp
+ If gestellungsdatum IsNot Nothing Then STATUS.dySt_ergZeitpunkt = gestellungsdatum
STATUS.SAVE()
-
'----------------------------------------------------------------
+ 'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
+
+ Try
- 'Verwahrung ANSCHREIBUNG
- 'Dim ANSCHREIBUNG As New cSicherheiten()
- 'With ANSCHREIBUNG
+ 'Dim Standort As String = ""
+ 'If MRN.Length > 4 Then
+ ' Select Case MRN.Substring(0, 4)
+ ' Case 4803, 4809
+ ' Standort = "VERAG AG"
+ ' Case 5601
+ ' Standort = "Unisped GmbH"
+ ' Case 5701
+ ' Standort = "AMBAR"
+ ' Case 4810,
+ ' Standort = "VERAG GmbH"
+ ' Case 5103
+ ' Standort = "VERAG CS"
+ ' Case 5501
+ ' Standort = "IMEX"
+ ' End Select
- 'End With
+ ' Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(Standort)
+ ' 'For Each pos In NCTS.EinzelErledigungsmeldung.Position
- '----------------------------------------------------------------
+ ' Dim saldo = GesSichRef.CalcSaldo()
+ ' Dim filiale
+ ' Dim abfertigungsnummer
+ ' Dim dy_SendungsId = VWI.Transaktion.IOReferenz
+ ' If dy_SendungsId IsNot Nothing AndAlso IsNumeric(dy_SendungsId) Then
+ ' Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(dy_SendungsId)
+ ' If SND IsNot Nothing Then
+ ' If SND.FilialenNr > 0 Then filiale = SND.FilialenNr
+ ' If SND.AbfertigungsNr > 0 Then abfertigungsnummer = SND.AbfertigungsNr
+ ' 'Verwahrung ANSCHREIBUNG
+ ' Dim ANSCHREIBUNG As New cSicherheiten()
+
+ ' With ANSCHREIBUNG
+ ' .gs_ATBNr = Vorpapiernummer
+ ' .gs_posNr = 1
+ ' .gs_datum = gestellungsdatum
+ ' .gs_warenwert = SND.tblSnd_Warenwert
+ ' .gs_sicherheitsbetrag = (SND.tblSnd_Warenwert * (GesSichRef.gsr_zollsatz / 100))
+ ' .gs_standort = Standort
+ ' .gs_art = "OPEN"
+ ' '.gs_gsNr = ANSCHREIBUNG.gessicherheitID
+ ' .gs_erstellungsdatum = Now()
+ ' .gs_freitext = ""
+ ' .gs_saldo = GesSichRef.gsr_Saldo
+ ' .gs_atr = ""
+ ' .gs_filialenNr = filiale
+ ' .gs_abfertigungsnr = abfertigungsnummer
+ ' '.gs_LKWKZ = SND.tblSnd_id
+ ' '.gs_warenort = gessich.warenortID
+
+ ' End With
+
+ ' End If
+ ' End If
+ 'End If
+
+ '----------------------------------------------------------------
+
+ Catch ex As Exception
+
+ 'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+ End Try
+
+ 'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
FORM.addDGVEinarbeitung("VW: Verwahrungsinfo", STATUS.dySt_BezugsNr)
End If
diff --git a/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb b/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb
index bfa5d05..c1db5fe 100644
--- a/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb
+++ b/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb
@@ -19,6 +19,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
Dim renameFilesAfterDownload = False
Dim rmc As New cRMC
Dim uta As New cUTA
+ Dim ids As New cIDS
Dim programName As String
Dim Dateiname = ""
@@ -63,6 +64,12 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
ListBox3.Items.Add(frmStartOptions.cut_file(d))
Me.Refresh()
Next
+ ElseIf programName.Contains("IDS") Then
+ ids.initImportPfade(programName)
+ For Each d In System.IO.Directory.GetFiles(ids.VERARBEITUNG_PFAD)
+ ListBox3.Items.Add(frmStartOptions.cut_file(d))
+ Me.Refresh()
+ Next
End If
End Sub
@@ -107,7 +114,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
ElseIf programName.Contains("UTA") Then
DownloadSFtpDirectory(uta.API_STRING, New NetworkCredential(uta.API.Rows(0).Item("api_user").ToString, uta.API.Rows(0).Item("api_password").ToString), "", cnt, deleteFilesAfterDownload, "/TRX/" & Now.Year, renameFilesAfterDownload)
ElseIf programName.Contains("IDS") Then
- 'DownloadSFtpDirectory(uta.API_STRING, New NetworkCredential(uta.API.Rows(0).Item("api_user").ToString, uta.API.Rows(0).Item("api_password").ToString), "", cnt, False, "/TRX/" & Now.Year)
+ 'keinFTP (NOCH NICHT)!
End If
@@ -224,7 +231,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
Using client = New SftpClient(ConnectionInfo)
client.Connect()
- Dim files = client.ListDirectory(Path)
+ Dim files = client.ListDirectory(Path).OrderBy(Function(file) file.LastAccessTime).Reverse
Dim targetFile As SftpFile
@@ -235,27 +242,37 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
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(System.IO.File.Exists(uta.VERARBEITUNG_PFAD & file.Name), Name.Replace(".UTA", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".UTA", file.Name)
+ Dim filePath = uta.VERARBEITUNG_PFAD & IIf(System.IO.File.Exists(uta.VERARBEITUNG_PFAD & file.Name), file.Name.Replace(".UTA", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".UTA", file.Name)
Dim downloadedFile As Stream = System.IO.File.Create(filePath)
client.DownloadFile(Path + remoteFileName, downloadedFile)
- If System.IO.File.Exists(filePath) AndAlso deleteAfterDownload Then client.DeleteFile(Path + remoteFileName) 'Datei nach erfolgreichem Herunterladen vom Server löschen
+ If System.IO.File.Exists(filePath) AndAlso deleteAfterDownload Then
+
+ client.DeleteFile(Path + remoteFileName) 'Datei nach erfolgreichem Herunterladen vom Server löschen
+
+ End If
If System.IO.File.Exists(filePath) AndAlso Not deleteAfterDownload And renameAfterDownload Then
- Dim remoteFileNameRenamed = "/_" & file.Name
- client.RenameFile(Path + remoteFileName, Path + remoteFileNameRenamed) 'verarbeitete Datei kennzeichnen mit beginnenden "_"
+ Try
+
+ Dim remoteFileNameRenamed = "/_" & file.Name
+ client.RenameFile(Path + remoteFileName, Path + remoteFileNameRenamed) 'verarbeitete Datei kennzeichnen mit beginnenden "_"
+
+ Catch ex As Exception
+ End Try
+
End If
downloadedFile.Dispose()
-
Dim fi As FileInfo = New FileInfo(filePath)
- ListBox3.Items.Add(frmStartOptions.cut_file(fi.Name)) 'zur Liste hinzufügen
- cnt += 1
-
+ If fi.Extension = ".uta" Then
+ ListBox3.Items.Add(frmStartOptions.cut_file(fi.Name)) 'zur Liste hinzufügen
+ cnt += 1
+ End If
End If
Next
@@ -303,6 +320,9 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
ElseIf programName.Contains("UTA") Then
verarbeitungspfad = uta.VERARBEITUNG_PFAD
zielpfad = uta.ZIEL_PFAD
+ ElseIf programName.Contains("IDS") Then
+ verarbeitungspfad = ids.VERARBEITUNG_PFAD
+ zielpfad = ids.ZIEL_PFAD
End If
For i = 1 To 2
@@ -411,7 +431,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
If True Then 'Not System.IO.Directory.Exists(zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then System.IO.Directory.CreateDirectory(zielpfad & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
- If fi.Name.ToString.StartsWith("invoice_") Then
+ If fi.Name.ToString.StartsWith("AP") Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "UTA", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(d))
@@ -467,7 +487,9 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
If UTA_Beleg_ID <> "" Then
'TO DO -> ÄNDERN----------------------
- SQL.doSQL("Update [tblUTAImportNew] SET [daId]='" & DS.da_id & "' where [UTA_Beleg_ID] = '" & UTA_Beleg_ID & "' and [rmc_importDatum] > DATEADD(DAY,-4,getdate()) ", "FMZOLL")
+ If SQL.doSQL("Update [tblUTAImportNew] SET [daId]='" & DS.da_id & "' where [UTA_Beleg_ID] = '" & UTA_Beleg_ID & "' ", "FMZOLL") Then
+ frmStartOptions.moveFile_DateBack(d, zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
+ End If
'TO DO -> ÄNDERN----------------------
End If
@@ -480,14 +502,71 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
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()
+ End Select
+
+ ElseIf programName.Contains("IDS") Then
+
+ Select Case i
+
+ Case 1
+ '------------------------------------------
+ '------------------ .CSV ------------------
+ '------------------------------------------
+
+ 'If Not deleteTable Then
+ ' deleteTable = uta.clearimporttable()
+ 'End If
+
+ If fi.Extension.ToLower = ".csv" Then
+
+ If Not found Then
+
+ If readIDS(d) <> "" Then found = True
+
+ End If
+
+ If found Then cntDatenEingelesen += 1
+ End If
+
+ Case 2
+ '------------------------------------------
+ '------------------ .PDF ------------------
+ '------------------------------------------
+
+ If fi.Extension.ToLower = ".pdf" Then
+
+ If True Then
+
+
+
+
+ Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "IDS", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(d))
+
+ DS.uploadDataToDATENSERVER(d,,,,,, True)
+
+ Try
+
+
+
+ Catch ex As System.Exception
+ End Try
+
+ End If
+
+ End If
+
+
+ If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name)
dgvEinarbeitung.Refresh()
End Select
+
+
+
End If
If True Then
If Not alreadyMoved Then
@@ -626,6 +705,30 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
End Try
+ End Function
+
+ Function readIDS(d As String) As String
+ Try
+
+ Dim fi As FileInfo = New FileInfo(d)
+ Dim cnt = 0
+ Dim objFileRead As StreamReader = New StreamReader(d)
+
+
+ If ids.readAndSaveIDS(objFileRead, fi, cnt) Then
+ addDGVEinarbeitung(fi.Name, "OK")
+ Else
+ addDGVEinarbeitung(fi.Name, "Fehler")
+ End If
+
+ readIDS = "Zeilen: " & cnt
+
+ Catch ex As System.Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ MsgBox(ex.StackTrace & ex.Message)
+ End Try
+
+
End Function
diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb
index df850e8..c033221 100644
--- a/initATLASAufschubkonten/frmStartOptions.Designer.vb
+++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb
@@ -25,6 +25,7 @@ Partial Class frmStartOptions
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStartOptions))
Me.pnl = New System.Windows.Forms.Panel()
+ Me.Button25 = New System.Windows.Forms.Button()
Me.Button24 = New System.Windows.Forms.Button()
Me.CheckBox8 = New System.Windows.Forms.CheckBox()
Me.Label43 = New System.Windows.Forms.Label()
@@ -262,7 +263,7 @@ Partial Class frmStartOptions
Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Button21 = New System.Windows.Forms.Button()
Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
- Me.Button25 = New System.Windows.Forms.Button()
+ Me.LinkLabel65 = New System.Windows.Forms.LinkLabel()
Me.pnl.SuspendLayout()
CType(Me.PictureBox25, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox24, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -391,6 +392,18 @@ Partial Class frmStartOptions
Me.pnl.Size = New System.Drawing.Size(1229, 1007)
Me.pnl.TabIndex = 0
'
+ 'Button25
+ '
+ Me.Button25.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.Button25.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.Button25.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.Button25.Location = New System.Drawing.Point(910, 298)
+ Me.Button25.Name = "Button25"
+ Me.Button25.Size = New System.Drawing.Size(187, 38)
+ Me.Button25.TabIndex = 135
+ Me.Button25.Text = "Summen anzeigen"
+ Me.Button25.UseVisualStyleBackColor = True
+ '
'Button24
'
Me.Button24.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -2282,6 +2295,7 @@ Partial Class frmStartOptions
'
'TabPage4
'
+ Me.TabPage4.Controls.Add(Me.LinkLabel65)
Me.TabPage4.Controls.Add(Me.LinkLabel64)
Me.TabPage4.Controls.Add(Me.Label42)
Me.TabPage4.Controls.Add(Me.cbxUploadDA)
@@ -2364,7 +2378,7 @@ Partial Class frmStartOptions
'
Me.Label42.AutoSize = True
Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label42.Location = New System.Drawing.Point(772, 235)
+ Me.Label42.Location = New System.Drawing.Point(884, 235)
Me.Label42.Name = "Label42"
Me.Label42.Size = New System.Drawing.Size(40, 13)
Me.Label42.TabIndex = 130
@@ -2374,7 +2388,7 @@ Partial Class frmStartOptions
'
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.Location = New System.Drawing.Point(884, 324)
Me.cbxUploadDA.Name = "cbxUploadDA"
Me.cbxUploadDA.Size = New System.Drawing.Size(81, 17)
Me.cbxUploadDA.TabIndex = 128
@@ -2386,7 +2400,7 @@ Partial Class frmStartOptions
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.Location = New System.Drawing.Point(991, 39)
Me.Label5.Name = "Label5"
Me.Label5.Size = New System.Drawing.Size(56, 16)
Me.Label5.TabIndex = 126
@@ -2396,7 +2410,7 @@ Partial Class frmStartOptions
'
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.Location = New System.Drawing.Point(991, 117)
Me.LinkLabel23.Name = "LinkLabel23"
Me.LinkLabel23.Size = New System.Drawing.Size(180, 13)
Me.LinkLabel23.TabIndex = 125
@@ -2407,7 +2421,7 @@ Partial Class frmStartOptions
'
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.Location = New System.Drawing.Point(991, 92)
Me.LinkLabel24.Name = "LinkLabel24"
Me.LinkLabel24.Size = New System.Drawing.Size(177, 13)
Me.LinkLabel24.TabIndex = 124
@@ -2420,7 +2434,7 @@ Partial Class frmStartOptions
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.Location = New System.Drawing.Point(782, 84)
Me.cbxOnlyBilledTransactions.Name = "cbxOnlyBilledTransactions"
Me.cbxOnlyBilledTransactions.Size = New System.Drawing.Size(172, 17)
Me.cbxOnlyBilledTransactions.TabIndex = 121
@@ -2431,7 +2445,7 @@ Partial Class frmStartOptions
'
Me.LinkLabel62.AutoSize = True
Me.LinkLabel62.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.LinkLabel62.Location = New System.Drawing.Point(622, 374)
+ Me.LinkLabel62.Location = New System.Drawing.Point(734, 374)
Me.LinkLabel62.Name = "LinkLabel62"
Me.LinkLabel62.Size = New System.Drawing.Size(226, 13)
Me.LinkLabel62.TabIndex = 120
@@ -2442,7 +2456,7 @@ Partial Class frmStartOptions
'
Me.LinkLabel60.AutoSize = True
Me.LinkLabel60.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.LinkLabel60.Location = New System.Drawing.Point(662, 131)
+ Me.LinkLabel60.Location = New System.Drawing.Point(774, 131)
Me.LinkLabel60.Name = "LinkLabel60"
Me.LinkLabel60.Size = New System.Drawing.Size(144, 13)
Me.LinkLabel60.TabIndex = 119
@@ -2453,7 +2467,7 @@ Partial Class frmStartOptions
'
Me.LinkLabel61.AutoSize = True
Me.LinkLabel61.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.LinkLabel61.Location = New System.Drawing.Point(657, 351)
+ Me.LinkLabel61.Location = New System.Drawing.Point(769, 351)
Me.LinkLabel61.Name = "LinkLabel61"
Me.LinkLabel61.Size = New System.Drawing.Size(158, 13)
Me.LinkLabel61.TabIndex = 118
@@ -2464,7 +2478,7 @@ Partial Class frmStartOptions
'
Me.Label40.AutoSize = True
Me.Label40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label40.Location = New System.Drawing.Point(658, 235)
+ Me.Label40.Location = New System.Drawing.Point(770, 235)
Me.Label40.Name = "Label40"
Me.Label40.Size = New System.Drawing.Size(20, 13)
Me.Label40.TabIndex = 116
@@ -2474,7 +2488,7 @@ Partial Class frmStartOptions
'
Me.LinkLabel59.AutoSize = True
Me.LinkLabel59.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.LinkLabel59.Location = New System.Drawing.Point(670, 255)
+ Me.LinkLabel59.Location = New System.Drawing.Point(782, 255)
Me.LinkLabel59.Name = "LinkLabel59"
Me.LinkLabel59.Size = New System.Drawing.Size(149, 13)
Me.LinkLabel59.TabIndex = 114
@@ -2485,7 +2499,7 @@ Partial Class frmStartOptions
'
Me.Label39.AutoSize = True
Me.Label39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label39.Location = New System.Drawing.Point(657, 296)
+ Me.Label39.Location = New System.Drawing.Point(769, 296)
Me.Label39.Name = "Label39"
Me.Label39.Size = New System.Drawing.Size(28, 13)
Me.Label39.TabIndex = 113
@@ -2495,7 +2509,7 @@ Partial Class frmStartOptions
'
Me.Label38.AutoSize = True
Me.Label38.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label38.Location = New System.Drawing.Point(656, 439)
+ Me.Label38.Location = New System.Drawing.Point(768, 439)
Me.Label38.Name = "Label38"
Me.Label38.Size = New System.Drawing.Size(23, 13)
Me.Label38.TabIndex = 112
@@ -2505,7 +2519,7 @@ Partial Class frmStartOptions
'
Me.Label37.AutoSize = True
Me.Label37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label37.Location = New System.Drawing.Point(656, 420)
+ Me.Label37.Location = New System.Drawing.Point(768, 420)
Me.Label37.Name = "Label37"
Me.Label37.Size = New System.Drawing.Size(28, 13)
Me.Label37.TabIndex = 111
@@ -2515,7 +2529,7 @@ Partial Class frmStartOptions
'
Me.LinkLabel58.AutoSize = True
Me.LinkLabel58.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.LinkLabel58.Location = New System.Drawing.Point(663, 156)
+ Me.LinkLabel58.Location = New System.Drawing.Point(775, 156)
Me.LinkLabel58.Name = "LinkLabel58"
Me.LinkLabel58.Size = New System.Drawing.Size(126, 13)
Me.LinkLabel58.TabIndex = 110
@@ -2526,7 +2540,7 @@ Partial Class frmStartOptions
'
Me.LinkLabel57.AutoSize = True
Me.LinkLabel57.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.LinkLabel57.Location = New System.Drawing.Point(663, 205)
+ Me.LinkLabel57.Location = New System.Drawing.Point(775, 205)
Me.LinkLabel57.Name = "LinkLabel57"
Me.LinkLabel57.Size = New System.Drawing.Size(166, 13)
Me.LinkLabel57.TabIndex = 108
@@ -2536,7 +2550,7 @@ Partial Class frmStartOptions
'DateTimePicker2
'
Me.DateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
- Me.DateTimePicker2.Location = New System.Drawing.Point(691, 433)
+ Me.DateTimePicker2.Location = New System.Drawing.Point(803, 433)
Me.DateTimePicker2.Name = "DateTimePicker2"
Me.DateTimePicker2.Size = New System.Drawing.Size(85, 20)
Me.DateTimePicker2.TabIndex = 107
@@ -2544,7 +2558,7 @@ Partial Class frmStartOptions
'DateTimePicker1
'
Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
- Me.DateTimePicker1.Location = New System.Drawing.Point(691, 414)
+ Me.DateTimePicker1.Location = New System.Drawing.Point(803, 414)
Me.DateTimePicker1.Name = "DateTimePicker1"
Me.DateTimePicker1.Size = New System.Drawing.Size(85, 20)
Me.DateTimePicker1.TabIndex = 106
@@ -2553,7 +2567,7 @@ Partial Class frmStartOptions
'
Me.LinkLabel56.AutoSize = True
Me.LinkLabel56.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.LinkLabel56.Location = New System.Drawing.Point(656, 456)
+ Me.LinkLabel56.Location = New System.Drawing.Point(768, 456)
Me.LinkLabel56.Name = "LinkLabel56"
Me.LinkLabel56.Size = New System.Drawing.Size(114, 13)
Me.LinkLabel56.TabIndex = 105
@@ -2563,7 +2577,7 @@ Partial Class frmStartOptions
'datVon
'
Me.datVon.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
- Me.datVon.Location = New System.Drawing.Point(691, 296)
+ Me.datVon.Location = New System.Drawing.Point(803, 296)
Me.datVon.Name = "datVon"
Me.datVon.Size = New System.Drawing.Size(85, 20)
Me.datVon.TabIndex = 104
@@ -2572,7 +2586,7 @@ Partial Class frmStartOptions
'
Me.LinkLabel55.AutoSize = True
Me.LinkLabel55.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.LinkLabel55.Location = New System.Drawing.Point(658, 324)
+ Me.LinkLabel55.Location = New System.Drawing.Point(770, 324)
Me.LinkLabel55.Name = "LinkLabel55"
Me.LinkLabel55.Size = New System.Drawing.Size(108, 13)
Me.LinkLabel55.TabIndex = 103
@@ -2583,7 +2597,7 @@ Partial Class frmStartOptions
'
Me.LinkLabel54.AutoSize = True
Me.LinkLabel54.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.LinkLabel54.Location = New System.Drawing.Point(663, 106)
+ Me.LinkLabel54.Location = New System.Drawing.Point(775, 106)
Me.LinkLabel54.Name = "LinkLabel54"
Me.LinkLabel54.Size = New System.Drawing.Size(157, 13)
Me.LinkLabel54.TabIndex = 102
@@ -2649,7 +2663,7 @@ Partial Class frmStartOptions
'
Me.Label36.AutoSize = True
Me.Label36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label36.Location = New System.Drawing.Point(663, 65)
+ Me.Label36.Location = New System.Drawing.Point(775, 65)
Me.Label36.Name = "Label36"
Me.Label36.Size = New System.Drawing.Size(42, 13)
Me.Label36.TabIndex = 96
@@ -2659,7 +2673,7 @@ Partial Class frmStartOptions
'
Me.Label35.AutoSize = True
Me.Label35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label35.Location = New System.Drawing.Point(549, 65)
+ Me.Label35.Location = New System.Drawing.Point(572, 65)
Me.Label35.Name = "Label35"
Me.Label35.Size = New System.Drawing.Size(42, 13)
Me.Label35.TabIndex = 95
@@ -2680,7 +2694,7 @@ Partial Class frmStartOptions
Me.Label33.AutoSize = True
Me.Label33.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label33.ForeColor = System.Drawing.Color.Red
- Me.Label33.Location = New System.Drawing.Point(663, 39)
+ Me.Label33.Location = New System.Drawing.Point(775, 39)
Me.Label33.Name = "Label33"
Me.Label33.Size = New System.Drawing.Size(39, 16)
Me.Label33.TabIndex = 93
@@ -2691,7 +2705,7 @@ Partial Class frmStartOptions
Me.Label32.AutoSize = True
Me.Label32.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label32.ForeColor = System.Drawing.Color.Red
- Me.Label32.Location = New System.Drawing.Point(549, 39)
+ Me.Label32.Location = New System.Drawing.Point(572, 39)
Me.Label32.Name = "Label32"
Me.Label32.Size = New System.Drawing.Size(32, 16)
Me.Label32.TabIndex = 92
@@ -2931,7 +2945,7 @@ Partial Class frmStartOptions
Me.txtBatchNrofTransaction._WaehrungZeichen = True
Me.txtBatchNrofTransaction.BackColor = System.Drawing.SystemColors.Window
Me.txtBatchNrofTransaction.ForeColor = System.Drawing.Color.Red
- Me.txtBatchNrofTransaction.Location = New System.Drawing.Point(817, 232)
+ Me.txtBatchNrofTransaction.Location = New System.Drawing.Point(929, 232)
Me.txtBatchNrofTransaction.MaxLength = 10
Me.txtBatchNrofTransaction.MaxLineLength = -1
Me.txtBatchNrofTransaction.MaxLines_Warning = ""
@@ -2957,7 +2971,7 @@ Partial Class frmStartOptions
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.Location = New System.Drawing.Point(833, 181)
Me.txtBatchNr.MaxLength = 10
Me.txtBatchNr.MaxLineLength = -1
Me.txtBatchNr.MaxLines_Warning = ""
@@ -2975,7 +2989,7 @@ Partial Class frmStartOptions
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.Location = New System.Drawing.Point(782, 181)
Me.cbxMSEBatchNr.Name = "cbxMSEBatchNr"
Me.cbxMSEBatchNr.Size = New System.Drawing.Size(44, 21)
Me.cbxMSEBatchNr.TabIndex = 122
@@ -2996,7 +3010,7 @@ Partial Class frmStartOptions
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(681, 232)
+ Me.txtTransactionID.Location = New System.Drawing.Point(793, 232)
Me.txtTransactionID.MaxLength = 10
Me.txtTransactionID.MaxLineLength = -1
Me.txtTransactionID.MaxLines_Warning = ""
@@ -3379,17 +3393,16 @@ Partial Class frmStartOptions
Me.DataGridViewTextBoxColumn1.MinimumWidth = 8
Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
'
- 'Button25
+ 'LinkLabel65
'
- Me.Button25.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.Button25.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.Button25.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.Button25.Location = New System.Drawing.Point(910, 298)
- Me.Button25.Name = "Button25"
- Me.Button25.Size = New System.Drawing.Size(187, 38)
- Me.Button25.TabIndex = 135
- Me.Button25.Text = "Summen anzeigen"
- Me.Button25.UseVisualStyleBackColor = True
+ Me.LinkLabel65.AutoSize = True
+ Me.LinkLabel65.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.LinkLabel65.Location = New System.Drawing.Point(572, 88)
+ Me.LinkLabel65.Name = "LinkLabel65"
+ Me.LinkLabel65.Size = New System.Drawing.Size(115, 13)
+ Me.LinkLabel65.TabIndex = 132
+ Me.LinkLabel65.TabStop = True
+ Me.LinkLabel65.Text = "CSV + PDF importieren"
'
'frmStartOptions
'
@@ -3686,4 +3699,5 @@ Partial Class frmStartOptions
Friend WithEvents CheckBox8 As CheckBox
Friend WithEvents Button24 As Button
Friend WithEvents Button25 As Button
+ Friend WithEvents LinkLabel65 As LinkLabel
End Class