Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

2024-05-22 16:15:20 +02:00
parent df1239705a b7f6d8540d
commit a77dd979a7
11 changed files with 386 additions and 172 deletions
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb
@@ -714,15 +714,20 @@ Public Class usrcntlVorauskasse
    Sub setDefault()
        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "AMBAR"
-                txtVerzollungskosten._value = 112
-                txtATLAS._value = 10
-                '  txtClearing._value = 40
-                txtClearing._value = 0
-                txtAviso._value = 20
-                txtSonstigeKosten._value = 40
-                txtSonstigeKostenText.Text = "Sonstige Kosten"
-                txtPapierePorti._value = 10
+
+                offertenvonKundenladen(True)
+
+                'txtVerzollungskosten._value = 112
+                'txtATLAS._value = 10
+                ''  txtClearing._value = 40
+                'txtClearing._value = 0
+                'txtAviso._value = 20
+                'txtSonstigeKosten._value = 40
+                'txtSonstigeKostenText.Text = "Sonstige Kosten"
+                'txtPapierePorti._value = 10
            Case "VERAG", "IMEX"
+
+                offertenvonKundenladen(True)
                'txtVerzollungskosten._value = 93
                'txtATLAS._value = 8
                'txtClearing._value = 40
@@ -779,19 +784,27 @@ Public Class usrcntlVorauskasse

    Private Sub btnOffertladen_Click(sender As Object, e As EventArgs) Handles btnOffertladen.Click

+        offertenvonKundenladen(False)
+
+        'For Each row As DataRow In dt.Select("BerechnungsartNr = '8'")
+
+        '    If row("LeistungsNr") = 60 Then txtVerzollungskosten.Text = row("Preis")
+        '    If row("LeistungsNr") = 20 Then txtZoll._value = row("Preis")
+
+    End Sub
+
+    Private Sub offertenvonKundenladen(warnungunterduecken As Boolean)

-        'Dim SQL As New SQL
-        '        Dim dt As DataTable = SQL.loadDgvBySql("SELECT [LeistungsNr], [Preis], [Anzahl], BerechnungsartPosInkludiert FROM [Offertenpositionen] WHERE KundenNr='" & KdNR & "' and OffertenNr='1' and preis is not null order by LeistungsNr, Preis desc", "FMZOLL")
        Dim dt As DataTable
        If SENDUNG Is Nothing Then
-            MsgBox("keine Sendung hinterlegt, Offert kann nicht geladen werden!")
+            If Not warnungunterduecken Then MsgBox("Es ist keine Sendung hinterlegt, daher kann keine Abfertigungsart geladen werden und kein passendes Offert!")
            Exit Sub
        End If

        dt = SQL.loadDgvBySql("SELECT [LeistungsNr], [Preis], [BerechnungsartNr] ,[Anzahl], BerechnungsartPosInkludiert FROM [Offertenpositionen] WHERE KundenNr='" & KdNR & "' and OffertenNr=(SELECT ISNULL(AO.ao_OffertenNr,-1) FROM tblAbfertigungsartOffertenstamm as AO WHERE AO.ao_Abfertigungsart='" & SENDUNG.tblSnd_Abfertigungsart_ID & "') and preis is not null order by LeistungsNr, Preis desc", "FMZOLL")

        If dt.Rows.Count = 0 Then
-            MsgBox("Es konnten keine Offertpositionen für Abfertigunsgart " & SENDUNG.tblSnd_Abfertigungsart_ID & " ermittelt werden!")
+            If Not warnungunterduecken Then MsgBox("Es konnten keine Offertpositionen für Abfertigunsgart " & SENDUNG.tblSnd_Abfertigungsart_ID & " ermittelt werden!")
            Exit Sub
        End If

@@ -823,16 +836,9 @@ Public Class usrcntlVorauskasse
            If row("LeistungsNr") = 340 Then txtVerzollungskosten._value = row("Preis")
            If row("LeistungsNr") = 324 Then txtATLAS._value = row("Preis")
            If row("LeistungsNr") = 440 Then txtPapierePorti._value = row("Preis")
