Überstundenauszahlung, FaktAbrechnung, etc.

2025-11-25 14:23:08 +01:00
parent 010ff0cf18
commit 978edb3499
13 changed files with 465 additions and 324 deletions
--- a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb
+++ b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb
@@ -23,8 +23,8 @@ Partial Class usrcntlFremdrechnungen
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.DetailsAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel()
        Me.btnSDL_Alle = New System.Windows.Forms.Button()
@@ -39,6 +39,10 @@ Partial Class usrcntlFremdrechnungen
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.KundenblattAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.txtKundenNrbis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtKundenNrvon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label6 = New System.Windows.Forms.Label()
        Me.lblSumBto = New System.Windows.Forms.Label()
        Me.Label5 = New System.Windows.Forms.Label()
        Me.cbxMailoeffnen = New System.Windows.Forms.CheckBox()
@@ -64,11 +68,8 @@ Partial Class usrcntlFremdrechnungen
        Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Label6 = New System.Windows.Forms.Label()
        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.txtKundenNrvon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txtKundenNrbis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Label7 = New System.Windows.Forms.Label()
+        Me.cbxTest = New System.Windows.Forms.CheckBox()
        Me.FlowLayoutPanel.SuspendLayout()
        Me.ContextMenuStrip1.SuspendLayout()
        Me.Panel1.SuspendLayout()
@@ -282,6 +283,7 @@ Partial Class usrcntlFremdrechnungen
        Me.Panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
        Me.Panel1.BackColor = System.Drawing.SystemColors.ControlLightLight
        Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel1.Controls.Add(Me.cbxTest)
        Me.Panel1.Controls.Add(Me.Label7)
        Me.Panel1.Controls.Add(Me.txtKundenNrbis)
        Me.Panel1.Controls.Add(Me.txtKundenNrvon)
@@ -309,6 +311,70 @@ Partial Class usrcntlFremdrechnungen
        Me.Panel1.Size = New System.Drawing.Size(260, 907)
        Me.Panel1.TabIndex = 23
        '
+        'Label7
+        '
+        Me.Label7.AutoSize = True
+        Me.Label7.Location = New System.Drawing.Point(121, 126)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(10, 13)
+        Me.Label7.TabIndex = 60
+        Me.Label7.Text = "-"
+        '
+        'txtKundenNrbis
+        '
+        Me.txtKundenNrbis._DateTimeOnly = False
+        Me.txtKundenNrbis._numbersOnly = True
+        Me.txtKundenNrbis._numbersOnlyKommastellen = ""
+        Me.txtKundenNrbis._numbersOnlyTrennzeichen = False
+        Me.txtKundenNrbis._Prozent = False
+        Me.txtKundenNrbis._ShortDateNew = False
+        Me.txtKundenNrbis._ShortDateOnly = False
+        Me.txtKundenNrbis._TimeOnly = False
+        Me.txtKundenNrbis._TimeOnly_Seconds = False
+        Me.txtKundenNrbis._value = ""
+        Me.txtKundenNrbis._Waehrung = False
+        Me.txtKundenNrbis._WaehrungZeichen = False
+        Me.txtKundenNrbis.ForeColor = System.Drawing.Color.Black
+        Me.txtKundenNrbis.Location = New System.Drawing.Point(146, 123)
+        Me.txtKundenNrbis.MaxLineLength = -1
+        Me.txtKundenNrbis.MaxLines_Warning = ""
+        Me.txtKundenNrbis.MaxLines_Warning_Label = Nothing
+        Me.txtKundenNrbis.Name = "txtKundenNrbis"
+        Me.txtKundenNrbis.Size = New System.Drawing.Size(98, 20)
+        Me.txtKundenNrbis.TabIndex = 59
+        '
+        'txtKundenNrvon
+        '
+        Me.txtKundenNrvon._DateTimeOnly = False
+        Me.txtKundenNrvon._numbersOnly = True
+        Me.txtKundenNrvon._numbersOnlyKommastellen = ""
+        Me.txtKundenNrvon._numbersOnlyTrennzeichen = False
+        Me.txtKundenNrvon._Prozent = False
+        Me.txtKundenNrvon._ShortDateNew = False
+        Me.txtKundenNrvon._ShortDateOnly = False
+        Me.txtKundenNrvon._TimeOnly = False
+        Me.txtKundenNrvon._TimeOnly_Seconds = False
+        Me.txtKundenNrvon._value = ""
+        Me.txtKundenNrvon._Waehrung = False
+        Me.txtKundenNrvon._WaehrungZeichen = False
+        Me.txtKundenNrvon.ForeColor = System.Drawing.Color.Black
+        Me.txtKundenNrvon.Location = New System.Drawing.Point(11, 123)
+        Me.txtKundenNrvon.MaxLineLength = -1
+        Me.txtKundenNrvon.MaxLines_Warning = ""
+        Me.txtKundenNrvon.MaxLines_Warning_Label = Nothing
+        Me.txtKundenNrvon.Name = "txtKundenNrvon"
+        Me.txtKundenNrvon.Size = New System.Drawing.Size(98, 20)
+        Me.txtKundenNrvon.TabIndex = 58
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Location = New System.Drawing.Point(8, 107)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(58, 13)
+        Me.Label6.TabIndex = 57
+        Me.Label6.Text = "KundenNr."
+        '
        'lblSumBto
        '
        Me.lblSumBto.AutoSize = True
