Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

SDL/Fakturierung/cFakturierung.vb

@@ -3676,6 +3676,7 @@ Public Class cFakturierung
             '    RECHNUNG.SET_DruckdatumUhrzeit()
             'End If
 
+
             If isMDMRechnungsdruck Then
                 If Rechnugnsdruck = 4 Or Rechnugnsdruck = 2 Then
                     If ROW("RechnungsLandKz") IsNot DBNull.Value AndAlso ROW("RechnungsLandKz") <> "" AndAlso rpt.lblSteuerbetrag.Text = "" Then
@@ -3688,8 +3689,8 @@ Public Class cFakturierung
 
 
 
-                'ORIGINAL
+            'ORIGINAL
-                Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(ROW("RechnungsKundenNr"))
+            Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(ROW("RechnungsKundenNr"))
             'Dim RG_Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & " _Rechnung_" & RechnungsNr & ".pdf"
             Dim RG_Bezeichnung = "Rechnung_" & RechnungsNr & ".pdf"
             'Rechnugnsdruck  =  Individuell für deise Rechnung, wird optional mitgegeben

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -1,4 +1,7 @@
 
+Imports System.Web.Configuration
+Imports System.Web.UI.WebControls.Expressions
+Imports com.sun.imageio.plugins
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class usrCntlFaktAbrechnung
@@ -406,10 +409,10 @@ Public Class usrCntlFaktAbrechnung
             End If
 
         End If
-            'initDGVOfferteDetailsUebersicht(RECHNUNG.kundenn,RECHNUNG.OffertenNr)
+        'initDGVOfferteDetailsUebersicht(RECHNUNG.kundenn,RECHNUNG.OffertenNr)
-            'Dann die Werte eintragen:
+        'Dann die Werte eintragen:
-            ' MsgBox("G: " & RECHNUNG.POSITIONEN.Count)
+        ' MsgBox("G: " & RECHNUNG.POSITIONEN.Count)
-            Dim vorzeichen = 1 'If(RECHNUNG.Vorzeichen = "-", -1, 1)
+        Dim vorzeichen = 1 'If(RECHNUNG.Vorzeichen = "-", -1, 1)
         For Each POS In RECHNUNG.POSITIONEN
             Dim found = False
             For Each r As DataGridViewRow In dgvOfferteDetailsUebersicht.Rows
@@ -528,6 +531,15 @@ Public Class usrCntlFaktAbrechnung
         End If
 
 
+        Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then
+            FirmaTmp = "VERAGIMEX"
+        End If
+
+        If Not IsDBNull(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) AndAlso CInt(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) = 19 Then
+            FirmaTmp = "VERAG360"
+        End If
+
         cboVorauskasse.Items.Clear()
         cboVorauskasse.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEIN", 0))
         cboVorauskasse.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("JA", 1))
@@ -539,7 +551,7 @@ Public Class usrCntlFaktAbrechnung
         cboSammelrechnung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3 monatlich", 3))
         cboSammelrechnung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("4 Dekade", 4))
         cboSammelrechnung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("5 wöchentlich", 5))
-        '  cboSammelrechnung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("6 Maut/Diesel", 6))
+        If FirmaTmp = "VERAG360" Then cboSammelrechnung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("6 Maut/Diesel", 6))
         cboSammelrechnung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("7 pro  LKW", 7))
         cboSammelrechnung.changeItem(0)
 
@@ -554,15 +566,6 @@ Public Class usrCntlFaktAbrechnung
         Dim whereFirma = ""
         Dim firstEmpty = False
 
-        Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then
-            FirmaTmp = "VERAGIMEX"
-        End If
-
-        If Not IsDBNull(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) AndAlso CInt(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) = 19 Then
-            FirmaTmp = "VERAG360"
-        End If
-
         'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
         'FirmaTmp = "AMBAR"
         'End If
@@ -596,11 +599,12 @@ Public Class usrCntlFaktAbrechnung
                 Else
                     whereFirma = " AND FIRMENGRUPPE IN ('VERAG360') " : pnlDocs.Visible = True
                 End If
+
         End Select
 
 
         cboFirma.fillWithSQL("SELECT  [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) " & whereFirma & " ORDER BY Firma_ID  ", True, "FMZOLL", firstEmpty)
-                cboFirma.SelectedIndex = 0
+        cboFirma.SelectedIndex = 0
 
 
         If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE <> "" And Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER And FirmaTmp <> "VERAGIMEX" Then
@@ -1828,6 +1832,8 @@ Public Class usrCntlFaktAbrechnung
                 pnlTop.BackColor = Color.Teal
             Case 20 : pic.BackgroundImage = My.Resources.IMEX_LOGO_simple
                 pnlTop.BackColor = Color.FromArgb(250, 120, 0) : errCOlor = Color.DarkRed
+            Case 19 : pic.BackgroundImage = My.Resources.VERAG_360
+                pnlTop.BackColor = Color.FromArgb(250, 120, 0) : errCOlor = Color.LightBlue
 
                 'UNISPED:
             Case 21 : pic.BackgroundImage = My.Resources.Unisped_logo
@@ -1883,6 +1889,33 @@ Public Class usrCntlFaktAbrechnung
         End If
 
         initRg_Anhaenhe_Default(RECHNUNG, SPEDBUCH)
+
+        If Not cboFirma._value = 19 Then
+
+            If cboSammelrechnung.Items.Count > 7 Then
+
+
+                For iIndex = 0 To cboSammelrechnung.Items.Count - 1
+                    If cboSammelrechnung.Items(iIndex).value = 6 Then
+                        cboSammelrechnung.Items.RemoveAt(iIndex)
+                        Exit For
+                    End If
+                Next
+
+
+            End If
+
+        Else
+
+            If cboSammelrechnung.Items.Count < 8 Then
+                cboSammelrechnung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("6 Maut/Diesel", 6))
+            End If
+
+
+
+
+        End If
+
     End Sub
 
 

SDL/USTV/frmUSTVoffeneAntraege.Designer.vb

@@ -23,15 +23,16 @@ Partial Class frmUSTVoffeneAntraege
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel()
         Me.btn = New System.Windows.Forms.Button()
         Me.Button7 = New System.Windows.Forms.Button()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Button3 = New System.Windows.Forms.Button()
+        Me.btnVerag = New System.Windows.Forms.Button()
         Me.btnAlle = New System.Windows.Forms.Button()
         Me.lbl = New System.Windows.Forms.Label()
         Me.Label2 = New System.Windows.Forms.Label()
@@ -57,7 +58,7 @@ Partial Class frmUSTVoffeneAntraege
         Me.txtMWST = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.btnVerag = New System.Windows.Forms.Button()
+        Me.Button4 = New System.Windows.Forms.Button()
         Me.FlowLayoutPanel.SuspendLayout()
         Me.Panel4.SuspendLayout()
         Me.pnlLand.SuspendLayout()
@@ -138,6 +139,17 @@ Partial Class frmUSTVoffeneAntraege
         Me.Button3.Text = "IDS"
         Me.Button3.UseVisualStyleBackColor = False
         '
+        'btnVerag
+        '
+        Me.btnVerag.BackColor = System.Drawing.Color.FloralWhite
+        Me.btnVerag.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnVerag.Location = New System.Drawing.Point(633, 3)
+        Me.btnVerag.Name = "btnVerag"
+        Me.btnVerag.Size = New System.Drawing.Size(120, 23)
+        Me.btnVerag.TabIndex = 6
+        Me.btnVerag.Text = "VERAG"
+        Me.btnVerag.UseVisualStyleBackColor = False
+        '
         'btnAlle
         '
         Me.btnAlle.BackColor = System.Drawing.Color.FloralWhite
@@ -433,55 +445,54 @@ Partial Class frmUSTVoffeneAntraege
         Me.MyDatagridview1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle1.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.WindowText
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.MyDatagridview1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
+        Me.MyDatagridview1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
         Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle2.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.ControlText
+        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.MyDatagridview1.DefaultCellStyle = DataGridViewCellStyle5
+        Me.MyDatagridview1.DefaultCellStyle = DataGridViewCellStyle2
         Me.MyDatagridview1.Location = New System.Drawing.Point(12, 98)
         Me.MyDatagridview1.Name = "MyDatagridview1"
         Me.MyDatagridview1.ReadOnly = True
-        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle3.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))
+        DataGridViewCellStyle3.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
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.MyDatagridview1.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
+        Me.MyDatagridview1.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
         Me.MyDatagridview1.RowHeadersWidth = 62
         Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.MyDatagridview1.Size = New System.Drawing.Size(1409, 528)
         Me.MyDatagridview1.TabIndex = 30
         '
-        'btnVerag
+        'Button4
         '
-        Me.btnVerag.BackColor = System.Drawing.Color.FloralWhite
+        Me.Button4.Location = New System.Drawing.Point(15, 639)
-        Me.btnVerag.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button4.Name = "Button4"
-        Me.btnVerag.Location = New System.Drawing.Point(633, 3)
+        Me.Button4.Size = New System.Drawing.Size(75, 23)
-        Me.btnVerag.Name = "btnVerag"
+        Me.Button4.TabIndex = 46
-        Me.btnVerag.Size = New System.Drawing.Size(120, 23)
+        Me.Button4.Text = "PDFs prüfen"
-        Me.btnVerag.TabIndex = 6
+        Me.Button4.UseVisualStyleBackColor = True
-        Me.btnVerag.Text = "VERAG"
-        Me.btnVerag.UseVisualStyleBackColor = False
         '
         'frmUSTVoffeneAntraege
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1457, 681)
+        Me.Controls.Add(Me.Button4)
         Me.Controls.Add(Me.lblKunde)
         Me.Controls.Add(Me.pnlLand)
         Me.Controls.Add(Me.cbxAlleoffenen)
@@ -541,4 +552,5 @@ Partial Class frmUSTVoffeneAntraege
     Friend WithEvents Label5 As Label
     Friend WithEvents cbxKundeLand As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents btnVerag As Button
+    Friend WithEvents Button4 As Button
 End Class

SDL/USTV/frmUSTVoffeneAntraege.vb

@@ -1,4 +1,5 @@
 Imports System.Windows.Documents
+Imports DocumentFormat.OpenXml.Drawing.Spreadsheet
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmUSTVoffeneAntraege
@@ -89,11 +90,12 @@ Public Class frmUSTVoffeneAntraege
                 sqlwhere &= " and Adressen.AdressenNr = " & kdnr
             End If
 
