From 8187250b82b98c695342334426059f63fab17b4e Mon Sep 17 00:00:00 2001
From: Koen Reefman <koen.reefman@aareon.nl>
Date: Thu, 20 Apr 2017 07:20:35 +0000
Subject: [PATCH] VEBE#39163 variabele l_cnt_srt (nu cnt_disc_key) wordt nu
 correct opgehaald

svn path=/Website/trunk/; revision=33546
---
 APPL/CNT/cnt_edit_contract.asp      | 12 ++++++------
 APPL/CNT/cnt_edit_contract_save.asp |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/APPL/CNT/cnt_edit_contract.asp b/APPL/CNT/cnt_edit_contract.asp
index 1e68c6e400..80f45d40ff 100644
--- a/APPL/CNT/cnt_edit_contract.asp
+++ b/APPL/CNT/cnt_edit_contract.asp
@@ -29,7 +29,7 @@ FCLTHeader.Requires({plugins:["jQuery"],
                      js: ["../cnt/cnt_edit_contract.js"]})
 
 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 transitParam = "&cnt_key="+cnt_key;
@@ -62,7 +62,7 @@ else // nieuw contract of copy
     user.auth_required_or_abort(this_cnt.canCopy);
     cnt_info.cnt_key = -1;
     cnt_info.nummer_intern = null;
-    l_cnt_srt = getQParam("srtdisc", -1);
+    cnt_disc_key = getQParamInt("srtdisc", -1);
   }
   else
   {
@@ -99,13 +99,13 @@ else // nieuw contract of copy
           + "        WHERE prs_kostensoort_key = cs.prs_kostensoort_key) kostensoort_naam"
           + " FROM cnt_disc_params dp,"
           + "      cnt_discipline cs"
-          + " WHERE dp.cnt_ins_discipline_key = " + l_cnt_srt
-          + "   AND cs.ins_discipline_key =  " + l_cnt_srt;
+          + " WHERE dp.cnt_ins_discipline_key = " + cnt_disc_key
+          + "   AND cs.ins_discipline_key =  " + cnt_disc_key;
   var oRs = Oracle.Execute( sql );
 
   cnt_info.srtcontract_type = oRs("cnt_srtcontract_type").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.kostensoort_naam = oRs("kostensoort_naam").value;
 
@@ -207,7 +207,7 @@ else // nieuw contract of copy
     </script>
     <div id="edit">
       <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"
             target="hidFrameSubmit"
             onSubmit="cnt_submit();">
diff --git a/APPL/CNT/cnt_edit_contract_save.asp b/APPL/CNT/cnt_edit_contract_save.asp
index 24db6383cb..5581af0f5d 100644
--- a/APPL/CNT/cnt_edit_contract_save.asp
+++ b/APPL/CNT/cnt_edit_contract_save.asp
@@ -17,7 +17,7 @@ var JSON_Result = true;
 <%
 protectRequest.validateToken();
 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 cnt_copy_key = -1;
 if (copy)
@@ -30,7 +30,7 @@ var isNew = (cnt_key < 0);
 
 var sql = "SELECT cdp.cnt_srtcontract_type"
         + "  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 srtcontract_type = oRs("cnt_srtcontract_type").Value;
 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") },
-                { 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_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" },