-
        Next

        initBerechnung()
-
-        'For Each row As DataRow In dt.Select("BerechnungsartNr = '8'")
-
-        '    If row("LeistungsNr") = 60 Then txtVerzollungskosten.Text = row("Preis")
-        '    If row("LeistungsNr") = 20 Then txtZoll._value = row("Preis")
-
    End Sub
 End Class

--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -1,7 +1,9 @@
-Imports System.Reflection
-Imports DocumentFormat.OpenXml.Drawing.Charts
+
+Imports System.Reflection
+'Imports DocumentFormat.OpenXml.Drawing.Charts
 Imports Microsoft.Office.Interop
-Imports VERAG_PROG_ALLGEMEIN.TESTJSON
+
+Imports VERAG_PROG_ALLGEMEIN

 Public Class frmMDM_USTVAntrag

@@ -281,6 +283,62 @@ Public Class frmMDM_USTVAntrag
        End Try
    End Function

+
+    Shared Function loadUSTVFrom_RMC(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean
+        Try
+            Dim bytSchnittstellenNr = 7 'glaube noch frei?
+            Dim USTV_ANTRAG As New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID)
+            Dim dt As New DataTable
+            Dim GET_Antraege = cRMC.GET_Antraege_RMC(dt, USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien)
+
+            If GET_Antraege Then
+
+                For Each r As DataRow In dt.Rows
+
+                    Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen
+                    USTV_POS.UStVAn_ID = USTV_ANTRAG.[UStVAn_ID]
+                    USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr
+                    USTV_POS.UStVPo_ReDat = r.Item("rmc_reDatum")
+                    USTV_POS.UStVPo_ReNr = r.Item("rmc_reNr")
+                    USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr
+
+                    If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then
+
+                        USTV_POS.UStVPo_Schnittstelle = True
+                        USTV_POS.UStVPo_Leistungsbezeichnung = "Diesel"
+                        USTV_POS.UStVPo_Leistender = "RMC Service GmbH"
+                        USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+                        USTV_POS.UStVPo_Zeitstempel = Now()
+
+                        ' Berechnungen
+                        Dim umrechKurs = 1
+                        If (CDbl(r.Item("rmc_betragBrutto")) > 0 AndAlso CDbl(r.Item("rmc_euroBrutto")) > 0) Then
+                            umrechKurs = CDbl(r.Item("rmc_betragBrutto") / r.Item("rmc_euroBrutto"))
+                        End If
+
+                        If CDbl(r.Item("rmc_betragMWST")) > 0 Then
+                            USTV_POS.UStVPo_USteuerbetragEUR = CDbl(r.Item("rmc_betragMWST") * umrechKurs)
+                            USTV_POS.UStVPo_Umrechnungskurs = umrechKurs
+                            USTV_POS.UStVPo_USteuerbetrag = r.Item("rmc_betragMWST")
+                        End If
+
+                        USTV_POS.INSERT()
+
+                    End If
+
+                Next
+
+                cRMC.UPDATE_ARCHIV(USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr)
+
+            End If
+            Return True
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            Return False
+        End Try
+    End Function
+
+
    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click

        getValue(USTV_ANTRAG)
--- a/SDL/USTV/usrCntlUSTV.Designer.vb
+++ b/SDL/USTV/usrCntlUSTV.Designer.vb
@@ -28,6 +28,7 @@ Partial Class usrCntlUSTV
        Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Label1 = New System.Windows.Forms.Label()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.cbxEingereicht = New System.Windows.Forms.CheckBox()
        Me.cbxTopMax = New System.Windows.Forms.CheckBox()
        Me.txtMaxSrch = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.cboJahrBis = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -45,7 +46,7 @@ Partial Class usrCntlUSTV
        Me.Button5 = New System.Windows.Forms.Button()
        Me.Button8 = New System.Windows.Forms.Button()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.cbxEingereicht = New System.Windows.Forms.CheckBox()