-            .SET_SQL("select " & top & " Adressen.AdressenNr, Adressen.[Name 1] ,[plose_Lieferant],[plose_RechnungsDatum],[plose_RechnungsNr],plp_Land, sum([plose_MWSTBetrag])[plose_MWSTBetrag] FROM [tblPLOSE_Details]  
+            .SET_SQL("select " & top & " Adressen.AdressenNr, Adressen.[Name 1] ,[plose_Lieferant],[plose_RechnungsDatum],[plose_RechnungsNr],plp_Land, sum([plose_MWSTBetrag])[plose_MWSTBetrag], [plInv_daId] as daId FROM [tblPLOSE_Details]  
                     INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer
                     INNER JOIN [tblPLOSE_Produktbeschreibung] ON [plp_ProductCode]=[plose_ProduktCode]
+                    LEFT JOIN [tblPLOSE_Inv_Data] on  plInv_SupplierRechnungsDatum=plose_RechnungsDatum and plInv_SupplierRechnungsNr=plose_RechnungsNr and plInv_SupplierCountry=plp_Land AND [plInv_daId] is not null
                     WHERE plose_Archiv <> 1 /*AND plose_LieferantCode IN (0,1,7) */ AND  cast(plose_RechnungsDatum as date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' and plose_RechnungsNr is not null " & sqlwhere &
-                    "group by  Adressen.AdressenNr, Adressen.[Name 1] ,[plose_RechnungsDatum],[plose_RechnungsNr],[plose_Lieferant], plp_Land
+                    "group by  Adressen.AdressenNr, Adressen.[Name 1] ,[plose_RechnungsDatum],[plose_RechnungsNr],[plose_Lieferant], plp_Land, [plInv_daId]
                     having sum(plose_MWSTBetrag) <>0", "FMZOLL")
             .LOAD()
             If .Columns.Count > 0 Then
@@ -106,16 +108,32 @@ Public Class frmUSTVoffeneAntraege
                 .Columns("plp_Land").HeaderText = "Land"
                 .Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
                 .Columns("plose_MWSTBetrag").HeaderText = "MWST"
+                .Columns("daId").Visible = False
 
                 .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
 
             End If
 
             Dim sumMwSt As Double = 0
+
+            Dim c As New DataGridViewImageColumn
+            c.Name = "clmnPDF" : c.HeaderText = "RE"
+            '    c.Image = Nothing
+            c.DefaultCellStyle.NullValue = Nothing
+            c.ImageLayout = DataGridViewImageCellLayout.Zoom
+            c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
+            'c.DefaultCellStyle.Tag = "Therefore anzeigen"
+
+            If Not .Columns.Contains("clmnPDF") Then .Columns.Add(c)
+
             For Each r As DataGridViewRow In .Rows
                 sumMwSt += If(IsNumeric(r.Cells("plose_MWSTBetrag").Value), CDbl(r.Cells("plose_MWSTBetrag").Value), 0)
+
+                If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf
             Next
 
+
+
             txtAnzahl.Text = .Rows.Count
             txtMWST.Text = sumMwSt
 
@@ -265,7 +283,7 @@ Public Class frmUSTVoffeneAntraege
 
 
         With MyDatagridview1
-.Columns.Clear()
+            .Columns.Clear()
             'Exit Sub
             'MsgBox(.sql)
             Dim sqlstring = "Select " & top & " Adressen.AdressenNr as KdNr,Adressen.[Name 1],[Lieferland_ISO2],Abrechnungsnummer, [Rechnungsdatum] AS Rechnungsdatum, sum([Gesamtbetrag_Brutto_in_Darstellwährung]) as [Gesamtbetrag_Brutto_in_Darstellwährung], sum([Gesamtbetrag_Umsatzsteuer_in_Darstellwährung]) as [Gesamtbetrag_Umsatzsteuer_in_Darstellwährung], daId  
@@ -275,38 +293,38 @@ Public Class frmUSTVoffeneAntraege
 " group by Adressen.AdressenNr,Adressen.[Name 1],Abrechnungsnummer,[Rechnungsdatum], [Lieferland_ISO2], daId having sum([Gesamtbetrag_Umsatzsteuer_in_Darstellwährung]) <> 0 "
 
             .SET_SQL(sqlstring, "FMZOLL")
-.LOAD()
+            .LOAD()
-If .Columns.Count > 0 Then
+            If .Columns.Count > 0 Then
 
                 .Columns("KdNr").HeaderText = "KdNr"
                 .Columns("Name 1").HeaderText = "Kunde"
-.Columns("Lieferland_ISO2").HeaderText = "Land"
+                .Columns("Lieferland_ISO2").HeaderText = "Land"
-.Columns("Rechnungsdatum").HeaderText = "RE-Datum"
+                .Columns("Rechnungsdatum").HeaderText = "RE-Datum"
-.Columns("Abrechnungsnummer").HeaderText = "RE-Nr"
+                .Columns("Abrechnungsnummer").HeaderText = "RE-Nr"
-.Columns("Gesamtbetrag_Brutto_in_Darstellwährung").HeaderText = "Gesamtsumme Euro"
+                .Columns("Gesamtbetrag_Brutto_in_Darstellwährung").HeaderText = "Gesamtsumme Euro"
-.Columns("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").HeaderText = "MWSt Euro"
+                .Columns("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").HeaderText = "MWSt Euro"
-.Columns("daId").Visible = False
+                .Columns("daId").Visible = False
-.Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+                .Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
-.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
+                .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
-End If
+            End If
-Dim sumMwSt As Double = 0
+            Dim sumMwSt As Double = 0
 
             Dim c As New DataGridViewImageColumn
             c.Name = "clmnPDF" : c.HeaderText = "RE"
             '    c.Image = Nothing
             c.DefaultCellStyle.NullValue = Nothing
             c.ImageLayout = DataGridViewImageCellLayout.Zoom
-c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
+            c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
-'c.DefaultCellStyle.Tag = "Therefore anzeigen"
+            'c.DefaultCellStyle.Tag = "Therefore anzeigen"
 
-.Columns.Add(c)
+            .Columns.Add(c)
-For Each r As DataGridViewRow In .Rows
+            For Each r As DataGridViewRow In .Rows
-sumMwSt += If(IsNumeric(r.Cells("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").Value), CDbl(r.Cells("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").Value), 0)
+                sumMwSt += If(IsNumeric(r.Cells("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").Value), CDbl(r.Cells("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").Value), 0)
                 If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf
-Next
+            Next
-txtAnzahl.Text = .Rows.Count
+            txtAnzahl.Text = .Rows.Count
-txtMWST.Text = sumMwSt
+            txtMWST.Text = sumMwSt
-End With
+        End With
 
     End Sub
     Sub initDgv_IDS(anz As Integer, Optional kdnr As Integer = -1)
@@ -413,7 +431,7 @@ End With
                             tblTrdinInvoice.Rechnungsdatum,
                             'AT' as Land,
                             tblTrdinInvoice.Rechnungsnummer, 
-                            tblTrdinInvoice.SteuerbetragLokal 
+                            tblTrdinInvoice.SteuerbetragLokal, 
                             FROM tblTrdinInvoice
                             inner join Adressen on Adressen.AdressenNr = tblTrdinInvoice.RechnungsKundenNr
                             WHERE tblTrdinInvoice.Rechnungsdatum Between '" & dat_Sum_Von.Value & "' And '" & dat_Sum_Bis.Value & "' AND tblTrdinInvoice.SteuerbetragLokal<>0 AND tblTrdinInvoice.UStVAn_ID is null And Firma_ID = 19 AND tblTrdinInvoice.WährungLokal='EUR' " & sqlwhere & "
@@ -435,20 +453,21 @@ End With
 
             Dim sumMwSt As Double = 0
 
-            'Dim c As New DataGridViewImageColumn
+            Dim c As New DataGridViewImageColumn
-            'c.Name = "clmnPDF" : c.HeaderText = "RE"
+            c.Name = "clmnPDF" : c.HeaderText = "RE"
-            ''    c.Image = Nothing
+            '    c.Image = Nothing
-            'c.DefaultCellStyle.NullValue = Nothing
+            c.DefaultCellStyle.NullValue = Nothing
-            'c.ImageLayout = DataGridViewImageCellLayout.Zoom
+            c.ImageLayout = DataGridViewImageCellLayout.Zoom
-            'c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
+            c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
-            ''c.DefaultCellStyle.Tag = "Therefore anzeigen"
+            'c.DefaultCellStyle.Tag = "Therefore anzeigen"
 
-            'If Not .Columns.Contains("clmnPDF") Then .Columns.Add(c)
+            If Not .Columns.Contains("clmnPDF") Then .Columns.Add(c)
 
 
             For Each r As DataGridViewRow In .Rows
                 sumMwSt += If(IsNumeric(r.Cells("SteuerbetragLokal").Value), CDbl(r.Cells("SteuerbetragLokal").Value), 0)
-                'If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf
+                'If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then
+                DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf
             Next
 
             txtAnzahl.Text = .Rows.Count
@@ -736,8 +755,14 @@ End With
         Try
 
             If Not MyDatagridview1.Columns.Contains("daId") Then Exit Sub
+            Dim ColInd As Integer = 8
+            Select Case LIEFERANT.ToString.ToLower
+                Case "ids", "verag"
+                    ColInd = 7
 
-            If e.RowIndex >= 0 AndAlso e.ColumnIndex = 7 Then
+            End Select
+
+            If e.RowIndex >= 0 AndAlso e.ColumnIndex = ColInd Then
                 Dim dsID = MyDatagridview1.Rows(e.RowIndex).Cells("daId").Value
 
                 If dsID > 0 Then
@@ -828,5 +853,29 @@ End With
         initDgv_gesamt(txtmaxAnz.Text, cbxNichtEroeffneteAntraege.Checked, IIf(cbxAlleoffenen.Checked, -1, kdNr))
     End Sub
 
+    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 count(distinct([plInv_SupplierRechnungsNr])) from [tblPLOSE_Inv_Data] where [plInv_daId] is null and cast([plInv_SupplierRechnungsDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'"
+            Case "rmc" : SQLQuery = "select count(distinct(rmc_reNr)) as Anzahl  from [tblRMCImport] where rmc_daId is null and cast([rmc_reDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'"
+            Case "mse" : SQLQuery = "select count(distinct(invoice_id)) as Anzahl  from tblMSEInvoices where daId is null and cast(invoice_date as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'"
+            Case "uta" : SQLQuery = "select count(distinct(tblUTAImportNew.Abrechnungsnummer)) as Anzahl from tblUTAImportNew 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'"
+            Case "ids" : SQLQuery = "select count(distinct(Invoicenumber)) as Anzahl from tblIDSInvoicesNew where DocumentName is null and cast(YearMonthDay as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'"
+            Case Else
+                SQLQuery = ""
+
+        End Select
+
+
+        Dim fehlendePDFs As Integer = 0
+        If SQLQuery <> "" Then
+            fehlendePDFs = CInt((New SQL).getValueTxtBySql(SQLQuery, "FMZOLL"))
+            MsgBox("Anzahl fehlende PDFs: " & fehlendePDFs)
+        Else
+            MsgBox("Funktion nicht implementiert!")
+        End If
+
+
+    End Sub
 End Class

SDL/USTV/usrCntlUSTV.vb

@@ -342,7 +342,7 @@ Public Class usrCntlUSTV
         '              AND cast( [UStVAn_USteuerbetragEUR] as decimal(17,2))-cast( [UStVAn_ErstattungsbetragEUR]  as decimal(17,2))<>0
         '              AND UStVAn_AntragEingereichtAm is not null
         '          order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc"
-        Dim sqlStr = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KundenNr,[UStVAn_Name] as Kundename,Adressen.LandKz as Land_Kunde, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr,  LfdA .LandKz Land_Antrag,cast([UStVAn_ReDatVon] as Date),cast([UStVAn_ReDatBis] as Date) , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as 3470 ,[UStVAn_Währungscode] as Währung,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR],(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR]  as decimal(17,2))) as DifferenzbetragEUR, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr
+        Dim sqlStr = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KundenNr,[UStVAn_Name] as Kundename,Adressen.LandKz as Land_Kunde, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr,  LfdA .LandKz Land_Antrag,cast([UStVAn_ReDatVon] as Date),cast([UStVAn_ReDatBis] as Date) , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as Währung,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR],(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR]  as decimal(17,2))) as DifferenzbetragEUR, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr
                   FROM [tblUStVAntrag] 
 				  inner join [Länderverzeichnis für die Außenhandelsstatistik] as LfdA on UStVAn_LandNr=Landnr
 				  inner join Adressen on AdressenNr=UStVAn_KuNr

SDL/USTV/ustCntlUSTV_AntragPosition.vb

@@ -193,10 +193,12 @@ Public Class ustCntlUSTV_AntragPosition
 
             ElseIf sender Is txtUSTBetragEUR Then
 
-                If IsNumeric(txtUSTBetragEUR._value) AndAlso IsNumeric(txtUmrechnungskurs._value) Then
+                'so herum nicht umrechnen!!!!
-                    txtUSTBetrag.Text = Math.Floor((txtUSTBetragEUR._value * txtUmrechnungskurs._value) * 100 + 0.5) / 100
+                'If IsNumeric(txtUSTBetragEUR._value) AndAlso IsNumeric(txtUmrechnungskurs._value) Then
-                    'values_changed()
+                '    txtUSTBetrag.Text = Math.Floor((txtUSTBetragEUR._value * txtUmrechnungskurs._value) * 100 + 0.5) / 100
-                End If
+                '    'values_changed()
+                'End If
+
             End If
 
 

SDL/mdm/usrcntlFremdrechnungen.Designer.vb

@@ -23,7 +23,7 @@ Partial Class usrcntlFremdrechnungen
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 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()
@@ -35,10 +35,15 @@ Partial Class usrcntlFremdrechnungen
         Me.btnVERAGCardNew = New System.Windows.Forms.Button()
         Me.btnSDL_PLOSE = New System.Windows.Forms.Button()
         Me.btnSDL_RMC = New System.Windows.Forms.Button()
-        Me.btnFilter = 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.cbx = New System.Windows.Forms.CheckBox()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.dat_Sum_Bis = New System.Windows.Forms.DateTimePicker()
+        Me.dat_Sum_Von = New System.Windows.Forms.DateTimePicker()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.cbxMax200Eintrage = New System.Windows.Forms.CheckBox()
         Me.lblEinträge = New System.Windows.Forms.Label()
@@ -50,24 +55,18 @@ Partial Class usrcntlFremdrechnungen
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.dgvSDL = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel4 = New System.Windows.Forms.Panel()
-        Me.pnlTest = New System.Windows.Forms.Panel()
-        Me.dgvFILTER = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.UsrCntlDatenDetails1 = New SDL.usrCntlDatenDetails()
         Me.FlowLayoutPanel.SuspendLayout()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.Panel1.SuspendLayout()
         Me.Panel3.SuspendLayout()
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainer1.Panel1.SuspendLayout()
-        Me.SplitContainer1.Panel2.SuspendLayout()
         Me.SplitContainer1.SuspendLayout()
         CType(Me.dgvSDL, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel4.SuspendLayout()
-        Me.pnlTest.SuspendLayout()
-        CType(Me.dgvFILTER, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.cntxtExcel.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -94,7 +93,7 @@ Partial Class usrcntlFremdrechnungen
         Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 0)
         Me.FlowLayoutPanel.Margin = New System.Windows.Forms.Padding(0)
         Me.FlowLayoutPanel.Name = "FlowLayoutPanel"
-        Me.FlowLayoutPanel.Size = New System.Drawing.Size(1356, 78)
+        Me.FlowLayoutPanel.Size = New System.Drawing.Size(1356, 108)
         Me.FlowLayoutPanel.TabIndex = 11
         '
         'btnSDL_Alle
@@ -253,17 +252,6 @@ Partial Class usrcntlFremdrechnungen
         Me.btnSDL_RMC.TextAlign = System.Drawing.ContentAlignment.BottomCenter
         Me.btnSDL_RMC.UseVisualStyleBackColor = True
         '
-        'btnFilter
-        '
-        Me.btnFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnFilter.Location = New System.Drawing.Point(7, 19)
-        Me.btnFilter.Name = "btnFilter"
-        Me.btnFilter.Size = New System.Drawing.Size(98, 23)
-        Me.btnFilter.TabIndex = 39
-        Me.btnFilter.Text = "Filter einblenden"
-        Me.btnFilter.UseVisualStyleBackColor = True
-        Me.btnFilter.Visible = False
-        '
         'ContextMenuStrip1
         '
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DetailsAnzeigenToolStripMenuItem, Me.KundenblattAnzeigenToolStripMenuItem})
@@ -281,10 +269,15 @@ Partial Class usrcntlFremdrechnungen
         Me.Panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.Panel1.BackColor = System.Drawing.SystemColors.ControlLightLight
         Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel1.Controls.Add(Me.cbx)
