FSN#37938 m adressen via suggest

svn path=/Website/trunk/; revision=31745

APPL/Shared/Suggest/SuggestAdres.asp

@@ -14,7 +14,7 @@
                                   'A': Filter op afleveradressen
     Globals:
     Context:
-    Note:								UNDER CONSTRUCTION
+    Note:
 */ %>
 
 <%
@@ -24,7 +24,6 @@ JSON_Result = true;
 <!-- #include file="../../Shared/common.inc" -->
 <!-- #include file="./suggest.inc" -->
 <!-- #include file="./adresFilter.inc" -->
-
 <%
 var chars = getQParam("k", "");
 var autlevel = getQParamInt("autlevel", -1);
@@ -36,32 +35,25 @@ var locatie = getQParamInt("locatie", -1);
 chars = chars.replace(/\*/g,"%");
 
 var params = {
-							autlevel: autlevel,
+			  autlevel: autlevel,
               locatie: locatie
              };
 var filtClause = getFiltClauseAdres(filtcode, params);
 
 var extraInf = getExtraInfadres(extracode);
 
-if (autlevel > -1) // Deze is gemakkelijk
-{
-  filtClause +=" AND b.prs_bedrijf_key = " + user.afdeling().prs_bedrijf_key();
-}
-
-
   sql = "SELECT m.mld_adres_key"
-      + ", mld_adres_naam naam"
-      + ", COALESCE(mld_adres_bezoek_plaats, ' ') plts"
-      + ", COALESCE(mld_adres_bezoek_adres, ' ') straat"
+      + ",      mld_adres_naam naam"
+      + ",      COALESCE(mld_adres_bezoek_plaats, ' ') plts"
+      + ",      COALESCE(mld_adres_bezoek_adres, ' ') straat"
       + extraInf
-      + ", m.mld_adres_upper"
-      + " FROM mld_adres m"
+      + ",      m.mld_adres_upper"
+      + " FROM  mld_adres m"
       + " WHERE (mld_adres_upper LIKE " + safe.quoted_sql_wild(chars + "%")
-      + " OR mld_adres_bezoek_postcode LIKE " + safe.quoted_sql_wild(chars + "%")
-      + " OR UPPER(mld_adres_bezoek_adres) LIKE " + safe.quoted_sql_wild(chars + "%") +") "
+      + "    OR mld_adres_bezoek_postcode LIKE " + safe.quoted_sql_wild(chars + "%")
+      + "    OR UPPER(mld_adres_bezoek_adres) LIKE " + safe.quoted_sql_wild(chars + "%") +") "
       + filtClause
       + " ORDER BY m.mld_adres_upper ";
 
-
 WriteResult(sql, bAll, "naam", "mld_adres_key", "straat", "extra");
 %>