neu

SDL/kunden/Vorauskasse/frmVorauskasse.vb

@@ -328,6 +328,8 @@
             Dim VK As New VERAG_PROG_ALLGEMEIN.cVorauskasse(MyDatagridview1.SelectedRows(0).Cells("vk_id").Value)
             VK.SET_GELDEINGANG(True, txtBemerkung.Text)
             cVorauskasseOptions.insertVermerk(MyDatagridview1.SelectedRows(0).Cells("vk_FilialeNr").Value, MyDatagridview1.SelectedRows(0).Cells("vk_AbfertigungsNr").Value, 14)
+            'cVorauskasseOptions.SpeichernVermerkIDAufgehoben(MyDatagridview1.SelectedRows(0).Cells("vk_FilialeNr").Value, MyDatagridview1.SelectedRows(0).Cells("vk_AbfertigungsNr").Value, 14)
+
             txtBemerkung.Text = ""
             MyDatagridview1.RELOAD()
             setDGVOptions()
@@ -518,12 +520,18 @@ End Class
 
 Public Class cVorauskasseOptions
 
-    Shared Sub insertVermerk(FilialenNr, AbfertigungsNr, VermerkCodeId, Optional DatumTmp = Nothing, Optional Freigegeben = False, Optional ByRef VermerkId = -1, Optional tblSnd_SendungID = -1)
+    Shared Sub insertVermerk(FilialenNr, AbfertigungsNr, VermerkCodeId, Optional DatumTmp = Nothing, Optional Freigegeben = False, Optional ByRef VermerkId = -1, Optional tblSnd_SendungID = -1, Optional vk_Betrag = Nothing)
         Try
 
+            If vk_Betrag Is Nothing Then vk_Betrag = 0
+            If vk_Betrag.ToString = "" Then vk_Betrag = 0
+
+
+            '   MsgBox(vk_Betrag)
+
             Dim veragSQL As New VERAG_PROG_ALLGEMEIN.SQL
             Dim VermerkeDAL As New VERAG_PROG_ALLGEMEIN.cVermerkeDAL
-            '      MsgBox("SELECT TOP 1 [tblSnd_SendungID],[tblSnd_AvisoID]  FROM [tblSendungen]  where AbfertigungsNr='" & AbfertigungsNr & "' and FilialenNr='" & FilialenNr & "'")
+            '      MsgBox("ThenSELECT TOP 1 [tblSnd_SendungID],[tblSnd_AvisoID]  FROM [tblSendungen]  where AbfertigungsNr='" & AbfertigungsNr & "' and FilialenNr='" & FilialenNr & "'")
             Dim dt As DataTable = Nothing
             If tblSnd_SendungID > 0 Then
                 dt = veragSQL.loadDgvBySql("SELECT TOP 1 [tblSnd_SendungID],[tblSnd_AvisoID]  FROM [tblSendungen]  where tblSnd_SendungID='" & tblSnd_SendungID & "' ", "AVISO")
@@ -547,7 +555,7 @@ Public Class cVorauskasseOptions
             myVermerk.Mitarbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " (AUTO)"
             myVermerk.MitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
             Select Case VermerkCodeId
-                Case 13 : myVermerk.Hinweis_Vermerk = "Vorauskasse angefordert"
+                Case 13 : myVermerk.Hinweis_Vermerk = "Vorauskasse angefordert" & If(CDbl(vk_Betrag) > 0, " (" & CDbl(vk_Betrag).ToString("C2") & ")", "")
                 Case 14 : myVermerk.Hinweis_Vermerk = "Vorauskasse erhalten"
                 Case 59 : myVermerk.Hinweis_Vermerk = "Vorauskasse freigegeben"
                 Case Else : Exit Sub
@@ -566,7 +574,7 @@ Public Class cVorauskasseOptions
             Dim veragSQL As New VERAG_PROG_ALLGEMEIN.SQL
             Dim dt As DataTable = veragSQL.loadDgvBySql("SELECT TOP 1 [tblSnd_SendungID] FROM [tblSendungen]  where AbfertigungsNr='" & AbfertigungsNr & "' and FilialenNr='" & FilialenNr & "'", "AVISO")
 
-            If dt.Rows.Count = 0 Then Exit Sub
+                    If dt.Rows.Count = 0 Then Exit Sub
             If Not IsNumeric(dt.Rows(0)("tblSnd_SendungID")) Then Exit Sub
 
             veragSQL.doSQL("DELETE TOP (1) FROM [Vermerke]  where SendungID='" & dt.Rows(0)("tblSnd_SendungID") & "'  AND VermerkeCode='" & VermerkCodeId & "' ", "AVISO")