+        Me.Panel1.Controls.Add(Me.Label4)
+        Me.Panel1.Controls.Add(Me.Label2)
+        Me.Panel1.Controls.Add(Me.Label1)
+        Me.Panel1.Controls.Add(Me.dat_Sum_Bis)
+        Me.Panel1.Controls.Add(Me.dat_Sum_Von)
         Me.Panel1.Controls.Add(Me.Button1)
         Me.Panel1.Controls.Add(Me.cbxMax200Eintrage)
         Me.Panel1.Controls.Add(Me.lblEinträge)
-        Me.Panel1.Controls.Add(Me.btnFilter)
         Me.Panel1.Controls.Add(Me.Button4)
         Me.Panel1.Controls.Add(Me.Button5)
         Me.Panel1.Controls.Add(Me.Label3)
@@ -295,13 +288,66 @@ Partial Class usrcntlFremdrechnungen
         Me.Panel1.Size = New System.Drawing.Size(260, 907)
         Me.Panel1.TabIndex = 23
         '
+        'cbx
+        '
+        Me.cbx.AutoSize = True
+        Me.cbx.Location = New System.Drawing.Point(8, 107)
+        Me.cbx.Name = "cbx"
+        Me.cbx.Size = New System.Drawing.Size(178, 17)
+        Me.cbx.TabIndex = 52
+        Me.cbx.Text = "MWST-relevenate Rechnungen"
+        Me.cbx.UseVisualStyleBackColor = True
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(5, 35)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(91, 13)
+        Me.Label4.TabIndex = 51
+        Me.Label4.Text = "Rechnungsdatum"
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(5, 83)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(20, 13)
+        Me.Label2.TabIndex = 50
+        Me.Label2.Text = "bis"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(5, 57)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(28, 13)
+        Me.Label1.TabIndex = 49
+        Me.Label1.Text = "von:"
+        '
+        'dat_Sum_Bis
+        '
+        Me.dat_Sum_Bis.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
+        Me.dat_Sum_Bis.Location = New System.Drawing.Point(60, 77)
+        Me.dat_Sum_Bis.Name = "dat_Sum_Bis"
+        Me.dat_Sum_Bis.Size = New System.Drawing.Size(103, 20)
+        Me.dat_Sum_Bis.TabIndex = 48
+        '
+        'dat_Sum_Von
+        '
+        Me.dat_Sum_Von.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
+        Me.dat_Sum_Von.Location = New System.Drawing.Point(60, 51)
+        Me.dat_Sum_Von.Name = "dat_Sum_Von"
+        Me.dat_Sum_Von.Size = New System.Drawing.Size(103, 20)
+        Me.dat_Sum_Von.TabIndex = 46
+        '
         'Button1
         '
         Me.Button1.BackgroundImage = Global.SDL.My.Resources.Resources.refresh
         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(199, 118)
+        Me.Button1.Location = New System.Drawing.Point(200, 203)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(50, 44)
         Me.Button1.TabIndex = 45
@@ -313,7 +359,7 @@ Partial Class usrcntlFremdrechnungen
         Me.cbxMax200Eintrage.AutoSize = True
         Me.cbxMax200Eintrage.Checked = True
         Me.cbxMax200Eintrage.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbxMax200Eintrage.Location = New System.Drawing.Point(7, 45)
+        Me.cbxMax200Eintrage.Location = New System.Drawing.Point(8, 130)
         Me.cbxMax200Eintrage.Name = "cbxMax200Eintrage"
         Me.cbxMax200Eintrage.Size = New System.Drawing.Size(111, 17)
         Me.cbxMax200Eintrage.TabIndex = 41
@@ -324,7 +370,7 @@ Partial Class usrcntlFremdrechnungen
         '
         Me.lblEinträge.AutoSize = True
         Me.lblEinträge.BackColor = System.Drawing.Color.White
-        Me.lblEinträge.Location = New System.Drawing.Point(191, 19)
+        Me.lblEinträge.Location = New System.Drawing.Point(190, 3)
         Me.lblEinträge.Name = "lblEinträge"
         Me.lblEinträge.Size = New System.Drawing.Size(58, 13)
         Me.lblEinträge.TabIndex = 40
@@ -335,20 +381,21 @@ Partial Class usrcntlFremdrechnungen
         Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button4.Image = Global.SDL.My.Resources.Resources.checklist
         Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button4.Location = New System.Drawing.Point(7, 118)
+        Me.Button4.Location = New System.Drawing.Point(8, 203)
         Me.Button4.Name = "Button4"
         Me.Button4.Size = New System.Drawing.Size(118, 44)
         Me.Button4.TabIndex = 21
         Me.Button4.Text = "Details" & Global.Microsoft.VisualBasic.ChrW(10) & "anzeigen"
         Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.Button4.UseVisualStyleBackColor = True
+        Me.Button4.Visible = False
         '
         'Button5
         '
         Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button5.Image = Global.SDL.My.Resources.Resources.email_big1
         Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button5.Location = New System.Drawing.Point(7, 68)
+        Me.Button5.Location = New System.Drawing.Point(8, 153)
         Me.Button5.Name = "Button5"
         Me.Button5.Size = New System.Drawing.Size(118, 44)
         Me.Button5.TabIndex = 22
@@ -361,16 +408,16 @@ Partial Class usrcntlFremdrechnungen
         Me.Label3.AutoSize = True
         Me.Label3.Location = New System.Drawing.Point(3, 3)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(53, 13)
+        Me.Label3.Size = New System.Drawing.Size(32, 13)
         Me.Label3.TabIndex = 25
-        Me.Label3.Text = "Optionen:"
+        Me.Label3.Text = "Filter:"
         '
         'Button8
         '
         Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button8.Image = Global.SDL.My.Resources.Resources.Excel_logo
         Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button8.Location = New System.Drawing.Point(131, 68)
+        Me.Button8.Location = New System.Drawing.Point(132, 153)
         Me.Button8.Name = "Button8"
         Me.Button8.Size = New System.Drawing.Size(118, 44)
         Me.Button8.TabIndex = 31
@@ -402,11 +449,7 @@ Partial Class usrcntlFremdrechnungen
         '
         Me.SplitContainer1.Panel1.AutoScroll = True
         Me.SplitContainer1.Panel1.Controls.Add(Me.dgvSDL)
-        '
+        Me.SplitContainer1.Panel2MinSize = 0
-        'SplitContainer1.Panel2
-        '
-        Me.SplitContainer1.Panel2.Controls.Add(Me.UsrCntlDatenDetails1)
-        Me.SplitContainer1.Panel2MinSize = 234
         Me.SplitContainer1.Size = New System.Drawing.Size(1356, 799)
         Me.SplitContainer1.SplitterDistance = 559
         Me.SplitContainer1.TabIndex = 13
@@ -417,53 +460,24 @@ Partial Class usrcntlFremdrechnungen
         Me.dgvSDL.AllowUserToAddRows = False
         Me.dgvSDL.AllowUserToDeleteRows = False
         Me.dgvSDL.AllowUserToResizeColumns = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvSDL.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        Me.dgvSDL.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.dgvSDL.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvSDL.Location = New System.Drawing.Point(0, -1)
+        Me.dgvSDL.Location = New System.Drawing.Point(4, 3)
         Me.dgvSDL.Name = "dgvSDL"
-        Me.dgvSDL.Size = New System.Drawing.Size(1354, 599)
+        Me.dgvSDL.Size = New System.Drawing.Size(1354, 770)
         Me.dgvSDL.TabIndex = 29
         '
         'Panel4
         '
         Me.Panel4.BackColor = System.Drawing.Color.White
         Me.Panel4.Controls.Add(Me.FlowLayoutPanel)
-        Me.Panel4.Controls.Add(Me.pnlTest)
         Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel4.Location = New System.Drawing.Point(0, 0)
         Me.Panel4.Name = "Panel4"
         Me.Panel4.Size = New System.Drawing.Size(1356, 108)
         Me.Panel4.TabIndex = 11
         '
-        'pnlTest
-        '
-        Me.pnlTest.BackColor = System.Drawing.Color.White
-        Me.pnlTest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.pnlTest.Controls.Add(Me.dgvFILTER)
-        Me.pnlTest.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnlTest.Location = New System.Drawing.Point(0, 78)
-        Me.pnlTest.Name = "pnlTest"
-        Me.pnlTest.Size = New System.Drawing.Size(1356, 30)
-        Me.pnlTest.TabIndex = 33
-        '
-        'dgvFILTER
-        '
-        Me.dgvFILTER.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvFILTER.AllowUserToAddRows = False
-        Me.dgvFILTER.AllowUserToDeleteRows = False
-        Me.dgvFILTER.AllowUserToResizeColumns = False
-        Me.dgvFILTER.AllowUserToResizeRows = False
-        Me.dgvFILTER.BackgroundColor = System.Drawing.Color.White
-        Me.dgvFILTER.BorderStyle = System.Windows.Forms.BorderStyle.None
-        Me.dgvFILTER.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvFILTER.ColumnHeadersVisible = False
-        Me.dgvFILTER.Location = New System.Drawing.Point(0, 0)
-        Me.dgvFILTER.Name = "dgvFILTER"
-        Me.dgvFILTER.ScrollBars = System.Windows.Forms.ScrollBars.None
-        Me.dgvFILTER.Size = New System.Drawing.Size(1286, 28)
-        Me.dgvFILTER.TabIndex = 0
-        '
         'cntxtExcel
         '
         Me.cntxtExcel.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem3, Me.ToolStripMenuItem6})
@@ -483,15 +497,6 @@ Partial Class usrcntlFremdrechnungen
         Me.ToolStripMenuItem6.Size = New System.Drawing.Size(210, 22)
         Me.ToolStripMenuItem6.Text = "Formatiert (dauert länger)"
         '
-        'UsrCntlDatenDetails1
-        '
-        Me.UsrCntlDatenDetails1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlDatenDetails1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrCntlDatenDetails1.Name = "UsrCntlDatenDetails1"
-        Me.UsrCntlDatenDetails1.Size = New System.Drawing.Size(1354, 234)
-        Me.UsrCntlDatenDetails1.TabIndex = 0
-        Me.UsrCntlDatenDetails1.Visible = False
-        '
         'usrcntlFremdrechnungen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -507,13 +512,10 @@ Partial Class usrcntlFremdrechnungen
         Me.Panel1.PerformLayout()
         Me.Panel3.ResumeLayout(False)
         Me.SplitContainer1.Panel1.ResumeLayout(False)