+        Me.btnRMCalle = New System.Windows.Forms.Button()
        CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.Panel2.SuspendLayout()
@@ -109,6 +110,19 @@ Partial Class usrCntlUSTV
        Me.Panel1.Size = New System.Drawing.Size(1072, 84)
        Me.Panel1.TabIndex = 0
        '
+        'cbxEingereicht
+        '
+        Me.cbxEingereicht.AutoSize = True
+        Me.cbxEingereicht.Checked = True
+        Me.cbxEingereicht.CheckState = System.Windows.Forms.CheckState.Indeterminate
+        Me.cbxEingereicht.Location = New System.Drawing.Point(367, 35)
+        Me.cbxEingereicht.Name = "cbxEingereicht"
+        Me.cbxEingereicht.Size = New System.Drawing.Size(118, 17)
+        Me.cbxEingereicht.TabIndex = 46
+        Me.cbxEingereicht.Text = "Anträge eingereicht"
+        Me.cbxEingereicht.ThreeState = True
+        Me.cbxEingereicht.UseVisualStyleBackColor = True
+        '
        'cbxTopMax
        '
        Me.cbxTopMax.AutoSize = True
@@ -274,6 +288,7 @@ Partial Class usrCntlUSTV
        'Panel3
        '
        Me.Panel3.AutoSize = True
+        Me.Panel3.Controls.Add(Me.btnRMCalle)
        Me.Panel3.Controls.Add(Me.btnMail)
        Me.Panel3.Controls.Add(Me.btnPLOSEAlle)
        Me.Panel3.Controls.Add(Me.Button5)
@@ -292,7 +307,7 @@ Partial Class usrCntlUSTV
        Me.btnMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnMail.ForeColor = System.Drawing.Color.Black
        Me.btnMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnMail.Location = New System.Drawing.Point(545, 10)
+        Me.btnMail.Location = New System.Drawing.Point(750, 5)
        Me.btnMail.Name = "btnMail"
        Me.btnMail.Size = New System.Drawing.Size(75, 39)
        Me.btnMail.TabIndex = 25
@@ -347,18 +362,20 @@ Partial Class usrCntlUSTV
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
        '
-        'cbxEingereicht
+        'btnRMCalle
        '
-        Me.cbxEingereicht.AutoSize = True
-        Me.cbxEingereicht.Checked = True
-        Me.cbxEingereicht.CheckState = System.Windows.Forms.CheckState.Indeterminate
-        Me.cbxEingereicht.Location = New System.Drawing.Point(367, 35)
-        Me.cbxEingereicht.Name = "cbxEingereicht"
-        Me.cbxEingereicht.Size = New System.Drawing.Size(118, 17)
-        Me.cbxEingereicht.TabIndex = 46
-        Me.cbxEingereicht.Text = "Anträge eingereicht"
-        Me.cbxEingereicht.ThreeState = True
-        Me.cbxEingereicht.UseVisualStyleBackColor = True
+        Me.btnRMCalle.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnRMCalle.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+        Me.btnRMCalle.ForeColor = System.Drawing.Color.Black
+        Me.btnRMCalle.Image = Global.SDL.My.Resources.Resources.plus
+        Me.btnRMCalle.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnRMCalle.Location = New System.Drawing.Point(545, 6)
+        Me.btnRMCalle.Name = "btnRMCalle"
+        Me.btnRMCalle.Size = New System.Drawing.Size(172, 40)
+        Me.btnRMCalle.TabIndex = 26
+        Me.btnRMCalle.Text = "RMC für offene " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Anträge übernehmen"
+        Me.btnRMCalle.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnRMCalle.UseVisualStyleBackColor = True
        '
        'usrCntlUSTV
        '
@@ -400,4 +417,5 @@ Partial Class usrCntlUSTV
    Friend WithEvents cbxTopMax As CheckBox
    Friend WithEvents txtMaxSrch As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents cbxEingereicht As CheckBox
+    Friend WithEvents btnRMCalle As Button
 End Class
