Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

SDL/Formulare/KDFormulare/FormulareBaukasten/frmVorauskasse_CBAM.Designer.vb

@@ -44,6 +44,7 @@ Partial Class frmVorauskasse_CBAM
         Me.clmnYear = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.clmnKosten = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.cmlnEmission = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnBenchmark = New System.Windows.Forms.DataGridViewTextBoxColumn()
         CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -124,7 +125,7 @@ Partial Class frmVorauskasse_CBAM
         '
         Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1
         Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.MyDatagridview1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnTarif, Me.clmnWeight, Me.clmnCountry, Me.clmnYear, Me.clmnKosten, Me.cmlnEmission})
+        Me.MyDatagridview1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnTarif, Me.clmnWeight, Me.clmnCountry, Me.clmnYear, Me.clmnKosten, Me.cmlnEmission, Me.clmnBenchmark})
         Me.MyDatagridview1.Location = New System.Drawing.Point(12, 12)
         Me.MyDatagridview1.Name = "MyDatagridview1"
         Me.MyDatagridview1.Size = New System.Drawing.Size(430, 359)
@@ -176,7 +177,6 @@ Partial Class frmVorauskasse_CBAM
         '
         'Button1
         '
-        Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button1.Image = Global.SDL.My.Resources.Resources.Excel_logo
         Me.Button1.Location = New System.Drawing.Point(12, 451)
@@ -236,6 +236,12 @@ Partial Class frmVorauskasse_CBAM
         Me.cmlnEmission.Name = "cmlnEmission"
         Me.cmlnEmission.Visible = False
         '
+        'clmnBenchmark
+        '
+        Me.clmnBenchmark.HeaderText = "Benchmark"
+        Me.clmnBenchmark.Name = "clmnBenchmark"
+        Me.clmnBenchmark.Visible = False
+        '
         'frmVorauskasse_CBAM
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -279,4 +285,5 @@ Partial Class frmVorauskasse_CBAM
     Friend WithEvents clmnYear As DataGridViewTextBoxColumn
     Friend WithEvents clmnKosten As DataGridViewTextBoxColumn
     Friend WithEvents cmlnEmission As DataGridViewTextBoxColumn
+    Friend WithEvents clmnBenchmark As DataGridViewTextBoxColumn
 End Class

SDL/Formulare/KDFormulare/FormulareBaukasten/frmVorauskasse_CBAM.resx

@@ -135,6 +135,9 @@
   <metadata name="cmlnEmission.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="clmnBenchmark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

SDL/Formulare/KDFormulare/FormulareBaukasten/frmVorauskasse_CBAM.vb

@@ -27,11 +27,13 @@ Public Class frmVorauskasse_CBAM
             If Not r.IsNewRow Then
                 Dim cost As Double = 0
                 Dim emission As Double = 0
-                cATEZ_Greenpulse_CBAM_CostCalculation.calcCBAM_ByCertificatePrice(r.Cells("clmnTarif").Value, r.Cells("clmnWeight").Value, r.Cells("clmnCountry").Value, txtCalc_Defaut_CertPrice._value, r.Cells("clmnYear").Value, cost, emission)
+                Dim benchmark As Double = 0
+                cATEZ_Greenpulse_CBAM_CostCalculation.calcCBAM_ByCertificatePrice(r.Cells("clmnTarif").Value, r.Cells("clmnWeight").Value, r.Cells("clmnCountry").Value, txtCalc_Defaut_CertPrice._value, r.Cells("clmnYear").Value, cost, emission, benchmark)
 
                 If cost > 0 Then
                     r.Cells("clmnKosten").Value = cost
                     r.Cells("cmlnEmission").Value = emission
+                    r.Cells("clmnBenchmark").Value = benchmark
                     GesamtBetrag += cost
                 End If
 

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -216,7 +216,10 @@ Public Class frmFormulare
                 Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
                     Case "IMEX"
                         MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CBAM Checkliste", FormularManagerArten.CBAM_Checkliste))
+                    Case "FRONTOFFICE"
+                        MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CBAM Checkliste", FormularManagerArten.CBAM_Checkliste))
                     Case "AMBAR"
+                        MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CBAM Checkliste", FormularManagerArten.CBAM_Checkliste))
                     Case "ATILLA"
                     Case "UNISPED"
                         MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CBAM Checkliste", FormularManagerArten.CBAM_Checkliste))

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()
@@ -402,7 +404,7 @@ Public Class usrCntlCBAM
         txtCalcJahr.Text = Now.Year
         txtCalc_Defaut_Year.Text = Now.Year
         txtCalc_Defaut_CertPrice._value = 95
-
+        Button8.Visible = True
 
         If Now.Month < 3 Then
             txtJahr.Text = Now.Year - 1
