HPJI#40743 adresselector.inc verwacht filtercode, geen filtcode.
svn path=/Website/trunk/; revision=35108
This commit is contained in:
@@ -188,7 +188,7 @@ else
|
|||||||
label: L("lcl_delivery_address"),
|
label: L("lcl_delivery_address"),
|
||||||
adresKey: mld_adres,
|
adresKey: mld_adres,
|
||||||
emptyOption: "",
|
emptyOption: "",
|
||||||
filtcode: "A",
|
filtercode: "A",
|
||||||
readonly: !this_alg.writeman
|
readonly: !this_alg.writeman
|
||||||
}) ;
|
}) ;
|
||||||
manRWFIELD("bld_x", "fld", L("lcl_geoxcoord"), bld_x, {maxlength: 25});
|
manRWFIELD("bld_x", "fld", L("lcl_geoxcoord"), bld_x, {maxlength: 25});
|
||||||
|
|||||||
@@ -713,7 +713,7 @@ else // nieuwe bestelling. Defaults bepalen
|
|||||||
label: L("lcl_delivery_address"),
|
label: L("lcl_delivery_address"),
|
||||||
adresKey: bes_bestelling.mld_adres_key,
|
adresKey: bes_bestelling.mld_adres_key,
|
||||||
emptyOption: "",
|
emptyOption: "",
|
||||||
filtcode: "A",
|
filtercode: "A",
|
||||||
autlevel: ALGreadlevel,
|
autlevel: ALGreadlevel,
|
||||||
onChange: "onChangeAdres",
|
onChange: "onChangeAdres",
|
||||||
readonly: aflever_readonly || (adres_key > 0 && bes_key < 0),
|
readonly: aflever_readonly || (adres_key > 0 && bes_key < 0),
|
||||||
|
|||||||
@@ -214,7 +214,7 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key);
|
|||||||
label: L("lcl_bes_adres_lev"),
|
label: L("lcl_bes_adres_lev"),
|
||||||
adresKey: bes_bestelopdr.mld_adres_key_lev,
|
adresKey: bes_bestelopdr.mld_adres_key_lev,
|
||||||
emptyOption: (bes_bestelopdr.mld_adres_key_lev < 0? null : ""),
|
emptyOption: (bes_bestelopdr.mld_adres_key_lev < 0? null : ""),
|
||||||
filtcode: "A",
|
filtercode: "A",
|
||||||
autlevel: authparams.ALGreadlevel
|
autlevel: authparams.ALGreadlevel
|
||||||
}) ;
|
}) ;
|
||||||
|
|
||||||
@@ -223,7 +223,7 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key);
|
|||||||
label: L("lcl_bes_adres_fac"),
|
label: L("lcl_bes_adres_fac"),
|
||||||
adresKey: bes_bestelopdr.mld_adres_key_fac,
|
adresKey: bes_bestelopdr.mld_adres_key_fac,
|
||||||
emptyOption: (bes_bestelopdr.mld_adres_key_fac < 0? null : ""),
|
emptyOption: (bes_bestelopdr.mld_adres_key_fac < 0? null : ""),
|
||||||
filtcode: "F",
|
filtercode: "F",
|
||||||
autlevel: authparams.ALGreadlevel
|
autlevel: authparams.ALGreadlevel
|
||||||
}) ;
|
}) ;
|
||||||
RWTEXTAREATR("opmerk", "fldtxt", L("lcl_remark"), bes_bestelopdr.opmerking, {html: "rows='3'", suppressEmpty: true}); // Afhandeling, reden niet akkoord
|
RWTEXTAREATR("opmerk", "fldtxt", L("lcl_remark"), bes_bestelopdr.opmerking, {html: "rows='3'", suppressEmpty: true}); // Afhandeling, reden niet akkoord
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ oRs.Close();
|
|||||||
autlevel: authparams.PRSreadlevel, // Was voorheen niet aanwezig
|
autlevel: authparams.PRSreadlevel, // Was voorheen niet aanwezig
|
||||||
whenEmpty: L("lcl_search_generic") // want filter
|
whenEmpty: L("lcl_search_generic") // want filter
|
||||||
});
|
});
|
||||||
|
|
||||||
// <!-- Afleveradres -->
|
// <!-- Afleveradres -->
|
||||||
/* FCLTselector("adr_key",
|
/* FCLTselector("adr_key",
|
||||||
"SELECT mld_adres_key, mld_adres_naam"
|
"SELECT mld_adres_key, mld_adres_naam"
|
||||||
@@ -141,14 +141,14 @@ oRs.Close();
|
|||||||
label : L("lcl_bes_del_place"),
|
label : L("lcl_bes_del_place"),
|
||||||
trclass: "secsearch"
|
trclass: "secsearch"
|
||||||
}); */
|
}); */
|
||||||
FCLTadresselector("adr_key", "sgAdres",
|
FCLTadresselector("adr_key", "sgAdres",
|
||||||
{
|
{
|
||||||
label: L("lcl_delivery_address"), /* zelfde als lcl_bes_del_place */
|
label: L("lcl_delivery_address"), /* zelfde als lcl_bes_del_place */
|
||||||
whenEmpty: L("lcl_search_generic"),
|
whenEmpty: L("lcl_search_generic"),
|
||||||
filtcode: "A",
|
filtercode: "A",
|
||||||
trclass: "secsearch"
|
trclass: "secsearch"
|
||||||
}) ;
|
}) ;
|
||||||
|
|
||||||
%>
|
%>
|
||||||
</table>
|
</table>
|
||||||
</td><!-- end column 1 -->
|
</td><!-- end column 1 -->
|
||||||
|
|||||||
@@ -936,31 +936,12 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
|
|||||||
{
|
{
|
||||||
BLOCK_START("mldBes", L("lcl_aflevergegevens"));
|
BLOCK_START("mldBes", L("lcl_aflevergegevens"));
|
||||||
var ALGreadlevel = this_mld.authparams(autfunction)? this_mld.authparams(autfunction).ALGreadlevel : 9;
|
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",
|
FCLTadresselector("del_address", "sgAdres",
|
||||||
{
|
{
|
||||||
label: L("lcl_delivery_address"),
|
label: L("lcl_delivery_address"),
|
||||||
adresKey: mld_melding.deladdress,
|
adresKey: mld_melding.deladdress,
|
||||||
emptyOption: "",
|
emptyOption: "",
|
||||||
filtcode: "A",
|
filtercode: "A",
|
||||||
autlevel: ALGreadlevel,
|
autlevel: ALGreadlevel,
|
||||||
readonly: (mld_key > 0 && !this_mld.canAflChange),
|
readonly: (mld_key > 0 && !this_mld.canAflChange),
|
||||||
required: true
|
required: true
|
||||||
|
|||||||
@@ -705,14 +705,14 @@ oRs.close();
|
|||||||
|
|
||||||
if (anydeladr)
|
if (anydeladr)
|
||||||
{
|
{
|
||||||
// Afleveradres
|
// Afleveradres
|
||||||
FCLTadresselector("adr_key", "sgAdres",
|
FCLTadresselector("adr_key", "sgAdres",
|
||||||
{
|
{
|
||||||
label: L("lcl_delivery_address"), /* zelfde als lcl_bes_del_place */
|
label: L("lcl_delivery_address"), /* zelfde als lcl_bes_del_place */
|
||||||
whenEmpty: L("lcl_search_generic"),
|
whenEmpty: L("lcl_search_generic"),
|
||||||
filtcode: "A",
|
filtercode: "A",
|
||||||
trclass: "secsearch"
|
trclass: "secsearch"
|
||||||
}) ;
|
}) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
%>
|
%>
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ BLOCK_START("prsAfd", L("lcl_dep_name_level"+afd_niveau));
|
|||||||
{
|
{
|
||||||
label: L("lcl_delivery_address"),
|
label: L("lcl_delivery_address"),
|
||||||
adresKey: mld_adres,
|
adresKey: mld_adres,
|
||||||
filtcode: "A",
|
filtercode: "A",
|
||||||
emptyOption: ""
|
emptyOption: ""
|
||||||
}) ;
|
}) ;
|
||||||
|
|
||||||
|
|||||||
@@ -161,7 +161,7 @@ if (intern)
|
|||||||
label: L("lcl_prs_companies_adres_lev"),
|
label: L("lcl_prs_companies_adres_lev"),
|
||||||
adresKey: bedrijf_info.mld_adres_key_lev,
|
adresKey: bedrijf_info.mld_adres_key_lev,
|
||||||
emptyOption: "",
|
emptyOption: "",
|
||||||
filtcode: "A"
|
filtercode: "A"
|
||||||
}) ;
|
}) ;
|
||||||
|
|
||||||
FCLTadresselector("mld_adrfkey", "sgAdres2",
|
FCLTadresselector("mld_adrfkey", "sgAdres2",
|
||||||
@@ -169,7 +169,7 @@ if (intern)
|
|||||||
label: L("lcl_prs_companies_adres_fac"),
|
label: L("lcl_prs_companies_adres_fac"),
|
||||||
adresKey: bedrijf_info.mld_adres_key_fac,
|
adresKey: bedrijf_info.mld_adres_key_fac,
|
||||||
emptyOption: "",
|
emptyOption: "",
|
||||||
filtcode: "F"
|
filtercode: "F"
|
||||||
}) ;
|
}) ;
|
||||||
|
|
||||||
sql = "SELECT fin_btwtabel_key"
|
sql = "SELECT fin_btwtabel_key"
|
||||||
|
|||||||
@@ -347,7 +347,7 @@ BLOCK_START("prsPerslid2", L("lcl_prs_organisatieblok"));
|
|||||||
label: L("lcl_delivery_address"),
|
label: L("lcl_delivery_address"),
|
||||||
adresKey: mld_adrkey,
|
adresKey: mld_adrkey,
|
||||||
emptyOption: "",
|
emptyOption: "",
|
||||||
filtcode: "A",
|
filtercode: "A",
|
||||||
readonly: !prsauthparams.writeman
|
readonly: !prsauthparams.writeman
|
||||||
}) ;
|
}) ;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user