--- a/SDL/USTV/usrCntlUSTV.vb
+++ b/SDL/USTV/usrCntlUSTV.vb
@@ -24,6 +24,7 @@ Public Class usrCntlUSTV
        End If

        btnPLOSEAlle.Enabled = KdSearchBox1.KdNr > 0
+        btnRMCalle.Enabled = KdSearchBox1.KdNr > 0

        With dgvUSTV
            .ClearSelection()
@@ -163,9 +164,16 @@ Public Class usrCntlUSTV


        If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then
-            'FlatButton1.Enabled = False
+            'FlatButton1.Enabled = False#
+
            FlatButton2.Enabled = False
            Button14.Enabled = False
+
+        Else
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
+                FlatButton2.Enabled = True
+                Button14.Enabled = True
+            End If
        End If
        '   Panel3.Height = Me.Height / 2 + 300
    End Sub
@@ -228,7 +236,7 @@ Public Class usrCntlUSTV
        ' End If
    End Sub

-    Private Sub btnPLOSEAlle_Click(sender As Object, e As EventArgs) Handles btnPLOSEAlle.Click
+    Private Sub btnPLOSEAlle_Click(sender As Object, e As EventArgs) Handles btnPLOSEAlle.Click, btnRMCalle.Click
        Try
            Me.Cursor = Cursors.WaitCursor
            If KdSearchBox1.KdNr <= 0 Then Exit Sub
@@ -238,16 +246,37 @@ Public Class usrCntlUSTV
            Dim cnt = SQL.getValueTxtBySql(" SELECT  COUNT(*)   FROM [tblUStVAntrag] where UStVAn_AntragEingereichtAm is null AND UStVAn_KuNr=" & KdSearchBox1.KdNr & "  AND UStVAn_ReDatVon>='01.01." & cboJahr._value & "' AND UStVAn_ReDatBis<='31.12." & cboJahrBis._value & "'", "FMZOLL")
            If cnt = 0 Then MsgBox("Keine einreichbaren Anträge gefunden!") : Exit Sub

-            If vbYes = MsgBox("Es werden PLOSE Daten für " & cnt & " USTV-Anträge eingearbeitet. Möchten Sie fortfahren?", vbYesNoCancel) Then
-                For Each r As DataGridViewRow In dgvUSTV.Rows
-                    If r.Cells("UStVAn_AntragEingereichtAm").Value Is DBNull.Value Then ' OrElse r.Cells("UStVAn_AntragEingereichtAm").Value = "" Then
-                        'Dim Antrag_LandKz = SQL.DLookup("LandKz", "[Länderverzeichnis für die Außenhandelsstatistik]", "Landnr='" & r.Cells("UStVAn_LandNr").Value & "'", "FMZOLL")
-                        frmMDM_USTVAntrag.loadUSTVFrom_PLOSE(r.Cells("UStVAn_ID").Value, r.Cells("LandKz").Value, False)
+            Select Case sender.name
+                Case "btnPLOSEAlle"
+                    If vbYes = MsgBox("Es werden PLOSE Daten für " & cnt & " USTV-Anträge eingearbeitet. Möchten Sie fortfahren?", vbYesNoCancel) Then
+                        For Each r As DataGridViewRow In dgvUSTV.Rows
+                            If r.Cells("UStVAn_AntragEingereichtAm").Value Is DBNull.Value Then ' OrElse r.Cells("UStVAn_AntragEingereichtAm").Value = "" Then
+                                'Dim Antrag_LandKz = SQL.DLookup("LandKz", "[Länderverzeichnis für die Außenhandelsstatistik]", "Landnr='" & r.Cells("UStVAn_LandNr").Value & "'", "FMZOLL")
+                                frmMDM_USTVAntrag.loadUSTVFrom_PLOSE(r.Cells("UStVAn_ID").Value, r.Cells("LandKz").Value, False)
+                            End If
+                        Next
                    End If
