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

div. Änderungen

Browse Source
This commit is contained in:
d.breimaier
2025-09-24 12:12:03 +02:00
parent cd3d34182f
commit 3556d96d7a
8 changed files with 216 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
View File

@@ -557,8 +557,8 @@ Public Class cRechnungsausgang
If FIRMA.Firma_ID = 19 Then
Select Case Me.BelegartenKz
Case "AR" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) < 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False
Case "AG" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) > 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False
Case "AR" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) > 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False
Case "AG" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) < 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False
End Select
End If

8
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
View File

@@ -408,12 +408,14 @@ Public Class frmUeberstundenauszahlen
Next
If (stunden100bereitsausbezahl + stunden50bereitsausbezahlt + stunden25bereitsausbezahlt) > 0 Then
If MA.mit_firma = "ATILLA" Then GoTo sonderRegelungAtilla :
picDel.Visible = True
Button1.Enabled = False
txtAusz.Enabled = False
picShow.Visible = True
Else
Button1.Enabled = True
sonderRegelungAtilla:
Button1.Enabled = True
txtAusz.Enabled = True
picShow.Visible = False
@@ -816,6 +818,10 @@ Public Class frmUeberstundenauszahlen
If istTeilzeit Then txtAusgabe.Append("25% ÜS: " & CDbl(txtberAusz25.Text) & vbNewLine)
'txtAusgabe.Append("ÜS gesamt: " & CDbl(txtberAusz100.Text) + CDbl(txtberAusz50.Text) + CDbl(txtberAusz25.Text))
If cbxabwDatum.Checked Then
MsgBox("Das Zurücksetzen von bereits ausgezahlten Stunden bei abweichenden Datum wird aktuell (noch) nicht unterstützt!")
Exit Sub
End If
Dim aksAuszahlung As MsgBoxResult = MsgBox(txtAusgabe.ToString, vbYesNo)
If aksAuszahlung = vbYes Then

55
VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb
View File

@@ -2,16 +2,9 @@
Imports System.Data.SqlClient
Imports System.IO
Imports System.Net
Imports System.Numerics
Imports System.Reflection
Imports System.Runtime.InteropServices.ComTypes
Imports System.Text.RegularExpressions
Imports System.Threading
Imports System.Web.UI
Imports com.sun.org.apache.xalan.internal.xsltc
Imports com.sun.source.tree
Imports Microsoft.VisualBasic.ApplicationServices
Imports Org.BouncyCastle.Ocsp
Public Class cCreditSafeAPI
@@ -497,14 +490,14 @@ Public Class cCreditSafeAPI
If failureDesc <> "" Then
If showError Then MsgBox(failureDesc)
Return "Error"
Return "Error" & vbNewLine & failureDesc & vbNewLine & myUrl
End If
Dim json As New Chilkat.JsonObject
Dim success As Boolean = json.Load(jsonRespString)
If (success <> True) Then
Debug.WriteLine(json.LastErrorText)
Return "Verbindungsfehler"
Return "Verbindungsfehler" & vbNewLine & json.LastErrorText
End If
If dtEvents.Columns.Count = 0 Then
@@ -575,7 +568,7 @@ Public Class cCreditSafeAPI
dtEvents.Rows.Add(R)
Dim cEvent As New cCreditsafeEvent(CLng(R("eventId")))
Dim cEvent As New cCreditsafeEvent(CLng(R("eventId")), company.kdNr)
cEvent.eventId = R("eventId")
cEvent.companyId = R("companyId")
@@ -1409,9 +1402,16 @@ Public Class cCreditSafeAPI
Me.eventId = eventId
LOAD()
End Sub
Sub New(eventId, kundenNr) 'zwei unterschiedliche KundenNr können dieselbe eventID besitzen (weil bei uns alles tlw. doppelt angelegt ist!!!!!)
Me.eventId = eventId
kundenNr = kundenNr
LOADKDNR()
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("eventId", eventId,, True))
'list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eventId", eventId,, True))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eventId", eventId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("companyId", companyId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("portfolioId", portfolioId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ruleName", ruleName))
@@ -1443,7 +1443,7 @@ Public Class cCreditSafeAPI
Public Function SAVE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblCreditsafeEvents WHERE eventId=@eventId) " &
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblCreditsafeEvents WHERE eventId=@eventId AND kundenNr=@kundenNr) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
@@ -1480,6 +1480,35 @@ Public Class cCreditSafeAPI
End Try
End Sub
Public Sub LOADKDNR()
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM tblCreditsafeEvents WHERE eventId=@eventId AND kundenNr=@kundenNr ", conn)
cmd.Parameters.AddWithValue("@eventId", eventId)
cmd.Parameters.AddWithValue("@kundenNr", kundenNr)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each li In getParameterList()
Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
If dr.Item(li.Text) Is DBNull.Value Then
propInfo.SetValue(Me, Nothing)
Else
propInfo.SetValue(Me, dr.Item(li.Text))
End If
Next
hasEntry = True
End If
dr.Close()
End Using
End Using
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
Public Function getUpdateCmd() As String
@@ -1493,7 +1522,7 @@ Public Class cCreditSafeAPI
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
Return (" UPDATE tblCreditsafeEvents SET " & str & " WHERE eventId=@eventId ")
Return (" UPDATE tblCreditsafeEvents SET " & str & " WHERE eventId=@eventId AND kundenNr=@kundenNr")
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)