Fakt, MDM-Datenverarb, Mahnlauf, etc.

SDL/Fakturierung/cAutomailversand.vb

@@ -132,6 +132,17 @@ Public Class cAutomailversand
                             End If
 
                         Else
+
+                            Dim TextHTML = ""
+                            TextHTML &= HTMLMail
+                            TextHTML &= "<br>"
+                            TextHTML &= "<br>"
+                            TextHTML &= "Mit freundlichen Grüßen<br>"
+                            TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
+                            TextHTML &= "<br>"
+                            TextHTML &= cFakturierung.getSignature("DE", FirmaID, True, True)
+                            HTMLMail = "<div style=""font-family:Calibri, Arial"">" & TextHTML & "</div>"
+
                             If setLog(row.Item("RechnungsKundenNr"), ATTACHMENTS, Mailsubject, HTMLMail, MailTo, MailtoCC, MailtoBCC) Then
 
                             End If
@@ -240,6 +251,12 @@ Public Class cAutomailversand
 
         ATTACHMENTS.Clear()
         'Rechnungsanhänge anfügen
+
+        For Each l In listPDFs
+
+            ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
+
+        Next
         '-----------------------------------------------------------------
         If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then
             For Each r In SR_DT.Rows
@@ -252,11 +269,7 @@ Public Class cAutomailversand
             Next
         End If
 
-        For Each l In listPDFs
 
-            ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
-
-        Next
         '-----------------------------------------------------------------
 
 

SDL/Fakturierung/frmAbrechnungsMaskeEinzeln.vb

@@ -2,6 +2,7 @@
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
     Dim FilialenNr As Integer = -1
     Dim AbfertigungsNr As Integer = -1
+    Dim RK_ID As Integer = -1
     Sub New(FilialenNr, AbfertigungsNr)
 
         ' Dieser Aufruf ist für den Designer erforderlich.
@@ -12,6 +13,16 @@
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
 
     End Sub
+
+    Sub New(RK_ID)
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+        If RK_ID IsNot Nothing AndAlso IsNumeric(RK_ID) Then Me.RK_ID = RK_ID
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+
+    End Sub
+
     Private Sub frmAbrechnungsMaske_Load(sender As Object, e As EventArgs) Handles Me.Load
         'Größe anpassen:
         Me.Height = Screen.FromRectangle(Me.Bounds).WorkingArea.Size.Height
@@ -30,6 +41,23 @@
             UsrCntlFaktAbrechnung1.cboFiliale.changeItem(FilialenNr)
             UsrCntlFaktAbrechnung1.txtAbfertigungsnummer.Text = AbfertigungsNr
             UsrCntlFaktAbrechnung1.cboSpedBuchUnterNr.Focus()
+
+        ElseIf RK_ID > 0 Then
+
+            Dim dt As DataTable = SQL.loadDgvBySql("select top(1) FilialenNr, AbfertigungsNr from Rechnungsausgang where RK_ID = " & RK_ID, "FMZOLL")
+
+            If dt.Rows.Count > 0 Then
+
+                UsrCntlFaktAbrechnung1.cboFiliale.changeItem(dt.Rows(0).Item("FilialenNr"))
+                UsrCntlFaktAbrechnung1.txtAbfertigungsnummer.Text = dt.Rows(0).Item("AbfertigungsNr")
+                UsrCntlFaktAbrechnung1.cboSpedBuchUnterNr.Focus()
+
+            End If
+
+
+
+
+
         End If
     End Sub
 

SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb

@@ -61,14 +61,15 @@ Partial Class frmFaktSammelRgDrucken
         Me.Button2 = New System.Windows.Forms.Button()
         Me.cbxMWST = New System.Windows.Forms.CheckBox()
         Me.pnlAUTOMailversand = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
+        Me.cbxMailoeffnen = New System.Windows.Forms.CheckBox()
+        Me.Button7 = New System.Windows.Forms.Button()
         Me.Button6 = New System.Windows.Forms.Button()
         Me.Button5 = New System.Windows.Forms.Button()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.Button4 = New System.Windows.Forms.Button()
         Me.Button3 = New System.Windows.Forms.Button()
         Me.cbxAUTOMail = New System.Windows.Forms.CheckBox()
-        Me.Button7 = New System.Windows.Forms.Button()
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.cbxMailoeffnen = New System.Windows.Forms.CheckBox()
         Me.pnl.SuspendLayout()
         CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.pnlAUTOMailversand.SuspendLayout()
