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-05-21 12:04:06 +02:00
parent 8f59d7e380 44c87e5060
commit f73f77b76f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -1444,7 +1444,7 @@ Public Class usrCntlFaktAbrechnung
POS.Anzahl = If(r.Cells("Anzahl").Value Is DBNull.Value, 0, r.Cells("Anzahl").Value)
'-----------------------MWST-Abrechnung! + Kompat. zu FM-Zoll
If FIRMA.Firma_ID = 19 Then
If FIRMA IsNot Nothing AndAlso FIRMA.Firma_ID = 19 Then
Dim isRC As Boolean = If(r.Cells("ReverseCharge").Value IsNot DBNull.Value, r.Cells("ReverseCharge").Value, False)
setMWSTABRfromSPEDinPOS(r, POS, landNr, landBez, antrag)
End If
@@ -4464,7 +4464,7 @@ Nächste_Textzeile_lesen:
Dim landbez As String = ""
If SPEDBUCH Is Nothing Then Return landbez
If SPEDBUCH.FilialenNr = 4817 AndAlso SPEDBUCH.AbfertigungsNr > 0 And FIRMA.Firma_ID = 19 Then
If SPEDBUCH.FilialenNr = 4817 AndAlso SPEDBUCH.AbfertigungsNr > 0 AndAlso FIRMA IsNot Nothing AndAlso FIRMA.Firma_ID = 19 Then
Dim antragsID As Integer = CInt(SQL.getValueTxtBySql("SELECT UStVAn_ID FROM tblUStVAntrag WHERE FilialenNr = " & SPEDBUCH.FilialenNr & " AND AbfertigungsNr = " & SPEDBUCH.AbfertigungsNr, "FMZOLL",,, "-1"))