diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 8fa9892..40cd787 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -15,6 +15,7 @@ Imports System.Runtime.InteropServices Imports GrapeCity.Viewer.Common.Model Imports System.Drawing.Drawing2D Imports SDL +Imports Microsoft.Office.Interop 'Imports UID @@ -4545,11 +4546,48 @@ Public Class frmHauptfenster End Sub Private Sub DatevBuchungsexportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DatevBuchungsexportToolStripMenuItem.Click - If VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, False, True, True) Then - MsgBox("Buchungen wurden erfolgreich exportiert!") - Else - MsgBox("Es wurden keine Buchungen exportiert!") - End If + + Try + Dim Pathlist As New List(Of String) + + If VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, False, True, True,, Pathlist) Then + MsgBox("Buchungen wurden erfolgreich exportiert!") + Else + MsgBox("Es wurden keine Buchungen exportiert!") + Exit Sub + End If + + Dim outl As New Outlook.Application + Dim Mail As Microsoft.Office.Interop.Outlook.MailItem + Mail = outl.CreateItem(0) + + Mail.To = "T.Wesolowski@hkt-tax.de" + Mail.CC = "C.Tuendermann@hkt-tax.de;D.Horneber@hkt-tax.de" + + + Dim TextHTML = "" + TextHTML &= "Sehr geehrte Damen und Herren,
im Anhang befinden sich die Exportdaten für die Buchhaltung!" + TextHTML &= "
" + TextHTML &= "
" + TextHTML &= "Mit freundlichen Grüßen
" + TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "
" + TextHTML &= "
" + TextHTML &= cFakturierung.getSignature("DE", 24, True, True) + + Mail.HTMLBody = "
" & TextHTML & "
" + + Mail.Subject = "DATEV-Buchungsdaten AMBAR " & Now.Date.ToShortDateString + + For Each path In Pathlist + Mail.Attachments.Add(path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue) + Next + + Mail.Display() + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Sub Private Sub APIToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles APIToolStripMenuItem.Click diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 886fd6a..ed8ad08 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -2998,12 +2998,16 @@ Public Class frmSendungsdetailsNEU Case "AMBAR" If cboFiliale._value <> "5701" Then sperren = True 'UNISPED darf VERIMEX nicht, sonst alle im CLUSTER Case "VERAG" - If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(cboFiliale._value) <> "VERAG" And cboFiliale._value <> "5701" Then sperren = True 'Grundsätzlich wenn nicht VERAG --> sperren + If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(cboFiliale._value) <> "VERAG" Then sperren = True 'Grundsätzlich wenn nicht VERAG --> sperren If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Then If cboFiliale._value = "5601" Or cboFiliale._value = "5501" Then sperren = True End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_AMBARVERAG", "AVISO") Then + If cboFiliale._value = "5701" Then sperren = False + End If + If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(cboFiliale._value) = "IMEX" AndAlso VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then sperren = False End If @@ -3254,39 +3258,11 @@ Public Class frmSendungsdetailsNEU End Sub Sub initAnhang() - Dim hSQL As String = " SELECT [anh_id],[anh_Name],anh_Datum,[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND anh_Art='' THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ],anh_LaufzettelDruck,anh_GestellungslisteAnfuegen, anh_markiert FROM [tblAvisoAnhaenge] - WHERE anh_AvisoId=" & AvisoId & " AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId=" & SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID & ") - ORDER BY anh_SendungsId desc, - case - /* when [anh_Art] ='ATR' then 0 - when [anh_Art] ='Rechnung' then 1 - when [anh_Art] ='CMR' then 2 - when [anh_Art] ='Ausfuhr' then 3 - when [anh_Art] ='Packliste' then 4 - when [anh_Art] ='Auftrag' then 5 - when [anh_Art] ='Sonstiges' then 6 - when [anh_Art] ='' then 7*/ - - when [anh_Art] = 'ATR-EUR1' then 0 - when [anh_Art] = 'Rechnung' then 1 - when [anh_Art] = 'eFatura' then 1.1 - when [anh_Art] = 'CMR' then 2 - when [anh_Art] = 'Ausfuhr' then 3 - when [anh_Art] = 'Vorpapier' then 4 - when [anh_Art] = 'Packliste' then 5 - when [anh_Art] = 'Auftrag' then 6 - when [anh_Art] = 'Auftrag' then 7 - when [anh_Art] = 'Dispoliste' then 8 - when [anh_Art] = 'Vorkasse' then 9 - when [anh_Art] = 'Überweisungsbeleg' then 10 - when [anh_Art] = 'Vollmacht' then 11 - when [anh_Art] = 'ATB' then 12 - when [anh_Art] = 'ATA' then 13 - when [anh_Art] = 'Sonstiges' then 99 - when [anh_Art] ='' then 15 - - END, [anh_Reihenfolge],[anh_id]" - + Dim hSQL As String = " SELECT [anh_id],[anh_Name],anh_Datum,[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND anh_Art='' THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ],anh_LaufzettelDruck,anh_GestellungslisteAnfuegen, anh_markiert + FROM [tblAvisoAnhaenge] + left join tblAvisoAnhangsArten on aa_name = anh_Art + WHERE anh_AvisoId=" & AvisoId & " AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId=" & SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID & ") + ORDER BY anh_SendungsId desc, case when aa_sort = NULL THEN 15 else aa_sort END, [anh_Reihenfolge],[anh_id]" dgvAnhang.DataSource = SQL.loadDgvBySql(hSQL, "AVISO") @@ -5282,7 +5258,7 @@ Public Class frmSendungsdetailsNEU VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST_SND, SENDUNG.tblSnd_SendungID) 'LÄDT alle Aviso-Anhänge For Each l In ANH_LIST_SND Select Case l.anh_Art.ToString.ToUpper - Case "RECHNUNG", "HANDELSRECHNUNG", "EFATURA" + Case "RECHNUNG", "HANDELSRECHNUNG", "EFATURA", "EUR1" VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId)}) End Select Next @@ -6835,8 +6811,7 @@ Public Class frmSendungsdetailsNEU Mail.Subject = Mail.Subject.Replace("%LKW%", "") Mail.Subject = Mail.Subject.Replace("%LKWKennzeichen%", "") - Mail.Subject = Mail.Subject.Replace("% - Empfaenger%", "") - Mail.Subject = Mail.Subject.Replace("% Empfaenger%", "") + Mail.Subject = Mail.Subject.Replace("%Empfaenger%", "")