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

FCLT#57668 Contract splitsen falen wordt niet goed afgevangen

Browse Source 
svn path=/Website/branches/v2019.1/; revision=42381
This commit is contained in:
Erik Groener
2019-05-03 09:55:16 +00:00
parent c08ecbbf08
commit 2c90b80fb2
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
APPL/CNT/cnt_split.asp
View File

@@ -53,28 +53,34 @@ var kosten = oRs("kosten").value;
{
cnt_amount = parseFloat(cnt_amount.replace(/,/g,"."));
}
sql = "BEGIN cnt.splitscontract (" + cnt_key + ", " + splitdate.toSQL() + "," + user_key + "," + cnt_amount + "); END;";
oRs = Oracle.Execute(sql);
sql = "SELECT cnt.getnieuwsteversiekey(" + cnt_key + ") newkey FROM DUAL";
oRs = Oracle.Execute(sql);
var newkey = oRs("newkey").value;
if (mindate <= splitdate && splitdate <= maxdate)
{ // splitsdatum moet tussen begin- en einddatum van contract liggen.
sql = "BEGIN cnt.splitscontract (" + cnt_key + ", " + splitdate.toSQL() + "," + user_key + "," + cnt_amount + "); END;";
oRs = Oracle.Execute(sql);
var flexsql = "SELECT k_old.cnt_kenmerk_key k_old"
+ ", k_old.cnt_kenmerk_key k_new"
+ " FROM cnt_srtkenmerk t"
+ ", cnt_discipline s"
+ ", cnt_kenmerk k_old"
+ ", cnt_contract c_old"
+ " WHERE c_old.cnt_contract_key = " + cnt_key
+ " AND s.ins_discipline_key = c_old.ins_discipline_key"
+ " AND k_old.cnt_srtcontract_key = s.ins_discipline_key"
+ " AND t.cnt_srtkenmerk_kenmerktype IN ('F', 'E', 'M') "
+ " AND k_old.cnt_kenmerk_verwijder IS NULL "
+ " AND k_old.cnt_srtkenmerk_key = t.cnt_srtkenmerk_key "
+ " AND t.cnt_srtkenmerk_verwijder IS NULL";
CopyFlexFolders("CNT/" + subfolderKey("C", cnt_key), "CNT/" + subfolderKey("C", newkey), flexsql);
sql = "SELECT cnt.getnieuwsteversiekey(" + cnt_key + ") newkey FROM DUAL";
oRs = Oracle.Execute(sql);
var newkey = oRs("newkey").value;
if (cnt_key != newkey)
{
var flexsql = "SELECT k_old.cnt_kenmerk_key k_old"
+ ", k_old.cnt_kenmerk_key k_new"
+ " FROM cnt_srtkenmerk t"
+ ", cnt_discipline s"
+ ", cnt_kenmerk k_old"
+ ", cnt_contract c_old"
+ " WHERE c_old.cnt_contract_key = " + cnt_key
+ " AND s.ins_discipline_key = c_old.ins_discipline_key"
+ " AND k_old.cnt_srtcontract_key = s.ins_discipline_key"
+ " AND t.cnt_srtkenmerk_kenmerktype IN ('F', 'E', 'M') "
+ " AND k_old.cnt_kenmerk_verwijder IS NULL "
+ " AND k_old.cnt_srtkenmerk_key = t.cnt_srtkenmerk_key "
+ " AND t.cnt_srtkenmerk_verwijder IS NULL";
CopyFlexFolders("CNT/" + subfolderKey("C", cnt_key), "CNT/" + subfolderKey("C", newkey), flexsql);
}
}
%><script>FcltMgr.closeDetail(window, { refresh: true } );</script><%
Response.End;
}