merge ,

KD-Übers

SDL/Fakturierung/cFakturierung.vb

@@ -1826,7 +1826,7 @@ Public Class cFakturierung
                 End If
 
                 If Not Rechnung.checkRechnungsNrIsSet() Then
-                    MsgBox("Rechnungsnummer wurde nicht in Datenbank eingetragen" & vbNewLine & "Vorgang wird abgebrochen")
+                    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Rechnungsnummer wurde nicht in Datenbank eingetragen" & vbNewLine & "Vorgang wird abgebrochen", "Rechnungsnummer wurde nicht in Datenbank eingetragen" & vbNewLine & "Vorgang wird abgebrochen" & Rechnung.RK_ID, System.Reflection.MethodInfo.GetCurrentMethod.Name)
                     Return False
                 End If
 
@@ -2623,6 +2623,7 @@ Public Class cFakturierung
                                                           ElseIf rpt.txtLeistung.Text.Contains("00") Then
                                                               rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("00", MonthStart & IIf(MonthEnd <> "", "-" & MonthEnd, ""))
                                                           End If
+                                                          If rpt.txtLeistung.Text.Contains(" DL") Then rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace(" DL", " ")
                                                       End If
 
 
@@ -3942,8 +3943,13 @@ Public Class cFakturierung
 
                 RECHNUNG.Buchungsjahr = cRKSV.getGJ(RechnungsDatum, RECHNUNG.Firma_ID) ' If(CDate(RECHNUNG.[RechnungsDatum]).Month = 1, CDate(RECHNUNG.[RechnungsDatum]).Year - 1, CDate(RECHNUNG.[RechnungsDatum]).Year)
 
+                If RECHNUNG.Buchungsjahr Is Nothing Then
+                    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Bei Beleg " & RECHNUNG.RechnungsNr & " konnte kein Buchungsjahr gesetzt werden! RK_ID:" & RECHNUNG.RK_ID, "Bei Beleg " & RECHNUNG.RechnungsNr & " konnte kein Buchungsjahr gesetzt werden! RK_ID:" & RECHNUNG.RK_ID, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+                    Return False
+                End If
+
                 If RECHNUNG.Buchungsjahr < 2000 Then
-                    MsgBox("Buchungsjahr im falschen Format!")
+                    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Bei Beleg " & RECHNUNG.RechnungsNr & " hat das Buchungsjahr " & RECHNUNG.Buchungsjahr & " das falsche Format! RK_ID:" & RECHNUNG.RK_ID, "Bei Beleg " & RECHNUNG.RechnungsNr & " hat das Buchungsjahr das falsche Format!! RK_ID:" & RECHNUNG.RK_ID, System.Reflection.MethodInfo.GetCurrentMethod.Name)
                     Return False
                     End If
 

SDL/Fakturierung/frmAbrechnungsMaske.vb

@@ -102,7 +102,7 @@ Public Class frmAbrechnungsMaske
             Case "ATILLA"
                 cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] WHERE Firma_ID=7", False, "FMZOLL")
                 cboFirma.changeItem("7")
-                cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where  isnull(mit_firmaFMZoll,0)=7  and mit_gekuendigt=0 AND  (mit_abteilung IN ('VRR','BH')	OR (SELECT COUNT(*)  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
+                cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where  isnull(mit_firmaFMZoll,0)=7  and mit_gekuendigt=0 AND  (mit_abteilung IN ('VRR','BH')	OR (SELECT COUNT(*)  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=199 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
                 FilialNrRestriction = 4813
 
             Case "VERAGIMEX"

SDL/Fakturierung/frmFaktEmail.Designer.vb

@@ -22,7 +22,6 @@ Partial Class frmFaktEmail
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -51,7 +50,7 @@ Partial Class frmFaktEmail
         Me.lkl = New System.Windows.Forms.LinkLabel()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.cbxOriginalPrint = New System.Windows.Forms.CheckBox()
-        Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
         Me.clmnLKW = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.clmnStb_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.clmnMitt_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -74,7 +73,7 @@ Partial Class frmFaktEmail
         Me.cbxTransFerry = New System.Windows.Forms.CheckBox()
         Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cbxRgKopieDrucken = New System.Windows.Forms.CheckBox()
-        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
         Me.optAnhSel = New System.Windows.Forms.DataGridViewCheckBoxColumn()
         Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.clmnBezeichnung = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -87,11 +86,15 @@ Partial Class frmFaktEmail
         Me.cbxMDMAnh = New System.Windows.Forms.CheckBox()
         Me.Button6 = New System.Windows.Forms.Button()
         Me.cbxVZ = New System.Windows.Forms.CheckBox()
+        Me.btn_FM = New System.Windows.Forms.Button()
+        Me.CM_FM = New System.Windows.Forms.ContextMenuStrip()
+        Me.OriginalschreibenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         CType(Me.dgvEmailBCC, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvEmailCC, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvEmail, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.CM_FM.SuspendLayout()
         Me.SuspendLayout()
         '
         'lbl
@@ -744,12 +747,38 @@ Partial Class frmFaktEmail
         Me.cbxVZ.Text = "VZ"
         Me.cbxVZ.UseVisualStyleBackColor = True
         '
+        'btn_FM
+        '
+        Me.btn_FM.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btn_FM.Image = Global.SDL.My.Resources.Resources.android_note12
+        Me.btn_FM.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btn_FM.Location = New System.Drawing.Point(610, 605)
+        Me.btn_FM.Name = "btn_FM"
+        Me.btn_FM.Size = New System.Drawing.Size(131, 39)
+        Me.btn_FM.TabIndex = 99
+        Me.btn_FM.Text = "Formular-Manager"
+        Me.btn_FM.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btn_FM.UseVisualStyleBackColor = True
+        '
+        'CM_FM
+        '
+        Me.CM_FM.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OriginalschreibenToolStripMenuItem})
+        Me.CM_FM.Name = "ContextMenuStrip1"
+        Me.CM_FM.Size = New System.Drawing.Size(192, 26)
+        '
+        'OriginalschreibenToolStripMenuItem
+        '
+        Me.OriginalschreibenToolStripMenuItem.Name = "OriginalschreibenToolStripMenuItem"
+        Me.OriginalschreibenToolStripMenuItem.Size = New System.Drawing.Size(191, 22)
+        Me.OriginalschreibenToolStripMenuItem.Text = "Verzollungsunterlagen"
+        '
         'frmFaktEmail
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.WhiteSmoke
         Me.ClientSize = New System.Drawing.Size(750, 850)
+        Me.Controls.Add(Me.btn_FM)
         Me.Controls.Add(Me.cbxVZ)
         Me.Controls.Add(Me.Button6)
         Me.Controls.Add(Me.cbxMDMAnh)
@@ -802,6 +831,7 @@ Partial Class frmFaktEmail
         CType(Me.dgvEmail, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.CM_FM.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -865,4 +895,7 @@ Partial Class frmFaktEmail
     Friend WithEvents cbxMDMAnh As CheckBox
     Friend WithEvents Button6 As Button
     Friend WithEvents cbxVZ As CheckBox
+    Friend WithEvents btn_FM As Button
+    Friend WithEvents CM_FM As ContextMenuStrip
+    Friend WithEvents OriginalschreibenToolStripMenuItem As ToolStripMenuItem
 End Class

SDL/Fakturierung/frmFaktEmail.resx

@@ -162,6 +162,9 @@
   <metadata name="clmnAnhId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="CM_FM.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/frmFaktEmail.vb

@@ -1401,6 +1401,14 @@ Public Class frmFaktEmail
         End If
 
     End Sub
+
+    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles btn_FM.Click
+        CM_FM.Show(Cursor.Position)
+    End Sub
+
+    Private Sub OriginalschreibenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OriginalschreibenToolStripMenuItem.Click
+        SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Verzollungsunterlagen, KdNr)
+    End Sub
 End Class
 
 

SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb

@@ -924,36 +924,36 @@ Partial Class usrCntlFaktAbrechnung
         Me.dgvAnhaenge.AllowUserToResizeColumns = False
         Me.dgvAnhaenge.AllowUserToResizeRows = False
         Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvAnhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
+        Me.dgvAnhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22
         Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.optAnhSel, Me.DataGridViewTextBoxColumn2, Me.clmnBezeichnung, Me.clmnDsId, Me.clmnAnhId})
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvAnhaenge.DefaultCellStyle = DataGridViewCellStyle4
+        Me.dgvAnhaenge.DefaultCellStyle = DataGridViewCellStyle25
         Me.dgvAnhaenge.Location = New System.Drawing.Point(493, 911)
         Me.dgvAnhaenge.MultiSelect = False
         Me.dgvAnhaenge.Name = "dgvAnhaenge"
         Me.dgvAnhaenge.ReadOnly = True
-        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvAnhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle5
+        Me.dgvAnhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle26
         Me.dgvAnhaenge.RowHeadersVisible = False
         Me.dgvAnhaenge.RowHeadersWidth = 62
         Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -975,10 +975,10 @@ Partial Class usrCntlFaktAbrechnung
         '
         'DataGridViewTextBoxColumn2
         '
-        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        DataGridViewCellStyle2.Format = "N0"
+        DataGridViewCellStyle23.Format = "N0"
-        DataGridViewCellStyle2.NullValue = Nothing
+        DataGridViewCellStyle23.NullValue = Nothing
-        Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle2
+        Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle23
         Me.DataGridViewTextBoxColumn2.HeaderText = "Art"
         Me.DataGridViewTextBoxColumn2.MinimumWidth = 8
         Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
@@ -988,9 +988,9 @@ Partial Class usrCntlFaktAbrechnung
         'clmnBezeichnung
         '
         Me.clmnBezeichnung.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle3.Format = "c2"
+        DataGridViewCellStyle24.Format = "c2"
-        Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle3
+        Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle24
         Me.clmnBezeichnung.FillWeight = 121.2598!
         Me.clmnBezeichnung.HeaderText = "Bezeichnung"
         Me.clmnBezeichnung.MinimumWidth = 8
@@ -2318,7 +2318,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtKdAuftragsNr.BackColor = System.Drawing.Color.Yellow
         Me.txtKdAuftragsNr.ForeColor = System.Drawing.Color.Black
         Me.txtKdAuftragsNr.Location = New System.Drawing.Point(101, 123)
-        Me.txtKdAuftragsNr.MaxLength = 35
+        Me.txtKdAuftragsNr.MaxLength = 46
         Me.txtKdAuftragsNr.MaxLineLength = -1
         Me.txtKdAuftragsNr.MaxLines_Warning = ""
         Me.txtKdAuftragsNr.MaxLines_Warning_Label = Nothing
@@ -2995,35 +2995,35 @@ Partial Class usrCntlFaktAbrechnung
         Me.dgvRechnungenPositionen.AllowUserToResizeColumns = False
         Me.dgvRechnungenPositionen.AllowUserToResizeRows = False
         Me.dgvRechnungenPositionen.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvRechnungenPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6
+        Me.dgvRechnungenPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27
         Me.dgvRechnungenPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvRechnungenPositionen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.Leistung, Me.Anzahl, Me.Preis, Me.SteuerpflichtigerBetrag, Me.SteuerfreierBetrag, Me.Aufschubkonto})
-        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvRechnungenPositionen.DefaultCellStyle = DataGridViewCellStyle11
+        Me.dgvRechnungenPositionen.DefaultCellStyle = DataGridViewCellStyle32
         Me.dgvRechnungenPositionen.Location = New System.Drawing.Point(10, 258)
         Me.dgvRechnungenPositionen.Name = "dgvRechnungenPositionen"
         Me.dgvRechnungenPositionen.ReadOnly = True
-        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvRechnungenPositionen.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
+        Me.dgvRechnungenPositionen.RowHeadersDefaultCellStyle = DataGridViewCellStyle33
         Me.dgvRechnungenPositionen.RowHeadersVisible = False
         Me.dgvRechnungenPositionen.RowHeadersWidth = 62
         Me.dgvRechnungenPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -3041,10 +3041,10 @@ Partial Class usrCntlFaktAbrechnung
         '
         'Anzahl
         '
-        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        DataGridViewCellStyle7.Format = "N0"
+        DataGridViewCellStyle28.Format = "N0"
-        DataGridViewCellStyle7.NullValue = Nothing
+        DataGridViewCellStyle28.NullValue = Nothing
-        Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle7
+        Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle28
         Me.Anzahl.HeaderText = "Anzahl"
         Me.Anzahl.MinimumWidth = 8
         Me.Anzahl.Name = "Anzahl"
@@ -3053,9 +3053,9 @@ Partial Class usrCntlFaktAbrechnung
         '
         'Preis
         '
-        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        DataGridViewCellStyle8.Format = "c2"
+        DataGridViewCellStyle29.Format = "c2"
-        Me.Preis.DefaultCellStyle = DataGridViewCellStyle8
+        Me.Preis.DefaultCellStyle = DataGridViewCellStyle29
         Me.Preis.HeaderText = "Preis"
         Me.Preis.MinimumWidth = 8
         Me.Preis.Name = "Preis"
@@ -3064,9 +3064,9 @@ Partial Class usrCntlFaktAbrechnung
         '
         'SteuerpflichtigerBetrag
         '
-        DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        DataGridViewCellStyle9.Format = "c2"
+        DataGridViewCellStyle30.Format = "c2"
-        Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle9
+        Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle30
         Me.SteuerpflichtigerBetrag.HeaderText = "Steuerpfl."
         Me.SteuerpflichtigerBetrag.MinimumWidth = 8
         Me.SteuerpflichtigerBetrag.Name = "SteuerpflichtigerBetrag"
@@ -3075,10 +3075,10 @@ Partial Class usrCntlFaktAbrechnung
         '
         'SteuerfreierBetrag
         '
-        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        DataGridViewCellStyle10.Format = "C2"
+        DataGridViewCellStyle31.Format = "C2"
-        DataGridViewCellStyle10.NullValue = Nothing
+        DataGridViewCellStyle31.NullValue = Nothing
-        Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle10
+        Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle31
         Me.SteuerfreierBetrag.HeaderText = "Steuerfrei"
         Me.SteuerfreierBetrag.MinimumWidth = 8
         Me.SteuerfreierBetrag.Name = "SteuerfreierBetrag"
@@ -3148,44 +3148,44 @@ Partial Class usrCntlFaktAbrechnung
         Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False
         Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True
         Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False
-        DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle38.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
+        Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle38
         Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White
         Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvOfferteDetailsUebersicht.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18
+        Me.dgvOfferteDetailsUebersicht.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle39
         Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvOfferteDetailsUebersicht.DefaultCellStyle = DataGridViewCellStyle19
+        Me.dgvOfferteDetailsUebersicht.DefaultCellStyle = DataGridViewCellStyle40
         Me.dgvOfferteDetailsUebersicht.Location = New System.Drawing.Point(220, 29)
         Me.dgvOfferteDetailsUebersicht.MultiSelect = False
         Me.dgvOfferteDetailsUebersicht.Name = "dgvOfferteDetailsUebersicht"
-        DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvOfferteDetailsUebersicht.RowHeadersDefaultCellStyle = DataGridViewCellStyle20
+        Me.dgvOfferteDetailsUebersicht.RowHeadersDefaultCellStyle = DataGridViewCellStyle41
         Me.dgvOfferteDetailsUebersicht.RowHeadersVisible = False
         Me.dgvOfferteDetailsUebersicht.RowHeadersWidth = 62
-        DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer))
+        DataGridViewCellStyle42.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer))
-        DataGridViewCellStyle21.SelectionForeColor = System.Drawing.Color.Black
+        DataGridViewCellStyle42.SelectionForeColor = System.Drawing.Color.Black
-        Me.dgvOfferteDetailsUebersicht.RowsDefaultCellStyle = DataGridViewCellStyle21
+        Me.dgvOfferteDetailsUebersicht.RowsDefaultCellStyle = DataGridViewCellStyle42
         Me.dgvOfferteDetailsUebersicht.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvOfferteDetailsUebersicht.Size = New System.Drawing.Size(601, 201)
         Me.dgvOfferteDetailsUebersicht.TabIndex = 3
@@ -3960,7 +3960,9 @@ Partial Class usrCntlFaktAbrechnung
         Me.Label50.Text = "STB"
         Me.Label50.TextAlign = System.Drawing.ContentAlignment.TopRight
         '
-        'cbxAdmin
+        Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GutschriftAusRechnungToolStripMenuItem, Me.SeperateRechnungFürEUSTToolStripMenuItem, Me.GutschriftAnVeragToolStripMenuItem})
+        Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
+        Me.ContextMenuStrip2.Size = New System.Drawing.Size(225, 70)
         '
         Me.cbxAdmin.AutoSize = True
         Me.cbxAdmin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -565,6 +565,10 @@ Public Class usrCntlFaktAbrechnung
         cboRechnungSprache.changeItem(0)
 
         cboRgArt.Items.Clear()
+
+        If FirmaTmp = "VERAG360" Then
+            cboRgArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Standard", "RG"))
+        Else
             If SPEDBUCH IsNot Nothing AndAlso SPEDBUCH.Abfertigungsart = 100 Then
                 cboRgArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("RG-Kopf", "RK"))
             Else
@@ -572,7 +576,7 @@ Public Class usrCntlFaktAbrechnung
                 cboRgArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Unvollständig", "RU"))
             End If
             cboRgArt.changeItem(0)
-
+        End If
 
         'cboSteuerschlüssel.fillWithSQL("SELECT tblSteuersätze.Nr, tblSteuersätze.Beschreibung FROM tblSteuersätze ORDER BY tblSteuersätze.Nr; ", False, "FMZOLL", True)
         cboSteuerschlüssel.fillWithSQL("SELECT [Steuerschlüssel],isnull([AuswahlSteuerbezeichnung],'') as Steuerbezeichnung FROM [Steuertabelle] ORDER BY [Steuerschlüssel]", False, "FMZOLL", True)
@@ -1483,7 +1487,7 @@ Public Class usrCntlFaktAbrechnung
                 Dim isMWSTBearb As Boolean = False
 
                 Select Case r.Cells("LeistungsNr").Value
-                    Case 124, 125, 126, 117, 118, 119, bearbNrRMC : isMWSTBearb = True
+                    Case 123, 124, 125, 126, 117, 118, 119, bearbNrRMC : isMWSTBearb = True
                 End Select
 
 
@@ -2897,9 +2901,9 @@ Public Class usrCntlFaktAbrechnung
                                     For Each row As DataGridViewRow In dgvOfferteDetailsUebersicht.Rows
                                         If row.Cells("LeistungsNr").Value = BGebLeistungsNr And row.Cells("BerechnungsartNr").Value = 9 Then
 
-                                            Dim preisecChanged = row.Cells("Preis").Value
+                                            Dim preiseChanged = row.Cells("Preis").Value
 
-                                            If preisecChanged <> (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) Then
+                                            If preiseChanged <> (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) Then
 
                                                 '    If row.Cells("Preis").Value = curBGebBetrag * 2 AndAlso minBetragRMCUsed Then 'wenn RMCPOS und MIND-BERTAG 2x verrechnet -> nur 1x berechnen v
 

SDL/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.5.1.2")>
+<Assembly: AssemblyVersion("1.5.1.8")>
-<Assembly: AssemblyFileVersion("1.5.1.2")>
+<Assembly: AssemblyFileVersion("1.5.1.8")>

SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb

@@ -2859,7 +2859,7 @@ Public Class usrCntlSpeditionsBuchSuche
   	                          ,BelegNr
                               ,[FilialenNr],[AbfertigungsNr],Speditionsbuch.Abfertigungsart,Abfertigungsbezeichnung,Speditionsbuch.Zollsystem_Land, Speditionsbuch.[LKW Kennzeichen]
                           FROM Speditionsbuch INNER JOIN [Abfertigungsarten] ON Speditionsbuch.Abfertigungsart=Abfertigungsarten.Abfertigungsart
