From cc9216750845a71b88e412c031b191124f750cd0 Mon Sep 17 00:00:00 2001
From: Andreas Luxbauer <al@verag.ag>
Date: Thu, 5 Mar 2026 11:02:39 +0100
Subject: [PATCH] CBAM

---
 .../FormulareBaukasten/usrcntlCBAM.vb            |  2 +-
 .../usrcntlCBAM_Zertifikate.vb                   |  1 +
 SDL/Formulare/KDFormulare/frmFormulare.vb        |  4 ++--
 .../VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb  | 16 +++++++++++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM.vb
index 6ce14351..e0cd8cdc 100644
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM.vb
@@ -73,7 +73,7 @@
         initControlsHandler()
         cboSprache.Items.Clear()
         cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE"))
-        'cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN"))
+        cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN"))
 
         cboPaketOption.Items.Clear()
         cboPaketOption.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Zertifikate.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Zertifikate.vb
index 3291e1bd..5dd402b8 100644
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Zertifikate.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Zertifikate.vb
@@ -73,6 +73,7 @@
         initControlsHandler()
         cboSprache.Items.Clear()
         cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE"))
+        cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN"))
 
         txtCBAM_jeZertBest_Paket_1._value = 50
         txtCBAM_ZertAufschlag_Paket_1._value = 10
diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb
index 40b254b5..ed8ae0f6 100644
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -1796,7 +1796,7 @@ Public Class FormularManagerNEU
         '   Dim firma=getUO2()
         Select Case usrCntl.cboSprache._value
             Case "EN"
-                Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM", listTowrite)
+                Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM_ENG", listTowrite)
             Case Else
                 Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM", listTowrite)
         End Select
@@ -1828,7 +1828,7 @@ Public Class FormularManagerNEU
 
         Select Case usrCntl.cboSprache._value
             Case "EN"
-                Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM_Zertifikate", listTowrite)
+                Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM_Zertifikate_ENG", listTowrite)
             Case Else
                 Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM_Zertifikate", listTowrite)
         End Select
diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb b/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb
index c040795c..be6a9326 100644
--- a/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb
@@ -227,6 +227,18 @@ Public Class cVERAG_CustomsDeclarations
             Dim cbamWhere As String = VERAG_PROG_ALLGEMEIN.cGreendeal_CBAM_Trn.BuildCBAMPatternWhereClause("i.zaItem_HSCode")
             Dim cbamWhereSnd As String = "  AND " & cbamWhere.Replace("i.zaItem_HSCode", "zaItem_HSCode")
 
+            Dim cbamWhereISOCntry As String = " i.zaItem_OriginCountry NOT IN (
+		        /*EU-27 (ISO2)*/
+		        'EU','AT','BE','BG','HR','CY','CZ','DK','EE','FI','FR',
+		        'DE','GR','HU','IE','IT','LV','LT','LU','MT','NL',
+		        'PL','PT','RO','SK','SI','ES','SE',
+		        /*Nicht CBAM-pflichtig (EU-ETS verknüpft / Ausnahmen)*/
+		        'CH', /* Schweiz */
+		        'NO', /* Norwegen */
+		        'IS', /* Island */
+		        'LI', /* Liechtenstein */
+		        'XI'  /* Nordirland (NI-Protokoll; im Warenverkehr EU-behandelt) */
+	        ) "
 
             ' ------------------------------------------------------------
             ' SQL: ZA-IDs ermitteln
@@ -247,7 +259,8 @@ Public Class cVERAG_CustomsDeclarations
             "  AND cast(z.za_DeclarationDate as date) >= @dateFrom " &
             "  AND cast(z.za_DeclarationDate  as date) <= @dateTo " &
            If(eoriIn <> "", "  AND p.zaParty_EORI IN (" & eoriIn & ") ", "") &
-            "  AND " & cbamWhere
+            "  AND " & cbamWhere &
+            "  AND " & cbamWhereISOCntry
 
             If indirect Then
                 sqlstr &= " AND (
@@ -265,6 +278,7 @@ Public Class cVERAG_CustomsDeclarations
                 sqlstr &= " AND z.za_System = @sys "
             End If
 
+
             Using conn = SQL.GetNewOpenConnectionFMZOLL()
                 Using cmd As New SqlCommand(sqlstr, conn)