@@ -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 za In LIST
-                  From it In za.Items
+                From it In za.Items
-                  Group By
+                Group By
-                        Tarifnummer = LeftStr(it.zaItem_HSCode, 8),
+                    Tarifnummer = LeftStr(it.zaItem_HSCode, 8),
-                        VersendungsLand = za.za_CountryDispatch,
+                    VersendungsLand = za.za_CountryDispatch
-                        Verfahren = LeftStr(za.za_MainProcedure, 2),
+                Into grp = Group
-                        Vorverfahren = it.zaItem_PrevProcedure
+                Let verfahren =
-                    Into grp = Group
+                    grp.Select(Function(x) LeftStr(x.za.za_MainProcedure, 2)).
-                  Select New With {
+                        FirstOrDefault(Function(v) Not String.IsNullOrWhiteSpace(v))
-                        .Tarifnummer = Tarifnummer,
+                Let verfahrenFallback =
-                        .Eigenmasse = grp.Sum(Function(x) If(x.it.zaItem_NetMass, 0D)),
+                    grp.Select(Function(x) LeftStr(x.it.zaItem_MainProcedure, 2)).
-                        .Rohmasse = grp.Sum(Function(x) If(x.it.zaItem_GrossMass, 0D)),
+                        FirstOrDefault(Function(v) Not String.IsNullOrWhiteSpace(v))
-                        .Rechnungspreis = grp.Sum(Function(x) If(x.it.zaItem_InvoiceValueEUR, 0D)),
+                Let vorverfahren =
-                        .VersendungsLand = VersendungsLand,
+                    grp.Select(Function(x) x.it.zaItem_PrevProcedure).
-                        .Verfahren = Verfahren,
+                        FirstOrDefault(Function(v) Not String.IsNullOrWhiteSpace(v))
-                        .VorangegangenesVerfahren = Vorverfahren
+                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
@@ -2788,5 +2837,49 @@ Public Class usrCntlCBAM
         cboIndirekt.Visible = cbxIndirekt.Checked
         txtEori.Visible = Not cbxIndirekt.Checked
     End Sub
+
+    Private Sub Button8_Click_1(sender As Object, e As EventArgs) Handles Button8.Click
+        Dim LIST = VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations.LOAD_List_CBAM({}, "", Now.ToShortDateString, Now.ToShortDateString,, False, True)
+        MsgBox(LIST.Count & " Einträge: " & vbNewLine & vbNewLine &
+               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
 

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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle18 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 DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle20 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.datVertragBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txtBelegMail_FixBetreffText = 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))
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
+        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))
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
+        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))
+        DataGridViewCellStyle3.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))
+        DataGridViewCellStyle3.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
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black
-        Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle15
+        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))
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16
+        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))
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
+        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))
+        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18
+        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))
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle22
+        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))
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23
+        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))
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle24
+        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
+        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle10.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))
+        DataGridViewCellStyle10.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
+        DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19
+        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
+        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle12.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))
+        DataGridViewCellStyle12.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
+        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle21
+        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
+        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        Me.HZA.DefaultCellStyle = DataGridViewCellStyle20
+        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.datVertragBis._DateTimeOnly = False
-        Me.cbxBelegMail_FixBetreff.Location = New System.Drawing.Point(235, 67)
+        Me.datVertragBis._numbersOnly = False
-        Me.cbxBelegMail_FixBetreff.Name = "cbxBelegMail_FixBetreff"
+        Me.datVertragBis._numbersOnlyKommastellen = ""
-        Me.cbxBelegMail_FixBetreff.Size = New System.Drawing.Size(97, 17)
+        Me.datVertragBis._numbersOnlyTrennzeichen = True
-        Me.cbxBelegMail_FixBetreff.TabIndex = 10
+        Me.datVertragBis._Prozent = False
-        Me.cbxBelegMail_FixBetreff.Text = "Betreff Fix(Blg):"
+        Me.datVertragBis._ShortDateNew = True
-        Me.cbxBelegMail_FixBetreff.UseVisualStyleBackColor = True
+        Me.datVertragBis._ShortDateOnly = False
-        '
+        Me.datVertragBis._TimeOnly = False
-        'txtBelegMail_FixBetreffText
+        Me.datVertragBis._TimeOnly_Seconds = False
-        '
+        Me.datVertragBis._value = ""
-        Me.txtBelegMail_FixBetreffText._DateTimeOnly = False
+        Me.datVertragBis._Waehrung = False
-        Me.txtBelegMail_FixBetreffText._numbersOnly = False
+        Me.datVertragBis._WaehrungZeichen = True
-        Me.txtBelegMail_FixBetreffText._numbersOnlyKommastellen = ""
+        Me.datVertragBis.ForeColor = System.Drawing.Color.Black
-        Me.txtBelegMail_FixBetreffText._numbersOnlyTrennzeichen = True
+        Me.datVertragBis.Location = New System.Drawing.Point(321, 23)
-        Me.txtBelegMail_FixBetreffText._Prozent = False
+        Me.datVertragBis.MaxLength = 10
-        Me.txtBelegMail_FixBetreffText._ShortDateNew = False
+        Me.datVertragBis.MaxLineLength = -1
-        Me.txtBelegMail_FixBetreffText._ShortDateOnly = False
+        Me.datVertragBis.MaxLines_Warning = ""
-        Me.txtBelegMail_FixBetreffText._TimeOnly = False
+        Me.datVertragBis.MaxLines_Warning_Label = Nothing
-        Me.txtBelegMail_FixBetreffText._TimeOnly_Seconds = False
+        Me.datVertragBis.Name = "datVertragBis"
-        Me.txtBelegMail_FixBetreffText._value = ""
+        Me.datVertragBis.Size = New System.Drawing.Size(65, 20)
-        Me.txtBelegMail_FixBetreffText._Waehrung = False
+        Me.datVertragBis.TabIndex = 10
-        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
         '
         '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

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"

VERAG_PROG_ALLGEMEIN/Classes/cGreendeal_CBAM_Trn.vb

@@ -211,6 +211,51 @@ Public Class cGreendeal_CBAM_Trn
     End Function
 
 