-                          where EmpfängerKundenNr IN (" & kdnrsrch & ") and VermittlerKundenNr IN (" & kdnrsrch & ") and Abfertigungsdatum BETWEEN '" & txtAbfertDat.Text & "' AND '" & txtAbfertDatBis.Text & "' And Speditionsbuch.Abfertigungsart IN (1,29,38)", "FMZOLL")
+                          where EmpfängerKundenNr IN (" & kdnrsrch & ") and VermittlerKundenNr IN (" & kdnrsrch & ") and Abfertigungsdatum BETWEEN '" & txtAbfertDat.Text & "' AND '" & txtAbfertDatBis.Text & "' And Speditionsbuch.Abfertigungsart IN (1,26,29,38)", "FMZOLL")
 
         Try
 

SDL/USTV/frmMDM_USTVAntrag.Designer.vb

@@ -116,6 +116,7 @@ Partial Class frmMDM_USTVAntrag
         Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel()
         Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
         Me.Panel4 = New System.Windows.Forms.Panel()
         Me.cbxKIUploaddelete = New System.Windows.Forms.CheckBox()
         Me.scanUSTVA = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
@@ -126,6 +127,7 @@ Partial Class frmMDM_USTVAntrag
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.pnlErstattungsdetails = New System.Windows.Forms.Panel()
+        Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Button3 = New System.Windows.Forms.Button()
@@ -142,8 +144,7 @@ Partial Class frmMDM_USTVAntrag
         Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
         Me.FakturiertToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
+        Me.btnRMCQuartal = New System.Windows.Forms.Button()
-        Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
         Me.pnlBottom.SuspendLayout()
         CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -175,6 +176,7 @@ Partial Class frmMDM_USTVAntrag
         '
         Me.pnlBottom.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
         Me.pnlBottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnlBottom.Controls.Add(Me.btnRMCQuartal)
         Me.pnlBottom.Controls.Add(Me.Label18)
         Me.pnlBottom.Controls.Add(Me.txtSumme)
         Me.pnlBottom.Controls.Add(Me.pbMail)
@@ -1569,6 +1571,14 @@ Partial Class frmMDM_USTVAntrag
         Me.Panel2.Size = New System.Drawing.Size(1428, 263)
         Me.Panel2.TabIndex = 1
         '
+        'UstCntlUSTV_AntragPosition1
+        '
+        Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
+        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
+        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1272, 261)
+        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
+        '
         'Panel4
         '
         Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke
@@ -1714,6 +1724,14 @@ Partial Class frmMDM_USTVAntrag
         Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1426, 261)
         Me.pnlErstattungsdetails.TabIndex = 0
         '
+        'UstCntlUSTV_AntragErstattungen1
+        '
+        Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
+        Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
+        Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1270, 259)
+        Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
+        '
         'Panel1
         '
         Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke
@@ -1832,21 +1850,18 @@ Partial Class frmMDM_USTVAntrag
         Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen"
         Me.FakturiertToolStripMenuItem.Visible = False
         '
-        'UstCntlUSTV_AntragPosition1
+        'btnRMCQuartal
         '
-        Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.btnRMCQuartal.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
+        Me.btnRMCQuartal.ForeColor = System.Drawing.Color.Black
-        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
+        Me.btnRMCQuartal.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1272, 261)
+        Me.btnRMCQuartal.Location = New System.Drawing.Point(752, 17)
-        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
+        Me.btnRMCQuartal.Name = "btnRMCQuartal"
-        '
+        Me.btnRMCQuartal.Size = New System.Drawing.Size(103, 39)
-        'UstCntlUSTV_AntragErstattungen1
+        Me.btnRMCQuartal.TabIndex = 55
-        '
+        Me.btnRMCQuartal.Text = "RMC Quartal"
-        Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.btnRMCQuartal.UseVisualStyleBackColor = True
-        Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
+        Me.btnRMCQuartal.Visible = False
-        Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
-        Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1270, 259)
-        Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
         '
         'frmMDM_USTVAntrag
         '
@@ -2015,4 +2030,5 @@ Partial Class frmMDM_USTVAntrag
     Friend WithEvents pbMail As PictureBox
     Friend WithEvents Label18 As Label
     Friend WithEvents txtSumme As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents btnRMCQuartal As Button
 End Class

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -535,12 +535,18 @@ Public Class frmMDM_USTVAntrag
             Antrag_LandKz = SQL.DLookup("LandKz", "[Länderverzeichnis für die Außenhandelsstatistik]", "Landnr='" & USTV_ANTRAG.UStVAn_LandNr & "'", "FMZOLL")
             setValue(USTV_ANTRAG)
 
+            If CInt(USTV_ANTRAG.UStVAn_KuNr) >= 150000 AndAlso CInt(USTV_ANTRAG.UStVAn_KuNr) < 160000 Then
+                btnRMCQuartal.Visible = True
+            Else
+                btnRMCQuartal.Visible = False
+            End If
 
         Else
                 Dim sqlWhere As String = ""
             'neuer USTVA-Antrag
             KdSearchBox1.Visible = True
             cbxWahrung.Enabled = True
+            btnRMCQuartal.Visible = False
 
 
             For i As Integer = 0 To cbxFiliale.Items.Count - 1
@@ -2276,8 +2282,8 @@ Public Class frmMDM_USTVAntrag
 
     Private Function excelAuswertung(ByRef Optional filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean
 
-        Dim sqlStr = "Select [UStVPo_ReDat] As InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name As Company, LandKz as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory
+        Dim sqlStr = "Select [UStVPo_ReDat] As InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name As Company, LandKz as CountryOfRefund ,UStVAn_Währungscode as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory
-        ,Round((100 *[UStVPo_USteuerbetragEUR] / (isnull([Länderverzeichnis für die Außenhandelsstatistik].Steuersatz,1) * 100) ),2) as ExpenseNetAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round(Round((100 *[UStVPo_USteuerbetragEUR] / (isnull([Länderverzeichnis für die Außenhandelsstatistik].Steuersatz,1) * 100) ),2) + [UStVPo_USteuerbetragEUR],2) as ExpenseGrossAmount,
+        ,Round((100 *[UStVPo_USteuerbetrag] / (isnull([Länderverzeichnis für die Außenhandelsstatistik].Steuersatz,1) * 100) ),2) as ExpenseNetAmount, [UStVPo_USteuerbetrag] as ExpenseVATAmount,Round(Round((100 *[UStVPo_USteuerbetrag] / (isnull([Länderverzeichnis für die Außenhandelsstatistik].Steuersatz,1) * 100) ),2) + [UStVPo_USteuerbetrag],2) as ExpenseGrossAmount,
         [Länderverzeichnis für die Außenhandelsstatistik].Steuersatz * 100 as TaxRate 
                         From [tblUStVPositionen]
                       inner Join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]
@@ -2287,7 +2293,7 @@ Public Class frmMDM_USTVAntrag
 
         Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
         If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
-            filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt, {"N1:N" & (dt.Rows.Count + 1), "O1:O" & (dt.Rows.Count + 1), "P1:P" & (dt.Rows.Count + 1)},,,, openExcel,,, True)
+            filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW_(dt, {"N1:N" & (dt.Rows.Count + 1), "O1:O" & (dt.Rows.Count + 1), "P1:P" & (dt.Rows.Count + 1)},,,, IIf(USTV_ANTRAG.UStVAn_Währungscode = "EUR", "€", ""), True,,,, openExcel)
             Return True
         Else
             If feedback Then MsgBox("keine Daten vorhanden!")
@@ -3314,6 +3320,7 @@ Public Class frmMDM_USTVAntrag
 
     Private Sub Button5_Click_1(sender As Object, e As EventArgs) Handles Button5.Click
 
+
         If IsDBNull(USTV_ANTRAG.FilialenNr) OrElse USTV_ANTRAG.FilialenNr Is Nothing OrElse USTV_ANTRAG.FilialenNr = 0 Then MsgBox("Für das Speditionsbuch muss die Filiale eingegeben werden.") : Exit Sub
         If IsDBNull(USTV_ANTRAG.AbfertigungsNr) OrElse USTV_ANTRAG.AbfertigungsNr Is Nothing OrElse USTV_ANTRAG.AbfertigungsNr <= 0 Then MsgBox("Für das Speditionsbuch muss die Abfertigungs-Nr eingegeben werden.") : Exit Sub
 
@@ -3916,6 +3923,29 @@ Return ""
 
     End Function
 
+    Private Sub btnRMCQuartal_Click(sender As Object, e As EventArgs) Handles btnRMCQuartal.Click
+
+        Dim rmc As cRMC
+
+        Dim nurUnter50EurAnzeigen As Boolean = True
+
+        Select Case MsgBox("Sollen nur Anträge angezeigt werden, deren Bearbeitung pro Quartal unter 50EUR liegt?", vbYesNo)
+            Case vbYes : nurUnter50EurAnzeigen = True
+            Case vbNo : nurUnter50EurAnzeigen = False
+        End Select
+
+        Dim dt = rmc.getRMCQuartalsAbrechnungen(SQL, 1, Now.Year, "327", USTV_ANTRAG, Antrag_LandKz, nurUnter50EurAnzeigen)
+        If dt.Rows.Count > 0 Then
+            cProgramFunctions.genExcelFromDT_NEW(dt)
+        Else
+            MsgBox("keine Daten für ausgewählten Zeitraum")
+        End If
+
+
+
+
+    End Sub
+
     Private Function PDFInvoicesPath(ByRef posId As String) As String
 
 

SDL/USTV/frmUSTVoffeneAntraege.vb

@@ -1090,11 +1090,11 @@ Public Class frmUSTVoffeneAntraege
     Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
         Dim SQLQuery As String = ""
         Select Case LIEFERANT.ToString.ToLower
-            Case "plose" : SQLQuery = "select [plInv_SupplierRechnungsNr] as RechnungsNr,plInv_SupplierRechnungsDatum as Rechnungsdatum,Adressen.AdressenNr,Adressen.[Name 1] as Kunde  from [tblPLOSE_Inv_Data] INNER JOIN Adressen on [plInv_PLOSEKundennummer]=Adressen.PLOSEKundenNr where [plInv_daId] is null and cast([plInv_SupplierRechnungsDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by plInv_SupplierRechnungsNr, Adressen.AdressenNr, Adressen.[Name 1], plInv_SupplierRechnungsDatum"
+            Case "plose" : SQLQuery = "select [plInv_SupplierRechnungsNr] as RechnungsNr,plInv_SupplierRechnungsDatum as Rechnungsdatum,Adressen.AdressenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt as keineMWST  from [tblPLOSE_Inv_Data] INNER JOIN Adressen on [plInv_PLOSEKundennummer]=Adressen.PLOSEKundenNr INNER JOIN tblKundenErweitert on AdressenNr = kde_KundenNr where [plInv_daId] is null and cast([plInv_SupplierRechnungsDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by plInv_SupplierRechnungsNr, Adressen.AdressenNr, Adressen.[Name 1], plInv_SupplierRechnungsDatum, kde_keineMWSt"
-            Case "rmc" : SQLQuery = "select rmc_reNr as RechnungsNr,rmc_reDatum AS Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from [tblRMCImport] INNER JOIN Adressen on WölflKundenNr=[rmc_kdNr] or weitereWölflKundenNr=[rmc_kdNr]  where rmc_daId is null and cast([rmc_reDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum "
+            Case "rmc" : SQLQuery = "select rmc_reNr as RechnungsNr,rmc_reDatum AS Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt as keineMWST from [tblRMCImport] INNER JOIN Adressen on WölflKundenNr=[rmc_kdNr] or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN tblKundenErweitert on AdressenNr = kde_KundenNr  where rmc_daId is null and cast([rmc_reDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum, kde_keineMWSt "
-            Case "mse" : SQLQuery = "select invoice_id as RechnungsNr,[invoice_date] as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from tblMSEInvoices inner join [tblMSECustomers] on [customer_number] = [customer_id] INNER JOIN Adressen on Adressen.MSEKundenNr = [customer_number]  where daId is null and cast(invoice_date as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by invoice_id, Adressen.AdressenNr, Adressen.[Name 1], invoice_date"
+            Case "mse" : SQLQuery = "select invoice_id as RechnungsNr,[invoice_date] as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt as keineMWST from tblMSEInvoices inner join [tblMSECustomers] on [customer_number] = [customer_id] INNER JOIN Adressen on Adressen.MSEKundenNr = [customer_number] INNER JOIN tblKundenErweitert on AdressenNr = kde_KundenNr  where daId is null and cast(invoice_date as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by invoice_id, Adressen.AdressenNr, Adressen.[Name 1], invoice_date, kde_keineMWSt"
-            Case "uta" : SQLQuery = "select tblUTAImportNew.Abrechnungsnummer as RechnungNr,[Rechnungsdatum] AS Rechnungsdatum ,Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from tblUTAImportNew INNER JOIN Adressen on Adressen.UTAKundenNr = tblUTAImportNew.Kundennummer where daId is null and cast([Rechnungsdatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' and Lieferland <> 'ROM' and Steuerliches_Lieferland <> 'ROM' group by tblUTAImportNew.Abrechnungsnummer, Rechnungsdatum,Adressen.AdressenNr, Adressen.[Name 1] "
+            Case "uta" : SQLQuery = " SELECT U.Abrechnungsnummer AS Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum AS date) AS Rechnungsdatum,A.AdressenNr AS KundenNr,A.UTAKundenNr AS UTAKundenNr,A.[Name 1] AS Kunde,A.LandKz, kde_keineMWSt as keineMWST FROM tblUTAImportNew U INNER JOIN Adressen A ON A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert on A.AdressenNr = kde_KundenNr WHERE U.daId IS NULL AND CAST(U.Rechnungsdatum AS date)  BETWEEN '" & dat_Sum_Von.Value & "' AND '" & dat_Sum_Bis.Value & "'  AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.AdressenNr,A.UTAKundenNr ,A.[Name 1],A.LandKz, kde_keineMWSt ORDER BY U.Rechnungsdatum"
-            Case "ids" : SQLQuery = "select Invoicenumber as RechnungsNr,YearMonthDay as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from tblIDSInvoicesNew Inner join [tbl_IDS_Kunden] on [tbl_IDS_Kunden].CustomerCode =tblIDSInvoicesNew.CustomerCode and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0 Inner join Adressen on Adressen.AdressenNr = [tbl_IDS_Kunden].KdNrVERAG where DocumentName is null and cast(YearMonthDay as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by Invoicenumber, Adressen.AdressenNr, Adressen.[Name 1], YearMonthDay"
+            Case "ids" : SQLQuery = "select Invoicenumber as RechnungsNr,YearMonthDay as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt from tblIDSInvoicesNew Inner join [tbl_IDS_Kunden] on [tbl_IDS_Kunden].CustomerCode =tblIDSInvoicesNew.CustomerCode and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0 Inner join Adressen on Adressen.AdressenNr = [tbl_IDS_Kunden].KdNrVERAG INNER JOIN tblKundenErweitert on Adressen.AdressenNr = kde_KundenNr where DocumentName is null and cast(YearMonthDay as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by Invoicenumber, Adressen.AdressenNr, Adressen.[Name 1], YearMonthDay, kde_keineMWSt"
             Case Else : SQLQuery = ""
         End Select
 

SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb

@@ -25,6 +25,8 @@ Partial Class frmBU_Mahnlauf
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmBU_Mahnlauf))
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.lblBetreuer = New System.Windows.Forms.Label()
+        Me.cboBetreuer = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cbxKontotyp = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.txtZahlEingaenge = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.cbxZahlungseingaenge = New System.Windows.Forms.CheckBox()
@@ -62,8 +64,7 @@ Partial Class frmBU_Mahnlauf
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.cboBetreuer = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxNewDGV = New System.Windows.Forms.CheckBox()
-        Me.lblBetreuer = New System.Windows.Forms.Label()
         Me.Panel1.SuspendLayout()
         Me.pnlTop.SuspendLayout()
         Me.Panel2.SuspendLayout()
@@ -73,6 +74,7 @@ Partial Class frmBU_Mahnlauf
         '
         'Panel1
         '
+        Me.Panel1.Controls.Add(Me.cbxNewDGV)
         Me.Panel1.Controls.Add(Me.lblBetreuer)
         Me.Panel1.Controls.Add(Me.cboBetreuer)
         Me.Panel1.Controls.Add(Me.cbxKontotyp)
@@ -95,6 +97,28 @@ Partial Class frmBU_Mahnlauf
         Me.Panel1.Size = New System.Drawing.Size(1514, 132)
         Me.Panel1.TabIndex = 0
         '
+        'lblBetreuer
+        '
+        Me.lblBetreuer.AutoSize = True
+        Me.lblBetreuer.Location = New System.Drawing.Point(329, 114)
+        Me.lblBetreuer.Name = "lblBetreuer"
+        Me.lblBetreuer.Size = New System.Drawing.Size(50, 13)
+        Me.lblBetreuer.TabIndex = 50
+        Me.lblBetreuer.Text = "Betreuer:"
+        Me.lblBetreuer.Visible = False
+        '
+        'cboBetreuer
+        '
+        Me.cboBetreuer._allowedValuesFreiText = Nothing
+        Me.cboBetreuer._allowFreiText = False
+        Me.cboBetreuer._value = ""
+        Me.cboBetreuer.FormattingEnabled = True
+        Me.cboBetreuer.Location = New System.Drawing.Point(410, 111)
+        Me.cboBetreuer.Name = "cboBetreuer"
+        Me.cboBetreuer.Size = New System.Drawing.Size(97, 21)
+        Me.cboBetreuer.TabIndex = 49
+        Me.cboBetreuer.Visible = False
+        '
         'cbxKontotyp
         '
         Me.cbxKontotyp._allowedValuesFreiText = Nothing
@@ -602,27 +626,18 @@ Partial Class frmBU_Mahnlauf
         Me.MyTextBox2.TabIndex = 39
         Me.MyTextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
-        'cboBetreuer
+        'cbxNewDGV
         '
-        Me.cboBetreuer._allowedValuesFreiText = Nothing
+        Me.cbxNewDGV.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.cboBetreuer._allowFreiText = False
+        Me.cbxNewDGV.AutoSize = True
-        Me.cboBetreuer._value = ""
+        Me.cbxNewDGV.Checked = True
-        Me.cboBetreuer.FormattingEnabled = True
+        Me.cbxNewDGV.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cboBetreuer.Location = New System.Drawing.Point(410, 111)
+        Me.cbxNewDGV.Location = New System.Drawing.Point(1118, 54)
-        Me.cboBetreuer.Name = "cboBetreuer"
+        Me.cbxNewDGV.Name = "cbxNewDGV"
-        Me.cboBetreuer.Size = New System.Drawing.Size(97, 21)
+        Me.cbxNewDGV.Size = New System.Drawing.Size(88, 17)
-        Me.cboBetreuer.TabIndex = 49
+        Me.cbxNewDGV.TabIndex = 51
-        Me.cboBetreuer.Visible = False
+        Me.cbxNewDGV.Text = "neue Ansicht"
-        '
+        Me.cbxNewDGV.UseVisualStyleBackColor = True
-        'lblBetreuer
-        '
-        Me.lblBetreuer.AutoSize = True
-        Me.lblBetreuer.Location = New System.Drawing.Point(329, 114)
-        Me.lblBetreuer.Name = "lblBetreuer"
-        Me.lblBetreuer.Size = New System.Drawing.Size(50, 13)
-        Me.lblBetreuer.TabIndex = 50
-        Me.lblBetreuer.Text = "Betreuer:"
-        Me.lblBetreuer.Visible = False
         '
         'frmBU_Mahnlauf
         '
@@ -689,4 +704,5 @@ Partial Class frmBU_Mahnlauf
     Friend WithEvents Label9 As Label
     Friend WithEvents lblBetreuer As Label
     Friend WithEvents cboBetreuer As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxNewDGV As CheckBox
 End Class

SDL/buchhaltung/frmBU_Mahnlauf.vb

