This commit is contained in:
2019-10-31 09:23:20 +01:00
parent 021cce6f04
commit c5595a729a
169 changed files with 16226 additions and 3376 deletions

View File

@@ -272,10 +272,11 @@ Public Class KdSearchBox
SQLstr &= " AND ( Ordnungsbegriff LIKE '" & srch & "%' OR AdressenNr LIKE '" & srch & "%' ) "
If srch2 <> "" Then SQLstr &= " AND ( PLZ LIKE '" & srch2 & "%' OR Ort LIKE '" & srch2 & "%' OR LandKz LIKE '" & srch2 & "%' OR Straße LIKE '" & srch2 & "%' ) "
SQLstr &= " AND [Auswahl]='A' "
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
SQLstr &= " AND [FilialenNr]='5501' "
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" Then
SQLstr &= " AND [FilialenNr]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "' "
Else
SQLstr &= " AND isnull([FilialenNr],0)<>'5501' "
'SQLstr &= " AND isnull([FilialenNr],0)<>'5501' "
SQLstr &= " AND isnull([FilialenNr],0) NOT IN ('5501','5601','5701','5801') "
End If
If Not _displayWoelflKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%'"
SQLstr &= " order by Ordnungsbegriff "
@@ -313,10 +314,11 @@ Public Class KdSearchBox
SQLstr &= " AND ( Ordnungsbegriff LIKE '" & srch & "%' OR AdressenNr LIKE '" & srch & "%' ) "
If srch2 <> "" Then SQLstr &= " AND ( PLZ LIKE '" & srch2 & "%' OR Ort LIKE '" & srch2 & "%' OR LandKz LIKE '" & srch2 & "%' OR Straße LIKE '" & srch2 & "%' ) "
SQLstr &= " AND [Auswahl]='I' "
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
SQLstr &= " AND [FilialenNr]='5501' "
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" Then
SQLstr &= " AND [FilialenNr]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "' "
Else
SQLstr &= " AND isnull([FilialenNr],0)<>'5501' "
'SQLstr &= " AND isnull([FilialenNr],0)<>'5501' "
SQLstr &= " AND isnull([FilialenNr],0) NOT IN ('5501','5601','5701','5801') "
End If
If Not _displayWoelflKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%'"
SQLstr &= " order by Ordnungsbegriff "