@@ -232,7 +233,7 @@ Partial Class frmFaktSammelRgDrucken
         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(12, 425)
+        Me.cboPrinter.Location = New System.Drawing.Point(12, 443)
         Me.cboPrinter.Name = "cboPrinter"
         Me.cboPrinter.Size = New System.Drawing.Size(118, 21)
         Me.cboPrinter.TabIndex = 17
@@ -302,7 +303,7 @@ Partial Class frmFaktSammelRgDrucken
         Me.MyDatagridview1.ReadOnly = True
         Me.MyDatagridview1.RowHeadersVisible = False
         Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.MyDatagridview1.Size = New System.Drawing.Size(547, 355)
+        Me.MyDatagridview1.Size = New System.Drawing.Size(547, 373)
         Me.MyDatagridview1.TabIndex = 18
         '
         'btn
@@ -311,7 +312,7 @@ Partial Class frmFaktSammelRgDrucken
         Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.printer2
         Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
         Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btn.Location = New System.Drawing.Point(12, 323)
+        Me.btn.Location = New System.Drawing.Point(12, 341)
         Me.btn.Name = "btn"
         Me.btn.Size = New System.Drawing.Size(118, 60)
         Me.btn.TabIndex = 11
@@ -324,7 +325,7 @@ Partial Class frmFaktSammelRgDrucken
         Me.Button9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button9.Location = New System.Drawing.Point(12, 382)
+        Me.Button9.Location = New System.Drawing.Point(12, 400)
         Me.Button9.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
         Me.Button9.Name = "Button9"
         Me.Button9.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0)
@@ -340,7 +341,7 @@ Partial Class frmFaktSammelRgDrucken
         Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button8.Location = New System.Drawing.Point(51, 382)
+        Me.Button8.Location = New System.Drawing.Point(51, 400)
         Me.Button8.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
         Me.Button8.Name = "Button8"
         Me.Button8.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0)
@@ -353,7 +354,7 @@ Partial Class frmFaktSammelRgDrucken
         '
         Me.cbxEinzelAnlagen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.cbxEinzelAnlagen.AutoSize = True
-        Me.cbxEinzelAnlagen.Location = New System.Drawing.Point(150, 352)
+        Me.cbxEinzelAnlagen.Location = New System.Drawing.Point(150, 370)
         Me.cbxEinzelAnlagen.Name = "cbxEinzelAnlagen"
         Me.cbxEinzelAnlagen.Size = New System.Drawing.Size(96, 17)
         Me.cbxEinzelAnlagen.TabIndex = 14
@@ -366,7 +367,7 @@ Partial Class frmFaktSammelRgDrucken
         Me.cbxSammelbericht.AutoSize = True
         Me.cbxSammelbericht.Checked = True
         Me.cbxSammelbericht.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbxSammelbericht.Location = New System.Drawing.Point(150, 372)
+        Me.cbxSammelbericht.Location = New System.Drawing.Point(150, 390)
         Me.cbxSammelbericht.Name = "cbxSammelbericht"
         Me.cbxSammelbericht.Size = New System.Drawing.Size(95, 17)
         Me.cbxSammelbericht.TabIndex = 16
@@ -389,7 +390,7 @@ Partial Class frmFaktSammelRgDrucken
         '
         Me.cbxZusammenfassen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.cbxZusammenfassen.AutoSize = True
-        Me.cbxZusammenfassen.Location = New System.Drawing.Point(12, 408)
+        Me.cbxZusammenfassen.Location = New System.Drawing.Point(12, 426)
         Me.cbxZusammenfassen.Name = "cbxZusammenfassen"
         Me.cbxZusammenfassen.Size = New System.Drawing.Size(107, 17)
         Me.cbxZusammenfassen.TabIndex = 15
@@ -424,7 +425,7 @@ Partial Class frmFaktSammelRgDrucken
         '
         Me.cbxEVOLOG.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.cbxEVOLOG.AutoSize = True
-        Me.cbxEVOLOG.Location = New System.Drawing.Point(151, 410)
+        Me.cbxEVOLOG.Location = New System.Drawing.Point(151, 428)
         Me.cbxEVOLOG.Name = "cbxEVOLOG"
         Me.cbxEVOLOG.Size = New System.Drawing.Size(99, 17)
         Me.cbxEVOLOG.TabIndex = 19