@@ -8,10 +8,10 @@ Public Class frmBU_Mahnlauf
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
     Dim listOfTextconserven As cTextkonserve_LIST
     Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click
-        initDGV(cbxZahlungseingaenge.Checked)
+        initDGV(cbxZahlungseingaenge.Checked, cbxNewDGV.Checked)
     End Sub
 
-    Sub initDGV(Optional zahlungseingaenge As Boolean = False)
+    Sub initDGV(Optional zahlungseingaenge As Boolean = False, Optional newDGV As Boolean = False)
         With MyDatagridview1
             .Columns.Clear()
 
@@ -45,6 +45,57 @@ Public Class frmBU_Mahnlauf
                          " & If(MyComboBox1._value > 0, " and max(si_mahnstufe)>='" & MyComboBox1._value & "'", "") & "
                       ORDER BY KTO.c_name"
 
+            Dim sqlStr_New = "WITH EmailCTE AS (
+                               SELECT
+                                   kkd_KundenNr" & IIf(Firma_ID = 7, ",MAX(CASE WHEN kkd_kkaId = 18 THEN kkd_Email END) AS EmailMAhnungAtilla", "") & ",MAX(CASE WHEN kkd_kkaId = 10 THEN kkd_Email END) AS EmailMahnung
+                               FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt]
+                               WHERE kkd_kkaId IN (" & IIf(Firma_ID = 7, "10, 18", "10") & ")
+                               GROUP BY kkd_KundenNr
+                           )
+                           SELECT
+                               OP.i_personenkonto                     AS Konto,
+                               KTO.c_name,
+                               KTO.c_landid                           AS Land,
+                               KTO.c_plz + ' ' + KTO.c_ort            AS Ort,
+                               COALESCE(" & IIf(Firma_ID = 7, "E.EmailMAhnungAtilla,", "") & "E.EmailMahnung, '')  AS Email,
+                               ISNULL(K.VK, '')                       AS VK,
+                               KTO.c_zahlziel                         AS Zahlungsziel,
+                               COUNT(*)                               AS Anzahl,
+                               SUM(OP.eur_bruttobetrag + OP.eur_zahlung) AS Ausstand,
+                               MIN(OP.d_netto)                        AS Faelligkeit,
+                               MAX(OP.si_mahnstufe)                   AS Mahnstufe,
+                               CAST(MAX(OP.d_mahnung) AS date)        AS Mahndatum," &
+                               If(cbxNurFaellig.Checked, "", "SUM(CASE WHEN OP.d_netto<getDATE() THEN (eur_bruttobetrag+eur_zahlung) ELSE 0 END) Summe_Faellig,") & "
+                               CAST(ISNULL(si_mahnung,0) AS bit)   AS mahnbar
+                           FROM op_debitor OP
+                           JOIN fibu_konto KTO
+                               ON OP.i_personenkonto = KTO.i_konto
+                              AND OP.i_firm_refid    = KTO.i_firm_refid
+                           LEFT JOIN EmailCTE E ON E.kkd_KundenNr = OP.i_personenkonto
+                           LEFT JOIN (
+                               SELECT KundenNr, Vorkasse AS VK
+                               FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].Kunden
+                           ) K
+                               ON K.KundenNr = OP.i_personenkonto
+                           WHERE OP.i_firm_refid = '" & Firma_ID & "'
+                             AND OP.dt_geloescht IS NULL" & 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
+                               OP.i_personenkonto,
+                               KTO.c_name,
+                               KTO.c_landid,
+                               KTO.c_plz,
+                               KTO.c_ort,
+                               KTO.c_zahlziel,
+                               ISNULL(si_mahnung,0),
+                               COALESCE(" & IIf(Firma_ID = 7, "E.EmailMAhnungAtilla,", "") & "E.EmailMahnung, ''),
+                               ISNULL(K.VK,'')
+                           HAVING SUM(OP.eur_bruttobetrag + OP.eur_zahlung) > '" & MyTextBox1._value & "'
+                           ORDER BY KTO.c_name;"
+
+
+
             Dim sqlStringVerag360 = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,Kunden.Abfertigungsverbot as AV,max(KTO.dec_aktuellersaldo) as Saldo,/*KTO.c_plz + ' ' + KTO.c_ort Ort,isnull(KTO.c_email,'') Email, */  " &
                              "sum(eur_bruttobetrag+eur_zahlung) as Ausstand,cast(min(d_rechnung)as date) as 'ältesteRg',/*min(op.d_netto) Faelligkeit,*/max(si_mahnstufe) as MS,max(Kunden.UStV_Summe3470BetragEUR) as '3470',max(Kunden.Versicherungssumme) as V, 
                              
@@ -94,7 +145,7 @@ Public Class frmBU_Mahnlauf
 
 
             'MsgBox(sqlStr)
-            Dim dt_OP As DataTable = SQL.loadDgvBySql(If(Firma_ID = 19, IIf(zahlungseingaenge, sqlStringVerag360Zahlungseingaenge, sqlStringVerag360), sqlStr), "FIBU")
+            Dim dt_OP As DataTable = SQL.loadDgvBySql(If(Firma_ID = 19, IIf(zahlungseingaenge, sqlStringVerag360Zahlungseingaenge, sqlStringVerag360), IIf(newDGV, sqlStr_New, sqlStr)), "FIBU")
 
             .DataSource = dt_OP
             If .Columns.Count = 0 Then Exit Sub
@@ -292,24 +343,23 @@ Public Class frmBU_Mahnlauf
         'Wenn <0, dann Guthaben!!
     End Function
 
-
+    Public Function increaseMahnstufe(KdNr As Integer, Firma_ID As Integer, ErhoehungBeiMahnsperre As Boolean) As Boolean '
-    Public Function increaseMahnstufe(KdNr As Integer, Firma_ID As Integer) As Boolean
         Dim sqlStr = "UPDATE op_debitor  SET si_mahnstufe=(isnull(si_mahnstufe,0)+1),d_mahnung=GETDATE()
                     WHERE (i_firm_refid = '" & Firma_ID & "') AND (dt_geloescht IS NULL)  
-                    and i_personenkonto='" & KdNr & "'  and dec_fremdbrutto>0 and (si_mahnstufe  >=0 OR si_mahnstufe is NULL) and d_netto<=getdate()"
+                    and i_personenkonto='" & KdNr & "'  and dec_fremdbrutto>0 and (si_mahnstufe  >=0 OR si_mahnstufe is NULL) " & IIf(ErhoehungBeiMahnsperre, "", "AND isnull(si_mahnflags,0) <>(1)") & " and d_netto<=getdate()"
         Return SQL.doSQL(sqlStr, "FIBU")
     End Function
 
-    Public Function redoMahnstufe(Firma_ID As Integer, Mahn_Datum As Date) As Boolean
+    Public Function redoMahnstufe(Firma_ID As Integer, Mahn_Datum As Date, ErhoehungBeiMahnsperre As Boolean) As Boolean
         Dim sqlStr = " UPDATE op_debitor SET si_mahnstufe=(si_mahnstufe-1)
                     WHERE (i_firm_refid = '" & Firma_ID & "') AND (dt_geloescht IS NULL)  
                      and (si_mahnstufe  >0 AND si_mahnstufe is not NULL) and d_mahnung>='" & Mahn_Datum.ToShortDateString & "'  and d_netto<=getdate()"
         Return SQL.doSQL(sqlStr, "FIBU")
     End Function
-    Public Function cntRedoMahnstufe(Firma_ID As Integer, Mahn_Datum As Date) As Integer
+    Public Function cntRedoMahnstufe(Firma_ID As Integer, Mahn_Datum As Date, MahnsperreBeruecksichtigen As Boolean) As Integer
         Dim sqlStr = " SELECT COUNT(*) FROM op_debitor 
                     WHERE (i_firm_refid = '" & Firma_ID & "') AND (dt_geloescht IS NULL)  
-                     and (si_mahnstufe  >0 AND si_mahnstufe is not NULL) and d_mahnung>='" & Mahn_Datum.ToShortDateString & "' and d_netto<=getdate()"
+                     and (si_mahnstufe  >0 AND si_mahnstufe is not NULL) " & IIf(MahnsperreBeruecksichtigen, "", "AND isnull(si_mahnflags,0) <>(1)") & " and d_mahnung>='" & Mahn_Datum.ToShortDateString & "' and d_netto<=getdate()"
         Return SQL.getValueTxtBySql(sqlStr, "FIBU",,, 0)
     End Function
     Public Shared Function doMahnung(Mahndruckart As Integer, KdNr As Integer, Firma_ID As Integer, art As String, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional ByRef forceMahnstufe As String = "", Optional showErr As Boolean = True, Optional hideMahnstopp As Boolean = True) As Boolean
@@ -1374,9 +1424,9 @@ Public Class frmBU_Mahnlauf
                 For Each r As DataGridViewRow In MyDatagridview1.SelectedRows
 
 
-                    Dim mahnsperre As Boolean = r.Cells("mahnbar").Value
+                    Dim mahnbar As Boolean = r.Cells("mahnbar").Value
 
-                    If Not cbxMahnsperre.Checked Or (cbxMahnsperre.Checked And mahnsperre) Then
+                    If Not cbxMahnsperre.Checked Or (cbxMahnsperre.Checked And mahnbar) Then ' Mahnsperre -> Kunde mit Mahnsperre wird NICHT gemahnt!
 
                         Dim Konto = r.Cells("Konto").Value
                         Dim FirmaId = cboFirma._value
@@ -1385,18 +1435,18 @@ Public Class frmBU_Mahnlauf
                             Dim Path = ""
                             Select Case AUSGABE
                                 Case "PDF"
-                                    If bool_increaseMahnstufe Then increaseMahnstufe(Konto, FirmaId)
+                                    If bool_increaseMahnstufe Then increaseMahnstufe(Konto, FirmaId, Not cbxMahnsperre.Checked)
                                     If doMahnung(4, Konto, FirmaId, "ZE", Path, srchPrinter) Then
                                         PDF_LIST.Add(Path)
                                     End If
                                 Case "MAIL"
-                                    If bool_increaseMahnstufe Then increaseMahnstufe(Konto, FirmaId)
+                                    If bool_increaseMahnstufe Then increaseMahnstufe(Konto, FirmaId, Not cbxMahnsperre.Checked)
                                     doMahnung(2, Konto, FirmaId, "ZE",, srchPrinter)
                                 Case "MAIL_SEND"
-                                    If bool_increaseMahnstufe Then increaseMahnstufe(Konto, FirmaId)
+                                    If bool_increaseMahnstufe Then increaseMahnstufe(Konto, FirmaId, Not cbxMahnsperre.Checked)
                                     doMahnung(5, Konto, FirmaId, "ZE",, srchPrinter)
                                 Case "PRINT"
-                                    If bool_increaseMahnstufe Then increaseMahnstufe(Konto, FirmaId)
+                                    If bool_increaseMahnstufe Then increaseMahnstufe(Konto, FirmaId, Not cbxMahnsperre.Checked)
                                     doMahnung(0, Konto, FirmaId, "ZE",, srchPrinter)
                             End Select
                         End If
@@ -1474,9 +1524,9 @@ Public Class frmBU_Mahnlauf
     Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
         If MyTextBox2._value <> "" Then
             Dim mahndatum As Date = MyTextBox2._value
-            Dim cntRedo As Integer = cntRedoMahnstufe(cboFirma._value, mahndatum)
+            Dim cntRedo As Integer = cntRedoMahnstufe(cboFirma._value, mahndatum, Not cbxMahnsperre.Checked)
             If vbYes = MsgBox("Möchten Sie wirklich den Mahnzähler zurücksetzen?" & vbNewLine & "Ab Mahndatum: " & mahndatum & vbNewLine & "Betrifft '" & cntRedo & "' Mahnungen/Einträge " & mahndatum, vbYesNoCancel) Then
-                If redoMahnstufe(cboFirma._value, mahndatum) Then
+                If redoMahnstufe(cboFirma._value, mahndatum, Not cbxMahnsperre.Checked) Then
                     MsgBox("Der Mahnzähler wurde erfolgreich zurückgesetzt.")
                 End If
             End If
@@ -1524,12 +1574,14 @@ Public Class frmBU_Mahnlauf
             cbxZahlungseingaenge.Visible = True
             cboBetreuer.Visible = True
             lblBetreuer.Visible = True
+            cbxNewDGV.Visible = False
 
         Else
             cbxZahlungseingaenge.Visible = False
             cbxZahlungseingaenge.Checked = False
             cboBetreuer.Visible = False
             lblBetreuer.Visible = False
+            cbxNewDGV.Visible = True
 
         End If
     End Sub
@@ -1541,7 +1593,7 @@ Public Class frmBU_Mahnlauf
                 If Not VERAG_PROG_ALLGEMEIN.cSyska_Interface.OP_Einlesen(cboFirma._value) Then
                     MsgBox("Fehler beim aktualisieren der OPs aus Syska!")
                 Else
-                    initDGV(cbxZahlungseingaenge.Checked)
+                    initDGV(cbxZahlungseingaenge.Checked, cbxNewDGV.Checked)
                 End If
 
 

SDL/buchhaltung/usrCntlBH.Designer.vb

@@ -25,6 +25,16 @@ Partial Class usrCntlBH
         Me.Label6 = New System.Windows.Forms.Label()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.GroupBox13 = New System.Windows.Forms.GroupBox()
+        Me.btnfortlRENr = New System.Windows.Forms.Button()
+        Me.btnfehlendeBelege = New System.Windows.Forms.Button()
+        Me.btnBelegeOhnePOS = New System.Windows.Forms.Button()
+        Me.txtRE_Jahr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label59 = New System.Windows.Forms.Label()
+        Me.txtRE_Monat = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.cbxFirma_RE = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label60 = New System.Windows.Forms.Label()
+        Me.Label58 = New System.Windows.Forms.Label()
         Me.btn_fehlendeUID = New System.Windows.Forms.Button()
         Me.lblUID_zupruefen = New System.Windows.Forms.Label()
         Me.Label53 = New System.Windows.Forms.Label()
@@ -166,6 +176,7 @@ Partial Class usrCntlBH
         Me.Label51 = New System.Windows.Forms.Label()
         Me.pnl.SuspendLayout()
         Me.TabPage1.SuspendLayout()
+        Me.GroupBox13.SuspendLayout()
         Me.GroupBox12.SuspendLayout()
         Me.GroupBox10.SuspendLayout()
         Me.GroupBox8.SuspendLayout()
@@ -209,6 +220,8 @@ Partial Class usrCntlBH
         'TabPage1
         '
         Me.TabPage1.AutoScroll = True
+        Me.TabPage1.Controls.Add(Me.GroupBox13)
+        Me.TabPage1.Controls.Add(Me.Label58)
         Me.TabPage1.Controls.Add(Me.btn_fehlendeUID)
         Me.TabPage1.Controls.Add(Me.lblUID_zupruefen)
         Me.TabPage1.Controls.Add(Me.Label53)
@@ -236,6 +249,155 @@ Partial Class usrCntlBH
         Me.TabPage1.Text = "Allgemein"
         Me.TabPage1.UseVisualStyleBackColor = True
         '
+        'GroupBox13
+        '
+        Me.GroupBox13.Controls.Add(Me.btnfortlRENr)
+        Me.GroupBox13.Controls.Add(Me.btnfehlendeBelege)
+        Me.GroupBox13.Controls.Add(Me.btnBelegeOhnePOS)
+        Me.GroupBox13.Controls.Add(Me.txtRE_Jahr)
+        Me.GroupBox13.Controls.Add(Me.Label59)
+        Me.GroupBox13.Controls.Add(Me.txtRE_Monat)
+        Me.GroupBox13.Controls.Add(Me.cbxFirma_RE)
+        Me.GroupBox13.Controls.Add(Me.Label60)
+        Me.GroupBox13.Location = New System.Drawing.Point(480, 21)
+        Me.GroupBox13.Name = "GroupBox13"
+        Me.GroupBox13.Size = New System.Drawing.Size(372, 79)
+        Me.GroupBox13.TabIndex = 39
+        Me.GroupBox13.TabStop = False
+        '
+        'btnfortlRENr
+        '
+        Me.btnfortlRENr.Enabled = False
+        Me.btnfortlRENr.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnfortlRENr.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.btnfortlRENr.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.btnfortlRENr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnfortlRENr.Location = New System.Drawing.Point(236, 56)
+        Me.btnfortlRENr.Name = "btnfortlRENr"
+        Me.btnfortlRENr.Size = New System.Drawing.Size(130, 22)
+        Me.btnfortlRENr.TabIndex = 42
+        Me.btnfortlRENr.Text = "ReNr fortl."
+        Me.btnfortlRENr.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnfortlRENr.UseVisualStyleBackColor = True
+        '
+        'btnfehlendeBelege
+        '
+        Me.btnfehlendeBelege.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnfehlendeBelege.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.btnfehlendeBelege.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.btnfehlendeBelege.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnfehlendeBelege.Location = New System.Drawing.Point(236, 32)
+        Me.btnfehlendeBelege.Name = "btnfehlendeBelege"
+        Me.btnfehlendeBelege.Size = New System.Drawing.Size(130, 22)
+        Me.btnfehlendeBelege.TabIndex = 41
+        Me.btnfehlendeBelege.Text = "fehlende Belege"
+        Me.btnfehlendeBelege.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnfehlendeBelege.UseVisualStyleBackColor = True
+        '
+        'btnBelegeOhnePOS
+        '
+        Me.btnBelegeOhnePOS.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnBelegeOhnePOS.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.btnBelegeOhnePOS.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.btnBelegeOhnePOS.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnBelegeOhnePOS.Location = New System.Drawing.Point(236, 8)
+        Me.btnBelegeOhnePOS.Name = "btnBelegeOhnePOS"
+        Me.btnBelegeOhnePOS.Size = New System.Drawing.Size(130, 22)
+        Me.btnBelegeOhnePOS.TabIndex = 40
+        Me.btnBelegeOhnePOS.Text = "Belege ohne POS"
+        Me.btnBelegeOhnePOS.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnBelegeOhnePOS.UseVisualStyleBackColor = True
+        '
+        'txtRE_Jahr
+        '
+        Me.txtRE_Jahr._DateTimeOnly = False
+        Me.txtRE_Jahr._numbersOnly = True
+        Me.txtRE_Jahr._numbersOnlyKommastellen = ""
+        Me.txtRE_Jahr._numbersOnlyTrennzeichen = False
+        Me.txtRE_Jahr._Prozent = False
+        Me.txtRE_Jahr._ShortDateNew = False
+        Me.txtRE_Jahr._ShortDateOnly = False
+        Me.txtRE_Jahr._TimeOnly = False
+        Me.txtRE_Jahr._TimeOnly_Seconds = False
+        Me.txtRE_Jahr._value = ""
+        Me.txtRE_Jahr._Waehrung = False
+        Me.txtRE_Jahr._WaehrungZeichen = False
+        Me.txtRE_Jahr.ForeColor = System.Drawing.Color.Black
+        Me.txtRE_Jahr.Location = New System.Drawing.Point(108, 13)
+        Me.txtRE_Jahr.MaxLength = 4
+        Me.txtRE_Jahr.MaxLineLength = -1
+        Me.txtRE_Jahr.MaxLines_Warning = ""
+        Me.txtRE_Jahr.MaxLines_Warning_Label = Nothing
+        Me.txtRE_Jahr.Name = "txtRE_Jahr"
+        Me.txtRE_Jahr.Size = New System.Drawing.Size(64, 20)
+        Me.txtRE_Jahr.TabIndex = 39
+        Me.txtRE_Jahr.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'Label59
+        '
+        Me.Label59.AutoSize = True
+        Me.Label59.Location = New System.Drawing.Point(6, 16)
+        Me.Label59.Name = "Label59"
+        Me.Label59.Size = New System.Drawing.Size(62, 13)
+        Me.Label59.TabIndex = 38
+        Me.Label59.Text = "Monat/Jahr"
+        '
+        'txtRE_Monat
+        '
+        Me.txtRE_Monat._DateTimeOnly = False
+        Me.txtRE_Monat._numbersOnly = True
+        Me.txtRE_Monat._numbersOnlyKommastellen = ""
+        Me.txtRE_Monat._numbersOnlyTrennzeichen = False
+        Me.txtRE_Monat._Prozent = False
+        Me.txtRE_Monat._ShortDateNew = False
+        Me.txtRE_Monat._ShortDateOnly = False
+        Me.txtRE_Monat._TimeOnly = False
+        Me.txtRE_Monat._TimeOnly_Seconds = False
+        Me.txtRE_Monat._value = ""
+        Me.txtRE_Monat._Waehrung = False
+        Me.txtRE_Monat._WaehrungZeichen = False
+        Me.txtRE_Monat.ForeColor = System.Drawing.Color.Black
+        Me.txtRE_Monat.Location = New System.Drawing.Point(74, 13)
+        Me.txtRE_Monat.MaxLength = 2
+        Me.txtRE_Monat.MaxLineLength = -1
+        Me.txtRE_Monat.MaxLines_Warning = ""
+        Me.txtRE_Monat.MaxLines_Warning_Label = Nothing
+        Me.txtRE_Monat.Name = "txtRE_Monat"
+        Me.txtRE_Monat.Size = New System.Drawing.Size(24, 20)
+        Me.txtRE_Monat.TabIndex = 35
+        Me.txtRE_Monat.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'cbxFirma_RE
+        '
+        Me.cbxFirma_RE._allowedValuesFreiText = Nothing
+        Me.cbxFirma_RE._allowFreiText = False
+        Me.cbxFirma_RE._value = ""
+        Me.cbxFirma_RE.DropDownWidth = 200
+        Me.cbxFirma_RE.FormattingEnabled = True
+        Me.cbxFirma_RE.Location = New System.Drawing.Point(47, 34)
+        Me.cbxFirma_RE.Name = "cbxFirma_RE"
+        Me.cbxFirma_RE.Size = New System.Drawing.Size(125, 21)
+        Me.cbxFirma_RE.TabIndex = 36
+        '
+        'Label60
+        '
+        Me.Label60.AutoSize = True
+        Me.Label60.Location = New System.Drawing.Point(6, 38)
+        Me.Label60.Name = "Label60"
+        Me.Label60.Size = New System.Drawing.Size(35, 13)
+        Me.Label60.TabIndex = 37
+        Me.Label60.Text = "Firma:"
+        '
+        'Label58
+        '
+        Me.Label58.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label58.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Me.Label58.Location = New System.Drawing.Point(479, 3)
+        Me.Label58.Name = "Label58"
+        Me.Label58.Size = New System.Drawing.Size(298, 18)
+        Me.Label58.TabIndex = 38
+        Me.Label58.Text = "BELEGE PRÜFEN"
+        '
         'btn_fehlendeUID
         '
         Me.btn_fehlendeUID.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -714,7 +876,7 @@ Partial Class usrCntlBH
         Me.GroupBox2.Controls.Add(Me.Button1)
         Me.GroupBox2.Location = New System.Drawing.Point(6, 15)
         Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(847, 86)
