From 4b0bc6bc9da35242eee58410c9da1f3db5c7dbed Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 20 Sep 2021 14:18:07 +0200
Subject: [PATCH] Update If bedingungen zur fallgenauen Unterscheidung

---
 Customers/CustomsAviso.aspx.vb | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 54c297c..3c5e270 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -154,24 +154,28 @@ Partial Class Kundenbereich_Default
         Kdnrtext = Session.Item("CustomerID").ToString
 
         dt = Nothing
-        If txt_Absender.Text IsNot "" Or txt_Absender_M.Text IsNot "" Then
+        If txt_Absender.Text IsNot "" Then
             txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             Absender = txt_Absender.Text
-            txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
-            Absender = txt_Absender_M.Text
-        ElseIf txt_Empfaenger.Text IsNot "" Or txt_Empfaenger_M.Text IsNot "" Then
+        ElseIf txt_Empfaenger.Text IsNot "" Then
             txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             Empfaenger = txt_Empfaenger.Text
-            txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
-            Empfaenger = txt_Empfaenger_M.Text
-        ElseIf txt_KdNrAuftrag.Text IsNot "" Or txt_KdNrAuftrag_M.Text IsNot "" Then
+        ElseIf txt_KdNrAuftrag.Text IsNot "" Then
             txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             KDNAFNR = txt_KdNrAuftrag.Text
-            txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
-            KDNAFNR = txt_KdNrAuftrag_M.Text
-        ElseIf txt_LKWNr.Text IsNot "" Or txt_LKWNr_M.Text IsNot "" Then
+        ElseIf txt_LKWNr.Text IsNot "" Then
             txt_LKWNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             LKWNR = txt_LKWNr.Text
+        ElseIf txt_Absender_M.Text IsNot "" Then
+            txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+            Absender = txt_Absender_M.Text
+        ElseIf txt_Empfaenger_M.Text IsNot "" Then
+            txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+            Empfaenger = txt_Empfaenger_M.Text
+        ElseIf txt_KdNrAuftrag_M.Text IsNot "" Then
+            txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+            KDNAFNR = txt_KdNrAuftrag_M.Text
+        ElseIf txt_LKWNr_M.Text IsNot "" Then
             txt_LKWNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             LKWNR = txt_LKWNr_M.Text
         End If