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

fix

Browse Source
This commit is contained in:
d.breimaier
2025-06-18 11:56:26 +02:00
parent 493c8d5c5f
commit 4e9ecf9f28
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
SDL/Fakturierung/frmFaktEmail.vb
View File

@@ -379,37 +379,39 @@ Public Class frmFaktEmail
Dim KUNDE_ERW As New cKundenErweitert(KdNr) Dim KUNDE_ERW As New cKundenErweitert(KdNr)
If RECHNUNG.FilialenNr = 4817 And Firma_ID = 19 AndAlso RECHNUNG.ErfassungsNr IsNot Nothing Then If Not SR Then
Dim SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr, RECHNUNG.UnterNr)
If SPEDBUCH.hasEntry AndAlso (SPEDBUCH.Abfertigungsart = 114 Or SPEDBUCH.Abfertigungsart = 115) Then
Dim USTV_ANTRAG As New cUSTVAntrag(RECHNUNG.ErfassungsNr)
If USTV_ANTRAG.UStVAn_Sicherheit Then
replaceKZ("KZ1", TextHTML)
TextHTML = TextHTML.ToString.Replace("%KZ4:", "") : TextHTML = TextHTML.ToString.Replace("%", "")
ElseIf KUNDE_ERW.kde_Erstattungsart = 4 Then If RECHNUNG.FilialenNr = 4817 And Firma_ID = 19 AndAlso RECHNUNG.ErfassungsNr IsNot Nothing Then
replaceKZ("KZ1", TextHTML) Dim SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr, RECHNUNG.UnterNr)
TextHTML = TextHTML.ToString.Replace("%KZ4:", "") : TextHTML = TextHTML.ToString.Replace("%", "") If SPEDBUCH.hasEntry AndAlso (SPEDBUCH.Abfertigungsart = 114 Or SPEDBUCH.Abfertigungsart = 115) Then
Dim USTV_ANTRAG As New cUSTVAntrag(RECHNUNG.ErfassungsNr)
If USTV_ANTRAG.UStVAn_Sicherheit Then
replaceKZ("KZ1", TextHTML)
TextHTML = TextHTML.ToString.Replace("%KZ4:", "") : TextHTML = TextHTML.ToString.Replace("%", "")
ElseIf KUNDE_ERW.kde_Erstattungsart = 1 Then ElseIf KUNDE_ERW.kde_Erstattungsart = 4 Then
replaceKZ("KZ4", TextHTML) replaceKZ("KZ1", TextHTML)
TextHTML = TextHTML.ToString.Replace("%KZ1:", "") : TextHTML = TextHTML.ToString.Replace("%", "") TextHTML = TextHTML.ToString.Replace("%KZ4:", "") : TextHTML = TextHTML.ToString.Replace("%", "")
ElseIf KUNDE_ERW.kde_Erstattungsart = 1 Then
replaceKZ("KZ4", TextHTML)
TextHTML = TextHTML.ToString.Replace("%KZ1:", "") : TextHTML = TextHTML.ToString.Replace("%", "")
Else
replaceKZ("KZ1", TextHTML)
replaceKZ("KZ4", TextHTML)
TextHTML = TextHTML.ToString.Replace("%", "")
End If
If mailText <> "" Then TextHTML &= mailText & vbNewLine
'TextHTML &= "<br><br><br>" & cFakturierung.getSignature(RechnungsLandKz, Firma_ID)
Else
replaceKZ("KZ1", TextHTML)
replaceKZ("KZ4", TextHTML)
TextHTML = TextHTML.ToString.Replace("%", "")
End If End If
If mailText <> "" Then TextHTML &= mailText & vbNewLine
'TextHTML &= "<br><br><br>" & cFakturierung.getSignature(RechnungsLandKz, Firma_ID)
End If End If
End If End If
End If End If
End If End If
End If End If