+        Me.GroupBox2.Size = New System.Drawing.Size(461, 86)
         Me.GroupBox2.TabIndex = 4
         Me.GroupBox2.TabStop = False
         '
@@ -2103,6 +2265,8 @@ Partial Class usrCntlBH
         Me.pnl.PerformLayout()
         Me.TabPage1.ResumeLayout(False)
         Me.TabPage1.PerformLayout()
+        Me.GroupBox13.ResumeLayout(False)
+        Me.GroupBox13.PerformLayout()
         Me.GroupBox12.ResumeLayout(False)
         Me.GroupBox12.PerformLayout()
         Me.GroupBox10.ResumeLayout(False)
@@ -2282,4 +2446,14 @@ Partial Class usrCntlBH
     Friend WithEvents txtZRvon As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents txtZRbis As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label51 As Label
+    Friend WithEvents GroupBox13 As GroupBox
+    Friend WithEvents btnfehlendeBelege As Button
+    Friend WithEvents btnBelegeOhnePOS As Button
+    Friend WithEvents txtRE_Jahr As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label59 As Label
+    Friend WithEvents txtRE_Monat As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents cbxFirma_RE As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label60 As Label
+    Friend WithEvents Label58 As Label
+    Friend WithEvents btnfortlRENr As Button
 End Class

SDL/buchhaltung/usrCntlBH.vb

@@ -29,6 +29,11 @@ Public Class usrCntlBH
         cboAbfVerbFirma.fillWithSQL("SELECT distinct([Firma]) FROM [VERAG].[dbo].[Filialen] order by [Firma]", False, "FMZOLL", True)
         cboAbfVerbFirma.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
 
+        cbxFirma_RE.fillWithSQL("SELECT Firma_ID, Firma_Bez FROM [VERAG].[dbo].[tblFirma] where Firma_ID in (1,4,7,11,19,20,21,22,23,24,26)", False, "FMZOLL", True)
+
+        txtRE_Jahr.Text = Now().Year
+        txtRE_Monat.Text = Now().Month
+
         cbxFirmaUID.Items.Add(New MyListItem("AMBAR", "AMBAR"))
         cbxFirmaUID.Items.Add(New MyListItem("IMEX", "IMEX"))
         cbxFirmaUID.Items.Add(New MyListItem("ATILLA", "ATILLA"))
@@ -1452,5 +1457,135 @@ Public Class usrCntlBH
         End If
     End Sub
 
+    Private Sub Button15_Click(sender As Object, e As EventArgs) Handles btnBelegeOhnePOS.Click, btnfehlendeBelege.Click, btnfortlRENr.Click
+
+        Try
+
+            If txtRE_Jahr.Text <> "" AndAlso IsNumeric(txtRE_Jahr.Text) AndAlso txtRE_Jahr.Text.Length = 4 Then
+
+                    If txtRE_Monat.Text = "" OrElse txtRE_Monat.Text <> "" AndAlso IsNumeric(txtRE_Monat.Text) AndAlso CInt(txtRE_Monat.Text) > 0 AndAlso CInt(txtRE_Monat.Text) < 13 Then
+                    Dim Bezeichnung As String = ""
+                    Dim SQL_RE As String = ""
+
+                    Select Case sender.Name
+
+
+                        Case "btnfehlendeBelege"
+
+                            If cbxFirma_RE._value = "" Then MsgBox("Es muss eine Firma angegeben werden!") : Exit Sub
+                            If CInt(txtRE_Jahr.Text) < 2026 Then MsgBox("Erst ab Jahr 2026 möglich!") : Exit Sub
+
+                            Bezeichnung = "fehlende BELEGE von " & cbxFirma_RE.SelectedItem.Text & " Zeitraum: " & txtRE_Monat.Text & "/" & txtRE_Jahr.Text
+
+                            SQL_RE = "DECLARE @Month   INT = " & txtRE_Monat.Text & ";
+                                      DECLARE @Year    INT = " & txtRE_Jahr.Text & ";
+                                      DECLARE @FirmaID INT = " & cbxFirma_RE._value & ";
+                                      
+                                      SELECT DISTINCT
+                                             REPLACE(
+                                               REPLACE(
+                                                 REPLACE(da.da_name, 'Rechnung_', ''),
+                                               '.pdf', ''),
+                                             'Gutschrift_', '') AS RechnungsNr, da_name as Bezeichnung
+                                      FROM tblDatenarchiv da
+                                      WHERE da.da_kategorie = 'Rechnungen'
+                                        AND da.da_ordner = 'Firma_' + CAST(@FirmaID AS VARCHAR)
+                                        AND da.da_uOrdner1 = CAST(@Year AS VARCHAR) + '_' + CAST(@Month AS VARCHAR)
+                                        AND LEFT(da.da_name, 6) <> 'Sammel'
+                                        AND NOT EXISTS (
+                                              SELECT 1
+                                              FROM Rechnungsausgang ra
+                                              WHERE ra.RechnungsNr =
+                                                    REPLACE(
+                                                      REPLACE(
+                                                        REPLACE(da.da_name, 'Rechnung_', ''),
+                                                      '.pdf', ''),
+                                                    'Gutschrift_', '')
+                                                AND MONTH(ra.RechnungsDatum) = @Month
+                                                AND YEAR(ra.RechnungsDatum)  = @Year
+                                                AND ra.Firma_ID = @FirmaID
+                                                AND ra.Sammelrechnung = 0
+                                        ) UNION
+
+                       
+                                      
+                                      SELECT DISTINCT
+                                         REPLACE(
+                                           REPLACE(da.da_name, 'Sammelrechnung_', ''),
+                                         '.pdf', '') AS RechnungsNr, da_name as Bezeichnung
+                                FROM tblDatenarchiv da
+                                WHERE da.da_kategorie = 'Rechnungen'
+                                  AND da.da_ordner = 'Firma_' + CAST(@FirmaID AS VARCHAR)
+                                  AND da.da_uOrdner1 = CAST(@Year AS VARCHAR) + '_' + CAST(@Month AS VARCHAR)
+                                  AND LEFT(da.da_name, 6) = 'Sammel'
+                                  AND NOT EXISTS (
+                                        SELECT 1
+                                        FROM Rechnungsausgang ra
+                                        WHERE ra.RechnungsNr =
+                                                REPLACE(
+                                                  REPLACE(da.da_name, 'Sammelrechnung_', ''),
+                                                '.pdf', '')
+                                          AND MONTH(ra.RechnungsDatum) = @Month
+                                          AND YEAR(ra.RechnungsDatum)  = @Year
+                                          AND ra.Firma_ID = @FirmaID
+                                          AND ra.Sammelrechnung <> 0
+                                  );"
+
+
+                        Case "btnBelegeOhnePOS"
+                            Bezeichnung = "BELEGE ohne Positionen" & IIf(cbxFirma_RE._value <> "", " von " & cbxFirma_RE.SelectedItem.Text, "") & "  Zeitraum: " & txtRE_Monat.Text & "/" & txtRE_Jahr.Text
+                            SQL_RE = "Select * From Rechnungsausgang r Where YEAR(r.RechnungsDatum) = " & txtRE_Jahr.Text & " AND MONTH(r.RechnungsDatum) = " & txtRE_Monat.Text & "  AND Not EXISTS( SELECT 1 From RechnungsausgangPositionen p Where p.RK_ID = r.RK_ID) " & IIf(cbxFirma_RE._value <> "", "  AND r.[Firma_ID] = " & cbxFirma_RE._value, "")
+
+                        Case "btnfortlRENr"
+                            If cbxFirma_RE._value = "" Then MsgBox("Es muss eine Firma angegeben werden!") : Exit Sub
+
+                            Dim ignoreMonth As Boolean = False
+
+                            If vbYes = MsgBox("Möchten Sie die fortlaufende Re-Nr für das Gesamtjahr " & txtRE_Jahr.Text & " prüfen?", vbYesNoCancel) Then ignoreMonth = True
+
+
+                            Bezeichnung = "Lücken in der fortl. Belegnummerierung von " & cbxFirma_RE.SelectedItem.Text & " Zeitraum: " & IIf(Not ignoreMonth, txtRE_Monat.Text & "/" & txtRE_Jahr.Text, txtRE_Jahr.Text)
+                            SQL_RE = "WITH Nummern AS (
+                                        SELECT
+                                            RechnungsNr,
+                                            LEAD(RechnungsNr) OVER (ORDER BY RechnungsNr) AS NextRechnungsNr
+                                        FROM Rechnungsausgang
+                                        WHERE Firma_ID = " & cbxFirma_RE._value & "
+                                          AND YEAR(RechnungsDatum) = " & txtRE_Jahr.Text & IIf(Not ignoreMonth, " and Month(RechnungsDatum) = " & txtRE_Monat.Text, "") &
+                                        " GROUP BY RechnungsNr
+                                    )
+                                    SELECT
+                                        RechnungsNr + 1 AS FehlendeVon,
+                                        NextRechnungsNr - 1 AS FehlendeBis
+                                    FROM Nummern
+                                    WHERE NextRechnungsNr IS NOT NULL
+                                      AND NextRechnungsNr > RechnungsNr + 1
+                                    ORDER BY FehlendeVon;"
+
+                    End Select
+
+                    Me.Cursor = Cursors.WaitCursor
+                    Dim dt_RE As DataTable = SQL.loadDgvBySql(SQL_RE, "FMZOLL")
+
+                    If dt_RE.Rows.Count > 0 Then
+                        cProgramFunctions.genExcelFromDT_NEW(dt_RE,,, Bezeichnung,,, True)
+                        Me.Cursor = Cursors.Default
+                        Else
+                            MsgBox("keine Daten für den ausgewählten Zeitraum!")
+                            Me.Cursor = Cursors.Default
+                        End If
+
+                    End If
+
+                End If
+
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            Me.Cursor = Cursors.Default
+        End Try
+
+    End Sub
+
 
 End Class

SDL/kassenbuch/frmNacherfassungLeihgeld.vb

@@ -591,7 +591,7 @@ Public Class frmNacherfassungLeihgeld
             Dim OFFERTE As New VERAG_PROG_ALLGEMEIN.cOfferte(KdNr, OffertenNr, True)
             RG.LOAD_OFFERT_POSITIONEN() ' --> OFFERTE MIT ANZAHL >0 und Preis >0
 
-            allPos(RG, OFFERTE, 110, summeBRUTTO, summeNETTO, (summeBRUTTO - summeNETTO), "Leihgeldauszahlung (" & BARBELEG.LKW_Kennzeichen & " " & BARBELEG.Fahrer & ")")
+            allPos(RG, OFFERTE, 110, summeBRUTTO, summeNETTO, (summeBRUTTO - summeNETTO), "LG-Auszahlung (" & BARBELEG.LKW_Kennzeichen & " " & BARBELEG.Fahrer & ")")
 
             Dim dtSt As DataTable = SQL.loadDgvBySql("SELECT TOP 1 isnull([Steuersatz %],0),isnull([Steuerbezeichnung],'')  FROM [Steuertabelle] WHERE [Steuerschlüssel]='" & RG.Steuerschlüssel & "'", "FMZOLL")
             If dtSt IsNot Nothing AndAlso dtSt.Rows.Count > 0 Then
@@ -627,6 +627,10 @@ Public Class frmNacherfassungLeihgeld
                     POS.LeistungsNr = o.LeistungsNr
                     POS.LeistungsBez = IIf(leistungsBez <> "", leistungsBez, o.LeistungsBez)
 
+                    If POS.LeistungsBez IsNot Nothing AndAlso POS.LeistungsBez.Length > 30 Then
+                        POS.LeistungsBez = POS.LeistungsBez.Substring(0, Math.Min(30, POS.LeistungsBez.Length))
+                    End If
+
                     POS.BerechnungsartNr = o.BerechnungsartNr
                     POS.Anzahl = 1
                     POS.Steuerpflichtig = LEISTUNG.Steuerpflichtig
@@ -665,7 +669,6 @@ Public Class frmNacherfassungLeihgeld
 
 
         Dim BELEG_Prov As New EABeleg(PERSONAL.Mandant, PERSONAL.Niederlassung, PERSONAL.ID)
-        'lblRgNr.Text = "12345 / TR"
         BELEG_Prov.BelegDat = BELEG.BelegDat
         BELEG_Prov.Beleg_TYP = "K"
         BELEG_Prov.KundenNr = BELEG.FrachtführerKundenNr
@@ -732,7 +735,6 @@ Public Class frmNacherfassungLeihgeld
         If f.ShowDialog() Then
             barBetrag = f.BELEG.rksv_umsatz
             BelegNrProvision = f.BELEG.rksv_BelegId
-
             printProvision = f.printErfolgreich
         End If
         ' f.Close()
@@ -777,8 +779,8 @@ Public Class frmNacherfassungLeihgeld
             VALUES.Frachtfuehrer_KdNr = BELEG.FrachtführerKundenNr
             VALUES.Frachtfuehrer_Firma = BELEG.Frachtführer
             VALUES.KdAuftrNr = If(BELEG.Auftraggeber_KdAuftragsnummer, "")
-
             VALUES.Auftraggeber_Leistung1 = "Leihgeld"
+
             Dim betrag As Double = 0
             For Each p In BELEG.POS
                 betrag += p.Preis

SDL/kunden/Vorauskasse/frmVorauskasse.vb

@@ -97,6 +97,7 @@ Public Class frmVorauskasse
             Case "AMBAR"
                 cboFiliale._allowedValuesFreiText = {"5701"}
                 cboFiliale.changeItem("5701")
+                cboFiliale.Enabled = False
             Case "FRONTOFFICE"
                 cboFiliale._allowedValuesFreiText = {"5801"}
                 cboFiliale.changeItem("5801")

SDL/kunden/frmKundenKontakteDetails.Designer.vb

@@ -55,16 +55,20 @@ Partial Class frmKundenKontakteDetails
         Me.PictureBox5 = New System.Windows.Forms.PictureBox()
         Me.lblAnsprechpartnerNN = New System.Windows.Forms.TextBox()
         Me.pnlGeschaeftsfuehrer = New System.Windows.Forms.Panel()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.cbxGeburtsland = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label5 = New System.Windows.Forms.Label()
+        Me.txtGeburtsort = New System.Windows.Forms.TextBox()
         Me.txtPassgueltigbis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.PictureBox9 = New System.Windows.Forms.PictureBox()
         Me.txtGebDatum = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.pnlMain = New System.Windows.Forms.Panel()
-        Me.txtGeburtsort = New System.Windows.Forms.TextBox()
+        Me.lblSachbearbeiter = New System.Windows.Forms.Label()
-        Me.cbxGeburtsland = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.lblAenderung = New System.Windows.Forms.Label()
-        Me.Label6 = New System.Windows.Forms.Label()
+        Me.Label26 = New System.Windows.Forms.Label()
-        Me.Label7 = New System.Windows.Forms.Label()
+        Me.Label23 = New System.Windows.Forms.Label()
         Me.pnlKontakt.SuspendLayout()
         CType(Me.picBoxKorr, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -463,6 +467,37 @@ Partial Class frmKundenKontakteDetails
         Me.pnlGeschaeftsfuehrer.TabIndex = 11
         Me.pnlGeschaeftsfuehrer.Visible = False
         '
+        'Label7
+        '
+        Me.Label7.AutoSize = True
+        Me.Label7.Location = New System.Drawing.Point(4, 42)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(59, 13)
+        Me.Label7.TabIndex = 270
+        Me.Label7.Text = "Geburtsort:"
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Location = New System.Drawing.Point(268, 42)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(67, 13)
+        Me.Label6.TabIndex = 269
+        Me.Label6.Text = "Geburtsland:"
+        '
+        'cbxGeburtsland
+        '
+        Me.cbxGeburtsland._allowedValuesFreiText = Nothing
+        Me.cbxGeburtsland._allowFreiText = False
+        Me.cbxGeburtsland._value = ""
+        Me.cbxGeburtsland.DropDownWidth = 150
+        Me.cbxGeburtsland.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!)
+        Me.cbxGeburtsland.FormattingEnabled = True
+        Me.cbxGeburtsland.Location = New System.Drawing.Point(354, 35)
+        Me.cbxGeburtsland.Name = "cbxGeburtsland"
+        Me.cbxGeburtsland.Size = New System.Drawing.Size(140, 26)
+        Me.cbxGeburtsland.TabIndex = 268
+        '
         'Label5
         '
         Me.Label5.AutoSize = True
@@ -472,6 +507,17 @@ Partial Class frmKundenKontakteDetails
         Me.Label5.TabIndex = 266
         Me.Label5.Text = "Pass gültig bis.:"
         '
