edv/ADMIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ADMIN' of https://dev.azure.com/VeragAG/_git/ADMIN into ADMIN

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-03-10 11:45:21 +01:00
parent cd3b0ca707 f538f7fe70
commit 5b4600b75e
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -870,12 +870,7 @@ Public Class frmStartOptions
For Each row In dt.Rows For Each row In dt.Rows
Dim cDHF_Anhaenge As New VERAG_PROG_ALLGEMEIN.cDHF_Anhaenge(row("AnmID"), row("MsgTyp"), row("LizenzNr")) Dim cDHF_Anhaenge As New VERAG_PROG_ALLGEMEIN.cDHF_Anhaenge(row("AnmID"), row("MsgTyp"), row("LizenzNr"))
If Not cDHF_Anhaenge.hasEntry Or cDHF_Anhaenge.LRN = "4805/24006407" Then 'WENN NEU:: If Not cDHF_Anhaenge.hasEntry Then 'WENN NEU::
If cDHF_Anhaenge.LRN = "4805/24006407" Then
MsgBox("Test")
End If
cDHF_Anhaenge.AnmID = row("AnmID") cDHF_Anhaenge.AnmID = row("AnmID")
cDHF_Anhaenge.LizenzNr = row("LizenzNr") cDHF_Anhaenge.LizenzNr = row("LizenzNr")
@@ -3249,13 +3244,17 @@ Public Class frmStartOptions
If SQL.doSQL("INSERT INTO tblKundenBesonderheiten (kdb_KundenNr,kdb_kategorie,kdb_text,kdb_mitId,kdb_mitName,kdb_EingetragenAm,kdb_visible,kdb_hervorheben,kdb_history) " & If SQL.doSQL("INSERT INTO tblKundenBesonderheiten (kdb_KundenNr,kdb_kategorie,kdb_text,kdb_mitId,kdb_mitName,kdb_EingetragenAm,kdb_visible,kdb_hervorheben,kdb_history) " &
" VALUES(" & kunde.KundenNr & ",'ALLG' ,'" & textUIDVermerk & "'," & "4" & ",'" & "AUTO" & "','" & Now() & "',1,1,0)", "FMZOLL") Then " VALUES(" & kunde.KundenNr & ",'ALLG' ,'" & textUIDVermerk & "'," & "4" & ",'" & "AUTO" & "','" & Now() & "',1,1,0)", "FMZOLL") Then
setUIDToNull(kunde) setUIDToNull(kunde)
End If End If
Else Else
If kunde.Besonderheiten <> "" Then kunde.Besonderheiten &= vbNewLine If kunde.Besonderheiten <> "" Then kunde.Besonderheiten &= vbNewLine
kunde.Besonderheiten &= textUIDVermerk kunde.Besonderheiten &= textUIDVermerk
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "IMEX" : kunde.FiBuSchnittstelle = True 'IMEX-Kunden sollen neu in DVO exportiert werden!
End Select
kunde.SAVE() kunde.SAVE()
setUIDToNull(kunde) setUIDToNull(kunde)
@@ -3670,7 +3669,7 @@ Public Class frmStartOptions
Private Sub LinkLabel20_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel20.LinkClicked Private Sub LinkLabel20_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel20.LinkClicked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
Dim bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "as@verag.ag;ih@verag.ag;kb@verag.ag", "al@verag.ag;d.breimaier@verag.ag",, MyTextBox2._value, cbxVermerk.Checked) Dim bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "as@verag.ag;kb@verag.ag", "al@verag.ag;d.breimaier@verag.ag",, MyTextBox2._value, cbxVermerk.Checked)
'bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "d.breimaier@verag.ag",,, MyTextBox2._value, cbxVermerk.Checked) 'bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "d.breimaier@verag.ag",,, MyTextBox2._value, cbxVermerk.Checked)
'Dim bool = getUID_PruefungVERAG(MyTextBox1.Text) 'Dim bool = getUID_PruefungVERAG(MyTextBox1.Text)
showPic(bool, PictureBox12) showPic(bool, PictureBox12)
@@ -4696,13 +4695,17 @@ Public Class frmStartOptions
Dim enddatum_monat2 = lastDaycurrentMonth.Month Dim enddatum_monat2 = lastDaycurrentMonth.Month
Dim enddatum_jahr2 = lastDaycurrentMonth.Year Dim enddatum_jahr2 = lastDaycurrentMonth.Year
Try Try
System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12
Using WC As New System.Net.WebClient() Using WC As New System.Net.WebClient()
' C0008_URL() ' C0008_URL()
WC.Encoding = ASCIIEncoding.UTF8 WC.Encoding = ASCIIEncoding.UTF8
Dim URL = "https://www.zoll.de/SiteGlobals/Functions/Kurse/KursExport.xml?view=xmlexportkursesearchresultZOLLWeb&kursart=" & kursart &
'Mit dem 26.02.2025 hat sich die URL für den Abruf der Wechselkurse geändert!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
'Dim URL = "https://www.zoll.de/SiteGlobals/Functions/Kurse/KursExport.xml?view=xmlexportkursesearchresultZOLLWeb&kursart=" & kursart &
Dim URL = "https://www.zoll.de/SiteGlobals/Functions/Kurse/KursExport.xml?view=xmlexportkursesearchresultzoll&kursart=" & kursart &
"&startdatum_tag2=" & startdatum_tag2 & "&startdatum_tag2=" & startdatum_tag2 &
"&startdatum_monat2=" & startdatum_monat2 & "&startdatum_monat2=" & startdatum_monat2 &
"&startdatum_jahr2=" & startdatum_jahr2 & "&startdatum_jahr2=" & startdatum_jahr2 &

4
initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb
View File

@@ -1,9 +1,5 @@
Imports System.IO Imports System.IO
Imports System.Globalization
Imports System.Xml Imports System.Xml
Imports Renci.SshNet
Imports System.Net.Mail
Imports DocumentFormat.OpenXml.Drawing.Diagrams
Public Class frmTCNachrichtenVerarbeitung Public Class frmTCNachrichtenVerarbeitung
Dim cntDatenEingelesen As Integer = 0 Dim cntDatenEingelesen As Integer = 0