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-08-20 13:48:45 +02:00
parent feaec7a290 b92ba0480c
commit a97eb51344
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SDL/Fakturierung/frmFaktEmail.vb
View File

@@ -185,6 +185,8 @@ Public Class frmFaktEmail
If AD.AdressenNr = 1001688 Then cbxExcelEvolog.Checked = True 'EVOLOG
If AD.AdressenNr = 800020 Then cbxTransFerry.Checked = True 'TRANS FERRY 360
If (AD.AdressenNr.ToString.Substring(0, 2) = 15 Or AD.AdressenNr.ToString.Substring(0, 2) = 18) AndAlso cbxMergePDF.Enabled = True Then cbxMergePDF.Checked = True
If AD.E_Mail IsNot Nothing AndAlso AD.E_Mail <> "" Then lkl.Text = """" & AD.E_Mail & """ anfügen" : lkl.Tag = AD.E_Mail
If AD.E_Mail2 IsNot Nothing AndAlso AD.E_Mail2 <> "" Then lklcc.Text = """" & AD.E_Mail2 & """ anfügen" : lklcc.Tag = AD.E_Mail2
lblKunde.Text = AD.AdressenNr & " - " & AD.Ordnungsbegriff

2
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -5002,7 +5002,7 @@ mwst:
Dim count_nichtAbgerVZ As Integer = -1
count_nichtAbgerVZ = CInt(SQL.getValueTxtBySql("SELECT COUNT(*) FROM [tblUStVPositionen] WHERE [UStVAn_ID] = " & USTV_ANTRAG.UStVAn_ID & " and [UStVPo_VZ] = 1 and isnull(UStVPo_VZ_RKID,0) = 0", "FMZOLL"))
If count_nichtAbgerVZ = 0 Then
Return SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 0 WHERE [UStVAn_ID] IN (SELECT [UStVAn_ID] FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull([UStVPo_VZ_RKID],0) = 0 AND [UStVAn_ID] = " & USTV_ANTRAG.UStVAn_ID & " )", "FMZOLL")
Return SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 0 WHERE [UStVAn_ID] IN (SELECT [UStVAn_ID] FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull([UStVPo_VZ_RKID],0) <> 0 AND [UStVAn_ID] = " & USTV_ANTRAG.UStVAn_ID & " )", "FMZOLL")
End If
End If

2
SDL/USTV/frmMDM_USTVAntrag.vb
View File

@@ -3480,7 +3480,7 @@ Public Class frmMDM_USTVAntrag
Next
'würde prüfung nochmals für alle machen, performance allerdings nicht gut....
'SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 0 WHERE [UStVAn_ID] IN (SELECT [UStVAn_ID] FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull([UStVPo_VZDatetime],0) = 0 )")
'SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 0 WHERE [UStVAn_ID] IN (SELECT [UStVAn_ID] FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull(UStVPo_VZ_RKID,0) <> 0)")
Dim count_nichtAbgerVZ As Integer = -1
count_nichtAbgerVZ = CInt(SQL.getValueTxtBySql("SELECT COUNT(*) FROM [tblUStVPositionen] WHERE [UStVAn_ID] = " & USTV_ANTRAG.UStVAn_ID & " and [UStVPo_VZ] = 1 and isnull(UStVPo_VZ_RKID,0) = 0", "FMZOLL"))

14
VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb
View File

@@ -308,11 +308,9 @@ Public Class cSyska_Interface
If Not System.IO.Directory.Exists(path) Then System.IO.Directory.CreateDirectory(path)
If Not System.IO.Directory.Exists(pathArchiv) Then System.IO.Directory.CreateDirectory(pathArchiv)
'-------------------------------------------------------------------------------------------
'----------------- Buchungssätze -----------------
If True Then 'boolBuchungen Then
If WdhDateiname = "" AndAlso Not ambargubuchungen Then TrdInvoice_FUNCTIONS.TrdinSchreiben(FIRMA.Firma_ID) 'Lädt die Daten aus der Tabelle Rechnungsausgang in die Tabelle trdInvoice (nur für 20 = IMEX )
@@ -330,11 +328,6 @@ Public Class cSyska_Interface
'file.WriteLine(genBuchungenBeginn()) 'not needed
For Each r In dt_Buchungen.Rows
If r("Rechnungsnummer") = 25224877 Then
MsgBox("")
End If
Dim curDifferenzbetrag As Double = 0
If r("WährungFremd") Is DBNull.Value Then
curDifferenzbetrag = Math.Round(If(r("RechnungsbetragLokal") < 0, 0 - r("RechnungsbetragLokal"), r("RechnungsbetragLokal")), 2)
@@ -364,6 +357,9 @@ Public Class cSyska_Interface
If r("BelegartenNr") = 71 And Not ambargubuchungen Then 'GUTSCHRIFT ---> Immer am Schluss
file.WriteLine(genBuchungsZeileSum(r, SummeBuchungen, Geschaeftsjahr, FIRMA, ambargubuchungen))
End If
Next
For Each r In dt_Buchungen.Rows
If r("VZ") = 1 Then
file.WriteLine(genBuchungsZeileVZ(r, SummeBuchungen, Geschaeftsjahr, FIRMA, ambargubuchungen))
End If
@@ -900,7 +896,7 @@ Public Class cSyska_Interface
genBuchungsZeileVZ &= Format(CDbl(FiBuSteuersatz), fmt) & vbTab 'FiBuSteuersatz
genBuchungsZeileVZ &= FormatStringDbl(FiBuSteuerbetrag) & vbTab 'FiBuSteuerbetrag
genBuchungsZeileVZ &= FiBuWährung & vbTab
genBuchungsZeileVZ &= Format(CDbl(SummeBuchungen), fmt) & vbTab
genBuchungsZeileVZ &= Format(CDbl(FiBuEigenbruttobetrag), fmt) & vbTab