admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HPJI#40743 adresselector.inc verwacht filtercode, geen filtcode.

Browse Source 
svn path=/Website/trunk/; revision=35108
This commit is contained in:
Jos Groot Lipman
2017-08-28 09:54:40 +00:00
parent 79d084551d
commit 9b7f7611a8
9 changed files with 23 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/ALG/alg_edit_gebouw.asp
View File

@@ -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});

2
APPL/BES/bes_edit_bestelling.asp
View File

@@ -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),

4
APPL/BES/bes_edit_opdr.asp
View File

@@ -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

2
APPL/BES/opdr_search.asp
View File

@@ -145,7 +145,7 @@ oRs.Close();
{
label: L("lcl_delivery_address"), /* zelfde als lcl_bes_del_place */
whenEmpty: L("lcl_search_generic"),
filtcode: "A",
filtercode: "A",
trclass: "secsearch"
}) ;

21
APPL/MLD/mld_edit_melding.asp
View File

@@ -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

16
APPL/MLD/opdr_search.asp
View File

@@ -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"
}) ;
}
%>

2
APPL/PRS/prs_edit_afdeling.asp
View File

@@ -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: ""
}) ;

4
APPL/PRS/prs_edit_bedrijf.asp
View File

@@ -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"

2
APPL/PRS/prs_edit_perslid.asp
View File

@@ -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
}) ;