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

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

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-10-16 16:06:43 +02:00
parent a5fbf88a20 632e7cfb32
commit c43fd1ef63
40 changed files with 3883 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
View File

@@ -96,11 +96,10 @@ Public Class cKundenErweitert
Property kde_Kopfsammelrechnung As Boolean = False
Property kde_CSPortfolioAdded As Boolean = False
Property kde_CSinsolventAm As Object = Nothing
Property kde_Provisionsverguetung As Boolean = False
Property kde_Provisionsverguetung_ProzentDL As Object = Nothing
Property kde_Provisionsverguetung_GSAnKdNr As Object = Nothing
Property kde_zinssatz As Object = Nothing
@@ -207,6 +206,7 @@ Public Class cKundenErweitert
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Provisionsverguetung_ProzentDL", kde_Provisionsverguetung_ProzentDL))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Provisionsverguetung_GSAnKdNr", kde_Provisionsverguetung_GSAnKdNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CSinsolventAm", kde_CSinsolventAm))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_zinssatz", kde_zinssatz))
Return list
End Function

2
VERAG_PROG_ALLGEMEIN/Classes/cMDMEInarbeitung.vb
View File

@@ -33,7 +33,7 @@ Public Class cMDMEinarbeitung
Sub New(supplier, invoicedate, importdate)
Me.supplier = supplier
Me.invoicedate = invoicedate
Me.import_date = import_date
Me.import_date = importdate
LOAD(supplier, invoicedate, import_date)
End Sub

10
VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
View File

@@ -1117,21 +1117,21 @@ Public Class cMDMFunctionsAllgemein
AND leist.[UStV_Leistender]= [tblUStVPositionen].[UStVPo_Leistender])
where UStVAn_ID=" & USTV_ANTRAG.UStVAn_ID & sqlWHere & " ORDER BY UStVPo_ID"
Dim dtNew As DataTable = sql.loadDgvBySql(StringSQL, " FMZOLL")
Dim dtNew As DataTable = sql.loadDgvBySql(StringSQL, "FMZOLL")
If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then
If type = " excel" Then
If type = "excel" Then
Dim sumVAT As Double = 0
For Each row In dtNew.Rows
If Not IsDBNull(row(" Amount of tax refund")) AndAlso IsNumeric(row(" Amount of tax refund")) Then sumVAT += CDbl(row(" Amount of tax refund"))
If Not IsDBNull(row(" Amount of tax refund")) AndAlso IsNumeric(row(" Amount of tax refund")) Then row(" Amount of tax refund") = CDbl(row(" Amount of tax refund"))
If Not IsDBNull(row(" Name of supplier")) AndAlso row(" Name of supplier") <> "" AndAlso Not IsDBNull(row("VAT")) AndAlso row("VAT") <> "" Then
If Not IsDBNull(row("Amount of tax refund")) AndAlso IsNumeric(row("Amount of tax refund")) Then sumVAT += CDbl(row("Amount of tax refund"))
If Not IsDBNull(row("Amount of tax refund")) AndAlso IsNumeric(row("Amount of tax refund")) Then row("Amount of tax refund") = CDbl(row("Amount of tax refund"))
If Not IsDBNull(row("Name of supplier")) AndAlso row("Name of supplier") <> "" AndAlso Not IsDBNull(row("VAT")) AndAlso row("VAT") <> "" Then
row("Name of supplier") = row("Name of supplier").ToString.Replace(" " & row("VAT").ToString.Substring(0, 2), "")
End If
Next

211
VERAG_PROG_ALLGEMEIN/Classes/cMDMZinsberechnung.vb Normal file
View File

@@ -0,0 +1,211 @@

