diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index a1f9e961..36c01e85 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -3764,7 +3764,7 @@ Public Class cFakturierung Return getSignature(RECHNUNG.RechnungsLandKz, RECHNUNG.Firma_ID) 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 = "" firma = getFirmaNr(firma) @@ -3773,69 +3773,80 @@ Public Class cFakturierung Dim imgTag As String = "" - If useImagesFromWebserver Then + If special = "BREXIT_VERAG" Then - Dim firma_temp As New cFirmen(firma) - 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 = "" + imgTag = "" Else - Select Case special - Case "BREXIT_VERAG" : imgTag = "" - Case Else + Dim firma_temp As New cFirmen(firma) - Select Case firma - Case 1 'VERAG - imgTag = "" + If useLogosFromDB AndAlso (firma_temp.Firma_Logo IsNot Nothing OrElse firma_temp.Firma_Logo_Erweitert IsNot Nothing) Then - Case 4 'VERAG AG (DE) - imgTag = "" - Case 7 'ATILLA - imgTag = "" + 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 - Case 11 'VERAG CS - imgTag = "" - Case 20 'Imex - imgTag = "" + Dim imageBytes() As Byte = CType(logo, Byte()) + Dim base64 As String = Convert.ToBase64String(imageBytes) + imgTag = "" - Case 24 'AMBAR - imgTag = "" - Case 21 'UNISPED - imgTag = "" + Else - Case 19 'VERAG360 - imgTag = "" - Case 26 'VERAG-UNISPED - imgTag = "" - Case 99 'GmbH - imgTag = "" + Select Case firma + Case 1 'VERAG + imgTag = "" - Case 17 'Front-Office - imgTag = "" + Case 4 'VERAG AG (DE) + imgTag = "" - End Select + Case 7 'ATILLA + imgTag = "" - End Select + Case 11 'VERAG CS + imgTag = "" + + Case 20 'Imex + imgTag = "" + + Case 24 'AMBAR + + imgTag = "" + + Case 21 'UNISPED + imgTag = "" + + Case 19 'VERAG360 + imgTag = "" + + Case 26 'VERAG-UNISPED + imgTag = "" + + Case 99 'GmbH + imgTag = "" + + Case 17 'Front-Office + imgTag = "" + + End Select + + + End If End If + + Dim emailindividuell As String = "" If Not firmenSignature Then emailindividuell = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_email