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

2025-07-28 09:05:02 +02:00
parent c6050c5783 d079aff6cc
commit 2dff47162e
17 changed files with 413 additions and 96 deletions
--- a/SDL/Resources/AEO_CS.jpg
+++ b/SDL/Resources/AEO_CS.jpg
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -5124,9 +5124,7 @@
    </None>
    <None Include="Resources\ambar_boarder1.jpg" />
    <None Include="Resources\ambar_boarder.jpg" />
-    <Content Include="Resources\AEO_CS.jpg">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    <None Include="Resources\aeo_CS.jpg" />
    <Content Include="Resources\food.png" />
    <None Include="Resources\food1.png" />
    <None Include="Resources\food2.png" />
--- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
+++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
@@ -2182,13 +2182,22 @@ Public Class usrCntlSpeditionsBuchSuche
                        Blatt.Range("H" & cnt).Value = r("BelegNr")

                        Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung
-                        If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "", False, r("Zollsystem_Land")) Then
-                            Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.Rechnungspreis
-                            Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine)
-                            Blatt.Range("I" & cnt).Value = ZOLLANMELDUNG.ABGABEN_ZOLL
-                            Blatt.Range("J" & cnt).Value = ZOLLANMELDUNG.ANZ_POS
-                        End If
+                        Try
+                            Dim zS = If(r("Zollsystem_Land") IsNot DBNull.Value, r("Zollsystem_Land").ToString(), "")
+                            If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "", False, zS) Then
+                                Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.Rechnungspreis
+                                Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine)
+                                Blatt.Range("I" & cnt).Value = ZOLLANMELDUNG.ABGABEN_ZOLL
+                                Blatt.Range("J" & cnt).Value = ZOLLANMELDUNG.ANZ_POS

+                                If If(ZOLLANMELDUNG.ATCMRN, "") <> "" Then
+                                    Blatt.Range("H" & cnt).Value = ZOLLANMELDUNG.ATCMRN
+                                End If
+                            End If
+
+                        Catch ex As Exception
+                            MsgBox(ex.Message & ex.StackTrace)
+                        End Try
                        lblKdAusFortschritt.Text = (cnt - 2) & "/" & dt.Rows.Count
                        Me.Refresh()
                        cnt += 1
--- a/SDL/USTV/usrCntlUSTV.vb
+++ b/SDL/USTV/usrCntlUSTV.vb
@@ -43,7 +43,7 @@ Public Class usrCntlUSTV
                End If
            End If