@@ -529,12 +595,13 @@ Partial Class usrcntlFremdrechnungen
        Me.dgvLFRechnung.AllowUserToDeleteRows = False
        Me.dgvLFRechnung.AllowUserToResizeColumns = False
        Me.dgvLFRechnung.AllowUserToResizeRows = False
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvLFRechnung.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvLFRechnung.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
        Me.dgvLFRechnung.BackgroundColor = System.Drawing.Color.White
        Me.dgvLFRechnung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvLFRechnung.Location = New System.Drawing.Point(4, 3)
        Me.dgvLFRechnung.Name = "dgvLFRechnung"
+        Me.dgvLFRechnung.ReadOnly = True
        Me.dgvLFRechnung.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.dgvLFRechnung.Size = New System.Drawing.Size(1354, 770)
        Me.dgvLFRechnung.TabIndex = 29
@@ -546,8 +613,8 @@ Partial Class usrcntlFremdrechnungen
        Me.dgvDetails.AllowUserToDeleteRows = False
        Me.dgvDetails.AllowUserToResizeColumns = False
        Me.dgvDetails.AllowUserToResizeRows = False
-        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
        Me.dgvDetails.BackgroundColor = System.Drawing.Color.White
        Me.dgvDetails.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvDetails.Location = New System.Drawing.Point(-1, 3)
@@ -585,74 +652,21 @@ Partial Class usrcntlFremdrechnungen
        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(210, 22)
        Me.ToolStripMenuItem6.Text = "Formatiert (dauert länger)"
        '
-        'Label6
-        '
-        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(8, 107)
-        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(58, 13)
-        Me.Label6.TabIndex = 57
-        Me.Label6.Text = "KundenNr."
-        '
        'ContextMenuStrip2
        '
        Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
        Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
        '
-        'txtKundenNrvon
+        'cbxTest
        '
