merge

VERAG_PROG_ALLGEMEIN/Classes/cNCTSGestellungsadressen.vb

@@ -64,6 +64,10 @@ Public Class cNCTSGestellungsadressen
     Public Function SAVE() As Boolean
         Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
 
+        If Not VERAG_PROG_ALLGEMEIN.cProgramFunctions.ValidateSQLFieldLengths(list, "tblNCTSGestellungsadressen", "", "FMZOLL") Then
+            Return False
+        End If
+
 
         Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblNCTSGestellungsadressen WITH(updlock,serializable) WHERE nga_id=@nga_id) " &
                        " BEGIN " & getUpdateCmd() & " END " &

VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb

@@ -2512,7 +2512,7 @@ Public Class DATENVERVER_OPTIONS
     End Function
 
 
-    Public Shared Function addZugferdXML(pdfPath As String, xmlPath As String) As String
+    Public Shared Function addZugferdXML(pdfPath As String, xmlPath As String, Optional fixedIssuerAssignedID As Boolean = True) As String
 
 
         Dim tempFile As String = pdfPath & ".tmp"
@@ -2522,6 +2522,12 @@ Public Class DATENVERVER_OPTIONS
 
 
             Dim xmlBytes = File.ReadAllBytes(xmlPath)
+
+            If fixedIssuerAssignedID Then
+                fixIssuerAssignedID(xmlBytes)
+            End If
+
+
             Dim fileName As String = "factur-x.xml"
 
             If HasAttachment(pdf, fileName) Then
@@ -2557,6 +2563,75 @@ Public Class DATENVERVER_OPTIONS
 
     End Function
 
+
+
+    Public Shared Sub fixIssuerAssignedID(ByRef xmlBytes As Byte())
+
+
+        Dim xmlDoc As New System.Xml.XmlDocument()
+        xmlDoc.PreserveWhitespace = True
+
+        Using ms As New MemoryStream(xmlBytes)
+            xmlDoc.Load(ms)
+        End Using
+
+        Dim ns As New System.Xml.XmlNamespaceManager(xmlDoc.NameTable)
+
+        ns.AddNamespace(
+            "ram",
+            "urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+        )
+
+        Dim documents = xmlDoc.SelectNodes(
+            "//ram:AdditionalReferencedDocument",
+            ns
+        )
+
+        For Each document As XmlElement In documents
+
+            Dim idNode As XmlNode =
+                document.SelectSingleNode("ram:ID", ns)
+
+            If idNode Is Nothing Then
+                Continue For
+            End If
+
+            ' Wert der bisherigen ID merken
+            Dim idValue As String = idNode.InnerText
+
+            ' Neue IssuerAssignedID erzeugen
+            Dim issuerAssignedID As XmlElement =
+                xmlDoc.CreateElement(
+                    "ram",
+                    "IssuerAssignedID",
+                    "urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+                )
+
+            issuerAssignedID.InnerText = idValue
+
+            ' ID entfernen
+            document.RemoveChild(idNode)
+
+            ' IssuerAssignedID an ERSTE Stelle setzen
+            document.InsertBefore(
+                issuerAssignedID,
+                document.FirstChild
+            )
+
+        Next
+
+        Using ms As New MemoryStream()
+            xmlDoc.Save(ms)
+            xmlBytes = ms.ToArray()
+        End Using
+
+
+    End Sub
+
+
+
+
+
     Private Shared Function HasAttachment(pdf As iText.Kernel.Pdf.PdfDocument, fileName As String) As Boolean
 
         Dim catalog = pdf.GetCatalog().GetPdfObject()

VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_CustomsDeclarations.vb

@@ -225,7 +225,13 @@ Public Class cVERAG_CustomsDeclarations
             ' CBAM Pattern (HSCode)
             ' ------------------------------------------------------------
             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 cbamWhereSnd As String = "  AND " & cbamWhere.Replace("i.zaItem_HSCode", "zaItem_HSCode") &
+                " AND zaItem_OriginCountry NOT IN (
+                    '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',
+                    'CH','NO','IS','LI','XI'
+                )"
 
             Dim cbamWhereISOCntry As String = " i.zaItem_OriginCountry NOT IN (
 		        /*EU-27 (ISO2)*/