neu

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -872,6 +872,7 @@ Public Class frmFormulare
                     Next
                 Next
 
+
                 Dim dest_path = ""
                 If list.Count = 0 Then Me.Cursor = Cursors.Default : Exit Sub
 
@@ -4246,14 +4247,27 @@ Public Class FormularManagerNEU
             Dim MailHTMLText = "<div style=""font-family:Calibri, Arial"">"
             Dim Mail_Subject = ""
             Dim Mail_CC = ""
+            Dim Mail_BCC = ""
             Dim Mail_To = ""
 
             If usrCntl.KdNR > 0 Then
                 'lt. Kerstin: Steuerberater braucht den Verbringungsnachweis nicht
                 ' Dim FISKAL As New cFiskal_Daten(usrCntl.KdNR)
                 '  If FISKAL IsNot Nothing Then Mail_CC = If(FISKAL.fisk_schreibenSB_Mail, "")
-                Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(usrCntl.KdNR)
+                'Mail aus kunden Kontakte Spezial:
-                If AD IsNot Nothing Then Mail_To = If(AD.E_Mail, "")
+                Dim EMAILTMP = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(usrCntl.KdNR, "Fiskal")
+                If EMAILTMP <> "" Then Mail_To = EMAILTMP
+
+                Dim EMAILTMPCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(usrCntl.KdNR, "Fiskal")
+                If EMAILTMPCC <> "" Then Mail_CC = EMAILTMPCC
+
+                Dim EMAILTMPBCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(usrCntl.KdNR, "Fiskal")
+                If EMAILTMPBCC <> "" Then Mail_bCC = EMAILTMPBCC
+
+                If EMAILTMP = "" Then
+                    Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(usrCntl.KdNR)
+                    If AD IsNot Nothing Then Mail_To = If(AD.E_Mail, "")
+                End If
             End If
 
 
@@ -4424,8 +4438,7 @@ Public Class FormularManagerNEU
 
             MailHTMLText &= "</div>"
 
-
+            listMail.Add(New FormMangagerEmail(Mail_To, Mail_CC, Mail_BCC, Mail_Subject, MailHTMLText))
-            listMail.Add(New FormMangagerEmail(Mail_To, Mail_CC, "", Mail_Subject, MailHTMLText))
 
 
             Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -114,6 +114,17 @@
     End Sub
 
 
+    Function alreadyExists(USTV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen) As Boolean
+        For Each row As DataGridViewRow In dgvUSTVPositionen.Rows
+            If row.Cells("UStVPo_SchnittstellenNr").Value = USTV_POS.UStVPo_SchnittstellenNr Then
+                If row.Cells("UStVPo_ReNr").Value = USTV_POS.UStVPo_ReNr.ToString And row.Cells("UStVPo_ReDat").Value = USTV_POS.UStVPo_ReDat Then
+                    Return True
+                End If
+            End If
+        Next
+        Return False
+    End Function
+
     Function loadUSTVFrom_PLOSE() As Boolean
         Try
             Dim bytSchnittstellenNr = 6 'glaube noch frei?
@@ -123,31 +134,36 @@
             If GET_Antraege IsNot Nothing Then
 
                 For Each ANTRAG In GET_Antraege
+
                     Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen
                     USTV_POS.UStVAn_ID = USTV_ANTRAG.[UStVAn_ID]
                     USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr
 
                     USTV_POS.UStVPo_ReDat = ANTRAG.plose_RechnungsDatum
                     USTV_POS.UStVPo_ReNr = ANTRAG.plose_RechnungsNr.ToString
-                    USTV_POS.UStVPo_Schnittstelle = True
                     USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr
