fremde grenzen, etc.

SDL/Fakturierung/cAutomailversand.vb

@@ -692,6 +692,7 @@ Public Class cAutomailversand
 
         Dim Anhangsbez = getAnhangbezeichnung(sprache, RECHNUNG, BelegartenNr)
 
+        'ATTACHMENTS.Clear()
 
         Dim zielPfad_PDFZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(Belegnr & "_" & Anhangsbez, ".pdf",, False, "Zusammenfassung")
 
@@ -724,6 +725,21 @@ Public Class cAutomailversand
             ' Zusammenfassung erzeugen
             AddMergedPdf(mergeList, zielPfad_PDFZusammenfassung, ATTACHMENTS)
 
+            If checkFremdeGrenze(SPEDBUCH) AndAlso System.IO.File.Exists(zielPfad_PDFZusammenfassung) Then 'Upload ins Therefore
+
+                Try
+                    If RECHNUNG.Automailversand_sent Is Nothing And (Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM OrElse vbYes = MsgBox("TEST - Rechnungsanhang (FREMDE GRENZEN) in Therefore speichern?", vbYesNoCancel)) Then
+
+                        VERAG_PROG_ALLGEMEIN.cTherefore.saveFileTo_ImportFolder(zielPfad_PDFZusammenfassung, RECHNUNG.FilialenNr & RECHNUNG.AbfertigungsNr, If(RECHNUNG.AvisoID, ""), RECHNUNG.Firma_ID, False)
+
+                    End If
+                Catch ex As Exception
+                    MsgBox("Therefore-Import fehlgeschlagen!" & ex.Message & ex.StackTrace)
+                End Try
+
+
+            End If
+
             ' Beleg + Anhänge zusammenführen
             If mergeAllPDFS AndAlso ATTACHMENTS.Count > 1 Then
 
@@ -788,6 +804,21 @@ Public Class cAutomailversand
 
     End Sub
 
+    Private Function checkFremdeGrenze(SPED As cSpeditionsbuch) As Boolean
+
+        If SPED Is Nothing Then Return False
+
+        If SPED.Grenzstelle Is Nothing OrElse SPED.Grenzstelle = "" Then Return False
+
+        If SPED.Grenzstelle = "???" Then Return True
+
+        Dim FREMDEGRENZE = (New VERAG_PROG_ALLGEMEIN.SQL).DLookup("grz_fremdeGrenze", "tblGrenzstelle", "grz_BezeichnungCBO='" & SPED.Grenzstelle & "'", "AVISO", False)
+
+        Return FREMDEGRENZE
+
+
+    End Function
+
 
     Private Sub loadAndSetAnhaenge(SR_DT As DataTable, ATTACHMENTS As List(Of cFakt_MailATTach), listPDFs As List(Of String), Optional RECHNUNG As cRechnungsausgang = Nothing, Optional SPEDBUCH As cSpeditionsbuch = Nothing, Optional mergeAllPDFS As Boolean = False)
 

SDL/Fakturierung/frmFaktEmail.Designer.vb

@@ -22,6 +22,7 @@ Partial Class frmFaktEmail
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -50,7 +51,7 @@ Partial Class frmFaktEmail
         Me.lkl = New System.Windows.Forms.LinkLabel()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.cbxOriginalPrint = New System.Windows.Forms.CheckBox()
-        Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.clmnLKW = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.clmnStb_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.clmnMitt_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -73,7 +74,7 @@ Partial Class frmFaktEmail
         Me.cbxTransFerry = New System.Windows.Forms.CheckBox()
         Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cbxRgKopieDrucken = New System.Windows.Forms.CheckBox()
-        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.optAnhSel = New System.Windows.Forms.DataGridViewCheckBoxColumn()
         Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.clmnBezeichnung = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -87,8 +88,9 @@ Partial Class frmFaktEmail
         Me.Button6 = New System.Windows.Forms.Button()
         Me.cbxVZ = New System.Windows.Forms.CheckBox()
         Me.btn_FM = New System.Windows.Forms.Button()
