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-08-19 09:01:29 +02:00
parent a8ec52518f 1b2ab457a4
commit b9b605e39d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SDL/Creditsafe/usrcntlVAT_ATEZ.vb
View File

@@ -129,7 +129,7 @@ Public Class usrcntlVAT_ATEZ
Next Next
If dgvVAT.Rows(0).Cells("total_pages").Value <> pageCpunterCheck Then If dgvVAT.Rows(0).Cells("total_pages").Value <> pageCpunterCheck Then
lblLand.Text = "ACHTUNG, es wurden nur " & pageCpunterCheck & " von möglichen " & dgvVAT.Rows(0).Cells("total_pages").Value & " per KI ausgelesen, das kann uU zu fehlern beim Aufsplitten der Seiten führen!" lblLand.Text = "ACHTUNG, es wurden nur " & pageCpunterCheck & " von möglichen " & dgvVAT.Rows(0).Cells("total_pages").Value & " Seiten per KI ausgelesen, das kann uU zu fehlern beim Aufsplitten der Seiten führen!"
lblLand.ForeColor = Color.Red lblLand.ForeColor = Color.Red
lblLand.Visible = True lblLand.Visible = True
Else Else

2
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -1186,7 +1186,7 @@ Public Class usrCntlFaktAbrechnung
If FIRMA IsNot Nothing AndAlso FIRMA.Firma_ID = 19 AndAlso SPEDBUCH IsNot Nothing AndAlso SPEDBUCH.FilialenNr = 4817 Then landBez = CheckLandNr_getLandBezFromAntrag(landNr, antrag) If FIRMA IsNot Nothing AndAlso FIRMA.Firma_ID = 19 AndAlso SPEDBUCH IsNot Nothing AndAlso SPEDBUCH.FilialenNr = 4817 Then landBez = CheckLandNr_getLandBezFromAntrag(landNr, antrag)
Dim addFields As String = "" Dim addFields As String = ""
Dim orderby As String = " AND MDM_Staffelpreis" Dim orderby As String = ""
If addFieldsBoolean Then If addFieldsBoolean Then
addFields = ", MDM_Land as Land, MDM_RMC as RMC, MDM_Fremd as Fremd, MDM_VZ as VZ, MDM_Staffelpreis as Staffelpreis" addFields = ", MDM_Land as Land, MDM_RMC as RMC, MDM_Fremd as Fremd, MDM_VZ as VZ, MDM_Staffelpreis as Staffelpreis"

10
VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb
View File

@@ -245,7 +245,7 @@ Public Class cOfferte
Case "RO" : leistBez = IIf(Not IsDBNull(r("LeistungsBez_RO")), r("LeistungsBez_RO"), "") Case "RO" : leistBez = IIf(Not IsDBNull(r("LeistungsBez_RO")), r("LeistungsBez_RO"), "")
Case "TR" : leistBez = IIf(Not IsDBNull(r("LeistungsBez_TR")), r("LeistungsBez_TR"), "") Case "TR" : leistBez = IIf(Not IsDBNull(r("LeistungsBez_TR")), r("LeistungsBez_TR"), "")
Case Else Case Else
P.LeistungsBez = r("LeistungsBez") leistBez = r("LeistungsBez")
End Select End Select
If leistBez.Length > 30 Then If leistBez.Length > 30 Then
@@ -306,7 +306,7 @@ Public Class cOfferte
Case "RO" : leistBez = r("LeistungsBez_RO") Case "RO" : leistBez = r("LeistungsBez_RO")
Case "TR" : leistBez = r("LeistungsBez_TR") Case "TR" : leistBez = r("LeistungsBez_TR")
Case Else Case Else
P.LeistungsBez = r("LeistungsBez") leistBez = r("LeistungsBez")
End Select End Select
If leistBez.Length > 30 Then If leistBez.Length > 30 Then
@@ -433,7 +433,7 @@ Public Class cOffertPosition
Property MDM_VZ As Object = Nothing Property MDM_VZ As Object = Nothing
Property MDM_RMC As Object = Nothing Property MDM_RMC As Object = Nothing
Property MDM_Fremd As Object = Nothing Property MDM_Fremd As Object = Nothing
Property MDM_Staffelpreis As Object = Nothing Property MDM_Preisstaffel As Object = Nothing
Dim SQL As New SQL Dim SQL As New SQL
@@ -505,14 +505,14 @@ Public Class cOffertPosition
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MDM_VZ", MDM_VZ)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MDM_VZ", MDM_VZ))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MDM_RMC", MDM_RMC)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MDM_RMC", MDM_RMC))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MDM_Fremd", MDM_Fremd)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MDM_Fremd", MDM_Fremd))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MDM_Staffelpreis", MDM_Staffelpreis)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MDM_Preisstaffel", MDM_Preisstaffel))
Return list Return list
End Function End Function
Public Function INSERT() As Boolean Public Function INSERT() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Return SQL.doSQLVarList(getInsertCmd, "FMZOLL", False, list) Return SQL.doSQLVarList(getInsertCmd, "FMZOLL", True, list)
End Function End Function
Public Function UPDATE(LEISTUNGSBEZ_ORG As String) As Boolean Public Function UPDATE(LEISTUNGSBEZ_ORG As String) As Boolean