-                Next
-            End If
-            init()
-            MsgBox("Fertig!")
+                    init()
+                    MsgBox("Fertig!")
+
+                Case "btnRMCalle"
+
+                    If vbYes = MsgBox("Es werden RMC Daten für " & cnt & " USTV-Anträge eingearbeitet. Möchten Sie fortfahren?", vbYesNoCancel) Then
+                        For Each r As DataGridViewRow In dgvUSTV.Rows
+                            If r.Cells("UStVAn_AntragEingereichtAm").Value Is DBNull.Value Then
+                                frmMDM_USTVAntrag.loadUSTVFrom_RMC(r.Cells("UStVAn_ID").Value, r.Cells("LandKz").Value, False)
+                            End If
+                        Next
+                    End If
+
+
+                Case Else
+                    MsgBox("Funktion nicht definiert")
+            End Select
+
+
+
+
        Catch ex As Exception
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try
@@ -383,4 +412,6 @@ Public Class usrCntlUSTV
    Private Sub cbxEingereicht_CheckedChanged(sender As Object, e As EventArgs) Handles cbxEingereicht.CheckStateChanged
        init()
    End Sub
+
+
 End Class
--- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb
+++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb
@@ -55,6 +55,7 @@ Public Class ustCntlUSTV_AntragPosition
        Dim da_id = -1
        Select Case If(UStV_POS.UStVPo_SchnittstellenNr, -1)
            Case 6, 0 : da_id = sql.getValueTxtBySql("SELECT TOP(1) [plInv_daId] FROM [tblPLOSE_Inv_Data] where plInv_SupplierRechnungsDatum='" & UStV_POS.UStVPo_ReDat & "' and plInv_SupplierRechnungsNr='" & UStV_POS.UStVPo_ReNr & "' and plInv_SupplierCountry='" & Antrag_LandKz & "' AND [plInv_daId] is not null", "FMZOLL",,, -1)
+            Case 7 : da_id = sql.getValueTxtBySql("SELECT TOP(1) [rmc_daId] FROM [tblRMCImport] where rmc_reDatum='" & UStV_POS.UStVPo_ReDat & "' and rmc_reNr='" & UStV_POS.UStVPo_ReNr & "' and rmc_landKZ='" & Antrag_LandKz & "' AND [rmc_daId] is not null", "FMZOLL",,, -1)

        End Select
        scanSonstiges.INIT_daId(da_id)
--- a/SDL/frmMain.vb
+++ b/SDL/frmMain.vb
@@ -886,9 +886,10 @@ Public Class frmMain
                ' MsgBox(newMsg)
                Label20.Text = newMsg
                Label20.Visible = (newMsg > 0)
-                VERAG_PROG_ALLGEMEIN.cMessenger.NEW_MESSGE = True 'NEUE NACHTICHTEN
-                If newMsg Then
-                    ' Me.Icon = My.Resources.avisoNewMsg
+                'VERAG_PROG_ALLGEMEIN.cMessenger.NEW_MESSGE = True 'NEUE NACHTICHTEN warum hier ????????????
+                If newMsg > 0 Then
+                    VERAG_PROG_ALLGEMEIN.cMessenger.NEW_MESSGE = True
+                    'Me.Icon = My.Resources.avisoNewMsg

                    Dim isshown = False
                    For Each openForm In Application.OpenForms()
@@ -914,7 +915,7 @@ Public Class frmMain
            End If

        Catch ex As Exception
-
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try

    End Sub
--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -263,7 +263,7 @@ Partial Class frmKundenblatt
        Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25)
        Me.tbFirmendaten.Name = "tbFirmendaten"
        Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 761)
+        Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 778)
        Me.tbFirmendaten.TabIndex = 3
        Me.tbFirmendaten.Text = "Firmendaten"
        '
@@ -273,7 +273,7 @@ Partial Class frmKundenblatt
        Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill
        Me.Panel4.Location = New System.Drawing.Point(3, 3)
        Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(1624, 755)
+        Me.Panel4.Size = New System.Drawing.Size(1624, 772)
        Me.Panel4.TabIndex = 0
        '
        'UsrcntlKundeBearbeitenFull1
