CBAM/VERAG Zollanmeldugnen

2026-01-13 10:01:59 +01:00
parent 7cd106a413
commit 0ebe4cf198
12 changed files with 849 additions and 123 deletions
--- a/SDL/kunden/usrCntlCBAM.Designer.vb
+++ b/SDL/kunden/usrCntlCBAM.Designer.vb
@@ -127,10 +127,25 @@ Partial Class usrCntlCBAM
        Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtEori = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Button8 = New System.Windows.Forms.Button()
+        Me.Panel3 = New System.Windows.Forms.Panel()
+        Me.Button9 = New System.Windows.Forms.Button()
+        Me.txtCBAM_KdSett_CBAMNo = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label20 = New System.Windows.Forms.Label()
+        Me.Label21 = New System.Windows.Forms.Label()
+        Me.txtCBAM_KdSett_Warn1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label22 = New System.Windows.Forms.Label()
+        Me.Label23 = New System.Windows.Forms.Label()
+        Me.txtCBAM_KdSett_Status = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.txtCBAM_KdSett_Warn2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtCBAM_KdSett_ApplNo = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label14 = New System.Windows.Forms.Label()
+        Me.Label24 = New System.Windows.Forms.Label()
+        Me.Label25 = New System.Windows.Forms.Label()
        Me.cntxtAddSdl.SuspendLayout()
        Me.Panel1.SuspendLayout()
        Me.Panel2.SuspendLayout()
        Me.MyPanel1.SuspendLayout()
+        Me.Panel3.SuspendLayout()
        Me.SuspendLayout()
        '
        'lblOffert
@@ -911,7 +926,7 @@ Partial Class usrCntlCBAM
        'Button5
        '
        Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button5.Location = New System.Drawing.Point(825, 620)
+        Me.Button5.Location = New System.Drawing.Point(1097, 79)
        Me.Button5.Name = "Button5"
        Me.Button5.Size = New System.Drawing.Size(68, 37)
        Me.Button5.TabIndex = 53
@@ -1547,7 +1562,7 @@ Partial Class usrCntlCBAM
        'Button8
        '
        Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button8.Location = New System.Drawing.Point(825, 672)
+        Me.Button8.Location = New System.Drawing.Point(1097, 131)
        Me.Button8.Name = "Button8"
        Me.Button8.Size = New System.Drawing.Size(68, 37)
        Me.Button8.TabIndex = 72
@@ -1555,11 +1570,221 @@ Partial Class usrCntlCBAM
        Me.Button8.UseVisualStyleBackColor = True
        Me.Button8.Visible = False
        '