-        Me.SplitContainer1.Panel2.ResumeLayout(False)
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainer1.ResumeLayout(False)
         CType(Me.dgvSDL, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Panel4.ResumeLayout(False)
-        Me.pnlTest.ResumeLayout(False)
-        CType(Me.dgvFILTER, System.ComponentModel.ISupportInitialize).EndInit()
         Me.cntxtExcel.ResumeLayout(False)
         Me.ResumeLayout(False)
 
@@ -526,7 +528,6 @@ Partial Class usrcntlFremdrechnungen
     Friend WithEvents btnSDL_UTA As System.Windows.Forms.Button
     Friend WithEvents btnSDL_FREJUS As System.Windows.Forms.Button
     Friend WithEvents btnSDL_Hugo As System.Windows.Forms.Button
-    Friend WithEvents btnFilter 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
@@ -536,18 +537,21 @@ 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 dgvSDL As VERAG_PROG_ALLGEMEIN.MyDatagridview
     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 cbxMax200Eintrage As System.Windows.Forms.CheckBox
-    Friend WithEvents UsrCntlDatenDetails1 As SDL.usrCntlDatenDetails
     Friend WithEvents Button1 As System.Windows.Forms.Button
     Friend WithEvents Panel4 As System.Windows.Forms.Panel
-    Friend WithEvents pnlTest As System.Windows.Forms.Panel
-    Friend WithEvents dgvFILTER As VERAG_PROG_ALLGEMEIN.MyDatagridview
     Friend WithEvents btnSDL_PLOSE As Button
     Friend WithEvents btnVERAGCardNew As Button
     Friend WithEvents btnSDL_RMC As Button
+    Friend WithEvents dgvSDL As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents Label4 As Label
+    Friend WithEvents Label2 As Label
+    Friend WithEvents Label1 As Label
+    Friend WithEvents cbx As CheckBox
+    Friend WithEvents dat_Sum_Bis As DateTimePicker
+    Friend WithEvents dat_Sum_Von As DateTimePicker
 End Class

SDL/mdm/usrcntlFremdrechnungen.vb

@@ -20,15 +20,15 @@ Public Class usrcntlFremdrechnungen
 
         init()
 
-        AddHandler SplitContainer1.Panel1.Scroll, Sub()
-                                                      initFilterLeft()
-                                                  End Sub
-
         AddHandler cbxMax200Eintrage.Click, Sub()
                                                 reClick()
                                             End Sub
 
 
+        SplitContainer1.Panel2Collapsed = True
+
+        dat_Sum_Von.Value = New Date(Today.AddYears(-1).Year, 1, 1)
+        dat_Sum_Bis.Value = New Date(Today.Year, 12, 31)
 
     End Sub
 
@@ -75,62 +75,11 @@ Public Class usrcntlFremdrechnungen
         dgvInitWait = False
         Panel3.Visible = True
 
-
     End Sub
 
 
 
 
-    Sub initFilterLeft()
-        Dim left_value As Integer = SplitContainer1.Panel1.HorizontalScroll.Value 'HorizontalScrollingOffset
-        dgvFILTER.Left = (-1) * left_value
-    End Sub
-
-
-
-    Sub initFilter()
-        dgvInitWait = True
-
-        dgvFILTER.RowTemplate.Height = dgvFILTER.Height
-        If Not fullyPainted Then Exit Sub ' nur wenn die usrcntl komplett gelden wurde...
-        'pnlFilter.Controls.Clear()
-        Try
-            dgvFILTER.Columns.Clear()
-        Catch ex As Exception
-
-        End Try
-        For Each c As DataGridViewColumn In dgvSDL.Columns
-            Dim cNew As DataGridViewColumn = c.Clone
-
-            If c.ReadOnly And c.Name = "IDS-KdNr" Then
-                cNew = New DataGridViewTextBoxColumn
-                cNew.Name = c.Name
-                cNew.Width = c.Width
-                cNew.Visible = c.Visible
-                'KundenNr
-            End If
-            cNew.MinimumWidth = c.Width
-            dgvFILTER.Columns.Add(cNew)
-            If cNew.GetType Is GetType(DataGridViewCheckBoxColumn) Then
-                DirectCast(cNew, DataGridViewCheckBoxColumn).ThreeState = True
-                DirectCast(cNew, DataGridViewCheckBoxColumn).DefaultCellStyle.NullValue = CheckState.Indeterminate
-            End If
-        Next
-
-        If dgvFILTER IsNot Nothing AndAlso dgvFILTER.ColumnCount > 0 Then
-
-            'dgv.AllowUserToAddRows = False
-            dgvFILTER.Rows.Add()
-            '   pnlTest.Controls.Add(dgv)
-            ' dgv.Top = 0
-            ' dgv.Left = 0
-            dgvFILTER.Width = dgvSDL.Width
-        End If
-
-        dgvInitWait = False
-
-    End Sub
-
     Dim txtchanged As Boolean = False
     Sub initSearchOLD()
         reClick()
@@ -156,68 +105,8 @@ Public Class usrcntlFremdrechnungen
         End Try
     End Function
 
-    Function getFilter() As String
 
 
-        Dim filter As String = ""
-        Dim andstr As String = ""
-
-        If dgvFILTER.RowCount > 0 Then
-            For Each c As DataGridViewCell In dgvFILTER.Rows(0).Cells
-                If c.Value IsNot DBNull.Value Then
-                    If c.GetType Is GetType(DataGridViewTextBoxCell) Then
-                        If c.Value IsNot Nothing AndAlso c.Value <> "" Then
-                            Dim srchstr = getSqlText(c.Value.ToString.Trim)
-                            If c.OwningColumn.Name.Contains("SDLNr") Then
-                                filter &= andstr & " FMZOLL.[" & c.OwningColumn.Name & "] LIKE '%" & srchstr & "%' "
-                            ElseIf c.OwningColumn.Name.Contains("IDS-KdNr") Then
-                                filter &= andstr & " (SELECT TOP 1 [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden]  WHERE [KdNrVERAG]=KundenNr AND KdNrAlt =0  ORDER BY Zeitstempel DESC)  LIKE '%" & srchstr & "%'  "
-                            ElseIf IsDate(srchstr) Then
-                                If srchstr.ToLower = "ist null" Then
-                                    filter &= andstr & "( [" & c.OwningColumn.Name & "] is null ) "
-                                Else
-                                    filter &= andstr & " convert(varchar,[" & c.OwningColumn.Name & "] ,104) LIKE '%" & srchstr & "%' "
-                                End If
-                            Else
-                                If srchstr.ToLower = "ist null" Then
-                                    filter &= andstr & "( [" & c.OwningColumn.Name & "] LIKE '' OR  [" & c.OwningColumn.Name & "] is null ) "
-                                Else
-                                    filter &= andstr & " [" & c.OwningColumn.Name & "] LIKE '%" & srchstr & "%' "
-                                End If
-                            End If
-                            andstr = " AND "
-                        End If
-                    ElseIf c.GetType Is GetType(DataGridViewCheckBoxCell) Then
-                        If c.Value IsNot Nothing AndAlso c.Value.ToString <> "" Then
-                            If c.Value = CheckState.Checked Then
-                                filter &= andstr & " FMZOLL.[" & c.OwningColumn.Name & "] =1 "
-                                andstr = " AND "
-                            ElseIf c.Value = CheckState.Unchecked Then
-                                filter &= andstr & " FMZOLL.[" & c.OwningColumn.Name & "] =0 "
-                                andstr = " AND "
-                            End If
-                        End If
-                    End If
-
-                End If
-            Next
-        End If
-
-        Return filter
-    End Function
-
-
-
-
-    Sub clearFilter()
-        If dgvFILTER.RowCount > 0 Then
-            For Each c As DataGridViewCell In dgvFILTER.Rows(0).Cells
-                c.Value = c.DefaultNewRowValue
-            Next
-        End If
-
-    End Sub
-
 
     Sub initAllg()
         If Not fullyPainted Then Exit Sub ' nur wenn die usrcntl komplett gelden wurde...
@@ -304,68 +193,71 @@ Public Class usrcntlFremdrechnungen
     End Sub
 
 
-    Sub SET_SDL(SDLNrTmp, Optional doFilter = False)
+    Sub SET_SDL(SDLNrTmp)
         aktSDLNr = SDLNrTmp
 
+
+
+
         Dim SQL_STR = ""
         Select Case SDLNrTmp
 
             'IDS
             Case 100 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") &
-                    " [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer,[daId],[TransactionVolume] as Transaktionsmenge,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt, cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM tblIDSInvoicesNew WHERE [CustomerCode] =  (SELECT TOP 1 [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE [KdNrVERAG]=" & kdNr & " AND KdNrAlt =0  ORDER BY Zeitstempel DESC) order by [YearMonthDay] desc, [Invoicenumber]"
+                    " [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer,[daId],[TransactionVolume] as Transaktionsmenge,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt, cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM tblIDSInvoicesNew WHERE [CustomerCode] =  (SELECT TOP 1 [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE [KdNrVERAG]=" & kdNr & " AND KdNrAlt =0 and [YearMonthDay] " & setSQLWhere(SDLNrTmp, "") & "  ORDER BY Zeitstempel DESC) order by [YearMonthDay] desc, [Invoicenumber]"
 
             'UTA
             Case 212 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") &
-                    " [Rechnungsdatum],[Rechnungsnummer_pro_Lieferland] as Rechnungsnummer,Kundennummer,SUM(Gesamtbetrag_Brutto_in_Darstellwährung) as Bruttobetrag,SUM(Gesamtbetrag_Netto_in_Darstellwährung) as Nettobetrag, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[daId],[Lieferland_ISO2] as Land, 'RE' as Art, cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTAImportNew] inner join adressen on Kundennummer = UTAKundenNr  where AdressenNr = " & kdNr & "  group by [Rechnungsnummer_pro_Lieferland],[Rechnungsdatum],Kundennummer,[daId],[Lieferland_ISO2]"
+                    " [Rechnungsdatum],[Rechnungsnummer_pro_Lieferland] as Rechnungsnummer,Kundennummer,SUM(Gesamtbetrag_Brutto_in_Darstellwährung) as Bruttobetrag,SUM(Gesamtbetrag_Netto_in_Darstellwährung) as Nettobetrag, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[daId],[Lieferland_ISO2] as Land, 'RE' as Art, cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTAImportNew] inner join adressen on Kundennummer = UTAKundenNr  where AdressenNr = " & kdNr & " [Rechnungsdatum] " & setSQLWhere(SDLNrTmp, "Land") & "  group by [Rechnungsnummer_pro_Lieferland],[Rechnungsdatum],Kundennummer,[daId],[Lieferland_ISO2]"
 
-                SQL_STR &= " UNION ALL SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " [Datum], [RechnungsNr],[KundenNr],0,0,0,[daId],'',[DocumentTyp], cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTADocuments]inner join adressen on KundenNr = UTAKundenNr  where AdressenNr = " & kdNr
+                SQL_STR &= " UNION ALL SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " [Datum], [RechnungsNr],[KundenNr],0,0,0,[daId],'',[DocumentTyp], cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTADocuments]inner join adressen on KundenNr = UTAKundenNr  where AdressenNr = " & kdNr & " and [Rechnungsdatum] " & setSQLWhere(SDLNrTmp, "") & "  order by Rechnungsdatum desc"
 
             'PLOSE
             Case 214 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") &
-                   " [plInv_SupplierRechnungsDatum] as Rechnungsdatum, [plInv_SupplierRechnungsNr] as Rechnungsnummer,[plInv_Nettobetrag] as Nettobetrag,[plInv_MWSTBetrag] as MWST,[plInv_Bruttobetrag] as Bruttobetrag,[plInv_daId] as daId, [plInv_SupplierCountry] as Land,  cast(case when [plInv_daId] is not null then 1 else 0 end as bit) as PDF FROM tblPLOSE_Inv_Data where plInv_PLOSEKundennummer = " & kdNr
+                   " [plInv_SupplierRechnungsDatum] as Rechnungsdatum, [plInv_SupplierRechnungsNr] as Rechnungsnummer,[plInv_Nettobetrag] as Nettobetrag,[plInv_MWSTBetrag] as MWST,[plInv_Bruttobetrag] as Bruttobetrag,[plInv_daId] as daId, [plInv_SupplierCountry] as Land,  cast(case when [plInv_daId] is not null then 1 else 0 end as bit) as PDF FROM tblPLOSE_Inv_Data  inner join Adressen on Adressen.PLOSEKundenNr = plInv_PLOSEKundennummer where Adressen.AdressenNr = " & kdNr & " and [plInv_SupplierRechnungsDatum] " & setSQLWhere(SDLNrTmp, "plInv_SupplierCountry") & "  Order by plInv_SupplierRechnungsDatum desc, [plInv_SupplierRechnungsNr]"
 
             'MSE
             Case 208 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") &
-                    " [invoice_date] as Rechnungsdatum, [invoice_id] as Rechnungsnummer/*,[invoice_nr]*/,[customer_number] as Kundennummer, daId, [total_amount_euro] as Brutto_EUR  ,[total_vat_amount_euro] as MWST,[country] as Land,  cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM tblMSEInvoices where customer_number = (select top 1 customer_id from tblMSECustomers where partner_customer_number = " & kdNr & ") order by invoice_date, invoice_id"
+                    " [invoice_date] as Rechnungsdatum, [invoice_id] as Rechnungsnummer/*,[invoice_nr]*/,[customer_number] as Kundennummer, daId, [total_amount_euro] as Brutto_EUR  ,[total_vat_amount_euro] as MWST,[country] as Land,  cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM tblMSEInvoices where customer_number = (select top 1 customer_id from tblMSECustomers where partner_customer_number = " & kdNr & " and [invoice_date] " & setSQLWhere(SDLNrTmp, "country") & " ) order by invoice_date desc, invoice_id"
 
             'VERAG
             Case 502 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") &
-                    " tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer , tblTrdinInvoice.SteuerbetragLokal, cast( 1 as bit) as PDF FROM tblTrdinInvoice WHERE tblTrdinInvoice.RechnungsKundenNr=" & kdNr & " ORDER BY tblTrdinInvoice.Rechnungsdatum desc, tblTrdinInvoice.Rechnungsnummer"
+                    " tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer , tblTrdinInvoice.SteuerbetragLokal, cast( 1 as bit) as PDF FROM tblTrdinInvoice WHERE tblTrdinInvoice.RechnungsKundenNr=" & kdNr & " AND tblTrdinInvoice.FilialenNr = 4814 and tblTrdinInvoice.Rechnungsdatum " & setSQLWhere(SDLNrTmp, "'AT'") & "  ORDER BY tblTrdinInvoice.Rechnungsdatum desc, tblTrdinInvoice.Rechnungsnummer"
             'RMC
             Case 999 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") &
-               "[rmc_reDatum]  as Rechnungsdatum,[rmc_reNr] as Rechnungsnummer,[rmc_betragNetto] as Nettobetrag,[rmc_betragBrutto] as Bruttobetrag,[rmc_waehrung] as Währung ,[rmc_euroBrutto] as Brutto_EUR,[rmc_daId] as daId,[rmc_betragMWST] as MWST, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblRMCImport] where rmc_kdNr = " & kdNr & " order by rmc_reDatum, rmc_reNr"
+               "[rmc_reDatum]  as Rechnungsdatum,[rmc_reNr] as Rechnungsnummer,[rmc_betragNetto] as Nettobetrag,[rmc_betragBrutto] as Bruttobetrag,[rmc_waehrung] as Währung ,[rmc_euroBrutto] as Brutto_EUR,[rmc_daId] as daId,[rmc_betragMWST] as MWST,rmc_landKZ as Land, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where AdressenNr = " & kdNr & " and [rmc_reDatum] " & setSQLWhere(SDLNrTmp, "rmc_landKZ") & "  order by rmc_reDatum desc, rmc_reNr"
 
             Case -1 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") &
                     "
                         --IDS