-            .SET_SQL("SELECT " & topMax & " [tblUStVAntrag].[UStVAn_ID],UStVAn_AntragArt,[UStVAn_KuNr],[UStVAn_Name],[UStVAn_LandKz],LandKz as Land_Antrag , UStVAn_BezugsNr, [UStVAn_ReDatVon], [UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],([UStVAn_USteuerbetrag] - [UStVAn_Erstattungsbetrag]) as UStVAn_Differenzbetrag,[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],([UStVAn_USteuerbetragEUR] - [UStVAn_ErstattungsbetragEUR]) as UStVAn_DifferenzbetragEUR,[UStVAn_VZBetrag],[UStVAn_VZDatum],UStVAn_VZoffen ,[UStVAn_Sachbearbeiter]                 
+            .SET_SQL("SELECT " & topMax & " [tblUStVAntrag].[UStVAn_ID],UStVAn_AntragArt,[UStVAn_KuNr],[UStVAn_Name],[UStVAn_LandKz],LandKz as Land_Antrag , UStVAn_BezugsNr, [UStVAn_ReDatVon], [UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_VZBetrag],[UStVAn_VZDatum],[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],([UStVAn_USteuerbetrag] - [UStVAn_Erstattungsbetrag]) as UStVAn_Differenzbetrag,[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],([UStVAn_USteuerbetragEUR] - [UStVAn_ErstattungsbetragEUR]) as UStVAn_DifferenzbetragEUR,UStVAn_VZoffen ,[UStVAn_Sachbearbeiter]                 
                        FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr
                        where 1=1 " & getWhere(, ID, AntragsLand) & "
                        order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc", "FMZOLL")
@@ -67,86 +67,99 @@ Public Class usrCntlUSTV
                DataGridViewCellStyleDate.Format = "MM/yyyy"


-                '.Columns("UStVAn_ID").Visible = False
+
+                '   .Columns("UStVAn_ID").Visible = False 
+                .Columns("UStVAn_ID").Width = 70
+                .Columns("UStVAn_ID").HeaderText = "ID"
+                .Columns("UStVAn_ID").Frozen = True
+
                .Columns("UStVAn_AntragArt").HeaderText = "Art"
                .Columns("UStVAn_AntragArt").MinimumWidth = 50
+                .Columns("UStVAn_AntragArt").Frozen = True

                .Columns("UStVAn_KuNr").HeaderText = "KundenNr"
                .Columns("UStVAn_Name").MinimumWidth = 70
+                .Columns("UStVAn_KuNr").Frozen = True

                .Columns("UStVAn_Name").HeaderText = "Firma"
                .Columns("UStVAn_Name").Width = 200
+                .Columns("UStVAn_Name").Frozen = True
                ' .Columns("UStVAn_Name").MinimumWidth = 150
                ' .Columns("UStVAn_Name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill

                .Columns("UStVAn_LandKz").HeaderText = "Land"
                .Columns("UStVAn_LandKz").Width = 60
+                .Columns("UStVAn_LandKz").Frozen = True

-                .Columns("Land_Antrag").Width = 90
+                .Columns("Land_Antrag").HeaderText = "Antrag Land"
+                .Columns("Land_Antrag").Width = 60
+                .Columns("Land_Antrag").Frozen = True

                .Columns("UStVAn_ReDatVon").HeaderText = "Von"
                '.Columns("UStVAn_ReDatVon").DefaultCellStyle = DataGridViewCellStyleDate
-                .Columns("UStVAn_ReDatVon").Width = 100
+                .Columns("UStVAn_ReDatVon").Width = 75

                .Columns("UStVAn_ReDatBis").HeaderText = "Bis"
                '.Columns("UStVAn_ReDatBis").DefaultCellStyle = DataGridViewCellStyleDate
-                .Columns("UStVAn_ReDatBis").Width = 100
+                .Columns("UStVAn_ReDatBis").Width = 75

                .Columns("UStVAn_BezugsNr").HeaderText = "BezugsNr"
-                .Columns("UStVAn_BezugsNr").Width = 100
+                .Columns("UStVAn_BezugsNr").Width = 70
+
+                .Columns("UStVAn_AntragEingereichtAm").HeaderText = "Eingereicht Datum"
+                .Columns("UStVAn_AntragEingereichtAm").Width = 80
+
+                .Columns("UStVAn_VZDatum").HeaderText = "Vorausz.Am"
+                .Columns("UStVAn_VZDatum").Width = 75
+
+                .Columns("UStVAn_VZBetrag").HeaderText = "Vorauszahlung Betrag"
+                .Columns("UStVAn_VZBetrag").Width = 100
+                .Columns("UStVAn_VZBetrag").DefaultCellStyle.Format = "N2"
+                .Columns("UStVAn_VZBetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight

-                .Columns("UStVAn_AntragEingereichtAm").HeaderText = "EingereichtAm"
-                .Columns("UStVAn_AntragEingereichtAm").Width = 100

                .Columns("UStVAn_3470").HeaderText = "3470"
-                .Columns("UStVAn_3470").Width = 150
+                .Columns("UStVAn_3470").Width = 100
                .Columns("UStVAn_3470").DefaultCellStyle.Format = "N2"
                .Columns("UStVAn_3470").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight

-                .Columns("UStVAn_Währungscode").HeaderText = "Währung"
-                .Columns("UStVAn_Währungscode").Width = 80
+                .Columns("UStVAn_Währungscode").HeaderText = "Währ."
+                .Columns("UStVAn_Währungscode").Width = 60

-                .Columns("UStVAn_USteuerbetrag").HeaderText = "USt-Betrag"
-                .Columns("UStVAn_USteuerbetrag").Width = 150
+                .Columns("UStVAn_USteuerbetrag").HeaderText = "USt Betrag"
+                .Columns("UStVAn_USteuerbetrag").Width = 100
                .Columns("UStVAn_USteuerbetrag").DefaultCellStyle.Format = "N2"
                .Columns("UStVAn_USteuerbetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight

-                .Columns("UStVAn_Erstattungsbetrag").HeaderText = "Erstattung-Betrag"
-                .Columns("UStVAn_Erstattungsbetrag").Width = 150
+                .Columns("UStVAn_Erstattungsbetrag").HeaderText = "Erstattung Betrag"
+                .Columns("UStVAn_Erstattungsbetrag").Width = 100
                .Columns("UStVAn_Erstattungsbetrag").DefaultCellStyle.Format = "N2"
                .Columns("UStVAn_Erstattungsbetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight


-                .Columns("UStVAn_Differenzbetrag").HeaderText = "Differenz-Betrag"
-                .Columns("UStVAn_Differenzbetrag").Width = 150
+                .Columns("UStVAn_Differenzbetrag").HeaderText = "Differenz Betrag"
+                .Columns("UStVAn_Differenzbetrag").Width = 100
                .Columns("UStVAn_Differenzbetrag").DefaultCellStyle.Format = "N2"
                .Columns("UStVAn_Differenzbetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight

-                .Columns("UStVAn_ErstattungsbetragEUR").HeaderText = "Erstattung-Betrag  EUR"
-                .Columns("UStVAn_ErstattungsbetragEUR").Width = 150
+                .Columns("UStVAn_ErstattungsbetragEUR").HeaderText = "Erstattung Betrag EUR"
+                .Columns("UStVAn_ErstattungsbetragEUR").Width = 100
                .Columns("UStVAn_ErstattungsbetragEUR").DefaultCellStyle.Format = "N2"
                .Columns("UStVAn_ErstattungsbetragEUR").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight

                .Columns("UStVAn_USteuerbetragEUR").HeaderText = "USt-Betrag EUR"
-                .Columns("UStVAn_USteuerbetragEUR").Width = 150
+                .Columns("UStVAn_USteuerbetragEUR").Width = 100
                .Columns("UStVAn_USteuerbetragEUR").DefaultCellStyle.Format = "N2"
                .Columns("UStVAn_USteuerbetragEUR").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight

-                .Columns("UStVAn_DifferenzbetragEUR").HeaderText = "Differenz-Betrag EUR"
-                .Columns("UStVAn_DifferenzbetragEUR").Width = 150
+                .Columns("UStVAn_DifferenzbetragEUR").HeaderText = "Differenz Betrag EUR"
+                .Columns("UStVAn_DifferenzbetragEUR").Width = 100
                .Columns("UStVAn_DifferenzbetragEUR").DefaultCellStyle.Format = "N2"
                .Columns("UStVAn_DifferenzbetragEUR").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight

-                .Columns("UStVAn_VZDatum").HeaderText = "Vorauszahlung Am"
-                .Columns("UStVAn_VZDatum").Width = 100
-
-                .Columns("UStVAn_VZBetrag").HeaderText = "Vorauszahlung-Betrag"
-                .Columns("UStVAn_VZBetrag").Width = 150
-                .Columns("UStVAn_VZBetrag").DefaultCellStyle.Format = "N2"
-                .Columns("UStVAn_VZBetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight

                .Columns("UStVAn_VZoffen").HeaderText = "VZ nicht abgerechnet"
-                .Columns("UStVAn_VZoffen").Width = 100
+                .Columns("UStVAn_VZoffen").Width = 80
                .Columns("UStVAn_VZoffen").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter

                .Columns("UStVAn_Sachbearbeiter").HeaderText = "Sachbearbeiter"
--- a/SDL/kunden/frmKundenSyska_DatenÜbertragen.vb
+++ b/SDL/kunden/frmKundenSyska_DatenÜbertragen.vb
@@ -26,21 +26,21 @@
            Dim SystembenutzerText = "AVISO_User"

            If cbxUID.Checked Then
-                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_ustidnr='" & lblAVISO_UID.Text & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate() where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
+                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_ustidnr='" & SqlSafe(lblAVISO_UID.Text) & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate() where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
            End If
            If cbxEMail.Checked Then
-                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_email='" & lblAVISO_EMail.Text & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()  where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
+                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_email='" & SqlSafe(lblAVISO_EMail.Text) & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()  where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
            End If
            If cbxFirma.Checked Then
-                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_name='" & lblAVISO_Name1.Text & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()    where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
-                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_name2='" & lblAVISO_Name2.Text & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()   where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
+                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_name='" & SqlSafe(lblAVISO_Name1.Text) & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()    where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
+                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_name2='" & SqlSafe(lblAVISO_Name2.Text) & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()   where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
            End If
            If cbxAdresse.Checked Then
-                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_strasse='" & lblAVISO_Strasse.Text & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()  where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
-                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_plz='" & lblAVISO_PLZ.Text & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()  where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
-                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_ort='" & lblAVISO_Ort.Text & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()  where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
-                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_landid='" & lblAVISO_Land.Text & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()  where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
-            End If
+                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_strasse='" & SqlSafe(lblAVISO_Strasse.Text) & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()  where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
+                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_plz='" & SqlSafe(lblAVISO_PLZ.Text) & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()  where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
+                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_ort='" & SqlSafe(lblAVISO_Ort.Text) & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()  where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
+                If Not Sql.doSQL("UPDATE [FIBU2].dbo.fibu_konto  SET c_landid='" & SqlSafe(lblAVISO_Land.Text) & "', c_manipulator = '" & SystembenutzerText & "', dt_manipulation = Getdate()  where i_konto='" & KundenNr & "' AND i_firm_refid = '" & FIRMA_ID & "'", "FIBU") Then fehler = True
+                End If
        End If

        If fehler Then
@@ -67,7 +67,10 @@
        End If

    End Sub
-
+    Function SqlSafe(value As String) As String
+        If value Is Nothing Then Return ""
+        Return value.Replace("'", "''").Replace(";", "").Replace("--", "")
+    End Function
    Private Sub cboFirma_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedIndexChanged
        Button1.Image = Nothing
        If cboFirma._value = "" Then Exit Sub
--- a/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.Designer.vb
+++ b/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.Designer.vb
@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class usrCntlKundenAvisoMailBenachrichtigung
    Inherits System.Windows.Forms.UserControl

    'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        Try
            If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.cboFreigabe_SteuerbescheidBedingung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cbxFreigabe_VBD = New System.Windows.Forms.CheckBox()
@@ -49,6 +49,8 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.FlatButton5 = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.btnWikiStatusmails = New System.Windows.Forms.Button()
+        Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.cbxSndUnterl = New System.Windows.Forms.CheckBox()
        Me.SuspendLayout()
        '
        'cboFreigabe_SteuerbescheidBedingung
@@ -58,9 +60,9 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.cboFreigabe_SteuerbescheidBedingung._value = ""
        Me.cboFreigabe_SteuerbescheidBedingung.Enabled = False
        Me.cboFreigabe_SteuerbescheidBedingung.FormattingEnabled = True
-        Me.cboFreigabe_SteuerbescheidBedingung.Location = New System.Drawing.Point(367, 138)
+        Me.cboFreigabe_SteuerbescheidBedingung.Location = New System.Drawing.Point(293, 80)
        Me.cboFreigabe_SteuerbescheidBedingung.Name = "cboFreigabe_SteuerbescheidBedingung"
-        Me.cboFreigabe_SteuerbescheidBedingung.Size = New System.Drawing.Size(86, 21)
+        Me.cboFreigabe_SteuerbescheidBedingung.Size = New System.Drawing.Size(76, 21)
        Me.cboFreigabe_SteuerbescheidBedingung.TabIndex = 52
        '
        'cbxFreigabe_VBD
@@ -68,7 +70,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.cbxFreigabe_VBD.AutoSize = True
        Me.cbxFreigabe_VBD.Enabled = False
        Me.cbxFreigabe_VBD.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxFreigabe_VBD.Location = New System.Drawing.Point(104, 140)
+        Me.cbxFreigabe_VBD.Location = New System.Drawing.Point(104, 83)
        Me.cbxFreigabe_VBD.Name = "cbxFreigabe_VBD"
        Me.cbxFreigabe_VBD.Size = New System.Drawing.Size(48, 17)
        Me.cbxFreigabe_VBD.TabIndex = 51
@@ -79,18 +81,18 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        '
        Me.cbxFreigabe_Steuerbescheid.AutoSize = True
        Me.cbxFreigabe_Steuerbescheid.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxFreigabe_Steuerbescheid.Location = New System.Drawing.Point(266, 140)
+        Me.cbxFreigabe_Steuerbescheid.Location = New System.Drawing.Point(246, 83)
        Me.cbxFreigabe_Steuerbescheid.Name = "cbxFreigabe_Steuerbescheid"
-        Me.cbxFreigabe_Steuerbescheid.Size = New System.Drawing.Size(103, 17)
+        Me.cbxFreigabe_Steuerbescheid.Size = New System.Drawing.Size(50, 17)
        Me.cbxFreigabe_Steuerbescheid.TabIndex = 49
-        Me.cbxFreigabe_Steuerbescheid.Text = "Steuerbescheid:"
+        Me.cbxFreigabe_Steuerbescheid.Text = "STB:"
        Me.cbxFreigabe_Steuerbescheid.UseVisualStyleBackColor = True
        '
        'cbxSendungsListFreigabe
        '
        Me.cbxSendungsListFreigabe.AutoSize = True
        Me.cbxSendungsListFreigabe.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxSendungsListFreigabe.Location = New System.Drawing.Point(6, 140)
+        Me.cbxSendungsListFreigabe.Location = New System.Drawing.Point(6, 83)
        Me.cbxSendungsListFreigabe.Name = "cbxSendungsListFreigabe"
        Me.cbxSendungsListFreigabe.Size = New System.Drawing.Size(92, 17)
        Me.cbxSendungsListFreigabe.TabIndex = 50
@@ -102,7 +104,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.rtbLKWFreigabe.BackColor = System.Drawing.Color.White
        Me.rtbLKWFreigabe.BorderStyle = System.Windows.Forms.BorderStyle.None
        Me.rtbLKWFreigabe.Enabled = False
-        Me.rtbLKWFreigabe.Location = New System.Drawing.Point(278, 25)
+        Me.rtbLKWFreigabe.Location = New System.Drawing.Point(278, 27)
        Me.rtbLKWFreigabe.Name = "rtbLKWFreigabe"
        Me.rtbLKWFreigabe.ReadOnly = True
        Me.rtbLKWFreigabe.Size = New System.Drawing.Size(184, 48)
@@ -114,7 +116,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.rtbLkwAnkunf.BackColor = System.Drawing.Color.White
        Me.rtbLkwAnkunf.BorderStyle = System.Windows.Forms.BorderStyle.None
        Me.rtbLkwAnkunf.Enabled = False
-        Me.rtbLkwAnkunf.Location = New System.Drawing.Point(88, 24)
+        Me.rtbLkwAnkunf.Location = New System.Drawing.Point(88, 26)
        Me.rtbLkwAnkunf.Name = "rtbLkwAnkunf"
        Me.rtbLkwAnkunf.ReadOnly = True
        Me.rtbLkwAnkunf.Size = New System.Drawing.Size(184, 49)
@@ -125,7 +127,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        '
        Me.CheckBox6.AutoSize = True
        Me.CheckBox6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.CheckBox6.Location = New System.Drawing.Point(278, 4)
+        Me.CheckBox6.Location = New System.Drawing.Point(278, 6)
        Me.CheckBox6.Name = "CheckBox6"
        Me.CheckBox6.Size = New System.Drawing.Size(72, 17)
        Me.CheckBox6.TabIndex = 44
@@ -136,7 +138,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        '
        Me.CheckBox4.AutoSize = True
        Me.CheckBox4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.CheckBox4.Location = New System.Drawing.Point(87, 4)
+        Me.CheckBox4.Location = New System.Drawing.Point(87, 6)
        Me.CheckBox4.Name = "CheckBox4"
        Me.CheckBox4.Size = New System.Drawing.Size(142, 17)
        Me.CheckBox4.TabIndex = 43
@@ -151,7 +153,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.FlatButton2.FlatAppearance.BorderSize = 0
        Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.FlatButton2.ForeColor = System.Drawing.Color.Black
-        Me.FlatButton2.Location = New System.Drawing.Point(422, 2)
+        Me.FlatButton2.Location = New System.Drawing.Point(422, 4)
        Me.FlatButton2.Name = "FlatButton2"
        Me.FlatButton2.Size = New System.Drawing.Size(20, 20)
        Me.FlatButton2.TabIndex = 46
@@ -166,7 +168,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.FlatButton3.FlatAppearance.BorderSize = 0
        Me.FlatButton3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.FlatButton3.ForeColor = System.Drawing.Color.Black
-        Me.FlatButton3.Location = New System.Drawing.Point(235, 2)
+        Me.FlatButton3.Location = New System.Drawing.Point(235, 4)
        Me.FlatButton3.Name = "FlatButton3"
        Me.FlatButton3.Size = New System.Drawing.Size(20, 20)
        Me.FlatButton3.TabIndex = 47
@@ -178,7 +180,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.RichTextBox1.BackColor = System.Drawing.Color.White
        Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None
        Me.RichTextBox1.Enabled = False
-        Me.RichTextBox1.Location = New System.Drawing.Point(278, 95)
+        Me.RichTextBox1.Location = New System.Drawing.Point(278, 139)
        Me.RichTextBox1.Name = "RichTextBox1"
        Me.RichTextBox1.ReadOnly = True
        Me.RichTextBox1.Size = New System.Drawing.Size(184, 41)
@@ -190,7 +192,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.RichTextBox2.BackColor = System.Drawing.Color.White
        Me.RichTextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None
        Me.RichTextBox2.Enabled = False
-        Me.RichTextBox2.Location = New System.Drawing.Point(88, 95)
+        Me.RichTextBox2.Location = New System.Drawing.Point(88, 139)
        Me.RichTextBox2.Name = "RichTextBox2"
        Me.RichTextBox2.ReadOnly = True
        Me.RichTextBox2.Size = New System.Drawing.Size(184, 41)
@@ -201,7 +203,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        '
        Me.CheckBox1.AutoSize = True
        Me.CheckBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.CheckBox1.Location = New System.Drawing.Point(278, 75)
+        Me.CheckBox1.Location = New System.Drawing.Point(278, 119)
        Me.CheckBox1.Name = "CheckBox1"
        Me.CheckBox1.Size = New System.Drawing.Size(72, 17)
        Me.CheckBox1.TabIndex = 54
@@ -212,7 +214,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        '
        Me.CheckBox2.AutoSize = True
        Me.CheckBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.CheckBox2.Location = New System.Drawing.Point(87, 75)
+        Me.CheckBox2.Location = New System.Drawing.Point(87, 119)
        Me.CheckBox2.Name = "CheckBox2"
        Me.CheckBox2.Size = New System.Drawing.Size(142, 17)
        Me.CheckBox2.TabIndex = 53
@@ -227,7 +229,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.FlatButton1.FlatAppearance.BorderSize = 0
        Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.FlatButton1.ForeColor = System.Drawing.Color.Black
-        Me.FlatButton1.Location = New System.Drawing.Point(422, 73)
+        Me.FlatButton1.Location = New System.Drawing.Point(422, 117)
        Me.FlatButton1.Name = "FlatButton1"
        Me.FlatButton1.Size = New System.Drawing.Size(20, 20)
        Me.FlatButton1.TabIndex = 56
@@ -242,7 +244,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.FlatButton4.FlatAppearance.BorderSize = 0
        Me.FlatButton4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.FlatButton4.ForeColor = System.Drawing.Color.Black
-        Me.FlatButton4.Location = New System.Drawing.Point(235, 73)
+        Me.FlatButton4.Location = New System.Drawing.Point(235, 117)
        Me.FlatButton4.Name = "FlatButton4"
        Me.FlatButton4.Size = New System.Drawing.Size(20, 20)
        Me.FlatButton4.TabIndex = 57
@@ -253,7 +255,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        '
        Me.lbl.AutoSize = True
        Me.lbl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lbl.Location = New System.Drawing.Point(3, 6)
+        Me.lbl.Location = New System.Drawing.Point(3, 8)
        Me.lbl.Name = "lbl"
        Me.lbl.Size = New System.Drawing.Size(52, 13)
        Me.lbl.TabIndex = 59
@@ -263,7 +265,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        '
        Me.Label1.AutoSize = True
        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.Location = New System.Drawing.Point(3, 77)
+        Me.Label1.Location = New System.Drawing.Point(3, 121)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(54, 13)
        Me.Label1.TabIndex = 60
@@ -273,7 +275,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        '
        Me.cbxFreigabe_ABD.AutoSize = True
        Me.cbxFreigabe_ABD.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxFreigabe_ABD.Location = New System.Drawing.Point(153, 140)
+        Me.cbxFreigabe_ABD.Location = New System.Drawing.Point(153, 83)
        Me.cbxFreigabe_ABD.Name = "cbxFreigabe_ABD"
        Me.cbxFreigabe_ABD.Size = New System.Drawing.Size(48, 17)
        Me.cbxFreigabe_ABD.TabIndex = 61
@@ -284,7 +286,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        '
        Me.cbxAVM.AutoSize = True
        Me.cbxAVM.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxAVM.Location = New System.Drawing.Point(207, 140)
+        Me.cbxAVM.Location = New System.Drawing.Point(197, 83)
        Me.cbxAVM.Name = "cbxAVM"
        Me.cbxAVM.Size = New System.Drawing.Size(49, 17)
        Me.cbxAVM.TabIndex = 62
@@ -299,7 +301,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.cboFreigabeArt.Enabled = False
        Me.cboFreigabeArt.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.cboFreigabeArt.FormattingEnabled = True
-        Me.cboFreigabeArt.Location = New System.Drawing.Point(348, 1)
+        Me.cboFreigabeArt.Location = New System.Drawing.Point(348, 3)
        Me.cboFreigabeArt.Name = "cboFreigabeArt"
        Me.cboFreigabeArt.Size = New System.Drawing.Size(68, 21)
        Me.cboFreigabeArt.TabIndex = 63
@@ -312,7 +314,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.cboFreigabeArtExport.Enabled = False
        Me.cboFreigabeArtExport.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.cboFreigabeArtExport.FormattingEnabled = True
-        Me.cboFreigabeArtExport.Location = New System.Drawing.Point(348, 70)
+        Me.cboFreigabeArtExport.Location = New System.Drawing.Point(348, 114)
        Me.cboFreigabeArtExport.Name = "cboFreigabeArtExport"
        Me.cboFreigabeArtExport.Size = New System.Drawing.Size(68, 21)
        Me.cboFreigabeArtExport.TabIndex = 64
@@ -321,7 +323,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        '
        Me.Label2.AutoSize = True
        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label2.Location = New System.Drawing.Point(3, 178)
+        Me.Label2.Location = New System.Drawing.Point(3, 196)
        Me.Label2.Name = "Label2"
        Me.Label2.Size = New System.Drawing.Size(58, 13)
        Me.Label2.TabIndex = 68
@@ -331,7 +333,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        '
        Me.rtbLkwStatusMail.BackColor = System.Drawing.Color.White
        Me.rtbLkwStatusMail.BorderStyle = System.Windows.Forms.BorderStyle.None
-        Me.rtbLkwStatusMail.Location = New System.Drawing.Point(88, 178)
+        Me.rtbLkwStatusMail.Location = New System.Drawing.Point(88, 196)
        Me.rtbLkwStatusMail.Name = "rtbLkwStatusMail"
        Me.rtbLkwStatusMail.ReadOnly = True
        Me.rtbLkwStatusMail.Size = New System.Drawing.Size(184, 59)
@@ -346,7 +348,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.FlatButton5.FlatAppearance.BorderSize = 0
        Me.FlatButton5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.FlatButton5.ForeColor = System.Drawing.Color.Black
-        Me.FlatButton5.Location = New System.Drawing.Point(67, 174)
+        Me.FlatButton5.Location = New System.Drawing.Point(67, 192)
        Me.FlatButton5.Name = "FlatButton5"
        Me.FlatButton5.Size = New System.Drawing.Size(20, 20)
        Me.FlatButton5.TabIndex = 67
@@ -355,7 +357,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        'Panel1
        '
        Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.Panel1.Location = New System.Drawing.Point(6, 165)
+        Me.Panel1.Location = New System.Drawing.Point(6, 183)
        Me.Panel1.Name = "Panel1"
        Me.Panel1.Size = New System.Drawing.Size(460, 1)
        Me.Panel1.TabIndex = 69
@@ -366,18 +368,40 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.btnWikiStatusmails.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.btnWikiStatusmails.FlatAppearance.BorderSize = 0
        Me.btnWikiStatusmails.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnWikiStatusmails.Location = New System.Drawing.Point(6, 25)
+        Me.btnWikiStatusmails.Location = New System.Drawing.Point(6, 27)
        Me.btnWikiStatusmails.Name = "btnWikiStatusmails"
        Me.btnWikiStatusmails.Size = New System.Drawing.Size(32, 25)
        Me.btnWikiStatusmails.TabIndex = 70
        Me.btnWikiStatusmails.UseVisualStyleBackColor = True
        '
+        'Panel2
+        '
+        Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel2.Location = New System.Drawing.Point(9, 105)
+        Me.Panel2.Name = "Panel2"
+        Me.Panel2.Size = New System.Drawing.Size(460, 1)
+        Me.Panel2.TabIndex = 71
+        '
+        'cbxSndUnterl
+        '
+        Me.cbxSndUnterl.AutoSize = True
+        Me.cbxSndUnterl.Enabled = False
+        Me.cbxSndUnterl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxSndUnterl.Location = New System.Drawing.Point(378, 81)
+        Me.cbxSndUnterl.Name = "cbxSndUnterl"
+        Me.cbxSndUnterl.Size = New System.Drawing.Size(88, 17)
+        Me.cbxSndUnterl.TabIndex = 72
+        Me.cbxSndUnterl.Text = "SndUntl.(Blg)"
+        Me.cbxSndUnterl.UseVisualStyleBackColor = True
+        '
        'usrCntlKundenAvisoMailBenachrichtigung
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.AutoScroll = True
        Me.BackColor = System.Drawing.Color.White
+        Me.Controls.Add(Me.cbxSndUnterl)
+        Me.Controls.Add(Me.Panel2)
        Me.Controls.Add(Me.btnWikiStatusmails)
        Me.Controls.Add(Me.Panel1)
        Me.Controls.Add(Me.Label2)
@@ -406,7 +430,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
        Me.Controls.Add(Me.FlatButton2)
        Me.Controls.Add(Me.FlatButton3)
        Me.Name = "usrCntlKundenAvisoMailBenachrichtigung"
-        Me.Size = New System.Drawing.Size(479, 245)
+        Me.Size = New System.Drawing.Size(471, 260)
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -439,4 +463,6 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung
    Friend WithEvents FlatButton5 As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents Panel1 As Panel
    Friend WithEvents btnWikiStatusmails As Button
+    Friend WithEvents Panel2 As Panel
+    Friend WithEvents cbxSndUnterl As CheckBox
 End Class
--- a/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.vb
+++ b/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.vb
@@ -23,8 +23,16 @@
        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.

    End Sub
-    Private Sub CheckBox6_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox6.CheckedChanged, CheckBox4.CheckedChanged, cbxSendungsListFreigabe.CheckedChanged, cbxFreigabe_Steuerbescheid.CheckedChanged, cbxFreigabe_Steuerbescheid.CheckedChanged, cbxFreigabe_VBD.CheckedChanged, cboFreigabe_SteuerbescheidBedingung.SelectedIndexChanged, CheckBox2.CheckedChanged, CheckBox1.CheckedChanged, cbxFreigabe_ABD.CheckedChanged, cbxAVM.CheckedChanged, cboFreigabeArt.SelectedIndexChanged, cboFreigabeArtExport.SelectedIndexChanged
+    Private Sub CheckBox6_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox6.CheckedChanged, CheckBox4.CheckedChanged, cbxSendungsListFreigabe.CheckedChanged, cbxFreigabe_Steuerbescheid.CheckedChanged, cbxFreigabe_Steuerbescheid.CheckedChanged, cbxFreigabe_VBD.CheckedChanged, cboFreigabe_SteuerbescheidBedingung.SelectedIndexChanged, CheckBox2.CheckedChanged, CheckBox1.CheckedChanged, cbxFreigabe_ABD.CheckedChanged, cbxAVM.CheckedChanged, cboFreigabeArt.SelectedIndexChanged, cboFreigabeArtExport.SelectedIndexChanged, cbxSndUnterl.CheckedChanged
        Try
+            If sender Is cboFreigabeArt Then
+                If cboFreigabeArt._value = "BLG" Then
+                    cbxSndUnterl.Enabled = True
+                Else
+                    cbxSndUnterl.Enabled = False
+                End If
+            End If
+
            If sender Is cbxSendungsListFreigabe Then
                ' cbxFreigabe_Steuerbescheid.Enabled = cbxSendungsListFreigabe.Checked
                cbxFreigabe_VBD.Enabled = cbxSendungsListFreigabe.Checked
@@ -45,6 +53,7 @@
                kdTmpErw.EmailFreigabe_Export = CheckBox1.Checked
                kdTmpErw.EmailFreigabe_Art = cboFreigabeArt._value
                kdTmpErw.EmailFreigabe_Export_Art = cboFreigabeArtExport._value
+                kdTmpErw.EmailFreigabeBeleg_Sendungsunterlagen = cbxSndUnterl.Checked

                kdTmpErw.EmailFreigabeSendungsListe = cbxSendungsListFreigabe.Checked
                kdTmpErw.EmailFreigabe_SteuerbescheidPDF = cbxFreigabe_Steuerbescheid.Checked
@@ -87,6 +96,13 @@
        cbxFreigabe_ABD.Checked = False
        cbxAVM.Checked = False

+
+        If If(KUNDE_ERW.EmailFreigabe_Art, "") = "BLG" Then
+            cbxSndUnterl.Checked = KUNDE_ERW.EmailFreigabeBeleg_Sendungsunterlagen
+        Else
+            cbxSndUnterl.Checked = False
+        End If
+
        If KUNDE IsNot Nothing AndAlso KUNDE.KundenNr > 0 Then
            CheckBox6.Checked = KUNDE.EmailFreigabe
            CheckBox4.Checked = KUNDE.EmailAnkunft
--- a/SDL/mdm/frmMDMDatenverarbetiung.vb
+++ b/SDL/mdm/frmMDMDatenverarbetiung.vb
@@ -3930,7 +3930,7 @@ Public Class frmMDMDatenverarbetiung
                            ORDER BY cardnumber", "FMZOLL")


-            Dim dtKunden As DataTable = SQL.loadDgvBySql("SELECT Distinct(Kreditkarten.AdressenNr FROM dbo.tblAsfinagMaut", "FMZOLL")
+            Dim dtKunden As DataTable = SQL.loadDgvBySql("SELECT Distinct(Kreditkarten.AdressenNr) FROM dbo.tblAsfinagMaut LEFT JOIN [dbo].[Kreditkarten] on cardnumber= Kreditkarten.KartenNr", "FMZOLL")

            checkFixeTaxeImOffert("ASFINAG", dtKunden)