+        'Panel3
+        '
+        Me.Panel3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Panel3.BackColor = System.Drawing.Color.FloralWhite
+        Me.Panel3.Controls.Add(Me.Label25)
+        Me.Panel3.Controls.Add(Me.Label24)
+        Me.Panel3.Controls.Add(Me.txtCBAM_KdSett_ApplNo)
+        Me.Panel3.Controls.Add(Me.Label14)
+        Me.Panel3.Controls.Add(Me.txtCBAM_KdSett_Warn2)
+        Me.Panel3.Controls.Add(Me.txtCBAM_KdSett_Status)
+        Me.Panel3.Controls.Add(Me.Button9)
+        Me.Panel3.Controls.Add(Me.txtCBAM_KdSett_CBAMNo)
+        Me.Panel3.Controls.Add(Me.Label20)
+        Me.Panel3.Controls.Add(Me.Label21)
+        Me.Panel3.Controls.Add(Me.txtCBAM_KdSett_Warn1)
+        Me.Panel3.Controls.Add(Me.Label22)
+        Me.Panel3.Controls.Add(Me.Label23)
+        Me.Panel3.Location = New System.Drawing.Point(491, 511)
+        Me.Panel3.Name = "Panel3"
+        Me.Panel3.Size = New System.Drawing.Size(382, 182)
+        Me.Panel3.TabIndex = 73
+        '
+        'Button9
+        '
+        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button9.Location = New System.Drawing.Point(149, 147)
+        Me.Button9.Name = "Button9"
+        Me.Button9.Size = New System.Drawing.Size(217, 28)
+        Me.Button9.TabIndex = 53
+        Me.Button9.Text = "Speichern"
+        Me.Button9.UseVisualStyleBackColor = True
+        '
+        'txtCBAM_KdSett_CBAMNo
+        '
+        Me.txtCBAM_KdSett_CBAMNo._DateTimeOnly = False
+        Me.txtCBAM_KdSett_CBAMNo._numbersOnly = True
+        Me.txtCBAM_KdSett_CBAMNo._numbersOnlyKommastellen = ""
+        Me.txtCBAM_KdSett_CBAMNo._numbersOnlyTrennzeichen = True
+        Me.txtCBAM_KdSett_CBAMNo._Prozent = False
+        Me.txtCBAM_KdSett_CBAMNo._ShortDateNew = False
+        Me.txtCBAM_KdSett_CBAMNo._ShortDateOnly = False
+        Me.txtCBAM_KdSett_CBAMNo._TimeOnly = False
+        Me.txtCBAM_KdSett_CBAMNo._TimeOnly_Seconds = False
+        Me.txtCBAM_KdSett_CBAMNo._value = ""
+        Me.txtCBAM_KdSett_CBAMNo._Waehrung = False
+        Me.txtCBAM_KdSett_CBAMNo._WaehrungZeichen = True
+        Me.txtCBAM_KdSett_CBAMNo.Enabled = False
+        Me.txtCBAM_KdSett_CBAMNo.ForeColor = System.Drawing.Color.Red
+        Me.txtCBAM_KdSett_CBAMNo.Location = New System.Drawing.Point(110, 118)
+        Me.txtCBAM_KdSett_CBAMNo.MaxLength = 10
+        Me.txtCBAM_KdSett_CBAMNo.MaxLineLength = -1
+        Me.txtCBAM_KdSett_CBAMNo.MaxLines_Warning = ""
+        Me.txtCBAM_KdSett_CBAMNo.MaxLines_Warning_Label = Nothing
+        Me.txtCBAM_KdSett_CBAMNo.Name = "txtCBAM_KdSett_CBAMNo"
+        Me.txtCBAM_KdSett_CBAMNo.Size = New System.Drawing.Size(256, 20)
+        Me.txtCBAM_KdSett_CBAMNo.TabIndex = 58
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(3, 121)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(88, 13)
+        Me.Label20.TabIndex = 59
+        Me.Label20.Text = "CBAM Konto-Nr.:"
+        '
+        'Label21
+        '
+        Me.Label21.AutoSize = True
+        Me.Label21.Location = New System.Drawing.Point(2, 69)
+        Me.Label21.Name = "Label21"
+        Me.Label21.Size = New System.Drawing.Size(102, 13)
+        Me.Label21.TabIndex = 57
+        Me.Label21.Text = "Warnschwelle/Jahr:"
+        '
+        'txtCBAM_KdSett_Warn1
+        '
+        Me.txtCBAM_KdSett_Warn1._DateTimeOnly = False
+        Me.txtCBAM_KdSett_Warn1._numbersOnly = True
+        Me.txtCBAM_KdSett_Warn1._numbersOnlyKommastellen = ""
+        Me.txtCBAM_KdSett_Warn1._numbersOnlyTrennzeichen = True
+        Me.txtCBAM_KdSett_Warn1._Prozent = False
+        Me.txtCBAM_KdSett_Warn1._ShortDateNew = False
+        Me.txtCBAM_KdSett_Warn1._ShortDateOnly = False
+        Me.txtCBAM_KdSett_Warn1._TimeOnly = False
+        Me.txtCBAM_KdSett_Warn1._TimeOnly_Seconds = False
+        Me.txtCBAM_KdSett_Warn1._value = "30"
+        Me.txtCBAM_KdSett_Warn1._Waehrung = False
+        Me.txtCBAM_KdSett_Warn1._WaehrungZeichen = True
+        Me.txtCBAM_KdSett_Warn1.ForeColor = System.Drawing.Color.Black
+        Me.txtCBAM_KdSett_Warn1.Location = New System.Drawing.Point(110, 66)
+        Me.txtCBAM_KdSett_Warn1.MaxLength = 10
+        Me.txtCBAM_KdSett_Warn1.MaxLineLength = -1
+        Me.txtCBAM_KdSett_Warn1.MaxLines_Warning = ""
+        Me.txtCBAM_KdSett_Warn1.MaxLines_Warning_Label = Nothing
+        Me.txtCBAM_KdSett_Warn1.Name = "txtCBAM_KdSett_Warn1"
+        Me.txtCBAM_KdSett_Warn1.Size = New System.Drawing.Size(58, 20)
+        Me.txtCBAM_KdSett_Warn1.TabIndex = 56
+        Me.txtCBAM_KdSett_Warn1.Text = "30"
+        '
+        'Label22
+        '
+        Me.Label22.AutoSize = True
+        Me.Label22.Location = New System.Drawing.Point(3, 25)
+        Me.Label22.Name = "Label22"
+        Me.Label22.Size = New System.Drawing.Size(73, 13)
+        Me.Label22.TabIndex = 55
+        Me.Label22.Text = "CBAM-Status:"
+        '
+        'Label23
+        '
+        Me.Label23.AutoSize = True
+        Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label23.Location = New System.Drawing.Point(3, 3)
+        Me.Label23.Name = "Label23"
+        Me.Label23.Size = New System.Drawing.Size(142, 13)
+        Me.Label23.TabIndex = 53
+        Me.Label23.Text = "CBAM-Kundeneinstellungen:"
+        '
+        'txtCBAM_KdSett_Status
+        '
+        Me.txtCBAM_KdSett_Status._allowedValuesFreiText = Nothing
+        Me.txtCBAM_KdSett_Status._allowFreiText = False
+        Me.txtCBAM_KdSett_Status._value = ""
+        Me.txtCBAM_KdSett_Status.FormattingEnabled = True
+        Me.txtCBAM_KdSett_Status.Location = New System.Drawing.Point(110, 24)
+        Me.txtCBAM_KdSett_Status.Name = "txtCBAM_KdSett_Status"
+        Me.txtCBAM_KdSett_Status.Size = New System.Drawing.Size(256, 21)
+        Me.txtCBAM_KdSett_Status.TabIndex = 74
+        '
+        'txtCBAM_KdSett_Warn2
+        '
+        Me.txtCBAM_KdSett_Warn2._DateTimeOnly = False
+        Me.txtCBAM_KdSett_Warn2._numbersOnly = True
+        Me.txtCBAM_KdSett_Warn2._numbersOnlyKommastellen = ""
+        Me.txtCBAM_KdSett_Warn2._numbersOnlyTrennzeichen = True
+        Me.txtCBAM_KdSett_Warn2._Prozent = False
+        Me.txtCBAM_KdSett_Warn2._ShortDateNew = False
+        Me.txtCBAM_KdSett_Warn2._ShortDateOnly = False
+        Me.txtCBAM_KdSett_Warn2._TimeOnly = False
+        Me.txtCBAM_KdSett_Warn2._TimeOnly_Seconds = False
+        Me.txtCBAM_KdSett_Warn2._value = "40"
+        Me.txtCBAM_KdSett_Warn2._Waehrung = False
+        Me.txtCBAM_KdSett_Warn2._WaehrungZeichen = True
+        Me.txtCBAM_KdSett_Warn2.ForeColor = System.Drawing.Color.Black
+        Me.txtCBAM_KdSett_Warn2.Location = New System.Drawing.Point(174, 66)
+        Me.txtCBAM_KdSett_Warn2.MaxLength = 10
+        Me.txtCBAM_KdSett_Warn2.MaxLineLength = -1
+        Me.txtCBAM_KdSett_Warn2.MaxLines_Warning = ""
+        Me.txtCBAM_KdSett_Warn2.MaxLines_Warning_Label = Nothing
+        Me.txtCBAM_KdSett_Warn2.Name = "txtCBAM_KdSett_Warn2"
+        Me.txtCBAM_KdSett_Warn2.Size = New System.Drawing.Size(58, 20)
+        Me.txtCBAM_KdSett_Warn2.TabIndex = 75
+        Me.txtCBAM_KdSett_Warn2.Text = "40"
+        '
+        'txtCBAM_KdSett_ApplNo
+        '
+        Me.txtCBAM_KdSett_ApplNo._DateTimeOnly = False
+        Me.txtCBAM_KdSett_ApplNo._numbersOnly = True
+        Me.txtCBAM_KdSett_ApplNo._numbersOnlyKommastellen = ""
+        Me.txtCBAM_KdSett_ApplNo._numbersOnlyTrennzeichen = True
+        Me.txtCBAM_KdSett_ApplNo._Prozent = False
+        Me.txtCBAM_KdSett_ApplNo._ShortDateNew = False
+        Me.txtCBAM_KdSett_ApplNo._ShortDateOnly = False
+        Me.txtCBAM_KdSett_ApplNo._TimeOnly = False
+        Me.txtCBAM_KdSett_ApplNo._TimeOnly_Seconds = False
+        Me.txtCBAM_KdSett_ApplNo._value = ""
+        Me.txtCBAM_KdSett_ApplNo._Waehrung = False
+        Me.txtCBAM_KdSett_ApplNo._WaehrungZeichen = True
+        Me.txtCBAM_KdSett_ApplNo.Enabled = False
+        Me.txtCBAM_KdSett_ApplNo.ForeColor = System.Drawing.Color.Red
+        Me.txtCBAM_KdSett_ApplNo.Location = New System.Drawing.Point(110, 95)
+        Me.txtCBAM_KdSett_ApplNo.MaxLength = 10
+        Me.txtCBAM_KdSett_ApplNo.MaxLineLength = -1
+        Me.txtCBAM_KdSett_ApplNo.MaxLines_Warning = ""
+        Me.txtCBAM_KdSett_ApplNo.MaxLines_Warning_Label = Nothing
+        Me.txtCBAM_KdSett_ApplNo.Name = "txtCBAM_KdSett_ApplNo"
+        Me.txtCBAM_KdSett_ApplNo.Size = New System.Drawing.Size(256, 20)
+        Me.txtCBAM_KdSett_ApplNo.TabIndex = 77
+        '
+        'Label14
+        '
+        Me.Label14.AutoSize = True
+        Me.Label14.Location = New System.Drawing.Point(3, 98)
+        Me.Label14.Name = "Label14"
+        Me.Label14.Size = New System.Drawing.Size(79, 13)
+        Me.Label14.TabIndex = 78
+        Me.Label14.Text = "Application-Nr.:"
+        '
+        'Label24
+        '
+        Me.Label24.AutoSize = True
+        Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
+        Me.Label24.Location = New System.Drawing.Point(118, 52)
+        Me.Label24.Name = "Label24"
+        Me.Label24.Size = New System.Drawing.Size(43, 13)
+        Me.Label24.TabIndex = 79
+        Me.Label24.Text = "Warn 1 "
+        '
+        'Label25
+        '
+        Me.Label25.AutoSize = True
+        Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
+        Me.Label25.Location = New System.Drawing.Point(182, 52)
+        Me.Label25.Name = "Label25"
+        Me.Label25.Size = New System.Drawing.Size(40, 13)
+        Me.Label25.TabIndex = 80
+        Me.Label25.Text = "Warn 2"
+        '
        'usrCntlCBAM
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
+        Me.Controls.Add(Me.Panel3)
        Me.Controls.Add(Me.Button8)
        Me.Controls.Add(Me.cboIndirekt)
        Me.Controls.Add(Me.cbxIndirekt)