SDL/kunden/frmKundenUebersichtZOLL.vb

@@ -279,6 +279,7 @@ Public Class frmKundenUebersichtZOLL
 
 
         Dim KdFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr)
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then KdFirma = KdFirma.Replace("VERAG", "ATILLA")
         If (KdFirma <> VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA And Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER) And
             Not (KdFirma = "IMEX" And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO")) Then
 

SDL/kunden/frmLKW_AnhaengeDatenarchiv.vb

@@ -116,7 +116,7 @@ Public Class frmLKW_AnhaengeDatenarchiv
                 zielPfad &= kz & "_" & art & ".pdf"
             End If
 
-            IO.File.Copy(pfad, zielPfad, True)
+            System.IO.File.Copy(pfad, zielPfad, True)
             Return zielPfad
         Catch ex As Exception
             MsgBox(ex.Message & ex.StackTrace)

SDL/kunden/usrCntlKundeFiskaldaten.vb

@@ -5,6 +5,11 @@
 
     Dim KundenNr As Integer
 
+    Sub New()
+        InitializeComponent()
+    End Sub
+
+
     Sub New(KundenNr)
         InitializeComponent()
         Me.KundenNr = KundenNr
@@ -78,4 +83,13 @@
     Private Sub usrCntlKundeFiskaldaten_Load(sender As Object, e As EventArgs) Handles Me.Load
         initFiskal()
     End Sub
+
+    Sub initFiskal(FISKAL As cFiskal_Daten, KUNDE_ERW As VERAG_PROG_ALLGEMEIN.cKundenErweitert)
+        Me.KundenNr = KundenNr
+        Me.KUNDE_ERW = KUNDE_ERW
+        Me.FISKAL = FISKAL
+
+        initFiskal()
+    End Sub
+
 End Class

SDL/kunden/usrCntlKundenKontakte.vb

@@ -36,14 +36,15 @@
 
     Sub initDGV()
         dgvAufschub.Rows.Clear()
-
-        If kdNr > 0 Then
-            Dim dt = SQL.loadDgvBySql("SELECT *  FROM [tblKundenKontakt]  where [kkd_KundenNr]=" & kdNr, "FMZOLL")
-            If dt IsNot Nothing Then
-                For Each r In dt.Rows
-                    Dim anspr = (If(r("kkd_AnsprechpartnerAnrede"), "") & " " & If(r("kkd_AnsprechpartnerVorname"), "") & " " & If(r("kkd_AnsprechpartnerNachname"), "")).trim
-                    dgvAufschub.Rows.Add(r("kkd_id"), r("kkd_kkaBez"), r("kkd_Tel"), r("kkd_Email"), anspr, r("kkd_Fax"))
-                Next
+        If dgvAufschub.Columns.Count >= 5 Then
+            If kdNr > 0 Then
+                Dim dt = SQL.loadDgvBySql("SELECT *  FROM [tblKundenKontakt]  where [kkd_KundenNr]=" & kdNr, "FMZOLL")
+                If dt IsNot Nothing Then
+                    For Each r In dt.Rows
+                        Dim anspr = (If(r("kkd_AnsprechpartnerAnrede"), "") & " " & If(r("kkd_AnsprechpartnerVorname"), "") & " " & If(r("kkd_AnsprechpartnerNachname"), "")).trim
+                        dgvAufschub.Rows.Add(r("kkd_id"), r("kkd_kkaBez"), r("kkd_Tel"), r("kkd_Email"), anspr, r("kkd_Fax"))
+                    Next
+                End If
             End If
         End If
     End Sub

SDL/kunden/usrCntlLKW.vb

@@ -123,6 +123,7 @@ Public Class usrCntlLKW
                     .Columns("KundenNr").Visible = False
                     .Columns("KfzKennzeichen").Visible = False
                     .Columns("History").Visible = False
+                    .Columns("Archiviert").Visible = False
 
 
                     .Columns("SDLNr").Width = 40
@@ -197,6 +198,7 @@ Public Class usrCntlLKW
             If r.Cells("LKWAbgemeldet").Value IsNot DBNull.Value AndAlso r.Cells("LKWAbgemeldet").Value Then bgred = True
             If r.Cells("Gestohlen").Value IsNot DBNull.Value AndAlso r.Cells("Gestohlen").Value Then bgred = True
             If r.Cells("GültigBis").Value IsNot DBNull.Value AndAlso CDate(r.Cells("GültigBis").Value) < Now.ToShortDateString Then bgred = True
+            If r.Cells("Archiviert").Value IsNot DBNull.Value AndAlso r.Cells("Archiviert").Value Then bgred = True
             ' If r.Cells("TelepassErsatzkarte").Value IsNot DBNull.Value AndAlso CDate(r.Cells("TelepassErsatzkarte").Value) < Now.ToShortDateString Then bgred = True
 
             If bgred Then r.DefaultCellStyle.ForeColor = System.Drawing.Color.Red
@@ -206,7 +208,7 @@ Public Class usrCntlLKW
     Private Sub initSDLBinding(Optional srchSdlNr = Nothing, Optional srchHistory = Nothing)
 
         Dim sqlstr As String = " SELECT SDL.KundenNr,SDL.KfzKennzeichen, SDL.SDLNr, SDL.History,Speditionsdienstleistungen.SDLBez,SDL.Bestelldatum,SDL.Lieferdatum,SDL.GültigBis,SDL.KartenNr,SDL.PIN, " &
-                                          " sdl.[Ersatzkarte],sdl.[Retourniert],sdl.[Gesperrt],sdl.[Defekt],sdl.[Verloren],sdl.[Gestohlen],sdl.LKWAbgemeldet /*, sdl.Erfassungsdatum,sdl.Änderungsdatum,sdl.Sachbearbeiter*/ " &
+                                          " sdl.[Ersatzkarte],sdl.[Retourniert],sdl.[Gesperrt],sdl.[Defekt],sdl.[Verloren],sdl.[Gestohlen],sdl.LKWAbgemeldet /*, sdl.Erfassungsdatum,sdl.Änderungsdatum,sdl.Sachbearbeiter*/ , sdl.Archiviert " &
                                      " FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdnr & " AND  KfzKennzeichen='" & kz & "' AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr AND SDLTypNr IN (1,2) ORDER BY Speditionsdienstleistungen.SDLBez, SDL.History desc"
         dgvSDLLeistungen.SET_SQL(sqlstr, "SDL")
         dgvSDLLeistungen.LOAD()

SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb

@@ -22,16 +22,16 @@ Partial Class usrcntlKundeBearbeitenFull
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.tbcntrDetails = New System.Windows.Forms.TabControl()
         Me.tbAbfertigung = New System.Windows.Forms.TabPage()
         Me.tbcntrAbf = New System.Windows.Forms.TabControl()
@@ -295,6 +295,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cbxFiBu = New System.Windows.Forms.CheckBox()
         Me.cbxFiBuLG = New System.Windows.Forms.CheckBox()
+        Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten()
         Me.tbcntrDetails.SuspendLayout()
         Me.tbAbfertigung.SuspendLayout()
         Me.tbcntrAbf.SuspendLayout()
@@ -304,6 +305,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.TabPage1.SuspendLayout()
         Me.GroupBox7.SuspendLayout()
         Me.GroupBox6.SuspendLayout()
+        Me.tbFiskal.SuspendLayout()
         Me.tbVerrechnung.SuspendLayout()
         Me.tbVersicherung.SuspendLayout()
         Me.tbUmsatz.SuspendLayout()
@@ -886,6 +888,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         'tbFiskal
         '
+        Me.tbFiskal.Controls.Add(Me.UsrCntlKundeFiskaldaten1)
         Me.tbFiskal.Location = New System.Drawing.Point(4, 22)
         Me.tbFiskal.Name = "tbFiskal"
         Me.tbFiskal.Size = New System.Drawing.Size(672, 458)
@@ -2247,8 +2250,8 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.dgvUmsatzbericht.AllowUserToDeleteRows = False
         Me.dgvUmsatzbericht.AllowUserToOrderColumns = True
         Me.dgvUmsatzbericht.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
         Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White
         Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25)