-        Me.CM_FM = New System.Windows.Forms.ContextMenuStrip()
+        Me.CM_FM = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.OriginalschreibenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.cbxAnhaengeInTherefore = New System.Windows.Forms.CheckBox()
         CType(Me.dgvEmailBCC, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvEmailCC, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvEmail, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -561,7 +563,7 @@ Partial Class frmFaktEmail
         Me.cboPrinter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.cboPrinter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.cboPrinter.FormattingEnabled = True
-        Me.cboPrinter.Location = New System.Drawing.Point(610, 580)
+        Me.cboPrinter.Location = New System.Drawing.Point(610, 602)
         Me.cboPrinter.Name = "cboPrinter"
         Me.cboPrinter.Size = New System.Drawing.Size(118, 21)
         Me.cboPrinter.TabIndex = 33
@@ -752,7 +754,7 @@ Partial Class frmFaktEmail
         Me.btn_FM.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btn_FM.Image = Global.SDL.My.Resources.Resources.android_note12
         Me.btn_FM.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btn_FM.Location = New System.Drawing.Point(610, 605)
+        Me.btn_FM.Location = New System.Drawing.Point(610, 627)
         Me.btn_FM.Name = "btn_FM"
         Me.btn_FM.Size = New System.Drawing.Size(131, 39)
         Me.btn_FM.TabIndex = 99
@@ -772,12 +774,23 @@ Partial Class frmFaktEmail
         Me.OriginalschreibenToolStripMenuItem.Size = New System.Drawing.Size(191, 22)
         Me.OriginalschreibenToolStripMenuItem.Text = "Verzollungsunterlagen"
         '
+        'cbxAnhaengeInTherefore
+        '
+        Me.cbxAnhaengeInTherefore.AutoSize = True
+        Me.cbxAnhaengeInTherefore.Location = New System.Drawing.Point(610, 582)
+        Me.cbxAnhaengeInTherefore.Name = "cbxAnhaengeInTherefore"
+        Me.cbxAnhaengeInTherefore.Size = New System.Drawing.Size(108, 17)
+        Me.cbxAnhaengeInTherefore.TabIndex = 100
+        Me.cbxAnhaengeInTherefore.Text = "Anh. in Therefore"
+        Me.cbxAnhaengeInTherefore.UseVisualStyleBackColor = True
+        '
         'frmFaktEmail
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.WhiteSmoke
         Me.ClientSize = New System.Drawing.Size(750, 850)
+        Me.Controls.Add(Me.cbxAnhaengeInTherefore)
         Me.Controls.Add(Me.btn_FM)
         Me.Controls.Add(Me.cbxVZ)
         Me.Controls.Add(Me.Button6)
@@ -898,4 +911,5 @@ Partial Class frmFaktEmail
     Friend WithEvents btn_FM As Button
     Friend WithEvents CM_FM As ContextMenuStrip
     Friend WithEvents OriginalschreibenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents cbxAnhaengeInTherefore As CheckBox
 End Class

SDL/Fakturierung/frmFaktEmail.vb

@@ -1,4 +1,5 @@
-Imports Microsoft.Office.Interop
+Imports GrapeCity.DataVisualization.TypeScript
+Imports Microsoft.Office.Interop
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmFaktEmail
@@ -82,6 +83,9 @@ Public Class frmFaktEmail
         cboFaStb_Sprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EN", "EN"))
         cboFaStb_Sprache.changeItem("DE")
 
+        cbxAnhaengeInTherefore.Visible = False
+        cbxAnhaengeInTherefore.Checked = False
+
         cProgramFunctions.initDrucker(cboPrinter)
         Select Case Rechnungsdruck
             Case 5 : cbxRgKopieDrucken.Checked = True
@@ -152,6 +156,11 @@ Public Class frmFaktEmail
             If SPEDBUCH.DokumentId_VBD Then cbxVBD.Enabled = True : cbxVBD.Checked = True
             ' wbShowHTML(WebBrowser, cFakturierung.getSignature(RECHNUNG))
 
+            If checkFremdeGrenze(SPEDBUCH) Then
+                cbxAnhaengeInTherefore.Visible = True
+                cbxAnhaengeInTherefore.Checked = True
+            End If
+
             AD = New VERAG_PROG_ALLGEMEIN.cAdressen(RECHNUNG.RechnungsKundenNr)
             FISKAL = New cFiskal_Daten(RECHNUNG.RechnungsKundenNr)
             KD_ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(RECHNUNG.RechnungsKundenNr)
@@ -613,7 +622,10 @@ Public Class frmFaktEmail
                         ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
 
                     Next
-                    addAttachments(Mail, lastAktuelle_RgNr, cbxMergeRg.Checked)
+
+
+                    'WARUM HIER BEREITS??
+                    'addAttachments(Mail, lastAktuelle_RgNr, cbxMergeRg.Checked, "")
 
                     '-----------------------------------------------------------------
                     'Steuerbescheid/VDB anfügen
@@ -639,7 +651,7 @@ Public Class frmFaktEmail
                     '-----------------------------------------------------------------
 
 
-                    addAttachments(Mail, lastAktuelle_RgNr, cbxMergePDF.Checked)
+                    addAttachments(Mail, lastAktuelle_RgNr, cbxMergePDF.Checked, "")
 
                     If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
                         Try
@@ -773,13 +785,29 @@ Public Class frmFaktEmail
                     For Each ANH In RECHNUNG.ANHAENGE
                         ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung))
                     Next