+    Public Shared Function LoadCBAMTariffNumbers(Optional onlyActive As Boolean = True,
+                                             Optional includeExclusions As Boolean = False) _
+                                             As List(Of String)
+
+        Dim sql As String =
+        "SELECT DISTINCT trnPattern " &
+        "FROM VERAG.dbo.tblGreendeal_CBAM_Trn " &
+        "WHERE trnPattern IS NOT NULL " &
+        "AND LTRIM(RTRIM(trnPattern)) <> '' "
+
+        If onlyActive Then
+            sql &= " AND is_active = 1 " &
+               " AND (start_date IS NULL OR start_date <= GETDATE()) " &
+               " AND (end_date   IS NULL OR end_date   >= GETDATE()) "
+        End If
+
+        If Not includeExclusions Then
+            sql &= " AND ISNULL(is_exclusion,0) = 0 "
+        End If
+
+        Dim dt As DataTable =
+        (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(sql, "FMZOLL")
+
+        Dim result As New List(Of String)
+
+        If dt Is Nothing OrElse dt.Rows.Count = 0 Then
+            Return result
+        End If
+
+        For Each r As DataRow In dt.Rows
+            Dim pattern As String = r("trnPattern").ToString().Trim()
+
+            ' % entfernen → reine Tarifnummer
+            pattern = pattern.Replace("%", "")
+
+            ' nur numerische Werte zulassen
+            If pattern <> "" AndAlso pattern.All(AddressOf Char.IsDigit) Then
+                result.Add(pattern)
+            End If
+        Next
+
+        Return result.Distinct().OrderBy(Function(x) x).ToList()
+
+    End Function
+
     Public Shared Function DELETE_ALL() As Boolean
         Try
 

VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb

@@ -321,12 +321,13 @@ Public Class cKunde
         '  Return Nothing
     End Sub
 
-    Public Shared Function LOAD_ByEORI(EORI) As cKunde
+    Public Shared Function LOAD_ByEORI(EORI, Optional searchfirma = "") As cKunde
         Dim test = ""
         Dim KUNDE As New cKunde()
         Try
             Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
-                Using cmd As New SqlCommand("SELECT * FROM Kunden INNER JOIN Filialen on Filialen.FilialenNr=Kunden.FilialenNr WHERE EORITIN=@EORITIN and  ( '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.Replace("ATILLA", "VERAG") & "' IN (Filialen.Firma,Filialen.Cluster)) ", conn)
+                If searchfirma = "" Then searchfirma = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.Replace("ATILLA", "VERAG")
+                Using cmd As New SqlCommand("SELECT * FROM Kunden INNER JOIN Filialen on Filialen.FilialenNr=Kunden.FilialenNr WHERE EORITIN=@EORITIN and  ( '" & searchfirma & "' IN (Filialen.Firma,Filialen.Cluster)) ", conn)
                     cmd.Parameters.AddWithValue("@EORITIN", EORI)
 
                     Dim dr = cmd.ExecuteReader()

VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb

@@ -107,6 +107,11 @@ Public Class cKundenErweitert
     Property kde_ATEZ_GreenpulseID As Object = Nothing
     Property kde_SEG_Summe As Object = Nothing
     Property kde_SEG_Datum As Object = Nothing
+    Property kde_CBAM_Status As String = ""
+    Property kde_CBAM_Warn1 As Decimal? = 30
+    Property kde_CBAM_Warn2 As Decimal? = 40
+    Property kde_CBAM_ApplicationNo As Object = Nothing
+    Property kde_CBAM_CBAMAccountNo As Object = Nothing
 
 
     Dim SQL As New SQL
@@ -221,6 +226,15 @@ Public Class cKundenErweitert
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_SEG_Summe", kde_SEG_Summe))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_SEG_Datum", kde_SEG_Datum))
 
+
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_Status", kde_CBAM_Status))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_Warn1", kde_CBAM_Warn1))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_Warn2", kde_CBAM_Warn2))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_ApplicationNo", kde_CBAM_ApplicationNo))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_CBAMAccountNo", kde_CBAM_CBAMAccountNo))
+
+
+
         Return list
     End Function
 

VERAG_PROG_ALLGEMEIN/Classes/cKundenVertraege.vb

@@ -6,6 +6,7 @@ Public Class cKundenVertraege
     Property kv_Id As Integer
     Property kv_KundenNr As Integer
     Property kv_erhalten_Datum As Date
+    Property kv_gueltigBis_Datum As Date?
     Property kv_vertragArtId As Integer
     Property kv_Info As Object = Nothing
     Property kv_datenarchivId As Object = Nothing
@@ -24,10 +25,11 @@ Public Class cKundenVertraege
         LOAD()
     End Sub
 
-    Sub New(kv_KundenNr, kv_erhalten_Datum, kv_vertragArtId)
+    Sub New(kv_KundenNr, kv_erhalten_Datum, kv_vertragArtId, Optional kv_gueltigBis_Datum = Nothing)
         Me.kv_KundenNr = kv_KundenNr
         Me.kv_erhalten_Datum = kv_erhalten_Datum
         Me.kv_vertragArtId = kv_vertragArtId
+        Me.kv_gueltigBis_Datum = kv_gueltigBis_Datum
         LOAD(kv_KundenNr, kv_erhalten_Datum, kv_vertragArtId)
     End Sub
 
@@ -40,12 +42,13 @@ Public Class cKundenVertraege
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_Info", kv_Info))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_datenarchivId", kv_datenarchivId))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_gueltig", kv_gueltig))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_gueltigBis_Datum", kv_gueltigBis_Datum))
 
         Return list
     End Function
 
     Public Shared Function LOAD_LIST(KundenNr As Integer) As DataTable
-        Return (New SQL).loadDgvBySql("SELECT [kv_Id],[kv_KundenNr],[kv_erhalten_Datum],[kv_vertragArtId],kva_Bezeichnung,[kv_Info],[kv_datenarchivId],[kv_gueltig] FROM tblKundenVertraege INNER JOIN tblKundenVertraegeArten ON kv_vertragArtId=kva_id WHERE kv_KundenNr=" & KundenNr, "FMZOLL")
+        Return (New SQL).loadDgvBySql("SELECT [kv_Id],[kv_KundenNr],[kv_erhalten_Datum],[kv_vertragArtId],kva_Bezeichnung,[kv_Info],[kv_datenarchivId],[kv_gueltig],kv_gueltigBis_Datum FROM tblKundenVertraege INNER JOIN tblKundenVertraegeArten ON kv_vertragArtId=kva_id WHERE kv_KundenNr=" & KundenNr, "FMZOLL")
     End Function
 
     Public Shared Function ENTRY_Exists(KundenNr As Integer, kv_vertragArtId As Integer) As Boolean

VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/GREENPULSE/cATEZ_Greenpulse_CBAM_CostCalculation.vb

@@ -285,7 +285,9 @@ Public Class cATEZ_Greenpulse_CBAM_CostCalculation
 
     End Function
 
-    Public Shared Function calcCBAM_ByCertificatePrice(cn_code As String, weight As Object, country_code As String, certificate_price As Object, year As Object, Optional ByRef CBAM_COST As Decimal = -1, Optional ByRef CBAM_EMISSION As Decimal = -1) As String
+    Public Shared Function calcCBAM_ByCertificatePrice(cn_code As String, weight As Object, country_code As String, certificate_price As Object, year As Object, Optional ByRef CBAM_COST As Decimal = -1, Optional ByRef CBAM_EMISSION As Decimal = -1, Optional ByRef CBAM_BENCHMARK As Decimal = -1, Optional ByRef CBAM_Faktor As Decimal = -1) As String
+
+        VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
 
         ' ------------------------------------------------------------
         ' Validierung
@@ -316,6 +318,7 @@ Public Class cATEZ_Greenpulse_CBAM_CostCalculation
         ' ------------------------------------------------------------
         Dim api As New cATEZ_Greenpulse_CBAM_CostCalculation()
         Dim see_total As Decimal
+        Dim benchmark As Decimal
 
         Try
             Dim defResp = api.GetCnCodeDefaults(
@@ -333,6 +336,7 @@ Public Class cATEZ_Greenpulse_CBAM_CostCalculation
             End If
 
             see_total = defResp.data.default_emission
+            benchmark = defResp.data.benchmark
 
         Catch ex As Exception
             Return "Technischer Fehler beim Laden der CN-Code Defaults: " & ex.Message
@@ -344,29 +348,57 @@ Public Class cATEZ_Greenpulse_CBAM_CostCalculation
         Dim w As Decimal = CDec(weight)
         Dim price As Decimal = CDec(certificate_price)
 
-        Dim cbamEmission As Decimal = w * see_total
-        Dim cbamCost As Decimal = cbamEmission * price
 
-        ' ------------------------------------------------------------
+        ' --- Faktoren als echte Faktoren (nicht Prozent) ---
-        ' Ausgabe
+        Dim cbamf As Decimal = 0D
-        ' ------------------------------------------------------------
+        Select Case CInt(year)
+            Case 2026 : cbamf = 0.975D
+            Case 2027 : cbamf = 0.95D
+            Case 2028 : cbamf = 0.9D
+            Case 2029 : cbamf = 0.775D
+            Case 2030 : cbamf = 0.515D
+            Case 2031 : cbamf = 0.39D
+            Case 2032 : cbamf = 0.265D
+            Case 2033 : cbamf = 0.14D
+            Case Else : cbamf = 0D
+        End Select
+
+
+        ' SEFA = Benchmark * CBAMF * CSCF
+        Dim sefa As Decimal = benchmark * cbamf
+
+        ' Zertifikatspflicht je Tonne Ware
+        Dim certPerTon As Decimal = see_total - sefa
+        If certPerTon < 0D Then certPerTon = 0D
+
+        ' Gesamte Zertifikatspflicht (t CO2e)
+        Dim certTotal As Decimal = certPerTon * w
+
+        ' Kosten
+        Dim cbamCost As Decimal = certTotal * price
+
+        ' --- Ausgabe ---
         Dim s As String = ""
-        s &= "CBAM Kostenberechnung (ohne Benchmark)" & vbCrLf
+        s &= "CBAM Kostenberechnung (Default EE mit SEFA-Abzug)" & vbCrLf
         s &= "-----------------------------------------------------------" & vbCrLf
         s &= $"CN-Code: {cn_code}" & vbCrLf
         s &= $"Ursprungsland: {country_code.ToUpperInvariant()}" & vbCrLf
+        s &= $"Jahr: {year}" & vbCrLf
         s &= $"Gewicht: {w:N2} t" & vbCrLf
-        s &= $"SEE total (Default): {see_total:N5}" & vbCrLf
+        s &= $"EE / SEE total (Default): {see_total:N6} t CO₂e/t" & vbCrLf
-        s &= $"CBAM Emission: {cbamEmission:N5} t CO₂" & vbCrLf
+        s &= $"Benchmark BMg: {benchmark:N6} t CO₂e/t" & vbCrLf
-        s &= $"Zertifikatspreis: {price:N2} EUR/t" & vbCrLf
+        s &= $"CBAMF: {cbamf:N3}"
-        s &= vbCrLf
+        Console.WriteLine(s)
-        s &= $"CBAM Kosten: {cbamCost:N2} EUR" & vbCrLf
+
         CBAM_COST = cbamCost
         CBAM_EMISSION = see_total
+        CBAM_BENCHMARK = benchmark
+        CBAM_Faktor = cbamf
 
         Return s
 
     End Function
+
     ' ------------------------------------------------------------------------
     ' Helpers
     ' ------------------------------------------------------------------------

VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/GREENPULSE/cATEZ_Greenpulse_KafkaDecs.vb

@@ -46,6 +46,7 @@ Public Class cATEZ_Greenpulse_KafkaDecs
         Dim m = (mrn).ToUpperInvariant()
         Return String.Join(SEP_PIPE, New String() {KEY_VERSION, c, s, m})
     End Function
+
     Public Shared Function GetUniqueKey_Pipe_FromVERAG_CustomsDec(CD As VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations, Optional mrn As String = "") As String
 
         Dim c = (If(CD.za_CountryImport, CD.za_CustomsSystemCountry)).ToUpperInvariant()

VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb

@@ -1,5 +1,10 @@
 Imports System.Data.SqlClient
 Imports System.Reflection
+Imports System.Runtime.InteropServices.ComTypes
+Imports com.sun.tools.javac.util
+Imports java.lang.ProcessBuilder
+Imports sun.util.resources.cldr.aa
+Imports VERAG_PROG_ALLGEMEIN.TESTJSON
 
 ' ==========================================================================
 '   MASTER CLASS
@@ -231,13 +236,13 @@ Public Class cVERAG_CustomsDeclarations
             "FROM VERAG.dbo.tblVERAG_CustomsDeclarations z " &
             "INNER JOIN VERAG.dbo.tblVERAG_CustomsDeclarations_Items i " &
             "   ON z.za_Id = i.zaItem_zaId " &
-            "INNER JOIN VERAG.dbo.tblVERAG_CustomsDeclarations_Parties p " &
+            "LEFT JOIN VERAG.dbo.tblVERAG_CustomsDeclarations_Parties p " &
             "   ON z.za_Id = p.zaParty_zaId " &
             "WHERE z.za_REGIME = 'IMPORT' " &
             "  AND z.za_IsFinalDeclaration = 1 " &
-            "  AND z.za_DeclarationDate >= @dateFrom " &
+            "  AND cast(z.za_DeclarationDate as date) >= @dateFrom " &
-            "  AND z.za_DeclarationDate <= @dateTo " &
+            "  AND cast(z.za_DeclarationDate  as date) <= @dateTo " &
-            "  AND p.zaParty_EORI IN (" & eoriIn & ") " &
+           If(eoriIn <> "", "  AND p.zaParty_EORI IN (" & eoriIn & ") ", "") &
             "  AND " & cbamWhere
 
             If indirect Then
@@ -255,13 +260,12 @@ Public Class cVERAG_CustomsDeclarations
             If CustomsSystem <> "" Then
                 sqlstr &= " AND z.za_System = @sys "
             End If
-
             Using conn = SQL.GetNewOpenConnectionFMZOLL()
                 Using cmd As New SqlCommand(sqlstr, conn)
 
                     ' cmd.Parameters.AddWithValue("@eori", EORI)
-                    cmd.Parameters.AddWithValue("@dateFrom", datFrom)
+                    cmd.Parameters.AddWithValue("@dateFrom", datFrom.ToShortDateString)
-                    cmd.Parameters.AddWithValue("@dateTo", datTo)
+                    cmd.Parameters.AddWithValue("@dateTo", datTo.ToShortDateString)
 
                     If ImportCountry <> "" Then
                         cmd.Parameters.AddWithValue("@importCountry", ImportCountry)
@@ -358,12 +362,306 @@ Public Class cVERAG_CustomsDeclarations
         Return ZA
     End Function
 
+    Public Sub checkfreshCBAMWarning()
+        Try
+            Dim CBAM_ITEMS As New List(Of cVERAG_CustomsDeclarations_Item)
+
+            If hasCBAM(CBAM_ITEMS) Then
+
+                Dim importerEORI As String = Me.Parties.Where(Function(p) {"CN", "IM", "IMP", "IMPORTER"}.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_EORI).FirstOrDefault()
+                Dim ImporterString As String = Me.Parties.Where(Function(p) {"CZ", "EX", "EXP", "EXPORTER"}.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_Name).FirstOrDefault()
+                Dim ExporterEORI As String = Me.Parties.Where(Function(p) {"CZ", "EX", "EXP", "EXPORTER"}.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_EORI).FirstOrDefault()
+                Dim ExporterString As String = Me.Parties.Where(Function(p) {"CZ", "EX", "EXP", "EXPORTER"}.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_Name).FirstOrDefault()
+
+                Dim KD As cKunde = Nothing
+                Dim AD As cAdressen = Nothing
+                If If(importerEORI, "") <> "" Then
+                    KD = cKunde.LOAD_ByEORI(importerEORI, If(za_Firma, ""))
+                    If KD Is Nothing Then KD = cKunde.LOAD_ByEORI(importerEORI) 'Wenn kein Kunde mit Firma gefunden wurde, nur nach EORI suchen (default VERAG)
+                    AD = New cAdressen(KD.KundenNr)
+                End If
+
+
+                If AD IsNot Nothing Then
+                    ImporterString = AD.Name_1 & " " & If(AD.Name_2, "") & "<br/>" & If(AD.LandKz, "") & " " & If(AD.PLZ, "") & " " & If(AD.Ort, "")
+                End If
+
+                Dim KD_EX As cKunde = Nothing
+                Dim AD_EX As cAdressen = Nothing
+                If If(ExporterEORI, "") <> "" Then
+                    KD_EX = cKunde.LOAD_ByEORI(ExporterEORI, If(za_Firma, ""))
+                    If KD_EX Is Nothing Then KD_EX = cKunde.LOAD_ByEORI(ExporterEORI) 'Wenn kein Kunde mit Firma gefunden wurde, nur nach EORI suchen (default VERAG)
+                    AD_EX = New cAdressen(KD_EX.KundenNr)
+
+                End If
+                If AD_EX IsNot Nothing Then
+                    ExporterString = AD_EX.Name_1 & " " & If(AD_EX.Name_2, "") & "<br/>" & If(AD_EX.LandKz, "") & " " & If(AD_EX.PLZ, "") & " " & If(AD_EX.Ort, "")
+                End If
+
+
+                If isIndirect() Then
+
+
+
+                    '==================>> INDIRECT <<=========================
+                    Dim itemsHtml As String =
+                                String.Join("", CBAM_ITEMS.Select(Function(i) "<tr>" &
+                                    "<td>" & i.zaItem_PosNo.ToString & "</td>" &
+                                    "<td>" & If(i.zaItem_HSCode, "") & "</td>" &
+                                    "<td>" & If(i.zaItem_Description, "") & "</td>" &
+                                    "</tr>"
+                                ))
+
+                    Dim bodyHtml As String =
+                            "<html><body style='font-family:Segoe UI, Arial, sans-serif; font-size:12pt; color:#222'>" &
+                            "<h2 style='color:#b00020'>CBAM-Warnmeldung bei Zollanmeldung " & Me.za_MRN & "</h2>" &
+                            "<p>" &
+                            "Bei der Zollanmeldung mit der MRN <b>" & Me.za_MRN & "</b> wurden CBAM-relevante Warenpositionen erkannt.<br/>" &
+                            "Bitte prüfen Sie diese Anmeldung im Hinblick auf die CBAM-Meldepflicht." &
+                            "</p>" &
+                            "<h3>Erkannte CBAM-Positionen</h3>" &
+                            "<table cellpadding='6' cellspacing='0' border='1' style='border-collapse:collapse; width:100%'>" &
+                            "<tr style='background-color:#f0f0f0'>" &
+                            "<th align='left'>PosNr</th>" &
+                            "<th align='left'>HS-Code</th>" &
+                            "<th align='left'>Beschreibung</th>" &
+                            "</tr>" &
+                            itemsHtml &
+                            "</table>" &
+                             "<p>" &
+                            "<b>Importeur:</b><br/>" &
+                            If(importerEORI, "") & "<br>" & If(ImporterString, "") &
+                            "</p>" &
+                             "<p>" &
+                            "<b>Exporteur:</b><br/>" &
+                            If(ExporterEORI, "") & " – " & vbNewLine &
+                            If(AD_EX Is Nothing, ExporterString, AD_EX.Name_1 & " " & If(AD_EX.Name_2, "") & "<br/>" &
+                            If(AD_EX.LandKz, "") & " " & If(AD_EX.PLZ, "") & " " & If(AD_EX.Ort, "")) &
+                            "</p>" &
+                            "<br/><p><b>VERAG – CBAM Compliance Services</b></p>" &
+                            "</body></html>"
+
+                    VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "CBAM WARNUNG - " & Me.za_MRN, bodyHtml, "cbam@verag.ag")
+
+                    'VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "CBAM WARNUNG",
+                    '                "CBAM-Warnmeldung bei Zollanmeldung " & Me.za_MRN & vbNewLine &
+                    '                "Bei der Zollanmeldung mit der MRN " & Me.za_MRN & " wurden CBAM-relevante Warenpositionen erkannt." & vbCrLf &
+                    '                "Bitte prüfen Sie diese Anmeldung im Hinblick auf die CBAM-Meldepflicht." & vbCrLf & vbCrLf &
+                    '                "Erkannte CBAM-Positionen:" & vbCrLf &
+                    '                String.Join(vbCrLf, CBAM_ITEMS.Select(Function(i) " - PosNr: " & i.zaItem_PosNo.ToString & " | HS-Code: " & If(i.zaItem_HSCode, "") & " | Beschreibung: " & If(i.zaItem_Description, "")))
+                    '            )
+                    ''=========================================================
+                Else
+                        '==================>> DIRECT <<=========================
+
+                        Try
+                            If KD IsNot Nothing Then
+                                Dim ERW As New cKundenErweitert(KD.KundenNr)
+
+                                Select Case ERW.kde_CBAM_Status
+                                Case "", "50to" ' Nur hier wird eine Warnung gesendet!! -> WEnn der Kunde bereits Registriert ist, nicht notwendig.
+
+                                    Dim dateCBAM = If(If(za_ReleaseDate, za_DeclarationDate), Now)
+
+                                    Dim eigenmasseSumme_Shipment As Decimal = CBAM_ITEMS.Sum(Function(i) If(i.zaItem_NetMass, 0D)) / 1000
+                                    Dim eigenmasseSumme_YEAR As Decimal = getCBAM_KG(importerEORI, CDate("01.01." & dateCBAM.Year), CDate("31.12." & dateCBAM.Year), za_MRN) / 1000
+
+                                    Dim WarnLevel As String = ""
+                                    Dim Schwellenwert As Decimal = 0
+
+                                    Dim Warn1 As Decimal = If(If(ERW.kde_CBAM_Warn1, 0) > 0, ERW.kde_CBAM_Warn1, 30)
+                                    Dim Warn2 As Decimal = If(If(ERW.kde_CBAM_Warn2, 0) > 0, ERW.kde_CBAM_Warn2, 40)
+                                    Dim Warn50to As Decimal = 50
+
+                                    'geprüft werden die bisherigen CBAM Waren im Jahr + die aktuelle Sendung
+                                    If eigenmasseSumme_YEAR < Warn50to And (eigenmasseSumme_Shipment + eigenmasseSumme_YEAR) >= Warn50to Then
+                                        '--> WARN 2 überschritten
+                                        WarnLevel = "3"
+                                        Schwellenwert = 50
+                                    End If
+                                    'geprüft werden die bisherigen CBAM Waren im Jahr + die aktuelle Sendung
+                                    If eigenmasseSumme_YEAR < Warn2 And (eigenmasseSumme_Shipment + eigenmasseSumme_YEAR) >= Warn2 Then
+                                        '--> WARN 2 überschritten
+                                        WarnLevel = "2"
+                                        Schwellenwert = Warn2
+                                    End If
+                                    'geprüft werden die bisherigen CBAM Waren im Jahr + die aktuelle Sendung
+                                    If eigenmasseSumme_YEAR < Warn1 And (eigenmasseSumme_Shipment + eigenmasseSumme_YEAR) >= Warn1 Then
+                                            '--> WARN 1 überschritten
+                                            WarnLevel = "1"
+                                            Schwellenwert = Warn1
+                                        End If
+
+                                    '===========>>>> WARNUNG <<<<<<<=================================
+                                    If WarnLevel <> "" Then
+
+                                        Dim bodyHtml As String =
+                                                    "<html><body style='font-family:Segoe UI, Arial, sans-serif; font-size:12pt; color:#222'>" &
+                                                    "<h2 style='color:#b00020'>CBAM-Warnmeldung zu Ihrer Zollanmeldung " & Me.za_MRN & "</h2>" &
+                                                    "<p>" &
+                                                    "Laut unserem System wurden in der Zollanmeldung mit der MRN <b>" & Me.za_MRN & "</b> " &
+                                                    "CBAM-pflichtige Warenpositionen erkannt.<br/>" &
+                                                    "Für Ihr Unternehmen liegen uns derzeit keine Informationen über eine gültige CBAM-Registrierung vor." &
+                                                    "</p>" &
+                                                    "<table cellpadding='6' cellspacing='0' border='1' style='border-collapse:collapse'>" &
+                                                    "<tr><td><b>Warnstufe</b></td><td>" & WarnLevel & If(WarnLevel = 3, " - <span style='color:#b00020'><b>ÜBERSCHREITUNG!</b></span>", "") & "</td></tr>" &
+                                                    "<tr><td><b>Schwellenwert</b></td><td>" & Schwellenwert.ToString("N0") & " Tonnen</td></tr>" &
+                                                    "</table><br/>" &
+                                                    "<p>" &
+                                                    "<b>Importeur:</b><br/>" &
+                                                     If(importerEORI, "") & "<br>" & If(ImporterString, "") &
+                                                   "</p>" &
+                                                   "<p>" &
+                                                    "<b>Exporteur:</b><br/>" &
+                                                    If(ExporterEORI, "") & "<br>" & If(ExporterString, "") &
+                                                    "</p>" &
+                                                     "<p style='color:#b00020'><b>WICHTIG</b></p>" &
+                                                    "<p>" &
+                                                    "Bei Überschreitung einer jährlichen Gesamtmenge von <b>50 Tonnen CBAM-pflichtiger Waren</b> (Jahressumme) " &
+                                                    "ist eine gültige CBAM-Registrierung zwingend erforderlich.<br/>" &
+                                                    "Ohne gültige Registrierung kann es zu Zollblockaden oder Abfertigungsstopps kommen." &
+                                                    "</p>" &
+                                                    "<p>" &
+                                                    "Bitte teilen Sie uns kurzfristig unter " &
+                                                    "<a href='mailto:cbam@verag.ag'>cbam@verag.ag</a> mit, wie Sie weiter vorgehen möchten " &
+                                                    "(z. B. bestehende Registrierung, Beantragung mit VERAG oder Bevollmächtigung)." &
+                                                    "</p>" &
+                                                    "<p><b>VERAG DCS – CBAM Compliance Services</b></p>" &
+                                                    "<p>VERAG Spedition AG<br>A-4975 Suben, Suben 100</p>" &
+                                                    "</body></html>"
+                                        Console.WriteLine(bodyHtml)
+
+                                        ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(If(AD.E_Mail, ""), "CBAM-WARNUNG – " & If(WarnLevel = 3, " ACHTUNG: Überschreitung 50to! ", "Überschreitung der Meldeschwelle"), bodyHtml, "cbam@verag.ag", (WarnLevel = 3), "cbam@verag.ag",, "al@verag.ag")
+                                        VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(If(AD.E_Mail, ""), "CBAM-WARNUNG – " & If(WarnLevel = 3, " ACHTUNG: Überschreitung 50to! ", "Überschreitung der Meldeschwelle"), bodyHtml, "cbam@verag.ag", (WarnLevel = 3), False, "cbam@verag.ag", "al@verag.ag")
+
+                                        'VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(
+                                        '         "al@verag.ag",
+                                        '         "CBAM-WARNUNG – Überschreitung der Meldeschwelle",
+                                        '         "CBAM-Warnmeldung zu Ihrer Zollanmeldung " & Me.za_MRN & vbCrLf & vbCrLf &
+                                        '         "Laut unserem System wurden in der Zollanmeldung mit der MRN " & Me.za_MRN & " CBAM-pflichtige Warenpositionen erkannt." & vbCrLf &
+                                        '         "Für Ihr Unternehmen liegen uns derzeit keine Informationen über eine gültige CBAM-Registrierung vor." & vbCrLf & vbCrLf &
+                                        '         "Der für diese Sendung relevante Schwellenwert wurde überschritten." & vbCrLf &
+                                        '         "Aktuelle Warnstufe: " & WarnLevel & vbCrLf &
+                                        '         "Angewendeter Schwellenwert: " & Schwellenwert.ToString("N0") & " Tonnen" & vbCrLf & vbCrLf &
+                                        '         "Importeur: " & importerEORI & " - " & AD.Name_1 & " " & If(AD.Name_2, "") & " " & If(AD.LandKz, "") & " " & If(AD.PLZ, "") & " " & If(AD.Ort, "") & vbCrLf &
+                                        '         "WICHTIG:" & vbCrLf &
+                                        '         "Bei Überschreitung einer jährlichen Gesamtmenge von 50 Tonnen CBAM-pflichtiger Waren ist eine gültige CBAM-Registrierung zwingend erforderlich." & vbCrLf &
+                                        '         "Ohne gültige Registrierung kann es zu Zollblockaden oder Abfertigungsstopps kommen." & vbCrLf & vbCrLf &
+                                        '         "Bitte teilen Sie uns kurzfristig unter cbam@verag.ag mit, wie Sie weiter vorgehen möchten (z. B. bestehende Registrierung, Beantragung mit VERAG oder Bevollmächtigung)." & vbCrLf & vbCrLf &
+                                        '         "VERAG – CBAM Compliance Services"
+                                        '     )
+                                    End If
+                                    '================================================================
+                            End Select
+                            End If
+                            '=========================================================
+                        Catch ex As Exception
+                            cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name)
+                        End Try
+                    End If
+                End If
+        Catch ex As Exception
+            cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+
+    End Sub
+
+    Public Function getCBAM_KG(EORI As String, von As Date, bis As Date, Optional without_MRN As String = "") As Decimal
+        Try
+            Dim sqlstr = "SELECT   SUM(i.zaItem_NetMass) AS CBAM_Eigenmasse_kg
+                    FROM VERAG.dbo.tblVERAG_CustomsDeclarations_Items i
+                    JOIN VERAG.dbo.tblVERAG_CustomsDeclarations z
+                        ON z.za_Id = i.zaItem_zaId
+	
+                    JOIN VERAG.dbo.tblVERAG_CustomsDeclarations_Parties p
+                        ON p.zaParty_zaId = z.za_Id
+                       AND p.zaParty_EORI = '" & EORI & "'
+                       AND p.zaParty_Role IN ('CN','IM','IMP','IMPORTER')
+
+                    WHERE z.za_ReleaseDate BETWEEN '" & von.ToShortDateString & "' AND '" & bis.ToShortDateString & "'
+                    AND EXISTS (
+                        SELECT 1
+                        FROM VERAG.dbo.tblGreendeal_CBAM_Trn t
+                        WHERE
+                            i.zaItem_HSCode LIKE t.trnPattern
+                            AND t.is_active = 1
+                            AND ISNULL(t.is_exclusion,0) = 0
+                            AND (t.start_date IS NULL OR t.start_date <= z.za_ReleaseDate)
+                            AND (t.end_date   IS NULL OR t.end_date   >= z.za_ReleaseDate)
+                    ) "
+
+            If without_MRN <> "" Then sqlstr &= " and za_MRN <>'" & without_MRN & "'"
+
+            Return SQL.getValueTxtBySql(sqlstr, "FMZOLL",,, 0)
+
+        Catch ex As Exception
+            cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+        Return 0
+    End Function
+    Public Function isIndirect() As Boolean
+        If Me.za_System Is Nothing Then Return False
+        If Me.za_RepresentationCode Is Nothing Then Return False
+        If Me.za_System.Contains("DHF") AndAlso Me.za_RepresentationCode = 3 Then Return True
+        If Me.za_System.Contains("TELOTEC") AndAlso Me.za_RepresentationCode = 3 Then Return True
+        If Me.za_System.Contains("DAKOSY") AndAlso Me.za_RepresentationCode = 2 Then Return True
+        Return False
+    End Function
+    Public Function hasCBAM(Optional ByRef CBAM_ITEMS As List(Of cVERAG_CustomsDeclarations_Item) = Nothing) As Boolean
+
+        Dim LIST As New List(Of cVERAG_CustomsDeclarations)
+        Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+        Try
+            CBAM_ITEMS = getCBAM_ITEMS()
+            If CBAM_ITEMS IsNot Nothing AndAlso CBAM_ITEMS.Count > 0 Then
+                Return True
+            End If
+
+        Catch ex As Exception
+            cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+        Return False
+    End Function
+
+    Public Function getCBAM_ITEMS() As List(Of cVERAG_CustomsDeclarations_Item)
+
+        Dim LIST As New List(Of cVERAG_CustomsDeclarations)
+        Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+        Try
+            ' ------------------------------------------------------------
+            ' CBAM Pattern (HSCode)
+            ' ------------------------------------------------------------
+            Dim cbamHsCodes = VERAG_PROG_ALLGEMEIN.cGreendeal_CBAM_Trn.LoadCBAMTariffNumbers()
+
+
+            If Items Is Nothing OrElse cbamHsCodes Is Nothing OrElse cbamHsCodes.Count = 0 Then Return Nothing
+
+            ' Performance: HashSet für Prefix-Liste
+            Dim prefixes As HashSet(Of String) =
+            New HashSet(Of String)(cbamHsCodes)
+
+            Return Me.Items.
+                Where(Function(it)
+                          Dim hs As String = If(it.zaItem_HSCode, "").Trim()
+                          If hs = "" Then Return False
+                          ' linksseitiger Prefix-Abgleich
+                          For Each p In prefixes
+                              If hs.StartsWith(p) Then
+                                  Return True
+                              End If
+                          Next
+                      End Function).ToList()
+        Catch ex As Exception
+            cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+        Return Nothing
+    End Function
     Public Function SAVE() As Boolean
         Dim list = getParameterList()
 
         Dim sqlstr =