@@ -435,7 +436,7 @@ Partial Class frmFaktSammelRgDrucken
         '
         Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(148, 394)
+        Me.Label4.Location = New System.Drawing.Point(148, 412)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(41, 13)
         Me.Label4.TabIndex = 20
@@ -447,7 +448,7 @@ Partial Class frmFaktSammelRgDrucken
         Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(150, 323)
+        Me.Button1.Location = New System.Drawing.Point(150, 341)
         Me.Button1.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(91, 25)
@@ -459,7 +460,7 @@ Partial Class frmFaktSammelRgDrucken
         '
         Me.cbxTransFerry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.cbxTransFerry.AutoSize = True
-        Me.cbxTransFerry.Location = New System.Drawing.Point(151, 428)
+        Me.cbxTransFerry.Location = New System.Drawing.Point(151, 446)
         Me.cbxTransFerry.Name = "cbxTransFerry"
         Me.cbxTransFerry.Size = New System.Drawing.Size(105, 17)
         Me.cbxTransFerry.TabIndex = 22
@@ -515,7 +516,7 @@ Partial Class frmFaktSammelRgDrucken
         Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button2.Location = New System.Drawing.Point(90, 382)
+        Me.Button2.Location = New System.Drawing.Point(90, 400)
         Me.Button2.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
         Me.Button2.Name = "Button2"
         Me.Button2.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0)
@@ -540,6 +541,7 @@ Partial Class frmFaktSammelRgDrucken
         '
         'pnlAUTOMailversand
         '
+        Me.pnlAUTOMailversand.BackColor = System.Drawing.Color.AliceBlue
         Me.pnlAUTOMailversand.Controls.Add(Me.cbxMailoeffnen)
         Me.pnlAUTOMailversand.Controls.Add(Me.Button7)
         Me.pnlAUTOMailversand.Controls.Add(Me.Button6)
@@ -549,10 +551,37 @@ Partial Class frmFaktSammelRgDrucken
         Me.pnlAUTOMailversand.Controls.Add(Me.Button3)
         Me.pnlAUTOMailversand.Location = New System.Drawing.Point(12, 185)
         Me.pnlAUTOMailversand.Name = "pnlAUTOMailversand"
-        Me.pnlAUTOMailversand.Size = New System.Drawing.Size(229, 132)
+        Me.pnlAUTOMailversand.Size = New System.Drawing.Size(229, 150)
         Me.pnlAUTOMailversand.TabIndex = 29
         Me.pnlAUTOMailversand.Visible = False
         '
+        'cbxMailoeffnen
+        '
+        Me.cbxMailoeffnen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.cbxMailoeffnen.AutoSize = True
+        Me.cbxMailoeffnen.Checked = True
+        Me.cbxMailoeffnen.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxMailoeffnen.Location = New System.Drawing.Point(135, 66)
+        Me.cbxMailoeffnen.Name = "cbxMailoeffnen"
+        Me.cbxMailoeffnen.Size = New System.Drawing.Size(91, 17)
+        Me.cbxMailoeffnen.TabIndex = 31
+        Me.cbxMailoeffnen.Text = "Mail anzeigen"
+        Me.cbxMailoeffnen.UseVisualStyleBackColor = True
+        '
+        'Button7
+        '
+        Me.Button7.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.Button7.BackgroundImage = Global.SDL.My.Resources.Resources.email_big
+        Me.Button7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button7.Location = New System.Drawing.Point(12, 55)
+        Me.Button7.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
+        Me.Button7.Name = "Button7"
+        Me.Button7.Size = New System.Drawing.Size(106, 37)
+        Me.Button7.TabIndex = 37
+        Me.Button7.UseVisualStyleBackColor = True
+        '
         'Button6
         '
         Me.Button6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -584,7 +613,7 @@ Partial Class frmFaktSammelRgDrucken
         'Label7
         '
         Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(8, 78)
+        Me.Label7.Location = New System.Drawing.Point(8, 96)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(135, 13)
         Me.Label7.TabIndex = 34
@@ -596,7 +625,7 @@ Partial Class frmFaktSammelRgDrucken
         Me.Button4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button4.Location = New System.Drawing.Point(111, 94)
+        Me.Button4.Location = New System.Drawing.Point(111, 112)
         Me.Button4.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
         Me.Button4.Name = "Button4"
         Me.Button4.Size = New System.Drawing.Size(91, 25)
@@ -610,7 +639,7 @@ Partial Class frmFaktSammelRgDrucken
         Me.Button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button3.Location = New System.Drawing.Point(10, 94)