-        Me.txtKundenNrvon._DateTimeOnly = False
-        Me.txtKundenNrvon._numbersOnly = True
-        Me.txtKundenNrvon._numbersOnlyKommastellen = ""
-        Me.txtKundenNrvon._numbersOnlyTrennzeichen = False
-        Me.txtKundenNrvon._Prozent = False
-        Me.txtKundenNrvon._ShortDateNew = False
-        Me.txtKundenNrvon._ShortDateOnly = False
-        Me.txtKundenNrvon._TimeOnly = False
-        Me.txtKundenNrvon._TimeOnly_Seconds = False
-        Me.txtKundenNrvon._value = ""
-        Me.txtKundenNrvon._Waehrung = False
-        Me.txtKundenNrvon._WaehrungZeichen = False
-        Me.txtKundenNrvon.ForeColor = System.Drawing.Color.Black
-        Me.txtKundenNrvon.Location = New System.Drawing.Point(11, 123)
-        Me.txtKundenNrvon.MaxLineLength = -1
-        Me.txtKundenNrvon.MaxLines_Warning = ""
-        Me.txtKundenNrvon.MaxLines_Warning_Label = Nothing
-        Me.txtKundenNrvon.Name = "txtKundenNrvon"
-        Me.txtKundenNrvon.Size = New System.Drawing.Size(98, 20)
-        Me.txtKundenNrvon.TabIndex = 58
-        '
-        'txtKundenNrbis
-        '
-        Me.txtKundenNrbis._DateTimeOnly = False
-        Me.txtKundenNrbis._numbersOnly = True
-        Me.txtKundenNrbis._numbersOnlyKommastellen = ""
-        Me.txtKundenNrbis._numbersOnlyTrennzeichen = False
-        Me.txtKundenNrbis._Prozent = False
-        Me.txtKundenNrbis._ShortDateNew = False
-        Me.txtKundenNrbis._ShortDateOnly = False
-        Me.txtKundenNrbis._TimeOnly = False
-        Me.txtKundenNrbis._TimeOnly_Seconds = False
-        Me.txtKundenNrbis._value = ""
-        Me.txtKundenNrbis._Waehrung = False
-        Me.txtKundenNrbis._WaehrungZeichen = False
-        Me.txtKundenNrbis.ForeColor = System.Drawing.Color.Black
-        Me.txtKundenNrbis.Location = New System.Drawing.Point(146, 123)
-        Me.txtKundenNrbis.MaxLineLength = -1
-        Me.txtKundenNrbis.MaxLines_Warning = ""
-        Me.txtKundenNrbis.MaxLines_Warning_Label = Nothing
-        Me.txtKundenNrbis.Name = "txtKundenNrbis"
-        Me.txtKundenNrbis.Size = New System.Drawing.Size(98, 20)
-        Me.txtKundenNrbis.TabIndex = 59
-        '
-        'Label7
-        '
-        Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(121, 126)
-        Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(10, 13)
-        Me.Label7.TabIndex = 60
-        Me.Label7.Text = "-"
+        Me.cbxTest.AutoSize = True
+        Me.cbxTest.Location = New System.Drawing.Point(146, 214)
+        Me.cbxTest.Name = "cbxTest"
+        Me.cbxTest.Size = New System.Drawing.Size(61, 17)
+        Me.cbxTest.TabIndex = 61
+        Me.cbxTest.Text = "testmail"
+        Me.cbxTest.UseVisualStyleBackColor = True
+        Me.cbxTest.Visible = False
        '
        'usrcntlFremdrechnungen
        '
@@ -723,4 +737,5 @@ Partial Class usrcntlFremdrechnungen
    Friend WithEvents txtKundenNrvon As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents Label6 As Label
    Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
+    Friend WithEvents cbxTest As CheckBox
 End Class
--- a/SDL/mdm/usrcntlFremdrechnungen.vb
+++ b/SDL/mdm/usrcntlFremdrechnungen.vb
@@ -53,6 +53,9 @@ Public Class usrcntlFremdrechnungen
        txtKundenNrvon.Enabled = kdNr <= 0
        txtKundenNrbis.Enabled = kdNr <= 0

+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", "SDL") Then
+            cbxTest.Visible = True
+        End If

        Dim kdNr_WHERE = ""
        If kdNr_filter Then
@@ -887,14 +890,13 @@ Public Class usrcntlFremdrechnungen
                Dim TextHTMLtable = ""
                Dim pdflist = createEMailTable(TextHTMLtable, kvp, cbx.Checked)

-                If Not cbxMailoeffnen.Checked And pdflist.Count > 0 Then
+                If pdflist.Count > 0 Then
+
+                    createEmail(kvp.Key, TextHTMLtable, pdflist)

-                Else
-                    If pdflist.Count > 0 Then createEmail(kvp.Key, TextHTMLtable, pdflist)

                End If

-
            Next


@@ -1126,6 +1128,12 @@ Public Class usrcntlFremdrechnungen
        Mail.To &= kundeMail.EMail
        Mail.CC &= kundeMail.EMail2

+        If cbxTest.Checked Then
+            Mail.To = "d.breimaier@verag.ag"
+            Mail.CC = "d.breimaier@verag.ag"
+
+        End If
+
        If cbxMailoeffnen.Checked Then
            Try

@@ -1155,7 +1163,6 @@ Public Class usrcntlFremdrechnungen

                If Mail IsNot Nothing Then

-
                    Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.SDL_OUT_SAMMELRECHNUNG, "MAIL-ORIG-RG",,, kdNr)

                    API.api_EMail = Mail.To