+
+                    Dim pathAnhaenge As String = ""
                     '-----------------------------------------------------------------
 
                     'Anhang an Mail anfügen
                     '-----------------------------------------------------------------
-                    addAttachments(Mail, RECHNUNG.RechnungsNr, cbxMergePDF.Checked)
+                    addAttachments(Mail, RECHNUNG.RechnungsNr, cbxMergePDF.Checked, pathAnhaenge)
                     '-----------------------------------------------------------------
 
+                    If cbxAnhaengeInTherefore.Checked Then
+
+                        Try
+                            If Not cbxRgKopieDrucken.Checked And (Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM OrElse vbYes = MsgBox("TEST - Anhang in Therefore speichern?", vbYesNoCancel)) Then
+
+                                VERAG_PROG_ALLGEMEIN.cTherefore.saveFileTo_ImportFolder(pathAnhaenge, RECHNUNG.FilialenNr & RECHNUNG.AbfertigungsNr, If(RECHNUNG.AvisoID, ""), RECHNUNG.Firma_ID, False)
+
+                            End If
+                        Catch ex As Exception
+                            MsgBox("Therefore-Import fehlgeschlagen!" & ex.Message & ex.StackTrace)
+                        End Try
+
+                    End If
+
 
                     If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
                         Try
@@ -1068,7 +1096,7 @@ Public Class frmFaktEmail
 
                 'Anhang an Mail anfügen
                 '-----------------------------------------------------------------
-                addAttachments(Mail_StbFA, RechnungsNr, cbxMergePDF.Checked)
+                addAttachments(Mail_StbFA, RechnungsNr, cbxMergePDF.Checked, "")
                 '-----------------------------------------------------------------
 
                 Mail_StbFA.Display()
@@ -1108,7 +1136,7 @@ Public Class frmFaktEmail
 
 
 
-    Sub addAttachments(ByRef Mail As Microsoft.Office.Interop.Outlook.MailItem, RgNr As Integer, MergePDF As Boolean)
+    Sub addAttachments(ByRef Mail As Microsoft.Office.Interop.Outlook.MailItem, RgNr As Integer, MergePDF As Boolean, zielPfadZusammenfassung As String)
         If ATTACHMENTS.Count = 0 Then Exit Sub
         Try
 
@@ -1150,7 +1178,7 @@ Public Class frmFaktEmail
                     Belegsbezeichnung = RECHNUNG.BelegartenBez
                 End If
 
-                Dim zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(IIf(SammelrechungArt <> 6, Belegsbezeichnung & "sanhänge_", Belegsbezeichnung & "_") & RgNr & extension, extension,, False, "Zusammenfassung")
+                zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(IIf(SammelrechungArt <> 6, Belegsbezeichnung & "sanhänge_", Belegsbezeichnung & "_") & RgNr & extension, extension,, False, "Zusammenfassung")
 
                 If RECHNUNG IsNot Nothing AndAlso RECHNUNG.Firma_ID = 19 Then
 
@@ -1343,6 +1371,23 @@ Public Class frmFaktEmail
 
     End Sub
 
+    Private Function checkFremdeGrenze(SPED As cSpeditionsbuch) As Boolean
+
+        If SPED Is Nothing Then Return False
+
+        If SPED.Grenzstelle Is Nothing OrElse SPED.Grenzstelle = "" Then Return False
+
+        If SPED.Grenzstelle = "???" Then Return True
+
+        Dim FREMDEGRENZE = (New VERAG_PROG_ALLGEMEIN.SQL).DLookup("grz_fremdeGrenze", "tblGrenzstelle", "grz_BezeichnungCBO='" & SPED.Grenzstelle & "'", "AVISO", False)
+
+        Return FREMDEGRENZE
+
+
+    End Function
+
+
+
     Sub initDGVAnhaenge()
 
         With dgvAnhaenge