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

Version, cFakt, etc.

Browse Source
This commit is contained in:
d.breimaier
2026-07-28 08:22:31 +02:00
parent 8d4c14ef88
commit ac2e14ff6e
1 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
SDL/Fakturierung/cFakturierung.vb
View File

@@ -3764,7 +3764,7 @@ Public Class cFakturierung
Return getSignature(RECHNUNG.RechnungsLandKz, RECHNUNG.Firma_ID) Return getSignature(RECHNUNG.RechnungsLandKz, RECHNUNG.Firma_ID)
End Function End Function
Shared Function getSignature(Optional landKz = "", Optional firma = -1, Optional individuell = False, Optional displayFirmenmane = True, Optional special = "", Optional additionalLine = "", Optional departmentmailadress = True, Optional fakturierung = False, Optional firmenSignature = False, Optional useImagesFromWebserver = False) As String Shared Function getSignature(Optional landKz = "", Optional firma = -1, Optional individuell = False, Optional displayFirmenmane = True, Optional special = "", Optional additionalLine = "", Optional departmentmailadress = True, Optional fakturierung = False, Optional firmenSignature = False, Optional useLogosFromDB = False) As String
getSignature = "" getSignature = ""
firma = getFirmaNr(firma) firma = getFirmaNr(firma)
@@ -3773,9 +3773,17 @@ Public Class cFakturierung
Dim imgTag As String = "" Dim imgTag As String = ""
If useImagesFromWebserver Then If special = "BREXIT_VERAG" Then
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "VERAG_AEO_MailSig.jpg""/>"
Else
Dim firma_temp As New cFirmen(firma) Dim firma_temp As New cFirmen(firma)
If useLogosFromDB AndAlso (firma_temp.Firma_Logo IsNot Nothing OrElse firma_temp.Firma_Logo_Erweitert IsNot Nothing) Then
Dim logo As Byte() Dim logo As Byte()
If firma_temp.Firma_Logo_Erweitert IsNot Nothing Then If firma_temp.Firma_Logo_Erweitert IsNot Nothing Then
logo = firma_temp.Firma_Logo_Erweitert logo = firma_temp.Firma_Logo_Erweitert
@@ -3788,18 +3796,18 @@ Public Class cFakturierung
Dim base64 As String = Convert.ToBase64String(imageBytes) Dim base64 As String = Convert.ToBase64String(imageBytes)
imgTag = "<img width=""250"" height=""50"" src=""data:image/jpeg;base64," & base64 & """ />" imgTag = "<img width=""250"" height=""50"" src=""data:image/jpeg;base64," & base64 & """ />"
Else Else
Select Case special
Case "BREXIT_VERAG" : imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "VERAG_AEO_MailSig.jpg""/>"
Case Else
Select Case firma Select Case firma
Case 1 'VERAG Case 1 'VERAG
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "VERAG_AEO_MailSig.jpg""/>" imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "VERAG_AEO_MailSig.jpg""/>"
Case 4 'VERAG AG (DE) Case 4 'VERAG AG (DE)
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Verag-AG-Logo21.png""/>" imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Verag-AG-Logo2.png""/>"
Case 7 'ATILLA Case 7 'ATILLA
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Atilla.jpg""/>" imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Atilla.jpg""/>"
@@ -3831,11 +3839,14 @@ Public Class cFakturierung
End Select End Select
End Select
End If
End If End If
Dim emailindividuell As String = "" Dim emailindividuell As String = ""
If Not firmenSignature Then emailindividuell = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_email If Not firmenSignature Then emailindividuell = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_email