From d6897eeb7e985bf7c9b844996f1faefa5b0e3ceb Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 19 Dec 2023 08:15:27 +0100 Subject: [PATCH] SigAMBAR --- SDL/Fakturierung/cFakturierung.vb | 15 ++++++++++++++- SDL/Formulare/KDFormulare/frmFormulare.vb | 20 ++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 2a4aad83..1758cb6f 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -2,6 +2,7 @@ Imports System.Globalization Imports awt.ShellApi Imports Microsoft.Office.Interop +Imports VERAG_PROG_ALLGEMEIN.TESTJSON Public Class cFakturierung @@ -1636,9 +1637,10 @@ Public Class cFakturierung getSignature &= "
A 4975 Suben, Autobahngrenze 15
T +43 7711 31630 | F +43 7711 31630-1 | @ " & If(individuell, emailindividuell, "info@imex-group.at") & " | www.imex-group.at | FN 410356s
" If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine Case 24 'AMBAR + Dim defaultMail = getDefaultMail("AMBAR") getSignature &= "" If displayFirmenmane Then getSignature &= "
AMBAR Logistic Services GmbH
" - getSignature &= "
D 83435 Bad Reichenhall, Reichenhallerstrasse 62
T +49 8651 99624911 | F +49 8651 9962493 | @ " & If(individuell, emailindividuell, "info@ambarlog.de") & " | www.ambarlog.com | DE309105428
" + getSignature &= "
D 83435 Bad Reichenhall, Reichenhallerstrasse 62
T +49 8651 99624911 | F +49 8651 9962493 | @ " & If(individuell, emailindividuell, defaultMail) & " | www.ambarlog.com | DE309105428
" If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine Case 21 'UNISPED getSignature &= "" @@ -1708,6 +1710,17 @@ Public Class cFakturierung End Select 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 RECHNUNG.[DruckDatumZeit] = Now diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 3eb2f0c3..a3574de2 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1064,6 +1064,14 @@ Public Class frmFormulare If l.Mail_BCC <> "" Then Mail.CC = l.Mail_BCC 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.Display() @@ -1074,6 +1082,16 @@ Public Class frmFormulare Dim Mail As Microsoft.Office.Interop.Outlook.MailItem 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 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) @@ -1100,6 +1118,8 @@ Public Class frmFormulare Mail.Subject = Mail.Subject.Replace("%LKWKennzeichen%", "") End If + + Mail.Attachments.Add(dest_path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Formular.pdf") Mail.Display()