Mailtextvariable für RMC
This commit is contained in:
@@ -384,6 +384,15 @@ Public Class frmFaktEmail
|
|||||||
|
|
||||||
If Not SR Then
|
If Not SR Then
|
||||||
|
|
||||||
|
If RECHNUNG.VermittlerKundenNr = 150000 Then
|
||||||
|
replaceKZ("nichtRMC", TextHTML)
|
||||||
|
TextHTML = TextHTML.ToString.Replace("%RMC:", "") : TextHTML = TextHTML.ToString.Replace("RMC%", "")
|
||||||
|
Else
|
||||||
|
replaceKZ("RMC", TextHTML)
|
||||||
|
TextHTML = TextHTML.ToString.Replace("%nichtRMC:", "") : TextHTML = TextHTML.ToString.Replace("nichtRMC%", "")
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
If RECHNUNG.FilialenNr = 4817 And Firma_ID = 19 AndAlso RECHNUNG.ErfassungsNr IsNot Nothing Then
|
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)
|
Dim SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr, RECHNUNG.UnterNr)
|
||||||
If SPEDBUCH.hasEntry AndAlso (SPEDBUCH.Abfertigungsart = 114 Or SPEDBUCH.Abfertigungsart = 115 Or SPEDBUCH.Abfertigungsart = 10) Then
|
If SPEDBUCH.hasEntry AndAlso (SPEDBUCH.Abfertigungsart = 114 Or SPEDBUCH.Abfertigungsart = 115 Or SPEDBUCH.Abfertigungsart = 10) Then
|
||||||
@@ -406,6 +415,10 @@ Public Class frmFaktEmail
|
|||||||
TextHTML = TextHTML.ToString.Replace("%", "")
|
TextHTML = TextHTML.ToString.Replace("%", "")
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
If mailText <> "" Then TextHTML &= mailText & vbNewLine
|
If mailText <> "" Then TextHTML &= mailText & vbNewLine
|
||||||
'TextHTML &= "<br><br><br>" & cFakturierung.getSignature(RechnungsLandKz, Firma_ID)
|
'TextHTML &= "<br><br><br>" & cFakturierung.getSignature(RechnungsLandKz, Firma_ID)
|
||||||
|
|
||||||
@@ -1315,6 +1328,7 @@ Public Class frmFaktEmail
|
|||||||
If TextHTML = "" Then Exit Sub
|
If TextHTML = "" Then Exit Sub
|
||||||
|
|
||||||
Dim index_start As Integer = TextHTML.ToString.IndexOf("%" & KZ & ":")
|
Dim index_start As Integer = TextHTML.ToString.IndexOf("%" & KZ & ":")
|
||||||
|
If index_start < 0 Then Exit Sub
|
||||||
Dim txtKZ = TextHTML.ToString.Substring(index_start)
|
Dim txtKZ = TextHTML.ToString.Substring(index_start)
|
||||||
Dim index_end As Integer = txtKZ.ToString.IndexOf("%", 1)
|
Dim index_end As Integer = txtKZ.ToString.IndexOf("%", 1)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user