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-11-05 08:47:41 +01:00
parent bed1c032af 4e88299736
commit cd842113c4
56 changed files with 8463 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb
View File

@@ -169,6 +169,8 @@ Public Class cFinanzOnlineWebService
UID_TMP.uid_stufe = Stufe
UID_TMP.uid_pruefungstool = "FINANZONLINE"
UID_TMP.SAVE()
If multiUID Then
@@ -203,7 +205,7 @@ Public Class cFinanzOnlineWebService
UID_TMP_new.uid_adr6 = adrz6
UID_TMP_new.uid_stufe = Stufe
UID_TMP.uid_pruefungstool = "FINANZONLINE"
UID_TMP_new.SAVE()
If (UID_TMP.uid_valid) Then 'OK

7
VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb
View File

@@ -348,7 +348,7 @@ Public Class cSyska_Interface
If dt_BuchungenZeilen IsNot Nothing AndAlso dt_BuchungenZeilen.Rows.Count > 0 Then
For Each rz In dt_BuchungenZeilen.Rows
file.WriteLine(genBuchungsZeile(rz, SummeBuchungen, Geschaeftsjahr, FIRMA, curDifferenzbetrag, ambargubuchungen)) ' BuchungsZeilen...
file.WriteLine(genBuchungsZeile(rz, SummeBuchungen, Geschaeftsjahr, FIRMA, curDifferenzbetrag, ambargubuchungen, r("Buchungstext"))) ' BuchungsZeilen...
Next
End If
If curDifferenzbetrag <> 0 Then 'Differenz --> Ausgelich auf Diff.Konto
@@ -741,7 +741,7 @@ Public Class cSyska_Interface
Return genBuchungsZeileSum
End Function
Public Shared Function genBuchungsZeile(row As DataRow, ByRef SummeBuchungen As Double, ByRef Geschäftsjahr As Integer, ByRef FIRMA As VERAG_PROG_ALLGEMEIN.cFirmen, ByRef curDifferenzbetrag As Double, Optional ambargubuchungen As Boolean = False) As String
Public Shared Function genBuchungsZeile(row As DataRow, ByRef SummeBuchungen As Double, ByRef Geschäftsjahr As Integer, ByRef FIRMA As VERAG_PROG_ALLGEMEIN.cFirmen, ByRef curDifferenzbetrag As Double, Optional ambargubuchungen As Boolean = False, Optional Buchungstext As String = "") As String
Dim curSteuerbetrag As Double
Dim curNettobetrag As Double
@@ -818,7 +818,8 @@ Public Class cSyska_Interface
genBuchungsZeile &= FiBuSollkontonummer & vbTab
genBuchungsZeile &= FiBuHabenkontonummer & vbTab
genBuchungsZeile &= row("FilialenNr") & "/" & row("AbfertigungsNr") & "/" & CDbl(row("UnterNr")).ToString("00") & vbTab
'genBuchungsZeile &= row("FilialenNr") & "/" & row("AbfertigungsNr") & "/" & CDbl(row("UnterNr")).ToString("00") & vbTab
genBuchungsZeile &= IIf(Buchungstext <> "" AndAlso Buchungstext.Contains("Zinsen"), Buchungstext & vbTab, row("FilialenNr") & "/" & row("AbfertigungsNr") & "/" & CDbl(row("UnterNr")).ToString("00") & vbTab)
genBuchungsZeile &= Format(CDbl(FiBuBruttobetrag), fmt) & vbTab