From 696df5c367612d760b496ca804519ed8b60c6bc3 Mon Sep 17 00:00:00 2001
From: Andreas Luxbauer <al@verag.ag>
Date: Fri, 12 Jun 2026 14:22:04 +0200
Subject: [PATCH] kvi rpt

---
 SDL/Resources/KVI_report_general.xlsx         | Bin 10280 -> 10318 bytes
 .../usrCntlSpeditionsBuchSuche.vb             |  64 ++++++++++--------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/SDL/Resources/KVI_report_general.xlsx b/SDL/Resources/KVI_report_general.xlsx
index 8498e850f9f72c2c721a2c1a8bdf87f7b2053468..160e9f010a9ebdb4fa49cff815acc66fb215afa9 100644
GIT binary patch
delta 2382
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
Am;e9(

delta 2348
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
SCsY9$lO-r42J9pN0000OPEQ2@

diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
index d46eae12..80d9cb21 100644
--- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
+++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
@@ -3304,7 +3304,7 @@ Public Class usrCntlSpeditionsBuchSuche
             Detailbericht = True
         End If
 
-        If kdnrsrch <0 Then
+        If kdnrsrch < 0 Then
 
             Dim inputKdNr = InputBox("Bitte KdNr eingeben", "Kundenauswertung generieren")
             If inputKdNr <> "" Then inputKdNr = inputKdNr.Trim()
@@ -3650,7 +3650,7 @@ Public Class usrCntlSpeditionsBuchSuche
                 RPT.RunReport_VERAG_ZA_DETAIL(770931, CDate(txtAbfertDat.Text), CDate(txtAbfertDatBis.Text))
 
             Else
-                RPT.RunReport_VERAG_ZA_GENERAL(770931, CDate(txtAbfertDat.Text), CDate(txtAbfertDatBis.Text))
+                RPT.RunReport_VERAG_ZA_GENERAL(770931, CDate(txtAbfertDat.Text), CDate(txtAbfertDatBis.Text),,, CheckBox5.Checked)
 
             End If
 
@@ -3974,8 +3974,7 @@ Class cSpeditionsbuchReport
                                               AbfVon As Date,
                                               AbfBis As Date,
                                               Optional whereStr As String = "",
-                                              Optional Open As Boolean = True,
-                                              Optional DL_Kosten As Boolean = False) As String
+                                              Optional Open As Boolean = True) As String
         Try
             Dim dt As DataTable = LoadSpeditionsbuchData(KDNR, AbfVon, AbfBis, whereStr)
             If dt Is Nothing OrElse dt.Rows.Count = 0 Then
@@ -3998,7 +3997,7 @@ Class cSpeditionsbuchReport
                 blatt = datei.Worksheets(1)
 
 
-                CreateDetailReport(blatt, dt, KDNR, DL_Kosten)
+                CreateDetailReport(blatt, dt, KDNR)
                 '       CreateGeneralReport(blatt, dt, KDNR, AbfVon, AbfBis)
 
 
@@ -4038,7 +4037,8 @@ Class cSpeditionsbuchReport
                                                AbfVon As Date,
                                                AbfBis As Date,
                                                Optional whereStr As String = "",
-                                               Optional Open As Boolean = True) As String
+                                               Optional Open As Boolean = True,
+                                              Optional DL_Kosten As Boolean = False) As String
         Try
             Dim dt As DataTable = LoadSpeditionsbuchData(KDNR, AbfVon, AbfBis, whereStr)
             If dt Is Nothing OrElse dt.Rows.Count = 0 Then
@@ -4061,7 +4061,7 @@ Class cSpeditionsbuchReport
                 blatt = datei.Worksheets(1)
 
 
-                CreateGeneralReport(blatt, dt, KDNR, AbfVon, AbfBis)
+                CreateGeneralReport(blatt, dt, KDNR, AbfVon, AbfBis, DL_Kosten)
 
 
                 datei.Save()
@@ -4161,7 +4161,7 @@ Class cSpeditionsbuchReport
         Return cd
     End Function
 
-    Private Sub CreateDetailReport(blatt As Object, dt As DataTable, kdnr As Integer, Optional DL_Kosten As Boolean = False)
+    Private Sub CreateDetailReport(blatt As Object, dt As DataTable, kdnr As Integer)
         Dim cnt As Integer = 2
 
         For Each r As DataRow In dt.Rows
@@ -4175,7 +4175,7 @@ Class cSpeditionsbuchReport
                            If(r("AbfertigungsNr"), "").ToString())
                 End If
                 's
-                WriteDetailReportRow(blatt, r, cd, cnt, kdnr, DL_Kosten)
+                WriteDetailReportRow(blatt, r, cd, cnt, kdnr)
 
             Catch ex As Exception
                 MsgBox(ex.Message & vbCrLf & ex.StackTrace)