-                    USTV_POS.UStVPo_Leistungsbezeichnung = "Maut"
+
-                    USTV_POS.UStVPo_Leistender = ANTRAG.plose_Lieferant
+                    If Not alreadyExists(USTV_POS) Then
-                    USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+
-                    USTV_POS.UStVPo_Zeitstempel = Now()
+                        USTV_POS.UStVPo_Schnittstelle = True
-                    ' Berechnungen
+                        USTV_POS.UStVPo_Leistungsbezeichnung = "Maut"
-                    USTV_POS.UStVPo_USteuerbetragEUR = ANTRAG.plose_MWSTBetragWaehrungAbbuchung 'VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(ANTRAG.plose_MWSTBetragWaehrungAbbuchung, USTV_ANTRAG.UStVAn_Währungscode, "EUR")
+                        USTV_POS.UStVPo_Leistender = ANTRAG.plose_Lieferant
-                    'USTV_POS.UStVPo_Umrechnungskurs = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuroKurs(ANTRAG.plose_WaehrungAbbuchung, ANTRAG.plose_RechnungsDatum)
+                        USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
-                    USTV_POS.UStVPo_Umrechnungskurs = ANTRAG.plose_MWSTBetrag / ANTRAG.plose_MWSTBetragWaehrungAbbuchung
+                        USTV_POS.UStVPo_Zeitstempel = Now()
-                    USTV_POS.UStVPo_USteuerbetrag = ANTRAG.plose_MWSTBetrag
+                        ' Berechnungen
-                    ' MsgBox(ANTRAG.plose_Lieferant & "  -  " & ANTRAG.plose_RechnungsDatum & "  -  " & ANTRAG.plose_RechnungsNr & " :::::::::: " & CDbl(ANTRAG.plose_MWSTBetrag).ToString("C2"))
+                        USTV_POS.UStVPo_USteuerbetragEUR = ANTRAG.plose_MWSTBetragWaehrungAbbuchung 'VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(ANTRAG.plose_MWSTBetragWaehrungAbbuchung, USTV_ANTRAG.UStVAn_Währungscode, "EUR")
+                        'USTV_POS.UStVPo_Umrechnungskurs = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuroKurs(ANTRAG.plose_WaehrungAbbuchung, ANTRAG.plose_RechnungsDatum)
+                        USTV_POS.UStVPo_Umrechnungskurs = ANTRAG.plose_MWSTBetrag / ANTRAG.plose_MWSTBetragWaehrungAbbuchung
+                        USTV_POS.UStVPo_USteuerbetrag = ANTRAG.plose_MWSTBetrag
+                        ' MsgBox(ANTRAG.plose_Lieferant & "  -  " & ANTRAG.plose_RechnungsDatum & "  -  " & ANTRAG.plose_RechnungsNr & " :::::::::: " & CDbl(ANTRAG.plose_MWSTBetrag).ToString("C2"))
 
 
-                    USTV_POS.INSERT()
+                        USTV_POS.INSERT()
+                    End If
                 Next
 
+                'Einträge als archivert setzen ' vormals wichtig
                 MDM_Worker.cPLOSE.UPDATE_ARCHIV(USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr)