-                          'IDS' as Lieferant, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer,CustomerCode as Kundennummer,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt,'' as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM tblIDSInvoicesNew WHERE [CustomerCode] =  (SELECT TOP 1 [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE [KdNrVERAG]=" & kdNr & " AND KdNrAlt =0  ORDER BY Zeitstempel DESC) --order by [YearMonthDay], [Invoicenumber]
+                          'IDS' as Lieferant, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer,CustomerCode as Kundennummer,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt,'' as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM tblIDSInvoicesNew WHERE [CustomerCode] =  (SELECT TOP 1 [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE [KdNrVERAG]=" & kdNr & " AND KdNrAlt =0 and [YearMonthDay] " & setSQLWhere(SDLNrTmp, "") & "   ORDER BY Zeitstempel DESC) --order by [YearMonthDay], [Invoicenumber]
                         
                         UNION ALL
                         
                         
                         --MSE
-                        SELECT  'MSE' as Lieferant, [invoice_date] as Rechnungsdatum, cast([invoice_id] as nvarchar) as Rechnungsnummer,[customer_number] as Kundennummer,  [total_amount_euro] as Bruttobetrag ,(total_amount_euro - [total_vat_amount_euro]) as Nettobetrag  ,[total_vat_amount_euro] as MWST,[country] as Land,'RE' as Art,daId,  cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM tblMSEInvoices where customer_number = (select top 1 customer_id from tblMSECustomers where partner_customer_number = " & kdNr & ") --order by invoice_date, invoice_id
+                        SELECT  'MSE' as Lieferant, [invoice_date] as Rechnungsdatum, cast([invoice_id] as nvarchar) as Rechnungsnummer,[customer_number] as Kundennummer,  [total_amount_euro] as Bruttobetrag ,(total_amount_euro - [total_vat_amount_euro]) as Nettobetrag  ,[total_vat_amount_euro] as MWST,[country] as Land,'RE' as Art,daId,  cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM tblMSEInvoices where customer_number = (select top 1 customer_id from tblMSECustomers where partner_customer_number = " & kdNr & " and [invoice_date] " & setSQLWhere(SDLNrTmp, "country") & "   ) --order by invoice_date, invoice_id
                         
                         UNION ALL
                         
                         --UTA
-                        SELECT 'UTA' as Lieferant, [Rechnungsdatum],STR([Rechnungsnummer_pro_Lieferland])  as Rechnungsnummer,Kundennummer,SUM(Gesamtbetrag_Brutto_in_Darstellwährung) as Bruttobetrag,SUM(Gesamtbetrag_Netto_in_Darstellwährung) as Nettobetrag, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[Lieferland_ISO2] as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTAImportNew] inner join adressen on Kundennummer = UTAKundenNr  where AdressenNr = " & kdNr & "  group by [Rechnungsnummer_pro_Lieferland],[Rechnungsdatum],Kundennummer,[daId],[Lieferland_ISO2] UNION ALL SELECT 'UTA', [Datum], cast([RechnungsNr] as nvarchar) ,[KundenNr],0,0,0,'',[DocumentTyp],[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTADocuments]inner join adressen on KundenNr = UTAKundenNr  where AdressenNr = 401026
+                        SELECT 'UTA' as Lieferant, [Rechnungsdatum],STR([Rechnungsnummer_pro_Lieferland])  as Rechnungsnummer,Kundennummer,SUM(Gesamtbetrag_Brutto_in_Darstellwährung) as Bruttobetrag,SUM(Gesamtbetrag_Netto_in_Darstellwährung) as Nettobetrag, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[Lieferland_ISO2] as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTAImportNew] inner join adressen on Kundennummer = UTAKundenNr  where AdressenNr = " & kdNr & " and [Rechnungsdatum] " & setSQLWhere(SDLNrTmp, "Lieferland_ISO2") & "     group by [Rechnungsnummer_pro_Lieferland],[Rechnungsdatum],Kundennummer,[daId],[Lieferland_ISO2] UNION ALL SELECT 'UTA', [Datum], cast([RechnungsNr] as nvarchar) ,[KundenNr],0,0,0,'',[DocumentTyp],[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTADocuments]inner join adressen on KundenNr = UTAKundenNr  where AdressenNr = " & kdNr & " AND Datum " & setSQLWhere(SDLNrTmp, "") & " 
                         
                         UNION ALL
-                        --VERA
+                        --VERAG
                         
-                        SELECT 'VERAG' as Lieferant,  tblTrdinInvoice.Rechnungsdatum, cast(tblTrdinInvoice.Rechnungsnummer as nvarchar) as Rechnungsnummer ,tblTrdinInvoice.KundenNrZentrale as Kundennummer, tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal as Bruttobetrag ,tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal - tblTrdinInvoice.SteuerbetragLokal  as Nettobetrag ,tblTrdinInvoice.SteuerbetragLokal as MWST, 'AT' as Land, 'RE' as Art, -1 as daId, cast( 1 as bit) as PDF FROM tblTrdinInvoice WHERE tblTrdinInvoice.RechnungsKundenNr=" & kdNr & " -- ORDER BY tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer
+                        SELECT 'VERAG' as Lieferant,  tblTrdinInvoice.Rechnungsdatum, cast(tblTrdinInvoice.Rechnungsnummer as nvarchar) as Rechnungsnummer ,tblTrdinInvoice.KundenNrZentrale as Kundennummer, tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal as Bruttobetrag ,tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal - tblTrdinInvoice.SteuerbetragLokal  as Nettobetrag ,tblTrdinInvoice.SteuerbetragLokal as MWST, 'AT' as Land, 'RE' as Art, -1 as daId, cast( 1 as bit) as PDF FROM tblTrdinInvoice WHERE tblTrdinInvoice.RechnungsKundenNr=" & kdNr & " and tblTrdinInvoice.Rechnungsdatum " & setSQLWhere(SDLNrTmp, "'AT'") & "    AND tblTrdinInvoice.FilialenNr = 4814 -- ORDER BY tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer
                         
                         
                         UNION ALL
                         --PLOSE
                         
-                        SELECT 'PLOSE' as Lieferant,  [plInv_SupplierRechnungsDatum] as Rechnungsdatum, cast([plInv_SupplierRechnungsNr]  as nvarchar) as Rechnungsnummer,[plInv_PLOSEKundennummer] as Kundennummer,[plInv_Bruttobetrag] as Bruttobetrag,[plInv_Nettobetrag] as Nettobetrag,[plInv_MWSTBetrag] as MWST, [plInv_SupplierCountry] as Land, 'RE' as Art,[plInv_daId] as daId, cast(case when [plInv_daId] is not null then 1 else 0 end as bit) as PDF FROM tblPLOSE_Inv_Data where plInv_PLOSEKundennummer = " & kdNr & "
+                        SELECT 'PLOSE' as Lieferant,  [plInv_SupplierRechnungsDatum] as Rechnungsdatum, cast([plInv_SupplierRechnungsNr]  as nvarchar) as Rechnungsnummer,[plInv_PLOSEKundennummer] as Kundennummer,[plInv_Bruttobetrag] as Bruttobetrag,[plInv_Nettobetrag] as Nettobetrag,[plInv_MWSTBetrag] as MWST, [plInv_SupplierCountry] as Land, 'RE' as Art,[plInv_daId] as daId, cast(case when [plInv_daId] is not null then 1 else 0 end as bit) as PDF FROM tblPLOSE_Inv_Data  inner join Adressen on Adressen.PLOSEKundenNr = plInv_PLOSEKundennummer  where Adressen.AdressenNr = " & kdNr & " and [plInv_SupplierRechnungsDatum] " & setSQLWhere(SDLNrTmp, "plInv_SupplierCountry") & "   
                         
                         UNION ALL
                         
                         --RMC
-                        SELECT 'RMC' as Lieferant, [rmc_reDatum]  as Rechnungsdatum,cast([rmc_reNr] as nvarchar) as Rechnungsnummer,rmc_kdNr as Kundennummer ,[rmc_betragBrutto] as Bruttobetrag,[rmc_betragNetto] as Nettobetrag,[rmc_betragMWST] as MWST, 'X' as Land, 'RE' as Art, [rmc_daId] as daId, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblRMCImport] where rmc_kdNr = " & kdNr & " --order by rmc_reDatum, rmc_reNr
+                        SELECT 'RMC' as Lieferant, [rmc_reDatum]  as Rechnungsdatum,cast([rmc_reNr] as nvarchar) as Rechnungsnummer,rmc_kdNr as Kundennummer ,[rmc_betragBrutto] as Bruttobetrag,[rmc_betragNetto] as Nettobetrag,[rmc_betragMWST] as MWST, rmc_landKZ as Land, 'RE' as Art, [rmc_daId] as daId, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where AdressenNr = " & kdNr & " and [rmc_reDatum] " & setSQLWhere(SDLNrTmp, "rmc_landKZ") & "    --order by rmc_reDatum, rmc_reNr
                         
                         order by Rechnungsdatum desc"
 
@@ -376,7 +268,7 @@ Public Class usrcntlFremdrechnungen
 
         End Select
 
-        newBinding(SDLNrTmp, SQL_STR, doFilter)
+        newBinding(SDLNrTmp, SQL_STR)
         initBtnClick(getSDLNrButton(SDLNrTmp))
 
         With dgvSDL
@@ -399,11 +291,28 @@ Public Class usrcntlFremdrechnungen
         dgvSDL.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
 
         initDGVWidth() 'vor Filter, damit richtige Größe
-        If Not doFilter Then initFilter()
-
 
     End Sub
 
+    Private Function setSQLWhere(SDLNrTmp As Integer, land As String) As String
+
+
+        Dim SQLWhere = " between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "'"
+
+        If cbx.Checked AndAlso SDLNrTmp <> 100 Then
+            Select Case KUNDE.LandKz
+                Case "SRB", "BIH", "MK", "MNE", "TR"
+                    If land <> "" Then SQLWhere &= " AND " & land & " not in('AT','CH', 'CZ', 'DE', 'EE', 'ES', 'IE', 'LT', 'LV', 'NRW', 'NO', 'OT', 'RS', 'UA', " & IIf(KUNDE.LandKz = "SRB", "'BG', 'HU', 'RO', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "BIH", "'SK'", "") & IIf(KUNDE.LandKz = "TR", "'HU', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "MNE", "'PL', 'SI'", "") & IIf(KUNDE.LandKz = "MK", "'BG', 'PL','SI'", "") & ")"
+            End Select
+        End If
+
+        Return SQLWhere
+
+    End Function
+
+
+
+
     Function getSDLNrButton(SDLNrTmp) As Object
         Select Case SDLNrTmp
             Case 100 : Return btnSDL_IDS
@@ -459,22 +368,10 @@ Public Class usrcntlFremdrechnungen
     End Sub
 
 
-    Private Sub dgvSDL_ColumnWidthChanged(sender As Object, e As DataGridViewColumnEventArgs) Handles dgvSDL.ColumnWidthChanged
-        initfilterColumnsWidth()
-    End Sub
 
-    Sub initfilterColumnsWidth()
 
-        If dgvFILTER.ColumnCount > 0 AndAlso dgvFILTER.ColumnCount = dgvSDL.ColumnCount Then
 
-            dgvFILTER.Width = dgvSDL.Width
+    Sub newBinding(sdlNr As Integer, ByVal sql As String)
-            For Each c As DataGridViewColumn In dgvSDL.Columns
-                dgvFILTER.Columns(c.Index).Width = c.Width
-            Next
-
-        End If
-    End Sub
-    Sub newBinding(sdlNr As Integer, ByVal sql As String, doFilter As Boolean)
         dgvInitWait = True
         ' bindingSDL = Nothing
         dgvSDL.Columns.Clear()
@@ -482,12 +379,6 @@ Public Class usrcntlFremdrechnungen
         txtchanged = True
         dgvInitWait = True
 
-        If doFilter Then
-            Dim filter As String = getFilter()
-            If filter <> "" Then sql &= " AND " & filter
-        Else
-
-        End If
 
         dgvSDL.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
 
@@ -512,17 +403,6 @@ Public Class usrcntlFremdrechnungen
 
 
 
-    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles btnFilter.Click
-        '     MsgBox(pnlFilterInside.Height)
-        Exit Sub
-        If pnlTest.Height > 0 Then
-            pnlTest.Height = 0
-            btnFilter.Text = "Filter einblenden"
-        Else
-            pnlTest.Height = 39
-            btnFilter.Text = "Filter ausblenden"
-        End If
-    End Sub
 
 
 
@@ -541,7 +421,7 @@ Public Class usrcntlFremdrechnungen
     End Sub
 
     Sub refreshDgv(kdNr, SDLNr, Optional Kfz = "", Optional History = "")
-        SET_SDL(aktSDLNr, True)
+        SET_SDL(aktSDLNr)
 
         dgvSDL.ClearSelection()
         If Kfz <> "" And History <> "" Then
@@ -560,12 +440,12 @@ Public Class usrcntlFremdrechnungen
 
 
 
-    Private Sub UsrCntlDatenDetails1_Changed(kdNr, Kfz, SDLNr, History) Handles UsrCntlDatenDetails1.Changed
+    Private Sub UsrCntlDatenDetails1_Changed(kdNr, Kfz, SDLNr, History)
         'refreshDgv(kdNr, SDLNr, Kfz, History)'?????????????? ausgebelndet,was das ein VErsuch? 31.07.2017
         dgvSDL.VALUE_CHANGED = True
     End Sub
 
-    Private Sub datadgvSDL_SelectionChanged(kdNr, Kfz, SDLNr, History) Handles UsrCntlDatenDetails1.DataChanged
+    Private Sub datadgvSDL_SelectionChanged(kdNr, Kfz, SDLNr, History)
         '    refreshDgv(kdNr, SDLNr, Kfz, History)
         dgvSDL.VALUE_CHANGED = True
         Exit Sub
@@ -587,7 +467,7 @@ Public Class usrcntlFremdrechnungen
 
 
     Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
-        'TODO CREATE EMAIL 
+
 
         If dgvSDL.SelectedRows.Count > 0 Then
 
@@ -712,23 +592,23 @@ Public Class usrcntlFremdrechnungen
     End Sub
 
 
-    Sub SelectRow(kdnr, kfz, SDLNr, history)
+    'Sub SelectRow(kdnr, kfz, SDLNr, history)
-        dgvInitWait = True
+    '    dgvInitWait = True
-        dgvSDL.ClearSelection()
+    '    dgvSDL.ClearSelection()
-        For Each r As DataGridViewRow In dgvSDL.Rows
+    '    For Each r As DataGridViewRow In dgvSDL.Rows
-            If r.Cells("KundenNr").Value = kdnr AndAlso
+    '        If r.Cells("KundenNr").Value = kdnr AndAlso
-                r.Cells("SDLNr").Value = SDLNr AndAlso
+    '            r.Cells("SDLNr").Value = SDLNr AndAlso
-                r.Cells("KfzKennzeichen").Value = kfz AndAlso
+    '            r.Cells("KfzKennzeichen").Value = kfz AndAlso
-                r.Cells("History").Value = history Then
+    '            r.Cells("History").Value = history Then
-                r.Selected = True
+    '            r.Selected = True
-                dgvSDL.FirstDisplayedScrollingRowIndex = r.Index
+    '            dgvSDL.FirstDisplayedScrollingRowIndex = r.Index
-                Exit For
+    '            Exit For
-            End If
+    '        End If
-        Next
+    '    Next
-        dgvInitWait = False
+    '    dgvInitWait = False
-        'ReloadLeistung()
+    '    'ReloadLeistung()
-        dgvSDL.PerformLayout()
+    '    dgvSDL.PerformLayout()
-    End Sub
+    'End Sub
 
 
     Private Sub ToolStripMenuItem3_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem3.Click
