diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx index 9efe1ab..088f776 100644 --- a/Customers/Invoices.aspx +++ b/Customers/Invoices.aspx @@ -110,7 +110,7 @@
- + @@ -142,7 +142,7 @@ - + @@ -184,7 +184,7 @@
- +
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb index f349323..f99e71d 100644 --- a/Customers/Invoices.aspx.vb +++ b/Customers/Invoices.aspx.vb @@ -33,8 +33,8 @@ Partial Class Customers_Invoices normaltable.EnableViewState = True lbl_von.Visible = True lbl_bis.Visible = True - valDateRange_1.Enabled = True - valDateRange_2.Enabled = True + 'valDateRange_1.Enabled = True + 'valDateRange_2.Enabled = True Dim erster = New Date(Now().Year, Now().Month, 1) Dim ersterdat = "1." + Now().Month.ToString + "." + Now().Year.ToString pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString @@ -162,15 +162,15 @@ Partial Class Customers_Invoices reNr = "" End Sub - Protected Sub Send_Data_Click(sender As Object, e As EventArgs) + Protected Sub btn_Send_Data_Click(sender As Object, e As EventArgs) dt = Nothing valreq_pickdate1.Validate() valreq_pickdate2.Validate() If valreq_pickdate1.IsValid And valreq_pickdate2.IsValid And Kdnrtext = Not "" Then - valDateRange_1.Validate() - valDateRange_2.Validate() - If valDateRange_1.IsValid And valDateRange_2.IsValid Then - If Not String.IsNullOrEmpty(txt_Absender.Text) Then + ' valDateRange_1.Validate() + 'valDateRange_2.Validate() + 'If valDateRange_1.IsValid And valDateRange_2.IsValid Then + If Not String.IsNullOrEmpty(txt_Absender.Text) Then regexval_txt_Absender.Enabled = True regexval_txt_Absender.Validate() txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled @@ -304,13 +304,13 @@ Partial Class Customers_Invoices End Try End If - 'lbl_status.Text=Kdnrtext) - If String.IsNullOrEmpty(Kdnrtext) = False And String.IsNullOrEmpty(datevon.ToString) = False And String.IsNullOrEmpty(datebis.ToString) = False Then - dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Integer.Parse(reNr), Absender, Empfaenger, LKWNR, KDNAFNR) - ElseIf String.IsNullOrEmpty(Kdnrtext) = True Or String.IsNullOrEmpty(datevon.ToString) = True And String.IsNullOrEmpty(datebis.ToString) = True And String.IsNullOrEmpty(reNr) = True And String.IsNullOrEmpty(Absender) = False And String.IsNullOrEmpty(LKWNR) = False And String.IsNullOrEmpty(Empfaenger) = False And String.IsNullOrEmpty(KDNAFNR) = False Then - - valreq_pickdate1.Validate() - valreq_pickdate2.Validate() + 'lbl_status.Text = Kdnrtext + If String.IsNullOrEmpty(Kdnrtext) = False And String.IsNullOrEmpty(datevon.ToString) = False And String.IsNullOrEmpty(datebis.ToString) = False Then + dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Integer.Parse(reNr), Absender, Empfaenger, LKWNR, KDNAFNR) + ElseIf String.IsNullOrEmpty(Kdnrtext) = True And String.IsNullOrEmpty(datevon.ToString) = True And String.IsNullOrEmpty(datebis.ToString) = True And String.IsNullOrEmpty(reNr) = True And String.IsNullOrEmpty(Absender) = False And String.IsNullOrEmpty(LKWNR) = False And String.IsNullOrEmpty(Empfaenger) = False And String.IsNullOrEmpty(KDNAFNR) = False Then + lbl_status.Text = "Bitte alle fehlenden Felder ausfüllen!" + valreq_pickdate1.Validate() + valreq_pickdate2.Validate() End If If dt IsNot Nothing AndAlso Not dt.Count = 0 Then @@ -380,6 +380,6 @@ Partial Class Customers_Invoices Else lbl_status.Text = "Error in valid date room" End If - End If + 'End If End Sub End Class