@@ -2345,8 +2348,8 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.dgvOffenePosten.AllowUserToDeleteRows = False
         Me.dgvOffenePosten.AllowUserToOrderColumns = True
         Me.dgvOffenePosten.AllowUserToResizeRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle12
         Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White
         Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38)
@@ -2502,41 +2505,41 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.dgvKreditkarten.AllowUserToDeleteRows = False
         Me.dgvKreditkarten.AllowUserToOrderColumns = True
         Me.dgvKreditkarten.AllowUserToResizeRows = False
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
         Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.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))
-        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
+        DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle14
         Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle5.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))
-        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle15
         Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20)
         Me.dgvKreditkarten.MultiSelect = False
         Me.dgvKreditkarten.Name = "dgvKreditkarten"
         Me.dgvKreditkarten.ReadOnly = True
-        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle6.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))
-        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle16
         Me.dgvKreditkarten.RowHeadersVisible = False
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle17
         Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312)
@@ -2674,8 +2677,8 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         'dgvUstv_LaenderUndSteuernummern
         '
-        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18
         Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White
         Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94)
@@ -2888,8 +2891,8 @@ Partial Class usrcntlKundeBearbeitenFull
         'dgvSonst_IDSKunden
         '
         Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
         Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White
         Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 251)
@@ -3092,8 +3095,8 @@ Partial Class usrcntlKundeBearbeitenFull
         'DataGridView1
         '
         Me.DataGridView1.AllowUserToResizeRows = False