Imports System.Data.SqlClient
Imports System.Reflection
Public Class cMDMZinsberechnung
Property id As Integer
Property kundenNr As Object = Nothing
Property belegNr As Object = Nothing
Property buchungstext As Object = Nothing
Property kundeZahlungsziel As Object = Nothing
Property zinssatz As Object = Nothing
Property belegZahlungsziel As Object = Nothing
Property ueberschreitungInTagen As Object = Nothing
Property zinsbetrag As Object = Nothing
Property timestamp As Object = Nothing
Property verrechnet As Object = Nothing
Property belegDatum As Object = Nothing
Property zahlungDatum As Object = Nothing
Property zahlungsBetrag As Object = Nothing
Property zahlungsperiode_start As Object = Nothing
Property zahlungsperiode_ende As Object = Nothing
Public hasEntry = False
Dim SQL As New SQL
Sub New(id)
Me.id = id
LOAD()
End Sub
Sub New(kundennr, BelegNr)
Me.kundenNr = kundennr
Me.belegNr = BelegNr
LOAD(kundennr, BelegNr)
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("id", id,, True))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kundenNr", kundenNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("belegNr", belegNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("buchungstext", buchungstext))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kundeZahlungsziel", kundeZahlungsziel))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zinssatz", zinssatz))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("belegZahlungsziel", belegZahlungsziel))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ueberschreitungInTagen", ueberschreitungInTagen))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zinsbetrag", zinsbetrag))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("timestamp", timestamp))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("verrechnet", verrechnet))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("belegDatum", belegDatum))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zahlungDatum", zahlungDatum))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zahlungsBetrag", zahlungsBetrag))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zahlungsperiode_start", zahlungsperiode_start))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zahlungsperiode_ende", zahlungsperiode_ende))
Return list
End Function
Public Function SAVE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMDM_Zinsberechnung WHERE id=@id) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
" commit tran "
Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
End Function
Public Sub LOAD()
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM tblMDM_Zinsberechnung WHERE id=@id ", conn)
cmd.Parameters.AddWithValue("@id", id)
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 Sub LOAD(kundennr, BelegNr)
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM tblMDM_Zinsberechnung WHERE kundennr=@kundennr and BelegNr=@BelegNr ", conn)
cmd.Parameters.AddWithValue("@kundennr", kundennr)
cmd.Parameters.AddWithValue("@BelegNr", BelegNr)
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
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim str As String = ""
For Each i In list
If Not i.isPrimaryParam Then
str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
Return (" UPDATE [tblMDM_Zinsberechnung] SET " & str & " WHERE id=@id ")
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return ""
End Function
Public Function getInsertCmd() As String
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim str As String = ""
Dim values As String = ""
For Each i In list
If Not i.isPrimaryParam Then
str &= "[" & i.Text & "],"
values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
values = values.Substring(0, values.Length - 1) 'wg. ','
Return (" INSERT INTO tblMDM_Zinsberechnung (" & str & ") VALUES(" & values & ") ")
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return ""
End Function
Public Shared Function GET_NICHTABGERECHNETE_ZB(ByRef dt As DataTable, KundenNr As Integer) As Boolean
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT belegNr,belegDatum,buchungstext,zahlungsBetrag,zahlungDatum, ueberschreitungInTagen, zinssatz,zinsbetrag
FROM
tblMDM_Zinsberechnung
WHERE
kundenNr = @KundenNr
AND zinsbetrag <> 0
AND verrechnet is null
ORDER BY
belegDatum", conn)
cmd.Parameters.AddWithValue("@KundenNr", KundenNr)
Dim dr = cmd.ExecuteReader()
dt.Load(dr)
'While dr.Read
' dt.Load(dr)
'End While
dr.Close()
End Using
End Using
Return True
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return False
End Function
End Class

1
VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb
View File

@@ -1338,6 +1338,7 @@ Public Class cUTA
MDMEinarb.ds_count += savedTrans
MDMEinarb.import_date = Now()
MDMEinarb.importfilename = fi.Name
If MDMEinarb.ds_count = MDMEinarb.ds_total - 2 Then 'header and trailer wegzählen!
MDMEinarb.completed = True
MDMEinarb.completed_date = Now()

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

@@ -5,7 +5,6 @@ Imports System.Net
Imports System.Reflection
Imports System.Text.RegularExpressions
Imports System.Threading
Imports com.sun.source.tree
Public Class cCreditSafeAPI
@@ -137,7 +136,7 @@ Public Class cCreditSafeAPI
If type = "addCompanyToPortfolio_CSV" Then
rest.PartSelector = "0"
rest.AddHeader("Content-Type", "multipart/form-data")
rest.AddHeader("Content-Type", "multipart/form-data") 'nicht notwendig!!! - wird automatisch gesetzt
rest.AddHeader("Expect", "100-continue")
Else
rest.AddHeader("Content-Type", "application/json")
@@ -166,9 +165,9 @@ Public Class cCreditSafeAPI
rest.AddHeader("Content-Disposition", "form-data; name=""email""")
rest.SetMultipartBodyString("d.breimaier@verag.ag;as@verag.ag;Viktoria.Leirich@imex-group.at")
rest.PartSelector = "0"
Dim strResponseBody As String = rest.FullRequestMultipart(method, url.Replace(API_STRING, ""))
If (rest.LastMethodSuccess <> True) Then
Debug.WriteLine(rest.LastErrorText)

1
VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
View File

@@ -393,6 +393,7 @@
<Compile Include="AuditFlow\Classes\cAuditFlow_Pruefobjekte.vb" />
<Compile Include="AuditFlow\Classes\cAuditFlow_Pruefungen.vb" />
<Compile Include="Classes\cMDMEInarbeitung.vb" />
<Compile Include="Classes\cMDMZinsberechnung.vb" />
<Compile Include="frmTimasabfrage.Designer.vb">
<DependentUpon>frmTimasabfrage.vb</DependentUpon>
</Compile>