+        Me.Button3.Location = New System.Drawing.Point(10, 112)
         Me.Button3.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
         Me.Button3.Name = "Button3"
         Me.Button3.Size = New System.Drawing.Size(91, 25)
@@ -630,39 +659,17 @@ Partial Class frmFaktSammelRgDrucken
         Me.cbxAUTOMail.UseVisualStyleBackColor = True
         Me.cbxAUTOMail.Visible = False
         '
-        'Button7
+        'ContextMenuStrip1
         '
-        Me.Button7.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.Button7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 26)
-        Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button7.Location = New System.Drawing.Point(12, 49)
-        Me.Button7.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
-        Me.Button7.Name = "Button7"
-        Me.Button7.Size = New System.Drawing.Size(106, 25)
-        Me.Button7.TabIndex = 37
-        Me.Button7.Text = "senden"
-        Me.Button7.UseVisualStyleBackColor = True
-        '
-        'cbxMailoeffnen
-        '
-        Me.cbxMailoeffnen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.cbxMailoeffnen.AutoSize = True
-        Me.cbxMailoeffnen.Checked = True
-        Me.cbxMailoeffnen.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbxMailoeffnen.Location = New System.Drawing.Point(124, 54)
-        Me.cbxMailoeffnen.Name = "cbxMailoeffnen"
-        Me.cbxMailoeffnen.Size = New System.Drawing.Size(91, 17)
-        Me.cbxMailoeffnen.TabIndex = 31
-        Me.cbxMailoeffnen.Text = "Mail anzeigen"
-        Me.cbxMailoeffnen.UseVisualStyleBackColor = True
         '
         'frmFaktSammelRgDrucken
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(811, 454)
+        Me.ClientSize = New System.Drawing.Size(811, 472)
         Me.Controls.Add(Me.cbxAUTOMail)
         Me.Controls.Add(Me.pnlAUTOMailversand)
         Me.Controls.Add(Me.cbxMWST)
@@ -753,4 +760,5 @@ Partial Class frmFaktSammelRgDrucken
     Friend WithEvents Button5 As Button
     Friend WithEvents Button7 As Button
     Friend WithEvents cbxMailoeffnen As CheckBox
+    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
 End Class

SDL/Fakturierung/frmFaktSammelRgDrucken.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

SDL/Fakturierung/frmFaktSammelRgDrucken.vb

@@ -87,7 +87,7 @@ Public Class frmFaktSammelRgDrucken
                     sqlStr = " SELECT Rechnungsausgang.RechnungsKundenNr, max(Rechnungsausgang.[RechnungsName 1]) as [RechnungsName 1],0 as AvisoId,max(Rechnungsausgang.[RechnungsLandKz]) as [RechnungsLandKz] , count(*) as Anzahl, SUM(Rechnungsausgang.SteuerfreierGesamtbetrag + Rechnungsausgang.SteuerpflichtigerGesamtbetrag) AS Summe,sum(Rechnungsausgang.SteuerpflichtigerGesamtbetrag) AS Steuer, isnull(tblKundenErweitert.kde_keineMWSt,0) as keineMWST 
                             ,(SELECT CASE WHEN Rechnungsdruck =0 THEN 'POST' WHEN Rechnungsdruck=1 THEN 'FAX' WHEN Rechnungsdruck=2 THEN 'E-MAIL' ELSE '-' END FROM Adressen WHERE AdressenNr=Rechnungsausgang.RechnungsKundenNr ) as Rechnungsdruck 
                              FROM Rechnungsausgang left  join tblKundenErweitert on tblKundenErweitert.kde_KundenNr = Rechnungsausgang.RechnungsKundenNr   
-	                         WHERE Rechnungsausgang.Status IN (2) And Rechnungsausgang.Firma_ID = '" & cboFirma._value & "' And Rechnungsausgang.Sammelrechnung = '6' And CONVERT(DATE,Rechnungsausgang.Abfertigungsdatum,104) = '" & txtZeitraumBis._value & "'
+	                         WHERE Rechnungsausgang.Status IN (2) And Rechnungsausgang.Firma_ID = '" & cboFirma._value & "' And Rechnungsausgang.Sammelrechnung = 6 And CONVERT(DATE,Rechnungsausgang.Abfertigungsdatum,104) = '" & txtRechnungsdatum._value & "'
                                 " & If(cboSB._value <> "", " AND Rechnungsausgang.Sachbearbeiter='" & cboSB._value & "' ", "") & "
                                 " & whereAbfArt & " " & whereMWST & "
                               GROUP BY RechnungsKundenNr, isnull(tblKundenErweitert.kde_keineMWSt,0) 
