diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index aabf73e..4285c91 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -92,7 +92,7 @@
Freigabe
-
+
@@ -223,7 +246,12 @@
} else {
$("#container2").hide();
}
- });
+ });
+ });
+
+
+ });
+
\ No newline at end of file
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 1b2ac21..a57ec97 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -44,39 +44,37 @@ Partial Class Kundenbereich_Default
Kdnrtext = Session.Item("CustomerID").ToString
dt = Nothing
- If txt_Absender.Text IsNot "" Then
+ If txt_Absender.Text IsNot "" Or txt_Absender_M.Text IsNot "" Then
txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Absender = txt_Absender.Text
- ElseIf txt_Empfaenger.Text IsNot "" Then
+ txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+ Absender = txt_Absender_M.Text
+ ElseIf txt_Empfaenger.Text IsNot "" Or txt_Empfaenger_M.Text IsNot "" Then
txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Empfaenger = txt_Empfaenger.Text
- ElseIf txt_KdNrAuftrag.Text IsNot "" Then
+ txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+ Empfaenger = txt_Empfaenger_M.Text
+ ElseIf txt_KdNrAuftrag.Text IsNot "" Or txt_KdNrAuftrag_M.Text IsNot "" Then
txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
KDNAFNR = txt_KdNrAuftrag.Text
- ElseIf txt_LKWNr.Text IsNot "" Then
+ txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+ KDNAFNR = txt_KdNrAuftrag_M.Text
+ ElseIf txt_LKWNr.Text IsNot "" Or txt_LKWNr_M.Text IsNot "" Then
txt_LKWNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
LKWNR = txt_LKWNr.Text
+ txt_LKWNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+ LKWNR = txt_LKWNr_M.Text
End If
'Dim tr
If rbt_Alle.Selected = True Or rbt_Alle_M.Selected = True Then
- If pickdate1.Text = Nothing AndAlso pickdate2.Text = Nothing Then
- MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
-
- pickdate1.BackColor = Drawing.Color.Aqua
- pickdate2.BackColor = Drawing.Color.Aqua
- lbl_von.BackColor = Drawing.Color.Red
- lbl_bis.BackColor = Drawing.Color.Red
- Else
- If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
- Try
- datevon = Date.Parse(pickdate1.Text)
- datebis = Date.Parse(pickdate2.Text)
- Catch ex As Exception
- MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
- End Try
- End If
- Return
+ If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
+ Try
+ datevon = Date.Parse(pickdate1.Text)
+ datebis = Date.Parse(pickdate2.Text)
+ Catch ex As Exception
+ MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
+ End Try
End If
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)