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

This commit is contained in:
2026-04-16 16:04:02 +02:00
11 changed files with 177 additions and 56 deletions

View File

@@ -685,6 +685,27 @@ Public Class cVERAG_CustomsDeclarations
End Sub
Public Function GetInvoiceListString() As String
If Documents Is Nothing OrElse Documents.Count = 0 Then Return ""
Dim result = Documents.
Where(Function(d) Not d Is Nothing AndAlso
(d.zaDoc_Code = "N380" OrElse d.zaDoc_Code = "N325")).
Select(Function(d)
Dim datum As String = If(String.IsNullOrWhiteSpace(d.zaDoc_Date), "", d.zaDoc_Date.Trim())
Dim ref As String = If(String.IsNullOrWhiteSpace(d.zaDoc_Reference), "", d.zaDoc_Reference.Trim())
' Format: "Datum Referenz"
Return (datum & " " & ref).Trim()
End Function).
Where(Function(s) Not String.IsNullOrWhiteSpace(s)).
Distinct().
ToList()
Return String.Join(", ", result)
End Function
Public Function getCBAM_KG(EORI As String, von As Date, bis As Date, Optional without_MRN As String = "", Optional isDeclarant As Boolean = False) As Decimal
Try
If EORI = "" Then Return 0
@@ -1094,6 +1115,28 @@ Public Class cVERAG_CustomsDeclarations_Item
Return result
End Function
Public Function GetInvoiceListString() As String
If Documents Is Nothing OrElse Documents.Count = 0 Then Return ""
Dim result = Documents.
Where(Function(d) Not d Is Nothing AndAlso
(d.zaDoc_Code = "N380" OrElse d.zaDoc_Code = "N325")).
Select(Function(d)
Dim datum As String = If(String.IsNullOrWhiteSpace(d.zaDoc_Date), "", d.zaDoc_Date.Trim())
Dim ref As String = If(String.IsNullOrWhiteSpace(d.zaDoc_Reference), "", d.zaDoc_Reference.Trim())
' Format: "Datum Referenz"
Return (datum & " " & ref).Trim()
End Function).
Where(Function(s) Not String.IsNullOrWhiteSpace(s)).
Distinct().
ToList()
Return String.Join(", ", result)
End Function
End Class
' ##########################################################