+        'txtGeburtsort
+        '
+        Me.txtGeburtsort.BackColor = System.Drawing.Color.White
+        Me.txtGeburtsort.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.txtGeburtsort.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtGeburtsort.Location = New System.Drawing.Point(77, 35)
+        Me.txtGeburtsort.Name = "txtGeburtsort"
+        Me.txtGeburtsort.Size = New System.Drawing.Size(183, 26)
+        Me.txtGeburtsort.TabIndex = 268
+        Me.txtGeburtsort.Text = "geburtsort"
+        '
         'txtPassgueltigbis
         '
         Me.txtPassgueltigbis._DateTimeOnly = False
@@ -548,6 +594,10 @@ Partial Class frmKundenKontakteDetails
         '
         'pnlMain
         '
+        Me.pnlMain.Controls.Add(Me.lblSachbearbeiter)
+        Me.pnlMain.Controls.Add(Me.lblAenderung)
+        Me.pnlMain.Controls.Add(Me.Label26)
+        Me.pnlMain.Controls.Add(Me.Label23)
         Me.pnlMain.Controls.Add(Me.lbl)
         Me.pnlMain.Controls.Add(Me.btn)
         Me.pnlMain.Controls.Add(Me.pnlGeschaeftsfuehrer)
@@ -558,47 +608,45 @@ Partial Class frmKundenKontakteDetails
         Me.pnlMain.Size = New System.Drawing.Size(513, 433)
         Me.pnlMain.TabIndex = 12
         '
-        'txtGeburtsort
+        'lblSachbearbeiter
         '
-        Me.txtGeburtsort.BackColor = System.Drawing.Color.White
+        Me.lblSachbearbeiter.AutoSize = True
-        Me.txtGeburtsort.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.lblSachbearbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtGeburtsort.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblSachbearbeiter.Location = New System.Drawing.Point(124, 409)
-        Me.txtGeburtsort.Location = New System.Drawing.Point(77, 35)
+        Me.lblSachbearbeiter.Name = "lblSachbearbeiter"
-        Me.txtGeburtsort.Name = "txtGeburtsort"
+        Me.lblSachbearbeiter.Size = New System.Drawing.Size(10, 13)
-        Me.txtGeburtsort.Size = New System.Drawing.Size(183, 26)
+        Me.lblSachbearbeiter.TabIndex = 17
-        Me.txtGeburtsort.TabIndex = 268
+        Me.lblSachbearbeiter.Text = "-"
-        Me.txtGeburtsort.Text = "geburtsort"
         '
-        'cbxGeburtsland
+        'lblAenderung
         '
-        Me.cbxGeburtsland._allowedValuesFreiText = Nothing
+        Me.lblAenderung.AutoSize = True
-        Me.cbxGeburtsland._allowFreiText = False
+        Me.lblAenderung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxGeburtsland._value = ""
+        Me.lblAenderung.Location = New System.Drawing.Point(124, 394)
-        Me.cbxGeburtsland.DropDownWidth = 150
+        Me.lblAenderung.Name = "lblAenderung"
-        Me.cbxGeburtsland.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!)
+        Me.lblAenderung.Size = New System.Drawing.Size(10, 13)
-        Me.cbxGeburtsland.FormattingEnabled = True
+        Me.lblAenderung.TabIndex = 15
-        Me.cbxGeburtsland.Location = New System.Drawing.Point(354, 35)
+        Me.lblAenderung.Text = "-"
-        Me.cbxGeburtsland.Name = "cbxGeburtsland"
-        Me.cbxGeburtsland.Size = New System.Drawing.Size(140, 26)
-        Me.cbxGeburtsland.TabIndex = 268
         '
-        'Label6
+        'Label26
         '
-        Me.Label6.AutoSize = True
+        Me.Label26.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(268, 42)
+        Me.Label26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label6.Name = "Label6"
+        Me.Label26.Location = New System.Drawing.Point(3, 409)
-        Me.Label6.Size = New System.Drawing.Size(67, 13)
+        Me.Label26.Name = "Label26"
-        Me.Label6.TabIndex = 269
+        Me.Label26.Size = New System.Drawing.Size(117, 13)
-        Me.Label6.Text = "Geburtsland:"
+        Me.Label26.TabIndex = 16
+        Me.Label26.Text = "Letzter Sachbearbeiter:"
         '
-        'Label7
+        'Label23
         '
-        Me.Label7.AutoSize = True
+        Me.Label23.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(4, 42)
+        Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label7.Name = "Label7"
+        Me.Label23.Location = New System.Drawing.Point(3, 394)
-        Me.Label7.Size = New System.Drawing.Size(59, 13)
+        Me.Label23.Name = "Label23"
-        Me.Label7.TabIndex = 270
+        Me.Label23.Size = New System.Drawing.Size(90, 13)
-        Me.Label7.Text = "Geburtsort:"
+        Me.Label23.TabIndex = 14
+        Me.Label23.Text = "Änderungsdatum:"
         '
         'frmKundenKontakteDetails
         '
@@ -676,4 +724,8 @@ Partial Class frmKundenKontakteDetails
     Friend WithEvents Label7 As Label
     Friend WithEvents Label6 As Label
     Friend WithEvents cbxGeburtsland As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents lblSachbearbeiter As Label
+    Friend WithEvents lblAenderung As Label
+    Friend WithEvents Label26 As Label
+    Friend WithEvents Label23 As Label
 End Class

SDL/kunden/frmKundenKontakteDetails.resx

@@ -120,179 +120,178 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="picBoxKorr.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
-        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
+        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
-        AAAAAAAAAMD7/PI9v37Pbz/z+4f8Mcj237b/vz62PgcwsXpIt4f3z+/563v+fmPq81Xqc9dEsU0OwMG2
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        +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
-        JgFe4uHvH/cEeIobfjlxY5CHeDtvXkwC3MVxX2aqH+AXj3KTfX9uNAX5UpWJo4EjOdEUZMi+f53YCvCJ
+        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
-        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
+        OCnIL6z710u956D0XziWAni8d+HYFVicrr84ILSw7cUg60VDcFHO+suIswGL0fiTbTQEF2LbT7axLbgI
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        AYeCmkss/2edlWoQSGy2zlBl8aG0NepsM/9WYiWgD9BY2qO/HWajtM9bmLXi4gXbN7Nzruz2vytp6aUP
-        Ghu9oF1zZrf/UUlbL32Apmq1HL2gHdNxFUqqvvQBGkpahWbe91+TtBXQB2goZQWq76OrlNfABNBQyuDr
+        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
-        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
+        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
-        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
+        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
-        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
+        +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
-        mI+LQBym+wSQ+PbT0ffZKa4CN5Lw5pOkNwN1PwGomAAaSZgAkkrO7vv/it8H0IjfQjOX+l5G32OnmACa
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        1Z+XVRVQf2X0aIDJ3IG3UAX0i/f78zZVBfitQX1SFRu8ld8d2Cd+0y+7UAXMH7/pl904Fpw/Vn925Yrw
+        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
-        vHHll92pAuZNvTawO8eC88WxH4dxLDhXHPtxOMeC80Tjj1NoCJ4fjT9OoyF4fjT+OJWG4Hnxbj9OpyF4
+        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
-        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
+        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
-        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
+        V4t9H6U/bVkKfBfHfWnPUuDzKP2JYCnwfpT+xLAUeC9Kf+JYCrwepT+RLAWeR+lPLEuBx3Hgh3iWAvej
-        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
+        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
-        P1UZPHpIkqP0hw9WOhp05AcXVjkatO+HK1Y4GlT6wxeSjwY9/HCHxH6A0h/ulHY06MgPHpTUD1D6wxMS
+        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
-        +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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        27d/ABBabbXEUZDWAAAAAElFTkSuQmCC
+        RK5CYII=
 </value>
   </data>
   <data name="PictureBox10.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        A8UYHICTjVl93Ozbm/XMjEGh/iwGBDjImOGvvuGfZVQK9We1dIAvdLnpH8VgAG/qftPfyxgMgI0x229v
-        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
+        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
-        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
+        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
-        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
+        +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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        FNhIwgSQNOAS7mR0uoi1vIQJIElCH8AE0Ej3kjPx2Kl7H8BdgEa6TwBJ+/9N9+NAE0Aj3Qdb4gTQfVI2
+        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
-        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
+        +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
-        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
+        PgAkPQk4bP+O3ZLYmI2V8PBJ0sNA3XcAKgaARhIGgKSSs/v6v+LzABpJePosaRmQ8PFsBoBmtm9gx6Qs
-        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
+        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
-        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
+        AQmN2BFbgA0lXYAdq4CEJdhI92XYsrZvZOd0KkMTDv78HJpKmoW6LAVSll4jHasvfkhpBI7MviuQtOwa
-        264tJoDG0lajysxn0kkV1xYNwMYSV6TKbJVAfS2JD39l5oqLO6QOzJoEZlidEqusLTV2aC6tD/AxNQmc
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        P1UZPHpIkqP0hw9WOhp05AcXVjkatO+HK1Y4GlT6wxeSjwY9/HCHxH6A0h/ulHY06MgPHpTUD1D6wxMS
+        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
-        +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
+        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
-        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
+        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
-        uT2bgvb90MAeTUEPPzTyzqagph809I5fJ6bpB029ejLg4Yfmnj0ZqI+pjwWae+ZkQNMPgjxyMuDhh0D3
+        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
-        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
+        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
-        27d/ABBabbXEUZDWAAAAAElFTkSuQmCC
+        RK5CYII=
 </value>
   </data>
   <data name="PictureBox8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        hsN5+OdJbQngEJp9c0ZzkN3VAKuBNhqAcn5MAuymBtZo0MlcMQnwdjWglP19YhLgrTz8/VKTALzMw983
+        +a9PDcBwOjf/PKklAZxCs2/OaA5yuLrAnOqbNwYBDlMX1vaCk/liEGB3yv5eMQiwKzd/v2gMsgs3f98Y
-        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
+        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
-        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
+        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
-        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
+        h37kXlQBC7D2l3vRC1jA9k0XGbEjEM6+vzyLKiCYU3/yLE4HhvIV3vJq6lohzOpbfzWz1WtQJW4thSp1
-        qsStrVClBvqW+vcVR6SOBCONXuj01ENfD/qjx1vVCKuPqY9ddUJwJBhktfK/Htx3qgmhPufoz0rNu3+G
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        IWEg1ghsaPsmdkzn2X9IqAIMAA1t38RuSbroEk4IJgzGy0jYAUgo/4eEE5m2AhtJGACSLriEMxmdDmIt
-        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
+        L2EASJLQBzAANNK95EzcdureB3AWoJHuA0DS+n/ovh1oAGik+8WWOAB0H5QNAI10HwASL7buA0DioByr
-        ATRitZmPqozDdJ8AEhtO3RuzJoBGTADzMQFwmO4TgC3AfDEBNNJ9sCVOAN0nZRNAI90ngMR7AKoyDmMC
+        +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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        DqR1+7ex/g+QPEON1IV6Zqla/6+UU36PMkOFxZdS+wDbjGrgyIGgfu/kimobQqT2AX6XIwaC1W78ivI/
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        qK+M3l5cMn9gF6qAfvG8P7vxqUG9UhUb7MpnB/aJT/rlEKqA+eOTfjmMbcH5Y/bnUI4IzxtHfjmcKmDe
-        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
+        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
-        TjT+mIaG4PHR+GMqGoLHReOP6WgIHheYkobg/nHjj6lpCO4Xb/VlerYC+0XjjxZsBd4fZ/604W7Ae6P0
+        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
-        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
+        V4t9H6U/bVkKfBfHfWnPUuDzKP2JYCnwfpT+xLAUeC9Kf+JYCrwepT+RLAWeR+lPLEuBx3Hgh3iWAvej
-        8HVc+CGercD1KP1Zgq3A/6P0Zxm2Ap+j9Gc5tgL/pX4WsBxvG7bvZ3Er/zJRpT/Lq/K3br6NHpDkuO0H
+        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
-        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
+        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
-        +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
+        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
-        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
+        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
-        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
+        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
-        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
+        Nz8sYrsz4Iw/LGYMArb7YFF14+v4AwAAAAAAAAAAAAAAAAAAAAAAAAAAnOUPEFpttRISJSgAAAAASUVO
-        27d/ABBabbXEUZDWAAAAAElFTkSuQmCC
+        RK5CYII=
 </value>
   </data>
   <data name="PictureBox9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        5mn/I7tfDhCAEDqIw84BqDvw+vXuYudnBwhACB3EYecA6Ne6k3U/oOtLiglACB3EYdcA1LW2fq272fV+
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        6+QAXPVSYOqp/wEBCKFGcZ0cgKIicKVvCU686/8WAhBCjeI6PQDFVSJQf4ap1/3PEIAQahTXDQEoXh2B
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        5YK/CrjgMXgAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

SDL/kunden/frmKundenKontakteDetails.vb

@@ -68,6 +68,15 @@
         txtPLZ.Text = If(KD_KONTAKT.kkd_PLZ, "")
         txtKorrAdd.Text = If(KD_KONTAKT.kkd_Firmenname, "")
 
+        Dim mailfalse = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(lblEmail.Text)
+        If mailfalse <> "" Then lblEmail.ForeColor = Color.Red
+
+        Dim mailfalsecc = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(lblEmailCC.Text)
+        If mailfalsecc <> "" Then lblEmail.ForeColor = Color.Red
+
+        Dim mailfalsebcc = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(lblEmailBCC.Text)
+        If mailfalsebcc <> "" Then lblEmail.ForeColor = Color.Red
+
         txtGebDatum.Text = IIf(Not IsDBNull(KD_KONTAKT.kkd_GebDatum) AndAlso IsDate(KD_KONTAKT.kkd_GebDatum), CDate(KD_KONTAKT.kkd_GebDatum), "")
         txtPassgueltigbis.Text = IIf(Not IsDBNull(KD_KONTAKT.kkd_Passgueltigbis) AndAlso IsDate(KD_KONTAKT.kkd_Passgueltigbis), CDate(KD_KONTAKT.kkd_Passgueltigbis), "")
         txtGeburtsort.Text = If(KD_KONTAKT.kkd_Geburtsort, "")
@@ -75,6 +84,9 @@
         If Not IsDBNull(KD_KONTAKT.kkd_Land) Then cbxLand.changeItem(KD_KONTAKT.kkd_Land)
         If Not IsDBNull(KD_KONTAKT.kkd_Geburtsland) Then cbxGeburtsland.changeItem(KD_KONTAKT.kkd_Geburtsland)
 
+        If Not IsDBNull(KD_KONTAKT.kkd_letzteAenderung) AndAlso IsDate(KD_KONTAKT.kkd_letzteAenderung) AndAlso CDate(KD_KONTAKT.kkd_letzteAenderung) > New Date("01.01.2000") Then lblAenderung.Text = KD_KONTAKT.kkd_letzteAenderung
+        If Not IsDBNull(KD_KONTAKT.kkd_letzteAenderungUser) Then lblSachbearbeiter.Text = KD_KONTAKT.kkd_letzteAenderungUser
+
     End Sub
 
     Sub getvalue()
@@ -110,6 +122,42 @@
 
     Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
         getvalue()
+
+
+
+        Dim mailfalse = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(KD_KONTAKT.kkd_Email)
+        If mailfalse <> "" Then
+            lblEmail.ForeColor = Color.Red
+            MsgBox("Mailadresse: " & mailfalse & " fehlerhaft!")
+            lblEmail.Focus()
+            Exit Sub
+
+        Else
+            lblEmail.ForeColor = Color.Black
+        End If
+
+        Dim mailfalsecc = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(KD_KONTAKT.kkd_EmailCC)
+        If mailfalsecc <> "" Then
+            lblEmailCC.ForeColor = Color.Red
+            MsgBox("Mailadresse: " & mailfalsecc & " fehlerhaft!")
+            lblEmailCC.Focus()
+            Exit Sub
+        Else
+            lblEmailCC.ForeColor = Color.Black
+        End If
+
+        Dim mailfalsebcc = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(KD_KONTAKT.kkd_EmailBCC)
+        If mailfalsebcc <> "" Then
+            lblEmailBCC.ForeColor = Color.Red
+            MsgBox("Mailadresse: " & mailfalsebcc & " fehlerhaft!")
+            lblEmailBCC.Focus()
+            Exit Sub
+        Else
+            lblEmailBCC.ForeColor = Color.Black
+        End If
+
+        KD_KONTAKT.kkd_letzteAenderung = DateTime.Now
+        KD_KONTAKT.kkd_letzteAenderungUser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
         KD_KONTAKT.SAVE()
         Me.Close()
     End Sub
@@ -125,5 +173,4 @@
 
     End Sub
 
-
 End Class

SDL/kunden/usrCntlKundenKontakte.vb

@@ -1,7 +1,4 @@
-
+Public Class usrCntlKundenKontakte
-Imports DocumentFormat.OpenXml.Spreadsheet
-
-Public Class usrCntlKundenKontakte
 
     'Dim KD_KONTAKT As VERAG_PROG_ALLGEMEIN.cKundenKontakt = Nothing
     Public kdNr As Integer
@@ -41,11 +38,18 @@ Public Class usrCntlKundenKontakte
         dgvAufschub.Rows.Clear()
         If dgvAufschub.Columns.Count >= 5 Then
             If kdNr > 0 Then
-                Dim dt = SQL.loadDgvBySql("SELECT *  FROM [tblKundenKontakt]  where [kkd_KundenNr]=" & kdNr, "FMZOLL")
+                Dim dt = SQL.loadDgvBySql("SELECT [kkd_id],[kkd_KundenNr],[kkd_kkaBez],[kkd_Tel],isnull([kkd_Email],'') as kkd_Email ,isnull([kkd_EmailCC], '') as kkd_EmailCC ,isnull([kkd_EmailBCC], '') as kkd_EmailBCC ,[kkd_Fax],[kkd_AnsprechpartnerAnrede],[kkd_AnsprechpartnerVorname],[kkd_AnsprechpartnerNachname]  FROM [tblKundenKontakt]  where [kkd_KundenNr]=" & kdNr, "FMZOLL")
                 If dt IsNot Nothing Then
                     For Each r In dt.Rows
-                        Dim anspr = (If(r("kkd_AnsprechpartnerAnrede"), "") & " " & If(r("kkd_AnsprechpartnerVorname"), "") & " " & If(r("kkd_AnsprechpartnerNachname"), "")).trim
+                        Dim anspr = (If(r("kkd_AnsprechpartnerAnrede"), "") & " " & If(r("kkd_AnsprechpartnerVorname"), "") & " " & If(r("kkd_AnsprechpartnerNachname"), "")).Trim
-                        dgvAufschub.Rows.Add(r("kkd_id"), r("kkd_kkaBez"), r("kkd_Tel"), r("kkd_Email"), anspr, r("kkd_Fax"))
+
+                        Dim rowIndex As Integer = dgvAufschub.Rows.Add(r("kkd_id"), r("kkd_kkaBez"), r("kkd_Tel"), r("kkd_Email"), anspr, r("kkd_Fax"))
+
+                        If VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(r("kkd_email")) <> "" Or VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(r("kkd_emailcc")) <> "" Or VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(r("kkd_emailbcc")) <> "" Then
+                            Dim dgvRow As DataGridViewRow = dgvAufschub.Rows(rowIndex)
+                            dgvRow.DefaultCellStyle.BackColor = Color.IndianRed
+                        End If
+
                     Next
                 End If
             End If
@@ -101,5 +105,4 @@ Public Class usrCntlKundenKontakte
         dgvAufschub_KeyDown(sender, delKey)
     End Sub
 
-
 End Class

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -34,7 +34,7 @@ Public Class frmMDMDatenverarbetiung
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
         Select Case LIEFERANT
