fix
This commit is contained in:
@@ -379,37 +379,39 @@ Public Class frmFaktEmail
|
||||
|
||||
Dim KUNDE_ERW As New cKundenErweitert(KdNr)
|
||||
|
||||
If RECHNUNG.FilialenNr = 4817 And Firma_ID = 19 AndAlso RECHNUNG.ErfassungsNr IsNot Nothing 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("%", "")
|
||||
If Not SR Then
|
||||
|
||||
ElseIf KUNDE_ERW.kde_Erstattungsart = 4 Then
|
||||
replaceKZ("KZ1", TextHTML)
|
||||
TextHTML = TextHTML.ToString.Replace("%KZ4:", "") : TextHTML = TextHTML.ToString.Replace("%", "")
|
||||
If RECHNUNG.FilialenNr = 4817 And Firma_ID = 19 AndAlso RECHNUNG.ErfassungsNr IsNot Nothing 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 = 1 Then
|
||||
replaceKZ("KZ4", TextHTML)
|
||||
TextHTML = TextHTML.ToString.Replace("%KZ1:", "") : TextHTML = TextHTML.ToString.Replace("%", "")
|
||||
ElseIf KUNDE_ERW.kde_Erstattungsart = 4 Then
|
||||
replaceKZ("KZ1", TextHTML)
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user