@@ -1643,6 +1868,8 @@ Partial Class usrCntlCBAM
        Me.Panel2.PerformLayout()
        Me.MyPanel1.ResumeLayout(False)
        Me.MyPanel1.PerformLayout()
+        Me.Panel3.ResumeLayout(False)
+        Me.Panel3.PerformLayout()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -1751,4 +1978,18 @@ Partial Class usrCntlCBAM
    Friend WithEvents cboIndirekt As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents cbxIndirekt As CheckBox
    Friend WithEvents Button8 As Button
+    Friend WithEvents Panel3 As Panel
+    Friend WithEvents txtCBAM_KdSett_ApplNo As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label14 As Label
+    Friend WithEvents txtCBAM_KdSett_Warn2 As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txtCBAM_KdSett_Status As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Button9 As Button
+    Friend WithEvents txtCBAM_KdSett_CBAMNo As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label20 As Label
+    Friend WithEvents Label21 As Label
+    Friend WithEvents txtCBAM_KdSett_Warn1 As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label22 As Label
+    Friend WithEvents Label23 As Label
+    Friend WithEvents Label25 As Label
+    Friend WithEvents Label24 As Label
 End Class
--- a/SDL/kunden/usrCntlCBAM.vb
+++ b/SDL/kunden/usrCntlCBAM.vb
@@ -1,5 +1,6 @@
 Imports DAKOSY_Worker
 Imports DocumentFormat.OpenXml.Spreadsheet
+Imports Org.BouncyCastle.Crypto.Agreement
 Imports VERAG_PROG_ALLGEMEIN

 Public Class usrCntlCBAM
@@ -8,6 +9,7 @@ Public Class usrCntlCBAM
    Public kdnr As Integer = -1
    Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen = Nothing
    Dim KD As VERAG_PROG_ALLGEMEIN.cKunde = Nothing
+    Dim ERW As VERAG_PROG_ALLGEMEIN.cKundenErweitert = Nothing

    Sub New()
        InitializeComponent()
@@ -415,11 +417,21 @@ Public Class usrCntlCBAM
        If kdnr > 0 Then
            AD = New VERAG_PROG_ALLGEMEIN.cAdressen(kdnr)
            KD = New VERAG_PROG_ALLGEMEIN.cKunde(kdnr)