@@ -4187,7 +4187,7 @@ Class cSpeditionsbuchReport
                                     dt As DataTable,
                                     kdnr As Integer,
                                     AbfVon As Date,
-                                    AbfBis As Date)
+                                    AbfBis As Date, Optional DL_Kosten As Boolean = False)
         blatt.Range("I1").Value = AbfVon.ToShortDateString & "-" & AbfBis.ToShortDateString
 
         Dim cnt As Integer = 3
@@ -4203,7 +4203,7 @@ Class cSpeditionsbuchReport
                            If(r("AbfertigungsNr"), "").ToString())
                 End If
 
-                WriteGeneralReportRow(blatt, r, cd, cnt, kdnr)
+                WriteGeneralReportRow(blatt, r, cd, cnt, kdnr, DL_Kosten)
 
             Catch ex As Exception
                 MsgBox(ex.Message & vbCrLf & ex.StackTrace)
@@ -4215,17 +4215,12 @@ Class cSpeditionsbuchReport
                                  r As DataRow,
                                  cd As cVERAG_CustomsDeclarations,
                                  ByRef cnt As Integer,
-                                 kdnrsrch As Integer,
-                                 Optional DL_Kosten As Boolean = False)
+                                 kdnrsrch As Integer)
 
         Dim kdAtrNr As String = NormalizeKdAuftragsNr(r("KdAuftragsNr"), kdnrsrch)
 
-        Dim dienstleistungsKosten As Decimal = 0D
 
-        If DL_Kosten Then
-            blatt.Range("AF1").Value = "Service Costs"
-            dienstleistungsKosten = GetDienstleistungskosten(r, kdnrsrch)
-        End If
+
 
         If cd IsNot Nothing AndAlso cd.hasEntry Then
 
@@ -4296,9 +4291,6 @@ Class cSpeditionsbuchReport
                     blatt.Range("AD" & cnt).Value = If(IsItemCBAM(item), "Y", "N")
                     blatt.Range("AE" & cnt).Value = item.GetInvoiceListString()
 
-                    If DL_Kosten Then
-                        blatt.Range("AF" & cnt).Value = dienstleistungsKosten
-                    End If
 
                     cnt += 1
 
@@ -4360,10 +4352,6 @@ Class cSpeditionsbuchReport
                 blatt.Range("AD" & cnt).Value = ""
                 blatt.Range("AE" & cnt).Value = ""
 
-                If DL_Kosten Then
-                    blatt.Range("AF" & cnt).Value = dienstleistungsKosten
-                End If
-
                 cnt += 1
 
             End If
@@ -4378,9 +4366,7 @@ Class cSpeditionsbuchReport
             blatt.Range("F" & cnt).Value = kdAtrNr
             blatt.Range("G" & cnt).Value = r("BelegNr")
 
-            If DL_Kosten Then
-                blatt.Range("AF" & cnt).Value = dienstleistungsKosten
-            End If
+
 
             cnt += 1
 
@@ -4521,10 +4507,19 @@ Class cSpeditionsbuchReport
                                       r As DataRow,
                                       cd As cVERAG_CustomsDeclarations,
                                       ByRef cnt As Integer,
-                                      kdnrsrch As Integer)
+                                      kdnrsrch As Integer,
+                                 Optional DL_Kosten As Boolean = False)
+
+        Dim dienstleistungsKosten As Decimal = 0D
+
+        If DL_Kosten Then
+            blatt.Range("P2").Value = "Service Costs"
+            dienstleistungsKosten = GetDienstleistungskosten(r, kdnrsrch)
+        End If
 
         Dim kdAtrNr As String = NormalizeKdAuftragsNr(r("KdAuftragsNr"), kdnrsrch)
 
+
         blatt.Range("A" & cnt).Value = cnt - 2
         blatt.Range("B" & cnt).Value = r("Abfertigungsnummer")
         blatt.Range("C" & cnt).Value = r("Abfertigungsdatum")
@@ -4545,8 +4540,19 @@ Class cSpeditionsbuchReport
             blatt.Range("M" & cnt).Value = GetPartyName(cd, cVERAG_CustomsDeclarations.DECLARANT_ROLES, "")
             blatt.Range("N" & cnt).Value = GetItemsDescription(cd)
             blatt.Range("O" & cnt).Value = cd.za_CountryDispatch & " --> " & cd.za_CountryDestination
+
+
+            If DL_Kosten Then
+                blatt.Range("P" & cnt).Value = dienstleistungsKosten
+            End If
+
+        Else
+            If DL_Kosten Then
+                blatt.Range("I" & cnt).Value = dienstleistungsKosten
+            End If
         End If
 
+
         cnt += 1
     End Sub