SendEmail Added ContextMenuStrip

SDL/Fakturierung/frmSendEmail.vb

@@ -40,6 +40,7 @@ Public Class frmSendEmail
                    ByVal SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch,
                    ByVal printOriginalRg As Object,
                    ByVal Rechnungsdruck As Integer,
+                   ByVal Kdnr As Integer,
                    Optional ByVal Rechnungsdatum As Object = Nothing)
 
         ' Dieser Aufruf ist für den Designer erforderlich.
@@ -50,64 +51,14 @@ Public Class frmSendEmail
         Me.Firma_ID = Firma_ID
         Me.SPEDBUCH = SPEDBUCH
         Me.printOriginalRg = printOriginalRg
-        Me.KdNr = RECHNUNG.RechnungsKundenNr
+        Me.KdNr = Kdnr
         Me.Rechnungsdruck = Rechnungsdruck
         If Rechnungsdatum IsNot Nothing Then
             Me.Rechnungsdatum = CDate(Rechnungsdatum)
         End If
     End Sub
 
-    ' Konstruktor 2
-    Public Sub New(ByVal Firma_ID As Integer,
-                   ByVal SammelrechungArt As Integer,
-                   ByVal DatumBis As Date,
-                   ByVal Rechnungsdatum As Date,
-                   ByVal PrinterName As String,
-                   ByVal Rechnungsdruck As Integer,
-                   Optional ByVal EinzelAnlagen As Boolean = True,
-                   Optional ByVal Sammelbericht As Boolean = True,
-                   Optional ByVal KdNr As Integer = -1,
-                   Optional ByVal RechnungsdruckArt As Integer = -1,
-                   Optional ByRef listPDFs As List(Of String) = Nothing,
-                   Optional ByVal SB As String = "",
-                   ByRef Optional lastAktuelle_RgNr As Integer = -1,
-                   Optional ByVal AvisoIds As List(Of Integer) = Nothing,
-                   Optional ByVal xlsEvolog As Boolean = False,
-                   Optional ByVal xlsTransFerry As Boolean = False,
-                   Optional ByVal FakturierungsGruppe As String = "",
-                   Optional ByVal Abfertigungsart As String = "",
-                   Optional ByVal printRgCopy As Boolean = False)
 
-        ' Dieser Aufruf ist für den Designer erforderlich.
-        InitializeComponent()
-
-        Me.SR_DT = cFakturierung.GET_SR_SQLDT(Firma_ID,
-                                              SammelrechungArt,
-                                              DatumBis,
-                                              KdNr,
-                                              SB,
-                                              AvisoIds,
-                                              FakturierungsGruppe,
-                                              Abfertigungsart)
-
-        Me.Firma_ID = Firma_ID
-        Me.SammelrechungArt = SammelrechungArt
-        Me.DatumBis = DatumBis
-        Me.SB = SB
-        Me.EinzelAnlagen = EinzelAnlagen
-        Me.Sammelbericht = Sammelbericht
-        Me.xlsEvolog = xlsEvolog
-        Me.xlsTransFerry = xlsTransFerry
-        Me.KdNr = KdNr
-        Me.Rechnungsdatum = Rechnungsdatum
-        Me.RechnungsNr = lastAktuelle_RgNr
-        Me.FakturierungsGruppe = FakturierungsGruppe
-        Me.Abfertigungsart = Abfertigungsart
-        Me.AvisoIds = AvisoIds
-        Me.Rechnungsdruck = Rechnungsdruck
-        Me.printRgCopy = printRgCopy
-        SR = True
-    End Sub
 
     ' Ereignishandler: Form-Load
     Private Sub frmFaktEmail_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -137,26 +88,26 @@ Public Class frmSendEmail
                     End If
                 Next
             End If
