div. Änderungen
This commit is contained in:
@@ -639,13 +639,13 @@ Public Class cAutomailversand
|
|||||||
|
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
Private Function getAnhangbezeichnung(sprache As String, RECHNUNG As cRechnungsausgang, BelegartenNr As Integer)
|
Private Function getAnhangbezeichnung(sprache As String, RECHNUNG As cRechnungsausgang, BelegartenNr As Integer, Optional onlyBelegsuebersetzung As Boolean = False)
|
||||||
|
|
||||||
Dim Anhangsbez = ""
|
Dim Anhangsbez = ""
|
||||||
If RECHNUNG IsNot Nothing Then
|
If RECHNUNG IsNot Nothing Then
|
||||||
|
|
||||||
Select Case sprache
|
Select Case sprache
|
||||||
Case "A", "AT", "D", "DE", "CH" : If BelegartenNr = 71 Then Anhangsbez = "Gutschriftsanhänge.pdf" Else Anhangsbez = "Rechnungsanhänge.pdf"
|
Case "A", "AT", "D", "DE", "CH" : If BelegartenNr = 71 Then IIf(onlyBelegsuebersetzung, Anhangsbez = "Gutschrift.pdf", Anhangsbez = "Gutschriftsanhänge.pdf") Else IIf(onlyBelegsuebersetzung, Anhangsbez = "Rechnung.pdf", Anhangsbez = "Rechnungsanhänge.pdf")
|
||||||
Case "TR" : If BelegartenNr = 71 Then Anhangsbez = "Kredi.pdf" Else Anhangsbez = "Fatura.pdf"
|
Case "TR" : If BelegartenNr = 71 Then Anhangsbez = "Kredi.pdf" Else Anhangsbez = "Fatura.pdf"
|
||||||
Case Else : If BelegartenNr = 71 Then Anhangsbez = "Creditnote.pdf" Else Anhangsbez = "Invoice.pdf"
|
Case Else : If BelegartenNr = 71 Then Anhangsbez = "Creditnote.pdf" Else Anhangsbez = "Invoice.pdf"
|
||||||
End Select
|
End Select
|
||||||
@@ -682,7 +682,7 @@ Public Class cAutomailversand
|
|||||||
Dim mergeList As New List(Of String)
|
Dim mergeList As New List(Of String)
|
||||||
|
|
||||||
' Beleg
|
' Beleg
|
||||||
Dim belegName = If(RECHNUNG.BelegartenKz = "AR", "Rechnung.pdf", "Gutschrift.pdf")
|
Dim belegName = getAnhangbezeichnung(sprache, RECHNUNG, BelegartenNr, True)
|
||||||
|
|
||||||
For Each pdf In listPDFs
|
For Each pdf In listPDFs
|
||||||
ATTACHMENTS.Add(New cFakt_MailATTach(pdf, belegName))
|
ATTACHMENTS.Add(New cFakt_MailATTach(pdf, belegName))
|
||||||
@@ -784,7 +784,7 @@ Public Class cAutomailversand
|
|||||||
|
|
||||||
'1--> Beleg
|
'1--> Beleg
|
||||||
For Each l In listPDFs
|
For Each l In listPDFs
|
||||||
ATTACHMENTS.Add(New cFakt_MailATTach(l, If(RECHNUNG.BelegartenKz = "AR", "Rechnung.pdf", "Gutschrift.pdf")))
|
ATTACHMENTS.Add(New cFakt_MailATTach(l, getAnhangbezeichnung(RECHNUNG.RechnungSprache, RECHNUNG, RECHNUNG.BelegartenNr, True)))
|
||||||
Next
|
Next
|
||||||
|
|
||||||
'2--> Anhänge der Rechnung
|
'2--> Anhänge der Rechnung
|
||||||
|
|||||||
@@ -3471,9 +3471,9 @@ Public Class usrCntlFaktAbrechnung
|
|||||||
|
|
||||||
setAutomailversand(True)
|
setAutomailversand(True)
|
||||||
|
|
||||||
saveMe()
|
If saveMe() Then
|
||||||
|
|
||||||
initRECHNUNG()
|
initRECHNUNG()
|
||||||
|
End If
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user