@@ -356,7 +356,7 @@ Public Class frmFaktSammelRgDrucken
         End If
 
 
-        Dim f As New frmFaktEmail(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, RG_DRUCK, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr_Simple, -1, Nothing, cboSB._value,, getAvisoIds, cbxEVOLOG.Checked, cbxTransFerry.Checked, cboFaktGrp._value, cboAbfertigungsart._value, MDMKopiedrucken)
+        Dim f As New frmFaktEmail(cboFirma._value, Sammelrechung, CDate(txtRechnungsdatum.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, RG_DRUCK, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr_Simple, -1, Nothing, cboSB._value,, getAvisoIds, cbxEVOLOG.Checked, cbxTransFerry.Checked, cboFaktGrp._value, cboAbfertigungsart._value, MDMKopiedrucken)
         f.ShowDialog(Me)
         MyDatagridview1.GetOrder()
         initDGV()
@@ -620,8 +620,51 @@ Public Class frmFaktSammelRgDrucken
         If MyDatagridview1.SelectedRows.Count > 0 Then
             If IsNumeric(MyDatagridview1.SelectedRows(0).Cells("RechnungsKundenNr").Value) AndAlso IsNumeric(MyDatagridview1.SelectedRows(0).Cells("RechnungsKundenNr").Value) AndAlso IsNumeric(MyDatagridview1.SelectedRows(0).Cells("RechnungsKundenNr").Value) Then
 
+
+                Dim dtRE As DataTable = (New SQL).loadDgvBySql("select  RK_ID, RechnungsNr, FilialenNr from Rechnungsausgang where RechnungsKundenNr = " & MyDatagridview1.SelectedRows(0).Cells("RechnungsKundenNr").Value & " AND cast(RechnungsDatum as Date) = '" & txtRechnungsdatum._value & "' AND Sammelrechnung = 6" & IIf(Firma > 0, " AND Firma_ID =" & Firma, ""), "FMZOLL")
+
+                If dtRE.Rows.Count > 0 Then
+                    Dim RK_ID As String = ""
+                    If dtRE.Rows.Count = 1 Then
+
+                        RK_ID = dtRE.Rows(0).Item("RK_ID")
+
+                        If RK_ID <> "" AndAlso IsNumeric(RK_ID) Then
+
+                            Dim f As New SDL.frmAbrechnungsMaskeEinzeln(RK_ID)
+                            f.Show(Me)
+
+
+                        End If
+
+
+                    Else
+                        ContextMenuStrip1.Items.Clear()
+
+                        For Each r As DataRow In dtRE.Rows
+
+                            Dim re = New ToolStripMenuItem() With {.Text = r.Item("FilialenNr") & " - " & r.Item("RechnungsNr"), .Name = r.Item("RK_ID"), .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+                            ContextMenuStrip1.Items.Add(re)
+                            AddHandler re.Click, AddressOf mnuItem_Clicked
+
+                        Next
+
+
+                        ContextMenuStrip1.Show(Cursor.Position)
+
+
+
+
+                    End If
+
+                End If
+
+
+
             End If
         End If
+
+
     End Sub
 
     Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
@@ -648,4 +691,23 @@ Public Class frmFaktSammelRgDrucken
 
 
     End Sub
+
+
+    Private Sub mnuItem_Clicked(sender As Object, e As EventArgs)
+        ContextMenuStrip1.Hide()
+        Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem)
+
+        If item IsNot Nothing Then
+
+            If item.Name <> "" AndAlso IsNumeric(item.Name) Then
+
+                Dim f As New SDL.frmAbrechnungsMaskeEinzeln(item.Name)
+                f.Show(Me)
+
+
+            End If
+
+        End If
+
+    End Sub
 End Class

SDL/buchhaltung/frmBU_Mahnlauf.vb

@@ -30,6 +30,7 @@ Public Class frmBU_Mahnlauf
             'Dim sqlStr = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,KTO.c_plz + ' ' + KTO.c_ort Ort,isnull(KTO.c_email,'') Email, count(*) Anzahl, sum(eur_bruttobetrag+eur_zahlung) Ausstand ,min(op.d_netto) Faelligkeit,max(si_mahnstufe) Mahnstufe, cast(MAX(d_mahnung)as date) Mahndatum
             Dim sqlStr = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,KTO.c_plz + ' ' + KTO.c_ort Ort,/*isnull(KTO.c_email,'') Email, */  " &
                             "isnull(( SELECT  TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10  and kkd_KundenNr=i_personenkonto ) ,'') Email," &
+                             " isnull(( SELECT TOP 1 Vorkasse FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].Kunden where  KundenNr=i_personenkonto ) ,'') VK,KTO.c_zahlziel as Zahlungsziel, " &
                              "count(*) Anzahl, sum(eur_bruttobetrag+eur_zahlung) Ausstand ,min(op.d_netto) Faelligkeit,max(si_mahnstufe) Mahnstufe, cast(MAX(d_mahnung)as date) Mahndatum" &
                              If(cbxNurFaellig.Checked, "", ",SUM(CASE WHEN op.d_netto<getDATE() THEN (eur_bruttobetrag+eur_zahlung) ELSE 0 END) Summe_Faellig") & "
                       FROM op_debitor OP
@@ -38,7 +39,7 @@ Public Class frmBU_Mahnlauf
                         " & If(cbxNurFaellig.Checked, " and op.d_netto<=getdate() and isnull(si_mahnflags,0) <>(1) ", "") & "
                         " & If(KdNr > 0, " AND i_personenkonto ='" & KdNr & "'", "") & "
                         " & If(KdTxt <> "", " AND KTO.c_name LIKE '" & KdTxt.Replace("*", "%") & "'", "") & "
-                      group by i_personenkonto ,KTO.c_name,KTO.c_landid,KTO.c_ort,KTO.c_plz,KTO.c_email
+                      group by i_personenkonto ,KTO.c_name,KTO.c_landid,KTO.c_ort,KTO.c_plz,KTO.c_email, KTO.c_zahlziel
                       HAVING sum(eur_bruttobetrag+eur_zahlung)>'" & MyTextBox1._value & "'
                          " & If(MyComboBox1._value > 0, " and max(si_mahnstufe)>='" & MyComboBox1._value & "'", "") & "
                       ORDER BY KTO.c_name"
@@ -716,6 +717,13 @@ Public Class frmBU_Mahnlauf
                         Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Mahnung an")
                         Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an")
 
+                        If Firma_ID = 19 Then
+                            Select Case AD.LandKz
+                                Case "RO" : Mail_BCC &= "alex@verag.ag;maut.ro@verag.ag;ma@verag.ag;" 'später mal über eigene Logik!!
+                            End Select
+                        End If
+
+
                         '    isnull(( SELECT  TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10  and kkd_KundenNr=i_personenkonto ) ,'') Email,
                         'isnull(( SELECT  TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10  and kkd_KundenNr=i_personenkonto ) ,'') Email,
 

SDL/frmLogin.vb

@@ -86,7 +86,6 @@ Public Class frmLogin
                 If IsDate(parameter(3)) Then REDat = CDate(parameter(3))
                 If IsNumeric(parameter(3)) Then FirmaID = parameter(3)
 
-
             End If
 
 

SDL/kunden/frmKundenblatt.Designer.vb

@@ -328,7 +328,7 @@ Partial Class frmKundenblatt
         Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0)
         Me.tbcntrMain.Name = "tbcntrMain"
         Me.tbcntrMain.SelectedIndex = 0