-            email_receipt = If(allAtilla, VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Rechnung an (ATILLA)"), "")
+            email_receipt = If(allAtilla, VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(KdNr, "Rechnung an (ATILLA)"), "")
         Else
             If RECHNUNG.FilialenNr = "4801" OrElse RECHNUNG.FilialenNr = "4802" Then
-                email_receipt = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Rechnung an (ATILLA)")
+                email_receipt = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(KdNr, "Rechnung an (ATILLA)")
             End If
         End If
 
         Dim EMAILTMP As String = If(email_receipt = "",
-                                    VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Rechnung an"),
+                                    VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(KdNr, "Rechnung an"),
                                     email_receipt)
         If EMAILTMP <> "" Then dgvEmail.Rows.Add(EMAILTMP)
 
         Dim EMAILTMPCC As String = If(email_receipt = "",
-                                      VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Rechnung an"),
+                                      VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(KdNr, "Rechnung an"),
-                                      VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Rechnung an (ATILLA)"))
+                                      VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(KdNr, "Rechnung an (ATILLA)"))
         If EMAILTMPCC <> "" Then dgvEmailCC.Rows.Add(EMAILTMPCC)
 
         Dim EMAILTMPBCC As String = If(email_receipt = "",
-                                       VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Rechnung an"),
+                                       VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(KdNr, "Rechnung an"),
-                                       VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Rechnung an (ATILLA)"))
+                                       VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(KdNr, "Rechnung an (ATILLA)"))
         If EMAILTMPBCC <> "" Then dgvEmailBCC.Rows.Add(EMAILTMPBCC)
 
         initDGVAnhaenge()

SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb

@@ -82,6 +82,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.lblRechnungsDatum = New System.Windows.Forms.Label()
         Me.lblRechnungsNummer = New System.Windows.Forms.Label()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Button17 = New System.Windows.Forms.Button()
         Me.txtTextZZ = New VERAG_PROG_ALLGEMEIN.MyRichTextBox()
         Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.optAnhSel = New System.Windows.Forms.DataGridViewCheckBoxColumn()
@@ -273,13 +274,17 @@ Partial Class usrCntlFaktAbrechnung
         Me.EmpfängerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AuftraggeberToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AvisiererToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.AbsenderToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.EmpfängerToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AuftraggeberToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AvisiererToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.GutschriftAusRechnungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.SeperateRechnungFürEUSTToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GutschriftAnVeragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.VeragAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.VeragCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Button17 = New System.Windows.Forms.Button()
         Me.rtbAbf_Besonderheiten = New SDL.usrCntlKundenBesonderheiten()
         Me.pnlTop.SuspendLayout()
         Me.Panel3.SuspendLayout()
@@ -305,6 +310,7 @@ Partial Class usrCntlFaktAbrechnung
         CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.CntxtAbfArt.SuspendLayout()
         Me.ContextMenuStrip1.SuspendLayout()
+        Me.ContextMenuStrip3.SuspendLayout()
         Me.ContextMenuStrip2.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -851,6 +857,20 @@ Partial Class usrCntlFaktAbrechnung
         Me.Panel1.Size = New System.Drawing.Size(830, 1142)
         Me.Panel1.TabIndex = 1
         '
+        'Button17
+        '
+        Me.Button17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+        Me.Button17.ContextMenuStrip = Me.ContextMenuStrip3
+        Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button17.Location = New System.Drawing.Point(656, 887)
+        Me.Button17.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
+        Me.Button17.Name = "Button17"
+        Me.Button17.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0)
+        Me.Button17.Size = New System.Drawing.Size(166, 24)
+        Me.Button17.TabIndex = 92
+        Me.Button17.Text = "E-Mail Erstellen"
+        Me.Button17.UseVisualStyleBackColor = True
+        '
         'txtTextZZ
         '
         Me.txtTextZZ.Location = New System.Drawing.Point(64, 1061)
@@ -3932,6 +3952,37 @@ Partial Class usrCntlFaktAbrechnung
         Me.AvisiererToolStripMenuItem.Size = New System.Drawing.Size(153, 22)
         Me.AvisiererToolStripMenuItem.Text = "4 Avisierer"
         '
