From 91748aac43084693ef27669052737cf5ef5e63b6 Mon Sep 17 00:00:00 2001
From: "d.breimaier" <d.breimaier@verag.ag>
Date: Thu, 24 Apr 2025 16:34:51 +0200
Subject: [PATCH] USTVAntrag

---
 SDL/SDL.vbproj                | 35 ++++++++++++++++++++++++++++-------
 SDL/USTV/frmMDM_USTVAntrag.vb | 22 ++++++++++++++++++----
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj
index 12f1da96..5fe0f7c0 100644
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -587,18 +587,31 @@
     <Compile Include="Creditsafe\frmCreditSafeSearch.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Creditsafe\frmVAT_ATEZ.Designer.vb">
+      <DependentUpon>frmVAT_ATEZ.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Creditsafe\frmVAT_ATEZ.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Creditsafe\usrcntlCreditsafe.Designer.vb">
       <DependentUpon>usrcntlCreditsafe.vb</DependentUpon>
     </Compile>
     <Compile Include="Creditsafe\usrcntlCreditsafe.vb">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="Creditsafe\usrcntlVAT_ATEZ.Designer.vb">
+      <DependentUpon>usrcntlVAT_ATEZ.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Creditsafe\usrcntlVAT_ATEZ.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="cServerClient.vb" />
     <Compile Include="cSourceListWrapper.vb" />
     <Compile Include="cSplitButton.vb">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="cSqlDb.vb" />
+    <Compile Include="Fakturierung\cAutomailversand.vb" />
     <Compile Include="Fakturierung\frmSendEmail.Designer.vb">
       <DependentUpon>frmSendEmail.vb</DependentUpon>
     </Compile>
@@ -779,6 +792,12 @@
     <Compile Include="kunden\frmGoMautBoxen_Bestellung.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="kunden\frmKundenLinkedGruppe.Designer.vb">
+      <DependentUpon>frmKundenLinkedGruppe.vb</DependentUpon>
+    </Compile>
+    <Compile Include="kunden\frmKundenLinkedGruppe.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="kunden\frmKundenTOBBKdNr.Designer.vb">
       <DependentUpon>frmKundenTOBBKdNr.vb</DependentUpon>
     </Compile>
@@ -875,10 +894,6 @@
     <Compile Include="mdm\Besuchsberichte\usrCntlBesuchsberichte.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="mdm\frmDatumsabfrage.Designer.vb">
-      <DependentUpon>frmDatumsabfrage.vb</DependentUpon>
-    </Compile>
-    <Compile Include="mdm\frmDatumsabfrage.vb" />
     <Compile Include="mdm\frmMDMLieferantenrechnungen.Designer.vb">
       <DependentUpon>frmMDMLieferantenrechnungen.vb</DependentUpon>
     </Compile>
@@ -3257,9 +3272,15 @@
     <EmbeddedResource Include="Creditsafe\frmCreditSafeSearch.resx">
       <DependentUpon>frmCreditSafeSearch.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Creditsafe\frmVAT_ATEZ.resx">
+      <DependentUpon>frmVAT_ATEZ.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Creditsafe\usrcntlCreditsafe.resx">
       <DependentUpon>usrcntlCreditsafe.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Creditsafe\usrcntlVAT_ATEZ.resx">
+      <DependentUpon>usrcntlVAT_ATEZ.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Fakturierung\frmSendEmail.resx">
       <DependentUpon>frmSendEmail.vb</DependentUpon>
     </EmbeddedResource>
@@ -3351,6 +3372,9 @@
     <EmbeddedResource Include="kunden\frmGoMautBoxen_Bestellung.resx">
       <DependentUpon>frmGoMautBoxen_Bestellung.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="kunden\frmKundenLinkedGruppe.resx">
+      <DependentUpon>frmKundenLinkedGruppe.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="kunden\frmKundenTOBBKdNr.resx">
       <DependentUpon>frmKundenTOBBKdNr.vb</DependentUpon>
     </EmbeddedResource>
@@ -3399,9 +3423,6 @@
     <EmbeddedResource Include="mdm\Besuchsberichte\usrCntlBesuchsberichte.resx">
       <DependentUpon>usrCntlBesuchsberichte.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="mdm\frmDatumsabfrage.resx">
-      <DependentUpon>frmDatumsabfrage.vb</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="mdm\frmMDMLieferantenrechnungen.resx">
       <DependentUpon>frmMDMLieferantenrechnungen.vb</DependentUpon>
     </EmbeddedResource>
diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb
index 05c85533..9858e89f 100644
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -729,14 +729,28 @@ Public Class frmMDM_USTVAntrag
 
                         Select Case Antrag_LandKz
                             Case "DK"
-                                leistenderName = "A/S Storebealt"
-                            Case Else
-                                If ANTRAG.plose_Lieferant = "SOFICO BELGIO" Then
-                                    leistenderName = "Sofico"
+                                If IsDBNull(ANTRAG.plose_Lieferant) Then
+                                    leistenderName = "A/S Storebealt"
                                 Else
                                     leistenderName = ANTRAG.plose_Lieferant
                                 End If
 
+                            Case "SE"
+                                If IsDBNull(ANTRAG.plose_Lieferant) Then
+                                    leistenderName = "Oresundsbro konsortiet I/S"
+                                Else
+                                    leistenderName = ANTRAG.plose_Lieferant
+                                End If
+
+                            Case Else
+                                If Not IsDBNull(ANTRAG.plose_Lieferant) Then
+                                    If ANTRAG.plose_Lieferant IsNot Nothing AndAlso ANTRAG.plose_Lieferant = "SOFICO BELGIO" Then
+                                        leistenderName = "Sofico"
+                                    Else
+                                        leistenderName = ANTRAG.plose_Lieferant
+                                    End If
+                                End If
+
                         End Select