diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb index afee44d..9ebcdee 100644 --- a/Customers/Invoices.aspx.vb +++ b/Customers/Invoices.aspx.vb @@ -353,6 +353,9 @@ Partial Class Customers_Default3 dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Integer.Parse(reNr), Absender, Empfaenger, LKWNR, KDNAFNR) ElseIf String.IsNullOrEmpty(Kdnrtext) = False AndAlso String.IsNullOrEmpty(datevon.ToShortDateString) = False AndAlso String.IsNullOrEmpty(datebis.ToShortDateString) = False And reNr = "" Then dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) + ElseIf String.IsNullOrEmpty(Kdnrtext) = False AndAlso String.IsNullOrEmpty(datevon.ToShortDateString) = False AndAlso String.IsNullOrEmpty(datebis.ToShortDateString) = False And reNr = "" And Absender = "" Then + dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Nothing, Nothing, Empfaenger, LKWNR, KDNAFNR) + Else valreq_pickdate1.Validate() valreq_pickdate2.Validate() If valreq_pickdate1.IsValid = False AndAlso valreq_pickdate2.IsValid = False Then @@ -422,12 +425,12 @@ Partial Class Customers_Default3 tbl_Cell_Empfaenger.Text = d.EmpfängerName_1.ToString End If tr.Cells.Add(tbl_Cell_Empfaenger) - Dim btn As New ImageButton + Dim btn As New ImageButton btn.ViewStateMode = ViewStateMode.Enabled btn.CssClass = "btn btn-primary" btn.ImageUrl = "../images/pdficon.gif" btn.Attributes.Add("href", "pdfviewer.aspx?P1=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.FilialenNr).ToString() + "&P2=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.AbfertigungsNr).ToString + "&P3=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.RK_ID).ToString) - btn.Attributes.Add("target", "_blank") + btn.Attributes.Add("Target", "_blank") btn.PostBackUrl = "pdfviewer.aspx?P1=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.FilialenNr).ToString + "&P2=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.AbfertigungsNr).ToString + "&P3=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.RK_ID).ToString tbl_Cell_Info.ValidateRequestMode = UI.ValidateRequestMode.Enabled tbl_Cell_Info.Controls.Add(btn)