div. Änderungen, etc.

2025-12-05 11:03:20 +01:00
parent c495bd03b4
commit fedbd98286
14 changed files with 480 additions and 171 deletions
--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -58,6 +58,7 @@ Partial Class frmKundenblatt
        Me.Panel4 = New System.Windows.Forms.Panel()
        Me.tbcntrMain = New System.Windows.Forms.TabControl()
        Me.tbAllgemein = New System.Windows.Forms.TabPage()
+        Me.txtKundeninfo = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtRisiko = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label20 = New System.Windows.Forms.Label()
        Me.txt3470Betrag = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -252,13 +253,13 @@ Partial Class frmKundenblatt
        Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem()
        Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem()
        Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem()
-        Me.txtKundeninfo = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull()
        Me.usrcntlKarten = New SDL.usrCntlKartenDaten()
        Me.UsrCntlLKW1 = New SDL.usrCntlLKW()
        Me.UsrCntlKundenlogin1 = New SDL.usrCntlKundenlogin()
        Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte()
        Me.UsrCntlUSTV = New SDL.usrCntlUSTV()
+        Me.btnRgMail = New System.Windows.Forms.Button()
        Me.pnlInfo.SuspendLayout()
        Me.tbFirmendaten.SuspendLayout()
        Me.Panel4.SuspendLayout()
@@ -434,6 +435,33 @@ Partial Class frmKundenblatt
        Me.tbAllgemein.TabIndex = 0
        Me.tbAllgemein.Text = "Allgemein"
        '
+        'txtKundeninfo
+        '
+        Me.txtKundeninfo._DateTimeOnly = False
+        Me.txtKundeninfo._numbersOnly = False
+        Me.txtKundeninfo._numbersOnlyKommastellen = ""
+        Me.txtKundeninfo._numbersOnlyTrennzeichen = True
+        Me.txtKundeninfo._Prozent = False
+        Me.txtKundeninfo._ShortDateNew = False
+        Me.txtKundeninfo._ShortDateOnly = False
+        Me.txtKundeninfo._TimeOnly = False
+        Me.txtKundeninfo._TimeOnly_Seconds = False
+        Me.txtKundeninfo._value = ""
+        Me.txtKundeninfo._Waehrung = False
+        Me.txtKundeninfo._WaehrungZeichen = True
+        Me.txtKundeninfo.BackColor = System.Drawing.Color.White
+        Me.txtKundeninfo.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.txtKundeninfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtKundeninfo.ForeColor = System.Drawing.Color.Black
+        Me.txtKundeninfo.Location = New System.Drawing.Point(8, 65)
+        Me.txtKundeninfo.MaxLineLength = -1
+        Me.txtKundeninfo.MaxLines_Warning = ""
+        Me.txtKundeninfo.MaxLines_Warning_Label = Nothing
+        Me.txtKundeninfo.Multiline = True
+        Me.txtKundeninfo.Name = "txtKundeninfo"
+        Me.txtKundeninfo.Size = New System.Drawing.Size(646, 364)
+        Me.txtKundeninfo.TabIndex = 202
+        '
        'txtRisiko
        '
        Me.txtRisiko._DateTimeOnly = False
@@ -2777,6 +2805,7 @@ Partial Class frmKundenblatt
        '
        'MyPanel1
        '
+        Me.MyPanel1.Controls.Add(Me.btnRgMail)
        Me.MyPanel1.Controls.Add(Me.btnRgPdf)
        Me.MyPanel1.Controls.Add(Me.btnMonat)
        Me.MyPanel1.Controls.Add(Me.Button10)
@@ -2794,12 +2823,11 @@ Partial Class frmKundenblatt
        Me.btnRgPdf.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnRgPdf.Image = Global.SDL.My.Resources.Resources.pdf1
        Me.btnRgPdf.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnRgPdf.Location = New System.Drawing.Point(1568, 0)
+        Me.btnRgPdf.Location = New System.Drawing.Point(1607, 0)
        Me.btnRgPdf.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
        Me.btnRgPdf.Name = "btnRgPdf"
-        Me.btnRgPdf.Size = New System.Drawing.Size(105, 57)
+        Me.btnRgPdf.Size = New System.Drawing.Size(66, 57)
        Me.btnRgPdf.TabIndex = 212