-            Case "PLOSE" : genSummenbericht_PLOSE()
+            Case "PLOSE" : genSummenbericht_PLOSE() : genSummenbericht_nachLand_PLOSE()
             Case "ASFINAG" : genSummenbericht_ASFINAG()
             Case "UTA" : genSummenbericht_UTA()
             Case "IDS" : genSummenbericht_IDS(17, cbxIDSmitVerag.Checked) : genSummenbericht_IDS(21, cbxIDSmitVerag.Checked)
@@ -303,6 +303,100 @@ Public Class frmMDMDatenverarbetiung
         print.Show()
     End Sub
 
+    Sub genSummenbericht_nachLand_PLOSE()
+        Dim displayFilter = False
+        Dim sqlstr As String = ""
+        sqlstr = "SELECT
+                    COUNT(*) AS Anzahl,
+                    [plInv_SupplierCountry],
+                    SUM([plInv_Nettobetrag])   AS plose_Nettobetrag,
+                    SUM([plInv_MWSTBetrag])    AS plose_MWSTBetrag,
+                    SUM([plInv_Bruttobetrag])  AS plose_Bruttobetrag,
+                    isnull([plInv_Currency],'EUR')            AS Währung
+                FROM [tblPLOSE_Inv_Data]
+                WHERE [plInv_SupplierRechnungsDatum] >= (
+                    SELECT MIN(plose_RechnungsDatum)
+                    FROM tblPLOSE_Details
+                    WHERE plose_DatumTransaktion BETWEEN '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'
+                      AND plose_Fakturiert = 0
+                      AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & ")
+                )
+                GROUP BY
+                    [plInv_SupplierCountry],
+                    [plInv_Currency]
+                ORDER BY
+                    [plInv_SupplierCountry]"
+
+
+        Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
+        'DataGridView.DataSource = dt
+
+
+        Dim print As New frmPrintLayout
+        print.Text = "PLOSE"
+
+        Dim rpt As New rptPLOSE_TransaktionenSumary
+
+        rpt.DataSource = dt
+
+
+        'If cbxProdukt.Checked Then
+        '    rpt.GroupHeader2.DataField = "prod_descr"
+        'Else
+        '    rpt.GroupHeader2.Visible = False
+        '    rpt.GroupFooter2.Visible = False
+        'End If
+
+
+
+        Dim sum = 0
+        rpt.lblUeberschrift.Text = "PLOSE Summenbericht nach Land " & dat_Sum_Von.Text & " bis " & dat_Sum_Bis.Text
+        rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
+        'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & "  /  " & PERSONAL.Niederlassung
+
+        'Dim cnt As Integer = 0
+        rpt.lblDat.Text = Now.ToLongDateString
+
+
+        Dim sumPreis As Double = 0
+        Dim sumNetto As Double = 0
+        Dim sumMWST As Double = 0
+        Dim sumBrutto As Double = 0
+        Dim sumMenge As Double = 0
+
+        AddHandler rpt.Detail.Format, Sub()
+                                          '   rpt.lblProduktBeschreibung.Text = isDbnullEmpty(rpt.Fields.Item("BC_DESCR").Value, "")
+                                          rpt.lblAnzahl.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Anzahl").Value, "")
+                                          rpt.lblProdukt.Text = SQL.isDbnullEmpty(rpt.Fields.Item("plInv_SupplierCountry").Value, "")
+                                          rpt.lblMenge.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Währung").Value, "")
+                                          ' rpt.lblPreis.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Preis").Value, 2, "")
+                                          rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Nettobetrag").Value, 2, "")
+                                          rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_MWSTBetrag").Value, 2, "")
+                                          rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Bruttobetrag").Value, 2, "")
+
+
+
+                                          sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Nettobetrag").Value, 4, 0)
+                                          sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_MWSTBetrag").Value, 4, 0)
+                                          sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Bruttobetrag").Value, 4, 0)
+
+                                      End Sub
+
+
+        AddHandler rpt.ReportFooter1.Format, Sub()
+                                                 rpt.lblSumMenge.Text = sumMenge.ToString("N0")
+                                                 'rpt.lblSumPreis.Text = sumPreis.ToString("N2")
+                                                 rpt.lblSumNetto.Text = sumNetto.ToString("N2")
+                                                 rpt.lblSumMwst.Text = sumMWST.ToString("N2")
+                                                 rpt.lblSumBrutto.Text = sumBrutto.ToString("N2")
+
+                                             End Sub
+
+        print.Viewer.LoadDocument(rpt)
+        print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
+        print.Show()
+    End Sub
+
     Sub genSummenbericht_ASFINAG()
         Dim displayFilter = False
         Dim sqlstr As String = ""

SDL/mdm/usrCntlMDMAuswertungen.Designer.vb

@@ -127,6 +127,18 @@ Partial Class usrCntlMDMAuswertungen
         Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label36 = New System.Windows.Forms.Label()
         Me.TabPage3 = New System.Windows.Forms.TabPage()
+        Me.Label66 = New System.Windows.Forms.Label()
+        Me.GroupBox20 = New System.Windows.Forms.GroupBox()
+        Me.cbxNurUnter50EUR = New System.Windows.Forms.CheckBox()
+        Me.cboQuartal = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.txtLeistungsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label67 = New System.Windows.Forms.Label()
+        Me.PictureBox7 = New System.Windows.Forms.PictureBox()
+        Me.Label45 = New System.Windows.Forms.Label()
+        Me.Label64 = New System.Windows.Forms.Label()
+        Me.Label65 = New System.Windows.Forms.Label()
+        Me.Button20 = New System.Windows.Forms.Button()
         Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg()
         Me.tbIDS = New System.Windows.Forms.TabPage()
         Me.Label62 = New System.Windows.Forms.Label()
@@ -168,6 +180,7 @@ Partial Class usrCntlMDMAuswertungen
         Me.TabPage5 = New System.Windows.Forms.TabPage()
         Me.Label56 = New System.Windows.Forms.Label()
         Me.GroupBox17 = New System.Windows.Forms.GroupBox()
+        Me.cbxExcel = New System.Windows.Forms.CheckBox()
         Me.Label55 = New System.Windows.Forms.Label()
         Me.Button16 = New System.Windows.Forms.Button()
         Me.Label53 = New System.Windows.Forms.Label()
@@ -209,6 +222,8 @@ Partial Class usrCntlMDMAuswertungen
         Me.GroupBox9.SuspendLayout()
         CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TabPage3.SuspendLayout()
+        Me.GroupBox20.SuspendLayout()
+        CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.tbIDS.SuspendLayout()
         Me.GroupBox13.SuspendLayout()
         Me.GroupBox18.SuspendLayout()
@@ -1405,6 +1420,8 @@ Partial Class usrCntlMDMAuswertungen
         '
         'TabPage3
         '
+        Me.TabPage3.Controls.Add(Me.Label66)
+        Me.TabPage3.Controls.Add(Me.GroupBox20)
         Me.TabPage3.Controls.Add(Me.UsrCntlWoelfl_IM_CSVRg1)
         Me.TabPage3.Controls.Add(Me.Label4)
         Me.TabPage3.Controls.Add(Me.GroupBox2)
@@ -1415,10 +1432,166 @@ Partial Class usrCntlMDMAuswertungen
         Me.TabPage3.Text = "WÖLFL"
         Me.TabPage3.UseVisualStyleBackColor = True
         '
+        'Label66
+        '
+        Me.Label66.AutoSize = True
+        Me.Label66.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label66.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Me.Label66.Location = New System.Drawing.Point(9, 136)
+        Me.Label66.Name = "Label66"
+        Me.Label66.Size = New System.Drawing.Size(347, 17)
+        Me.Label66.TabIndex = 15
+        Me.Label66.Text = "Wölfl Rechnungen Bearbeitungsbetrag Quartal"
+        '
+        'GroupBox20
+        '
+        Me.GroupBox20.Controls.Add(Me.cbxNurUnter50EUR)
+        Me.GroupBox20.Controls.Add(Me.cboQuartal)
+        Me.GroupBox20.Controls.Add(Me.txtLeistungsNr)
+        Me.GroupBox20.Controls.Add(Me.txtJahr)
+        Me.GroupBox20.Controls.Add(Me.Label67)
+        Me.GroupBox20.Controls.Add(Me.PictureBox7)
+        Me.GroupBox20.Controls.Add(Me.Label45)
+        Me.GroupBox20.Controls.Add(Me.Label64)
+        Me.GroupBox20.Controls.Add(Me.Label65)
+        Me.GroupBox20.Controls.Add(Me.Button20)
+        Me.GroupBox20.Location = New System.Drawing.Point(6, 153)
+        Me.GroupBox20.Name = "GroupBox20"
+        Me.GroupBox20.Size = New System.Drawing.Size(697, 111)
+        Me.GroupBox20.TabIndex = 14
+        Me.GroupBox20.TabStop = False
+        '
+        'cbxNurUnter50EUR
+        '
+        Me.cbxNurUnter50EUR.AutoSize = True
+        Me.cbxNurUnter50EUR.Checked = True
+        Me.cbxNurUnter50EUR.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxNurUnter50EUR.Location = New System.Drawing.Point(391, 46)
+        Me.cbxNurUnter50EUR.Name = "cbxNurUnter50EUR"
+        Me.cbxNurUnter50EUR.Size = New System.Drawing.Size(111, 17)
+        Me.cbxNurUnter50EUR.TabIndex = 17
+        Me.cbxNurUnter50EUR.Text = "Nur unter 50 EUR"
+        Me.cbxNurUnter50EUR.UseVisualStyleBackColor = True
+        '
+        'cboQuartal
+        '
+        Me.cboQuartal._allowedValuesFreiText = Nothing
+        Me.cboQuartal._allowFreiText = False
+        Me.cboQuartal._value = ""
+        Me.cboQuartal.FormattingEnabled = True
+        Me.cboQuartal.Location = New System.Drawing.Point(306, 46)
+        Me.cboQuartal.Name = "cboQuartal"
+        Me.cboQuartal.Size = New System.Drawing.Size(59, 21)
+        Me.cboQuartal.TabIndex = 16
+        '
+        'txtLeistungsNr
+        '
+        Me.txtLeistungsNr._DateTimeOnly = False
+        Me.txtLeistungsNr._numbersOnly = False
+        Me.txtLeistungsNr._numbersOnlyKommastellen = ""
+        Me.txtLeistungsNr._numbersOnlyTrennzeichen = True
+        Me.txtLeistungsNr._Prozent = False
+        Me.txtLeistungsNr._ShortDateNew = False
+        Me.txtLeistungsNr._ShortDateOnly = False
+        Me.txtLeistungsNr._TimeOnly = False
+        Me.txtLeistungsNr._TimeOnly_Seconds = False
+        Me.txtLeistungsNr._value = "327"
+        Me.txtLeistungsNr._Waehrung = False
+        Me.txtLeistungsNr._WaehrungZeichen = True
+        Me.txtLeistungsNr.ForeColor = System.Drawing.Color.Black
+        Me.txtLeistungsNr.Location = New System.Drawing.Point(306, 73)
+        Me.txtLeistungsNr.MaxLineLength = -1
+        Me.txtLeistungsNr.MaxLines_Warning = ""
+        Me.txtLeistungsNr.MaxLines_Warning_Label = Nothing
+        Me.txtLeistungsNr.Name = "txtLeistungsNr"
+        Me.txtLeistungsNr.Size = New System.Drawing.Size(141, 20)
+        Me.txtLeistungsNr.TabIndex = 15
+        Me.txtLeistungsNr.Text = "327"
+        '
+        'txtJahr
+        '
+        Me.txtJahr._DateTimeOnly = False
+        Me.txtJahr._numbersOnly = False
+        Me.txtJahr._numbersOnlyKommastellen = ""
+        Me.txtJahr._numbersOnlyTrennzeichen = True
+        Me.txtJahr._Prozent = False
+        Me.txtJahr._ShortDateNew = False
+        Me.txtJahr._ShortDateOnly = False
+        Me.txtJahr._TimeOnly = False
+        Me.txtJahr._TimeOnly_Seconds = False
+        Me.txtJahr._value = ""
+        Me.txtJahr._Waehrung = False
+        Me.txtJahr._WaehrungZeichen = True
+        Me.txtJahr.ForeColor = System.Drawing.Color.Black
+        Me.txtJahr.Location = New System.Drawing.Point(185, 47)
+        Me.txtJahr.MaxLineLength = -1
+        Me.txtJahr.MaxLines_Warning = ""
+        Me.txtJahr.MaxLines_Warning_Label = Nothing
+        Me.txtJahr.Name = "txtJahr"
+        Me.txtJahr.Size = New System.Drawing.Size(53, 20)
+        Me.txtJahr.TabIndex = 13
+        '
+        'Label67
+        '
+        Me.Label67.AutoSize = True
+        Me.Label67.Location = New System.Drawing.Point(145, 80)
+        Me.Label67.Name = "Label67"
+        Me.Label67.Size = New System.Drawing.Size(155, 13)
+        Me.Label67.TabIndex = 12
+        Me.Label67.Text = "LeistungsNr (Komma-getrennt).:"
+        '
+        'PictureBox7
+        '
+        Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.woelfl
+        Me.PictureBox7.Location = New System.Drawing.Point(640, 8)
+        Me.PictureBox7.Name = "PictureBox7"
+        Me.PictureBox7.Size = New System.Drawing.Size(51, 37)
+        Me.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.PictureBox7.TabIndex = 11
+        Me.PictureBox7.TabStop = False
+        '
+        'Label45
+        '
+        Me.Label45.AutoSize = True
+        Me.Label45.Location = New System.Drawing.Point(249, 50)
+        Me.Label45.Name = "Label45"
+        Me.Label45.Size = New System.Drawing.Size(44, 13)
+        Me.Label45.TabIndex = 10
+        Me.Label45.Text = "Quartal:"
+        '
+        'Label64
+        '
+        Me.Label64.AutoSize = True
+        Me.Label64.Location = New System.Drawing.Point(145, 50)
+        Me.Label64.Name = "Label64"
+        Me.Label64.Size = New System.Drawing.Size(27, 13)
+        Me.Label64.TabIndex = 8
+        Me.Label64.Text = "Jahr"
+        '
+        'Label65
+        '
+        Me.Label65.AutoSize = True
+        Me.Label65.Location = New System.Drawing.Point(145, 19)
+        Me.Label65.Name = "Label65"
+        Me.Label65.Size = New System.Drawing.Size(373, 13)
+        Me.Label65.TabIndex = 5
+        Me.Label65.Text = "Alle Woelfl-Kunden, deren Bearbeitungsbetrag pro Quartal unter 50 EUR liegt."
+        '
+        'Button20
+        '
+        Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button20.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Button20.Location = New System.Drawing.Point(6, 19)
+        Me.Button20.Name = "Button20"
+        Me.Button20.Size = New System.Drawing.Size(121, 49)
+        Me.Button20.TabIndex = 4
+        Me.Button20.Text = "CSV erstellen"
+        Me.Button20.UseVisualStyleBackColor = True
+        '
         'UsrCntlWoelfl_IM_CSVRg1
         '
         Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167)
+        Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(12, 292)
         Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1"
         Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97)
         Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10
@@ -1839,6 +2012,7 @@ Partial Class usrCntlMDMAuswertungen
         '
         'GroupBox17
         '
+        Me.GroupBox17.Controls.Add(Me.cbxExcel)
         Me.GroupBox17.Controls.Add(Me.Label55)
         Me.GroupBox17.Controls.Add(Me.Button16)
         Me.GroupBox17.Location = New System.Drawing.Point(6, 367)
@@ -1847,6 +2021,18 @@ Partial Class usrCntlMDMAuswertungen
         Me.GroupBox17.TabIndex = 13
         Me.GroupBox17.TabStop = False
         '
+        'cbxExcel
+        '
+        Me.cbxExcel.AutoSize = True
+        Me.cbxExcel.Checked = True
+        Me.cbxExcel.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxExcel.Location = New System.Drawing.Point(150, 36)
+        Me.cbxExcel.Name = "cbxExcel"
+        Me.cbxExcel.Size = New System.Drawing.Size(68, 17)
+        Me.cbxExcel.TabIndex = 56
+        Me.cbxExcel.Text = "als Excel"
+        Me.cbxExcel.UseVisualStyleBackColor = True
+        '
         'Label55
         '
         Me.Label55.AutoSize = True
@@ -2109,6 +2295,9 @@ Partial Class usrCntlMDMAuswertungen
         CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
         Me.TabPage3.ResumeLayout(False)
         Me.TabPage3.PerformLayout()
+        Me.GroupBox20.ResumeLayout(False)
+        Me.GroupBox20.PerformLayout()
+        CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
         Me.tbIDS.ResumeLayout(False)
         Me.tbIDS.PerformLayout()
         Me.GroupBox13.ResumeLayout(False)
@@ -2306,4 +2495,17 @@ Partial Class usrCntlMDMAuswertungen
     Friend WithEvents PictureBox6 As PictureBox
     Friend WithEvents Label63 As Label
     Friend WithEvents Button19 As Button
+    Friend WithEvents cbxExcel As CheckBox
+    Friend WithEvents Label66 As Label
+    Friend WithEvents GroupBox20 As GroupBox
+    Friend WithEvents PictureBox7 As PictureBox
+    Friend WithEvents Label45 As Label
+    Friend WithEvents Label64 As Label
+    Friend WithEvents Label65 As Label
+    Friend WithEvents Button20 As Button
+    Friend WithEvents txtJahr As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label67 As Label
+    Friend WithEvents txtLeistungsNr As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents cboQuartal As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxNurUnter50EUR As CheckBox
 End Class

SDL/mdm/usrCntlMDMAuswertungen.vb

@@ -56,6 +56,18 @@ Public Class usrCntlMDMAuswertungen
         cboIDSDateType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Leistungsdatum", "LDat"))
         cboIDSDateType.changeItem("RGDat")
 
+        txtJahr.Text = Now.Year
+
+        cboQuartal.Items.Clear()
+        cboQuartal.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1", "1"))
+        cboQuartal.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("2", "2"))
+        cboQuartal.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3", "3"))
+        cboQuartal.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("4", "4"))
+        cboQuartal.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" ", " "))
+        cboQuartal.changeItem(" ")
+
+        txtLeistungsNr.Text = "327"
+
         If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Auswertungen_IDS", Me.FindForm) Then
             tbcntr.TabPages.Remove(tbIDS)
         End If
@@ -1342,6 +1354,11 @@ Public Class usrCntlMDMAuswertungen
                 Exit Sub
             End If
 
+            If cbxExcel.Checked Then
+
+                VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt)
+            Else
+
                 dgv.DataSource = dt
 
                 If dgv IsNot Nothing Then
@@ -1357,77 +1374,7 @@ Public Class usrCntlMDMAuswertungen
                 End If
 
 