-            "BEGIN TRAN " &
+                "BEGIN TRAN " &
-            "IF EXISTS(SELECT 1 FROM tblVERAG_CustomsDeclarations WHERE za_Id=@za_Id) " &
+                "IF EXISTS(SELECT 1 FROM tblVERAG_CustomsDeclarations WHERE za_Id=@za_Id) " &
             "BEGIN " & getUpdateCmd() & " END " &
             "ELSE BEGIN " & getInsertCmd() & " END " &
             "COMMIT TRAN"

VERAG_PROG_ALLGEMEIN/cAllgemein.vb

@@ -29,6 +29,8 @@ Public Class cAllgemein
     Public Shared FMZOLL_SERVER As String = "[FMZOLL\SQLFMZOLL]" '"[SQLGUIDE01.verag.ost.dmn]"
     Public Shared SQLGUIDE01_USED As Boolean = False 'FM-ZOLL Ablöse!!!!
 
+    Public Shared AVISO_LAYOUT_NEW As Boolean = False
+
 
     'Public Shared FMZOLL_ATLAS_Datensicherung As String = "\\192.168.0.91\f\FMZoll\Datensicherung\atlas\atlas\fssouzb"
     Public Shared FMZOLL_ATLAS_Datensicherung_OLD As String = "\\share01\F\FMZoll\Datensicherung\atlas\atlas\fssouzb"