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

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

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-04-15 14:46:29 +02:00
parent 258efbe1d8 814133b95a
commit 100b1c3030
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SDL/USTV/frmMDM_USTVAntrag.vb
View File

@@ -1098,10 +1098,13 @@ Public Class frmMDM_USTVAntrag
If Leistender IsNot Nothing Then If Leistender IsNot Nothing Then
USTV_POS.UStVPo_LeistenderId = Leistender.UStV_LeistenderId USTV_POS.UStVPo_LeistenderId = Leistender.UStV_LeistenderId
USTV_POS.UStVPo_Leistender = Leistender.UStV_Leistender
Else
USTV_POS.UStVPo_Leistender = "Union Tank Eckstein Gmbh&Co KG"
End If End If
USTV_POS.UStVPo_Leistungsbezeichnung = "MAUT, DIESEL oder KFZ-Zubehör" USTV_POS.UStVPo_Leistungsbezeichnung = "MAUT, DIESEL oder KFZ-Zubehör"
USTV_POS.UStVPo_Leistender = "Union Tank Eckstein Gmbh&Co KG, Kleinostheim"
USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
USTV_POS.UStVPo_Zeitstempel = Now() USTV_POS.UStVPo_Zeitstempel = Now()

9
SDL/USTV/frmUSTVoffeneAntraege.vb
View File

@@ -569,16 +569,17 @@ Public Class frmUSTVoffeneAntraege
Dim counter = 0 Dim counter = 0
Dim landBez As String = "" Dim landBez As String = ""
Dim klammer = "" Dim klammer = ""
For Each t In dtKundeMWST.Rows 'klammer &= IIf(dtKundeMWST.Rows.Count > 0, "OR AdressenNr <> -1 ", "")
klammer &= ")" 'For Each t In dtKundeMWST.Rows
Next ' 'klammer &= ")"
'Next
If dtKundeMWST.Columns.Contains("KdNr") Then If dtKundeMWST.Columns.Contains("KdNr") Then
' If dtKundeMWST.Rows.Count > 0 Then sqlwhereLand &= "And " ' If dtKundeMWST.Rows.Count > 0 Then sqlwhereLand &= "And "
' For Each row As DataRow In dtKundeMWST.Rows ' For Each row As DataRow In dtKundeMWST.Rows
' landBez = row.Item("abc").ToString.Replace(";", "'") ' landBez = row.Item("abc").ToString.Replace(";", "'")
' counter = counter + 1 ' counter = counter + 1
' sqlwhereLand &= " ( AdressenNr = " & row.Item("KdNr") & " AND Einreichland Not in (" & landBez.ToString.Substring(0, landBez.ToString.Length - 1) & ") " & IIf(dtKundeMWST.Rows.Count <> 0 And counter <> dtKundeMWST.Rows.Count, "OR ", klammer) ' sqlwhereLand &= " ( AdressenNr = " & row.Item("KdNr") & " AND Einreichland Not in (" & landBez.ToString.Substring(0, landBez.ToString.Length - 1) & ")) " & IIf(dtKundeMWST.Rows.Count <> 0 And counter <> dtKundeMWST.Rows.Count, "OR ", klammer)
' Next ' Next
Else Else