-
+            End If
-            'Dim print As New frmPrintLayout
-            'print.Text = "ASFINAG"
-
-            'Dim rpt As New rptASFINAG_TransaktionenSumary
-
-            'rpt.DataSource = dt
-
-
-
-
-
-            'Dim sum = 0
-            'rpt.lblUeberschrift.Text = "ASFINAG Transaktionssummen " & CDate(dat_Sum_Bis.Value.ToShortDateString)
-            'rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
-
-            'rpt.Label10.Visible = False
-            'Label1.Text = "Dateiname"
-            'Label8.Text = "Erstellungsdatum"
-            ''Dim cnt As Integer = 0
-            'rpt.lblDat.Text = Now.ToLongDateString
-
-
-
-
-
-            'Dim sumNetto As Double = 0
-            'Dim sumMWST As Double = 0
-            'Dim sumBrutto As Double = 0
-
-            'Dim sumperKdNrNetto As Double = 0
-            'Dim sumperKdNrMWST As Double = 0
-            'Dim sumperKdNrBrutto As Double = 0
-
-
-            'AddHandler rpt.Detail.Format, Sub()
-
-
-            '                                  rpt.lblKundennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("PKFileName").Value, "")
-            '                                  rpt.lblName1.Text = SQL.isDbnullEmpty(rpt.Fields.Item("FileCreationDate").Value, "")
-            '                                  rpt.lblKartennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Abrechnungsdatum").Value, "")
-
-            '                                  rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 2, "")
-            '                                  rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Umsatzsteuer").Value, 2, "")
-            '                                  rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Bruttobetrag").Value, 2, "")
-
-
-            '                                  rpt.lblSumNet.Visible = False
-            '                                  rpt.lblSumVat.Visible = False
-            '                                  rpt.lblSumBrt.Visible = False
-
-            '                                  sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 4, 0)
-            '                                  sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Umsatzsteuer").Value, 4, 0)
-            '                                  sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Bruttobetrag").Value, 4, 0)
-
-
-            '                              End Sub
-
-
-            'AddHandler rpt.ReportFooter1.Format, Sub()
-
-            '                                         rpt.lblSumNetto.Text = sumNetto.ToString("N2")
-            '                                         rpt.lblSumMwst.Text = sumMWST.ToString("N2")
-            '                                         rpt.lblSumBrutto.Text = sumBrutto.ToString("N2")
-
-            '                                     End Sub
-
-            'print.Viewer.LoadDocument(rpt)
-            'print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
-            'print.Show()
-
 
         Catch ex As System.Exception
 
@@ -1570,6 +1517,37 @@ Public Class usrCntlMDMAuswertungen
 
 
     End Sub
+
+    Private Sub Button20_Click_1(sender As Object, e As EventArgs) Handles Button20.Click
+
+        Try
+
+
+            Me.Cursor = Cursors.WaitCursor
+
+            Dim Jahr As Integer = Now().Year
+
+            If txtJahr.Text <> "" AndAlso IsNumeric(txtJahr.Text) AndAlso txtJahr.Text.Length = 4 Then
+                Jahr = txtJahr.Text
+            End If
+
+            Dim rmc As cRMC
+            Dim dt = rmc.getRMCQuartalsAbrechnungen(New VERAG_PROG_ALLGEMEIN.SQL, IIf(cboQuartal._value.Trim() <> "", cboQuartal._value.Trim(), 0), Jahr, txtLeistungsNr.Text,,, cbxNurUnter50EUR.Checked)
+
+            If dt.Rows.Count > 0 Then
+                cProgramFunctions.genExcelFromDT_NEW(dt)
+            Else
+                MsgBox("keine Daten für ausgewählten Zeitraum")
+            End If
+
+
+        Catch ex As System.Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+
+        Me.Cursor = Cursors.Default
+
+    End Sub
 End Class
 
 

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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 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()
@@ -37,7 +37,6 @@ Partial Class usrcntlFremdrechnungen
         Me.btnSDL_PLOSE = New System.Windows.Forms.Button()
         Me.btnSDL_RMC = New System.Windows.Forms.Button()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.KundenblattAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.cbxTest = New System.Windows.Forms.CheckBox()
         Me.Label7 = New System.Windows.Forms.Label()
@@ -66,10 +65,7 @@ Partial Class usrcntlFremdrechnungen
         Me.dgvLFRechnung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.dgvDetails = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel4 = New System.Windows.Forms.Panel()
-        Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.FlowLayoutPanel.SuspendLayout()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.Panel1.SuspendLayout()
@@ -81,14 +77,14 @@ Partial Class usrcntlFremdrechnungen
         CType(Me.dgvLFRechnung, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvDetails, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel4.SuspendLayout()
-        Me.cntxtExcel.SuspendLayout()
         Me.SuspendLayout()
         '
         'DetailsAnzeigenToolStripMenuItem
         '
+        Me.DetailsAnzeigenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.pdf
         Me.DetailsAnzeigenToolStripMenuItem.Name = "DetailsAnzeigenToolStripMenuItem"
-        Me.DetailsAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(189, 22)
+        Me.DetailsAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(154, 22)
-        Me.DetailsAnzeigenToolStripMenuItem.Text = "Details anzeigen"
+        Me.DetailsAnzeigenToolStripMenuItem.Text = "PDF hochladen"
         '
         'FlowLayoutPanel
         '
@@ -268,15 +264,9 @@ Partial Class usrcntlFremdrechnungen
         '
         'ContextMenuStrip1
         '
-        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DetailsAnzeigenToolStripMenuItem, Me.KundenblattAnzeigenToolStripMenuItem})
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DetailsAnzeigenToolStripMenuItem, Me.PDFLöschenToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(190, 48)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(155, 48)
-        '
-        'KundenblattAnzeigenToolStripMenuItem
-        '
-        Me.KundenblattAnzeigenToolStripMenuItem.Name = "KundenblattAnzeigenToolStripMenuItem"
-        Me.KundenblattAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(189, 22)
-        Me.KundenblattAnzeigenToolStripMenuItem.Text = "Kundenblatt anzeigen"
         '
         'Panel1
         '
@@ -489,7 +479,7 @@ Partial Class usrcntlFremdrechnungen
         Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(5, 322)
+        Me.Button1.Location = New System.Drawing.Point(11, 322)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(50, 44)
         Me.Button1.TabIndex = 45
@@ -606,8 +596,8 @@ Partial Class usrcntlFremdrechnungen
         Me.dgvLFRechnung.AllowUserToDeleteRows = False
         Me.dgvLFRechnung.AllowUserToResizeColumns = False
         Me.dgvLFRechnung.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle3.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
         Me.dgvLFRechnung.BackgroundColor = System.Drawing.Color.White
         Me.dgvLFRechnung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvLFRechnung.Location = New System.Drawing.Point(4, 3)
@@ -624,8 +614,8 @@ Partial Class usrcntlFremdrechnungen
         Me.dgvDetails.AllowUserToDeleteRows = False
         Me.dgvDetails.AllowUserToResizeColumns = False
         Me.dgvDetails.AllowUserToResizeRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle4.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
         Me.dgvDetails.BackgroundColor = System.Drawing.Color.White
         Me.dgvDetails.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvDetails.Location = New System.Drawing.Point(-1, 3)
@@ -644,29 +634,12 @@ Partial Class usrcntlFremdrechnungen
         Me.Panel4.Size = New System.Drawing.Size(1356, 108)
         Me.Panel4.TabIndex = 11
         '
-        'cntxtExcel
+        'PDFLöschenToolStripMenuItem
         '
-        Me.cntxtExcel.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem3, Me.ToolStripMenuItem6})
+        Me.PDFLöschenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.del
-        Me.cntxtExcel.Name = "cntxtExcel"
+        Me.PDFLöschenToolStripMenuItem.Name = "PDFLöschenToolStripMenuItem"
-        Me.cntxtExcel.Size = New System.Drawing.Size(211, 48)
+        Me.PDFLöschenToolStripMenuItem.Size = New System.Drawing.Size(154, 22)
-        Me.cntxtExcel.Text = "Excel"
+        Me.PDFLöschenToolStripMenuItem.Text = "PDF löschen"
-        '
-        'ToolStripMenuItem3
-        '
-        Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
-        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(210, 22)
-        Me.ToolStripMenuItem3.Text = "Einfach"
-        '
-        'ToolStripMenuItem6
-        '
-        Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
-        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(210, 22)
-        Me.ToolStripMenuItem6.Text = "Formatiert (dauert länger)"
-        '
-        'ContextMenuStrip2
-        '
-        Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
-        Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
         '
         'usrcntlFremdrechnungen
         '
@@ -689,7 +662,6 @@ Partial Class usrcntlFremdrechnungen
         CType(Me.dgvLFRechnung, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.dgvDetails, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Panel4.ResumeLayout(False)
-        Me.cntxtExcel.ResumeLayout(False)
         Me.ResumeLayout(False)
 
     End Sub
@@ -702,7 +674,6 @@ Partial Class usrcntlFremdrechnungen
     Friend WithEvents btnSDL_FREJUS As System.Windows.Forms.Button
     Friend WithEvents btnSDL_Hugo As System.Windows.Forms.Button
     Friend WithEvents ContextMenuStrip1 As System.Windows.Forms.ContextMenuStrip
-    Friend WithEvents KundenblattAnzeigenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents Panel1 As System.Windows.Forms.Panel
     Friend WithEvents Button8 As System.Windows.Forms.Button
     Friend WithEvents Label3 As System.Windows.Forms.Label
@@ -710,9 +681,6 @@ Partial Class usrcntlFremdrechnungen
     Friend WithEvents Panel3 As System.Windows.Forms.Panel
     Friend WithEvents SplitContainer1 As System.Windows.Forms.SplitContainer
     Friend WithEvents Button4 As System.Windows.Forms.Button
-    Friend WithEvents cntxtExcel As System.Windows.Forms.ContextMenuStrip
-    Friend WithEvents ToolStripMenuItem3 As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents ToolStripMenuItem6 As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents lblEinträge As System.Windows.Forms.Label
     Friend WithEvents cbxMax1000Eintrage As System.Windows.Forms.CheckBox
     Friend WithEvents Button1 As System.Windows.Forms.Button
@@ -736,6 +704,6 @@ Partial Class usrcntlFremdrechnungen
     Friend WithEvents txtKundenNrbis As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents txtKundenNrvon As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label6 As Label
-    Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
     Friend WithEvents cbxTest As CheckBox
+    Friend WithEvents PDFLöschenToolStripMenuItem As ToolStripMenuItem
 End Class

SDL/mdm/usrcntlFremdrechnungen.resx

@@ -120,10 +120,4 @@
   <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="cntxtExcel.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>807, 17</value>
-  </metadata>
-  <metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>913, 17</value>
-  </metadata>
 </root>

SDL/mdm/usrcntlFremdrechnungen.vb

@@ -1,4 +1,6 @@
 Imports System.Reflection
+Imports com.sun.tools.corba.se.idl
+Imports DocumentFormat.OpenXml.VariantTypes
 Imports Microsoft.Office.Interop
 Imports VERAG_PROG_ALLGEMEIN
 
@@ -1195,13 +1197,13 @@ Public Class usrcntlFremdrechnungen
 
     End Sub
 
-    Private Sub ToolStripMenuItem3_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem3.Click
+    Private Sub ToolStripMenuItem3_Click(sender As Object, e As EventArgs)
         Me.Cursor = Cursors.WaitCursor
         cProgramFunctions.genExcelFromDGV(dgvLFRechnung, True)
         Me.Cursor = Cursors.Default
     End Sub
 
-    Private Sub ToolStripMenuItem6_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem6.Click
+    Private Sub ToolStripMenuItem6_Click(sender As Object, e As EventArgs)
         Me.Cursor = Cursors.WaitCursor
         cProgramFunctions.genExcelFromDGV_NEW(dgvLFRechnung, True)
         Me.Cursor = Cursors.Default
@@ -1554,4 +1556,76 @@ Public Class usrcntlFremdrechnungen
         End If
     End Sub
 
+    Private Sub ContextMenuStrip2_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs)
+
+    End Sub
+
+    Private Sub DetailsAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DetailsAnzeigenToolStripMenuItem.Click
+
+        If dgvLFRechnung.CurrentRow.Cells("daId").Value Is Nothing Or IsDBNull(dgvLFRechnung.CurrentRow.Cells("daId").Value) Then
+
+
+
+
+            Dim ReNr As String = dgvLFRechnung.SelectedRows(0).Cells("Rechnungsnummer").Value
+            Dim ReDat As String = dgvLFRechnung.SelectedRows(0).Cells("Rechnungsdatum").Value
+            Dim interneKundenNr As String = dgvLFRechnung.SelectedRows(0).Cells("AdressenNr").Value
+            Dim KundenNr As String = dgvLFRechnung.SelectedRows(0).Cells("Kundennummer").Value
+            Dim LieferlandISO2 As String = dgvLFRechnung.SelectedRows(0).Cells("Land").Value
+
+            If LieferlandISO2 = "" Then MsgBox("Land kann nicht ermittelt werden") : Exit Sub
+            If KundenNr = "" OrElse Not IsNumeric(KundenNr) Then MsgBox("KundenNr kann nicht ermittelt werden") : Exit Sub
+            If ReDat = "" OrElse Not IsDate(ReDat) Then MsgBox("Rechnungsdatum kann nicht ermittelt werden") : Exit Sub
+            If interneKundenNr = "" OrElse Not IsNumeric(interneKundenNr) Then MsgBox("KundenNr kann nicht ermittelt werden") : Exit Sub
+
+            Select Case aktLieferant
+
+                Case "UTA"
+                    Dim DS_Import As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", aktLieferant & "_MANUELL", Now.Year, interneKundenNr, interneKundenNr & "_" & ReNr & "_" & LieferlandISO2)
+
+                    If DS_Import.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then
+                        SQL.doSQL("Update [tblUTAImportNew] SET [daId]=" & DS_Import.da_id & ", daIdgesetztDatum = getdate(), PDFsetmanually = getdate() where Rechnungsnummer_pro_Lieferland = '" & ReNr & "' AND cast(Rechnungsdatum as Date) = '" & CDate(ReDat).ToShortDateString & "' AND Kundennummer =" & KundenNr & " and Lieferland_ISO2 ='" & LieferlandISO2 & "'  and daId is null", "FMZOLL")
+                        MsgBox("Dokument gesetzt! -> " & ReNr & " " & CDate(ReDat).ToShortDateString)
+                        SET_SDL(aktLieferant)
+                    End If
+
+                Case Else
+
+                    MsgBox("Funktion nicht implementiert!")
+
+            End Select
+
+        End If
+
+    End Sub
+
+    Private Sub dgvLFRechnung_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvLFRechnung.CellMouseClick
+
+
+        If e.RowIndex < 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
+        If e.ColumnIndex < 0 Then Exit Sub
+
+        DirectCast(sender, DataGridView).Rows(e.RowIndex).Selected = True
+        If e.Button = MouseButtons.Right Then
+
+            If dgvLFRechnung.SelectedCells.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
+            dgvLFRechnung.CurrentCell = dgvLFRechnung.Rows(e.RowIndex).Cells(e.ColumnIndex)
+
+
+            If dgvLFRechnung.CurrentRow.Cells("daId").Value Is Nothing Or IsDBNull(dgvLFRechnung.CurrentRow.Cells("daId").Value) Then
+
+                DetailsAnzeigenToolStripMenuItem.Visible = True
+            Else
+
+                DetailsAnzeigenToolStripMenuItem.Visible = False
+            End If
+
+
+            ContextMenuStrip1.Show(Cursor.Position)
+
+        End If
+
+
+
+    End Sub
 End Class

SDL/seriendruck/usrCntlFakturierung.vb

@@ -199,13 +199,32 @@ Public Class usrcntlFakturierung
             Select Case res
                 Case MsgBoxResult.Yes : SQL.doSQL("update [Rechnungsausgang] set Abfertigungsdatum = '" & rechnungsdatum & "' WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) <> '" & rechnungsdatum & "'", "FMZOLL")
                 Case MsgBoxResult.No
-                Case MsgBoxResult.Cancel : Exit Sub
+                Case MsgBoxResult.Cancel : MsgBox("Rechnungslauf wird abgebrochen!") : Exit Sub
             End Select
 
 
         End If
 
 
+        'START--------------------------- Zur Sicherheit!! - Kann ab nächsten Sammelrechnunsglauf deaktiviert werden! - 21.01.2026
+        Dim rechnungenMitRE_KZ As Integer = CInt((New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) FROM Rechnungsausgang
+                        WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "' AND Rechnungsart <> 'RG' ", "FMZOLL",, 0))
+
+        If rechnungenMitAbwAbfDat > 0 Then
+            Dim res As MsgBoxResult
+            res = MsgBox("Es gibt noch " & rechnungenMitRE_KZ & " Rechnungen deren Rechnungsart nicht auf Standard-Rechnung gesetzt ist" & vbNewLine & "Möchten Sie fortfahren (Rechnungsart wird auf Standard gesetzt) ?", vbYesNoCancel)
+            Select Case res
+                Case MsgBoxResult.Yes : SQL.doSQL("update [Rechnungsausgang] set Rechnungsart = 'RG' WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "' AND Rechnungsart <> 'RG' ", "FMZOLL")
+                Case MsgBoxResult.No
+                Case MsgBoxResult.Cancel : MsgBox("Rechnungslauf wird abgebrochen!") : Exit Sub
+            End Select
+
+
+        End If
+
+        'ENDE---------------------------
+
+
 
         Dim rechnungenMitGesamtmautanhangCSV As String = (New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) FROM Rechnungsausgang
                         inner join RechnungsausgangAnhaenge on Rechnungsausgang.RK_ID = RechnungsausgangAnhaenge.RK_ID
@@ -240,7 +259,7 @@ Public Class usrcntlFakturierung
 
 
         If Not vbYes = MsgBox("Möchten Sie mit der Erstellung der  " & dtREGU.Rows.Count & " Sammelrechnungen vorfahren?", vbYesNoCancel) Then
-            Exit Sub
+            MsgBox("Rechnungslauf wird abgebrochen!") : Exit Sub
         End If
 
         'RECHNUNG ODER GUTSCHRIFT
@@ -1180,14 +1199,16 @@ Public Class usrcntlFakturierung
 
         If dtSammelrechnungenGruppiert.Rows.Count > 0 Then
 
-            If Not vbYes = MsgBox("Möchten Sie die Rechnungsnummern für " & dtSammelrechnungenGruppiert.Rows.Count & " Rechnungen setzen?" & vbNewLine & "Es wird eine Rechnungsnummer vergeben, die Rechnungen gelten somit als gedruckt und können nicht mehr bearbeitet werden.", vbYesNoCancel) Then Exit Sub
+            If Not vbYes = MsgBox("Möchten Sie die Rechnungsnummern für " & dtSammelrechnungenGruppiert.Rows.Count & " Rechnungen setzen?" & vbNewLine & "Es wird eine Rechnungsnummer vergeben, die Rechnungen gelten somit als gedruckt und können nicht mehr bearbeitet werden.", vbYesNoCancel) Then
+                MsgBox("Rechnungslauf wird abgebrochen!") : Exit Sub
+            End If
 
             Dim reNrisSet = setStatus2(Sachbearbeiter, rechnungsdatum, dtSammelrechnungenGruppiert, cbxStatusAUTOMAIL.Checked)
 
             showPic(reNrisSet, PictureBox8)
 
             If Not reNrisSet Then
-                MsgBox("Fehler beim Setzen der Rechnungsnummer" & vbNewLine & "Vorgang wird abgebrochen!")
+                MsgBox("Fehler beim Setzen der Rechnungsnummer" & vbNewLine & "Rechnungslauf wird abgebrochen!")
                 Exit Sub
             End If
 

VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb

@@ -663,6 +663,26 @@ Public Class cIDS
         Return ""
     End Function
 
+    Public Shared Function checkInvoices() As DataTable
+        Try
+            Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+
+
+            Dim SQLstr = "select *  from tblIDSInvoicesNew where invoice_id not in (select TotalInvoiceId from tblIDSInvoicesNewSplittedByCountry) and Year(YearMonthDay) >= 2025"
+
+            Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
+
+            Return dt
+
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+
+        Return Nothing
+
+    End Function
+
 
     Public Class Paramter
 

VERAG_PROG_ALLGEMEIN/Classes/cKundenKontakte.vb

@@ -105,6 +105,8 @@ Public Class cKundenKontakte
     Property kkd_Firmenname As Object = Nothing
     Property kkd_Geburtsort As Object = Nothing
     Property kkd_Geburtsland As Object = Nothing
+    Property kkd_letzteAenderungUser As String
+    Property kkd_letzteAenderung As DateTime
 
     Public hasEntry = False
 
@@ -155,6 +157,8 @@ Public Class cKundenKontakte
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_Firmenname", kkd_Firmenname))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_Geburtsort", kkd_Geburtsort))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_Geburtsland", kkd_Geburtsland))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_letzteAenderungUser", kkd_letzteAenderungUser))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_letzteAenderung", kkd_letzteAenderung))
 
 
         Return list

VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb

@@ -999,7 +999,7 @@ Public Class cMDMFunctionsAllgemein
                     Dim merged As Boolean = False
 
                     If DS.DATA_LIST.coll_daId > 0 Then
-                        For Each L As cDatenarchiv_Collection In DS.DATA_LIST.LIST
+                        For Each L As cDatenarchiv_Collection In DS.DATA_LIST.LIST.OrderBy(Function(dgvr) dgvr.coll_date)
                             If L.coll_pfad <> "" Then PathList.Add(L.coll_pfad)
                         Next
 
@@ -1155,6 +1155,11 @@ Public Class cMDMFunctionsAllgemein
                 Dim AD As New cAdressen(USTV_ANTRAG.UStVAn_KuNr)
                 If Antrag_LandKz <> "" Then
                     header1 = "Statement itemising VAT amounts relating to the period covered by this application"
+
+                    If USTV_ANTRAG.UStVAn_ReDatVon IsNot Nothing AndAlso IsDate(USTV_ANTRAG.UStVAn_ReDatVon) AndAlso USTV_ANTRAG.UStVAn_ReDatBis IsNot Nothing AndAlso IsDate(USTV_ANTRAG.UStVAn_ReDatBis) Then
+                        header1 &= " (" & CDate(USTV_ANTRAG.UStVAn_ReDatVon).ToShortDateString & " - " & CDate(USTV_ANTRAG.UStVAn_ReDatBis).ToShortDateString & ")"
+                    End If
+
                     header2 = "VAT NO.: " & USTV_ANTRAG.UStVAn_Steuernummer & "    " & "Name/Company: " & AD.Name_1 & " " & AD.Name_2 & "   " & "VAT in " & Antrag_LandKz & ": " & SteuerNR
                     End If
 

VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb

@@ -1,6 +1,8 @@
 Imports System.Data.SqlClient
 Imports System.Reflection
 Imports System.Windows.Forms
+Imports com.sun.org.apache.xerces.internal.impl
+Imports com.sun.xml.internal.rngom
 
 Public Class cMessenger
 
@@ -405,16 +407,25 @@ Public Class cMessenger
             Try
                 Me.CHAT_MESSAGES.Clear()
                 Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN()
-                    Using cmd As New SqlCommand("SELECT * FROM(SELECT TOP " & top & " * FROM [tblMessenger_ChatMessages] WHERE chatMg_chatId=@chat_id  order by chatMg_datetime desc) as T order by chatMg_datetime asc", conn)
+                    ' Using cmd As New SqlCommand("SELECT chatMg_id,chatMg_chatId,chatMg_maId,chatMg_maName,chatMg_maFirma,chatMg_datetime,chatMg_type,chatMg_text,chatMg_anhang_docId,chatMg_referenz_AvisoId,chatMg_referenz_SendungsId,chatMg_referenz_KundenNr FROM(SELECT TOP " & top & " chatMg_id,chatMg_chatId,chatMg_maId,chatMg_maName,chatMg_maFirma,chatMg_datetime,chatMg_type,chatMg_text,chatMg_anhang_docId,chatMg_referenz_AvisoId,chatMg_referenz_SendungsId,chatMg_referenz_KundenNr FROM [tblMessenger_ChatMessages] WHERE chatMg_chatId=@chat_id  order by chatMg_datetime desc) as T order by chatMg_datetime asc", conn)
+
+                    Using cmd As New SqlCommand("SELECT TOP (@top) chatMg_id,chatMg_chatId,chatMg_maId,chatMg_maName,chatMg_maFirma,chatMg_datetime,chatMg_type,chatMg_text,chatMg_anhang_docId,chatMg_referenz_AvisoId,chatMg_referenz_SendungsId,chatMg_referenz_KundenNr FROM tblMessenger_ChatMessages WHERE chatMg_chatId = @chat_id ORDER BY chatMg_datetime DESC", conn)
+
                         cmd.Parameters.AddWithValue("@chat_id", chat_id)
+                        cmd.Parameters.AddWithValue("@top", top)
                         Dim dr = cmd.ExecuteReader()
                         While dr.Read
-                            Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc
+                            Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id")) '  ----> 100 messages = 101 SQL calls
+                            'Hier werden die einzelnen MSg-Obj nicht mehr per SQL geladen, sondern direkt als Objekt übergeben -> schneller!
+                            'Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id"), dr.Item("chatMg_maId"), dr.Item("chatMg_datetime"), dr.Item("chatMg_maName"), dr.Item("chatMg_maFirma"), dr.Item("chatMg_type"), dr.Item("chatMg_text"), IIf(IsDBNull(dr.Item("chatMg_anhang_docId")), Nothing, dr.Item("chatMg_anhang_docId")), IIf(IsDBNull(dr.Item("chatMg_referenz_AvisoId")), Nothing, dr.Item("chatMg_referenz_AvisoId")), IIf(IsDBNull(dr.Item("chatMg_referenz_SendungsId")), Nothing, dr.Item("chatMg_referenz_SendungsId")), dr.Item("chatMg_referenz_KundenNr")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc
                             Me.CHAT_MESSAGES.Add(MSG)
                         End While
                         dr.Close()
                     End Using
                 End Using
+
+                Me.CHAT_MESSAGES.Reverse()
+
             Catch ex As Exception
                 MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
             End Try
@@ -424,14 +435,20 @@ Public Class cMessenger
             Try
                 Me.CHAT_MESSAGES.Clear()
                 Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN()
-                    Using cmd As New SqlCommand("SELECT * FROM [tblMessenger_ChatMessages] WHERE chatMg_chatId=@chat_id AND CAST(chatMg_datetime as date)>=@dateTmp order by chatMg_datetime asc", conn)
+                    Using cmd As New SqlCommand("SELECT chatMg_id,chatMg_chatId,chatMg_maId,chatMg_maName,chatMg_maFirma,chatMg_datetime,chatMg_type,chatMg_text,chatMg_anhang_docId,chatMg_referenz_AvisoId,chatMg_referenz_SendungsId,chatMg_referenz_KundenNr FROM [tblMessenger_ChatMessages] WHERE chatMg_chatId=@chat_id AND CAST(chatMg_datetime as date)>=@dateTmp order by chatMg_datetime asc", conn)
                         cmd.Parameters.AddWithValue("@chat_id", chat_id)
                         cmd.Parameters.AddWithValue("@dateTmp", dateTmp)
                         Dim dr = cmd.ExecuteReader()
+
                         While dr.Read
-                            Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc
+
+                            Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id")) '----> 100 messages = 101 SQL calls
+                            'Hier werden die einzelnen MSg-Obj nicht mehr per SQL geladen, sondern direkt als Objekt übergeben -> schneller!
+                            'Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id"), dr.Item("chatMg_maId"), dr.Item("chatMg_datetime"), dr.Item("chatMg_maName"), dr.Item("chatMg_maFirma"), dr.Item("chatMg_type"), dr.Item("chatMg_text"), IIf(IsDBNull(dr.Item("chatMg_anhang_docId")), Nothing, dr.Item("chatMg_anhang_docId")), IIf(IsDBNull(dr.Item("chatMg_referenz_AvisoId")), Nothing, dr.Item("chatMg_referenz_AvisoId")), IIf(IsDBNull(dr.Item("chatMg_referenz_SendungsId")), Nothing, dr.Item("chatMg_referenz_SendungsId")), dr.Item("chatMg_referenz_KundenNr")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc
                             Me.CHAT_MESSAGES.Add(MSG)
+
                         End While
+
                         dr.Close()
                     End Using
                 End Using
@@ -763,6 +780,20 @@ Public Class cMessenger
             Me.chatMg_maId = chatMg_maId
         End Sub
 
+        Sub New(chatMg_chatId, chatMg_maId, chatMg_datetime, chatMg_maName, chatMg_maFirma, chatMg_type, chatMg_text, chatMg_anhang_docId, chatMg_referenz_AvisoId, chatMg_referenz_SendungsId, chatMg_referenz_KundenNr)
+            Me.chatMg_chatId = chatMg_chatId
+            Me.chatMg_maId = chatMg_maId
+            Me.chatMg_datetime = chatMg_datetime
+            Me.chatMg_maName = chatMg_maName
+            Me.chatMg_maFirma = chatMg_maFirma
+            Me.chatMg_type = chatMg_type
+            Me.chatMg_text = chatMg_text
+            Me.chatMg_anhang_docId = chatMg_anhang_docId
+            Me.chatMg_referenz_AvisoId = chatMg_referenz_AvisoId
+            Me.chatMg_referenz_SendungsId = chatMg_referenz_SendungsId
+            Me.chatMg_referenz_KundenNr = chatMg_referenz_KundenNr
+        End Sub
+
         Public Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
             Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
             list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_id", chatMg_id,, True))

VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb

@@ -264,6 +264,9 @@ Public Class cRMC
 
     End Function
 
+
+
+
     Public Shared Function setBackToCustomerCustomerID(SQL As SQL, backToCustomer As Boolean, customerNo As String) As Boolean
 
         Return SQL.doSQL("update tblRMCImport set InvToCustomer = " & IIf(backToCustomer, "1", "NULL") & "  where InvToCustomer Is null AND  rmc_kdNr = '" & customerNo & "'", "FMZOLL")
@@ -282,6 +285,55 @@ Public Class cRMC
         Return SQL.getValueTxtBySql("SELECT count(InvToCustomer) FROM [tblRMCImport] where InvToCustomer Is null ", "FMZOLL",,, -1)
     End Function
 
+
+    Public Shared Function getRMCQuartalsAbrechnungen(SQL As SQL, quartal As Integer, jahr As Integer, LeistungsNr As String, Optional USTV_ANTRAG As cUSTVAntrag = Nothing, Optional LANDKZ As String = "", Optional nurUnter50anzeigen As Boolean = True) As DataTable
+
+        Dim SQLWhere As String = "WHERE POS.LeistungsNr IN (" & IIf(LeistungsNr <> "", LeistungsNr, "") & ")"
+
+        If USTV_ANTRAG Is Nothing Then
+
+            SQLWhere &= " AND USTVA.UStVAn_KuNr LIKE '15%' AND YEAR(R.Abfertigungsdatum) = " & jahr & ""
+        Else
+
+            SQLWhere &= " AND USTVA.UStVAn_KuNr = " & USTV_ANTRAG.UStVAn_KuNr & IIf(LANDKZ <> "", " AND [Länderverzeichnis für die Außenhandelsstatistik].LandKz = '" & LANDKZ & "'", "") & " AND R.Abfertigungsdatum between '" & CDate(USTV_ANTRAG.UStVAn_ReDatVon).ToShortDateString & "' AND '" & CDate(USTV_ANTRAG.UStVAn_ReDatBis).ToShortDateString & "'"
+
+        End If
+
+
+        Dim SQLstr = "select Temp.KundenNr, Temp.Kundenname,Temp.LandKZ, Temp.Jahr, Temp.Quartal, sum(Temp.Betrag) as 'verrechneter Bearbeitungsbetrag', " & IIf(nurUnter50anzeigen, "50 - sum(Temp.Betrag) as Differenzbetrag", "") & " from (SELECT
+              USTVA.UStVAn_KuNr as KundenNr,
+              USTVA.UStVAn_Name as Kundenname,
+              [Länderverzeichnis für die Außenhandelsstatistik].LandKz as LandKZ,
+              YEAR(R.Abfertigungsdatum)                    AS Jahr,
+              DATEPART(QUARTER, R.Abfertigungsdatum)       AS Quartal,
+              POS.LeistungsNr,
+              SUM(POS.SteuerfreierBetrag + POS.SteuerpflichtigerBetrag) AS Betrag
+          FROM tblUStVAntrag AS USTVA
+          INNER JOIN Rechnungsausgang AS R ON R.FilialenNr     = USTVA.FilialenNr AND R.AbfertigungsNr = USTVA.AbfertigungsNr
+          INNER JOIN RechnungsausgangPositionen AS POS ON R.RK_ID = POS.RK_ID 
+          INNER JOIN  [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr 
+            " & SQLWhere & "
+          
+          GROUP BY
+              USTVA.UStVAn_KuNr,
+              USTVA.UStVAn_Name,
+              [Länderverzeichnis für die Außenhandelsstatistik].LandKz,
+              YEAR(R.Abfertigungsdatum),
+              DATEPART(QUARTER, R.Abfertigungsdatum),
+              POS.LeistungsNr
+          ) as Temp
+          	WHERE 1 = 1 " & IIf(quartal > 0, " AND temp.Quartal = " & quartal, "") & " 
+          	Group by Temp.KundenNr, Temp.Kundenname,Temp.LandKZ, Temp.Jahr, Temp.Quartal
+          	" & IIf(nurUnter50anzeigen, "Having sum(Temp.Betrag) < 50", "")
+
+        Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
+
+        Return dt
+
+
+
+    End Function
+
     Public Class Paramter
 
         Shared apiSettingsloaded As Boolean = False

VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb

@@ -1723,6 +1723,16 @@ Public Class cDatenarchiv_Collection
         Me.coll_archiv = coll_archiv
     End Sub
 
+    Sub New(coll_id, coll_daId, coll_pfad, coll_bezeichnung, coll_info, coll_archiv, coll_date)
+        Me.coll_id = coll_id
+        Me.coll_daId = coll_daId
+        Me.coll_pfad = coll_pfad
+        Me.coll_bezeichnung = coll_bezeichnung
+        Me.coll_info = coll_info
+        Me.coll_archiv = coll_archiv
+        Me.coll_date = coll_date
+    End Sub
+
     Public Function DELETE() As Boolean
         Try
             If coll_pfad.Contains(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir) Then '"\\192.168.0.91\DATENARCHIV\") Then 'Um sicher zu gehen, dass der pfad im richtigem VZ ist.
@@ -1864,12 +1874,12 @@ Public Class cDatenserverIDCollectionList
             LIST.Clear()
             Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
                 'Using cmd As New SqlCommand("SELECT coll_id, coll_daId, da_pfad, da_name FROM tblDatenarchiv_Collection INNER JOIN tblDatenarchiv ON coll_daId=da_id WHERE coll_id=@coll_id  ", conn)
-                Using cmd As New SqlCommand("SELECT coll_id, coll_daId, coll_pfad, coll_bezeichnung,coll_info,coll_archiv FROM tblDatenarchiv_Collection WHERE coll_daId=@coll_daId order by coll_bezeichnung ", conn) '  order by [coll_date] desc
+                Using cmd As New SqlCommand("SELECT coll_id, coll_daId, coll_pfad, coll_bezeichnung,coll_info,coll_archiv, coll_date FROM tblDatenarchiv_Collection WHERE coll_daId=@coll_daId order by coll_bezeichnung ", conn) '  order by [coll_date] desc
                     cmd.Parameters.AddWithValue("@coll_daId", Me.coll_daId)
                     Dim dr = cmd.ExecuteReader()
                     'LIST = New List(Of cDatenarchiv_Collection)
                     While dr.Read
-                        LIST.Add(New cDatenarchiv_Collection(dr.Item("coll_id"), dr.Item("coll_daId"), dr.Item("coll_pfad"), dr.Item("coll_bezeichnung"), dr.Item("coll_info"), dr.Item("coll_archiv")))
+                        LIST.Add(New cDatenarchiv_Collection(dr.Item("coll_id"), dr.Item("coll_daId"), dr.Item("coll_pfad"), dr.Item("coll_bezeichnung"), dr.Item("coll_info"), dr.Item("coll_archiv"), dr.Item("coll_date")))
                     End While
                     dr.Close()
                 End Using

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb

@@ -160,39 +160,6 @@ Public Class frmMessenger
         End If
     End Sub
 
-    'Sub initEmojisTEST()
-    '    FlowLayoutPanel.Controls.Clear()
-    '    If alloweasteregg Then pic.Visible = False
-
-    '    If System.IO.Directory.Exists(DATENVERVER_OPTIONS.getRootDir & "\DOKUMENTE\CHAT_EMOJIS\") Then
-    '        Dim EmojiPath = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "CHAT_EMOJIS\"
-    '        If Not System.IO.Directory.Exists(EmojiPath) Then System.IO.Directory.CreateDirectory(EmojiPath)
-
-    '        If VERAG_PROG_ALLGEMEIN.cProgrammeUpdate.copyProgramLIST(DATENVERVER_OPTIONS.getRootDir & "\DOKUMENTE\CHAT_EMOJIS\", EmojiPath, {}) Then
-    '            For Each a In System.IO.Directory.GetFiles(EmojiPath) '.OrderBy(Function(f) f)
-    '                If alloweasteregg Or Not a.Contains("easteregg") Then
-    '                    If System.IO.File.Exists(a) And a.Contains(".png") And a.Contains("emoji_") Then
-
-    '                        Dim p As New PictureBox
-    '                        p.Size = New Size(40, 40)
-    '                        p.BackgroundImage = Image.FromFile(a)
-    '                        p.BackgroundImageLayout = ImageLayout.Zoom
-    '                        p.Cursor = Cursors.Hand
-    '                        AddHandler p.Click, Sub()
-    '                                                If Not CHAT.chat_aktiv Then MsgBox("Chat inaktiv!") : Exit Sub
-    '                                                If CHAT IsNot Nothing Then
-    '                                                    saveEmoji(a)
-    '                                                End If
-    '                                            End Sub
-
-    '                        FlowLayoutPanel.Controls.Add(p)
-    '                    End If
-    '                End If
-    '            Next
-    '        End If
-    '    End If
-    'End Sub
-
     Sub intiDGVChats(Optional dgv_ChatID = -1, Optional reloadChat = True, Optional selFirst = False)
 
 

VERAG_PROG_ALLGEMEIN/cAllgemein.vb

@@ -1,7 +1,4 @@
-Imports GrapeCity.ActiveReports
+Imports System.Data.SqlClient
-Imports GrapeCity.ActiveReports.Document
-Imports System.ComponentModel
-Imports System.Data.SqlClient
 Imports System.IO
 
 Public Class cAllgemein

VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb

@@ -574,7 +574,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
             Case "AMBAR"
                 Select Case art
                     Case "3", "4" 'Export
-                        myCredentials.UserName = "office@ambarlog.de"
+                        myCredentials.UserName = "export@ambarlog.de"
                         ' myCredentials.Password = "Naq30716"
                         '   myCredentials.UserName = "import@ambarlog.com"
                         myCredentials.Password = "Naq30716"
@@ -584,7 +584,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
 
                         'text = text.replace("import@ambarlog.com", "office@ambarlog.com")
                         'text = text.replace("import@ambarlog.de", "office@ambarlog.com")
-                        eMailfrom = "office@ambarlog.de"
+                        eMailfrom = "export@ambarlog.de"
                     Case Else
 
                         '   myCredentials.UserName = "import@ambarlog.com"
@@ -898,6 +898,46 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
             EmAilAttach = String.Empty
         End Try
 
+    End Function
+
+    Shared Function checkifMailisOK(emailList As String) As String
+
+        Dim invalid As New List(Of String)
+
+        If String.IsNullOrWhiteSpace(emailList) Then Return ""
+
+        Dim emails = emailList.Split(";"c, ","c)
+
+        For Each email In emails
+            Dim e = email.Trim()
+            If e = "" Then Continue For
+
+            Try
+                Dim addr As New System.Net.Mail.MailAddress(e)
+                If Not addr.Host.Contains(".") Then
+                    invalid.Add(e)
+                End If
+            Catch
+                invalid.Add(e)
+            End Try
+        Next
+
+        If invalid.Count = 0 Then
+            Return ""
+        Else
+            Dim StringLIst As String = ""
+            For i = 1 To invalid.Count
+                StringLIst = StringLIst & invalid(i - 1)
+            Next i
+
+            Return StringLIst
+
+        End If
+
+
+
+
+
     End Function
 
     Public Function MakeScreenshot()