diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb index 29a8865..14cd2d1 100644 --- a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb +++ b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb @@ -1152,6 +1152,14 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_ Dim p = SQL.getValueTxtBySql("SELECT ISNULL(CASE WHEN [mit_FMZollPersIDKasseIsnotSpedBuch]=1 THEN [mit_FMZollPersIDSpedBuch] ELSE [mit_FMZollPersID] END ,-1) as [mit_FMZollPersID] FROM [ADMIN].[dbo].[tblMitarbeiter] WHERE [mit_DAKOSY_SB]='" & DY.eza_Bearbeiter & "'", "ADMIN") SPEDITIONSBUCH.Personalnummer = If(IsNumeric(p), p, Nothing) End If + + If If(SPEDITIONSBUCH.Personalnummer, "") = "" Then ' Falls nciht gefunden, mit vollem Namen + If DY.eza_AnmeldenderBearbeiterName IsNot Nothing Then + Dim p = SQL.getValueTxtBySql("SELECT ISNULL(CASE WHEN [mit_FMZollPersIDKasseIsnotSpedBuch]=1 THEN [mit_FMZollPersIDSpedBuch] ELSE [mit_FMZollPersID] END ,-1) as [mit_FMZollPersID] FROM [ADMIN].[dbo].[tblMitarbeiter] WHERE mit_DAKOSY_SBFull='" & DY.eza_AnmeldenderBearbeiterName & "' ", "ADMIN") + SPEDITIONSBUCH.Personalnummer = If(IsNumeric(p), p, Nothing) + End If + + End If Catch ex As Exception ' MsgBox( vbNewLine & ex.Message & vbNewLine & ex.StackTrace) VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "Fehler DAKOSY Personal: " & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -1276,6 +1284,7 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_ Dim p = SQL.getValueTxtBySql("SELECT ISNULL(CASE WHEN [mit_FMZollPersIDKasseIsnotSpedBuch]=1 THEN [mit_FMZollPersIDSpedBuch] ELSE [mit_FMZollPersID] END ,-1) as [mit_FMZollPersID] FROM [ADMIN].[dbo].[tblMitarbeiter] WHERE [mit_DAKOSY_SB]='" & DY.aes_Bearbeiter & "'", "ADMIN") SPEDITIONSBUCH.Personalnummer = If(IsNumeric(p), p, Nothing) End If + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "Fehler DAKOSY Personal: " & ex.StackTrace & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name) diff --git a/MailSender/Resources/MDM_ZOLL_Verguetung.xlsx b/MailSender/Resources/MDM_ZOLL_Verguetung.xlsx index 1ae8ad3..c96a876 100644 Binary files a/MailSender/Resources/MDM_ZOLL_Verguetung.xlsx and b/MailSender/Resources/MDM_ZOLL_Verguetung.xlsx differ diff --git a/UID/usrctlProcedures.Designer.vb b/UID/usrctlProcedures.Designer.vb index f045870..92b5866 100644 --- a/UID/usrctlProcedures.Designer.vb +++ b/UID/usrctlProcedures.Designer.vb @@ -24,6 +24,7 @@ Partial Class usrctlProcedures Private Sub InitializeComponent() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.Button44 = New System.Windows.Forms.Button() Me.CheckBox6 = New System.Windows.Forms.CheckBox() Me.TextBox15 = New System.Windows.Forms.TextBox() Me.Button37 = New System.Windows.Forms.Button() @@ -125,9 +126,11 @@ Partial Class usrctlProcedures Me.Button32 = New System.Windows.Forms.Button() Me.lblStatus = New System.Windows.Forms.Label() Me.Button33 = New System.Windows.Forms.Button() + Me.Button43 = New System.Windows.Forms.Button() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.Button43 = New System.Windows.Forms.Button() + Me.txtHMRCApplName = New System.Windows.Forms.TextBox() + Me.Label16 = New System.Windows.Forms.Label() Me.TabControl1.SuspendLayout() Me.TabPage3.SuspendLayout() Me.TabPage1.SuspendLayout() @@ -150,6 +153,9 @@ Partial Class usrctlProcedures ' 'TabPage3 ' + Me.TabPage3.Controls.Add(Me.Label16) + Me.TabPage3.Controls.Add(Me.txtHMRCApplName) + Me.TabPage3.Controls.Add(Me.Button44) Me.TabPage3.Controls.Add(Me.CheckBox6) Me.TabPage3.Controls.Add(Me.TextBox15) Me.TabPage3.Controls.Add(Me.Button37) @@ -171,6 +177,15 @@ Partial Class usrctlProcedures Me.TabPage3.Text = "TabPage3" Me.TabPage3.UseVisualStyleBackColor = True ' + 'Button44 + ' + Me.Button44.Location = New System.Drawing.Point(437, 9) + Me.Button44.Name = "Button44" + Me.Button44.Size = New System.Drawing.Size(159, 49) + Me.Button44.TabIndex = 78 + Me.Button44.Text = "HMRC TOKEN" + Me.Button44.UseVisualStyleBackColor = True + ' 'CheckBox6 ' Me.CheckBox6.AutoSize = True @@ -1107,6 +1122,15 @@ Partial Class usrctlProcedures Me.Button33.Text = "DAKOSY CSV Importieren" Me.Button33.UseVisualStyleBackColor = True ' + 'Button43 + ' + Me.Button43.Location = New System.Drawing.Point(694, 29) + Me.Button43.Name = "Button43" + Me.Button43.Size = New System.Drawing.Size(145, 49) + Me.Button43.TabIndex = 65 + Me.Button43.Text = "TELOTEC NCTS" + Me.Button43.UseVisualStyleBackColor = True + ' 'DataGridViewTextBoxColumn1 ' Me.DataGridViewTextBoxColumn1.HeaderText = "dat" @@ -1117,14 +1141,21 @@ Partial Class usrctlProcedures Me.DataGridViewTextBoxColumn2.HeaderText = "anz" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'Button43 + 'txtHMRCApplName ' - Me.Button43.Location = New System.Drawing.Point(694, 29) - Me.Button43.Name = "Button43" - Me.Button43.Size = New System.Drawing.Size(145, 49) - Me.Button43.TabIndex = 65 - Me.Button43.Text = "TELOTEC NCTS" - Me.Button43.UseVisualStyleBackColor = True + Me.txtHMRCApplName.Location = New System.Drawing.Point(437, 71) + Me.txtHMRCApplName.Name = "txtHMRCApplName" + Me.txtHMRCApplName.Size = New System.Drawing.Size(159, 20) + Me.txtHMRCApplName.TabIndex = 79 + ' + 'Label16 + ' + Me.Label16.AutoSize = True + Me.Label16.Location = New System.Drawing.Point(434, 58) + Me.Label16.Name = "Label16" + Me.Label16.Size = New System.Drawing.Size(169, 13) + Me.Label16.TabIndex = 80 + Me.Label16.Text = "fremde HMRC Application (Name):" ' 'usrctlProcedures ' @@ -1305,4 +1336,7 @@ Partial Class usrctlProcedures Friend WithEvents Button37 As Button Friend WithEvents CheckBox6 As CheckBox Friend WithEvents Button43 As Button + Friend WithEvents Button44 As Button + Friend WithEvents Label16 As Label + Friend WithEvents txtHMRCApplName As TextBox End Class diff --git a/UID/usrctlProcedures.resx b/UID/usrctlProcedures.resx index 508fc32..c9977e7 100644 --- a/UID/usrctlProcedures.resx +++ b/UID/usrctlProcedures.resx @@ -123,4 +123,10 @@ True + + True + + + True + \ No newline at end of file diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb index 64de5ae..3d4135b 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -18,6 +18,7 @@ Imports System.Data.OleDb Imports Chilkat Imports TELOTEC_Worker Imports GrapeCity +Imports VERAG_PROG_ALLGEMEIN 'Imports Microsoft.Office.Interop Public Class usrctlProcedures @@ -3891,6 +3892,16 @@ Public Class usrctlProcedures End Try End Sub + Private Sub Button44_Click(sender As Object, e As EventArgs) Handles Button44.Click + Dim TOKENNAME = InputBox("Bitte Token-Bezeichnung angeben:") + If TOKENNAME <> "" Then + Dim TOKEN = cHMRC.getTOKEN("ENS", True, TOKENNAME, txtHMRCApplName.Text) + MsgBox("REFRESH_TOKEN: " & TOKEN.token_REFRESH_TOKEN & vbNewLine & "BEARER_TOKEN: " & TOKEN.token_BEARER_TOKEN) + End If + + + End Sub + 'Private Sub Button26_Click(sender As Object, e As EventArgs) ' For Each d In System.IO.Directory.GetDirectories("\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\Nachrichtendaten_Ablage\2019") diff --git a/initATLASAufschubkonten/cWorker_NCTS.vb b/initATLASAufschubkonten/cWorker_NCTS.vb index 13364e5..3b3c14b 100644 --- a/initATLASAufschubkonten/cWorker_NCTS.vb +++ b/initATLASAufschubkonten/cWorker_NCTS.vb @@ -4154,12 +4154,17 @@ Public Class cWorker_NCTS End If End Sub - Shared Sub checkATEZIRU_Bereitstellung(DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, filePath As String) + Shared Sub checkATEZIRU_Bereitstellung(DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, filePath As String, Optional Division3 As String = "") If DY_TMP Is Nothing Then Exit Sub - 'Dim ATEZ = VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_DATA.LOAD_ByBezugsNr(DY_TMP.dy_BezugsNr) - If (DY_TMP.dy_BezugsNr.Contains("IRU0")) Then - ' Dim fio As New IO.FileInfo(filePath) - ' FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\" & fio.Name.Replace("lock_", "")) + + checkATEZIRU_BereitstellungBezugsNr(DY_TMP.dy_BezugsNr, filePath, Division3) + + End Sub + + Shared Sub checkATEZIRU_BereitstellungBezugsNr(dy_BezugsNr As String, filePath As String, Optional Division3 As String = "") + If dy_BezugsNr = "" Then Exit Sub + + If (dy_BezugsNr.Contains("IRU0")) OrElse Division3 = "IRU" Then Try @@ -4170,32 +4175,15 @@ Public Class cWorker_NCTS End If Dim F As New System.IO.FileInfo(filePath) - ' FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\" & fio.Name.Replace("lock_", "")) - - 'Dim DY_server = "91.93.197.91" - 'Dim DY_name = "Verag" - 'Dim DY_pwd = "5P1PYOr1" - ''Dim DY_name = "Verag-test" - ''Dim DY_pwd = "A1ZDTK99" - 'Dim DY_port = "22" - 'Dim DY_PFAD_IN = "" - 'Dim DY_PFAD_IN_KD = "" - - Dim DY_server = "sftp-01.singlewindow.io" Dim DY_name = "VERAG" Dim DY_pwd = "5P1PYOr1" - 'Dim DY_name = "Verag-test" - 'Dim DY_pwd = "A1ZDTK99" Dim DY_port = "22" - 'Dim DY_PFAD_IN = "/TIR/DE/OUT" Dim DY_PFAD_IN = "/" Dim DY_PFAD_IN_KD = "" If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then DY_server = "sftp-01.singlewindow.io" - 'DY_name = "IRU-TEST" - 'DY_pwd = "T1AF58OP" DY_name = "VERAG-TEST" DY_pwd = "A1ZDTK99" End If @@ -4223,6 +4211,8 @@ Public Class cWorker_NCTS End If End Sub + + Shared Sub checkATEZ_BereitstellungBezugsNr(dy_BezugsNr As String, filePath As String) If dy_BezugsNr = "" Then Exit Sub Dim ATEZ = VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_DATA.LOAD_ByBezugsNr(dy_BezugsNr) @@ -4235,63 +4225,63 @@ Public Class cWorker_NCTS ' End If End If End Sub - Shared Sub checkATEZIRU_BereitstellungBezugsNr(dy_BezugsNr As String, filePath As String) - If dy_BezugsNr = "" Then Exit Sub - Dim ATEZ = VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_DATA.LOAD_ByBezugsNr(dy_BezugsNr) - If (dy_BezugsNr.Contains("IRU0")) Then - ' Dim fio As New IO.FileInfo(filePath) - ' FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\" & fio.Name.Replace("lock_", "")) + 'Shared Sub checkATEZIRU_BereitstellungBezugsNr(dy_BezugsNr As String, filePath As String) + ' If dy_BezugsNr = "" Then Exit Sub + ' Dim ATEZ = VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_DATA.LOAD_ByBezugsNr(dy_BezugsNr) + ' If (dy_BezugsNr.Contains("IRU0")) Then + ' ' Dim fio As New IO.FileInfo(filePath) + ' ' FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\" & fio.Name.Replace("lock_", "")) - Try + ' Try - If Not System.IO.File.Exists(filePath) Then + ' If Not System.IO.File.Exists(filePath) Then - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Senden an ATEZ FTP (IRU-NCTS-File). File existert nicht.", "" & vbNewLine & "Datei: " & filePath, System.Reflection.MethodInfo.GetCurrentMethod.Name) - Exit Sub - End If - Dim F As New System.IO.FileInfo(filePath) + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Senden an ATEZ FTP (IRU-NCTS-File). File existert nicht.", "" & vbNewLine & "Datei: " & filePath, System.Reflection.MethodInfo.GetCurrentMethod.Name) + ' Exit Sub + ' End If + ' Dim F As New System.IO.FileInfo(filePath) - 'Dim DY_server = "91.93.197.91" - 'Dim DY_name = "Verag" - 'Dim DY_pwd = "5P1PYOr1" - ''Dim DY_name = "Verag-test" - ''Dim DY_pwd = "A1ZDTK99" - 'Dim DY_port = "22" - 'Dim DY_PFAD_IN = "" - 'Dim DY_PFAD_IN_KD = "" + ' 'Dim DY_server = "91.93.197.91" + ' 'Dim DY_name = "Verag" + ' 'Dim DY_pwd = "5P1PYOr1" + ' ''Dim DY_name = "Verag-test" + ' ''Dim DY_pwd = "A1ZDTK99" + ' 'Dim DY_port = "22" + ' 'Dim DY_PFAD_IN = "" + ' 'Dim DY_PFAD_IN_KD = "" - Dim DY_server = "sftp-01.singlewindow.io" - Dim DY_name = "IRU-TEST" - Dim DY_pwd = "T1AF58OP" - 'Dim DY_name = "Verag-test" - 'Dim DY_pwd = "A1ZDTK99" - Dim DY_port = "22" - Dim DY_PFAD_IN = "/TIR/DE/OUT" - Dim DY_PFAD_IN_KD = "" + ' Dim DY_server = "sftp-01.singlewindow.io" + ' Dim DY_name = "IRU-TEST" + ' Dim DY_pwd = "T1AF58OP" + ' 'Dim DY_name = "Verag-test" + ' 'Dim DY_pwd = "A1ZDTK99" + ' Dim DY_port = "22" + ' Dim DY_PFAD_IN = "/TIR/DE/OUT" + ' Dim DY_PFAD_IN_KD = "" - 'getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "", DY_PFAD_IN_KD, FRIMA_DY) + ' 'getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "", DY_PFAD_IN_KD, FRIMA_DY) - Dim ConnectionInfo As New Renci.SshNet.ConnectionInfo(DY_server, DY_port, DY_name, New Renci.SshNet.PasswordAuthenticationMethod(DY_name, DY_pwd)) - Using client = New Renci.SshNet.SftpClient(ConnectionInfo) - client.Connect() - If DY_PFAD_IN <> "" Then client.ChangeDirectory(DY_PFAD_IN) - Using uplfileStream = System.IO.File.OpenRead(filePath) - client.UploadFile(uplfileStream, "." & F.Name, True) - client.RenameFile("." & F.Name, F.Name) - End Using - client.Disconnect() - End Using + ' Dim ConnectionInfo As New Renci.SshNet.ConnectionInfo(DY_server, DY_port, DY_name, New Renci.SshNet.PasswordAuthenticationMethod(DY_name, DY_pwd)) + ' Using client = New Renci.SshNet.SftpClient(ConnectionInfo) + ' client.Connect() + ' If DY_PFAD_IN <> "" Then client.ChangeDirectory(DY_PFAD_IN) + ' Using uplfileStream = System.IO.File.OpenRead(filePath) + ' client.UploadFile(uplfileStream, "." & F.Name, True) + ' client.RenameFile("." & F.Name, F.Name) + ' End Using + ' client.Disconnect() + ' End Using - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Senden an ATEZ FTP (IRU-NCTS-File). " & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) - Exit Sub - End Try + ' Catch ex As Exception + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Senden an ATEZ FTP (IRU-NCTS-File). " & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + ' Exit Sub + ' End Try - End If - End Sub + ' End If + 'End Sub Shared Sub checkATEZ_Bereitstellung_VBD(dy_BezugsNr As String, filePath As String) diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb index 9cb8126..d113060 100644 --- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb @@ -454,7 +454,6 @@ Public Class frmDYNachrichtenVerarbeitung 'AES/EZA: Wiedervorlage zur Ausfuhr If Not found And cGetMsgType.isAES_E_EXP_FUP_DEXPFE(doc) Then - MsgBox("HALLLO") If readAES_E_EXP_FUP_DEXPFE(doc) <> "" Then found = True End If diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 763a125..b276c5d 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -25,6 +25,8 @@ 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.LinkLabel73 = New System.Windows.Forms.LinkLabel() + Me.Button27 = New System.Windows.Forms.Button() Me.txtMRNPrefix = New System.Windows.Forms.TextBox() Me.LinkLabel66 = New System.Windows.Forms.LinkLabel() Me.PictureBox24 = New System.Windows.Forms.PictureBox() @@ -161,8 +163,7 @@ Partial Class frmStartOptions Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtVRGOut_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.TabPage3 = New System.Windows.Forms.TabPage() - Me.Label50 = New System.Windows.Forms.Label() - Me.MyTextBox6 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.MyTextBox06 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.CheckBox9 = New System.Windows.Forms.CheckBox() Me.Label49 = New System.Windows.Forms.Label() Me.Button28 = New System.Windows.Forms.Button() @@ -193,7 +194,7 @@ Partial Class frmStartOptions Me.Label50 = New System.Windows.Forms.Label() Me.txtPLoseKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.LinkLabel74 = New System.Windows.Forms.LinkLabel() - Me.LinkLabel73 = New System.Windows.Forms.LinkLabel() + Me.LinkLabel073 = New System.Windows.Forms.LinkLabel() Me.LinkLabel69 = New System.Windows.Forms.LinkLabel() Me.LinkLabel72 = New System.Windows.Forms.LinkLabel() Me.lblUTAPDFvollst = New System.Windows.Forms.LinkLabel() @@ -308,9 +309,9 @@ Partial Class frmStartOptions Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel() Me.lblRoutineManager = New System.Windows.Forms.Label() Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label050 = New System.Windows.Forms.Label() Me.Button21 = New System.Windows.Forms.Button() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.LinkLabel73 = New System.Windows.Forms.LinkLabel() Me.pnl.SuspendLayout() CType(Me.PictureBox24, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit() @@ -353,6 +354,8 @@ Partial Class frmStartOptions ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.LinkLabel73) + Me.pnl.Controls.Add(Me.Button27) Me.pnl.Controls.Add(Me.txtMRNPrefix) Me.pnl.Controls.Add(Me.LinkLabel66) Me.pnl.Controls.Add(Me.PictureBox24) @@ -432,9 +435,32 @@ 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(1229, 920) + Me.pnl.Size = New System.Drawing.Size(1229, 970) Me.pnl.TabIndex = 0 ' + 'LinkLabel73 + ' + Me.LinkLabel73.AutoSize = True + Me.LinkLabel73.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel73.Location = New System.Drawing.Point(1023, 173) + Me.LinkLabel73.Name = "LinkLabel73" + Me.LinkLabel73.Size = New System.Drawing.Size(176, 13) + Me.LinkLabel73.TabIndex = 160 + Me.LinkLabel73.TabStop = True + Me.LinkLabel73.Text = "Rechnungsdetaildaten aktualisieren" + ' + 'Button27 + ' + Me.Button27.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button27.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button27.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button27.Location = New System.Drawing.Point(1076, 386) + Me.Button27.Name = "Button27" + Me.Button27.Size = New System.Drawing.Size(123, 24) + Me.Button27.TabIndex = 161 + Me.Button27.Text = "Test Err Mail" + Me.Button27.UseVisualStyleBackColor = True + ' 'txtMRNPrefix ' Me.txtMRNPrefix.Location = New System.Drawing.Point(1036, 48) @@ -1061,7 +1087,7 @@ Partial Class frmStartOptions Me.tbcntr.Controls.Add(Me.TabPage3) Me.tbcntr.Controls.Add(Me.TabPage4) Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Bottom - Me.tbcntr.Location = New System.Drawing.Point(0, 416) + Me.tbcntr.Location = New System.Drawing.Point(0, 466) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 Me.tbcntr.Size = New System.Drawing.Size(1227, 502) @@ -1069,7 +1095,6 @@ Partial Class frmStartOptions ' 'TabPage1 ' - Me.TabPage1.Controls.Add(Me.LinkLabel73) Me.TabPage1.Controls.Add(Me.LinkLabel68) Me.TabPage1.Controls.Add(Me.PictureBox26) Me.TabPage1.Controls.Add(Me.cbxGestellungspeichern) @@ -1133,7 +1158,7 @@ Partial Class frmStartOptions ' Me.LinkLabel68.AutoSize = True Me.LinkLabel68.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel68.Location = New System.Drawing.Point(18, 393) + Me.LinkLabel68.Location = New System.Drawing.Point(743, 32) Me.LinkLabel68.Name = "LinkLabel68" Me.LinkLabel68.Size = New System.Drawing.Size(127, 13) Me.LinkLabel68.TabIndex = 151 @@ -1144,7 +1169,7 @@ Partial Class frmStartOptions ' Me.PictureBox26.BackgroundImage = CType(resources.GetObject("PictureBox26.BackgroundImage"), System.Drawing.Image) Me.PictureBox26.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox26.Location = New System.Drawing.Point(837, 32) + Me.PictureBox26.Location = New System.Drawing.Point(876, 32) Me.PictureBox26.Name = "PictureBox26" Me.PictureBox26.Size = New System.Drawing.Size(18, 18) Me.PictureBox26.TabIndex = 141 @@ -2141,8 +2166,7 @@ Partial Class frmStartOptions ' 'TabPage3 ' - Me.TabPage3.Controls.Add(Me.Label50) - Me.TabPage3.Controls.Add(Me.MyTextBox6) + Me.TabPage3.Controls.Add(Me.MyTextBox06) Me.TabPage3.Controls.Add(Me.CheckBox9) Me.TabPage3.Controls.Add(Me.Label49) Me.TabPage3.Controls.Add(Me.Button28) @@ -2175,39 +2199,30 @@ Partial Class frmStartOptions Me.TabPage3.Text = "Partner-Systeme" Me.TabPage3.UseVisualStyleBackColor = True ' - 'Label50 + 'MyTextBox06 ' - Me.Label50.AutoSize = True - Me.Label50.Location = New System.Drawing.Point(548, 305) - Me.Label50.Name = "Label50" - Me.Label50.Size = New System.Drawing.Size(29, 13) - Me.Label50.TabIndex = 149 - Me.Label50.Text = "Top:" - ' - 'MyTextBox6 - ' - Me.MyTextBox6._DateTimeOnly = False - Me.MyTextBox6._numbersOnly = False - Me.MyTextBox6._numbersOnlyKommastellen = "" - Me.MyTextBox6._numbersOnlyTrennzeichen = False - Me.MyTextBox6._Prozent = False - Me.MyTextBox6._ShortDateNew = False - Me.MyTextBox6._ShortDateOnly = False - Me.MyTextBox6._TimeOnly = False - Me.MyTextBox6._TimeOnly_Seconds = False - Me.MyTextBox6._value = "200" - Me.MyTextBox6._Waehrung = False - Me.MyTextBox6._WaehrungZeichen = False - Me.MyTextBox6.ForeColor = System.Drawing.Color.Black - Me.MyTextBox6.Location = New System.Drawing.Point(583, 302) - Me.MyTextBox6.MaxLength = 18 - Me.MyTextBox6.MaxLineLength = -1 - Me.MyTextBox6.MaxLines_Warning = "" - Me.MyTextBox6.MaxLines_Warning_Label = Nothing - Me.MyTextBox6.Name = "MyTextBox6" - Me.MyTextBox6.Size = New System.Drawing.Size(150, 20) - Me.MyTextBox6.TabIndex = 148 - Me.MyTextBox6.Text = "200" + Me.MyTextBox06._DateTimeOnly = False + Me.MyTextBox06._numbersOnly = False + Me.MyTextBox06._numbersOnlyKommastellen = "" + Me.MyTextBox06._numbersOnlyTrennzeichen = False + Me.MyTextBox06._Prozent = False + Me.MyTextBox06._ShortDateNew = False + Me.MyTextBox06._ShortDateOnly = False + Me.MyTextBox06._TimeOnly = False + Me.MyTextBox06._TimeOnly_Seconds = False + Me.MyTextBox06._value = "200" + Me.MyTextBox06._Waehrung = False + Me.MyTextBox06._WaehrungZeichen = False + Me.MyTextBox06.ForeColor = System.Drawing.Color.Black + Me.MyTextBox06.Location = New System.Drawing.Point(583, 302) + Me.MyTextBox06.MaxLength = 18 + Me.MyTextBox06.MaxLineLength = -1 + Me.MyTextBox06.MaxLines_Warning = "" + Me.MyTextBox06.MaxLines_Warning_Label = Nothing + Me.MyTextBox06.Name = "MyTextBox06" + Me.MyTextBox06.Size = New System.Drawing.Size(150, 20) + Me.MyTextBox06.TabIndex = 148 + Me.MyTextBox06.Text = "200" ' 'CheckBox9 ' @@ -2523,7 +2538,7 @@ Partial Class frmStartOptions Me.TabPage4.Controls.Add(Me.Label50) Me.TabPage4.Controls.Add(Me.txtPLoseKdNr) Me.TabPage4.Controls.Add(Me.LinkLabel74) - Me.TabPage4.Controls.Add(Me.LinkLabel73) + Me.TabPage4.Controls.Add(Me.LinkLabel073) Me.TabPage4.Controls.Add(Me.LinkLabel69) Me.TabPage4.Controls.Add(Me.LinkLabel72) Me.TabPage4.Controls.Add(Me.lblUTAPDFvollst) @@ -2634,12 +2649,11 @@ Partial Class frmStartOptions 'Label50 ' Me.Label50.AutoSize = True - Me.Label50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label50.Location = New System.Drawing.Point(728, 124) + Me.Label50.Location = New System.Drawing.Point(548, 305) Me.Label50.Name = "Label50" - Me.Label50.Size = New System.Drawing.Size(27, 13) - Me.Label50.TabIndex = 163 - Me.Label50.Text = "Jahr" + Me.Label50.Size = New System.Drawing.Size(29, 13) + Me.Label50.TabIndex = 149 + Me.Label50.Text = "Top:" ' 'txtPLoseKdNr ' @@ -2678,16 +2692,16 @@ Partial Class frmStartOptions Me.LinkLabel74.TabStop = True Me.LinkLabel74.Text = "PDF mit RE verknüpfen" ' - 'LinkLabel73 + 'LinkLabel073 ' - Me.LinkLabel73.AutoSize = True - Me.LinkLabel73.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel73.Location = New System.Drawing.Point(18, 387) - Me.LinkLabel73.Name = "LinkLabel73" - Me.LinkLabel73.Size = New System.Drawing.Size(176, 13) - Me.LinkLabel73.TabIndex = 160 - Me.LinkLabel73.TabStop = True - Me.LinkLabel73.Text = "Rechnungsdetaildaten aktualisieren" + Me.LinkLabel073.AutoSize = True + Me.LinkLabel073.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel073.Location = New System.Drawing.Point(18, 419) + Me.LinkLabel073.Name = "LinkLabel073" + Me.LinkLabel073.Size = New System.Drawing.Size(148, 13) + Me.LinkLabel073.TabIndex = 152 + Me.LinkLabel073.TabStop = True + Me.LinkLabel073.Text = "KN8 EZT DE Stat.Bundesamt" ' 'LinkLabel69 ' @@ -2709,32 +2723,6 @@ Partial Class frmStartOptions Me.LinkLabel72.TabStop = True Me.LinkLabel72.Text = "PDF mit RE verknüpfen" ' - 'txtPloseJahr - ' - Me.txtPloseJahr._DateTimeOnly = False - Me.txtPloseJahr._numbersOnly = True - Me.txtPloseJahr._numbersOnlyKommastellen = "" - Me.txtPloseJahr._numbersOnlyTrennzeichen = False - Me.txtPloseJahr._Prozent = False - Me.txtPloseJahr._ShortDateNew = False - Me.txtPloseJahr._ShortDateOnly = False - Me.txtPloseJahr._TimeOnly = False - Me.txtPloseJahr._TimeOnly_Seconds = False - Me.txtPloseJahr._value = "" - Me.txtPloseJahr._Waehrung = False - Me.txtPloseJahr._WaehrungZeichen = False - Me.txtPloseJahr.BackColor = System.Drawing.SystemColors.Window - Me.txtPloseJahr.ForeColor = System.Drawing.Color.Red - Me.txtPloseJahr.Location = New System.Drawing.Point(797, 121) - Me.txtPloseJahr.MaxLength = 10 - Me.txtPloseJahr.MaxLineLength = -1 - Me.txtPloseJahr.MaxLines_Warning = "" - Me.txtPloseJahr.MaxLines_Warning_Label = Nothing - Me.txtPloseJahr.Name = "txtPloseJahr" - Me.txtPloseJahr.Size = New System.Drawing.Size(66, 20) - Me.txtPloseJahr.TabIndex = 158 - Me.txtPloseJahr.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - ' 'lblUTAPDFvollst ' Me.lblUTAPDFvollst.AutoSize = True @@ -2746,32 +2734,6 @@ Partial Class frmStartOptions Me.lblUTAPDFvollst.TabStop = True Me.lblUTAPDFvollst.Text = "PDF Daten vollständig" ' - 'txtUTADate - ' - Me.txtUTADate._DateTimeOnly = False - Me.txtUTADate._numbersOnly = False - Me.txtUTADate._numbersOnlyKommastellen = "" - Me.txtUTADate._numbersOnlyTrennzeichen = False - Me.txtUTADate._Prozent = False - Me.txtUTADate._ShortDateNew = False - Me.txtUTADate._ShortDateOnly = True - Me.txtUTADate._TimeOnly = False - Me.txtUTADate._TimeOnly_Seconds = False - Me.txtUTADate._value = "" - Me.txtUTADate._Waehrung = False - Me.txtUTADate._WaehrungZeichen = True - Me.txtUTADate.BackColor = System.Drawing.SystemColors.Window - Me.txtUTADate.ForeColor = System.Drawing.Color.Red - Me.txtUTADate.Location = New System.Drawing.Point(537, 415) - Me.txtUTADate.MaxLength = 10 - Me.txtUTADate.MaxLineLength = -1 - Me.txtUTADate.MaxLines_Warning = "" - Me.txtUTADate.MaxLines_Warning_Label = Nothing - Me.txtUTADate.Name = "txtUTADate" - Me.txtUTADate.Size = New System.Drawing.Size(66, 20) - Me.txtUTADate.TabIndex = 156 - Me.txtUTADate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - ' 'TextBox3 ' Me.TextBox3.BackColor = System.Drawing.SystemColors.Menu @@ -2794,32 +2756,6 @@ Partial Class frmStartOptions Me.cbxIDSUmbenenen.TabIndex = 153 Me.cbxIDSUmbenenen.UseVisualStyleBackColor = True ' - 'txtIDSYear - ' - Me.txtIDSYear._DateTimeOnly = False - Me.txtIDSYear._numbersOnly = True - Me.txtIDSYear._numbersOnlyKommastellen = "" - Me.txtIDSYear._numbersOnlyTrennzeichen = False - Me.txtIDSYear._Prozent = False - Me.txtIDSYear._ShortDateNew = False - Me.txtIDSYear._ShortDateOnly = False - Me.txtIDSYear._TimeOnly = False - Me.txtIDSYear._TimeOnly_Seconds = False - Me.txtIDSYear._value = "" - Me.txtIDSYear._Waehrung = False - Me.txtIDSYear._WaehrungZeichen = True - Me.txtIDSYear.BackColor = System.Drawing.SystemColors.Window - Me.txtIDSYear.ForeColor = System.Drawing.Color.Red - Me.txtIDSYear.Location = New System.Drawing.Point(24, 301) - Me.txtIDSYear.MaxLength = 10 - Me.txtIDSYear.MaxLineLength = -1 - Me.txtIDSYear.MaxLines_Warning = "" - Me.txtIDSYear.MaxLines_Warning_Label = Nothing - Me.txtIDSYear.Name = "txtIDSYear" - Me.txtIDSYear.Size = New System.Drawing.Size(66, 20) - Me.txtIDSYear.TabIndex = 155 - Me.txtIDSYear.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - ' 'LinkLabel70 ' Me.LinkLabel70.AutoSize = True @@ -4195,6 +4131,16 @@ Partial Class frmStartOptions Me.txtGJ_UNISPED.Size = New System.Drawing.Size(53, 20) Me.txtGJ_UNISPED.TabIndex = 68 ' + 'Label050 + ' + Me.Label050.AutoSize = True + Me.Label050.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label050.Location = New System.Drawing.Point(728, 124) + Me.Label050.Name = "Label050" + Me.Label050.Size = New System.Drawing.Size(27, 13) + Me.Label050.TabIndex = 163 + Me.Label050.Text = "Jahr" + ' 'Button21 ' Me.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -4214,23 +4160,12 @@ Partial Class frmStartOptions Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" ' - 'LinkLabel73 - ' - Me.LinkLabel73.AutoSize = True - Me.LinkLabel73.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel73.Location = New System.Drawing.Point(18, 419) - Me.LinkLabel73.Name = "LinkLabel73" - Me.LinkLabel73.Size = New System.Drawing.Size(148, 13) - Me.LinkLabel73.TabIndex = 152 - Me.LinkLabel73.TabStop = True - Me.LinkLabel73.Text = "KN8 EZT DE Stat.Bundesamt" - ' '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(1229, 920) + Me.ClientSize = New System.Drawing.Size(1229, 970) Me.Controls.Add(Me.pnl) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -4323,6 +4258,7 @@ Partial Class frmStartOptions Friend WithEvents PictureBox12 As PictureBox Friend WithEvents LinkLabel20 As LinkLabel Friend WithEvents MyTextBox1 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents MyTextBox06 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label3 As Label Friend WithEvents CheckBox1 As CheckBox Friend WithEvents cbxBu As CheckBox @@ -4562,8 +4498,11 @@ Partial Class frmStartOptions Friend WithEvents LinkLabel72 As LinkLabel Friend WithEvents txtPloseJahr As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents LinkLabel73 As LinkLabel + Friend WithEvents LinkLabel073 As LinkLabel Friend WithEvents LinkLabel74 As LinkLabel Friend WithEvents txtPLoseKdNr As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label51 As Label Friend WithEvents Label50 As Label + Friend WithEvents Label050 As Label + Friend WithEvents Button27 As Button End Class diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx index da5735e..b42d357 100644 --- a/initATLASAufschubkonten/frmStartOptions.resx +++ b/initATLASAufschubkonten/frmStartOptions.resx @@ -572,102 +572,6 @@ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= @@ -721,9 +625,6 @@ True - - True - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj @@ -818,6 +719,102 @@ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 46ec04b..a57a299 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -2415,6 +2415,8 @@ Public Class frmStartOptions 'IO.Directory.CreateDirectory(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\TEST3\" & betreff.ToString.Replace(",", "")) + betreff = betreff.replace("*00*", "") + If betreff.ToString.Contains("VBD - Versandbegleitdokument (DE), ") Then Dim found = False betreff = betreff.replace("WG: ", "") @@ -5613,8 +5615,8 @@ Public Class frmStartOptions ' Dim dt = (New SQL).loadDgvBySql("SELECT TOP (1000) [ncts_Id] FROM [tblNCTS_FREMD] where ncts_Partnersystem='ATEZ' and ncts_status < 60", "FMZOLL") Dim top = 200 - If IsNumeric(MyTextBox6._value) AndAlso CInt(MyTextBox6._value) > 0 Then - top = CInt(MyTextBox6._value) + If IsNumeric(MyTextBox06._value) AndAlso CInt(MyTextBox06._value) > 0 Then + top = CInt(MyTextBox06._value) End If updateATEZStatusByMRNTop(top) @@ -5831,4 +5833,8 @@ Public Class frmStartOptions Me.Cursor = Cursors.Default End Sub + + Private Sub Button27_Click_1(sender As Object, e As EventArgs) Handles Button27.Click + cErrorHandler.sendERRORperMail(My.Application.Info.AssemblyName, "TEST", "", "error@verag.ag", "", "Error_Test") + End Sub End Class \ No newline at end of file