+        'ContextMenuStrip3
+        '
+        Me.ContextMenuStrip3.ImageScalingSize = New System.Drawing.Size(24, 24)
+        Me.ContextMenuStrip3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AbsenderToolStripMenuItem2, Me.EmpfängerToolStripMenuItem2, Me.AuftraggeberToolStripMenuItem2, Me.AvisiererToolStripMenuItem2})
+        Me.ContextMenuStrip3.Name = "ContextMenuStrip3"
+        Me.ContextMenuStrip3.Size = New System.Drawing.Size(154, 92)
+        '
+        'AbsenderToolStripMenuItem2
+        '
+        Me.AbsenderToolStripMenuItem2.Name = "AbsenderToolStripMenuItem2"
+        Me.AbsenderToolStripMenuItem2.Size = New System.Drawing.Size(153, 22)
+        Me.AbsenderToolStripMenuItem2.Text = "1 Absender"
+        '
+        'EmpfängerToolStripMenuItem2
+        '
+        Me.EmpfängerToolStripMenuItem2.Name = "EmpfängerToolStripMenuItem2"
+        Me.EmpfängerToolStripMenuItem2.Size = New System.Drawing.Size(153, 22)
+        Me.EmpfängerToolStripMenuItem2.Text = "2 Empfänger"
+        '
+        'AuftraggeberToolStripMenuItem2
+        '
+        Me.AuftraggeberToolStripMenuItem2.Name = "AuftraggeberToolStripMenuItem2"
+        Me.AuftraggeberToolStripMenuItem2.Size = New System.Drawing.Size(153, 22)
+        Me.AuftraggeberToolStripMenuItem2.Text = "3 Auftraggeber"
+        '
+        'AvisiererToolStripMenuItem2
+        '
+        Me.AvisiererToolStripMenuItem2.Name = "AvisiererToolStripMenuItem2"
+        Me.AvisiererToolStripMenuItem2.Size = New System.Drawing.Size(153, 22)
+        Me.AvisiererToolStripMenuItem2.Text = "4 Avisierer"
+        '
         'ContextMenuStrip2
         '
         Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GutschriftAusRechnungToolStripMenuItem, Me.SeperateRechnungFürEUSTToolStripMenuItem, Me.GutschriftAnVeragToolStripMenuItem})
@@ -3969,19 +4020,6 @@ Partial Class usrCntlFaktAbrechnung
         Me.VeragCSToolStripMenuItem.Size = New System.Drawing.Size(122, 22)
         Me.VeragCSToolStripMenuItem.Text = "Verag CS"
         '
-        'Button17
-        '
-        Me.Button17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
-        Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button17.Location = New System.Drawing.Point(656, 887)
-        Me.Button17.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
-        Me.Button17.Name = "Button17"
-        Me.Button17.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0)
-        Me.Button17.Size = New System.Drawing.Size(166, 24)
-        Me.Button17.TabIndex = 92
-        Me.Button17.Text = "E-Mail Erstellen"
-        Me.Button17.UseVisualStyleBackColor = True
-        '
         'rtbAbf_Besonderheiten
         '
         Me.rtbAbf_Besonderheiten.BackColor = System.Drawing.Color.White
@@ -4039,6 +4077,7 @@ Partial Class usrCntlFaktAbrechnung
         CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
         Me.CntxtAbfArt.ResumeLayout(False)
         Me.ContextMenuStrip1.ResumeLayout(False)
+        Me.ContextMenuStrip3.ResumeLayout(False)
         Me.ContextMenuStrip2.ResumeLayout(False)
         Me.ResumeLayout(False)
 
@@ -4262,10 +4301,16 @@ Partial Class usrCntlFaktAbrechnung
     Friend WithEvents SdfToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents Button15 As Button
     Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents Button17 As Button
     Friend WithEvents AbsenderToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents EmpfängerToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents AuftraggeberToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents AvisiererToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ContextMenuStrip3 As ContextMenuStrip
+    Friend WithEvents AbsenderToolStripMenuItem2 As ToolStripMenuItem
+    Friend WithEvents EmpfängerToolStripMenuItem2 As ToolStripMenuItem
+    Friend WithEvents AuftraggeberToolStripMenuItem2 As ToolStripMenuItem
+    Friend WithEvents AvisiererToolStripMenuItem2 As ToolStripMenuItem
     Friend WithEvents txtTextZZ As VERAG_PROG_ALLGEMEIN.MyRichTextBox
     Friend WithEvents Button16 As Button
     Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
@@ -4278,5 +4323,5 @@ Partial Class usrCntlFaktAbrechnung
     Friend WithEvents VeragCSToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents lblOFgesperrt As Label
     Friend WithEvents cboVorauskasse As VERAG_PROG_ALLGEMEIN.MyComboBox
-    Friend WithEvents Button17 As Button
+
 End Class

SDL/Fakturierung/usrCntlFaktAbrechnung.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="ContextMenuStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="optAnhSel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -176,19 +179,19 @@
 </value>
   </data>
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>290, 17</value>
   </metadata>
   <metadata name="Timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>109, 17</value>
+    <value>384, 17</value>
   </metadata>
   <metadata name="CntxtAbfArt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>191, 6</value>
+    <value>173, 17</value>
   </metadata>
   <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>343, 15</value>
