This commit is contained in:
2019-11-06 16:33:03 +01:00
parent c5595a729a
commit 99ba5f4513
17 changed files with 521 additions and 92 deletions

View File

@@ -272,7 +272,7 @@ 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 <> "VERAG" Then
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "ATILLA" Then
SQLstr &= " AND [FilialenNr]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "' "
Else
'SQLstr &= " AND isnull([FilialenNr],0)<>'5501' "
@@ -314,7 +314,7 @@ 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 <> "VERAG" Then
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "ATILLA" Then
SQLstr &= " AND [FilialenNr]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "' "
Else
'SQLstr &= " AND isnull([FilialenNr],0)<>'5501' "