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

VEBE#39163 variabele l_cnt_srt (nu cnt_disc_key) wordt nu correct opgehaald

Browse Source 
svn path=/Website/trunk/; revision=33546
This commit is contained in:
Koen Reefman
2017-04-20 07:20:35 +00:00
parent 19899ccc04
commit 8187250b82
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
APPL/CNT/cnt_edit_contract.asp
View File

@@ -29,7 +29,7 @@ FCLTHeader.Requires({plugins:["jQuery"],
js: ["../cnt/cnt_edit_contract.js"]}) js: ["../cnt/cnt_edit_contract.js"]})
var cnt_key = getQParamInt("cnt_key"); var cnt_key = getQParamInt("cnt_key");
var l_cnt_srt = getQParamInt("srtdisc", -1); var cnt_disc_key = getQParamInt("srtdisc", -1);
var copy = (getQParamInt("cnt_copy", 0) == 1); var copy = (getQParamInt("cnt_copy", 0) == 1);
var transitParam = "&cnt_key="+cnt_key; var transitParam = "&cnt_key="+cnt_key;
@@ -62,7 +62,7 @@ else // nieuw contract of copy
user.auth_required_or_abort(this_cnt.canCopy); user.auth_required_or_abort(this_cnt.canCopy);
cnt_info.cnt_key = -1; cnt_info.cnt_key = -1;
cnt_info.nummer_intern = null; cnt_info.nummer_intern = null;
l_cnt_srt = getQParam("srtdisc", -1); cnt_disc_key = getQParamInt("srtdisc", -1);
} }
else else
{ {
@@ -99,13 +99,13 @@ else // nieuw contract of copy
+ " WHERE prs_kostensoort_key = cs.prs_kostensoort_key) kostensoort_naam" + " WHERE prs_kostensoort_key = cs.prs_kostensoort_key) kostensoort_naam"
+ " FROM cnt_disc_params dp," + " FROM cnt_disc_params dp,"
+ " cnt_discipline cs" + " cnt_discipline cs"
+ " WHERE dp.cnt_ins_discipline_key = " + l_cnt_srt + " WHERE dp.cnt_ins_discipline_key = " + cnt_disc_key
+ " AND cs.ins_discipline_key = " + l_cnt_srt; + " AND cs.ins_discipline_key = " + cnt_disc_key;
var oRs = Oracle.Execute( sql ); var oRs = Oracle.Execute( sql );
cnt_info.srtcontract_type = oRs("cnt_srtcontract_type").value; cnt_info.srtcontract_type = oRs("cnt_srtcontract_type").value;
cnt_info.discipline_omschrijving = oRs("ins_discipline_omschrijving").value; cnt_info.discipline_omschrijving = oRs("ins_discipline_omschrijving").value;
cnt_info.discipline_key = l_cnt_srt; cnt_info.discipline_key = cnt_disc_key;
cnt_info.hasfactuurschema = oRs("cnt_disc_params_factuurschema").value == 1; cnt_info.hasfactuurschema = oRs("cnt_disc_params_factuurschema").value == 1;
cnt_info.kostensoort_naam = oRs("kostensoort_naam").value; cnt_info.kostensoort_naam = oRs("kostensoort_naam").value;
@@ -207,7 +207,7 @@ else // nieuw contract of copy
</script> </script>
<div id="edit"> <div id="edit">
<form name="u2" <form name="u2"
action="cnt_edit_contract_save.asp?srtdisc=<%=cnt_info.discipline_key%><%=transitParam%>"; action="cnt_edit_contract_save.asp?srtdisc=<%=cnt_info.discipline_key%><%=transitParam%>"
method="post" method="post"
target="hidFrameSubmit" target="hidFrameSubmit"
onSubmit="cnt_submit();"> onSubmit="cnt_submit();">

6
APPL/CNT/cnt_edit_contract_save.asp
View File

@@ -17,7 +17,7 @@ var JSON_Result = true;
<% <%
protectRequest.validateToken(); protectRequest.validateToken();
var cnt_key = getQParamInt("cnt_key", -1); var cnt_key = getQParamInt("cnt_key", -1);
var srtdisc_key = getQParamInt("srtdisc"); var cnt_disc_key = getQParamInt("srtdisc");
var copy = (getQParamInt("cnt_copy", 0) == 1); var copy = (getQParamInt("cnt_copy", 0) == 1);
var cnt_copy_key = -1; var cnt_copy_key = -1;
if (copy) if (copy)
@@ -30,7 +30,7 @@ var isNew = (cnt_key < 0);
var sql = "SELECT cdp.cnt_srtcontract_type" var sql = "SELECT cdp.cnt_srtcontract_type"
+ " FROM cnt_disc_params cdp" + " FROM cnt_disc_params cdp"
+ " WHERE cdp.cnt_ins_discipline_key = " + srtdisc_key; + " WHERE cdp.cnt_ins_discipline_key = " + cnt_disc_key;
var oRs = Oracle.Execute(sql); var oRs = Oracle.Execute(sql);
var srtcontract_type = oRs("cnt_srtcontract_type").Value; var srtcontract_type = oRs("cnt_srtcontract_type").Value;
var doapprove = S("cnt_contract_approval") == 1; var doapprove = S("cnt_contract_approval") == 1;
@@ -74,7 +74,7 @@ if (!oRs.eof)
} }
var fields = [ { dbs: "cnt_contract_nummer_intern", typ: "varchar", frm: "cnt_cntnrint", track: L("lcl_cnt_intern_nr") }, var fields = [ { dbs: "cnt_contract_nummer_intern", typ: "varchar", frm: "cnt_cntnrint", track: L("lcl_cnt_intern_nr") },
{ dbs: "ins_discipline_key", typ: "key", val: srtdisc_key }, { dbs: "ins_discipline_key", typ: "key", val: cnt_disc_key },
{ dbs: "cnt_contract_omschrijving", typ: "varchar", frm: "cnt_cntomst", track: L("lcl_cnt_descr") }, { dbs: "cnt_contract_omschrijving", typ: "varchar", frm: "cnt_cntomst", track: L("lcl_cnt_descr") },
{ dbs: "cnt_contract_nummer", typ: "varchar", frm: "cnt_cntnr", track: L("lcl_cnt_contractnr") }, { dbs: "cnt_contract_nummer", typ: "varchar", frm: "cnt_cntnr", track: L("lcl_cnt_contractnr") },
{ dbs: "cnt_contract_mantel_key", typ: "key", frm: "cnt_macntkey", track: L("lcl_cnt_mantel"), foreign: "cnt_contract" }, { dbs: "cnt_contract_mantel_key", typ: "key", frm: "cnt_macntkey", track: L("lcl_cnt_mantel"), foreign: "cnt_contract" },