+            ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdnr)
        End If
        If KD IsNot Nothing Then
            txtEori.Text = KD.EORITIN
        End If

+        txtCBAM_KdSett_Status.Items.Clear()
+        txtCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("unbestimmt", ""))
+        txtCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("< 50 to (de minis)", "50to"))
+        txtCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Antrag abgegeben", "APPL"))
+        txtCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CBAM Konto vorhanden", "CBAM"))
+        txtCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Kein Interesse/Fremdkunde", "NO"))
+        txtCBAM_KdSett_Status.changeItem("undefined")
+
+
        cboIndirekt.Items.Clear()
        cboIndirekt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Spedition GmbH - DE4824105", "DE4824105"))
        cboIndirekt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Customs Service GmbH - ATEOS1000059121", "DE4ATEOS1000059121824105"))
@@ -430,6 +442,15 @@ Public Class usrCntlCBAM
        cboIndirekt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED Zollservice GmbH - ATEOS1000040508", "ATEOS1000040508"))
        cboIndirekt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED Deutschland GmbH - DE7467540", "DE7467540"))

+        If ERW IsNot Nothing Then
+            txtCBAM_KdSett_Status.changeItem(If(ERW.kde_CBAM_Status, ""))
+            txtCBAM_KdSett_Warn1._value = If(ERW.kde_CBAM_Warn1, "")
+            txtCBAM_KdSett_Warn2._value = If(ERW.kde_CBAM_Warn2, "")
+            txtCBAM_KdSett_ApplNo._value = If(ERW.kde_CBAM_ApplicationNo, "")
+            txtCBAM_KdSett_CBAMNo.Text = If(ERW.kde_CBAM_CBAMAccountNo, "")
+        End If
+
+
    End Sub

    Private Sub cboQuartal_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboQuartal.SelectedIndexChanged
@@ -2245,24 +2266,34 @@ Public Class usrCntlCBAM

        Try
            Dim summary =
-                  From za In LIST
-                  From it In za.Items
-                  Group By
-                        Tarifnummer = LeftStr(it.zaItem_HSCode, 8),
-                        VersendungsLand = za.za_CountryDispatch,
-                        Verfahren = LeftStr(za.za_MainProcedure, 2),
-                        Vorverfahren = it.zaItem_PrevProcedure
-                    Into grp = Group
-                  Select New With {
-                        .Tarifnummer = Tarifnummer,
-                        .Eigenmasse = grp.Sum(Function(x) If(x.it.zaItem_NetMass, 0D)),
-                        .Rohmasse = grp.Sum(Function(x) If(x.it.zaItem_GrossMass, 0D)),
-                        .Rechnungspreis = grp.Sum(Function(x) If(x.it.zaItem_InvoiceValueEUR, 0D)),
-                        .VersendungsLand = VersendungsLand,
-                        .Verfahren = Verfahren,
-                        .VorangegangenesVerfahren = Vorverfahren
-                    }
-
+                From za In LIST
+                From it In za.Items
+                Group By
+                    Tarifnummer = LeftStr(it.zaItem_HSCode, 8),
+                    VersendungsLand = za.za_CountryDispatch
+                Into grp = Group
+                Let verfahren =
+                    grp.Select(Function(x) LeftStr(x.za.za_MainProcedure, 2)).
+                        FirstOrDefault(Function(v) Not String.IsNullOrWhiteSpace(v))
+                Let verfahrenFallback =
+                    grp.Select(Function(x) LeftStr(x.it.zaItem_MainProcedure, 2)).
+                        FirstOrDefault(Function(v) Not String.IsNullOrWhiteSpace(v))
+                Let vorverfahren =
+                    grp.Select(Function(x) x.it.zaItem_PrevProcedure).
+                        FirstOrDefault(Function(v) Not String.IsNullOrWhiteSpace(v))
+                Let rohmasseItems =
+                    grp.Sum(Function(x) If(x.it.zaItem_GrossMass, 0D))
+                Let rohmasseZA =
+                    grp.Max(Function(x) If(x.za.za_TotGrossMass, 0D))
+                Select New With {
+                    .Tarifnummer = Tarifnummer,
+                    .Eigenmasse = grp.Sum(Function(x) If(x.it.zaItem_NetMass, 0D)),
+                    .Rohmasse = Math.Max(rohmasseItems, rohmasseZA),
+                    .Rechnungspreis = grp.Sum(Function(x) If(x.it.zaItem_InvoiceValueEUR, x.it.zaItem_StatisticalValueEUR)),
+                    .VersendungsLand = VersendungsLand,
+                    .Verfahren = If(verfahrenFallback, verfahren),
+                    .VorangegangenesVerfahren = vorverfahren
+                }

            Dim dt As New DataTable

@@ -2316,7 +2347,7 @@ Public Class usrCntlCBAM
            Let exporter = za.Parties.
                        FirstOrDefault(Function(p) {"CZ", "EX", "EXP", "EXPORTER"}.Contains(p.zaParty_Role))
            Let invoice =
-                    za.Documents.FirstOrDefault(Function(d) d.zaDoc_Code = "N380" OrElse d.zaDoc_Code = "N325")
+                        it.Documents.FirstOrDefault(Function(d) d.zaDoc_Code = "N380" OrElse d.zaDoc_Code = "N325")
            Let Anmeldedatum = (Function(x) If(x.za_releaseDate, x.za_DeclarationDate))
            Order By Anmeldedatum
            Select New With {
@@ -2330,14 +2361,14 @@ Public Class usrCntlCBAM
                            .Rohmasse = it.zaItem_GrossMass,
                            .VersendungsLand = za.za_CountryDispatch,
                            .BestimmungsLand = za.za_CountryDestination,
-                            .Rechnungspreis = it.zaItem_InvoiceValueEUR,
+                            .Rechnungspreis = If(it.zaItem_InvoiceValueEUR, it.zaItem_StatisticalValueEUR),
                            .Rechnungswaehrung = it.zaItem_InvoiceCurrency,
                            .EmpfaengerEORI = If(importer IsNot Nothing, importer.zaParty_EORI, ""),
                            .Empfaenger = If(importer IsNot Nothing, importer.zaParty_Name, ""),
                            .AbsenderEORI = If(exporter IsNot Nothing, exporter.zaParty_EORI, ""),
                            .Absender = If(exporter IsNot Nothing, exporter.zaParty_Name, ""),
                            .Rechnungsnummer = If(invoice IsNot Nothing, invoice.zaDoc_Reference, "-"),
-                            .Rechnungsdatum = If(invoice IsNot Nothing, invoice.zaDoc_Date, Nothing)
+                            .Rechnungsdatum = If(invoice IsNot Nothing, ParseDateSafe(invoice.zaDoc_Date), Nothing)
                        }