-        Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1181)
+        Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1198)
         Me.tbcntrMain.TabIndex = 3
         '
         'tbAllgemein
@@ -365,7 +365,7 @@ Partial Class frmKundenblatt
         Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0)
         Me.tbAllgemein.Name = "tbAllgemein"
         Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1152)
+        Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1169)
         Me.tbAllgemein.TabIndex = 0
         Me.tbAllgemein.Text = "Allgemein"
         '
@@ -924,7 +924,7 @@ Partial Class frmKundenblatt
         Me.dgvSperrliste.Name = "dgvSperrliste"
         Me.dgvSperrliste.ReadOnly = True
         Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle11
-        Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1109)
+        Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1126)
         Me.dgvSperrliste.TabIndex = 23
         '
         'PictureBox2
@@ -1009,7 +1009,7 @@ Partial Class frmKundenblatt
         Me.tbMdm.Location = New System.Drawing.Point(4, 25)
         Me.tbMdm.Name = "tbMdm"
         Me.tbMdm.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbMdm.Size = New System.Drawing.Size(1644, 1152)
+        Me.tbMdm.Size = New System.Drawing.Size(1644, 1169)
         Me.tbMdm.TabIndex = 10
         Me.tbMdm.Text = "MDM"
         Me.tbMdm.UseVisualStyleBackColor = True
