diff --git a/APPL/ALG/alg_edit_gebouw.asp b/APPL/ALG/alg_edit_gebouw.asp index aac428d226..29decbe633 100644 --- a/APPL/ALG/alg_edit_gebouw.asp +++ b/APPL/ALG/alg_edit_gebouw.asp @@ -188,7 +188,7 @@ else label: L("lcl_delivery_address"), adresKey: mld_adres, emptyOption: "", - filtcode: "A", + filtercode: "A", readonly: !this_alg.writeman }) ; manRWFIELD("bld_x", "fld", L("lcl_geoxcoord"), bld_x, {maxlength: 25}); diff --git a/APPL/BES/bes_edit_bestelling.asp b/APPL/BES/bes_edit_bestelling.asp index bef61a9fc0..da657c865a 100644 --- a/APPL/BES/bes_edit_bestelling.asp +++ b/APPL/BES/bes_edit_bestelling.asp @@ -713,7 +713,7 @@ else // nieuwe bestelling. Defaults bepalen label: L("lcl_delivery_address"), adresKey: bes_bestelling.mld_adres_key, emptyOption: "", - filtcode: "A", + filtercode: "A", autlevel: ALGreadlevel, onChange: "onChangeAdres", readonly: aflever_readonly || (adres_key > 0 && bes_key < 0), diff --git a/APPL/BES/bes_edit_opdr.asp b/APPL/BES/bes_edit_opdr.asp index 8f80f5c758..35c32c088f 100644 --- a/APPL/BES/bes_edit_opdr.asp +++ b/APPL/BES/bes_edit_opdr.asp @@ -214,7 +214,7 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key); label: L("lcl_bes_adres_lev"), adresKey: bes_bestelopdr.mld_adres_key_lev, emptyOption: (bes_bestelopdr.mld_adres_key_lev < 0? null : ""), - filtcode: "A", + filtercode: "A", autlevel: authparams.ALGreadlevel }) ; @@ -223,7 +223,7 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key); label: L("lcl_bes_adres_fac"), adresKey: bes_bestelopdr.mld_adres_key_fac, emptyOption: (bes_bestelopdr.mld_adres_key_fac < 0? null : ""), - filtcode: "F", + filtercode: "F", autlevel: authparams.ALGreadlevel }) ; RWTEXTAREATR("opmerk", "fldtxt", L("lcl_remark"), bes_bestelopdr.opmerking, {html: "rows='3'", suppressEmpty: true}); // Afhandeling, reden niet akkoord diff --git a/APPL/BES/opdr_search.asp b/APPL/BES/opdr_search.asp index 8feacaf760..ea0e9c5af5 100644 --- a/APPL/BES/opdr_search.asp +++ b/APPL/BES/opdr_search.asp @@ -130,7 +130,7 @@ oRs.Close(); autlevel: authparams.PRSreadlevel, // Was voorheen niet aanwezig whenEmpty: L("lcl_search_generic") // want filter }); - + // /* FCLTselector("adr_key", "SELECT mld_adres_key, mld_adres_naam" @@ -141,14 +141,14 @@ oRs.Close(); label : L("lcl_bes_del_place"), trclass: "secsearch" }); */ - FCLTadresselector("adr_key", "sgAdres", - { + FCLTadresselector("adr_key", "sgAdres", + { label: L("lcl_delivery_address"), /* zelfde als lcl_bes_del_place */ whenEmpty: L("lcl_search_generic"), - filtcode: "A", + filtercode: "A", trclass: "secsearch" - }) ; - + }) ; + %> diff --git a/APPL/MLD/mld_edit_melding.asp b/APPL/MLD/mld_edit_melding.asp index 95365135c8..09db3284f9 100644 --- a/APPL/MLD/mld_edit_melding.asp +++ b/APPL/MLD/mld_edit_melding.asp @@ -936,31 +936,12 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY"); { BLOCK_START("mldBes", L("lcl_aflevergegevens")); var ALGreadlevel = this_mld.authparams(autfunction)? this_mld.authparams(autfunction).ALGreadlevel : 9; - /* sql = "SELECT ma.mld_adres_key" - + " , ma.mld_adres_naam" - + " , ma.mld_adres_upper" - + " FROM mld_v_afleveradres ma" - + ((mld_key == -1 || this_mld.canAflChange) && ALGreadlevel >= 0 // Voor nieuwe melding bestaat canAflChange niet. - ? " WHERE ma.alg_locatie_key IN (SELECT alg_locatie_key FROM fac_v_my_locations" - + " WHERE prs_perslid_key = " + user_key - + " AND niveau = " + ALGreadlevel + ")" - : "") - + " ORDER BY mld_adres_upper"; - FCLTselector("del_address", sql, - { label: L("lcl_delivery_address"), - initKey: mld_melding.deladdress, - emptyOption: "", - readonly: (mld_key > 0 && !this_mld.canAflChange), - required: true - } - ); - */ FCLTadresselector("del_address", "sgAdres", { label: L("lcl_delivery_address"), adresKey: mld_melding.deladdress, emptyOption: "", - filtcode: "A", + filtercode: "A", autlevel: ALGreadlevel, readonly: (mld_key > 0 && !this_mld.canAflChange), required: true diff --git a/APPL/MLD/opdr_search.asp b/APPL/MLD/opdr_search.asp index 6267c244dc..75957b6d08 100644 --- a/APPL/MLD/opdr_search.asp +++ b/APPL/MLD/opdr_search.asp @@ -705,14 +705,14 @@ oRs.close(); if (anydeladr) { - // Afleveradres - FCLTadresselector("adr_key", "sgAdres", - { - label: L("lcl_delivery_address"), /* zelfde als lcl_bes_del_place */ - whenEmpty: L("lcl_search_generic"), - filtcode: "A", - trclass: "secsearch" - }) ; + // Afleveradres + FCLTadresselector("adr_key", "sgAdres", + { + label: L("lcl_delivery_address"), /* zelfde als lcl_bes_del_place */ + whenEmpty: L("lcl_search_generic"), + filtercode: "A", + trclass: "secsearch" + }) ; } %> diff --git a/APPL/PRS/prs_edit_afdeling.asp b/APPL/PRS/prs_edit_afdeling.asp index d15e50e6f5..3228d375f6 100644 --- a/APPL/PRS/prs_edit_afdeling.asp +++ b/APPL/PRS/prs_edit_afdeling.asp @@ -134,7 +134,7 @@ BLOCK_START("prsAfd", L("lcl_dep_name_level"+afd_niveau)); { label: L("lcl_delivery_address"), adresKey: mld_adres, - filtcode: "A", + filtercode: "A", emptyOption: "" }) ; diff --git a/APPL/PRS/prs_edit_bedrijf.asp b/APPL/PRS/prs_edit_bedrijf.asp index 67f74a580b..8c781ad05c 100644 --- a/APPL/PRS/prs_edit_bedrijf.asp +++ b/APPL/PRS/prs_edit_bedrijf.asp @@ -161,7 +161,7 @@ if (intern) label: L("lcl_prs_companies_adres_lev"), adresKey: bedrijf_info.mld_adres_key_lev, emptyOption: "", - filtcode: "A" + filtercode: "A" }) ; FCLTadresselector("mld_adrfkey", "sgAdres2", @@ -169,7 +169,7 @@ if (intern) label: L("lcl_prs_companies_adres_fac"), adresKey: bedrijf_info.mld_adres_key_fac, emptyOption: "", - filtcode: "F" + filtercode: "F" }) ; sql = "SELECT fin_btwtabel_key" diff --git a/APPL/PRS/prs_edit_perslid.asp b/APPL/PRS/prs_edit_perslid.asp index 30acf9b572..5939396066 100644 --- a/APPL/PRS/prs_edit_perslid.asp +++ b/APPL/PRS/prs_edit_perslid.asp @@ -347,7 +347,7 @@ BLOCK_START("prsPerslid2", L("lcl_prs_organisatieblok")); label: L("lcl_delivery_address"), adresKey: mld_adrkey, emptyOption: "", - filtcode: "A", + filtercode: "A", readonly: !prsauthparams.writeman }) ;