@@ -2398,7 +2429,25 @@ Public Class usrCntlCBAM
        End Try
    End Sub

-
+    Public Shared Function ParseDateSafe(value As String) As Date?
+        If String.IsNullOrWhiteSpace(value) Then Return Nothing
+        Dim d As DateTime
+        If DateTime.TryParseExact(
+        value.Trim(),
+        {"dd.MM.yyyy", "dd.MM.yyyy HH:mm:ss", "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "MM/dd/yyyy", "MM/dd/yyyy HH:mm:ss"},
+        Globalization.CultureInfo.InvariantCulture,
+        Globalization.DateTimeStyles.None,
+        d) Then
+            Return d
+        End If
+        If DateTime.TryParse(value, Globalization.CultureInfo.InvariantCulture, Globalization.DateTimeStyles.None, d) Then
+            Return d
+        End If
+        If DateTime.TryParse(value, Globalization.CultureInfo.CurrentCulture, Globalization.DateTimeStyles.None, d) Then
+            Return d
+        End If
+        Return Nothing
+    End Function
    Sub doVERAG_GREENPULSE_XLS(LIST As List(Of VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations), EORI As String)

        btnCBAM_DS_VERAG_GP.Enabled = False
@@ -2795,5 +2844,42 @@ Public Class usrCntlCBAM
               String.Join(vbNewLine, LIST.
                Where(Function(x) Not String.IsNullOrWhiteSpace(x.za_LRN))))
    End Sub
+
+    Private Sub MyComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles txtCBAM_KdSett_Status.SelectedIndexChanged
+
+        txtCBAM_KdSett_ApplNo.Enabled = False
+        txtCBAM_KdSett_CBAMNo.Enabled = False
+        txtCBAM_KdSett_Warn1.Enabled = False
+        txtCBAM_KdSett_Warn2.Enabled = False
+
+        Select Case txtCBAM_KdSett_Status._value
+            Case ""
+                txtCBAM_KdSett_Warn1.Enabled = True
+                txtCBAM_KdSett_Warn2.Enabled = True
+            Case "50to"
+                txtCBAM_KdSett_Warn1.Enabled = True
+                txtCBAM_KdSett_Warn2.Enabled = True
+            Case "APPL"
+                txtCBAM_KdSett_ApplNo.Enabled = True
+            Case "CBAM"
+                txtCBAM_KdSett_ApplNo.Enabled = True
+                txtCBAM_KdSett_CBAMNo.Enabled = True
+            Case "NO" 'nix
+        End Select
+
+    End Sub
+
+    Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click
+        If ERW Is Nothing Then ERW = New cKundenErweitert(kdnr)
+
+        ERW.kde_CBAM_Status = txtCBAM_KdSett_Status._value
+        ERW.kde_CBAM_Warn1 = txtCBAM_KdSett_Warn1._value
+        ERW.kde_CBAM_Warn2 = txtCBAM_KdSett_Warn2._value
+        ERW.kde_CBAM_ApplicationNo = If(txtCBAM_KdSett_ApplNo._value <> "", txtCBAM_KdSett_ApplNo._value, Nothing)
+        ERW.kde_CBAM_CBAMAccountNo = If(txtCBAM_KdSett_CBAMNo._value <> "", txtCBAM_KdSett_CBAMNo._value, Nothing)
+
+        ERW.SAVE()
+
+    End Sub
 End Class

--- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb
@@ -23,19 +23,19 @@ Partial Class usrCntlKundenuebersicht
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        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 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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlKundenuebersicht))
-        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle20 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 DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.btnExcel = New System.Windows.Forms.Button()
@@ -209,6 +209,8 @@ Partial Class usrCntlKundenuebersicht
        Me.tbAvisoMail = New System.Windows.Forms.TabPage()
        Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung()
        Me.tbKdSpez = New System.Windows.Forms.TabPage()
+        Me.txtBelegMail_FixBetreffText = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.cbxBelegMail_FixBetreff = New System.Windows.Forms.CheckBox()
        Me.Label14 = New System.Windows.Forms.Label()
        Me.Label43 = New System.Windows.Forms.Label()
        Me.cbxKdAuftragsNr = New System.Windows.Forms.CheckBox()
@@ -264,8 +266,7 @@ Partial Class usrCntlKundenuebersicht
        Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem()
        Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.SessionService1 = New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.session.sessionService()
-        Me.cbxBelegMail_FixBetreff = New System.Windows.Forms.CheckBox()
-        Me.txtBelegMail_FixBetreffText = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.datVertragBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.cntxtAddVM.SuspendLayout()
        Me.tbWeitereKundenDetails.SuspendLayout()
        Me.tbOfferten.SuspendLayout()
@@ -429,8 +430,8 @@ Partial Class usrCntlKundenuebersicht
        Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False
        Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True
        Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False
-        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
        Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White
        Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
        Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -450,8 +451,8 @@ Partial Class usrCntlKundenuebersicht
        Me.dgvOffertenSperrliste.AllowUserToDeleteRows = False
        Me.dgvOffertenSperrliste.AllowUserToOrderColumns = True
        Me.dgvOffertenSperrliste.AllowUserToResizeRows = False
