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

Merge branch 'ADMIN' of https://git.it.verag.ag/edv/ADMIN into ADMIN

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-01-07 22:29:13 +01:00
parent 355058cefd d3da34b225
commit 11bc5bfa95
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb
View File

@@ -604,15 +604,19 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
Dim destFilename As String = fi.FullName
destFilename = destFilename.Replace(".pdf", IIf(programName.ToLower.Contains("nto"), "_nto", "_bto") & ".pdf")
If Not destFilename.Contains("_nto") AndAlso Not destFilename.Contains("_bto") Then 'verhindert eine mehrfache umbenennung.
System.IO.File.Move(fi.FullName, destFilename) 'Datei umbenennen
destFilename = destFilename.Replace(".pdf", IIf(programName.ToLower.Contains("nto"), "_nto", "_bto") & ".pdf")
System.IO.File.Move(fi.FullName, destFilename) 'Datei umbenennen
fileNamePath = destFilename
End If
fileNamePath = destFilename
End If
If fi.Name.ToString.StartsWith("invoice_") OrElse (fi.Name.ToString.StartsWith("maut_") AndAlso fi.Name.ToString.Contains("EGR") AndAlso Not fi.Name.ToString.Contains("ALL")) Then 'RMC Eigenrechnungen
If fi.Name.ToString.StartsWith("invoice_") OrElse (fi.Name.ToString.StartsWith("maut_") AndAlso fi.Name.ToString.Contains("EGR") AndAlso Not fi.Name.ToString.Contains("ALL")) Then 'RMC Eigenrechnungen
If fi.Name.ToString.StartsWith("invoice_") Then
@@ -687,7 +691,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
If RMC.SAVE() Then
Dim adress As New VERAG_PROG_ALLGEMEIN.cAdressen(RMC.rmc_UID, RMC.rmc_kdNr)
Dim adress As New VERAG_PROG_ALLGEMEIN.cAdressen(RMC.rmc_UID, RMC.rmc_kdNr, True)
If Not adress.hasEntry Then
Dim R As DataRow = dt.NewRow
R("KundenNr") = RMC.rmc_kdNr
@@ -1325,11 +1329,9 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
End If
If RMC.SAVE() Then
If kdNr <> RMC.rmc_kdNr Then
Dim adress As New VERAG_PROG_ALLGEMEIN.cAdressen(RMC.rmc_UID, RMC.rmc_kdNr)
Dim adress As New VERAG_PROG_ALLGEMEIN.cAdressen(RMC.rmc_UID, RMC.rmc_kdNr, True) 'bei Mehrfachanlage muss auf 15-KundenNr georüft werden!
If Not adress.hasEntry Then
Dim R As DataRow = dt.NewRow
R("KundenNr") = RMC.rmc_kdNr

4
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -5430,7 +5430,9 @@ Public Class frmStartOptions
End If
MDMEinarb.import_date = Now()
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then MDMEinarb.SAVE()
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
MDMEinarb.SAVE()
End If
End If