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

SigAMBAR

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-12-19 08:15:27 +01:00
parent c68b2d2835
commit d6897eeb7e
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SDL/Fakturierung/cFakturierung.vb
View File

@@ -2,6 +2,7 @@
Imports System.Globalization Imports System.Globalization
Imports awt.ShellApi Imports awt.ShellApi
Imports Microsoft.Office.Interop Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN.TESTJSON
Public Class cFakturierung Public Class cFakturierung
@@ -1636,9 +1637,10 @@ Public Class cFakturierung
getSignature &= "<div style=""font-size:12px"">A 4975 Suben, Autobahngrenze 15 <br><b>T</b> +43 7711 31630 | <b>F</b> +43 7711 31630-1 | <b>@</b> " & If(individuell, emailindividuell, "info@imex-group.at") & " | www.imex-group.at | FN 410356s</div>" getSignature &= "<div style=""font-size:12px"">A 4975 Suben, Autobahngrenze 15 <br><b>T</b> +43 7711 31630 | <b>F</b> +43 7711 31630-1 | <b>@</b> " & If(individuell, emailindividuell, "info@imex-group.at") & " | www.imex-group.at | FN 410356s</div>"
If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine
Case 24 'AMBAR Case 24 'AMBAR
Dim defaultMail = getDefaultMail("AMBAR")
getSignature &= "<img width=""250"" height=""70"" src=""" & imgsrc & "ambar_simple.png""/>" getSignature &= "<img width=""250"" height=""70"" src=""" & imgsrc & "ambar_simple.png""/>"
If displayFirmenmane Then getSignature &= "<br><b>AMBAR Logistic Services GmbH</b><br>" If displayFirmenmane Then getSignature &= "<br><b>AMBAR Logistic Services GmbH</b><br>"
getSignature &= "<div style=""font-size:12px"">D 83435 Bad Reichenhall, Reichenhallerstrasse 62<br><b>T</b> +49 8651 99624911 | <b>F</b> +49 8651 9962493 | <b>@</b> " & If(individuell, emailindividuell, "info@ambarlog.de") & " | www.ambarlog.com | DE309105428</div>" getSignature &= "<div style=""font-size:12px"">D 83435 Bad Reichenhall, Reichenhallerstrasse 62<br><b>T</b> +49 8651 99624911 | <b>F</b> +49 8651 9962493 | <b>@</b> " & If(individuell, emailindividuell, defaultMail) & " | www.ambarlog.com | DE309105428</div>"
If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine
Case 21 'UNISPED Case 21 'UNISPED
getSignature &= "<img width=""250"" height=""50"" src=""" & imgsrc & "Unisped_logo.jpg""/>" getSignature &= "<img width=""250"" height=""50"" src=""" & imgsrc & "Unisped_logo.jpg""/>"
@@ -1708,6 +1710,17 @@ Public Class cFakturierung
End Select End Select
End Function End Function
Shared Function getDefaultMail(firma)
Dim defaultMail = ""
Select Case firma
Case "AMBAR"
defaultMail = "import@ambarlog.de"
If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "BH" Then defaultMail = "buchhaltung@ambarlog.de"
If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "EXPORT" Then defaultMail = "office@ambarlog.de"
End Select
End Function
Shared Function Abrechnugsdaten_AKTUALISIEREN(ByRef RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional RechnungsDatum As Object = Nothing) As Boolean Shared Function Abrechnugsdaten_AKTUALISIEREN(ByRef RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional RechnungsDatum As Object = Nothing) As Boolean
RECHNUNG.[DruckDatumZeit] = Now RECHNUNG.[DruckDatumZeit] = Now

20
SDL/Formulare/KDFormulare/frmFormulare.vb
View File

@@ -1064,6 +1064,14 @@ Public Class frmFormulare
If l.Mail_BCC <> "" Then Mail.CC = l.Mail_BCC If l.Mail_BCC <> "" Then Mail.CC = l.Mail_BCC
If l.Mail_Subject <> "" Then Mail.Subject = l.Mail_Subject If l.Mail_Subject <> "" Then Mail.Subject = l.Mail_Subject
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
Try
Mail.SentOnBehalfOfName = SDL.cFakturierung.getDefaultMail("AMBAR")
Mail.HTMLBody &= cFakturierung.getSignature(cboTextKonserveSprache._value, 24, False, True)
Catch ex2 As Exception
MsgBox(ex2.Message)
End Try
End If
Mail.Attachments.Add(dest_path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Formular.pdf") Mail.Attachments.Add(dest_path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Formular.pdf")
Mail.Display() Mail.Display()
@@ -1074,6 +1082,16 @@ Public Class frmFormulare
Dim Mail As Microsoft.Office.Interop.Outlook.MailItem Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
Mail = outl.CreateItem(0) Mail = outl.CreateItem(0)
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
Try
Mail.SentOnBehalfOfName = SDL.cFakturierung.getDefaultMail("AMBAR")
Mail.HTMLBody &= cFakturierung.getSignature(cboTextKonserveSprache._value, 24, True, True)
Catch ex2 As Exception
MsgBox(ex2.Message)
End Try
End If
If Me.txtEmail.Text <> "" Then Mail.To = Me.txtEmail.Text If Me.txtEmail.Text <> "" Then Mail.To = Me.txtEmail.Text
If cboTextkonserve._value <> "" AndAlso cboTextKonserveSprache._value <> "" Then If cboTextkonserve._value <> "" AndAlso cboTextKonserveSprache._value <> "" Then
Dim tX As New VERAG_PROG_ALLGEMEIN.cTextkonserve("FRM_MNGR_MailText", cboTextkonserve._value, cboTextKonserveSprache._value, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) Dim tX As New VERAG_PROG_ALLGEMEIN.cTextkonserve("FRM_MNGR_MailText", cboTextkonserve._value, cboTextKonserveSprache._value, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
@@ -1100,6 +1118,8 @@ Public Class frmFormulare
Mail.Subject = Mail.Subject.Replace("%LKWKennzeichen%", "") Mail.Subject = Mail.Subject.Replace("%LKWKennzeichen%", "")
End If End If
Mail.Attachments.Add(dest_path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Formular.pdf") Mail.Attachments.Add(dest_path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Formular.pdf")
Mail.Display() Mail.Display()