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

95
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,69 +3773,80 @@ Public Class cFakturierung
Dim imgTag As String = "" Dim imgTag As String = ""
If useImagesFromWebserver Then If special = "BREXIT_VERAG" Then
Dim firma_temp As New cFirmen(firma) imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "VERAG_AEO_MailSig.jpg""/>"
Dim logo As Byte()
If firma_temp.Firma_Logo_Erweitert IsNot Nothing Then
logo = firma_temp.Firma_Logo_Erweitert
ElseIf firma_temp.Firma_Logo IsNot Nothing Then
logo = firma_temp.Firma_Logo
End If
Dim imageBytes() As Byte = CType(logo, Byte())
Dim base64 As String = Convert.ToBase64String(imageBytes)
imgTag = "<img width=""250"" height=""50"" src=""data:image/jpeg;base64," & base64 & """ />"
Else Else
Select Case special Dim firma_temp As New cFirmen(firma)
Case "BREXIT_VERAG" : imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "VERAG_AEO_MailSig.jpg""/>"
Case Else
Select Case firma If useLogosFromDB AndAlso (firma_temp.Firma_Logo IsNot Nothing OrElse firma_temp.Firma_Logo_Erweitert IsNot Nothing) Then
Case 1 'VERAG
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "VERAG_AEO_MailSig.jpg""/>"
Case 4 'VERAG AG (DE)
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Verag-AG-Logo21.png""/>"
Case 7 'ATILLA Dim logo As Byte()
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Atilla.jpg""/>" If firma_temp.Firma_Logo_Erweitert IsNot Nothing Then
logo = firma_temp.Firma_Logo_Erweitert
ElseIf firma_temp.Firma_Logo IsNot Nothing Then
logo = firma_temp.Firma_Logo
End If
Case 11 'VERAG CS
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Verag_Customs_Service_AEO.jpg""/>"
Case 20 'Imex Dim imageBytes() As Byte = CType(logo, Byte())
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "IMEX-LOGO-AEO_sig.jpg""/>" Dim base64 As String = Convert.ToBase64String(imageBytes)
imgTag = "<img width=""250"" height=""50"" src=""data:image/jpeg;base64," & base64 & """ />"
Case 24 'AMBAR
imgTag = "<img width=""250"" height=""70"" src=""" & imgsrc & "ambar_boarder.png""/>"
Case 21 'UNISPED Else
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Unisped_logo.jpg""/>"
Case 19 'VERAG360
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "VERAG_360.jpg""/>"
Case 26 'VERAG-UNISPED
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "VERAG-UNISPED-Logo.jpg""/>"
Case 99 'GmbH Select Case firma
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Verag-Spedition-GMBH-Logo1.png""/>" Case 1 'VERAG
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "VERAG_AEO_MailSig.jpg""/>"
Case 17 'Front-Office Case 4 'VERAG AG (DE)
imgTag = "<img width=""170"" height=""50"" src=""" & imgsrc & "Logo_blue_globe_Horizontal.jpg""/>" imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Verag-AG-Logo2.png""/>"
End Select Case 7 'ATILLA
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Atilla.jpg""/>"
End Select Case 11 'VERAG CS
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Verag_Customs_Service_AEO.jpg""/>"
Case 20 'Imex
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "IMEX-LOGO-AEO_sig.jpg""/>"
Case 24 'AMBAR
imgTag = "<img width=""250"" height=""70"" src=""" & imgsrc & "ambar_boarder.png""/>"
Case 21 'UNISPED
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Unisped_logo.jpg""/>"
Case 19 'VERAG360
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "VERAG_360.jpg""/>"
Case 26 'VERAG-UNISPED
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "VERAG-UNISPED-Logo.jpg""/>"
Case 99 'GmbH
imgTag = "<img width=""250"" height=""50"" src=""" & imgsrc & "Verag-Spedition-GMBH-Logo1.png""/>"
Case 17 'Front-Office
imgTag = "<img width=""170"" height=""50"" src=""" & imgsrc & "Logo_blue_globe_Horizontal.jpg""/>"
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