@@ -751,7 +631,8 @@ Public Class usrcntlFremdrechnungen
     End Sub
 
     Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles Button1.Click
-        dgvSDL.RELOAD()
+
+        SET_SDL(aktSDLNr)
     End Sub
 
 
@@ -774,30 +655,13 @@ Public Class usrcntlFremdrechnungen
         vval = SplitContainer1.Panel1.VerticalScroll.Value
     End Sub
 
-
-    Private Sub dgvFILTER_SelectionChanged(sender As Object, e As EventArgs) Handles dgvFILTER.SelectionChanged
-        dgvFILTER.ClearSelection()
-    End Sub
-
-    Private Sub dgvFILTER_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvFILTER.CellContentClick
-        If dgvFILTER.Columns(e.ColumnIndex).GetType Is GetType(DataGridViewCheckBoxColumn) Then
-            dgvSDL.Focus()
-        End If
-    End Sub
-
-
-    Private Sub dgvFILTER_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvFILTER.CellValueChanged
-        SET_SDL(aktSDLNr, True)
-        initfilterColumnsWidth()
-    End Sub
-
     Private Sub dgvSDL_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSDL.CellContentDoubleClick
 
         Try
             If e.RowIndex >= 0 AndAlso e.ColumnIndex >= 0 Then
 
                 Select Case aktSDLNr
-                    Case 502
+                    Case 502 'VERAG
                         Dim ReDat = dgvSDL.Rows(e.RowIndex).Cells("Rechnungsdatum").Value
                         Dim ReNr = dgvSDL.Rows(e.RowIndex).Cells("Rechnungsnummer").Value
 
@@ -807,7 +671,7 @@ Public Class usrcntlFremdrechnungen
                             cFakturierung.doRechnungsDruck_SRorER(da_id,, False, 3)
                         End If
 
-                    Case Else
+                    Case -1 'ALLE
                         Dim Lieferant = dgvSDL.Rows(e.RowIndex).Cells("Lieferant").Value
 
                         If Lieferant = "VERAG" Then
@@ -830,6 +694,17 @@ Public Class usrcntlFremdrechnungen
                             DS.OPEN_SINGLE()
                         End If
 
+
+                    Case Else
+
+
+                        Dim daId = dgvSDL.Rows(e.RowIndex).Cells("daId").Value
+                        If daId > 0 Then
+                            Me.Cursor = Cursors.WaitCursor
+                            Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId)
+                            DS.OPEN_SINGLE()
+                        End If
+
                 End Select
 
 
@@ -846,4 +721,12 @@ Public Class usrcntlFremdrechnungen
 
 
     End Sub
+
+    Private Sub dat_Sum_Von_Leave(sender As Object, e As EventArgs) Handles dat_Sum_Von.Leave, dat_Sum_Bis.Leave
+        SET_SDL(aktSDLNr)
+    End Sub
+
+    Private Sub cbx_CheckedChanged(sender As Object, e As EventArgs) Handles cbx.CheckedChanged
+        SET_SDL(aktSDLNr)
+    End Sub
 End Class

SDL/seriendruck/usrCntlFakturierung.Designer.vb

@@ -75,6 +75,7 @@ Partial Class usrcntlFakturierung
         Me.Label63 = New System.Windows.Forms.Label()
         Me.Label45 = New System.Windows.Forms.Label()
         Me.Button14 = New System.Windows.Forms.Button()
+        Me.Button1 = New System.Windows.Forms.Button()
         Me.GroupBox1.SuspendLayout()
         Me.GBMautberichte.SuspendLayout()
         CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -294,7 +295,7 @@ Partial Class usrcntlFakturierung
         Me.Label44.AutoSize = True
         Me.Label44.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label44.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Label44.Location = New System.Drawing.Point(11, 329)
+        Me.Label44.Location = New System.Drawing.Point(11, 340)
         Me.Label44.Name = "Label44"
         Me.Label44.Size = New System.Drawing.Size(436, 17)
         Me.Label44.TabIndex = 15
@@ -302,6 +303,7 @@ Partial Class usrcntlFakturierung
         '
         'GBSammelrechnung
         '
+        Me.GBSammelrechnung.Controls.Add(Me.Button1)
         Me.GBSammelrechnung.Controls.Add(Me.PictureBox6)
         Me.GBSammelrechnung.Controls.Add(Me.PictureBox5)
         Me.GBSammelrechnung.Controls.Add(Me.PictureBox4)
@@ -333,7 +335,7 @@ Partial Class usrcntlFakturierung
         Me.GBSammelrechnung.Controls.Add(Me.Label45)
         Me.GBSammelrechnung.Controls.Add(Me.Button14)
         Me.GBSammelrechnung.Enabled = False
-        Me.GBSammelrechnung.Location = New System.Drawing.Point(10, 340)
+        Me.GBSammelrechnung.Location = New System.Drawing.Point(10, 351)
         Me.GBSammelrechnung.Name = "GBSammelrechnung"
         Me.GBSammelrechnung.Size = New System.Drawing.Size(697, 393)
         Me.GBSammelrechnung.TabIndex = 14
@@ -343,7 +345,7 @@ Partial Class usrcntlFakturierung
         '
         Me.PictureBox6.BackgroundImage = CType(resources.GetObject("PictureBox6.BackgroundImage"), System.Drawing.Image)
         Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox6.Location = New System.Drawing.Point(151, 149)
+        Me.PictureBox6.Location = New System.Drawing.Point(232, 151)
         Me.PictureBox6.Name = "PictureBox6"
         Me.PictureBox6.Size = New System.Drawing.Size(14, 14)
         Me.PictureBox6.TabIndex = 105
@@ -354,7 +356,7 @@ Partial Class usrcntlFakturierung
         '
         Me.PictureBox5.BackgroundImage = CType(resources.GetObject("PictureBox5.BackgroundImage"), System.Drawing.Image)
         Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox5.Location = New System.Drawing.Point(151, 132)
+        Me.PictureBox5.Location = New System.Drawing.Point(232, 134)
         Me.PictureBox5.Name = "PictureBox5"
         Me.PictureBox5.Size = New System.Drawing.Size(14, 14)
         Me.PictureBox5.TabIndex = 104
@@ -365,7 +367,7 @@ Partial Class usrcntlFakturierung
         '
         Me.PictureBox4.BackgroundImage = CType(resources.GetObject("PictureBox4.BackgroundImage"), System.Drawing.Image)
         Me.PictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox4.Location = New System.Drawing.Point(151, 115)
+        Me.PictureBox4.Location = New System.Drawing.Point(232, 117)
         Me.PictureBox4.Name = "PictureBox4"
         Me.PictureBox4.Size = New System.Drawing.Size(14, 14)
         Me.PictureBox4.TabIndex = 103
@@ -376,7 +378,7 @@ Partial Class usrcntlFakturierung
         '
         Me.PictureBox3.BackgroundImage = CType(resources.GetObject("PictureBox3.BackgroundImage"), System.Drawing.Image)
         Me.PictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox3.Location = New System.Drawing.Point(151, 98)
+        Me.PictureBox3.Location = New System.Drawing.Point(232, 100)
         Me.PictureBox3.Name = "PictureBox3"
         Me.PictureBox3.Size = New System.Drawing.Size(14, 14)
         Me.PictureBox3.TabIndex = 102
@@ -387,7 +389,7 @@ Partial Class usrcntlFakturierung
         '
         Me.PictureBox2.BackgroundImage = CType(resources.GetObject("PictureBox2.BackgroundImage"), System.Drawing.Image)
         Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox2.Location = New System.Drawing.Point(151, 81)
+        Me.PictureBox2.Location = New System.Drawing.Point(232, 83)
         Me.PictureBox2.Name = "PictureBox2"
         Me.PictureBox2.Size = New System.Drawing.Size(14, 14)
         Me.PictureBox2.TabIndex = 101
@@ -398,7 +400,7 @@ Partial Class usrcntlFakturierung
         '
         Me.PictureBox1.BackgroundImage = Global.SDL.My.Resources.Resources.ok
         Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox1.Location = New System.Drawing.Point(151, 67)
+        Me.PictureBox1.Location = New System.Drawing.Point(232, 69)
         Me.PictureBox1.Name = "PictureBox1"
         Me.PictureBox1.Size = New System.Drawing.Size(14, 14)
         Me.PictureBox1.TabIndex = 95
@@ -407,9 +409,9 @@ Partial Class usrcntlFakturierung
         '
         'Label4
         '
-        Me.Label4.Location = New System.Drawing.Point(171, 132)
+        Me.Label4.Location = New System.Drawing.Point(252, 134)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(541, 17)
+        Me.Label4.Size = New System.Drawing.Size(440, 17)
         Me.Label4.TabIndex = 100
         Me.Label4.Text = "5. Banküberweisung/Bankspesen berechnen"
         '
@@ -453,7 +455,7 @@ Partial Class usrcntlFakturierung
         '
         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(10, 28)
+        Me.Button20.Location = New System.Drawing.Point(147, 12)
         Me.Button20.Name = "Button20"
         Me.Button20.Size = New System.Drawing.Size(121, 49)
         Me.Button20.TabIndex = 43
@@ -566,9 +568,9 @@ Partial Class usrcntlFakturierung
         '
         'Label70
         '
-        Me.Label70.Location = New System.Drawing.Point(171, 149)
+        Me.Label70.Location = New System.Drawing.Point(252, 151)
         Me.Label70.Name = "Label70"
-        Me.Label70.Size = New System.Drawing.Size(498, 17)
+        Me.Label70.Size = New System.Drawing.Size(429, 14)
         Me.Label70.TabIndex = 30
         Me.Label70.Text = "6. Hängt Mautgesamtbericht an Sammenrechnungen an."
         '
@@ -578,7 +580,7 @@ Partial Class usrcntlFakturierung
         Me.cboSachbearbeiter._allowFreiText = False
         Me.cboSachbearbeiter._value = ""
         Me.cboSachbearbeiter.FormattingEnabled = True
-        Me.cboSachbearbeiter.Location = New System.Drawing.Point(243, 36)
+        Me.cboSachbearbeiter.Location = New System.Drawing.Point(529, 38)
         Me.cboSachbearbeiter.Name = "cboSachbearbeiter"
         Me.cboSachbearbeiter.Size = New System.Drawing.Size(152, 21)
         Me.cboSachbearbeiter.TabIndex = 29
@@ -586,7 +588,7 @@ Partial Class usrcntlFakturierung
         'Label67
         '
         Me.Label67.AutoSize = True
-        Me.Label67.Location = New System.Drawing.Point(148, 36)
+        Me.Label67.Location = New System.Drawing.Point(434, 38)
         Me.Label67.Name = "Label67"
         Me.Label67.Size = New System.Drawing.Size(82, 13)
         Me.Label67.TabIndex = 28
@@ -595,7 +597,7 @@ Partial Class usrcntlFakturierung
         'dtRechnungsdatum
         '
         Me.dtRechnungsdatum.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.dtRechnungsdatum.Location = New System.Drawing.Point(292, 10)
+        Me.dtRechnungsdatum.Location = New System.Drawing.Point(578, 12)
         Me.dtRechnungsdatum.Name = "dtRechnungsdatum"
         Me.dtRechnungsdatum.Size = New System.Drawing.Size(103, 20)
         Me.dtRechnungsdatum.TabIndex = 26
@@ -603,7 +605,7 @@ Partial Class usrcntlFakturierung
         'Label66
         '
         Me.Label66.AutoSize = True
-        Me.Label66.Location = New System.Drawing.Point(148, 16)
+        Me.Label66.Location = New System.Drawing.Point(434, 18)
         Me.Label66.Name = "Label66"
         Me.Label66.Size = New System.Drawing.Size(94, 13)
         Me.Label66.TabIndex = 27
@@ -611,34 +613,34 @@ Partial Class usrcntlFakturierung
         '
         'Label65
         '
-        Me.Label65.Location = New System.Drawing.Point(171, 115)
+        Me.Label65.Location = New System.Drawing.Point(252, 117)
         Me.Label65.Name = "Label65"
-        Me.Label65.Size = New System.Drawing.Size(541, 17)
+        Me.Label65.Size = New System.Drawing.Size(440, 17)
         Me.Label65.TabIndex = 8
         Me.Label65.Text = "4. Porto/Papiere berechnen"
         '
         'Label64
         '
-        Me.Label64.Location = New System.Drawing.Point(171, 98)
+        Me.Label64.Location = New System.Drawing.Point(252, 100)
         Me.Label64.Name = "Label64"
-        Me.Label64.Size = New System.Drawing.Size(541, 17)
+        Me.Label64.Size = New System.Drawing.Size(440, 17)
         Me.Label64.TabIndex = 7
         Me.Label64.Text = "3. Rechnungstext im RK eintragen"
         '
         'Label63
         '
-        Me.Label63.Location = New System.Drawing.Point(171, 81)
+        Me.Label63.Location = New System.Drawing.Point(252, 83)
         Me.Label63.Name = "Label63"
