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-02-12 12:40:23 +01:00
parent afcfd962fe 3e1bc43dd2
commit 5b36701345
17 changed files with 3548 additions and 2995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb
View File

@@ -356,6 +356,7 @@ Public Class cUStVPositionen
Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
End Function
Public Function getUpdateCmd() As String
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
@@ -424,7 +425,7 @@ Public Class cUStVPositionen
Public Function DELETE(UStVAn_ID, UStVPo_ID) As Boolean
Dim sqlstr = " DELETE FROM tblUStVPositionen WITH(updlock,serializable) WHERE UStVAn_ID=" & Me.UStVAn_ID & " AND UStVPo_ID=" & Me.UStVPo_ID
Dim sqlstr = " DELETE FROM tblUStVPositionen WHERE UStVAn_ID=" & Me.UStVAn_ID & " AND UStVPo_ID=" & Me.UStVPo_ID
Return SQL.doSQL(sqlstr, "FMZOLL")
End Function

31
VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb
View File

@@ -21,9 +21,11 @@ Public Class cUStVLeistender
Me.UStV_Leistender = UStV_Leistender
LOAD()
End Sub
Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_Leistender", UStV_Leistender,, True))
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_Leistender", UStV_Leistender))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_PLZ", UstV_Leistender_PLZ))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_Strasse", UstV_Leistender_Strasse))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_Stadt", UstV_Leistender_Stadt))
@@ -36,19 +38,28 @@ Public Class cUStVLeistender
Public Function SAVE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Public Function SAVE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblUStVLeistender WHERE UStV_Leistender=@UStV_Leistender) " &
" BEGIN " & getUpdateCmd() & " END " & " commit tran "
'" Else " &
'" BEGIN " & getInsertCmd() & " END " &
'" commit tran "
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
" commit tran "
Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
End Function
End Function
Public Sub LOAD()
Public Function INSERT() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = getInsertCmd()
Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
End Function
Public Sub LOAD()
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()

6
VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
View File

@@ -88,6 +88,9 @@ Public Class cKundenErweitert
Property kde_WechselBlanko As Boolean = False
Property kde_UStV_SummeVorschaubetragEUR_PLOSE As Object = Nothing
Property kde_keineMWSt As Boolean = False
Property kde_MWStAbrechnung As Object = Nothing
Property kde_AnmerkungVZ As Object = Nothing
Property kde_VZ As Boolean = False
Dim SQL As New SQL
@@ -178,6 +181,9 @@ Public Class cKundenErweitert
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_WechselBlanko", kde_WechselBlanko))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_UStV_SummeVorschaubetragEUR_PLOSE", kde_UStV_SummeVorschaubetragEUR_PLOSE))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_keineMWSt", kde_keineMWSt))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_MWStAbrechnung", kde_MWStAbrechnung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_AnmerkungVZ", kde_AnmerkungVZ))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_VZ", kde_VZ))
Return list
End Function

3
VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
View File

@@ -719,6 +719,9 @@
<EmbeddedResource Include="Benutzerdefinierte Steuerelemente\HTMLTextBox.resx">
<DependentUpon>HTMLTextBox.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Benutzerdefinierte Steuerelemente\MySearchBox.resx">
<DependentUpon>MySearchBox.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Benutzerdefinierte Steuerelemente\RichTextBoxEx.resx">
<DependentUpon>RichTextBoxEx.vb</DependentUpon>
</EmbeddedResource>