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

This commit is contained in:
2026-05-08 10:47:23 +02:00
12 changed files with 235 additions and 119 deletions

View File

@@ -2,7 +2,6 @@
Imports System.Data.SqlClient
Imports System.Reflection
Imports jdk.nashorn.internal.objects.annotations
Public Class cAufschubKonten
Property brgakto_id As Integer
@@ -12,7 +11,7 @@ Public Class cAufschubKonten
Property brgakto_warn1 As Decimal
Property brgakto_warn2 As Decimal
Property brgakto_gs_standort As Object = Nothing
Property brgakto_gs_zollsatz As Integer
Property brgakto_gs_zollsatz As Decimal
Property brgakto_gs_ustEnabled As Boolean = False
Property brgakto_gs_ust As Object = Nothing
Property brgakto_gs_aktSaldo As Decimal
@@ -100,7 +99,7 @@ Public Class cAufschubKonten
End Using
End Using
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
@@ -132,7 +131,7 @@ Public Class cAufschubKonten
End Using
End Using
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
@@ -152,7 +151,7 @@ Public Class cAufschubKonten
Return (" UPDATE [tblBrgAufschubKonten] SET " & str & " WHERE brgakto_id=@brgakto_id ")
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return ""
End Function
@@ -173,7 +172,7 @@ Public Class cAufschubKonten
values = values.Substring(0, values.Length - 1) 'wg. ','
Return (" INSERT INTO tblBrgAufschubKonten (" & str & ") VALUES(" & values & ") ")
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return ""
End Function
@@ -253,7 +252,7 @@ Public Class cAufschubKonten
Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]=" & brgakto_id & " and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate.ToShortDateString & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,,,)
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Function

View File

@@ -9,6 +9,7 @@ Public Class Sicherheiten_Standort
Public Const UNISPED As String = "UNISPED GmbH"
Public Const AMBAR As String = "AMBAR GmbH"
Public Const ATILLA As String = "ATILLA GmbH"
Public Const ZOLLERN As String = "ZOLLERN"
End Class
Public Class cSicherheiten