-        Me.Label63.Size = New System.Drawing.Size(541, 17)
+        Me.Label63.Size = New System.Drawing.Size(440, 17)
         Me.Label63.TabIndex = 6
         Me.Label63.Text = "2. Rechnung oder Gutschrift im RK eintragen, abhängig vom Sammelrechnungsbetrag (" &
     "+/-)"
         '
         'Label45
         '
-        Me.Label45.Location = New System.Drawing.Point(171, 64)
+        Me.Label45.Location = New System.Drawing.Point(252, 66)
         Me.Label45.Name = "Label45"
-        Me.Label45.Size = New System.Drawing.Size(530, 17)
+        Me.Label45.Size = New System.Drawing.Size(224, 17)
         Me.Label45.TabIndex = 5
         Me.Label45.Text = "1. Einträge auf Sachbearbeiter ändern."
         '
@@ -646,13 +648,24 @@ Partial Class usrcntlFakturierung
         '
         Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button14.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Button14.Location = New System.Drawing.Point(10, 94)
+        Me.Button14.Location = New System.Drawing.Point(10, 85)
         Me.Button14.Name = "Button14"
         Me.Button14.Size = New System.Drawing.Size(121, 49)
         Me.Button14.TabIndex = 4
         Me.Button14.Text = "Rechnungspos. berechnen"
         Me.Button14.UseVisualStyleBackColor = True
         '
+        'Button1
+        '
+        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Button1.Location = New System.Drawing.Point(10, 12)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(121, 49)
+        Me.Button1.TabIndex = 106
+        Me.Button1.Text = "Mautanh. prüfen"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
         'usrcntlFakturierung
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -733,4 +746,5 @@ Partial Class usrcntlFakturierung
     Friend WithEvents PictureBox4 As PictureBox
     Friend WithEvents PictureBox3 As PictureBox
     Friend WithEvents PictureBox2 As PictureBox
+    Friend WithEvents Button1 As Button
 End Class

SDL/seriendruck/usrCntlFakturierung.vb

@@ -93,7 +93,7 @@ Public Class usrcntlFakturierung
         If rechnungenMitGesamtmautanhant <> "" Then
 
 
