merge beta
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user