neu

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -855,7 +855,7 @@ Public Class frmMDMDatenverarbetiung
 
             cFakturierung.setGesamtBetraege(RG)
 
-            RG.Text = cFakturierung.przRechnungstext(RG)
+            RG.Text = (cFakturierung.przRechnungstextTXT(RG) & vbNewLine & cFakturierung.przRechnungstextZZ(RG)).Trim
 
             ' Call usrCntlFaktAbrechnung.przSVSRVS(RG)      ' SVS/RVS errechnen
             '  Call przSKR()         ' SKR errechnen

SDL/mdm/usrCntlKartenDaten.vb

@@ -153,6 +153,14 @@ Public Class usrCntlKartenDaten
         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
@@ -219,8 +227,10 @@ Public Class usrCntlKartenDaten
                             Dim srchstr = getSqlText(c.Value.ToString.Trim)
                             If c.OwningColumn.Name.Contains("SDLNr") Then
                                 filter &= andstr & " SDL.[" & c.OwningColumn.Name & "] LIKE '%" & srchstr & "%' "
-                            ElseIf IsDate(srchstr) Then
-                                If srchstr.ToLower = "ist null" Then
+                            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 & "%' "
@@ -412,13 +422,16 @@ Public Class usrCntlKartenDaten
         b.ForeColor = Color.Black
         aktbtn = b.Name
 
-        If aktbtn = "btnSDL_Alle" Then
-            dgvSDL.Columns("SDLNr").Visible = True
-            '     dgvSDL.ReadOnly = True
-            '    Button11.Enabled = False
-        Else
-            dgvSDL.Columns("SDLNr").Visible = False
-            '    dgvSDL.ReadOnly = False
+        If dgvSDL.Columns("SDLNr") IsNot Nothing Then
+
+            If aktbtn = "btnSDL_Alle" Then
+                dgvSDL.Columns("SDLNr").Visible = True
+                '     dgvSDL.ReadOnly = True
+                '    Button11.Enabled = False
+            Else
+                dgvSDL.Columns("SDLNr").Visible = False
+                '    dgvSDL.ReadOnly = False
+            End If
         End If
 
         ' If kdNr_filter Then
@@ -638,6 +651,7 @@ Public Class usrCntlKartenDaten
         dgvInitWait = True
         If doFilter Then
             Dim filter As String = getFilter()
+
             If filter <> "" Then sql &= " AND " & filter
             ' sql &= " ORDER BY sdl.[Erfassungsdatum] ASC"
         Else