-            If vbYes = MsgBox("Möchten Sie die " & rechnungenMitGesamtmautanhant & " Gesamtmautberichte (PDF und CSV) aus den Rechnungen vom entfernen?" & vbNewLine & "Die Mautberichte können erneut über 'Durchfüren' and die Rechnung gehängt werden.", vbYesNoCancel) Then
+            If vbYes = MsgBox("Möchten Sie die " & rechnungenMitGesamtmautanhant & " Gesamtmautberichte (PDF und CSV) aus den Rechnungen vom entfernen?" & vbNewLine & "Die Mautberichte können erneut über 'Durchfüren' and die Rechnung gehängt werden." & vbNewLine & "Nur bei Rechnungen mit Status 0 möglich!", vbYesNoCancel) Then
 
                 deleted = (New SQL).doSQL("delete from RechnungsausgangAnhaenge where RechnungsausgangAnhaenge.RK_ID IN (SELECT Rechnungsausgang.RK_ID
                 FROM Rechnungsausgang
@@ -112,6 +112,8 @@ Public Class usrcntlFakturierung
 
     Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
 
+        Label70.Text = "6. Hängt Mautgesamtbericht an Sammenrechnungen an."
+
         Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
 
         Dim ok As Boolean = True
@@ -151,6 +153,32 @@ Public Class usrcntlFakturierung
         End If
 
 
+        Dim rechnungenMitGesamtmautanhantCSV As String = (New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) FROM Rechnungsausgang
+                        inner join RechnungsausgangAnhaenge on Rechnungsausgang.RK_ID = RechnungsausgangAnhaenge.RK_ID
+                        WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "'   
+                        and (RechnungsausgangAnhaenge.Bezeichnung like '%Maut.csv')
+                        group by [Firma_ID], RechnungsNr,Buchungsjahr,DruckDatumZeit,[Status], RechnungsausgangAnhaenge.Bezeichnung ", "FMZOLL",, 0)
+
+
+        Dim rechnungenMitGesamtmautanhantPDF As String = (New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) FROM Rechnungsausgang
+                        inner join RechnungsausgangAnhaenge on Rechnungsausgang.RK_ID = RechnungsausgangAnhaenge.RK_ID
+                        WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "'   
+                        and (RechnungsausgangAnhaenge.Bezeichnung like '%Maut.pdf')
+                        group by [Firma_ID], RechnungsNr,Buchungsjahr,DruckDatumZeit,[Status], RechnungsausgangAnhaenge.Bezeichnung ", "FMZOLL",, 0)
+
+        If rechnungenMitGesamtmautanhantPDF <> "" Then
+            MsgBox("Bei " & rechnungenMitGesamtmautanhantPDF & " Rechnungen befindet sich noch eine PDF-Gesamtmaut" & vbNewLine & "Diesen bitte vorher entfernen über MAUTBERICHTE ENTFERNEN " & vbNewLine & "Vorang wird abgebrochen!")
+            Exit Sub
+
+        End If
+
+        If rechnungenMitGesamtmautanhantCSV <> "" Then
+            MsgBox("Bei " & rechnungenMitGesamtmautanhantCSV & " Rechnungen befindet sich noch eine CSV-Gesamtmaut" & vbNewLine & "Diesen bitte vorher entfernen über MAUTBERICHTE ENTFERNEN " & vbNewLine & "Vorang wird abgebrochen!")
+            Exit Sub
+
+        End If
+
+
         '---------------DONE
         '        ' Sachbearbeiter im RK eintragen.
         '140      Call SysCmd(acSysCmdSetStatus, "Sachbearbeiter im RK eintragen...")
@@ -754,6 +782,8 @@ Public Class usrcntlFakturierung
 
     Private Function setMautgesamtberichtInRechnung(Sachbearbeiter As String, rechnungsdatum As Date, dtSammelRechnugen As DataTable)
         Try
+            Dim counterPDF As Integer = 0
+            Dim counterCSV As Integer = 0
 
             Dim attachmentIsSet As Boolean = False
             If dtSammelRechnugen.Rows.Count = 0 Then
@@ -771,6 +801,7 @@ Public Class usrcntlFakturierung
                                 Dim RK_ID As Integer = dtSammelRechnugen.AsEnumerable().Where(Function(r) r.Field(Of Integer)("RechnungsKundenNr") = KundenNr).Select(Function(r) r.Field(Of Integer)("RK_ID")).FirstOrDefault()
                                 Dim RECHNUNG As New cRechnungsausgang(RK_ID)
                                 attachmentIsSet = AddAttachementToRE(FileCSV.FullName, KundenNr, RECHNUNG, rechnungsdatum)
+                                If attachmentIsSet Then counterCSV = counterCSV + 1
                             End If
 
                         End If
@@ -784,6 +815,7 @@ Public Class usrcntlFakturierung
                                 Dim RK_ID As Integer = dtSammelRechnugen.AsEnumerable().Where(Function(r) r.Field(Of Integer)("RechnungsKundenNr") = CInt(KundenNr)).Select(Function(r) r.Field(Of Integer)("RK_ID")).FirstOrDefault()
                                 Dim RECHNUNG As New cRechnungsausgang(RK_ID)
                                 attachmentIsSet = AddAttachementToRE(FilePDF.FullName, KundenNr, RECHNUNG, rechnungsdatum)
+                                If attachmentIsSet Then counterPDF = counterPDF + 1
                             End If
                         End If
                     End If
@@ -791,12 +823,14 @@ Public Class usrcntlFakturierung
 
             End If
 
+            Label70.Text = "6. Hängt Mautgesamtbericht an Sammenrechnungen an." & " CSV: " & counterCSV & " PDF: " & counterPDF
             Return attachmentIsSet
 
         Catch ex As SystemException
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
 
+        Label70.Text = "6. Hängt Mautgesamtbericht an Sammenrechnungen an."
         Return False
 
     End Function
@@ -936,58 +970,70 @@ Public Class usrcntlFakturierung
         If dtSelectedSammelrechnungen.Rows.Count > 0 Then
 
             If cbxVorschau.Checked Then
+                Dim nurNICHTEUKunden As Boolean = False
+                If rbAlleKunden.Checked Then
+                    If vbYes = MsgBox("Sollen nur die Rechnungen der NICHT-EU Kunden gedruckt werden?", vbYesNoCancel) Then nurNICHTEUKunden = True
+                End If
 
-                For Each rowRE In dtSelectedSammelrechnungen.Rows
+                    For Each rowRE In dtSelectedSammelrechnungen.Rows
 
-                    Dim path = ""
+                        Dim path = ""
 
 
-                    cFakturierung.doSAMMELRechnungsDruck_Abschnitt(rowRE("RechnungsNr"), rowRE("Firma_ID"), rowRE("Buchungsjahr"), rowRE("DruckDatumZeit"), "", True, True, 7, path,, , , , , , , )
+                        cFakturierung.doSAMMELRechnungsDruck_Abschnitt(rowRE("RechnungsNr"), rowRE("Firma_ID"), rowRE("Buchungsjahr"), rowRE("DruckDatumZeit"), "", True, True, 7, path,, , , , , , , )
 
-                    If path <> "" Then listPDFs.Add(path)
+                    If path <> "" Then
-
+                        If nurNICHTEUKunden Then
-                    If True Then 'cnt Mod 10 = 0 Then
+                            'TODO-> nur nicht EU-Kunden zu Path
-                        txtPloseAnh_Einarbeitung.Text = cnt & " / " & dtSelectedSammelrechnungen.Rows.Count
+                            listPDFs.Add(path)
-                        Dim proz As Double = (cnt / dtSelectedSammelrechnungen.Rows.Count) * 100
+                        Else
-                        pbPloseAnh_Proz.Value = proz
+                            listPDFs.Add(path)
-                        lblPloseAnh_Proz.Text = proz.ToString("N2") & " %"
-                        'GroupBox12.Refresh()
-                        My.Application.DoEvents()
-                    End If
-                    cnt += 1
-
-                Next
-
-                If listPDFs.Count > 0 Then
-
-                    Dim pathPDF = listPDFs(0).ToString
-
-                    If listPDFs.Count > 1 Then
-                        Dim pathPDFMerge = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("MDM_Sammelrechnung.pdf", ".pdf", False, False)
-                        If Not FormularManagerNEU.MergePdfFiles(listPDFs, pathPDFMerge) Then
-                            Exit Sub
-                            MsgBox("Fehler beim Zusammenführen der PDFs.")
                         End If
 
                     End If
 
-                    pbPloseAnh_Proz.Value = 100
+                    If True Then 'cnt Mod 10 = 0 Then
-                    txtPloseAnh_Einarbeitung.Text = dtSelectedSammelrechnungen.Rows.Count & " / " & dtSelectedSammelrechnungen.Rows.Count
+                            txtPloseAnh_Einarbeitung.Text = cnt & " / " & dtSelectedSammelrechnungen.Rows.Count
-                    lblPloseAnh_Proz.Text = "100.00 %"
+                            Dim proz As Double = (cnt / dtSelectedSammelrechnungen.Rows.Count) * 100
-                    Process.Start(pathPDF)
+                            pbPloseAnh_Proz.Value = proz
+                            lblPloseAnh_Proz.Text = proz.ToString("N2") & " %"
+                            'GroupBox12.Refresh()
+                            My.Application.DoEvents()
+                        End If
+                        cnt += 1
 
-                Else
+                    Next
-                    MsgBox("Datei von " & rechnungsdatum.ToShortDateString & " konnte nicht erstellt werden!")
+
+                    If listPDFs.Count > 0 Then
+
+                        Dim pathPDF = listPDFs(0).ToString
+
+                        If listPDFs.Count > 1 Then
+                            Dim pathPDFMerge = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("MDM_Sammelrechnung.pdf", ".pdf", False, False)
+                            If Not FormularManagerNEU.MergePdfFiles(listPDFs, pathPDFMerge) Then
+                                Exit Sub
+                                MsgBox("Fehler beim Zusammenführen der PDFs.")
+                            End If
+
+                        End If
+
+                        pbPloseAnh_Proz.Value = 100
+                        txtPloseAnh_Einarbeitung.Text = dtSelectedSammelrechnungen.Rows.Count & " / " & dtSelectedSammelrechnungen.Rows.Count
+                        lblPloseAnh_Proz.Text = "100.00 %"
+                        Process.Start(pathPDF)
+
+                    Else
+                        MsgBox("Datei von " & rechnungsdatum.ToShortDateString & " konnte nicht erstellt werden!")
+
+                    End If
 
                 End If
 
-            End If
 
 
 
-
+                If cbxRechnungsjournaldrucken.Checked Then
-            If cbxRechnungsjournaldrucken.Checked Then
+                    Dim dtRechnungsjournal As DataTable = (New SQL).loadDgvBySql("SELECT 
-                Dim dtRechnungsjournal As DataTable = (New SQL).loadDgvBySql("SELECT 
                                                                                   Rechnungsausgang.Währungscode, 
                                                                                   Rechnungsausgang.RechnungsLandKz, 
                                                                                   Rechnungsausgang.RechnungsNr, 
@@ -1025,12 +1071,12 @@ Public Class usrcntlFakturierung
                                                                                   Rechnungsausgang.RechnungsLandKz,                                                                                    
                                                                                   Rechnungsausgang.RechnungsNr", "FMZOLL")
 
-                cProgramFunctions.genExcelFromDT_NEW(dtRechnungsjournal, {"J1:J" & (dtRechnungsjournal.Rows.Count + 1), "K1:K" & (dtRechnungsjournal.Rows.Count + 1), "L1:L" & (dtRechnungsjournal.Rows.Count + 1)},, "RECHNUNGSJOURNAL VOM" & rechnungsdatum.ToShortDateString,,, True)
+                    cProgramFunctions.genExcelFromDT_NEW(dtRechnungsjournal, {"J1:J" & (dtRechnungsjournal.Rows.Count + 1), "K1:K" & (dtRechnungsjournal.Rows.Count + 1), "L1:L" & (dtRechnungsjournal.Rows.Count + 1)},, "RECHNUNGSJOURNAL VOM" & rechnungsdatum.ToShortDateString,,, True)
-            End If
+                End If
 
-            If cbxAbfVerbotdrucken.Checked Then
+                If cbxAbfVerbotdrucken.Checked Then
 
-                Dim dtEbfertigungsverbot As DataTable = (New SQL).loadDgvBySql("SELECT 
+                    Dim dtEbfertigungsverbot As DataTable = (New SQL).loadDgvBySql("SELECT 
                                                                                   Rechnungsausgang.Buchungsjahr, 
                                                                                   Rechnungsausgang.Währungscode, 
                                                                                   Rechnungsausgang.RechnungsNr, 
@@ -1068,14 +1114,14 @@ Public Class usrcntlFakturierung
                                                                                   Rechnungsausgang.Währungscode, 
                                                                                   Rechnungsausgang.RechnungsNr;", "FMZOLL")
 
-                cProgramFunctions.genExcelFromDT_NEW(dtEbfertigungsverbot, {"I1:I" & (dtEbfertigungsverbot.Rows.Count + 1), "J1:J" & (dtEbfertigungsverbot.Rows.Count + 1), "K1:K" & (dtEbfertigungsverbot.Rows.Count + 1)},, "RECHNUNGEN VOM " & rechnungsdatum.ToShortDateString & " MIT ABFERTIGUNGSVERBOT",,, True)
+                    cProgramFunctions.genExcelFromDT_NEW(dtEbfertigungsverbot, {"I1:I" & (dtEbfertigungsverbot.Rows.Count + 1), "J1:J" & (dtEbfertigungsverbot.Rows.Count + 1), "K1:K" & (dtEbfertigungsverbot.Rows.Count + 1)},, "RECHNUNGEN VOM " & rechnungsdatum.ToShortDateString & " MIT ABFERTIGUNGSVERBOT",,, True)
-            End If
+                End If
 
 
 
-        Else
+            Else
 
-            MsgBox("Keine Sammelrechnung zum " & rechnungsdatum.ToShortDateString & " von " & Sachbearbeiter & " vorhanden!")
+                MsgBox("Keine Sammelrechnung zum " & rechnungsdatum.ToShortDateString & " von " & Sachbearbeiter & " vorhanden!")
         End If
     End Sub
 
@@ -1098,6 +1144,8 @@ Public Class usrcntlFakturierung
                 'für Kunde an RE anhängen 
                 Case "Gesamtbericht_CSV"
 
+                    Dim AnzahlCSV_Berichte As Integer = CInt((New SQL).getValueTxtBySql("SELECT count(distinct(tblMautbericht.[Customer No])) FROM Adressen INNER JOIN tblMautbericht ON Adressen.AdressenNr = tblMautbericht.[Customer No] WHERE Adressen.ExportMautberichtCSV=1 AND cast(BillingDate as Date) =  '" & cbxDateMautbericht._value & "'", "FMZOLL"))
+
                     Dim dtBerichtkunden_CSV As DataTable = (New SQL).loadDgvBySql("SELECT [Customer No], [Licence Plate Number], [Transaction Country], [Transaction date], tblMautbericht.[Product description], tblMautbericht.[Card number], tblMautbericht.[Entry Terminal], tblMautbericht.[Exit Terminal], tblMautbericht.[Net Amount], tblMautbericht.[VAT Amount], tblMautbericht.[Total Amount]
                                                                           FROM Adressen 
                                                                           INNER JOIN tblMautbericht ON Adressen.AdressenNr = tblMautbericht.[Customer No]
@@ -1139,8 +1187,8 @@ Public Class usrcntlFakturierung
                             outFile.Close()
 
                             If True Then 'cnt Mod 10 = 0 Then
-                                TextBox1.Text = cnt & " / " & dtBerichtkunden_CSV.Rows.Count
+                                TextBox1.Text = cnt & " / " & AnzahlCSV_Berichte
-                                Dim proz As Double = (cnt / dtBerichtkunden_CSV.Rows.Count) * 100
+                                Dim proz As Double = (cnt / AnzahlCSV_Berichte) * 100
                                 pbMautAnh_Proz.Value = proz
                                 lblMautAnh_Proz.Text = proz.ToString("N2") & " %"
                                 'GroupBox12.Refresh()
@@ -1151,7 +1199,7 @@ Public Class usrcntlFakturierung
                         Next
 
                         pbMautAnh_Proz.Value = 100
-                        TextBox1.Text = dtBerichtkunden_CSV.Rows.Count & " / " & dtBerichtkunden_CSV.Rows.Count
+                        TextBox1.Text = AnzahlCSV_Berichte & " / " & AnzahlCSV_Berichte
                         lblMautAnh_Proz.Text = "100.00 %"
 
 
@@ -1165,6 +1213,8 @@ Public Class usrcntlFakturierung
                 'für Kunde an RE anhängen (Tool Report to Verag Invoice aus FMZOLL)
                 Case "Lieferantenbericht_PDF"
 
+                    Dim AnzahlPDF_Berichte As Integer = CInt((New SQL).getValueTxtBySql("SELECT count(distinct(tblMautbericht.[Customer No])) FROM tblMautbericht WHERE cast(BillingDate as Date) =  '" & cbxDateMautbericht._value & "'", "FMZOLL"))
+
                     Dim dtBerichtkunden_PDF As DataTable = (New SQL).loadDgvBySql("SELECT tblMautbericht.[Customer No], Adressen.Ordnungsbegriff AS [Customer name], tblMautbericht.[Licence Plate Number], tblMautbericht.[Transaction date], tblMautbericht.[Transaction Country], tblMautbericht.[Product description], tblMautbericht.[Card number], tblMautbericht.[Entry Terminal], tblMautbericht.[Exit Terminal], Sum(tblMautbericht.[Net Amount]) AS [Net Amount], Sum(tblMautbericht.[VAT Amount]) AS [VAT Amount], Sum(tblMautbericht.[Total Amount]) AS [Total Amount]
                                                                             FROM tblMautbericht INNER JOIN Adressen ON tblMautbericht.[Customer No] = Adressen.AdressenNr
                                                                             WHERE cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "' 
@@ -1201,8 +1251,8 @@ Public Class usrcntlFakturierung
 
 
                             If True Then 'cnt Mod 10 = 0 Then
-                                TextBox1.Text = cnt & " / " & dtBerichtkunden_PDF.Rows.Count
+                                TextBox1.Text = cnt & " / " & AnzahlPDF_Berichte
-                                Dim proz As Double = (cnt / dtBerichtkunden_PDF.Rows.Count) * 100
+                                Dim proz As Double = (cnt / AnzahlPDF_Berichte) * 100
                                 pbMautAnh_Proz.Value = proz
                                 lblMautAnh_Proz.Text = proz.ToString("N2") & " %"
                                 'GroupBox12.Refresh()
@@ -1213,7 +1263,7 @@ Public Class usrcntlFakturierung
                         Next
 
                         pbMautAnh_Proz.Value = 100
-                        TextBox1.Text = dtBerichtkunden_PDF.Rows.Count & " / " & dtBerichtkunden_PDF.Rows.Count
+                        TextBox1.Text = AnzahlPDF_Berichte & " / " & AnzahlPDF_Berichte
                         lblMautAnh_Proz.Text = "100.00 %"
 
                         MsgBox("PDF-Berichte wurden  unter " & PathMautberichte & "erzeugt.")
@@ -1442,4 +1492,39 @@ Public Class usrcntlFakturierung
         Dim f As New SDL.frmRechnungenSuche
         f.Show(Me)
     End Sub
+
+    Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles Button1.Click
+
+        Dim Sachbearbeiter = cboSachbearbeiter._value
+        Dim rechnungsdatum As Date = CDate(dtRechnungsdatum.Text)
+        Dim deleted As Boolean = False
+
+        If rechnungsdatum > Today() Then
+            MsgBox("Rechnungsdatum liegt in der Zukunft, nicht möglich")
+            Exit Sub
+
+        End If
+
+        If Sachbearbeiter = "" Then
+            MsgBox("Sachbearbeiter auswählen!")
+            Exit Sub
+        End If
+
+
+        Dim rechnungenMitGesamtmautanhantCSV As String = (New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) FROM Rechnungsausgang
+                        inner join RechnungsausgangAnhaenge on Rechnungsausgang.RK_ID = RechnungsausgangAnhaenge.RK_ID
+                        WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "'   
+                        and (RechnungsausgangAnhaenge.Bezeichnung like '%Maut.csv')
+                        group by [Firma_ID], RechnungsNr,Buchungsjahr,DruckDatumZeit,[Status], RechnungsausgangAnhaenge.Bezeichnung ", "FMZOLL",, 0)
+
+
+        Dim rechnungenMitGesamtmautanhantPDF As String = (New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) FROM Rechnungsausgang
+                        inner join RechnungsausgangAnhaenge on Rechnungsausgang.RK_ID = RechnungsausgangAnhaenge.RK_ID
+                        WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "'   
+                        and (RechnungsausgangAnhaenge.Bezeichnung like '%Maut.pdf')
+                        group by [Firma_ID], RechnungsNr,Buchungsjahr,DruckDatumZeit,[Status], RechnungsausgangAnhaenge.Bezeichnung ", "FMZOLL",, 0)
+
+        MsgBox("Anzahl CSV-Anhänge: " & rechnungenMitGesamtmautanhantCSV & vbNewLine & "Anzahl PDF-Anhänge: " & rechnungenMitGesamtmautanhantPDF)
+
+    End Sub
 End Class

VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb

@@ -78,7 +78,7 @@ Public Class cRMC
     Public Function SAVE() As Boolean
         Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
 
-        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblRMCImport  WHERE rmc_kdNr=@rmc_kdNr AND rmc_reNr = @rmc_reNr and rmc_archiv is null ) " &
+        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblRMCImport  WHERE rmc_kdNr=@rmc_kdNr AND rmc_reNr = @rmc_reNr and rmc_reDatum  = @rmc_reDatum ) " &
                        " BEGIN " & getUpdateCmd() & " END " &
                        " Else " &
                        " BEGIN " & getInsertCmd() & " END " &
@@ -91,9 +91,10 @@ Public Class cRMC
         Try
             hasEntry = False
             Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
-                Using cmd As New SqlCommand("SELECT * FROM tblRMCImport WHERE rmc_kdNr=@rmc_kdNr AND rmc_reNr = @rmc_reNr", conn)
+                Using cmd As New SqlCommand("SELECT * FROM tblRMCImport WHERE rmc_kdNr=@rmc_kdNr AND rmc_reNr = @rmc_reNr and rmc_reDatum  = @rmc_reDatum ", conn)
                     cmd.Parameters.AddWithValue("@rmc_kdNr", rmc_kdNr)
                     cmd.Parameters.AddWithValue("@rmc_reNr", rmc_reNr)
+                    cmd.Parameters.AddWithValue("@rmc_reDatum", rmc_reDatum)
                     Dim dr = cmd.ExecuteReader()
                     If dr.Read Then
                         For Each li In getParameterList()
@@ -129,7 +130,7 @@ Public Class cRMC
                 End If
             Next
             str = str.Substring(0, str.Length - 1) 'wg. ','
-            Return (" UPDATE tblRMCImport SET " & str & " WHERE rmc_kdNr=@rmc_kdNr AND rmc_reNr = @rmc_reNr ")
+            Return (" UPDATE tblRMCImport SET " & str & " WHERE rmc_kdNr=@rmc_kdNr AND rmc_reNr = @rmc_reNr and rmc_reDatum  = @rmc_reDatum")
 
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb

@@ -22,6 +22,7 @@ Partial Class frmUeberstundenauszahlen
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmUeberstundenauszahlen))
         Me.dtpMonat = New System.Windows.Forms.DateTimePicker()
         Me.lblMonat = New System.Windows.Forms.Label()
@@ -71,7 +72,7 @@ Partial Class frmUeberstundenauszahlen
         Me.cbx100 = New System.Windows.Forms.CheckBox()
         Me.txtberAusz25 = New System.Windows.Forms.TextBox()
         Me.cbxoverwrite = New System.Windows.Forms.CheckBox()
-        Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Label8 = New System.Windows.Forms.Label()
         Me.txt50x1 = New System.Windows.Forms.TextBox()
         Me.cbxTeilzeit = New System.Windows.Forms.CheckBox()
@@ -83,7 +84,7 @@ Partial Class frmUeberstundenauszahlen
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
         Me.cbxalle = New System.Windows.Forms.CheckBox()
-        Me.dgvUberstundenauszahlungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.dgvUberstundenauszahlungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Label69 = New System.Windows.Forms.Label()
         CType(Me.picDel, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb

@@ -72,7 +72,7 @@ Public Class frmUeberstundenauszahlen
     End Sub
 
     Private Sub DateTimePicker1_ValueChanged(sender As Object, e As EventArgs) Handles dtpMonat.ValueChanged, dtpBis.ValueChanged
-        getUeberstunden(cbxabwDatum.Checked)
+
 
     End Sub
 
@@ -560,6 +560,9 @@ Public Class frmUeberstundenauszahlen
         End If
     End Sub
 
+    Private Sub dtpMonat_Leave(sender As Object, e As EventArgs) Handles dtpMonat.Leave, dtpBis.Leave
+        getUeberstunden(cbxabwDatum.Checked)
+    End Sub
 
     Private Sub txtAusz_hhmm_KeyPress(sender As Object, e As KeyPressEventArgs)
         Select Case Asc(e.KeyChar)