+    <value>469, 17</value>
   </metadata>
   <metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>500, 15</value>
+    <value>625, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>45</value>

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -4224,28 +4224,67 @@ Nächste_Textzeile_lesen:
     End Sub
 
     Private Sub Button17_Click(sender As Object, e As EventArgs) Handles Button17.Click
-        If Not checkUIDNR() Then Exit Sub
+        ContextMenuStrip3.Show(Cursor.Position)
-
-        If RECHNUNG.Status <> 0 OrElse saveMe() Then
-            ' Anhänge sichern, falls geändert
-            If RECHNUNG.RK_ID > 0 And RECHNUNG.Status <> 0 Then
-                getValues_ANHAENGE()
-                RECHNUNG.SAVE_ANHAENGE(RECHNUNG.RK_ID)
-            End If
-
-            'RG-Druck - Mail (+Kopie)
-            Dim RG_DRUCK = 2
-            If sender Is Button16 Then
-                RG_DRUCK = 5
-            End If
-
-            Dim f As New frmSendEmail(RECHNUNG, SPEDBUCH, If(cbxOriginalPrint.Visible, cbxOriginalPrint.Checked, Nothing), RG_DRUCK)
-            f.ShowDialog(Me)
-            initRECHNUNG()
-            RaiseEvent SOMETHING_CHANGED(-1)
-
-
-        End If
-        cbxOriginalPrint.Checked = False
     End Sub
+
+Private Sub AbsenderToolStripMenuItem2_Click(sender As Object, e As EventArgs) Handles AbsenderToolStripMenuItem2.Click, EmpfängerToolStripMenuItem2.Click, AuftraggeberToolStripMenuItem2.Click, AvisiererToolStripMenuItem2.Click
+        Try
+
+
+            If cboRechnungAn._value = "" Then Exit Sub
+            getValues()
+            Dim ROLLE = "AUFTRAGGEBER"
+
+            Dim FirmaFrm = (RECHNUNG.RechnungsName_1 & " " & If(RECHNUNG.RechnungsName_2, "")).trim
+            Dim kdnrFrm As Integer = RECHNUNG.RechnungsKundenNr
+
+            Select Case sender.text.ToString.Substring(0, 1) 'cboRechnungAn._value
+                Case "1"
+                    ROLLE = "ABSENDER"
+                    FirmaFrm = (RECHNUNG.AbsenderName_1 & " " & If(RECHNUNG.AbsenderName_2, "")).trim
+                    kdnrFrm = RECHNUNG.AbsenderKundenNr
+                Case "2"
+                    ROLLE = "EMPFAENGER"
+                    FirmaFrm = (RECHNUNG.EmpfängerName_1 & " " & If(RECHNUNG.EmpfängerName_2, "")).trim
+                    kdnrFrm = RECHNUNG.EmpfängerKundenNr
+                Case "3"
+                    ROLLE = "AUFTRAGGEBER"
+                    FirmaFrm = (RECHNUNG.VermittlerName_1 & " " & If(RECHNUNG.VermittlerName_2, "")).trim
+                    kdnrFrm = RECHNUNG.VermittlerKundenNr
+                Case "4"
+                    ROLLE = "AVISIERER"
+                    FirmaFrm = (RECHNUNG.Avisierer)
+                    kdnrFrm = RECHNUNG.AvisiererKundenNr
+            End Select
+            If Not checkUIDNR() Then Exit Sub
+
+            If RECHNUNG.Status <> 0 OrElse saveMe() Then
+                ' Anhänge sichern, falls geändert
+                If RECHNUNG.RK_ID > 0 And RECHNUNG.Status <> 0 Then
+                    getValues_ANHAENGE()
+                    RECHNUNG.SAVE_ANHAENGE(RECHNUNG.RK_ID)
+                End If
+
+                'RG-Druck - Mail (+Kopie)
+                Dim RG_DRUCK = 2
+                If sender Is Button16 Then
+                    RG_DRUCK = 5
+                End If
+
+                Dim f As New frmSendEmail(RECHNUNG, SPEDBUCH, If(cbxOriginalPrint.Visible, cbxOriginalPrint.Checked, Nothing), RG_DRUCK, kdnrFrm)
+                f.ShowDialog(Me)
+                initRECHNUNG()
+                RaiseEvent SOMETHING_CHANGED(-1)
+
+
+            End If
+            cbxOriginalPrint.Checked = False
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+
+
+
 End Class