@@ -283,7 +283,7 @@ Partial Class frmKundenblatt
        Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0)
        Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1"
-        Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 755)
+        Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 772)
        Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0
        '
        'tbcntrMain
@@ -301,7 +301,7 @@ Partial Class frmKundenblatt
        Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0)
        Me.tbcntrMain.Name = "tbcntrMain"
        Me.tbcntrMain.SelectedIndex = 0
-        Me.tbcntrMain.Size = New System.Drawing.Size(1638, 790)
+        Me.tbcntrMain.Size = New System.Drawing.Size(1638, 807)
        Me.tbcntrMain.TabIndex = 3
        '
        'tbAllgemein
@@ -334,7 +334,7 @@ Partial Class frmKundenblatt
        Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0)
        Me.tbAllgemein.Name = "tbAllgemein"
        Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbAllgemein.Size = New System.Drawing.Size(1630, 761)
+        Me.tbAllgemein.Size = New System.Drawing.Size(1630, 778)
        Me.tbAllgemein.TabIndex = 0
        Me.tbAllgemein.Text = "Allgemein"
        '
@@ -669,7 +669,7 @@ Partial Class frmKundenblatt
        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
        Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
-        Me.dgvSperrliste.Size = New System.Drawing.Size(835, 651)
+        Me.dgvSperrliste.Size = New System.Drawing.Size(835, 668)
        Me.dgvSperrliste.TabIndex = 23
        '
        'PictureBox2
@@ -723,7 +723,7 @@ Partial Class frmKundenblatt
        Me.tbZoll.Location = New System.Drawing.Point(4, 25)
        Me.tbZoll.Name = "tbZoll"
        Me.tbZoll.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbZoll.Size = New System.Drawing.Size(1630, 761)
+        Me.tbZoll.Size = New System.Drawing.Size(1630, 778)
        Me.tbZoll.TabIndex = 9
        Me.tbZoll.Text = "ZOLL"
        Me.tbZoll.UseVisualStyleBackColor = True
@@ -735,7 +735,7 @@ Partial Class frmKundenblatt
        Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3)
        Me.tbcntrZOLL.Name = "tbcntrZOLL"
        Me.tbcntrZOLL.SelectedIndex = 0
-        Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 755)
+        Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 772)
        Me.tbcntrZOLL.TabIndex = 0
        '
        'tabZoll_Artikel
@@ -743,7 +743,7 @@ Partial Class frmKundenblatt
        Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22)
        Me.tabZoll_Artikel.Name = "tabZoll_Artikel"
        Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3)
-        Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 729)
+        Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 746)
        Me.tabZoll_Artikel.TabIndex = 1
        Me.tabZoll_Artikel.Text = "Artikel"
        Me.tabZoll_Artikel.UseVisualStyleBackColor = True
@@ -754,7 +754,7 @@ Partial Class frmKundenblatt
        Me.tbMdm.Location = New System.Drawing.Point(4, 25)
        Me.tbMdm.Name = "tbMdm"
        Me.tbMdm.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbMdm.Size = New System.Drawing.Size(1630, 761)
+        Me.tbMdm.Size = New System.Drawing.Size(1630, 778)
        Me.tbMdm.TabIndex = 10
        Me.tbMdm.Text = "MDM"
        Me.tbMdm.UseVisualStyleBackColor = True
@@ -772,7 +772,7 @@ Partial Class frmKundenblatt
        Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0)
        Me.tbcntrMDM.Name = "tbcntrMDM"
        Me.tbcntrMDM.SelectedIndex = 0
-        Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 755)
+        Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 772)
        Me.tbcntrMDM.TabIndex = 0
        '
        'tbSDL
@@ -784,7 +784,7 @@ Partial Class frmKundenblatt
        Me.tbSDL.Margin = New System.Windows.Forms.Padding(0)
        Me.tbSDL.Name = "tbSDL"
        Me.tbSDL.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbSDL.Size = New System.Drawing.Size(1616, 729)