@@ -1028,7 +1028,7 @@ Partial Class frmKundenblatt
         Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0)
         Me.tbcntrMDM.Name = "tbcntrMDM"
         Me.tbcntrMDM.SelectedIndex = 0
-        Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 1146)
+        Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 1163)
         Me.tbcntrMDM.TabIndex = 0
         '
         'tbSDL
@@ -1040,7 +1040,7 @@ Partial Class frmKundenblatt
         Me.tbSDL.Margin = New System.Windows.Forms.Padding(0)
         Me.tbSDL.Name = "tbSDL"
         Me.tbSDL.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbSDL.Size = New System.Drawing.Size(1630, 1120)
+        Me.tbSDL.Size = New System.Drawing.Size(1630, 1137)
         Me.tbSDL.TabIndex = 5
         Me.tbSDL.Text = "SDL-Leistungen"
         Me.tbSDL.UseVisualStyleBackColor = True
@@ -1082,7 +1082,7 @@ Partial Class frmKundenblatt
         DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle17
         Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 924)
+        Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 941)
         Me.dgvSDLLeistungenFull.TabIndex = 5
         '
         'Panel6
@@ -1187,7 +1187,7 @@ Partial Class frmKundenblatt
         Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL)
         Me.Panel5.Controls.Add(Me.rtbVermerke)
         Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel5.Location = New System.Drawing.Point(3, 974)
+        Me.Panel5.Location = New System.Drawing.Point(3, 991)
         Me.Panel5.Name = "Panel5"
         Me.Panel5.Size = New System.Drawing.Size(1624, 143)
         Me.Panel5.TabIndex = 177
@@ -1853,7 +1853,7 @@ Partial Class frmKundenblatt
         Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd)
         Me.tbDokumente.Location = New System.Drawing.Point(4, 22)
         Me.tbDokumente.Name = "tbDokumente"
-        Me.tbDokumente.Size = New System.Drawing.Size(178, 39)
+        Me.tbDokumente.Size = New System.Drawing.Size(1630, 1137)
         Me.tbDokumente.TabIndex = 8
         Me.tbDokumente.Text = "Dokumente"
         Me.tbDokumente.UseVisualStyleBackColor = True
@@ -2073,7 +2073,7 @@ Partial Class frmKundenblatt
         Me.tbOfferte.Location = New System.Drawing.Point(4, 25)
         Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2)
         Me.tbOfferte.Name = "tbOfferte"
-        Me.tbOfferte.Size = New System.Drawing.Size(1644, 1152)
+        Me.tbOfferte.Size = New System.Drawing.Size(1644, 1169)
         Me.tbOfferte.TabIndex = 11
         Me.tbOfferte.Text = "Offerte"
         Me.tbOfferte.UseVisualStyleBackColor = True
@@ -2085,7 +2085,7 @@ Partial Class frmKundenblatt
         Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0)
         Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1)
         Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
-        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1152)
+        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1169)
         Me.UsrCntlOfferte1.TabIndex = 0
         '
         'tbUSTV
@@ -2376,7 +2376,6 @@ Partial Class frmKundenblatt
         '
         Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
         Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
         Me.cntxtCntxtMDM.Text = "cntxtMDM"
         '
@@ -2392,7 +2391,7 @@ Partial Class frmKundenblatt
         Me.ToolStripMenuItem8.MergeIndex = 10
         Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8"
         Me.ToolStripMenuItem8.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0)
-        Me.ToolStripMenuItem8.Size = New System.Drawing.Size(94, 60)
+        Me.ToolStripMenuItem8.Size = New System.Drawing.Size(122, 60)
         Me.ToolStripMenuItem8.Text = "USTV"
         Me.ToolStripMenuItem8.TextAlign = System.Drawing.ContentAlignment.BottomCenter
         Me.ToolStripMenuItem8.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
@@ -2516,7 +2515,7 @@ Partial Class frmKundenblatt
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.AutoScroll = True
         Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(1595, 1310)
+        Me.ClientSize = New System.Drawing.Size(1595, 1327)
         Me.Controls.Add(Me.lblAbfVerb)
         Me.Controls.Add(Me.btnAbfVerb)
         Me.Controls.Add(Me.tbcntrMain)