-        DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
        Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White
        Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
        Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -461,10 +462,10 @@ Partial Class usrCntlKundenuebersicht
        Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste"
        Me.dgvOffertenSperrliste.ReadOnly = True
        Me.dgvOffertenSperrliste.RowHeadersVisible = False
-        DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer))
-        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.Black
-        Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle15
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer))
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black
+        Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle3
        Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(173, 257)
        Me.dgvOffertenSperrliste.TabIndex = 0
@@ -602,8 +603,8 @@ Partial Class usrCntlKundenuebersicht
        Me.dgvOffenePosten.AllowUserToAddRows = False
        Me.dgvOffenePosten.AllowUserToDeleteRows = False
        Me.dgvOffenePosten.AllowUserToResizeRows = False
-        DataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
        Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White
        Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvOffenePosten.Dock = System.Windows.Forms.DockStyle.Fill
@@ -683,8 +684,8 @@ Partial Class usrCntlKundenuebersicht
        Me.dgvUmsatzbericht.AllowUserToDeleteRows = False
        Me.dgvUmsatzbericht.AllowUserToOrderColumns = True
        Me.dgvUmsatzbericht.AllowUserToResizeRows = False
-        DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
        Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White
        Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvUmsatzbericht.Dock = System.Windows.Forms.DockStyle.Fill
@@ -747,8 +748,8 @@ Partial Class usrCntlKundenuebersicht
        Me.dgvAnhaenge.AllowUserToAddRows = False
        Me.dgvAnhaenge.AllowUserToDeleteRows = False
        Me.dgvAnhaenge.AllowUserToResizeRows = False
-        DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18
+        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
        Me.dgvAnhaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
        Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -2511,8 +2512,8 @@ Partial Class usrCntlKundenuebersicht
        Me.dgvVollmachten.AllowUserToDeleteRows = False
        Me.dgvVollmachten.AllowUserToOrderColumns = True
        Me.dgvVollmachten.AllowUserToResizeRows = False
-        DataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle22
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
        Me.dgvVollmachten.BackgroundColor = System.Drawing.Color.White
        Me.dgvVollmachten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvVollmachten.Dock = System.Windows.Forms.DockStyle.Fill
@@ -2565,8 +2566,8 @@ Partial Class usrCntlKundenuebersicht
        Me.dgvVertraege.AllowUserToDeleteRows = False
        Me.dgvVertraege.AllowUserToOrderColumns = True
        Me.dgvVertraege.AllowUserToResizeRows = False
-        DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
        Me.dgvVertraege.BackgroundColor = System.Drawing.Color.White
        Me.dgvVertraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvVertraege.Dock = System.Windows.Forms.DockStyle.Fill
@@ -2582,6 +2583,7 @@ Partial Class usrCntlKundenuebersicht
        'Panel1
        '
        Me.Panel1.BackColor = System.Drawing.Color.White
+        Me.Panel1.Controls.Add(Me.datVertragBis)
        Me.Panel1.Controls.Add(Me.Button11)
        Me.Panel1.Controls.Add(Me.Button12)
        Me.Panel1.Controls.Add(Me.txtVertragVermerk)
@@ -2644,7 +2646,7 @@ Partial Class usrCntlKundenuebersicht
        Me.txtVertragVermerk.MaxLines_Warning = ""
        Me.txtVertragVermerk.MaxLines_Warning_Label = Nothing
        Me.txtVertragVermerk.Name = "txtVertragVermerk"
-        Me.txtVertragVermerk.Size = New System.Drawing.Size(326, 20)
+        Me.txtVertragVermerk.Size = New System.Drawing.Size(255, 20)
        Me.txtVertragVermerk.TabIndex = 6
        '
        'Label16
@@ -2661,11 +2663,11 @@ Partial Class usrCntlKundenuebersicht
        '
        Me.Label5.AutoSize = True
        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label5.Location = New System.Drawing.Point(244, 6)
+        Me.Label5.Location = New System.Drawing.Point(255, 6)
        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(41, 13)
+        Me.Label5.Size = New System.Drawing.Size(60, 13)
        Me.Label5.TabIndex = 2
-        Me.Label5.Text = "Datum:"
+        Me.Label5.Text = "Datum/Bis:"
        '
        'cboVertrag
        '
@@ -2675,7 +2677,7 @@ Partial Class usrCntlKundenuebersicht
        Me.cboVertrag.FormattingEnabled = True
        Me.cboVertrag.Location = New System.Drawing.Point(60, 3)
        Me.cboVertrag.Name = "cboVertrag"
-        Me.cboVertrag.Size = New System.Drawing.Size(178, 21)
+        Me.cboVertrag.Size = New System.Drawing.Size(189, 21)
        Me.cboVertrag.TabIndex = 1
        '
        'datVertrag
@@ -2693,13 +2695,13 @@ Partial Class usrCntlKundenuebersicht
        Me.datVertrag._Waehrung = False
        Me.datVertrag._WaehrungZeichen = True
        Me.datVertrag.ForeColor = System.Drawing.Color.Black
-        Me.datVertrag.Location = New System.Drawing.Point(291, 3)
+        Me.datVertrag.Location = New System.Drawing.Point(321, 3)
        Me.datVertrag.MaxLength = 10
        Me.datVertrag.MaxLineLength = -1
        Me.datVertrag.MaxLines_Warning = ""
        Me.datVertrag.MaxLines_Warning_Label = Nothing
        Me.datVertrag.Name = "datVertrag"
-        Me.datVertrag.Size = New System.Drawing.Size(95, 20)
+        Me.datVertrag.Size = New System.Drawing.Size(65, 20)
        Me.datVertrag.TabIndex = 3
        '
        'Label4
@@ -2741,8 +2743,8 @@ Partial Class usrCntlKundenuebersicht
        Me.dgvGestGarantie.AllowUserToDeleteRows = False
        Me.dgvGestGarantie.AllowUserToOrderColumns = True
        Me.dgvGestGarantie.AllowUserToResizeRows = False
