diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 2c38035e..523e6988 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index 63b78917..1705ddf3 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -1395,7 +1395,7 @@ Public Class usrCntlSpeditionsBuchSuche End If rpt.Label11.Text = "" - If rpt.Fields.Item("Grenzstelle").Value IsNot Nothing Then + If rpt.Fields.Item("Grenzstelle").Value IsNot Nothing AndAlso rpt.Fields.Item("Grenzstelle").Value IsNot DBNull.Value Then If rpt.Fields.Item("Grenzstelle").Value.Replace("???", "").Replace("WO_FREMD", "") = "" Then rpt.Label11.Text = SQL.getValueTxtBySql("SELECT Code +' - ' + [Description] FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(rpt.Fields.Item("Zollstelle").Value, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")