-                ' NOCH NICHT'''''
 
             End If
             Return True

SDL/kunden/frmKundenUebersichtZOLL.Designer.vb

@@ -124,6 +124,7 @@ Partial Class frmKundenUebersichtZOLL
         Me.BearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AnDakosyÜbertragenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AufschubEORIBearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.SYSKAÜbertragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem11 = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlTop = New System.Windows.Forms.Panel()
@@ -142,7 +143,6 @@ Partial Class frmKundenUebersichtZOLL
         Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.SYSKAÜbertragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.tabZolltarife.SuspendLayout()
         Me.tabKundendaten.SuspendLayout()
@@ -171,6 +171,7 @@ Partial Class frmKundenUebersichtZOLL
         '
         'ContextMenuStrip1
         '
+        Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KopierenToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
         Me.ContextMenuStrip1.Size = New System.Drawing.Size(122, 26)
@@ -225,6 +226,7 @@ Partial Class frmKundenUebersichtZOLL
         '
         'ContextMenuStrip2
         '
+        Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem2})
         Me.ContextMenuStrip2.Name = "ContextMenuStrip1"
         Me.ContextMenuStrip2.Size = New System.Drawing.Size(122, 26)
@@ -944,8 +946,9 @@ Partial Class frmKundenUebersichtZOLL
         Me.MenuStripSDL.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
         Me.MenuStripSDL.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.MenuStripSDL.Dock = System.Windows.Forms.DockStyle.Left
+        Me.MenuStripSDL.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.MenuStripSDL.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.MenuStripSDL.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnueKunden, Me.mnueZoll, Me.mnueOfferte, Me.mnueRechnungen, Me.mnueSpeditionsbuch, Me.mnueStatistik, Me.ToolStripFormulare, Me.mnueFiskal, Me.ToolStripMenuItem5, Me.toolNeuerKunde, Me.toolOptionen, Me.ToolStripMenuItem1, Me.ToolStripMenuItem11})
+        Me.MenuStripSDL.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnueKunden, Me.mnueZoll, Me.mnueOfferte, Me.mnueRechnungen, Me.mnueSpeditionsbuch, Me.mnueStatistik, Me.ToolStripFormulare, Me.mnueFiskal, Me.toolNeuerKunde, Me.ToolStripMenuItem5, Me.toolOptionen, Me.ToolStripMenuItem1, Me.ToolStripMenuItem11})
         Me.MenuStripSDL.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow
         Me.MenuStripSDL.Location = New System.Drawing.Point(0, 0)
         Me.MenuStripSDL.Name = "MenuStripSDL"
@@ -1223,6 +1226,12 @@ Partial Class frmKundenUebersichtZOLL
         Me.AufschubEORIBearbeitenToolStripMenuItem.Size = New System.Drawing.Size(217, 22)
         Me.AufschubEORIBearbeitenToolStripMenuItem.Text = "Aufschub/EORI bearbeiten "
         '
+        'SYSKAÜbertragToolStripMenuItem
+        '
+        Me.SYSKAÜbertragToolStripMenuItem.Name = "SYSKAÜbertragToolStripMenuItem"
+        Me.SYSKAÜbertragToolStripMenuItem.Size = New System.Drawing.Size(217, 22)
+        Me.SYSKAÜbertragToolStripMenuItem.Text = "SYSKA übertragen"
+        '
         'ToolStripMenuItem1
         '
         Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
@@ -1353,42 +1362,43 @@ Partial Class frmKundenUebersichtZOLL
         '
         'ContextMenuStrip3
         '
+        Me.ContextMenuStrip3.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.ContextMenuStrip3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem3, Me.ÄndernToolStripMenuItem, Me.HochladenToolStripMenuItem, Me.ScannenToolStripMenuItem, Me.PDFLöschenToolStripMenuItem})
         Me.ContextMenuStrip3.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip3.Size = New System.Drawing.Size(140, 114)
+        Me.ContextMenuStrip3.Size = New System.Drawing.Size(148, 154)
         '
         'ToolStripMenuItem3
         '
         Me.ToolStripMenuItem3.Image = Global.SDL.My.Resources.Resources.del
         Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
-        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(139, 22)
+        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(147, 30)
         Me.ToolStripMenuItem3.Text = "Löschen"
         '
         'ÄndernToolStripMenuItem
         '
         Me.ÄndernToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.stift
         Me.ÄndernToolStripMenuItem.Name = "ÄndernToolStripMenuItem"
-        Me.ÄndernToolStripMenuItem.Size = New System.Drawing.Size(139, 22)
+        Me.ÄndernToolStripMenuItem.Size = New System.Drawing.Size(147, 30)
         Me.ÄndernToolStripMenuItem.Text = "Ändern"
         '
         'HochladenToolStripMenuItem
         '
         Me.HochladenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.pdf
         Me.HochladenToolStripMenuItem.Name = "HochladenToolStripMenuItem"
-        Me.HochladenToolStripMenuItem.Size = New System.Drawing.Size(139, 22)
+        Me.HochladenToolStripMenuItem.Size = New System.Drawing.Size(147, 30)
         Me.HochladenToolStripMenuItem.Text = "Hochladen"
         '
         'ScannenToolStripMenuItem
         '
         Me.ScannenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.scanner1
         Me.ScannenToolStripMenuItem.Name = "ScannenToolStripMenuItem"
-        Me.ScannenToolStripMenuItem.Size = New System.Drawing.Size(139, 22)
+        Me.ScannenToolStripMenuItem.Size = New System.Drawing.Size(147, 30)
         Me.ScannenToolStripMenuItem.Text = "Scannen"
         '
         'PDFLöschenToolStripMenuItem
         '
         Me.PDFLöschenToolStripMenuItem.Name = "PDFLöschenToolStripMenuItem"
-        Me.PDFLöschenToolStripMenuItem.Size = New System.Drawing.Size(139, 22)
+        Me.PDFLöschenToolStripMenuItem.Size = New System.Drawing.Size(147, 30)
         Me.PDFLöschenToolStripMenuItem.Text = "PDF löschen"
         '
         'DataGridViewTextBoxColumn1
@@ -1402,12 +1412,6 @@ Partial Class frmKundenUebersichtZOLL
         Me.DataGridViewTextBoxColumn2.HeaderText = "KundenNr"
         Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
         '
-        'SYSKAÜbertragToolStripMenuItem
-        '
-        Me.SYSKAÜbertragToolStripMenuItem.Name = "SYSKAÜbertragToolStripMenuItem"
-        Me.SYSKAÜbertragToolStripMenuItem.Size = New System.Drawing.Size(217, 22)
-        Me.SYSKAÜbertragToolStripMenuItem.Text = "SYSKA übertragen"
-        '
         'frmKundenUebersichtZOLL
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyComboBox.vb

@@ -148,9 +148,10 @@ Public Class MyComboBox
 
             If VERAG_PROG_ALLGEMEIN.cAllgemein._LAN = "" Then Exit Sub
         If VERAG_PROG_ALLGEMEIN.cAllgemein._LAN = "DE" Then Exit Sub
+            If Me.FindForm Is Nothing Then Exit Sub '!!!!!!!!!!!!!!!!!!!!!!!!
 
-        Dim lanTxtAll = VERAG_PROG_ALLGEMEIN.cAllgemein.TRANSLATE.list.FindAll(Function(x) x.trs_object = Me.FindForm.Name And x.trs_control = Me.Name And x.trs_sprache = VERAG_PROG_ALLGEMEIN.cAllgemein._LAN)
+            Dim lanTxtAll = VERAG_PROG_ALLGEMEIN.cAllgemein.TRANSLATE.list.FindAll(Function(x) If(x.trs_object, "") = Me.FindForm.Name And If(x.trs_control, "") = Me.Name And If(x.trs_sprache, "") = VERAG_PROG_ALLGEMEIN.cAllgemein._LAN)
-        If lanTxtAll.Count > 0 Then
+            If lanTxtAll.Count > 0 Then
 
             Dim listItems(Me.Items.Count) As MyListItem
             Me.Items.CopyTo(listItems, 0)

VERAG_PROG_ALLGEMEIN/Classes/cKundenKontakte.vb

@@ -239,6 +239,7 @@ Public Class cKundenKontakte
     Shared Function getMailAdress(KdNr As Integer, bez As String) As String
         If KdNr < 0 Then Return ""
         Dim KD_LIST = New cKundenKontakteList(KdNr)
+
         If KD_LIST IsNot Nothing Then
             For Each li In KD_LIST.LIST
                 If li.kkd_kkaBez = bez Then Return li.kkd_Email