-        DataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle24
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
        Me.dgvGestGarantie.BackgroundColor = System.Drawing.Color.White
        Me.dgvGestGarantie.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvGestGarantie.Dock = System.Windows.Forms.DockStyle.Fill
@@ -2909,6 +2911,40 @@ Partial Class usrCntlKundenuebersicht
        Me.tbKdSpez.Text = "Kundenspezifisch"
        Me.tbKdSpez.UseVisualStyleBackColor = True
        '
+        'txtBelegMail_FixBetreffText
+        '
+        Me.txtBelegMail_FixBetreffText._DateTimeOnly = False
+        Me.txtBelegMail_FixBetreffText._numbersOnly = False
+        Me.txtBelegMail_FixBetreffText._numbersOnlyKommastellen = ""
+        Me.txtBelegMail_FixBetreffText._numbersOnlyTrennzeichen = True
+        Me.txtBelegMail_FixBetreffText._Prozent = False
+        Me.txtBelegMail_FixBetreffText._ShortDateNew = False
+        Me.txtBelegMail_FixBetreffText._ShortDateOnly = False
+        Me.txtBelegMail_FixBetreffText._TimeOnly = False
+        Me.txtBelegMail_FixBetreffText._TimeOnly_Seconds = False
+        Me.txtBelegMail_FixBetreffText._value = ""
+        Me.txtBelegMail_FixBetreffText._Waehrung = False
+        Me.txtBelegMail_FixBetreffText._WaehrungZeichen = True
+        Me.txtBelegMail_FixBetreffText.Enabled = False
+        Me.txtBelegMail_FixBetreffText.ForeColor = System.Drawing.Color.Black
+        Me.txtBelegMail_FixBetreffText.Location = New System.Drawing.Point(327, 64)
+        Me.txtBelegMail_FixBetreffText.MaxLineLength = -1
+        Me.txtBelegMail_FixBetreffText.MaxLines_Warning = ""
+        Me.txtBelegMail_FixBetreffText.MaxLines_Warning_Label = Nothing
+        Me.txtBelegMail_FixBetreffText.Name = "txtBelegMail_FixBetreffText"
+        Me.txtBelegMail_FixBetreffText.Size = New System.Drawing.Size(131, 20)
+        Me.txtBelegMail_FixBetreffText.TabIndex = 11
+        '
+        'cbxBelegMail_FixBetreff
+        '
+        Me.cbxBelegMail_FixBetreff.AutoSize = True
+        Me.cbxBelegMail_FixBetreff.Location = New System.Drawing.Point(235, 67)
+        Me.cbxBelegMail_FixBetreff.Name = "cbxBelegMail_FixBetreff"
+        Me.cbxBelegMail_FixBetreff.Size = New System.Drawing.Size(97, 17)
+        Me.cbxBelegMail_FixBetreff.TabIndex = 10
+        Me.cbxBelegMail_FixBetreff.Text = "Betreff Fix(Blg):"
+        Me.cbxBelegMail_FixBetreff.UseVisualStyleBackColor = True
+        '
        'Label14
        '
        Me.Label14.AutoSize = True
@@ -3198,24 +3234,24 @@ Partial Class usrCntlKundenuebersicht
        Me.dgvAufschub.AllowUserToResizeColumns = False
        Me.dgvAufschub.AllowUserToResizeRows = False
        Me.dgvAufschub.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19
+        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
        Me.dgvAufschub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvAufschub.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.KtoId, Me.Art, Me.HZA, Me.KontoNr, Me.EORI, Me.NL, Me.BIN})
-        DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle21
+        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle12
        Me.dgvAufschub.Location = New System.Drawing.Point(13, 61)
        Me.dgvAufschub.MultiSelect = False
        Me.dgvAufschub.Name = "dgvAufschub"
@@ -3242,8 +3278,8 @@ Partial Class usrCntlKundenuebersicht
        '
        'HZA
        '
-        DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        Me.HZA.DefaultCellStyle = DataGridViewCellStyle20
+        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        Me.HZA.DefaultCellStyle = DataGridViewCellStyle11
        Me.HZA.HeaderText = "HZA"
        Me.HZA.Name = "HZA"
        Me.HZA.ReadOnly = True
@@ -3461,39 +3497,29 @@ Partial Class usrCntlKundenuebersicht
        Me.SessionService1.Url = "https://finanzonline.bmf.gv.at/fonws/ws/session"
        Me.SessionService1.UseDefaultCredentials = False
        '
-        'cbxBelegMail_FixBetreff
+        'datVertragBis
        '
