From 14383d5cbe4a506895bb985e004acbf4d1962d76 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 22 Apr 2025 16:28:00 +0200 Subject: [PATCH] merge beta --- .../frmStartOptions.Designer.vb | 44 +++++++++---------- initATLASAufschubkonten/frmStartOptions.vb | 38 ++++++++-------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 531c558..9d950cc 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -25,8 +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.LinkLabel73 = New System.Windows.Forms.LinkLabel() + 'Me.Button27 = New System.Windows.Forms.Button() Me.txtMRNPrefix = New System.Windows.Forms.TextBox() Me.ATCNRinRE = New System.Windows.Forms.LinkLabel() Me.PictureBox24 = New System.Windows.Forms.PictureBox() @@ -278,7 +278,7 @@ 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.Label050 = New System.Windows.Forms.Label() Me.Button21 = New System.Windows.Forms.Button() Me.cbxPloseNeu = New System.Windows.Forms.CheckBox() Me.MyTextBox3 = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -359,8 +359,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.LinkLabel73) + 'Me.pnl.Controls.Add(Me.Button27) Me.pnl.Controls.Add(Me.txtMRNPrefix) Me.pnl.Controls.Add(Me.ATCNRinRE) Me.pnl.Controls.Add(Me.PictureBox24) @@ -445,26 +445,26 @@ Partial Class frmStartOptions ' '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" + '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 + '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 ' diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index dbe1692..419ca7c 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -3982,17 +3982,17 @@ Public Class frmStartOptions End If SDL.Sachbearbeiter = "ASFINAG" - Dim Validto = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss")) + Dim Validto = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss")) - SDL.KartenNr = SQl.checkNullStr(oRDR.GetValue("CardNumber")) + SDL.KartenNr = SQL.checkNullStr(oRDR.GetValue("CardNumber")) If Validto <> "" Then SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(oRDR.GetValue("CardNumber"), 1, 2), Mid(Validto, 3, 2), 1))) End If - SDL.OBUID = SQl.checkNullStr(oRDR.GetValue("OBUID")) - SDL.Vertragsabschlussdatum = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss")) - SDL.Kategorie = SQl.checkNullStr(oRDR.GetValue("Kategorie")) - SDL.Schadstoffklasse = SQl.checkNullStr(oRDR.GetValue("Schadstoffklasse")) - SDL.Status = SQl.checkNullStr(oRDR.GetValue("Status")) + SDL.OBUID = SQL.checkNullStr(oRDR.GetValue("OBUID")) + SDL.Vertragsabschlussdatum = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss")) + SDL.Kategorie = SQL.checkNullStr(oRDR.GetValue("Kategorie")) + SDL.Schadstoffklasse = SQL.checkNullStr(oRDR.GetValue("Schadstoffklasse")) + SDL.Status = SQL.checkNullStr(oRDR.GetValue("Status")) SDL.SAVE() End If @@ -4038,21 +4038,21 @@ Public Class frmStartOptions End If SDL.Sachbearbeiter = "ASFINAG" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_TEST", "") - Dim Validto = SQl.checkNullStr(row.Item("contractDate")) + Dim Validto = SQL.checkNullStr(row.Item("contractDate")) - SDL.KartenNr = SQl.checkNullStr(row.Item("cardNumber")) + SDL.KartenNr = SQL.checkNullStr(row.Item("cardNumber")) If Validto <> "" Then 'MsgBox(Mid(row.Item("ValidTo"), 1, 2) & " " & Mid(row.Item("ValidTo"), 3, 2)) SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(row.Item("ValidTo"), 1, 2), Mid(row.Item("ValidTo"), 3, 2), 1))) 'noch im DETAIL checken! End If - SDL.OBUID = SQl.checkNullStr(row.Item("OBUID")) - SDL.Vertragsabschlussdatum = SQl.checkNullStr(row.Item("contractDate")) - SDL.Kategorie = SQl.checkNullStr(row.Item("vehicleCategory")) - SDL.Schadstoffklasse = SQl.checkNullStr(row.Item("emissionCategory")) - SDL.Status = SQl.checkNullStr(row.Item("status")) - SDL.Nationalitaet = SQl.checkNullStr(row.Item("nationality")) - SDL.CO2Kategorie = SQl.checkNullStr(row.Item("CO2EmissionsClass")) + SDL.OBUID = SQL.checkNullStr(row.Item("OBUID")) + SDL.Vertragsabschlussdatum = SQL.checkNullStr(row.Item("contractDate")) + SDL.Kategorie = SQL.checkNullStr(row.Item("vehicleCategory")) + SDL.Schadstoffklasse = SQL.checkNullStr(row.Item("emissionCategory")) + SDL.Status = SQL.checkNullStr(row.Item("status")) + SDL.Nationalitaet = SQL.checkNullStr(row.Item("nationality")) + SDL.CO2Kategorie = SQL.checkNullStr(row.Item("CO2EmissionsClass")) SDL.SAVE() End If @@ -5859,9 +5859,9 @@ weiter: 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 + '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 Private Sub LinkLabel52_LinkClicked_1(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel52.LinkClicked