+        Me.tbSDL.Size = New System.Drawing.Size(1616, 746)
        Me.tbSDL.TabIndex = 5
        Me.tbSDL.Text = "SDL-Leistungen"
        Me.tbSDL.UseVisualStyleBackColor = True
@@ -826,7 +826,7 @@ Partial Class frmKundenblatt
        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
        Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle10
        Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 533)
+        Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 550)
        Me.dgvSDLLeistungenFull.TabIndex = 5
        '
        'Panel6
@@ -930,7 +930,7 @@ Partial Class frmKundenblatt
        Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL)
        Me.Panel5.Controls.Add(Me.rtbVermerke)
        Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel5.Location = New System.Drawing.Point(3, 583)
+        Me.Panel5.Location = New System.Drawing.Point(3, 600)
        Me.Panel5.Name = "Panel5"
        Me.Panel5.Size = New System.Drawing.Size(1610, 143)
        Me.Panel5.TabIndex = 177
@@ -1794,7 +1794,7 @@ Partial Class frmKundenblatt
        Me.tbOfferte.Location = New System.Drawing.Point(4, 25)
        Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2)
        Me.tbOfferte.Name = "tbOfferte"
-        Me.tbOfferte.Size = New System.Drawing.Size(1630, 761)
+        Me.tbOfferte.Size = New System.Drawing.Size(1630, 778)
        Me.tbOfferte.TabIndex = 11
        Me.tbOfferte.Text = "Offerte"
        Me.tbOfferte.UseVisualStyleBackColor = True
@@ -1806,7 +1806,7 @@ Partial Class frmKundenblatt
        Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0)
        Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1)
        Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
-        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 761)
+        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 778)
        Me.UsrCntlOfferte1.TabIndex = 0
        '
        'tbUSTV
@@ -1814,7 +1814,7 @@ Partial Class frmKundenblatt
        Me.tbUSTV.Controls.Add(Me.tbcntrUSTV)
        Me.tbUSTV.Location = New System.Drawing.Point(4, 25)
        Me.tbUSTV.Name = "tbUSTV"
-        Me.tbUSTV.Size = New System.Drawing.Size(1630, 761)
+        Me.tbUSTV.Size = New System.Drawing.Size(1630, 778)
        Me.tbUSTV.TabIndex = 12
        Me.tbUSTV.Text = "USTV"
        Me.tbUSTV.UseVisualStyleBackColor = True
@@ -1828,7 +1828,7 @@ Partial Class frmKundenblatt
        Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0)
        Me.tbcntrUSTV.Name = "tbcntrUSTV"
        Me.tbcntrUSTV.SelectedIndex = 0
-        Me.tbcntrUSTV.Size = New System.Drawing.Size(1630, 761)
+        Me.tbcntrUSTV.Size = New System.Drawing.Size(1630, 778)
        Me.tbcntrUSTV.TabIndex = 1
        '
        'tbUSTVDokumente
@@ -1841,7 +1841,7 @@ Partial Class frmKundenblatt
        Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten)
        Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22)
        Me.tbUSTVDokumente.Name = "tbUSTVDokumente"
-        Me.tbUSTVDokumente.Size = New System.Drawing.Size(1622, 735)
+        Me.tbUSTVDokumente.Size = New System.Drawing.Size(1622, 752)
        Me.tbUSTVDokumente.TabIndex = 8
        Me.tbUSTVDokumente.Text = "Dokumente"
        Me.tbUSTVDokumente.UseVisualStyleBackColor = True
@@ -2094,7 +2094,6 @@ Partial Class frmKundenblatt
        '
        Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
        Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
        Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
        Me.cntxtCntxtMDM.Text = "cntxtMDM"
        '
@@ -2234,7 +2233,7 @@ Partial Class frmKundenblatt
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.AutoScroll = True
        Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(1180, 919)
+        Me.ClientSize = New System.Drawing.Size(1180, 936)
        Me.Controls.Add(Me.lblAbfVerb)
        Me.Controls.Add(Me.btnAbfVerb)
        Me.Controls.Add(Me.tbcntrMain)