-        Me.cbxBelegMail_FixBetreff.AutoSize = True
-        Me.cbxBelegMail_FixBetreff.Location = New System.Drawing.Point(235, 67)
-        Me.cbxBelegMail_FixBetreff.Name = "cbxBelegMail_FixBetreff"
-        Me.cbxBelegMail_FixBetreff.Size = New System.Drawing.Size(97, 17)
-        Me.cbxBelegMail_FixBetreff.TabIndex = 10
-        Me.cbxBelegMail_FixBetreff.Text = "Betreff Fix(Blg):"
-        Me.cbxBelegMail_FixBetreff.UseVisualStyleBackColor = True
-        '
-        'txtBelegMail_FixBetreffText
-        '
-        Me.txtBelegMail_FixBetreffText._DateTimeOnly = False
-        Me.txtBelegMail_FixBetreffText._numbersOnly = False
-        Me.txtBelegMail_FixBetreffText._numbersOnlyKommastellen = ""
-        Me.txtBelegMail_FixBetreffText._numbersOnlyTrennzeichen = True
-        Me.txtBelegMail_FixBetreffText._Prozent = False
-        Me.txtBelegMail_FixBetreffText._ShortDateNew = False
-        Me.txtBelegMail_FixBetreffText._ShortDateOnly = False
-        Me.txtBelegMail_FixBetreffText._TimeOnly = False
-        Me.txtBelegMail_FixBetreffText._TimeOnly_Seconds = False
-        Me.txtBelegMail_FixBetreffText._value = ""
-        Me.txtBelegMail_FixBetreffText._Waehrung = False
-        Me.txtBelegMail_FixBetreffText._WaehrungZeichen = True
-        Me.txtBelegMail_FixBetreffText.Enabled = False
-        Me.txtBelegMail_FixBetreffText.ForeColor = System.Drawing.Color.Black
-        Me.txtBelegMail_FixBetreffText.Location = New System.Drawing.Point(327, 64)
-        Me.txtBelegMail_FixBetreffText.MaxLineLength = -1
-        Me.txtBelegMail_FixBetreffText.MaxLines_Warning = ""
-        Me.txtBelegMail_FixBetreffText.MaxLines_Warning_Label = Nothing
-        Me.txtBelegMail_FixBetreffText.Name = "txtBelegMail_FixBetreffText"
-        Me.txtBelegMail_FixBetreffText.Size = New System.Drawing.Size(131, 20)
-        Me.txtBelegMail_FixBetreffText.TabIndex = 11
+        Me.datVertragBis._DateTimeOnly = False
+        Me.datVertragBis._numbersOnly = False
+        Me.datVertragBis._numbersOnlyKommastellen = ""
+        Me.datVertragBis._numbersOnlyTrennzeichen = True
+        Me.datVertragBis._Prozent = False
+        Me.datVertragBis._ShortDateNew = True
+        Me.datVertragBis._ShortDateOnly = False
+        Me.datVertragBis._TimeOnly = False
+        Me.datVertragBis._TimeOnly_Seconds = False
+        Me.datVertragBis._value = ""
+        Me.datVertragBis._Waehrung = False
+        Me.datVertragBis._WaehrungZeichen = True
+        Me.datVertragBis.ForeColor = System.Drawing.Color.Black
+        Me.datVertragBis.Location = New System.Drawing.Point(321, 23)
+        Me.datVertragBis.MaxLength = 10
+        Me.datVertragBis.MaxLineLength = -1
+        Me.datVertragBis.MaxLines_Warning = ""
+        Me.datVertragBis.MaxLines_Warning_Label = Nothing
+        Me.datVertragBis.Name = "datVertragBis"
+        Me.datVertragBis.Size = New System.Drawing.Size(65, 20)
+        Me.datVertragBis.TabIndex = 10
        '
        'usrCntlKundenuebersicht
        '
@@ -3821,4 +3847,5 @@ Partial Class usrCntlKundenuebersicht
    Friend WithEvents lblInsolvent As Label
    Friend WithEvents txtBelegMail_FixBetreffText As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents cbxBelegMail_FixBetreff As CheckBox
+    Friend WithEvents datVertragBis As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -3,6 +3,7 @@ Imports System.Globalization
 Imports System.IO
 Imports org.BouncyCastle.Asn1.Ocsp
 Imports SDL.EORI
+Imports sun.util.resources.cldr.aa
 Imports VERAG_PROG_ALLGEMEIN

 Public Class usrCntlKundenuebersicht
@@ -1047,8 +1048,11 @@ Public Class usrCntlKundenuebersicht
            .Columns("kv_vertragArtId").Visible = False
            .Columns("kv_datenarchivId").Visible = False
            .Columns("kv_erhalten_Datum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
-            .Columns("kv_erhalten_Datum").Width = 70
+            .Columns("kv_erhalten_Datum").Width = 65
            .Columns("kv_erhalten_Datum").HeaderText = "Datum"
+            .Columns("kv_gueltigBis_Datum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+            .Columns("kv_gueltigBis_Datum").Width = 65
+            .Columns("kv_gueltigBis_Datum").HeaderText = "GültigBis"
            .Columns("kva_Bezeichnung").Width = 120
            .Columns("kva_Bezeichnung").HeaderText = "Art"
            .Columns("kv_Info").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
@@ -1067,6 +1071,12 @@ Public Class usrCntlKundenuebersicht
                    If r.Cells("kv_datenarchivId").Value IsNot DBNull.Value AndAlso CInt(r.Cells("kv_datenarchivId").Value) > 0 Then
                        DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf
                    End If
+                    If (r.Cells("kv_gueltigBis_Datum").Value IsNot DBNull.Value AndAlso CDate(r.Cells("kv_gueltigBis_Datum").Value) <= CDate(Now.ToShortDateString)) OrElse
+                            (Not CBool(r.Cells("kv_gueltig").Value)) Then
+                        r.DefaultCellStyle.ForeColor = Color.Red
+                    Else
+                        r.DefaultCellStyle.ForeColor = Color.Black
+                    End If
                Next
            End If
            .ClearSelection()
@@ -2447,6 +2457,7 @@ Public Class usrCntlKundenuebersicht
    Sub clearKV()
        cboVertrag.changeItem("")
        datVertrag.Text = ""
+        datVertragBis.Text = ""
        txtVertragVermerk.Text = ""
        Button11.Text = "Hinzufügen"
        Button12.Visible = False
@@ -2549,6 +2560,12 @@ Public Class usrCntlKundenuebersicht
            End If
            KV.kv_KundenNr = kdNr
            KV.kv_erhalten_Datum = datVertrag._value
+            If datVertragBis._value = "" Then
+                KV.kv_gueltigBis_Datum = Nothing
+            Else
+                KV.kv_gueltigBis_Datum = datVertragBis._value
+            End If
+
            'KV.kv_Zollamt = If(cbxKV.Checked, "GENERELL", txtT1VerzollungsadresseBestimmungszollstelle._value)

            'If Not Button9.Visible AndAlso VERAG_PROG_ALLGEMEIN.cKundenVertraege.ENTRY_Exists(kdNr, KV.kv_Zollamt) Then
@@ -2600,6 +2617,7 @@ Public Class usrCntlKundenuebersicht

            cboVertrag.changeItem(KV.kv_vertragArtId)
            datVertrag.Text = KV.kv_erhalten_Datum
+            datVertragBis.Text = If(KV.kv_gueltigBis_Datum, "")
            txtVertragVermerk.Text = KV.kv_Info

            Button11.Text = "Ändern"