-        Me.btnRgPdf.Text = "Als PDF"
        Me.btnRgPdf.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.btnRgPdf.UseVisualStyleBackColor = True
        '
@@ -2999,7 +3027,7 @@ Partial Class frmKundenblatt
        '
        Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
        Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
+        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
        Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
        Me.cntxtCntxtMDM.Text = "cntxtMDM"
        '
@@ -3161,33 +3189,6 @@ Partial Class frmKundenblatt
        Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22)
        Me.tbiVERAGCard.Text = "VERAG Card"
        '
-        'txtKundeninfo
-        '
-        Me.txtKundeninfo._DateTimeOnly = False
-        Me.txtKundeninfo._numbersOnly = False
-        Me.txtKundeninfo._numbersOnlyKommastellen = ""
-        Me.txtKundeninfo._numbersOnlyTrennzeichen = True
-        Me.txtKundeninfo._Prozent = False
-        Me.txtKundeninfo._ShortDateNew = False
-        Me.txtKundeninfo._ShortDateOnly = False
-        Me.txtKundeninfo._TimeOnly = False
-        Me.txtKundeninfo._TimeOnly_Seconds = False
-        Me.txtKundeninfo._value = ""
-        Me.txtKundeninfo._Waehrung = False
-        Me.txtKundeninfo._WaehrungZeichen = True
-        Me.txtKundeninfo.BackColor = System.Drawing.Color.White
-        Me.txtKundeninfo.BorderStyle = System.Windows.Forms.BorderStyle.None
-        Me.txtKundeninfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtKundeninfo.ForeColor = System.Drawing.Color.Black
-        Me.txtKundeninfo.Location = New System.Drawing.Point(8, 65)
-        Me.txtKundeninfo.MaxLineLength = -1
-        Me.txtKundeninfo.MaxLines_Warning = ""
-        Me.txtKundeninfo.MaxLines_Warning_Label = Nothing
-        Me.txtKundeninfo.Multiline = True
-        Me.txtKundeninfo.Name = "txtKundeninfo"
-        Me.txtKundeninfo.Size = New System.Drawing.Size(646, 364)
-        Me.txtKundeninfo.TabIndex = 202
-        '
        'UsrcntlKundeBearbeitenFull1
        '
        Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White
@@ -3246,6 +3247,20 @@ Partial Class frmKundenblatt
        Me.UsrCntlUSTV.Size = New System.Drawing.Size(1667, 964)
        Me.UsrCntlUSTV.TabIndex = 0
        '
+        'btnRgMail
+        '
+        Me.btnRgMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnRgMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnRgMail.Image = Global.SDL.My.Resources.Resources.email_big1
+        Me.btnRgMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnRgMail.Location = New System.Drawing.Point(1536, 0)
+        Me.btnRgMail.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
+        Me.btnRgMail.Name = "btnRgMail"
+        Me.btnRgMail.Size = New System.Drawing.Size(58, 57)
+        Me.btnRgMail.TabIndex = 213
+        Me.btnRgMail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnRgMail.UseVisualStyleBackColor = True
+        '
        'frmKundenblatt
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3554,4 +3569,5 @@ Partial Class frmKundenblatt
    Friend WithEvents txt3470Betrag As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents Label21 As Label
    Friend WithEvents txtKundeninfo As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents btnRgMail As Button
 End Class
--- a/SDL/kunden/frmKundenblatt.vb
+++ b/SDL/kunden/frmKundenblatt.vb
@@ -2,6 +2,7 @@
 Imports System.Globalization
 Imports System.Web.UI.WebControls.Expressions
 Imports com.sun.xml.internal.rngom
+Imports GrapeCity.Viewer.Common.Model
 Imports Microsoft.Office.Interop
 Imports VERAG_PROG_ALLGEMEIN

@@ -649,13 +650,13 @@ Public Class frmKundenblatt


        Dim GesamtUSteuer As Double = 0