SDL/kunden/frmKundenblatt.vb

@@ -265,12 +265,30 @@ Public Class frmKundenblatt
                         Case "tbVERAGCard" : initTABVERAGCard()
                         Case "tbSDLKarten" : initTABSDLDATEN()
                         Case "tbDokumente"
+
+                            Dim ADR As New cAdressen(kdNr)
+                            Dim isEU As Boolean = True
+                            If Not IsDBNull(ADR.LandKz) Then
+                                isEU = SQL.getValueTxtBySql("select MitgliedslandEU as bit from Währungstabelle where LandKz ='" & ADR.LandKz & "'", "FMZOLL")
+                            End If
+                            If Not isEU Then
+                                scanEULizenz._TEXT_PDF = "Transportlizenz"
+                                scanEULizenz.Name = scanEULizenz._TEXT_PDF
+                                scanEULizenz.INIT(kdNr, "KUNDENDATEN")
+                            Else
+                                scanEULizenz._TEXT_PDF = "EU-Lizenz"
+                                scanEULizenz.Name = scanEULizenz._TEXT_PDF
+                                scanEULizenz.INIT(kdNr, "KUNDENDATEN")
+                            End If
+
+
+
                             scanVertragVeragKd.INIT(kdNr, "KUNDENDATEN")
                             scanBankGarantie.INIT(kdNr, "KUNDENDATEN")
                             scanPersonalAusweisGF.INIT(kdNr, "KUNDENDATEN")
                             scanHRA.INIT(kdNr, "KUNDENDATEN")
                             scanHKA.INIT(kdNr, "KUNDENDATEN")
-                            scanEULizenz.INIT(kdNr, "KUNDENDATEN")
+
                             scanSonstiges.INIT(kdNr, "KUNDENDATEN")
                             scanUebernahmebestätigungen.INIT(kdNr, "KUNDENDATEN", "Übernahmebestätigungen")
                         Case "tbBesuchsberichte" : initTABBesuchsberichte()
@@ -294,17 +312,6 @@ Public Class frmKundenblatt
             End Select
 
 
-            If tbcntrMDM.SelectedTab.Name = "tbDokumente" Then
-                Dim ADR As New cAdressen(kdNr)
-                Dim isEU As Boolean = True
-                If Not IsDBNull(ADR.LandKz) Then
-                    isEU = SQL.getValueTxtBySql("select MitgliedslandEU as bit from Währungstabelle where LandKz ='" & ADR.LandKz & "'", "FMZOLL")
-                End If
-                If Not isEU Then
-                    scanEULizenz._TEXT_PDF = "Transportlizenz"
-                    scanEULizenz.Name = scanEULizenz._TEXT_PDF
-                End If
-            End If
 
         End If
         'tbcntrMDM.ResumeLayout()

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -4831,7 +4831,7 @@ RabattBerechnen:
         Dim checkDate As Boolean = False
 
         If Not (abrDate.Day = 15 Or abrDate.Day = 30 Or abrDate.Day = 31 Or (abrDate.Month = 2 And abrDate.Day = 28)) Then
-            If Not vbYes = MsgBox("ACHTUNG, immer als Abrechnungsdatum den 15. bzw. den letzten Tag des Monats angeben!" & vbNewLine & "Dies kann zu Fehlern bei der Verrechnung führen!" & vbNewLine & "Möchten Sie wirklich mit dem " & abrDate.ToShortDateString & " fortfahren?", vbYesNoCancel) Then
+            If Not vbYes = MsgBox("ACHTUNG, immer als Anhangsdatum den 15. bzw. den letzten Tag des Monats angeben!" & vbNewLine & "Dies kann zu Fehlern bei der Verrechnung führen!" & vbNewLine & "Möchten Sie wirklich mit dem " & abrDate.ToShortDateString & " fortfahren?", vbYesNoCancel) Then
                 checkDate = False
             Else
                 checkDate = True

SDL/seriendruck/usrCntlFakturierung.vb

@@ -1582,6 +1582,8 @@ Public Class usrcntlFakturierung
     Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnMDMSammelrechnung.Click
 
         Dim f As New frmFaktSammelRgDrucken(19)
+        f.Height = Screen.FromRectangle(Me.Bounds).WorkingArea.Size.Height
+        f.Top = 0
         f.ShowDialog(Me)
 
     End Sub