-        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
+        DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20
         Me.DataGridView1.BackgroundColor = System.Drawing.Color.White
         Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.DataGridView1.Enabled = False
@@ -3921,6 +3924,15 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cbxFiBuLG.UseVisualStyleBackColor = True
         Me.cbxFiBuLG.Visible = False
         '
+        'UsrCntlKundeFiskaldaten1
+        '
+        Me.UsrCntlKundeFiskaldaten1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlKundeFiskaldaten1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlKundeFiskaldaten1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrCntlKundeFiskaldaten1.Name = "UsrCntlKundeFiskaldaten1"
+        Me.UsrCntlKundeFiskaldaten1.Size = New System.Drawing.Size(672, 458)
+        Me.UsrCntlKundeFiskaldaten1.TabIndex = 0
+        '
         'usrcntlKundeBearbeitenFull
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3966,6 +3978,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.GroupBox7.PerformLayout()
         Me.GroupBox6.ResumeLayout(False)
         Me.GroupBox6.PerformLayout()
+        Me.tbFiskal.ResumeLayout(False)
         Me.tbVerrechnung.ResumeLayout(False)
         Me.tbVerrechnung.PerformLayout()
         Me.tbVersicherung.ResumeLayout(False)
@@ -4266,4 +4279,5 @@ Partial Class usrcntlKundeBearbeitenFull
     Friend WithEvents Label91 As Label
     Friend WithEvents Label92 As Label
     Friend WithEvents DataGridView1 As DataGridView
+    Friend WithEvents UsrCntlKundeFiskaldaten1 As usrCntlKundeFiskaldaten
 End Class

SDL/kunden/usrcntlKundeBearbeitenFull.vb

@@ -6,7 +6,7 @@ Public Class usrcntlKundeBearbeitenFull
     Dim KUNDE_ERW As VERAG_PROG_ALLGEMEIN.cKundenErweitert = Nothing
     Dim ADRESSE As VERAG_PROG_ALLGEMEIN.cAdressen = Nothing
     Dim FISKAL As cFiskal_Daten = Nothing
-    Dim USRCNTL_FISK As usrCntlKundeFiskaldaten
+    ' Dim USRCNTL_FISK As usrCntlKundeFiskaldaten
     Dim EMAIL_ANKUNFT As cEmailBenachrichtigungList = Nothing
     Dim EMAIL_FREIGABE As cEmailBenachrichtigungList = Nothing
      Dim sql As New SQL
@@ -111,10 +111,10 @@ Public Class usrcntlKundeBearbeitenFull
 
         Me.Cursor = Cursors.WaitCursor
 
-        tbFiskal.Controls.Clear()
-        USRCNTL_FISK = New usrCntlKundeFiskaldaten(FISKAL, KUNDE_ERW)
-        USRCNTL_FISK.Dock = DockStyle.Fill
-        tbFiskal.Controls.Add(USRCNTL_FISK)
+        ' tbFiskal.Controls.Clear()
+        UsrCntlKundeFiskaldaten1.initFiskal(FISKAL, KUNDE_ERW)
+        'USRCNTL_FISK.Dock = DockStyle.Fill
+        'tbFiskal.Controls.Add(USRCNTL_FISK)
 
         checkEORI_Aufschub()
 
@@ -565,7 +565,7 @@ Public Class usrcntlKundeBearbeitenFull
 
 
 
-        USRCNTL_FISK.loadinClass(FISKAL, KUNDE_ERW)
+        UsrCntlKundeFiskaldaten1.loadinClass(FISKAL, KUNDE_ERW)
 
         Return True
     End Function