-            Dim GesamtErstattung As Double = 0
-            Dim Differnezbetrag As Double = 0
-            Dim Gesamt3470 As Double = 0
-            Dim GesamtVZBetrag As Double = 0
-            Dim VorschaubetrGes As Double = 0
-            Dim OPSaldo As Double = 0
-            Dim Risiko As Double = 0
+        Dim GesamtErstattung As Double = 0
+        Dim Differnezbetrag As Double = 0
+        Dim Gesamt3470 As Double = 0
+        Dim GesamtVZBetrag As Double = 0
+        Dim VorschaubetrGes As Double = 0
+        Dim OPSaldo As Double = 0
+        Dim Risiko As Double = 0


        OPSaldo = CDbl((New SQL).getValueTxtBySql("SELECT isnull(sum(Gesamtausstand),0) FROM [Offene Posten] WHERE [Kontonummer]=" & kdNr, "FMZOLL"))
@@ -828,7 +829,7 @@ Public Class frmKundenblatt
                txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.Telefon) <> "", "Tel.: " & ADRESSE.Telefon & vbNewLine, ""))
                txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.Telefax) <> "", "Fax: " & ADRESSE.Telefax & vbNewLine, ""))
                txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.Mobiltelefon) <> "", "Mobil: " & checkNullStr(ADRESSE.Mobiltelefon) & vbNewLine, ""))
-                txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.E_Mail) <> "", "E-Mail: " & ADRESSE.E_Mail & IIf(checkNullStr(ADRESSE.E_Mail2) <> "", " " & ADRESSE.E_Mail2, "") & vbNewLine, ""))
+                txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.E_Mail) <> "", "E-Mail: " & ADRESSE.E_Mail & "; " & IIf(checkNullStr(ADRESSE.E_Mail2) <> "", " " & ADRESSE.E_Mail & ";", "") & vbNewLine, ""))

                lblKurzname.Text = checkNullStr(ADRESSE.Ordnungsbegriff)

@@ -855,8 +856,8 @@ Public Class frmKundenblatt
                txtEmailRE.Text = "-"
                txtEmailRE2.Text = ""
                If KUNDE_K_RE.hasEntry Then 'Rechnung an
-                    EmailRechnungen &= KUNDE_K_RE.kkd_Email
-                    EmailRechnungen &= KUNDE_K_RE.kkd_EmailCC
+                    EmailRechnungen &= KUNDE_K_RE.kkd_Email & "; "
+                    EmailRechnungen &= KUNDE_K_RE.kkd_EmailCC & "; "
                Else
                    EmailRechnungen &= " - "
                End If
@@ -2435,14 +2436,39 @@ Public Class frmKundenblatt

    End Sub

-    Private Sub btnRgPdf_Click(sender As Object, e As EventArgs) Handles btnRgPdf.Click
+    Private Sub btnRgPdf_Click(sender As Object, e As EventArgs) Handles btnRgPdf.Click, btnRgMail.Click
        Me.Cursor = Cursors.WaitCursor
+        Dim PathList As New List(Of String)
        Try
            For Each RK_ID In getList_RK_ID()
                Dim RG_PATH = ""
                cFakturierung.doRechnungsDruck_SRorER(RK_ID,, False, 4, RG_PATH,,, True)
-                Process.Start(RG_PATH)
+
+                PathList.Add(RG_PATH)
+                If sender.Name = "btnRgPdf" Then Process.Start(RG_PATH)
            Next
+
+            If sender.Name = "btnRgMail" Then
+
+
+                Dim outl As New Outlook.Application
+                Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+                Mail = outl.CreateItem(0)
+
+                Dim kundeMail As New cKunden()
+                kundeMail = kundenSQL.getKundeByKdNr(kdNr)
+                For Each pdf In PathList
+                    Mail.Attachments.Add(pdf, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , )
+                Next
+
+                Mail.To &= kundeMail.EMail
+                Mail.CC &= kundeMail.EMail2
+                Mail.Display()
+
+
+            End If
+
+
        Catch ex As Exception
            MsgBox(ex.Message & ex.StackTrace)
        End Try
@@ -2853,5 +2879,8 @@ Public Class frmKundenblatt

    End Sub

+    Private Sub btnRgMail_Click(sender As Object, e As EventArgs) Handles btnRgMail.Click
+
+    End Sub
 End Class

--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -2653,6 +2653,7 @@ Public Class usrcntlKundeBearbeitenFull
        If cboAbfVerb_Abfertigungsverbot.Checked Then

            If rtbAbfVerb_Grund.Text.Trim <> "" AndAlso rtbAbfVerb_Grund.TextLength < 4 Then
+                MsgBox("Abfertigungsgrund muss mind. 5 Zeichen haben!")
                Return False

            Else