Merge 2018.2 Gold D patches

svn path=/Website/trunk/; revision=40926
This commit is contained in:
Jos Groot Lipman
2019-02-13 08:24:27 +00:00
51 changed files with 1792 additions and 564 deletions

View File

@@ -69,8 +69,8 @@ var htmlBody = XMLval(xmlReq, "htmlbody");
var Body = XMLval(xmlReq, "body");
__Log("Subject: " + Subject);
__Log("From: " + fromAddr);
__Log("FromAddr: " + from);
__Log("From: " + from);
__Log("FromAddr: " + fromAddr);
__Log("To: " + toAddr);
__Log("RecipientNr: " + RecipientNr);
__Log("htmlBody: " + htmlBody);

View File

@@ -131,6 +131,7 @@ function doLogin(prs_key, params)
Session("user_key") = user_key; // Nu ben je pas *echt* ingelogd
/* global */ user = new Perslid(user_key);
Session("userident") = "{0} ({1})".format(user.naam(), user.oslogin() || user.oslogin2() || user.prs_perslid_email() || "??"); // Handig voor in logging
__Log("Authenticated '{0}' successfully".format(Session("userident")));
Session.Contents.Remove("must_accept_terms");
if (S("fac_accept_terms") > 0
@@ -1196,6 +1197,7 @@ function process_claim(claim, idp_data, params)
{
shared.auditfail(L("lcl_autfai_loginnotfound").format(idpm.name.name, idpm.from, claim[idpm.from]));
}
__Log("Authenticated because claim '{0}' maps to '{1}'".format(idpm.from, idpm.name.name));
break; // ingelogd, niet verder zoeken
}

View File

@@ -289,9 +289,6 @@ function generateFlexKenmerkBlock(params)
null, null, null, null, // or PRS fields known
autfunction, "", 0);
sql += " ORDER BY k.ins_kenmerk_volgnummer"
+ ", UPPER(" + lcl.xsql('t.ins_srtkenmerk_omschrijving', 't.ins_srtkenmerk_key')+")";
if (advanced) // Nog harder de dubbelen er uit filteren. Een kenmerk kan bijvoorbeeld bij verschillende
{ // objectsoorten een ander volgnummer hebben en dat interesseert ons echt niet.
sql = "SELECT kenmerk_key, "
@@ -320,6 +317,11 @@ function generateFlexKenmerkBlock(params)
+ " ORDER BY kenmerk_volgnr"
+ " , UPPER (kenmerk_omschrijving)"
}
else
{
sql += " ORDER BY k.ins_kenmerk_volgnummer"
+ ", UPPER(" + lcl.xsql('t.ins_srtkenmerk_omschrijving', 't.ins_srtkenmerk_key')+")";
}
var nrflexcolumns = 1;
if (!advanced && !lendout)

View File

@@ -57,10 +57,8 @@ function onChangedDienst()
// In de tussentijd verstoort CheckJustOne dit process met een $.getJSON()
// Dus gewoon Uitvoerende leegmaken
if ($("#cnt_bedrijf_key").length > 0)
{ // Suggestbox is aanwezig
// Suggestbox is aanwezig
sgBedrijf.setValue(-1, "", true, false, null, true);
sgBedrijf.CheckJustOne();
}
}
function checkLentOut(id)

View File

@@ -387,7 +387,7 @@ function showKenmerkModal(purl, ptitle, init)
$(this).attr("type", "time");
});
}
$("div.time-holder").each(function() { console.log(this); $(this).css('top', "").css('left', ""); });
$("div.time-holder").each(function() { $(this).css({top: "", left: "", zIndex: 101}); });
});
}

View File

@@ -680,8 +680,6 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
function fnrowClass(oRs)
{
var lclass = "";
if (groupby >= 7 && ins_score_enabled && oRs("ins_deel_mjb_score1").Value != null)
lclass += safe.htmlattr("dcscore"+oRs("ins_deel_mjb_score1").Value); // nog trimmen ofzo?
if (!fulldetails)
return lclass;
@@ -805,7 +803,7 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
{
prio = "2"; // default value
}
return L("lcl_ins_srtcontroledl_xcp_prio_"+prio);
return L("lcl_ins_srtcontroledl_xcp_prio_" + prio);
}
function fnfncolPrioClass(oRs)
@@ -815,7 +813,7 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
{
prio = "2"; // default value
}
return "xcp_prio_"+prio;
return "xcp_prio_" + prio;
}
function fnfnBedrag(jaar) // altijd afronden
@@ -925,6 +923,20 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
}
}
function fncolScore1Class(oRs)
{ // Conditiescore.
if (groupby >= 7 && ins_score_enabled && oRs("ins_deel_mjb_score1").Value != null)
return safe.htmlattr("dcscore" + oRs("ins_deel_mjb_score1").Value);
}
function fncolScore2Class(oRs)
{ // Prioriteit.
if (groupby >= 7 && ins_score_enabled && oRs("ins_deel_mjb_score2").Value != null)
return safe.htmlattr("dpscore" + oRs("ins_deel_mjb_score2").Value);
}
function fnfncolClass(jaar)
{
return function (oRs)
@@ -1031,10 +1043,11 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
rst.addColumn(new Column({caption: L("lcl_obj_unit"), content: "ins_srtdeel_eenheid"}));
if (ins_score_enabled)
{
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score1"), content: "ins_deel_mjb_score1", datatype: "number", align: "center"}));
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score1"), content: "ins_deel_mjb_score1", datatype: "number", align: "center", columnClass: fncolScore1Class}));
rst.addColumn(new Column({caption: L("ins_srtdeel_mjb_grensscore1"), content: "ins_srtdeel_mjb_grensscore1", datatype: "number", align: "center"}));
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score2"), content: "ins_deel_mjb_score2", datatype: "number", align: "center"}));
rst.addColumn(new Column({caption: L("lcl_ins_srtcontroledl_xcp_prio"), content: fnXcpPrio, columnClass: fnfncolPrioClass, align: "center"}));
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score2"), content: "ins_deel_mjb_score2", datatype: "number", align: "center", columnClass: fncolScore2Class}));
if (groupby == 8)
rst.addColumn(new Column({caption: L("lcl_ins_srtcontroledl_xcp_prio"), content: fnXcpPrio, columnClass: fnfncolPrioClass, align: "center"}));
}
}
if (fulldetails)

View File

@@ -5870,7 +5870,7 @@ mld = {setmeldingstatus:
if (uitvopdr_key) opdr_prs_key.push(uitvopdr_key);
sql += " AND o.prs_perslid_key IN (" + opdr_prs_key.join(",") + ")";
}
if (behandel_key_arr)
if (behandel_key_arr && behandel_key_arr.length)
//sql += " AND (o.prs_perslid_key IN (" + behandel_key_arr.join(",") + ") OR o.prs_perslid_key IS NULL)";
// Niet toegewezen (prs_perslid_key IS NULL) opdrachten van het opdrachttype Bedrijf Intern (BI) moeten ook getoond worden.
sql += " AND (o.prs_perslid_key IN (" + behandel_key_arr.join(",") + ") OR (o.prs_perslid_key IS NULL AND (" + uitv_type + ") = 'BI'))";

View File

@@ -142,21 +142,24 @@ for (var i = 0; i < ingesloten.length; i++)
+ " AND isc.ctr_discipline_key = cdp.ctr_ins_discipline_key"
+ " AND dsc.ins_deelsrtcontrole_key = " + mld_melding.kto_key;
var oRs = Oracle.Execute(sql);
// De controle moet aanwezig zijn.
var this_ins = ins.func_enabled_deel(oRs("ins_deel_key").Value,
{srtcont_key: oRs("ins_srtcontrole_key").Value,
deelsrtcont_key: mld_melding.kto_key,
scen_key: 1
});
if (this_ins.canInspFinishMjb)
if (!oRs.eof)
{
canCloseCtr.push({ ins_key: oRs("ins_deel_key").Value,
srtcont_key: oRs("ins_srtcontrole_key").Value,
deelsrtcont_key: mld_melding.kto_key,
controlemode: oRs("ctr_disc_params_controle_type").Value
});
srtContKeyArray.push(oRs("ins_srtcontrole_key").Value);
controleModeArray[oRs("ctr_disc_params_controle_type").Value - 1] = oRs("ctr_disc_params_controle_type").Value; // Controlemode 2 op de 2de plek van de Array invullen [-1, 2, -1].
// De controle moet aanwezig zijn. Maar een inspectie kan ook verwijderd zijn!
var this_ins = ins.func_enabled_deel(oRs("ins_deel_key").Value,
{srtcont_key: oRs("ins_srtcontrole_key").Value,
deelsrtcont_key: mld_melding.kto_key,
scen_key: 1
});
if (this_ins.canInspFinishMjb)
{
canCloseCtr.push({ ins_key: oRs("ins_deel_key").Value,
srtcont_key: oRs("ins_srtcontrole_key").Value,
deelsrtcont_key: mld_melding.kto_key,
controlemode: oRs("ctr_disc_params_controle_type").Value
});
srtContKeyArray.push(oRs("ins_srtcontrole_key").Value);
controleModeArray[oRs("ctr_disc_params_controle_type").Value - 1] = oRs("ctr_disc_params_controle_type").Value; // Controlemode 2 op de 2de plek van de Array invullen [-1, 2, -1].
}
}
}
}

View File

@@ -1074,6 +1074,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
ROFIELDTR("fld", L("lcl_vakgroup_type"), mld_melding.srtdisc_oms);
var valid_kto_key = true;
if (mld_melding.meldbron_key != S("mld_meldbron_key")) { // niet lastigvallen met defaultwaarde
sql = "SELECT "+lcl.xsqla('mld_meldbron_omschrijving', 'mld_meldbron_key')
+ " FROM mld_meldbron"
@@ -1088,8 +1089,13 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
+ " FROM ins_deelsrtcontrole dsc"
+ " WHERE dsc.ins_deelsrtcontrole_key = " + mld_melding.kto_key;
oRs = Oracle.Execute(sql);
// De controle moet aanwezig zijn.
ROFIELDTR("fld", L("lcl_mld_frozen_costs") + "&nbsp;" + L("lcl_valutasign"), oRs("ins_deelsrtcontrole_freezecost").Value, {suppressEmpty: true, datatype: "currency"});
if (!oRs.eof)
{
// De controle moet aanwezig zijn. Maar een inspectie kan ook verwijderd zijn!
ROFIELDTR("fld", L("lcl_mld_frozen_costs") + "&nbsp;" + L("lcl_valutasign"), oRs("ins_deelsrtcontrole_freezecost").Value, {suppressEmpty: true, datatype: "currency"});
}
else
valid_kto_key = false;
oRs.close();
}
}
@@ -1112,7 +1118,12 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
mld.referentielink("R", mld_melding.rsv_ruimte_key, L("lcl_mld_with_res"));
if(stdm_info.kanverwijzen == 0 && mld_melding.kto_type) // Referentie (kanverwijzen > 0) verderop invoerbaar.
mld.referentielink(mld_melding.kto_type, mld_melding.kto_key, L("lcl_mld_kto"));
{
if (valid_kto_key)
mld.referentielink(mld_melding.kto_type, mld_melding.kto_key, L("lcl_mld_kto"));
else
ROFIELDTR("fld", L("lcl_mld_kto"), mld_melding.kto_type);
}
if (stdm_info.slabewaken && this_mld.canSLAChange)
{
@@ -1203,7 +1214,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
var initHideRefBlock = !(stdm_info.ins_srtdiscipline_mldgroup & 2) && // Kan niet gegroepeerd worden
!stdm_info.kanverwijzen && // Kan niet verwijzen
(mld_melding.meldbron_key != 10 || mld_melding.kto_type != "T"); // Geen Taak/Inspectie referentielink
initHideRefBlock |= !((mld_melding.mldgroup_key!=null) || valid_kto_key);
BLOCK_START("mldRef", L("lcl_reference"), { hidden: initHideRefBlock}); %>
<input type="hidden" name="kto_type" id="kto_type" value="<%=mld_melding.kto_type%>">
<input type="hidden" name="kto_key" value="<%=mld_melding.kto_key%>">

View File

@@ -83,21 +83,24 @@ for (var i = 0; i < ingesloten.length; i++)
+ " AND isc.ctr_discipline_key = cdp.ctr_ins_discipline_key"
+ " AND dsc.ins_deelsrtcontrole_key = " + mld_melding.kto_key;
var oRs = Oracle.Execute(sql);
// De controle moet aanwezig zijn.
var this_ins = ins.func_enabled_deel(oRs("ins_deel_key").Value,
{srtcont_key: oRs("ins_srtcontrole_key").Value,
deelsrtcont_key: mld_melding.kto_key,
scen_key: 1
});
if (this_ins.canInspFinishMjb)
if (!oRs.eof)
{
ingesloten[i].canInspFinishMjb = true;
ingesloten[i].controlemode = oRs("ctr_disc_params_controle_type").Value;
ingesloten[i].ins_key = oRs("ins_deel_key").Value;
ingesloten[i].srtcont_key = oRs("ins_srtcontrole_key").Value;
canCloseCtr++;
srtContKeyArray.push(oRs("ins_srtcontrole_key").Value);
controleModeArray[oRs("ctr_disc_params_controle_type").Value - 1] = oRs("ctr_disc_params_controle_type").Value; // Controlemode 2 op de 2de plek van de Array invullen [-1, 2, -1].
// De controle moet aanwezig zijn. Maar een inspectie kan ook verwijderd zijn!
var this_ins = ins.func_enabled_deel(oRs("ins_deel_key").Value,
{srtcont_key: oRs("ins_srtcontrole_key").Value,
deelsrtcont_key: mld_melding.kto_key,
scen_key: 1
});
if (this_ins.canInspFinishMjb)
{
ingesloten[i].canInspFinishMjb = true;
ingesloten[i].controlemode = oRs("ctr_disc_params_controle_type").Value;
ingesloten[i].ins_key = oRs("ins_deel_key").Value;
ingesloten[i].srtcont_key = oRs("ins_srtcontrole_key").Value;
canCloseCtr++;
srtContKeyArray.push(oRs("ins_srtcontrole_key").Value);
controleModeArray[oRs("ctr_disc_params_controle_type").Value - 1] = oRs("ctr_disc_params_controle_type").Value; // Controlemode 2 op de 2de plek van de Array invullen [-1, 2, -1].
}
}
}
}

View File

@@ -636,7 +636,7 @@ if (mld_key > 0)
if (srtnoti)
Response.Write(("<td><div>{1}{0}</div></td></tr>").format(safehtml, suffixstr));
else
Response.Write(("<td class='mldhandlingnote {0}'><div class='bubble'>{2}{1}</div></td></tr>").format( note_zichtbaarFE_class, safehtml, suffixstr));
Response.Write(("<td class='mldhandlingnote {0}'><div class='bubble'>{1}{2}</div></td></tr>").format( note_zichtbaarFE_class, suffixstr, safehtml));
}
else if (srtnoti)

View File

@@ -449,7 +449,7 @@ var subject = (isReservering
afspr_key: <%=afs_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("../bez/bez_delete.asp",
$.post("<%=rooturl%>/appl/bez/bez_delete.asp",
data,
McltCallbackHome, // Op deze manier in ieder geval een refresh
"json");

View File

@@ -62,7 +62,7 @@ if (bes_key > -1)
var data = { bes_key: <%=bes_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("../bes/bes_approve.asp"
$.post("<%=rooturl%>/appl/bes/bes_approve.asp"
, data
, McltCallbackAndThenAlways(bes_approve_callback)
, "json");
@@ -81,7 +81,7 @@ if (bes_key > -1)
, opmerk: opmerk
};
<% protectRequest.dataToken("data"); %>
$.post("../bes/bes_reject_save.asp" + murl
$.post("<%=rooturl%>/appl/bes/bes_reject_save.asp" + murl
, data
, McltCallbackAndThenAlways(bes_approve_callback)
, "json");

View File

@@ -56,7 +56,7 @@ var subject = L("lcl_cnt_contract") + " " + cnt_info.nummer_intern+ (cnt_info.ve
{
var data = {cnt_key: <%=cnt_key%>};
<% protectRequest.dataToken("data"); %>
$.post("../cnt/cnt_approve.asp",
$.post("<%=rooturl%>/appl/cnt/cnt_approve.asp",
data,
McltCallbackAndThenAlways(cnt_action_callback),
"json");
@@ -73,7 +73,7 @@ var subject = L("lcl_cnt_contract") + " " + cnt_info.nummer_intern+ (cnt_info.ve
var data = {cnt_key: <%=cnt_key%>,
opmerk: opmerk };
<% protectRequest.dataToken("data"); %>
$.post("../cnt/cnt_reject_save.asp",
$.post("<%=rooturl%>/appl/cnt/cnt_reject_save.asp",
data,
McltCallbackAndThenAlways(cnt_action_callback),
"json");

View File

@@ -41,7 +41,7 @@ var subject = L("lcl_fin_invoice") + " " + fin_key;
var data = { fin_key: <%=fin_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("../fin/fin_approve.asp?a=1"
$.post("<%=rooturl%>/appl/fin/fin_approve.asp?a=1"
, data
, McltCallbackAndThenAlways(fin_approve_callback)
, "json");
@@ -59,7 +59,7 @@ var subject = L("lcl_fin_invoice") + " " + fin_key;
, opmerk: opmerk
};
<% protectRequest.dataToken("data"); %>
$.post("../fin/fin_approve.asp" + murl
$.post("<%=rooturl%>/appl/fin/fin_approve.asp" + murl
, data
, McltCallbackAndThenAlways(fin_approve_callback)
, "json");

View File

@@ -220,7 +220,7 @@ else
window.history.back(1);
});
$.post("../ins/ins_deel_free_save.asp",
$.post("<%=rooturl%>/appl/ins/ins_deel_free_save.asp",
data, //TODO: Gewoon submit van het formulier en ins_deel_free_save.asp hierop aanpassen.
backAndReload,
"json");

View File

@@ -272,7 +272,7 @@ if (srtcontrole_key < 0 || defaultmode_key > 0)
};
<% protectRequest.dataToken("data"); %>
$.post("../ins/ins_inspect_save.asp",
$.post("<%=rooturl%>/appl/ins/ins_inspect_save.asp",
data,
McltCallbackAndThen(ins_submit_callback),
"json");
@@ -445,7 +445,7 @@ else
dlsrtcont_key_arr: $("#dlsrtcont_key_arr").val()};
protectRequest.dataToken(data);
$.post("../ins/ins_inspect_finish.asp", data, McltCallbackAndThen(ins_callback), "json");
$.post("<%=rooturl%>/appl/ins/ins_inspect_finish.asp", data, McltCallbackAndThen(ins_callback), "json");
return;
}
else
@@ -470,7 +470,7 @@ else
{
var data = $("form[name=u2]").serialize();
protectRequest.dataToken(data);
$.post( "../ins/ins_inspect_start.asp"
$.post( "<%=rooturl%>/appl/ins/ins_inspect_start.asp"
, data
, McltCallbackAndThen(ins_callback)
, "json"
@@ -487,7 +487,7 @@ else
{
var data = $("form[name=u2]").serialize();
protectRequest.dataToken(data);
$.post( "../ins/ins_inspect_finish.asp"
$.post( "<%=rooturl%>/appl/ins/ins_inspect_finish.asp"
, data
, McltCallbackAndThen(ins_callback)
, "json"

View File

@@ -469,7 +469,7 @@ else
maybeDouble: "<%maybeDouble%>"
};
protectRequest.dataToken(data);
$.post("../mld/mld_accept_save.asp",
$.post("<%=rooturl%>/appl/mld/mld_accept_save.asp",
data,
McltCallbackAndThenAlways(mld_submit_callback),
"json");

View File

@@ -149,6 +149,13 @@ function tryOverrule(path)
Response: Response,
Server: Server
};
var realuser = Session("fclt_realuser"); // De Windows user, niet noodzakelijkerwijs de FACILITOR user
if (realuser)
{
aspdata.Username = realuser.split("\\").pop();
if (realuser.split("\\").length > 1)
aspdata.Userdomain = realuser.split("\\")[0];
}
hook.custenv(aspdata);
hook = null; // zorg dat de GC het object kan opruimen.

View File

@@ -66,8 +66,8 @@ function getFiltClauseDiscipline(pfiltcode, params)
{
switch(pfiltcode)
{ // ins_srtgroep sg is er bij INS altijd
case "I",
"IB2": lfiltClause.where += " AND sg.ins_srtgroep_key IN"
case "I":
case "IB2": lfiltClause.where += " AND sg.ins_srtgroep_key IN"
+ " (SELECT sd1.ins_srtgroep_key"
+ " FROM ins_srtcontrole isc"
+ " , ins_srtdeel sd1"

View File

@@ -4820,9 +4820,25 @@ td.kpidetails {
.mjbplanned td {
background-color: #FCF2E5;
}
.dcscore1 td , .dcscore2 td { color: #07B907; }
.dcscore3 td , .dcscore4 td { color: #FFAB00; }
.dcscore5 td , .dcscore6 td { color: #F00; }
/* Conditiescore dcscore1 t/m dcscore6 */
td.dcscore1, td.dcscore2 {
background-color: #07B907;
}
td.dcscore3, td.dcscore4 {
background-color: #FFAB00;
}
td.dcscore5, td.dcscore6 {
background-color: #F00;
}
/* Prioriteit dcscore1 t/m dcscore9 */
/* Urgentie xcp_prio_1 t/m xcp_prio_3 */
td.xcp_prio_3 {
background-color: #F00;
color: #FFF;
}
.fcltscenario, .fcltactsit {
font-weight: bold;

View File

@@ -419,7 +419,7 @@ function kenmerk_regel(kv_params)
kvhtml += '\n </td><td>'; // Extra leeg celletje voor layout MLD_OPDR
if ((!kv_params.maskeren && kv_params.flexkenmerkwaarde && kv_params.forceReadonly && kv_params.ktype != "M" && kv_params.ktype != "L" && kv_params.ktype != "l") ||
(!kv_params.maskeren && kv_params.flexExprIncluded && kv_params.expressionClass != "flexshow" && !kv_params.makeCheckbox)) // in case the field triggers ##SHOW## expressions (checkbox excuded)
(!kv_params.maskeren && kv_params.flexExprIncluded && kv_params.expressionClass != "flexshow" && !kv_params.makeCheckbox && kv_params.readonlyfield)) // in case the field triggers ##SHOW## expressions (checkbox excuded)
{
// hidden veld met de *echte* waardes zodat ze wel worden opgeslagen
kvhtml += "\n <input type=hidden id='" + kv_params.nameprefix + kv_params.idCounter + "val' name='" + kv_params.nameprefix + kv_params.idCounter + "val' value='" + safe.htmlattr(kv_params.flexkenmerkwaarde) + "'>";
@@ -427,7 +427,7 @@ function kenmerk_regel(kv_params)
if ((!kv_params.maskeren && (kv_params.kenmerk_search || !kv_params.readonlyfield || (kv_params.flexkenmerkwaarde && kv_params.forceReadonly)) && kv_params.ktype != "L" && kv_params.ktype != "l") ||
(!kv_params.ishidden && kv_params.maskeren && kv_params.flexkenmerkwaarde && (kv_params.ktype == "F" || kv_params.ktype == "E")) ||
(!kv_params.maskeren && kv_params.flexExprIncluded && kv_params.expressionClass != "flexshow" && !kv_params.makeCheckbox)) // in case the field triggers ##SHOW## expressions (checkbox excuded)
(!kv_params.maskeren && kv_params.flexExprIncluded && kv_params.expressionClass != "flexshow" && !kv_params.makeCheckbox && kv_params.readonlyfield)) // in case the field triggers ##SHOW## expressions (checkbox excuded)
{
// Alleen dan hidden name-velden er bij
kvhtml += "<input type=hidden name='"+kv_params.nameprefix + kv_params.idCounter+"key' id='"+kv_params.nameprefix + kv_params.idCounter+"key' value='"+kv_params.kkey+"'>";

View File

@@ -336,19 +336,23 @@ function callback_flex_expr_info(json)
$("#" + json[kenmerk].kfieldid + "val").val(json[kenmerk].waarde);
}
}
$("div.time-holder").each(function() { $(this).css('top', "").css('left', ""); });
}
function calculateFlexExpressions(field, module, refkey, niveau, nameprefix, extraserie)
{
var params = $("[name=" + field.form.name + "]").serialize()
+ "&module=" + module
+ "&refkey=" + refkey
+ "&niveau=" + niveau
+ "&nameprefix=" + nameprefix
+ "&extraserie=" + (extraserie? 1 : 0);
if (field.form)
{ // execute only when the field is on a form (which is not the case when on a modal screen like "advanced")
var params = $("[name=" + field.form.name + "]").serialize()
+ "&module=" + module
+ "&refkey=" + refkey
+ "&niveau=" + niveau
+ "&nameprefix=" + nameprefix
+ "&extraserie=" + (extraserie? 1 : 0);
$.post("../Shared/calculate_flex_expr.asp",
params,
FcltCallbackAndThenAlways(callback_flex_expr_info),
"json");
$.post("../Shared/calculate_flex_expr.asp",
params,
FcltCallbackAndThenAlways(callback_flex_expr_info),
"json");
}
}

View File

@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxml="urn:schemas-microsoft-com:xslt" version="1.0">
<xsl:output method="xml" indent="yes" encoding="utf-8"/>
<xsl:decimal-format name="european" decimal-separator="," grouping-separator="."/>
<xsl:variable name="Rev">
<!-- Revision van deze CSUN_besopdr_resp.xsl -->
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:template name="linebreaks">
<xsl:param name="string"/><xsl:param name="delimiter"/>
<xsl:choose>
<xsl:when test="contains($string, $delimiter)">
<xsl:value-of select="substring-before($string, $delimiter)"/>
<xsl:text>&#10;</xsl:text>
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="substring-after($string, $delimiter)"/>
<xsl:with-param name="delimiter" select="$delimiter"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$string"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="strip_prefix">
<xsl:param name="in"/>
<xsl:choose>
<xsl:when test="translate(substring($in,1,1), '01234567890', '')">
<xsl:call-template name="strip_prefix">
<xsl:with-param name="in" select="substring($in, 2)"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$in"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="facilitor">
<facilitor>
<xsl:for-each select="opdracht">
<xsl:sort select="DateTime"/>
<xsl:element name="bestelopdracht">
<xsl:attribute name="key">
<xsl:call-template name="strip_prefix">
<xsl:with-param name="in" select="@key"/>
</xsl:call-template>
</xsl:attribute>
<xsl:attribute name="type">update</xsl:attribute>
<xsl:choose>
<xsl:when test="status = 'ORDAFM' ">
<status>BES2AF</status>
</xsl:when>
<xsl:otherwise>
<status></status>
</xsl:otherwise>
</xsl:choose>
<opmerking>
<xsl:value-of select="mut_datum"/>:<xsl:value-of select="status"/><xsl:text>&#10;</xsl:text>
<xsl:value-of select="opmerking"/><xsl:text>&#10;</xsl:text>
</opmerking>
<xsl:element name="kenmerk">
<xsl:attribute name="naam">Ref. Nr. Leverancier</xsl:attribute>
<xsl:attribute name="type">C</xsl:attribute>
<xsl:value-of select="RegistrationID"/>
</xsl:element>
</xsl:element>
</xsl:for-each>
</facilitor>
</xsl:template>
<!-- Root -->
<xsl:template match="/">
<xsl:apply-templates select="facilitor"/>
</xsl:template>
</xsl:stylesheet><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2009. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2009. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2009. Progress Software Corporation. All rights reserved. -->

0
CUST/APGR/import/AD_Import/.gitignore vendored Normal file
View File

View File

@@ -0,0 +1,19 @@
REM GEN_IMPORT_AD.BAT
REM
REM APGR
REM
REM Import van personen uit AD via webdav
REM
REM
REM $Revision$
REM $Id$
REM
REM (c) 2019 Facilitor B.V.
REM
REM ==================================================
move d:\Apps\Facilitor\Webdav\APGR\*.csv .\AD_Import
cscript ..\..\..\utils\gen_import\gen_import.wsf APGR 41 >>%0.log 2>>&1

View File

@@ -265,21 +265,6 @@
</xsl:choose>
</xsl:template>
<xsl:template name="res_begintext">
<!-- District 21 = Heerlen -->
<xsl:if test="//district/key=21">
<tr>
<td colspan="4" class="tekst">
<br/>Beste campusbewoner,
<br/><br/>Bedankt voor uw reservering. Is deze reservering nog actueel? Zo niet, graag contact opnemen met de receptie Smart Services Campus (+316-51559065 of receptie.smartservices@brightlands.com).
<br/><br/>Dank voor uw medewerking.
<br/><br/>Met vriendelijke groet,
<br/><br/>Brightlands Smart Services Campus
</td>
</tr>
</xsl:if>
</xsl:template>
<xsl:template match="reservering" mode="include">
<!-- De algemene gegevens van de deelreservering met het laagste volgnummer worden gebruikt als referentie gegevens! -->
<xsl:variable name="min_volgnr">
@@ -419,93 +404,6 @@
</xsl:when>
<!-- District 21 = Heerlen -->
<xsl:otherwise>
<table border="0" width="100%">
<xsl:choose>
<xsl:when test="$srtnotificatiecode='RESDEL' and verwijder">
<tr><td class="caption" style="color:red;"><xsl:value-of select="//lcl/RES/annulering"/></td></tr>
</xsl:when>
</xsl:choose>
<!-- Altijd tonen, ook voor verwijderde reserveringen! -->
<tr>
<td colspan="4" class="caption">
<xsl:choose>
<xsl:when test="@content='complete'"><xsl:value-of select="//lcl/RES/reservering"/>&#xA0;<xsl:value-of select="key"/></xsl:when>
<xsl:otherwise><xsl:value-of select="//lcl/RES/deelreservering"/>&#xA0;<xsl:value-of select="key"/>/<xsl:value-of select="$min_volgnr"/></xsl:otherwise>
</xsl:choose>
<xsl:if test="string(rsv_ruimte[volgnr=$min_volgnr]/omschrijving)!=''">&#xA0;-&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/omschrijving"/></xsl:if>
</td>
</tr>
<tr><td colspan="4" class="tekstkop" style="text-decoration:underline">Contactgegevens:</td></tr>
<tr>
<td width="13%" class="label"><xsl:value-of select="//lcl/FAC/aanvrager"/>:</td>
<td width="37%" class="value"><xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/contact_user/naam_full"/></td>
<td width="13%" class="label"><xsl:value-of select="//lcl/FAC/afdeling"/>:</td>
<td width="37%" class="value"><xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/contact_user/afdeling/omschrijving"/></td>
</tr>
<tr>
<td width="13%" class="label"><xsl:value-of select="//lcl/FAC/telefoon"/>:</td>
<td width="37%" class="value"><xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/contact_user/telefoonnr"/></td>
<xsl:if test="string(rsv_ruimte[volgnr=$min_volgnr]/contact_user/werkplek/plaats/regio/district/locatie/omschrijving)!=''">
<td width="13%" class="label"><xsl:value-of select="//lcl/FAC/locatie"/>:</td>
<td width="37%" class="value"><xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/contact_user/werkplek/plaats/regio/district/locatie/omschrijving"/></td>
</xsl:if>
</tr>
<tr>
<td width="13%" class="label"><xsl:value-of select="//lcl/FAC/e-mail"/>:</td>
<td colspan="3" class="value"><xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/contact_user/email"/></td>
</tr>
<xsl:if test="$srtnotificatiecode='RESDEL'">
<tr>
<td width="13%" class="label"><xsl:value-of select="//lcl/RES/begintijd"/>:</td>
<td colspan="3" class="value"><xsl:value-of select="rsv_ruimte/van/datum"/>&#xA0;<xsl:value-of select="rsv_ruimte/van/tijd"/></td>
</tr>
</xsl:if>
<tr><td height="20px"/></tr>
<xsl:if test="rsv_ruimte[volgnr=$min_volgnr]/contact_user/key!=ingevoerd_user/key">
<tr>
<td width="13%" class="label"><xsl:value-of select="//lcl/RES/behandeld_door"/>:</td>
<td colspan="3" class="value"><xsl:value-of select="ingevoerd_user/naam_full"/></td>
</tr>
<tr><td height="20px"/></tr>
</xsl:if>
<tr>
<td colspan="2" class="tekst">
<xsl:choose>
<xsl:when test="$srtnotificatiecode='RESNEW'"/>
<xsl:when test="$srtnotificatiecode='RESDEL'"><xsl:value-of select="//lcl/RES/reservering_vervallen"/></xsl:when>
<xsl:otherwise><xsl:call-template name="res_begintext"/></xsl:otherwise>
</xsl:choose>
</td>
</tr>
<xsl:choose>
<xsl:when test="$srtnotificatiecode!='RESDEL'">
<tr><td height="10px"/></tr>
<tr>
<td colspan="4">
<table border="0" width="100%" style="border-collapse:collapse;" cellpadding="0" cellspacing="0">
<!-- rsv_ruimte -->
<xsl:for-each select="rsv_ruimte">
<xsl:sort select="van/timestamp"/>
<xsl:sort select="volgnr"/>
<xsl:call-template name="rsv_ruimte_ssc"><xsl:with-param name="min_volgnr" select="$min_volgnr"/></xsl:call-template>
</xsl:for-each>
<!-- totaal reservering -->
<xsl:if test="@content='complete'">
<tr>
<td colspan="5" class="tekstkop"><br/><xsl:value-of select="//lcl/RES/totaalprijs_reservering"/>:</td>
<td colspan="2" class="tekstkop" style="text-align:right;"><br/>
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="sum(rsv_ruimte/prijs[string(number(.))!='NaN'])+sum(rsv_ruimte/rsv_deel/prijs[string(number(.))!='NaN'])+sum(rsv_ruimte/rsv_artikel/prijs[string(number(.))!='NaN'])"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
</table>
</td>
</tr>
</xsl:when>
</xsl:choose>
</table>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
@@ -719,245 +617,6 @@
</xsl:if>
</xsl:template>
<xsl:template name="rsv_ruimte_ssc">
<xsl:param name="min_volgnr"/>
<tr>
<xsl:choose>
<xsl:when test="res_ruimte!=''">
<td colspan="7" class="tekstkop"><br/><u>
<xsl:if test="dirtlevel!='0'"><span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;</xsl:if>
<xsl:value-of select="van/datum"/>&#xA0;
<xsl:value-of select="//lcl/RES/deelreservering"/>&#xA0;<xsl:value-of select="../key"/>/<xsl:value-of select="volgnr"/>&#xA0;
(<xsl:value-of select="res_activiteit/omschrijving"/>)</u>
<!--xsl:value-of select="res_ruimte/plaats/regio/district/locatie/omschrijving"/-->
</td>
</xsl:when>
<!-- "roomservice" -->
<xsl:otherwise>
<td colspan="7" class="tekstkop"><br/><u>
<xsl:if test="dirtlevel!='0'"><span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;</xsl:if>
<xsl:value-of select="van/datum"/><xsl:if test="string(van/datum)!=string(tot/datum)"> - <xsl:value-of select="tot/datum"/></xsl:if>&#xA0;
<xsl:value-of select="//lcl/RES/deelreservering"/>&#xA0;<xsl:value-of select="../key"/>/<xsl:value-of select="volgnr"/>&#xA0;
<xsl:value-of select="plaats/plaatsaanduiding"/></u>
</td>
</xsl:otherwise>
</xsl:choose>
</tr>
<xsl:if test="string(omschrijving)!=string(//reservering/rsv_ruimte[volgnr=$min_volgnr]/omschrijving)">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/omschrijving"/>:</td>
<td class="value" colspan="6"><xsl:value-of select="omschrijving"/></td>
</tr>
</xsl:if>
<xsl:if test="string(contact_user/naam_full)!=string(//reservering/rsv_ruimte[volgnr=$min_volgnr]/contact_user/naam_full)">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/aanvrager"/>:</td>
<td class="value" colspan="6"><xsl:value-of select="contact_user/naam_full"/>/ <xsl:value-of select="contact_user/werkplek/plaats/regio/district/locatie/omschrijving"/></td>
</tr>
</xsl:if>
<tr>
<td class="label"><xsl:value-of select="//lcl/RES/status"/>:</td>
<td class="value" colspan="6"><xsl:value-of select="status_fo"/></td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/RES/gastheer_vrouw"/>:</td>
<td class="value" colspan="6"><xsl:value-of select="host_user/naam_full"/></td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/kostenplaats"/>:</td>
<td class="value" colspan="6"><xsl:value-of select="kostenplaats/nr"/>&#xA0;<xsl:value-of select="kostenplaats/omschrijving"/></td>
</tr>
<xsl:if test="opmerking!=''">
<tr>
<td class="label"> <xsl:value-of select="//lcl/FAC/opmerking"/>:</td>
<td class="value" colspan="6"><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="opmerking"/></xsl:call-template></td>
</tr>
</xsl:if>
<tr><td colspan="7"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></td></tr>
<tr><td colspan="7" style="border-top:1px solid #000;"/></tr>
<tr>
<th class="resth" width="18%" style="text-align:left"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th class="resth" width="10%" style="text-align:left"><xsl:value-of select="//lcl/RES/aantal"/></th>
<th class="resth" width="11%" style="text-align:right"><xsl:value-of select="//lcl/RES/begintijd"/></th>
<th class="resth" width="12%" style="text-align:right"><xsl:value-of select="//lcl/RES/eindtijd"/></th>
<th class="resth" width="12%" style="text-align:center"><xsl:value-of select="//lcl/RES/opstelling"/></th>
<th class="resth" width="10%" style="text-align:center">Btw tarief</th>
<th class="resth" width="12%" style="text-align:right"><xsl:value-of select="//lcl/RES/prijs"/></th>
</tr>
<xsl:if test="res_ruimte!=''">
<tr>
<td width="20%" class="resresult" style="text-align:left;"><xsl:if test="dirtlevel!='0'"><span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;</xsl:if>
<xsl:value-of select="res_ruimte/nr"/>
<br/>(max. <xsl:value-of select="res_ruimte/bezoekers"/>&#xA0;<xsl:value-of select="//lcl/FAC/personen"/>)
</td>
<td width="12%" class="resresult" style="text-align:left">
<xsl:value-of select="bezoekers"/>&#xA0;<xsl:value-of select="//lcl/FAC/personen"/>
</td>
<td width="12%" class="resresult" style="text-align:right">
<xsl:value-of select="van/tijd"/>
</td>
<td width="12%" class="resresult" style="text-align:right">
<xsl:value-of select="tot/tijd"/>
</td>
<td width="14%" class="resresult" style="text-align:center">
<xsl:value-of select="res_ruimte/opstelling"/>
</td>
<td width="14%" style="text-align:center">Hoog (21%) <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="sum(prijs)*1.21 - prijs"/></xsl:call-template></td>
<td width="15%" class="resresult" style="text-align:right">
<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs"/></xsl:call-template>
</td>
</tr>
</xsl:if>
<!-- rsv_deel-lijst gesorteerd op van-tijd -->
<xsl:for-each select="rsv_deel">
<xsl:sort select="van/tijd"/>
<tr>
<td class="resresult"><xsl:if test="dirtlevel!='0'"><span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;</xsl:if>
<xsl:value-of select="res_deel/omschrijving"/>
</td>
<td class="resresult">
<xsl:value-of select="aantal"/>
</td>
<td class="resresult" style="text-align:right">
<xsl:value-of select="van/tijd"/>
</td>
<td class="resresult" style="text-align:right">
<xsl:value-of select="tot/tijd"/>
</td>
<td></td>
<td width="14%" style="text-align:center">Hoog (21%) <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="sum(prijs)*1.21 - prijs"/></xsl:call-template></td>
<td class="resresult" style="text-align:right">
<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs"/></xsl:call-template>
</td>
</tr>
</xsl:for-each>
<!-- rsv_artikel-lijst gesorteerd op van-tijd -->
<xsl:for-each select="rsv_artikel">
<xsl:sort select="levering/tijd"/>
<tr>
<td class="resresult" >
<xsl:value-of select="res_artikel/omschrijving"/>
</td>
<td class="resresult">
<xsl:value-of select="aantal"/>
</td>
<td class="resresult" style="text-align:right">
<xsl:value-of select="levering/tijd"/>
</td>
<td></td>
<td></td>
<td class="resresult" style="text-align:center">
<xsl:if test="res_artikel/btw='6'">Laag (6%)
<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="sum(prijs)*1.06 - prijs"/></xsl:call-template>
</xsl:if>
<xsl:if test="res_artikel/btw='21'">Hoog (21%)
<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="sum(prijs)*1.21 - prijs"/></xsl:call-template>
</xsl:if>
</td>
<td class="resresult" style="text-align:right">
<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs"/></xsl:call-template>
</td>
</tr>
</xsl:for-each>
<!-- Totaalprijs excl. BTW -->
<xsl:variable name="totaal_excl_btw">
<xsl:value-of select="sum(//rsv_ruimte/prijs) + sum(//rsv_deel/prijs) + sum(//rsv_artikel/prijs)"/>
</xsl:variable>
<!-- Totaalprijs incl. BTW voor catering berekenen (sumProducts gebruikt template prijsEx) -->
<xsl:variable name="catering_incl_btw">
<xsl:call-template name="sumProducts">
<xsl:with-param name="pList" select="msxml:node-set(//rsv_artikel)"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="totaal_incl_btw" select="sum(//rsv_ruimte/prijs)*1.21 + sum(//rsv_deel/prijs)*1.21 + $catering_incl_btw"/>
<xsl:variable name="tmpprijslist">
<xsl:for-each select="//rsv_ruimte">
<item>
<prijs><xsl:value-of select="prijs"/></prijs>
<btw>21</btw>
</item>
</xsl:for-each>
<xsl:for-each select="//rsv_deel">
<item>
<prijs><xsl:value-of select="prijs"/></prijs>
<btw>21</btw>
</item>
</xsl:for-each>
<xsl:for-each select="//rsv_artikel">
<item>
<prijs><xsl:value-of select="prijs"/></prijs>
<btw><xsl:choose><xsl:when test="btw!=''"><xsl:value-of select="btw"/></xsl:when><xsl:otherwise>6</xsl:otherwise></xsl:choose></btw>
</item>
</xsl:for-each>
</xsl:variable>
<xsl:variable name="totaal_btw_laag" select="sum(msxml:node-set($tmpprijslist)/item[btw='6']/prijs)*0.06"/>
<xsl:variable name="totaal_btw_hoog" select="sum(msxml:node-set($tmpprijslist)/item[btw='21']/prijs)*0.21"/>
<!-- totaal per deelreservering -->
<tr><td colspan="7" style="border-top:1px solid #000;"><xsl:value-of select="msxml:node-set($tmpprijslist)"/></td></tr>
<tr>
<td class="tekst" colspan="4"></td>
<td class="tekst" colspan="3" style="text-align:right;">
Totaal exclusief BTW <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="$totaal_excl_btw"/></xsl:call-template>
</td>
</tr>
<!--tr>
<td class="tekst" colspan="4"></td>
<td class="tekst" colspan="3" style="text-align:right;">
BTW <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="$totaal_incl_btw - $totaal_excl_btw"/></xsl:call-template>
</td>
</tr-->
<tr>
<td class="tekst" colspan="4"></td>
<td class="tekst" colspan="3" style="text-align:right;">
BTW 6% <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="$totaal_btw_laag"/></xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst" colspan="4"></td>
<td class="tekst" colspan="3" style="text-align:right;">
BTW 21% <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="$totaal_btw_hoog"/></xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst" colspan="4"></td>
<td class="tekst" colspan="3" style="text-align:right;">
Totaal inclusief BTW <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="$totaal_incl_btw"/></xsl:call-template>
</td>
</tr>
<!-- afspraak-lijst gesorteerd op naam -->
<xsl:for-each select="afspraak/bezoeker">
<xsl:sort select="naam"/>
<xsl:if test="position()=1">
<tr><td colspan="7" class="tekst"><br/><u><xsl:value-of select="//lcl/BEZ/bezoekers"/></u></td></tr>
<tr>
<th colspan="2" style="text-align:left;"><xsl:value-of select="//lcl/FAC/naam"/></th>
<th colspan="2" style="text-align:left;"><xsl:value-of select="//lcl/FAC/bedrijf"/></th>
<th colspan="3" style="text-align:left;">Parkeerplaats</th>
</tr>
</xsl:if>
<tr>
<td colspan="2" class="result"><xsl:value-of select="naam"/></td>
<td colspan="2" class="result"><xsl:value-of select="bedrijf"/></td>
<td colspan="3" class="result"><xsl:value-of select="deel/omschrijving"/></td>
</tr>
</xsl:for-each>
<!-- kenmerk-lijst gesorteerd op volgnummer (en gevuld) --><!--@type!='L' and // weggehaald-->
<xsl:for-each select="kenmerk[ @type!='l' and @type!='Q' and count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
<xsl:if test="position()=1">
<tr><td colspan="7"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></td></tr>
</xsl:if>
<xsl:if test=".!=''">
<tr>
<td class="label"><xsl:value-of select="@naam"/>:</td>
<td colspan="6" class="value"><xsl:value-of select="."/></td>
</tr>
</xsl:if>
</xsl:for-each>
</xsl:template>
<xsl:template match="melding" mode="include">
<!--xsl:variable name="slatijd">
<xsl:choose>
@@ -2029,6 +1688,7 @@ Beste campusbewoner,
</body>
</html>
</xsl:when>
<!-- DEPRECATED: Facturen over mei t/m december 2018 (in juli t/m januari)! -->
<xsl:when test="substring(verkoopfactuurregel/id, 5, 1)='2'">
<html>
<xsl:call-template name="htmlhead"/>
@@ -2231,8 +1891,250 @@ Beste campusbewoner,
<td style="text-align:right;vertical-align:middle;background-color:#AAA;"><xsl:value-of select="format-number((1.065 * $mndnet) + $mndbtwl + $mndbtwh1 + $mndbtwh2, '###.###.##0,00', 'european')"/></td>
</tr>
<tr><td colspan="6"><br/>If you have questions regarding this invoice, please contact <a href="mailto:accountsreceivable@brightlands.com"><nobr>accountsreceivable@brightlands.com</nobr></a>.</td></tr>
<tr>
<td colspan="6" style="font-size:8pt;">
<br/><br/><br/><b>Please mention invoice number <xsl:value-of select="verkoopfactuurregel/id"/> and customer number <xsl:value-of select="substring-before(verkoopfactuurregel/tekst7, '=')"/> with your payment.</b>
<br/>Rabobank (EUR) Geleen Netherlands
<br/>Bank account 1716.02.161
<br/>IBAN&#xA0;&#xA0;&#xA0;NL 33 RABO 01716 02 161
<br/>BIC&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;RABONL2U
<br/><b>Our VAT number: NL852049511B01</b>
</td>
</tr>
</table>
<div class="page-break"></div>
<table border="0" style="width:100%;border-collapse:collapse;" cellpadding="3" cellspacing="3">
<xsl:variable name="sortfilter2">
<xsl:for-each select="verkoopfactuurregel">
<xsl:sort select="tekst3"/>
<xsl:copy-of select="."/>
</xsl:for-each>
</xsl:variable>
<tr><td colspan="6"><br/><b>SPECIFICATION</b></td></tr>
<tr>
<td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;font-size:8pt;"><b>ID</b></td>
<td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;font-size:8pt;"><b>Issuer</b></td>
<td colspan="2" style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;font-size:8pt;"><b>Description</b></td>
<td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;font-size:8pt;"><b>VAT</b></td>
<td style="text-align:center;vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;font-size:8pt;"><b>Amount excl.<br/>VAT</b></td>
</tr>
<xsl:for-each select="msxml:node-set($sortfilter2)/verkoopfactuurregel">
<tr>
<td style="border-bottom:1px solid black;font-size:8pt;"><xsl:value-of select="substring-after(omschrijving, '=')"/></td>
<td style="border-bottom:1px solid black;font-size:8pt;"><xsl:value-of select="tekst5"/></td>
<td colspan="2" style="border-bottom:1px solid black;font-size:8pt;"><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="tekst8"/></xsl:call-template></td>
<td style="border-bottom:1px solid black;font-size:8pt;"><xsl:value-of select="btwpercentage"/> %</td>
<td style="text-align:right;border-bottom:1px solid black;font-size:8pt;"><xsl:value-of select="format-number(bedrag, '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:for-each>
<tr>
<td colspan="3" style="background-color:#AAA;font-size:8pt;"/>
<td colspan="2" style="vertical-align:middle;background-color:#AAA;font-size:8pt;"><b>Total</b></td>
<td style="text-align:right;vertical-align:middle;background-color:#AAA;font-size:8pt;"><xsl:value-of select="format-number(sum(msxml:node-set($sortfilter2)/verkoopfactuurregel/bedrag), '###.###.##0,00', 'european')"/></td>
</tr>
</table>
</body>
</html>
</xsl:when>
<xsl:when test="substring(verkoopfactuurregel/id, 1, 1)='3'">
<html>
<xsl:call-template name="htmlhead"/>
<body>
<table border="0" style="width:100%;border-collapse:collapse;" cellpadding="3" cellspacing="3">
<colgroup>
<col width="10%"/>
<col width="20%"/>
<col width="20%"/>
<col width="20%"/>
<col width="15%"/>
<col width="15%"/>
</colgroup>
<xsl:variable name="sortfilter1">
<xsl:for-each select="verkoopfactuurregel">
<xsl:sort select="substring-before(omschrijving, '=')"/>
<xsl:sort select="btwpercentage"/>
<xsl:copy-of select="."/>
</xsl:for-each>
</xsl:variable>
<tr>
<td colspan="3">
<b>Chemelot Campus Vastgoed C.V.</b>
<br/>Urmonderbaan 22, 6167 RD Geleen
<br/>Phone: +31 (0) 88 99 95705
<br/>Mail: <a href="mailto:accountsreceivable@brightlands.com"><nobr>accountsreceivable@brightlands.com</nobr></a>
<br/>Chamber of Commerce: 56268556
</td>
<td colspan="3" style="text-align:right;">
<xsl:choose>
<xsl:when test="$mode='email'"><img src="cid:tmpl_logo.gif"/></xsl:when>
<xsl:otherwise><xsl:element name="img"><xsl:attribute name="src">../../cust/<xsl:value-of select="//header/custId"/>/tmpl_logo.gif</xsl:attribute></xsl:element></xsl:otherwise>
</xsl:choose>
</td>
</tr>
<tr>
<td colspan="3">
<b>
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/debiteurnaam"/>
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/bedrijf/post_adres"/>
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/bedrijf/post_postcode"/><xsl:text> </xsl:text><xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/bedrijf/post_plaats"/>
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/bedrijf/post_land"/>
</b>
</td>
<td>
<br/>Invoice number:
<br/>Date:
<br/><br/>Customer number:
<!--br/>Your VAT number:-->
<br/>Your reference:
<!--xsl:if test="msxml:node-set($sortfilter1)/verkoopfactuurregel/tekst4!=''"><br/>Your contact person:</xsl:if-->
</td>
<td colspan="2">
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/id"/>
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/datum/datum"/>
<br/><br/><xsl:value-of select="substring-before(msxml:node-set($sortfilter1)/verkoopfactuurregel/tekst7, '=')"/>
<!--br/><xsl:value-of select="substring-after(msxml:node-set($sortfilter1)/verkoopfactuurregel/tekst7, '=')"/-->
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/tekst1"/>
<!--xsl:if test="msxml:node-set($sortfilter1)/verkoopfactuurregel/tekst4!=''"><br/><xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/tekst4"/></xsl:if-->
</td>
</tr>
<!--tr><td colspan="6" style="text-align:right;"><br/>Page: 1/1</td></tr-->
<tr>
<td colspan="2">
<br/>Terms of payment:
<br/>Payment method:
<br/>Due date:
</td>
<td colspan="4">
<br/>Within 30 days Due net
<br/>Bank Transfer
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/datum1/datum"/>
</td>
</tr>
<tr><td colspan="6"><br/><b>INVOICE</b></td></tr>
<tr><td colspan="6"><br/>Period from - to: <xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/datum2/datum"/> - <xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/datum3/datum"/></td></tr>
<tr>
<td colspan="4" style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>Description</b></td>
<td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>VAT</b></td>
<td style="text-align:center;vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>Amount excl.<br/>VAT</b></td>
</tr>
<xsl:for-each select="msxml:node-set($sortfilter1)/verkoopfactuurregel">
<xsl:variable name="prev_reg">
<xsl:choose>
<xsl:when test="position()=1">Quqelequ</xsl:when>
<xsl:otherwise><xsl:value-of select="substring-before(preceding-sibling::verkoopfactuurregel[1]/omschrijving, '=')"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="this_reg">
<xsl:value-of select="substring-before(omschrijving, '=')"/>
</xsl:variable>
<xsl:variable name="prev_btw">
<xsl:choose>
<xsl:when test="position()=1">Quqelequ</xsl:when>
<xsl:otherwise><xsl:value-of select="preceding-sibling::verkoopfactuurregel[1]/btwpercentage"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="this_btw">
<xsl:value-of select="btwpercentage"/>
</xsl:variable>
<!-- Als 'this' != 'prev', dan nieuwe factuurregel! -->
<xsl:if test="$this_reg!=$prev_reg or $this_btw!=$prev_btw">
<tr>
<td colspan="4" style="border-bottom:1px solid black;"><xsl:value-of select="$this_reg"/></td>
<td style="border-bottom:1px solid black;"><xsl:value-of select="$this_btw"/> %</td>
<td style="text-align:right;border-bottom:1px solid black;"><xsl:value-of select="format-number(sum(msxml:node-set($sortfilter1)/verkoopfactuurregel[substring-before(omschrijving, '=')=$this_reg and btwpercentage=$this_btw]/bedrag), '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:if>
</xsl:for-each>
<xsl:variable name="mndnet">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/verkoopfactuurregel/bedrag)"/>
</xsl:variable>
<xsl:variable name="mndnetl6">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/verkoopfactuurregel[btwpercentage='6']/bedrag)"/>
</xsl:variable>
<xsl:variable name="mndnetl9">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/verkoopfactuurregel[btwpercentage='9']/bedrag)"/>
</xsl:variable>
<xsl:variable name="mndneth1">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/verkoopfactuurregel[btwpercentage='21']/bedrag)"/>
</xsl:variable>
<xsl:variable name="mndneth2">
<xsl:value-of select="0.065 * $mndnet"/>
</xsl:variable>
<xsl:variable name="mndbtwl6">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/verkoopfactuurregel[btwpercentage='6']/btwbedrag)"/>
</xsl:variable>
<xsl:variable name="mndbtwl9">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/verkoopfactuurregel[btwpercentage='9']/btwbedrag)"/>
</xsl:variable>
<xsl:variable name="mndbtwh1">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/verkoopfactuurregel[btwpercentage='21']/btwbedrag)"/>
</xsl:variable>
<xsl:variable name="mndbtwh2">
<xsl:value-of select="0.21 * 0.065 * $mndnet"/>
</xsl:variable>
<tr>
<td colspan="3"/>
<td colspan="2"><b>Subtotal</b></td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndnet, '###.###.##0,00', 'european')"/></td>
</tr>
<tr>
<td colspan="3"/>
<td colspan="2"><b>Managementfee 6,5%</b></td>
<td style="text-align:right;"><xsl:value-of select="format-number(0.065 * $mndnet, '###.###.##0,00', 'european')"/></td>
</tr>
<xsl:choose>
<xsl:when test="msxml:node-set($sortfilter1)/verkoopfactuurregel/btwverlegd='1'">
<tr>
<td colspan="3"/>
<td colspan="2">VAT verlegd</td>
<td style="text-align:right;"><xsl:value-of select="format-number(0, '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:when>
<xsl:otherwise>
<xsl:if test="$mndnetl6!='' and $mndnetl6!=0">
<tr>
<td><b>Total excl. VAT 6%</b></td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndnetl6, '###.###.##0,00', 'european')"/></td>
<td/>
<td colspan="2">VAT 6%</td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndbtwl6, '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:if>
<tr>
<td><b>Total excl. VAT 9%</b></td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndnetl9, '###.###.##0,00', 'european')"/></td>
<td/>
<td colspan="2">VAT 9%</td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndbtwl9, '###.###.##0,00', 'european')"/></td>
</tr>
<tr>
<td><b>Total excl. VAT 21%</b></td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndneth1 + $mndneth2, '###.###.##0,00', 'european')"/></td>
<td/>
<td colspan="2">VAT 21%</td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndbtwh1 + $mndbtwh2, '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:otherwise>
</xsl:choose>
<tr>
<td colspan="3" style="background-color:#AAA;"/>
<td colspan="2" style="vertical-align:middle;background-color:#AAA;"><b>Total incl. VAT</b></td>
<td style="text-align:right;vertical-align:middle;background-color:#AAA;"><xsl:value-of select="format-number((1.065 * $mndnet) + $mndbtwl6 + $mndbtwl9 + $mndbtwh1 + $mndbtwh2, '###.###.##0,00', 'european')"/></td>
</tr>
<tr><td colspan="6"><br/>If you have questions regarding this invoice, please contact <a href="mailto:accountsreceivable@brightlands.com"><nobr>accountsreceivable@brightlands.com</nobr></a>.</td></tr>
<!--BLCC#55804: Note op ADDD-factuur gedurende 2019-Q1 mbt. BTW-aanpassing!-->
<xsl:if test="msxml:node-set($sortfilter1)/verkoopfactuurregel/boekmaand='201812' or msxml:node-set($sortfilter1)/verkoopfactuurregel/boekmaand='201901' or msxml:node-set($sortfilter1)/verkoopfactuurregel/boekmaand='201902'">
<xsl:if test="msxml:node-set($sortfilter1)/verkoopfactuurregel/boekmaand='201901' or msxml:node-set($sortfilter1)/verkoopfactuurregel/boekmaand='201902'">
<tr><td colspan="6"><br/>Please note: As of January 1st, 2019, the low VAT-tariff has changed from 6 to 9%.</td></tr>
</xsl:if>
@@ -2684,18 +2586,24 @@ Beste campusbewoner,
<xsl:variable name="mndnet">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/data_row/MNDNET)"/>
</xsl:variable>
<xsl:variable name="mndnetl">
<xsl:variable name="mndnetl6">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/data_row[FIN_BTWTABELWAARDE_PERC='6']/MNDNET)"/>
</xsl:variable>
<xsl:variable name="mndnetl9">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/data_row[FIN_BTWTABELWAARDE_PERC='9']/MNDNET)"/>
</xsl:variable>
<xsl:variable name="mndneth1">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/data_row[FIN_BTWTABELWAARDE_PERC='21']/MNDNET)"/>
</xsl:variable>
<xsl:variable name="mndneth2">
<xsl:value-of select="0.065 * $mndnet"/>
</xsl:variable>
<xsl:variable name="mndbtwl">
<xsl:variable name="mndbtwl6">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/data_row[FIN_BTWTABELWAARDE_PERC='6']/MNDBTW)"/>
</xsl:variable>
<xsl:variable name="mndbtwl9">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/data_row[FIN_BTWTABELWAARDE_PERC='9']/MNDBTW)"/>
</xsl:variable>
<xsl:variable name="mndbtwh1">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/data_row[FIN_BTWTABELWAARDE_PERC='21']/MNDBTW)"/>
</xsl:variable>
@@ -2713,21 +2621,6 @@ Beste campusbewoner,
<td colspan="2"><b>Managementfee 6,5%</b></td>
<td style="text-align:right;"><xsl:value-of select="format-number(0.065 * $mndnet, '###.###.##0,00', 'european')"/></td>
</tr>
<!--tr>
<td colspan="3"/>
<td colspan="2"><b>Total excl. VAT</b></td>
<td style="text-align:right;">€ <xsl:value-of select="format-number(1.065 * $mndnet, '###.###.##0,00', 'european')"/></td>
</tr-->
<!--tr>
<td colspan="3"/>
<td colspan="2"><b>Total excl. VAT 6%</b></td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndnetl, '###.###.##0,00', 'european')"/></td>
</tr>
<tr>
<td colspan="3"/>
<td colspan="2"><b>Total excl. VAT 21%</b></td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndneth1 + $mndneth2, '###.###.##0,00', 'european')"/></td>
</tr-->
<xsl:choose>
<xsl:when test="msxml:node-set($sortfilter1)/data_row/FIN_BTWTABELWAARDE_VERLEGD='1'">
<tr>
@@ -2737,22 +2630,21 @@ Beste campusbewoner,
</tr>
</xsl:when>
<xsl:otherwise>
<!--tr>
<td colspan="3"/>
<td colspan="2">VAT 6%</td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndbtwl, '###.###.##0,00', 'european')"/></td>
</tr>
<xsl:if test="$mndnetl6!='' and $mndnetl6!=0">
<tr>
<td><b>Total excl. VAT 6%</b></td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndnetl6, '###.###.##0,00', 'european')"/></td>
<td/>
<td colspan="2">VAT 6%</td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndbtwl6, '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:if>
<tr>
<td colspan="3"/>
<td colspan="2">VAT 21%</td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndbtwh1 + $mndbtwh2, '###.###.##0,00', 'european')"/></td>
</tr-->
<tr>
<td><b>Total excl. VAT 6%</b></td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndnetl, '###.###.##0,00', 'european')"/></td>
<td><b>Total excl. VAT 9%</b></td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndnetl9, '###.###.##0,00', 'european')"/></td>
<td/>
<td colspan="2">VAT 6%</td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndbtwl, '###.###.##0,00', 'european')"/></td>
<td colspan="2">VAT 9%</td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndbtwl9, '###.###.##0,00', 'european')"/></td>
</tr>
<tr>
<td><b>Total excl. VAT 21%</b></td>
@@ -2766,11 +2658,11 @@ Beste campusbewoner,
<tr>
<td colspan="3" style="background-color:#AAA;"/>
<td colspan="2" style="vertical-align:middle;background-color:#AAA;"><b>Total incl. VAT</b></td>
<td style="text-align:right;vertical-align:middle;background-color:#AAA;"><xsl:value-of select="format-number((1.065 * $mndnet) + $mndbtwl + $mndbtwh1 + $mndbtwh2, '###.###.##0,00', 'european')"/></td>
<td style="text-align:right;vertical-align:middle;background-color:#AAA;"><xsl:value-of select="format-number((1.065 * $mndnet) + $mndbtwl6 + $mndbtwl9 + $mndbtwh1 + $mndbtwh2, '###.###.##0,00', 'european')"/></td>
</tr>
<tr><td colspan="6"><br/>If you have questions regarding this invoice, please contact <a href="mailto:accountsreceivable@brightlands.com"><nobr>accountsreceivable@brightlands.com</nobr></a>.</td></tr>
<!--BLCC#55804: Note op ADDD-factuur gedurende 2019-Q1 mbt. BTW-aanpassing!-->
<xsl:if test="msxml:node-set($sortfilter1)/data_row/MAAND='201812' or msxml:node-set($sortfilter1)/data_row/MAAND='201901' or msxml:node-set($sortfilter1)/data_row/MAAND='201902'">
<xsl:if test="msxml:node-set($sortfilter1)/data_row/MAAND='201901' or msxml:node-set($sortfilter1)/data_row/MAAND='201902'">
<tr><td colspan="6"><br/>Please note: As of January 1st, 2019, the low VAT-tariff has changed from 6 to 9%.</td></tr>
</xsl:if>

Binary file not shown.

View File

@@ -1,27 +0,0 @@
var csvfilename = "PRS-Beaufort.csv";
var Oracle = new ActiveXObject("ADODB.Connection");
var str = 'File Name=.\\beaufort.udl';
Oracle.Open(str);
ttTot = new Date();
sql = "SELECT PERSONEELSNUMMER||';'||NAAM||';'||TUSSENVOEGSELS||';'||VOORLETTERS||';'||VOORNAAM||';'||AFDELINGSCODE||';'||FUNCTIE||';'||INDIENSTDATUM||';'||UITDIENSTDATUM||';'||DIENSTVERBANDCODE||';'||DIENSTVERBANDGEBOUW||';'||AFDELINGSDOMEIN||';'||TELEFOON||';'||EMAIL||';'||LOGINNAAM||CHR(13)||CHR(10) FROM VW_FC_MEDEWERKERS";
oRs = Oracle.Execute(sql);
var fso;
var flog;
fso = new ActiveXObject("Scripting.FileSystemObject");
flog = fso.CreateTextFile(csvfilename, true);
//Header
flog.Write('PERSONEELSNUMMER;NAAM;TUSSENVOEGSEL;VOORLETTERS;VOORNAAM;AFDELINGSCODE;FUNCTIE;INDIENSTDATUM;UITDIENSTDATUM;DIENSTVERBANDCODE;DIENSTVERBANDGEBOUW;AFDELINGSDOMEIN;TELEFOON;EMAIL;LOGINNAAM\r\n');
//Content
while (!oRs.eof)
{
flog.Write(oRs(0).value);
oRs.MoveNext;
}
oRs.close;
flog.Close();
WScript.Echo("Klaar met wegschrijven CSV: " + (((new Date())-ttTot)) + "ms");

View File

@@ -1,8 +0,0 @@
Echo Starten ImportBeaufort.js
cscript ImportBeaufort.js>>gen_import.log
if errorlevel 1 goto fout
cscript ..\..\..\utils\gen_import\gen_import.wsf DENB PRS >>genimport.log 2>>&1
goto einde
:fout
Echo gen_import.wsf niet meer uitgevoerd>>gen_import.log
:einde

View File

@@ -389,14 +389,14 @@
<xsl:when test="kenmerk[@key='181']='Sociaal'">
<!--xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs"/></xsl:call-template-->
<xsl:choose>
<xsl:when test="res_ruimte/groep='6'"><xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="ruimteprijs * 1.06"/></xsl:call-template></xsl:when>
<xsl:when test="res_ruimte/groep='6'"><xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="ruimteprijs * 1.09"/></xsl:call-template></xsl:when>
<xsl:otherwise><xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="ruimteprijs * 1.21"/></xsl:call-template></xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<!--xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="(tot/timestamp - van/timestamp) div 3600 * number (res_ruimte/prijs_dag)"/></xsl:call-template-->
<xsl:choose>
<xsl:when test="res_ruimte/groep='6'"><xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="(tot/timestamp - van/timestamp) div 3600 * number (res_ruimte/prijs_dag) * 1.06"/></xsl:call-template></xsl:when>
<xsl:when test="res_ruimte/groep='6'"><xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="(tot/timestamp - van/timestamp) div 3600 * number (res_ruimte/prijs_dag) * 1.09"/></xsl:call-template></xsl:when>
<xsl:otherwise><xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="(tot/timestamp - van/timestamp) div 3600 * number (res_ruimte/prijs_dag) * 1.21"/></xsl:call-template></xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -410,7 +410,7 @@
<td class="resresult" style="text-align:center"><xsl:choose><xsl:when test="res_ruimte/groep!=''"><xsl:value-of select="res_ruimte/groep"/>%</xsl:when><xsl:otherwise/></xsl:choose></td>
<td class="resresult" style="text-align:right">
<xsl:choose>
<xsl:when test="res_ruimte/groep='6'"><xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="-1 * korting * 1.06"/></xsl:call-template></xsl:when>
<xsl:when test="res_ruimte/groep='6'"><xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="-1 * korting * 1.09"/></xsl:call-template></xsl:when>
<xsl:otherwise><xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="-1 * korting * 1.21"/></xsl:call-template></xsl:otherwise>
</xsl:choose>
</td>
@@ -462,7 +462,7 @@
<xsl:otherwise>
<xsl:choose>
<xsl:when test="res_artikel/btw='21'"><xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs * 1.21"/></xsl:call-template></xsl:when>
<xsl:otherwise><xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs * 1.06"/></xsl:call-template></xsl:otherwise>
<xsl:otherwise><xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs * 1.09"/></xsl:call-template></xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
</xsl:choose>
@@ -511,14 +511,14 @@
<btw>
<xsl:choose>
<xsl:when test="res_artikel/btw!=''"><xsl:value-of select="res_artikel/btw"/></xsl:when>
<xsl:otherwise>6</xsl:otherwise>
<xsl:otherwise>9</xsl:otherwise>
</xsl:choose>
</btw>
</item>
</xsl:for-each>
</xsl:variable>
<xsl:variable name="totaal_excl_btw" select="sum(msxml:node-set($tmpprijslist)/item/prijs)"/>
<xsl:variable name="totaal_btw_laag" select="sum(msxml:node-set($tmpprijslist)/item[btw='6']/prijs)*0.06"/>
<xsl:variable name="totaal_btw_laag" select="sum(msxml:node-set($tmpprijslist)/item[btw='9']/prijs)*0.09"/>
<xsl:variable name="totaal_btw_hoog" select="sum(msxml:node-set($tmpprijslist)/item[btw='21']/prijs)*0.21"/>
<!-- totaal per deelreservering -->
<!--tr><td colspan="7" style="border-top:1px solid #000;"><xsl:value-of select="msxml:node-set($tmpprijslist)"/></td></tr-->

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

0
CUST/KFHT/export/NACHTWERK/.gitignore vendored Normal file
View File

View File

@@ -0,0 +1,18 @@
REM GEN_EXPORT_NACHTWERK.BAT
REM
REM KFHT
REM
REM "Dummy" export die feitelijk niets exporteert, maar elke nacht
REM zaken bijwerkt in de database (bv. inactiveren van personen).
REM
REM Context : roep deze file aan indien nodig, of schedule deze
REM Vereist : de randvoorwaarde voor het gebruik van gen_export
REM
REM $Revision$
REM $Id$
REM
REM (c) 2019 Aareon B.V.
REM
REM ================================================== create exportfile
CALL ..\..\..\utils\gen_export\gen_export.bat NACHTWERK

View File

@@ -4137,25 +4137,20 @@ END:VCALENDAR
<xsl:template match="rapport">
<html>
<xsl:call-template name="htmlhead"/>
<xsl:if test="@view='RES_V_UDR_RESERVERINGINCL' or @view='res_v_udr_reserveringincl'">
<xsl:choose>
<xsl:when test="@usrrap_key='61'">
<xsl:call-template name="htmlhead"/>
<xsl:if test="@view='RES_V_UDR_RESERVERINGINCL' or @view='res_v_udr_reserveringincl'">
<xsl:choose>
<xsl:when test="@usrrap_key='61'">
<!-- RES: Cateringstickers -->
size: auto; /* auto is the initial value */
/* this affects the margin in the printer settings */
margin: 0mm 0mm 0mm 5mm;
<style>@page {
size: auto; /* auto is the initial value */
/* this affects the margin in the printer settings */
margin: 0mm 0mm 0mm 5mm;
}</style>
<body>
<xsl:variable name="p_rows" select="7"/>
<xsl:variable name="p_cols" select="3"/>
<!--table-->
<table style="width:50%;border-collapse:collapse;" cellpadding="0" cellspacing="0">
<tr height="200">
@@ -4198,32 +4193,30 @@ END:VCALENDAR
<xsl:with-param name="p_cols" select="$p_cols"/>
</xsl:call-template>
</xsl:if>
</body>
</xsl:when>
<xsl:otherwise>
<style>
</xsl:for-each>
</body>
</xsl:when>
<xsl:otherwise>
<style>
table, tr, td, th, tbody, thead, tfoot {
border: 0px solid #FFF;}
@media print {
table, tr, td, th, tbody, thead, tfoot {
border: 0px solid #FFF;}
}
border: 0px solid #FFF;
}
</style>
<body>
table, tr, td, th, tbody, thead, tfoot {
border: 0px solid #FFF;}
</style>
<body>
<xsl:for-each select="//facilitor/rapport/rapport_data/data_row">
<xsl:sort select="VOORZIENING_CATALOGUS"/>
<xsl:sort select="GEBOUW"/>
<xsl:sort select="VERDIEPING"/>
<!--table-->
<xsl:if test="position() != 1">
<div style="page-break-before:always">&#xA0;</div>
</xsl:if>
<xsl:element name="img">
<xsl:attribute name="src">../../cust/<xsl:value-of select="//header/custId"/>/tmpl_logo.gif</xsl:attribute>
</xsl:element>
<xsl:sort select="NUMMER"/>
<xsl:if test="position() != 1">
<div style="page-break-before:always">&#xA0;</div>
</xsl:if>
<xsl:element name="img">
<xsl:attribute name="src">../../cust/<xsl:value-of select="//header/custId"/>/tmpl_logo.gif</xsl:attribute>
</xsl:element>
<table border="1" cellspacing="0" cellpadding="5" width="100%">
<tr>
@@ -4234,7 +4227,7 @@ END:VCALENDAR
</tr>
<tr>
<td width="13%" class="label">Aanvrager</td>
<!-- <td width="13%" class="label">Afdeling</td>
<td width="37%" class="value">:&#160;<xsl:value-of select="CONTACT"/></td>
<!--<td width="13%" class="label">Afdeling</td>
<td width="37%" class="value">:&#160;<xsl:value-of select="AFDELING_CODE"/></td>-->
</tr>
@@ -4296,14 +4289,13 @@ END:VCALENDAR
<td width="13%" class="label">Handtekening</td>
<td width="37%" class="value">:&#160;</td>
</tr>
</xsl:for-each>
</table>
</xsl:for-each>
</body>
</xsl:otherwise>
</xsl:choose>
</xsl:if>
</body>
</xsl:otherwise>
</xsl:choose>
</xsl:if>
<xsl:if test="@view ='kfsg_v_resruimte_qrc'">
<xsl:if test="@view ='kfsg_v_resruimte_qrc'">
<xsl:variable name="p_rows" select="999"/>
<xsl:variable name="p_cols" select="1"/>
@@ -4319,7 +4311,7 @@ END:VCALENDAR
<xsl:with-param name="p_cols" select="$p_cols"/>
</xsl:call-template>
<div style="page-break-after:always; margin:0;padding:0">&#160;</div>
<xsl:if test="position() = last() and position() mod ($p_rows * $p_cols) != 0 ">
</xsl:if>
<xsl:if test="position() = last() and position() mod ($p_rows * $p_cols) != 0">
<xsl:comment>=== De laatste paar, zijn minder dan m*n =====</xsl:comment>
<xsl:call-template name="qrc_res_new_page">
@@ -4329,6 +4321,553 @@ END:VCALENDAR
</xsl:call-template>
</xsl:if>
</xsl:for-each>
</xsl:if>
<xsl:if test="(@view='kfsg_v_frozen_fact' or @view='KFSG_V_FROZEN_FACT') and $srtnotificatiecode='CUST01'">
<table style="width:100%;border-collapse:collapse;" cellpadding="0" cellspacing="0">
<tr>
<td colspan="4" class="tekst" style="vertical-align:center;">
<xsl:choose>
<xsl:when test="$mode='email'"><img src="cid:tmpl_logo.gif"/></xsl:when>
<xsl:otherwise><xsl:element name="img"><xsl:attribute name="src">../../cust/<xsl:value-of select="//header/custId"/>/tmpl_logo.gif</xsl:attribute></xsl:element></xsl:otherwise>
</xsl:choose>
</td>
</tr>
<xsl:choose>
<xsl:when test="count(rapport_data/data_row)=0">
<tr><td class="tekst"><center><br/><b>Geen gegevens gevonden</b></center></td></tr>
</xsl:when>
<xsl:otherwise>
<xsl:variable name="max_maand">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="MAAND" order="descending"/>
<xsl:if test="position()=1">
<xsl:value-of select="MAAND"/>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<xsl:variable name="filtered">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="MAAND" order="descending"/>
<xsl:sort select="PRS_BEDRIJF_NAAM"/>
<xsl:sort select="INKOOPORDERNR"/>
<xsl:sort select="CONTRACTNR"/>
<xsl:if test="MAAND=$max_maand">
<xsl:copy-of select="."/>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<xsl:for-each select="msxml:node-set($filtered)/data_row">
<xsl:variable name="prev_ponr">
<xsl:choose>
<xsl:when test="position()=1">Quqelequ</xsl:when>
<xsl:otherwise><xsl:value-of select="preceding-sibling::data_row[1]/CONTRACTNR"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="this_ponr">
<xsl:value-of select="CONTRACTNR"/>
</xsl:variable>
<xsl:if test="position()=1">
<tr>
<td colspan="4" class="tekst"><br/><b>Factuurnotificatie</b></td>
</tr>
<tr><td colspan="4"><br/><hr/></td></tr>
<tr>
<td class="tekst" style="width:18%;">Leverancier:</td>
<td class="tekst" style="width:32%;"><xsl:value-of select="PRS_BEDRIJF_NAAM"/></td>
<td class="tekst" style="width:18%;">Periode:</td>
<td class="tekst" style="width:32%;">
<table style="width:100%;">
<tr><td class="tekst" style="width:25%;text-align:right;"><xsl:value-of select="MAAND"/></td><td/></tr>
</table>
</td>
</tr>
<tr>
<td class="tekst">Contactpersoon:</td>
<td class="tekst"><xsl:value-of select="CP_AANHEF"/><xsl:value-of select="CP_NAAM"/></td>
</tr>
<tr>
<td class="tekst"><br/>Contractmanager Yask:</td>
<td class="tekst"><br/><xsl:value-of select="CM_AANHEF"/><xsl:value-of select="CM_NAAM"/></td>
</tr>
<tr><td colspan="4"><hr/></td></tr>
<tr>
<td colspan="4" class="tekst"><br/><b>Factuur</b></td>
</tr>
</xsl:if>
<!--Als 'this' != 'prev', dan invoegen PO-regel gegroepeerd op INKOOPORDERNR!-->
<xsl:if test="$this_ponr!=$prev_ponr">
<tr>
<td class="tekst"><br/><xsl:value-of select="INKOOPORDERNR"/></td>
<td colspan="2" class="tekst"><br/><xsl:value-of select="CONTRACTNR"/> - <xsl:value-of select="BESCHRIJVING"/></td>
<td class="tekst">
<table style="width:100%;">
<tr><td class="tekst" style="width:25%;text-align:right;"><br/><xsl:value-of select="format-number(sum(msxml:node-set($filtered)/data_row[CONTRACTNR=$this_ponr]/KOSTEN), '###.###.##0,00', 'european')"/></td><td/></tr>
</table>
</td>
</tr>
</xsl:if>
</xsl:for-each>
<tr>
<td class="tekst"><br/></td>
<td colspan="2" class="tekst"><br/><b>Totaal</b></td>
<td class="tekst">
<table style="width:100%;">
<tr><td class="tekst" style="width:25%;text-align:right;"><br/><b><xsl:value-of select="format-number(sum(msxml:node-set($filtered)/data_row/KOSTEN), '###.###.##0,00', 'european')"/></b></td><td/></tr>
</table>
</td>
</tr>
<tr><td colspan="4"><br/><hr/></td></tr>
<tr>
<td colspan="4" class="tekst">
<table style="width:100%">
<tr>
<td class="tekst" style="width:2%;"><br/></td>
<td class="tekst"><br/>De genoemde bedragen zijn bedragen exclusief BTW.</td>
</tr>
<tr>
<td class="tekst" style="width:2%;"></td>
<td class="tekst">De factuur kan direct worden verstuurd naar NS Stations via onderstaand factuuradres.<br/>
<br/>NS Groep N.V.
<br/>T.a.v. Crediteurenbeheer
<br/>Postbus 2210
<br/>3500 GE UTRECHT
<br/>NEDERLAND
</td>
</tr>
<tr>
<td class="tekst" style="width:2%;"><br/></td>
<td class="tekst"><br/>De betalingstermijn die wordt gehanteerd door NS Stations betreft 30 dagen vanaf factuurdatum.</td>
</tr>
<tr>
<td class="tekst" style="width:2%;"></td>
<td class="tekst">Bij vragen of opmerkingen over deze factuurnotificatie kunt u contact opnemen met bovenvermelde contractmanager.</td>
</tr>
</table>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
</table>
</xsl:if>
<xsl:if test="(@view='kfsg_v_frozen_fact' or @view='KFSG_V_FROZEN_FACT') and $srtnotificatiecode='CUST02'">
<table style="width:100%;border-collapse:collapse;" cellpadding="0" cellspacing="0">
<tr>
<td colspan="4" class="tekst" style="vertical-align:center;">
<xsl:choose>
<xsl:when test="$mode='email'"><img src="cid:tmpl_logo.gif"/></xsl:when>
<xsl:otherwise><xsl:element name="img"><xsl:attribute name="src">../../cust/<xsl:value-of select="//header/custId"/>/tmpl_logo.gif</xsl:attribute></xsl:element></xsl:otherwise>
</xsl:choose>
</td>
</tr>
<xsl:choose>
<xsl:when test="count(rapport_data/data_row)=0">
<tr><td class="tekst"><center><br/><b>Geen gegevens gevonden</b></center></td></tr>
</xsl:when>
<xsl:otherwise>
<xsl:variable name="max_maand">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="MAAND" order="descending"/>
<xsl:if test="position()=1">
<xsl:value-of select="MAAND"/>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<xsl:variable name="filtered">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="MAAND" order="descending"/>
<xsl:sort select="PRS_BEDRIJF_NAAM"/>
<xsl:sort select="INKOOPORDERNR"/>
<xsl:sort select="CONTRACTNR"/>
<xsl:if test="MAAND=$max_maand">
<xsl:copy-of select="."/>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<xsl:variable name="row_count">
<xsl:value-of select="count(msxml:node-set($filtered)/data_row)"/>
</xsl:variable>
<xsl:for-each select="msxml:node-set($filtered)/data_row">
<xsl:variable name="prev_bedr">
<xsl:choose>
<xsl:when test="position()=1">Quqelequ</xsl:when>
<xsl:otherwise><xsl:value-of select="preceding-sibling::data_row[1]/PRS_BEDRIJF_NAAM"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="this_bedr">
<xsl:value-of select="PRS_BEDRIJF_NAAM"/>
</xsl:variable>
<xsl:variable name="prev_ponr">
<xsl:choose>
<xsl:when test="position()=1">Quqelequ</xsl:when>
<xsl:otherwise><xsl:value-of select="preceding-sibling::data_row[1]/CONTRACTNR"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="this_ponr">
<xsl:value-of select="CONTRACTNR"/>
</xsl:variable>
<xsl:if test="position()=1">
<tr>
<td colspan="4" class="tekst"><br/><b>Factuurnotificatie <xsl:value-of select="MAAND"/></b></td>
</tr>
</xsl:if>
<!--Als 'this' != 'prev', dan invoegen som-regel vorige Leverancier en kop-regel nieuwe Leverancier!-->
<xsl:if test="$this_bedr!=$prev_bedr">
<xsl:if test="position()&gt;1">
<tr>
<td class="tekst"><br/></td>
<td colspan="2" class="tekst"><br/><b>Totaal leverancier</b></td>
<td class="tekst">
<table style="width:100%;">
<tr><td class="tekst" style="width:25%;text-align:right;"><br/><b><xsl:value-of select="format-number(sum(msxml:node-set($filtered)/data_row[PRS_BEDRIJF_NAAM=$prev_bedr]/KOSTEN), '###.###.##0,00', 'european')"/></b></td><td/></tr>
</table>
</td>
</tr>
</xsl:if>
<tr><td colspan="4"><br/><hr/></td></tr>
<tr>
<td class="tekst" style="width:18%;"><br/>Leverancier:</td>
<td class="tekst" style="width:32%;"><br/><xsl:value-of select="PRS_BEDRIJF_NAAM"/></td>
<td class="tekst" style="width:18%;"/>
<td class="tekst" style="width:32%;"/>
</tr>
</xsl:if>
<!--Als 'this' != 'prev', dan invoegen nieuwe PO-regel (= gegroepeerd op Leverancier/Inkoopordernr)!-->
<xsl:if test="$this_bedr!=$prev_bedr or $this_ponr!=$prev_ponr">
<tr>
<td class="tekst"><br/><xsl:value-of select="INKOOPORDERNR"/></td>
<td colspan="2" class="tekst"><br/><xsl:value-of select="CONTRACTNR"/> - <xsl:value-of select="BESCHRIJVING"/></td>
<td class="tekst">
<table style="width:100%;">
<tr><td class="tekst" style="width:25%;text-align:right;"><br/><xsl:value-of select="format-number(sum(msxml:node-set($filtered)/data_row[PRS_BEDRIJF_NAAM=$this_bedr and CONTRACTNR=$this_ponr]/KOSTEN), '###.###.##0,00', 'european')"/></td><td/></tr>
</table>
</td>
</tr>
</xsl:if>
<xsl:if test="position()=$row_count">
<tr>
<td class="tekst"><br/></td>
<td colspan="2" class="tekst"><br/><b>Totaal leverancier</b></td>
<td class="tekst">
<table style="width:100%;">
<tr><td class="tekst" style="width:25%;text-align:right;"><br/><b><xsl:value-of select="format-number(sum(msxml:node-set($filtered)/data_row[PRS_BEDRIJF_NAAM=$this_bedr]/KOSTEN), '###.###.##0,00', 'european')"/></b></td><td/></tr>
</table>
</td>
</tr>
<tr><td colspan="4"><br/><hr/></td></tr>
</xsl:if>
</xsl:for-each>
<tr>
<td class="tekst"><br/></td>
<td colspan="2" class="tekst"><br/><b>Totaal generaal</b></td>
<td class="tekst">
<table style="width:100%;">
<tr><td class="tekst" style="width:25%;text-align:right;"><br/><b><xsl:value-of select="format-number(sum(msxml:node-set($filtered)/data_row/KOSTEN), '###.###.##0,00', 'european')"/></b></td><td/></tr>
</table>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
</table>
</xsl:if>
<xsl:if test="@view='KFSG_V_RAP_ACTUAL_FACT_TOT'">
<table class="rstable sortable">
<xsl:if test="count(rapport_data/data_row)=0">
<tr><td class="tekst"><center><b>Geen gegevens gevonden</b></center></td></tr>
</xsl:if>
<xsl:for-each select="rapport_data/data_row">
<!--xsl:sort select="MAAND"/-->
<xsl:sort select="FCLT_F_LEVERANCIER"/>
<xsl:sort select="INKOOPORDERNR"/>
<xsl:sort select="CONTRACTNR"/>
<xsl:if test="position()=1">
<tr>
<th style="font-size:10pt;">Maand</th>
<th style="font-size:10pt;">Leverancier</th>
<th style="font-size:10pt;">Contractnr</th>
<th style="font-size:10pt;">Beschrijving</th>
<th style="font-size:10pt;">Inkoopordernr</th>
<th style="font-size:10pt;">Aantal</th>
<th style="font-size:10pt;">Kosten (€)</th>
</tr>
</xsl:if>
<tr>
<td class="tekst"><xsl:value-of select="MAAND"/></td>
<td class="tekst"><xsl:value-of select="FCLT_F_LEVERANCIER"/></td>
<td class="tekst"><xsl:value-of select="CONTRACTNR"/></td>
<td class="tekst"><xsl:value-of select="BESCHRIJVING"/></td>
<!--td><xsl:value-of select="INKOOPORDERNR"/></td-->
<xsl:element name="td">
<xsl:choose>
<xsl:when test="BROC_FLAG='B'">
<xsl:attribute name="title">Toon variabele bestelopdrachten.</xsl:attribute>
<xsl:attribute name="class">tekst</xsl:attribute>
<xsl:attribute name="style">cursor:pointer;</xsl:attribute>
<xsl:attribute name="onclick">FcltMgr.openDetail('appl/fac/fac_usrrap_list.asp?usrrap_key=601&amp;fclt_f_colname1=MAAND&amp;fclt_f_colvalue1=<xsl:value-of select="MAAND"/>&amp;fclt_f_colname2=FCLT_F_LEVERANCIER&amp;fclt_f_colvalue2=<xsl:value-of select="FCLT_F_LEVERANCIER"/>&amp;fclt_f_colname3=FCLT_F_CONTRACTNR&amp;fclt_f_colvalue3=<xsl:value-of select="CONTRACTNR"/>', '<xsl:value-of select="MAAND"/>/<xsl:value-of select="CONTRACTNR"/>');</xsl:attribute>
<u><xsl:value-of select="INKOOPORDERNR"/></u>
</xsl:when>
<xsl:when test="BROC_FLAG='R'">
<xsl:attribute name="title">Toon variabele reserveringen.</xsl:attribute>
<xsl:attribute name="class">tekst</xsl:attribute>
<xsl:attribute name="style">cursor:pointer;</xsl:attribute>
<xsl:attribute name="onclick">FcltMgr.openDetail('appl/fac/fac_usrrap_list.asp?usrrap_key=582&amp;fclt_f_colname1=MAAND&amp;fclt_f_colvalue1=<xsl:value-of select="MAAND"/>&amp;fclt_f_colname2=FCLT_F_LEVERANCIER&amp;fclt_f_colvalue2=<xsl:value-of select="FCLT_F_LEVERANCIER"/>&amp;fclt_f_colname3=FCLT_F_CONTRACTNR&amp;fclt_f_colvalue3=<xsl:value-of select="CONTRACTNR"/>', '<xsl:value-of select="MAAND"/>/<xsl:value-of select="CONTRACTNR"/>');</xsl:attribute>
<u><xsl:value-of select="INKOOPORDERNR"/></u>
</xsl:when>
<xsl:when test="BROC_FLAG='O'">
<xsl:attribute name="title">Toon variabele opdrachten.</xsl:attribute>
<xsl:attribute name="class">tekst</xsl:attribute>
<xsl:attribute name="style">cursor:pointer;</xsl:attribute>
<xsl:attribute name="onclick">FcltMgr.openDetail('appl/fac/fac_usrrap_list.asp?usrrap_key=581&amp;fclt_f_colname1=MAAND&amp;fclt_f_colvalue1=<xsl:value-of select="MAAND"/>&amp;fclt_f_colname2=FCLT_F_LEVERANCIER&amp;fclt_f_colvalue2=<xsl:value-of select="FCLT_F_LEVERANCIER"/>&amp;fclt_f_colname3=FCLT_F_CONTRACTNR&amp;fclt_f_colvalue3=<xsl:value-of select="CONTRACTNR"/>', '<xsl:value-of select="MAAND"/>/<xsl:value-of select="CONTRACTNR"/>');</xsl:attribute>
<u><xsl:value-of select="INKOOPORDERNR"/></u>
</xsl:when>
<xsl:otherwise>
<xsl:attribute name="class">tekst</xsl:attribute>
<xsl:value-of select="INKOOPORDERNR"/>
</xsl:otherwise>
</xsl:choose>
</xsl:element>
<td class="tekst"><xsl:value-of select="AANTAL"/></td>
<td class="tekst" style="text-align:right;"><xsl:value-of select="format-number(KOSTEN, '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:for-each>
<tr>
<td colspan="6" class="tekst"><b>Totaal</b></td>
<td class="tekst" style="text-align:right;"><xsl:value-of select="format-number(sum(rapport_data/data_row/KOSTEN), '###.###.##0,00', 'european')"/></td>
</tr>
</table>
</xsl:if>
<xsl:if test="@view='KFSG_V_RAP_FROZEN_FACT_TOT'">
<table class="rstable sortable">
<xsl:if test="count(rapport_data/data_row)=0">
<tr><td class="tekst"><center><b>Geen gegevens gevonden</b></center></td></tr>
</xsl:if>
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="FCLT_F_MAAND"/>
<xsl:sort select="FCLT_F_LEVERANCIER"/>
<xsl:sort select="INKOOPORDERNR"/>
<xsl:sort select="CONTRACTNR"/>
<xsl:if test="position()=1">
<tr>
<th style="font-size:10pt;">Maand</th>
<th style="font-size:10pt;">Leverancier</th>
<th style="font-size:10pt;">Contractnr</th>
<th style="font-size:10pt;">Beschrijving</th>
<th style="font-size:10pt;">Inkoopordernr</th>
<th style="font-size:10pt;">Aantal</th>
<th style="font-size:10pt;">Kosten (€)</th>
</tr>
</xsl:if>
<tr>
<td class="tekst"><xsl:value-of select="MAAND"/></td>
<td class="tekst"><xsl:value-of select="FCLT_F_LEVERANCIER"/></td>
<td class="tekst"><xsl:value-of select="CONTRACTNR"/></td>
<td class="tekst"><xsl:value-of select="BESCHRIJVING"/></td>
<!--td><xsl:value-of select="INKOOPORDERNR"/></td-->
<xsl:element name="td">
<xsl:choose>
<xsl:when test="BROC_FLAG='B'">
<xsl:attribute name="title">Toon variabele bestelopdrachten.</xsl:attribute>
<xsl:attribute name="class">tekst</xsl:attribute>
<xsl:attribute name="style">cursor:pointer;</xsl:attribute>
<xsl:attribute name="onclick">FcltMgr.openDetail('appl/fac/fac_usrrap_list.asp?usrrap_key=601&amp;fclt_f_colname1=MAAND&amp;fclt_f_colvalue1=<xsl:value-of select="MAAND"/>&amp;fclt_f_colname2=FCLT_F_LEVERANCIER&amp;fclt_f_colvalue2=<xsl:value-of select="FCLT_F_LEVERANCIER"/>&amp;fclt_f_colname3=FCLT_F_CONTRACTNR&amp;fclt_f_colvalue3=<xsl:value-of select="CONTRACTNR"/>', '<xsl:value-of select="MAAND"/>/<xsl:value-of select="CONTRACTNR"/>');</xsl:attribute>
<u><xsl:value-of select="INKOOPORDERNR"/></u>
</xsl:when>
<xsl:when test="BROC_FLAG='R'">
<xsl:attribute name="title">Toon variabele reserveringen.</xsl:attribute>
<xsl:attribute name="class">tekst</xsl:attribute>
<xsl:attribute name="style">cursor:pointer;</xsl:attribute>
<xsl:attribute name="onclick">FcltMgr.openDetail('appl/fac/fac_usrrap_list.asp?usrrap_key=582&amp;fclt_f_colname1=MAAND&amp;fclt_f_colvalue1=<xsl:value-of select="MAAND"/>&amp;fclt_f_colname2=FCLT_F_LEVERANCIER&amp;fclt_f_colvalue2=<xsl:value-of select="FCLT_F_LEVERANCIER"/>&amp;fclt_f_colname3=FCLT_F_CONTRACTNR&amp;fclt_f_colvalue3=<xsl:value-of select="CONTRACTNR"/>', '<xsl:value-of select="MAAND"/>/<xsl:value-of select="CONTRACTNR"/>');</xsl:attribute>
<u><xsl:value-of select="INKOOPORDERNR"/></u>
</xsl:when>
<xsl:when test="BROC_FLAG='O'">
<xsl:attribute name="title">Toon variabele opdrachten.</xsl:attribute>
<xsl:attribute name="class">tekst</xsl:attribute>
<xsl:attribute name="style">cursor:pointer;</xsl:attribute>
<xsl:attribute name="onclick">FcltMgr.openDetail('appl/fac/fac_usrrap_list.asp?usrrap_key=581&amp;fclt_f_colname1=MAAND&amp;fclt_f_colvalue1=<xsl:value-of select="MAAND"/>&amp;fclt_f_colname2=FCLT_F_LEVERANCIER&amp;fclt_f_colvalue2=<xsl:value-of select="FCLT_F_LEVERANCIER"/>&amp;fclt_f_colname3=FCLT_F_CONTRACTNR&amp;fclt_f_colvalue3=<xsl:value-of select="CONTRACTNR"/>', '<xsl:value-of select="MAAND"/>/<xsl:value-of select="CONTRACTNR"/>');</xsl:attribute>
<u><xsl:value-of select="INKOOPORDERNR"/></u>
</xsl:when>
<xsl:otherwise>
<xsl:attribute name="class">tekst</xsl:attribute>
<xsl:value-of select="INKOOPORDERNR"/>
</xsl:otherwise>
</xsl:choose>
</xsl:element>
<td class="tekst"><xsl:value-of select="AANTAL"/></td>
<td class="tekst" style="text-align:right;"><xsl:value-of select="format-number(KOSTEN, '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:for-each>
<tr>
<td colspan="6" class="tekst"><b>Totaal</b></td>
<td class="tekst" style="text-align:right;"><xsl:value-of select="format-number(sum(rapport_data/data_row/KOSTEN), '###.###.##0,00', 'european')"/></td>
</tr>
</table>
</xsl:if>
<xsl:if test="@view='KFSG_V_RAP_ACTUAL_FACT_BES' or @view='KFSG_V_RAP_FROZEN_FACT_BES'">
<table class="rstable sortable">
<xsl:if test="count(rapport_data/data_row)=0">
<tr><td class="tekst"><center><b>Geen gegevens gevonden</b></center></td></tr>
</xsl:if>
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="BES_BESTELLING_KEY" data-type="number"/>
<xsl:sort select="BES_ID"/>
<xsl:if test="position()=1">
<tr>
<th style="font-size:10pt;">Bestelopdracht</th>
<th style="font-size:10pt;">Plaats</th>
<th style="font-size:10pt;">Catalogus</th>
<th style="font-size:10pt;">Bestel-<br/>datum</th>
<th style="font-size:10pt;">Lever-<br/>datum</th>
<th style="font-size:10pt;">Status</th>
<th style="font-size:10pt;">Leverancier<br/>Contactpersoon</th>
<th style="font-size:10pt;">Kosten (€)</th>
</tr>
</xsl:if>
<tr>
<xsl:element name="td">
<xsl:attribute name="title">link naar details van opdracht</xsl:attribute>
<xsl:attribute name="class">tekst</xsl:attribute>
<xsl:attribute name="style">cursor:pointer;</xsl:attribute>
<xsl:attribute name="onclick">FcltMgr.openDetail('appl/bes/bes_show_opdr.asp?urole=bo&amp;opdr_key=<xsl:value-of select="BES_BESTELOPDR_KEY"/>', 'Details <xsl:value-of select="BES_BESTELOPDR_KEY"/>');</xsl:attribute>
<u><xsl:value-of select="BES_ID"/></u>
</xsl:element>
<td class="tekst"><xsl:value-of select="PLAATS"/><br/><xsl:value-of select="RUIMTE"/></td>
<td class="tekst"><xsl:value-of select="CATALOGUS"/></td>
<td class="tekst"><xsl:value-of select="substring-before(BESTELDATUM,'T')"/></td>
<td class="tekst"><xsl:value-of select="substring-before(LEVERDATUM,'T')"/></td>
<td class="tekst"><xsl:value-of select="BESTELOPDRACHTSTATUS"/></td>
<td class="tekst"><xsl:value-of select="FCLT_F_LEVERANCIER"/><br/><xsl:value-of select="CONTACTPERSOON"/></td>
<td class="tekst" style="text-align:right;"><xsl:value-of select="format-number(KOSTEN, '0,00', 'european')"/></td>
</tr>
</xsl:for-each>
<tr>
<td colspan="7" class="tekst"><b>Totaal</b></td>
<td class="tekst" style="text-align:right;"><xsl:value-of select="format-number(sum(rapport_data/data_row/KOSTEN), '0,00', 'european')"/></td>
</tr>
</table>
</xsl:if>
<xsl:if test="@view='KFSG_V_RAP_ACTUAL_FACT_RES' or @view='KFSG_V_RAP_FROZEN_FACT_RES'">
<table class="rstable sortable">
<xsl:if test="count(rapport_data/data_row)=0">
<tr><td class="tekst"><center><b>Geen gegevens gevonden</b></center></td></tr>
</xsl:if>
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="RES_RESERVERING_KEY" data-type="number"/>
<xsl:sort select="RES_ID"/>
<xsl:if test="position()=1">
<tr>
<th style="font-size:10pt;">Reservering<br/>Activiteit</th>
<th style="font-size:10pt;">Plaats</th>
<th style="font-size:10pt;">Omschrijving</th>
<th style="font-size:10pt;">Van-<br/>datum</th>
<th style="font-size:10pt;">Tot-<br/>datum</th>
<th style="font-size:10pt;">Status</th>
<th style="font-size:10pt;">Leverancier<br/>Contactpersoon</th>
<th style="font-size:10pt;">Kosten (€)</th>
</tr>
</xsl:if>
<tr>
<xsl:element name="td">
<xsl:attribute name="title">link naar details van opdracht</xsl:attribute>
<xsl:attribute name="class">tekst</xsl:attribute>
<xsl:attribute name="style">cursor:pointer;</xsl:attribute>
<xsl:attribute name="onclick">FcltMgr.openDetail('appl/res/res_show_rsv_ruimte.asp?urole=bo&amp;rsv_ruimte_key=<xsl:value-of select="RES_RSV_RUIMTE_KEY"/>', 'Details <xsl:value-of select="RES_RSV_RUIMTE_KEY"/>');</xsl:attribute>
<u><xsl:value-of select="RES_ID"/></u><br/><xsl:value-of select="ACTIVITEIT"/>
</xsl:element>
<td class="tekst"><xsl:value-of select="PLAATS"/><br/><xsl:value-of select="RUIMTE"/></td>
<td class="tekst"><xsl:value-of select="OMSCHRIJVING"/></td>
<td class="tekst"><xsl:value-of select="substring-before(VAN_TIJD,'T')"/></td>
<td class="tekst"><xsl:value-of select="substring-before(TOT_TIJD,'T')"/></td>
<td class="tekst"><xsl:value-of select="STATUS"/></td>
<td class="tekst"><xsl:value-of select="FCLT_F_LEVERANCIER"/><br/><xsl:value-of select="CONTACTPERSOON"/></td>
<td class="tekst" style="text-align:right;"><xsl:value-of select="format-number(KOSTEN, '0,00', 'european')"/></td>
</tr>
</xsl:for-each>
<tr>
<td colspan="7" class="tekst"><b>Totaal</b></td>
<td class="tekst" style="text-align:right;"><xsl:value-of select="format-number(sum(rapport_data/data_row/KOSTEN), '0,00', 'european')"/></td>
</tr>
</table>
</xsl:if>
<xsl:if test="@view='KFSG_V_RAP_ACTUAL_FACT_MLD' or @view='KFSG_V_RAP_FROZEN_FACT_MLD'">
<table class="rstable sortable">
<xsl:if test="count(rapport_data/data_row)=0">
<tr><td class="tekst"><center><b>Geen gegevens gevonden</b></center></td></tr>
</xsl:if>
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="MLD_MELDING_KEY" data-type="number"/>
<xsl:sort select="MLD_OPDR_KEY" data-type="number"/>
<xsl:if test="position()=1">
<tr>
<th style="font-size:10pt;">Opdracht<br/>Opdrachttype</th>
<th style="font-size:10pt;">Plaats</th>
<th style="font-size:10pt;">Melding<br/>Omschrijving</th>
<th style="font-size:10pt;">Opdracht-<br/>datum</th>
<th style="font-size:10pt;">Einddatum</th>
<th style="font-size:10pt;">Meldingstatus<br/>Opdrachtstatus</th>
<th style="font-size:10pt;">Uitvoerende<br/>Contactpersoon</th>
<th style="font-size:10pt;">Afhandeling</th>
<th style="font-size:10pt;">Kosten (€)</th>
</tr>
</xsl:if>
<tr>
<xsl:element name="td">
<xsl:attribute name="title">link naar details van opdracht</xsl:attribute>
<xsl:attribute name="class">tekst</xsl:attribute>
<xsl:attribute name="style">cursor:pointer;</xsl:attribute>
<xsl:attribute name="onclick">FcltMgr.openDetail('appl/mld/mld_opdr.asp?urole=bo&amp;opdr_key=<xsl:value-of select="MLD_OPDR_KEY"/>', 'Details <xsl:value-of select="MLD_OPDR_KEY"/>');</xsl:attribute>
<u><xsl:value-of select="OPDR_ID"/></u><br/><xsl:value-of select="OPDRACHTTYPE"/>
</xsl:element>
<td class="tekst"><xsl:value-of select="PLAATS"/></td>
<td class="tekst"><xsl:value-of select="MLD_STDMELDING_OMS"/><br/><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="OMSCHRIJVING"/></xsl:call-template></td>
<td class="tekst"><xsl:value-of select="MELDINGSTATUS"/><br/><xsl:value-of select="OPDRACHTSTATUS"/></td>
<td class="tekst"><xsl:value-of select="substring-before(BEGINDATUM,'T')"/></td>
<td class="tekst"><xsl:value-of select="substring-before(EINDDATUM,'T')"/></td>
<td class="tekst"><xsl:value-of select="FCLT_F_LEVERANCIER"/><br/><xsl:value-of select="CONTACTPERSOON"/></td>
<td class="tekst"><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="AFHANDELING"/></xsl:call-template></td>
<td class="tekst" style="text-align:right;"><xsl:value-of select="format-number(KOSTEN, '0,00', 'european')"/></td>
</tr>
</xsl:for-each>
<tr>
<td colspan="8" class="tekst"><b>Totaal</b></td>
<td class="tekst" style="text-align:right;"><xsl:value-of select="format-number(sum(rapport_data/data_row/KOSTEN), '0,00', 'european')"/></td>
</tr>
</table>
</xsl:if>
</html>
</xsl:template>

View File

@@ -10,3 +10,6 @@ cscript /E:javascript SYNC/Mareon.js "SYNC/FCLT/MareonFacilitor_DEMO.xml"
cscript /E:javascript SYNC/Mareon.js "SYNC/FCLT/AAGN_A.xml"
REM MARX#56423: Pilot Mareon i.c.m. Logchies
cscript /E:javascript SYNC/Mareon.js "SYNC/FCLT/ARAI_A.xml"

View File

@@ -0,0 +1,65 @@
<?xml version="1.0"?>
<ini>
<common>
<!-- Logging/Loglevel: 0 (geen logging), 1 of 2 (uitgebreide logging). -->
<logging>0</logging>
</common>
<tobias>
<!-- URL van de Tobias webservice 'TobiasConnect' -->
<url></url>
<appserver></appserver>
<methodlocation></methodlocation>
<!-- Methode van Gereedmelden in Tobias: 0 = GereedMelden (direct), 1 = GereedMeldenNaarSgWeb (via sgweb) -->
<methodegereedmelden></methodegereedmelden>
<!-- Aantal dagen in het verleden om open opdrachten op te halen -->
<opdr_past_days></opdr_past_days><!-- opdr_past_days is default 1 (alle opdrachten vanaf gisteren) -->
<opdr_today></opdr_today><!-- opdr_today is optioneel en default empty (empty = alle opdrachten tot en met vandaag, 1 = alle opdrachten tot met gisteren, 2 = eergisteren etc) -->
</tobias>
<ax>
<!-- URL van de AX webservice 'SupplierService' -->
<url></url>
<!-- Aantal dagen in het verleden om open opdrachten op te halen -->
<opdr_past_days></opdr_past_days><!-- opdr_past_days is default 1 (alle opdrachten vanaf gisteren) -->
<opdr_today></opdr_today><!-- opdr_today is optioneel en default empty (empty = alle opdrachten tot en met vandaag, 1 = alle opdrachten tot met gisteren, 2 = eergisteren etc) -->
</ax>
<ax2012>
<!-- URL van de AX webservice 'SupplierService' -->
<url></url>
<!-- AX2012 Logon as -->
<logonAs></logonAs>
<!-- AX2012 bcProxy encripted username/password-->
<bcProxy></bcProxy>
<!-- Aantal dagen in het verleden om open opdrachten op te halen -->
<opdr_past_days></opdr_past_days><!-- opdr_past_days is default 1 (alle opdrachten vanaf gisteren) -->
<opdr_today></opdr_today><!-- opdr_today is optioneel en default empty (empty = alle opdrachten tot en met vandaag, 1 = alle opdrachten tot met gisteren, 2 = eergisteren etc) -->
</ax2012>
<fclt>
<!-- URL + account van de CUST-Facilitor Webservice -->
<url>https://arai.facilitor-test.nl/</url>
<!-- API key van perslid voor Mareon communicatie van alle API's -->
<apikey>l4IQD0JhirnfnpGyPzM0NX5KamX1YrW9</apikey>
<factuur>
<xmlfolder>facilitor\arai\xml\</xmlfolder>
<pdffolder>facilitor\arai\pdf\</pdffolder>
</factuur>
</fclt>
<rems>
<!-- Folder waar opdrachten vanuit en door REMS als XML worden geplaatst -->
<opdrachtenfolder></opdrachtenfolder>
<!-- Folder waar de status van een opdracht vanuit en door Mareon als XML worden geplaatst -->
<opdrachtstatusfolder></opdrachtstatusfolder>
<facturenfolder></facturenfolder>
</rems>
<xtractor>
<xmlfolder></xmlfolder>
<pdffolder></pdffolder>
<succeededfolder></succeededfolder>
<rejectedfolder></rejectedfolder>
</xtractor>
<facilitor>
<!-- URL van Mareon -->
<url>https://marx.mareon-test.nl/</url>
<!-- API key van perslid 'opdrachtgever' in Mareon voor communicatie van alle API's -->
<apikey>2W0CDJY7PQIS12BV685CF3SLRYSDZGKA</apikey>
</facilitor>
</ini>

View File

@@ -135,10 +135,13 @@
<xsl:template name="Mareon_btwperc">
<xsl:param name="p_btwperc"/>
<xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'" />
<xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" />
<xsl:variable name="v_btwperc" select="translate($p_btwperc, $lowercase, $uppercase)" />
<xsl:choose>
<xsl:when test="$p_btwperc = 'Hoog'">21</xsl:when>
<xsl:when test="$p_btwperc = 'Laag'">9</xsl:when>
<xsl:when test="$p_btwperc = 'Geen'">0</xsl:when>
<xsl:when test="$v_btwperc = 'HOOG'">21</xsl:when>
<xsl:when test="$v_btwperc = 'LAAG'">9</xsl:when>
<xsl:when test="$v_btwperc = 'GEEN'">0</xsl:when>
<xsl:otherwise></xsl:otherwise>
</xsl:choose>
</xsl:template>

View File

@@ -94,10 +94,13 @@
<xsl:template name="Mareon_btwperc">
<xsl:param name="p_btwperc"/>
<xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'" />
<xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" />
<xsl:variable name="v_btwperc" select="translate($p_btwperc, $lowercase, $uppercase)" />
<xsl:choose>
<xsl:when test="$p_btwperc = 'Hoog'">21</xsl:when>
<xsl:when test="$p_btwperc = 'Laag'">9</xsl:when>
<xsl:when test="$p_btwperc = 'Geen'">0</xsl:when>
<xsl:when test="$v_btwperc = 'HOOG'">21</xsl:when>
<xsl:when test="$v_btwperc = 'LAAG'">9</xsl:when>
<xsl:when test="$v_btwperc = 'GEEN'">0</xsl:when>
<xsl:otherwise><xsl:value-of select="$p_btwperc"/></xsl:otherwise>
</xsl:choose>
</xsl:template>

View File

@@ -28,6 +28,7 @@
<!-- Als getal begint met een . (decimale punt), dan ontbreekt volgens de officiele regel kennelijk de voorloopnul -->
<!-- Deze zetten we er dan maar bij -->
<xsl:choose>
<xsl:when test="substring($p_decimal,1,2) = '-.'">-0<xsl:value-of select="substring($p_decimal,2)"/></xsl:when>
<xsl:when test="substring($p_decimal,1,1) = '.'">0<xsl:value-of select="$p_decimal"/></xsl:when>
<xsl:otherwise><xsl:value-of select="$p_decimal"/></xsl:otherwise>
</xsl:choose>

View File

@@ -160,10 +160,13 @@
<xsl:template name="Mareon_btwperc">
<xsl:param name="p_btwperc"/>
<xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'" />
<xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" />
<xsl:variable name="v_btwperc" select="translate($p_btwperc, $lowercase, $uppercase)" />
<xsl:choose>
<xsl:when test="$p_btwperc = 'Hoog'">21</xsl:when>
<xsl:when test="$p_btwperc = 'Laag'">9</xsl:when>
<xsl:when test="$p_btwperc = 'Geen'">0</xsl:when>
<xsl:when test="$v_btwperc = 'HOOG'">21</xsl:when>
<xsl:when test="$v_btwperc = 'LAAG'">9</xsl:when>
<xsl:when test="$v_btwperc = 'GEEN'">0</xsl:when>
<xsl:otherwise></xsl:otherwise>
</xsl:choose>
</xsl:template>

View File

@@ -3,7 +3,236 @@
<xsl:import href="../../../appl/shared/default.xsl"/>
<xsl:import href="../../pchx/xsl/default.xsl"/>
<xsl:template match="bestelling" mode="include">
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
<TR>
<TD WIDTH="40" ROWSPAN="30" ID="LINKERMARGE"></TD>
<TD>
<table border="0" width="100%" bordercolor="#000000" CELLPADDING="2">
<tr>
<td align="left" width="100%" class="caption" colspan="4">
<xsl:element name="a">
<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>?SSO=PCH&amp;<xsl:value-of select="../bookmarks/bestelling"/>
<xsl:value-of select="key"/>
</xsl:attribute>
<xsl:value-of select="//lcl/BES/bestelaanvraag"/>&#xA0;<xsl:value-of select="key"/>
<xsl:if test="ismutatie=1"> (WIJZIGING)</xsl:if>
<xsl:if test="isretour=1"> (RETOUR)</xsl:if>
</xsl:element>
</td>
</tr>
<tr>
<td colspan="4">
<xsl:element name="a">
<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>?SSO=PCH&amp;<xsl:value-of select="../bookmarks/bestelling"/>
<xsl:value-of select="key"/>
</xsl:attribute>
Bekijk deze in Facilitor
</xsl:element>
</td>
</tr>
<xsl:choose>
<xsl:when test="string(aanvrager/naam_full)!=string(voor/naam_full)">
<tr>
<td width="13%" class="label" align="left"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
<td width="33%" class="value" align="right">: <xsl:value-of select="aanvrager/naam_full"/></td>
<td width="20%" class="label" align="left"><xsl:value-of select="//lcl/BES/aanvraagdatum"/></td>
<td width="32%" class="value" align="right">:
<xsl:value-of select="datum/datum"/>&#xA0;
<xsl:value-of select="datum/tijd"/>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/BES/bestelvoor"/></td>
<td class="value">: <xsl:value-of select="voor/naam_full"/></td>
<td colspan="2"/>
</tr>
</xsl:when>
<xsl:otherwise>
<tr>
<td width="13%" class="label" align="left"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
<td width="33%" class="value" align="right">: <xsl:value-of select="voor/naam_full"/></td>
<td width="20%" class="label" align="left"><xsl:value-of select="//lcl/BES/aanvraagdatum"/></td>
<td width="32%" class="value" align="right">:
<xsl:value-of select="datum/datum"/>&#xA0;
<xsl:value-of select="datum/tijd"/>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="string(voor/email)!=''">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/e-mail"/></td>
<td class="value">: <xsl:value-of select="voor/email"/></td>
<td colspan="2"/>
</tr>
</xsl:if>
<xsl:choose>
<xsl:when test="voor/telefoonnr!=''">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/telefoon"/></td>
<td class="value">: <xsl:value-of select="voor/telefoonnr"/></td>
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</tr>
</xsl:when>
<xsl:when test="voor/mobiel!=''">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/telefoon"/></td>
<td class="value">: <xsl:value-of select="voor/mobiel"/></td>
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</tr>
</xsl:when>
<xsl:otherwise>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/telefoon"/></td>
<td class="value">: -</td>
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/afdeling"/></td>
<td class="value">:
<xsl:if test="voor/afdeling/omschrijving=''">-</xsl:if>
<xsl:value-of select="voor/afdeling/omschrijving"/>
</td>
<td class="label"><xsl:value-of select="//lcl/BES/aanvraagstatus"/></td>
<td class="value">: <xsl:value-of select="status"/></td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/kostenplaats"/></td>
<td class="value">:
<xsl:if test="kostenplaats/nr=''">-</xsl:if>
<xsl:value-of select="kostenplaats/nr"/>
</td>
<td colspan="2"/>
</tr>
<tr>
<td class="label" style="vertical-align:top"><xsl:value-of select="//lcl/BES/afleveradres"/></td>
<td class="value">:
<xsl:value-of select="afleveradres/naam"/>
<xsl:if test="afleveradres/bezoek_adres">
<br/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_adres"/>
<br/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_postcode"/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_plaats"/>
<br/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_land"/>
</xsl:if>
</td>
<td colspan="2"/>
</tr>
<xsl:if test="bestel_opm">
<tr>
<td height="10px" colspan="4"/>
</tr>
<tr>
<td class="label" style="vertical-align:top"><xsl:value-of select="//lcl/FAC/opmerkingen"/></td>
<td class="value" colspan="3">:
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="bestel_opm"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
<tr>
<td height="20px"/>
</tr>
<xsl:for-each select="kenmerk[count(@xmlnode)=0]">
<xsl:if test="(@type!='L' and @type!='l' and @type!='Q')">
<tr>
<td class="label">
<xsl:value-of select="@naam"/>
</td>
<td class="value" colspan="3">: <xsl:value-of select="."/></td>
</tr>
</xsl:if>
</xsl:for-each>
<tr>
<td height="20px"/>
</tr>
<tr>
<td colspan="4" style="border-top:1px solid #000;"/>
</tr>
<tr>
<td colspan="4">
<table cellpadding="1" cellspacing="0" border="0" bordercolor="#000000" frame="box" width="99%">
<tr>
<th class="besth" style="text-align:left"><xsl:value-of select="//lcl/BES/artikelnr"/></th>
<th class="besth"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th class="besth"><xsl:value-of select="//lcl/FAC/opmerkingen"/></th>
<th class="besth" style="text-align:right"><xsl:value-of select="//lcl/FAC/aantal"/></th>
<th class="besth" style="text-align:right"><xsl:value-of select="//lcl/FAC/prijs"/></th>
<th class="besth" style="text-align:right"><xsl:value-of select="//lcl/FAC/totaal"/></th>
</tr>
<xsl:for-each select="bestelitem">
<tr>
<td class="besresult" style="text-align:left">
&#xA0;<xsl:value-of select="srtdeel/artikel_nummer"/>
</td>
<td class="besresult" style="text-align:left">
<xsl:value-of select="srtdeel/omschrijving"/>
</td>
<td class="besresult">
<xsl:for-each select="kenmerk[count(@xmlnode)=0]">
<xsl:if test="(@type!='L' and @type!='l' and @type!='Q')">
<xsl:value-of select="@naam"/>:
<xsl:value-of select="."/>
<br/>
</xsl:if>
</xsl:for-each>&#xA0;</td>
<td class="besresult" style="text-align:right">
<xsl:value-of select="aantal"/>
</td>
<td class="besresult" style="text-align:right">
<xsl:value-of select="format-number(prijs, '0,00', 'european')"/>
</td>
<td class="besresult" style="text-align:right">
<xsl:value-of select="format-number(aantal*prijs, '0,00', 'european')"/>
</td>
</tr>
</xsl:for-each>
<tr>
<td colspan="6" height="6px" style="border-top:1px solid #000;"/>
</tr>
<xsl:if test="/facilitor/bestelling/levkosten != '0'">
<tr>
<td class="label" style="text-align:right;border-style:solid;border-width:0px;" colspan="5"><xsl:value-of select="//lcl/BES/transportkosten"/>:</td>
<td class="label" style="text-align:right;border-style:solid;border-width:0px;">
<xsl:value-of select="format-number(/facilitor/bestelling/levkosten, '0,00', 'european')"/>
</td>
</tr>
</xsl:if>
<tr>
<td class="tekstkop" style="text-align:right;border-style:solid;border-width:0px;" colspan="5"><xsl:value-of select="//lcl/FAC/totaal"/>:</td>
<td class="tekstkop" style="text-align:right;border-style:solid;border-width:0px;">
<xsl:value-of select="format-number(sum(/facilitor/bestelling/bestelitem/totaal)+ /facilitor/bestelling/levkosten, '0,00', 'european')"/>
</td>
</tr>
</table>
</td>
</tr>
</table>
</TD>
<TD WIDTH="30" ROWSPAN="30" ID="RECHTERMARGE"/>
</TR>
</TABLE>
</xsl:template>
<xsl:template match="opdracht" mode="include">
<xsl:variable name="custId">

View File

@@ -0,0 +1,137 @@
<%@language = "javascript" %>
<%
Session("customerId") = "PCHW";
ANONYMOUS_Allowed = 1; // We doen echt niets geheims.
//var url = "http://pchw.facws001.sg.nl/branch20182/api2/reports.xml?APIKEY=yjxQIAHEAFvjtSYBrjGHbRRGMohBqeWB&logging=3";
var url = "https://pchw.facilitor.nl/api2/reports.xml?APIKEY=yjxQIAHEAFvjtSYBrjGHbRRGMohBqeWB";
url += "&limit=30&usrrap_key=1001";
var refresh = getQParamInt("refresh", 50);
%>
<!--#include file="../../../appl/Shared/common.inc" -->
<%
FCLTHeader.Requires({ plugins: ["jQuery"],
js: ["date.js"]
});
var soap_req = '';
%>
<html>
<head>
<% FCLTHeader.Generate(); %>
<style>
body {
margin: 0;
font-family: Verdana;
}
table.fullscreen {
position: absolute;
width: 100%;
height: 100%;
}
table {
padding: 5px;
border: 0px;
}
div#error {
background-color:red;
color:white;
position:absolute;
z-index: 1;
padding:4px;
display:none;
}
td.tdleft {
color: #081638;
background-color: white;
text-align: center;
font-weight: bold;
vertical-align: middle;
padding: 0;
border-width: 4px 4px 4px 0px;
border-style: solid;
border-color: white;
width: 25%;
}
td.empty {
background-color: #fff;
}
td.tdleft span.nummer {
font-size: 5em;
}
</style>
<script>
function xtext(xelm)
{
return xelm.textContent || xelm.text;
}
var lastId = null;
var currId = null;
function callbackDone(data, textStatus, jqXHR)
{
var currName = "";
$("#error").hide();
var xmlResp = jQuery.parseXML(jqXHR.responseText);
var data = [];
if (xmlResp)
{
var afm = xmlResp.getElementsByTagName("Pchx_v_laatste_homij_afm");
var currId = xtext(afm[0].getElementsByTagName("mld_opdr_key")[0]);
var currName = xtext(afm[0].getElementsByTagName("mld_melding_key")[0]) + "/" + xtext(afm[0].getElementsByTagName("mld_opdr_bedrijfopdr_volgnr")[0]);
}
// Nu het grote nummer:
var $td = $("#tdbig");
$td.html("<span class='nummer'>" + currName + "</span>")
.removeClass("empty");
if (currId != lastId) {
PlaySound("sound1");
lastId = currId;
}
}
function callbackFail(jqXHR, textStatus, errorThrown)
{
$("#error").text("FAIL: "
+ toTimeString(new Date, true) + " "
+ jqXHR.status + " " + (typeof errorThrown == "string"?errorThrown:errorThrown.message))
.show();
}
// Overrule de ajaxSetup.error uit FcltJquery.js
// We willen absoluut geen alert popup's
$.ajaxSetup(
{"error":function(XMLHttpRequest,textStatus, errorThrown)
{
$("#error").text("FAIL: " + (typeof errorThrown == "string"?errorThrown:errorThrown.message))
.show();
}
});
function refresh()
{
$.get("<%= safe.jsstring(url) %>", "<%= safe.jsstring(soap_req) %>").done(callbackDone).fail(callbackFail);
setTimeout( refresh, 1000 * <%=refresh %>);
}
function PlaySound(soundObj)
{
var snd = new Audio("deurbel3.mp3"); // buffers automatically when created
snd.play();
}
$(refresh);
</script>
</head>
<body>
<div id='error'></div>
<embed src="deurbel3.mp3" autostart="false" width="0" height="0" style='display:none' id="sound1" enablejavascript="true">
<table class='fullscreen'>
<tr><td class='tdleft' id="tdbig"></td></tr>
</table>
</body>
</html>

15
CUST/RABO/RABO.css Normal file
View File

@@ -0,0 +1,15 @@
/*
* $Revision$
* $Id$
*/
td.xcp_prio_3 {
background: #F00;
color: #FFF;
}
td.xcp_prio_2 {
color: #FF8000;
}
td.xcp_prio_1 {
color: #01DF01;
}

View File

@@ -105,10 +105,26 @@ function (RequestForm, bes_srtdeel_key, item, pResult)
}
}
}
// Alleen voor leverancier Heutink uitvoeren (prs_bedrijf_key = 6101)
if (bedr_key == 6101)
{
// Prijs inclusief moet worden gehanteerd in Facilitor, die staat in Custfield_03 en deze moet worden gehanteerda als itemprijs.
if (item == 1) {
var itemprijs = punchNVL("NEW_ITEM-CUST_FIELD3[#]", item, "Onbekend");
__Log('Itemprijs: CUST_FIELD1[' + item + ']= ' + itemprijs);
if (itemprijs != "Onbekend")
{
sql = "UPDATE bes_srtdeel_prijs SET bes_srtdeel_prijs_prijs = " + parseFloat(itemprijs) + " WHERE bes_srtdeel_key = " + bes_srtdeel_key;
oRs = Oracle.Execute(sql);
}
}
}
return result;
}
]]>
</script>
</component>

View File

@@ -1660,7 +1660,7 @@ Voor eventuele vragen of opmerkingen graag een mail naar <a href="mailto:inkoop@
</xsl:when>
<xsl:otherwise>
<tr>
<td colspan="4" class="tekst">
<td colspan="5" class="tekst">
Beste <xsl:value-of select="//GEBRUIKER"/>,
<br/><br/>Je krijgt deze e-mail omdat je producten van SVRZ in bruikleen hebt en er onlangs een wijziging heeft plaats gevonden.
<br/><br/>SVRZ geeft producten in bruikleen uit aan medewerkers.
@@ -1688,7 +1688,7 @@ De registratie van deze goederen beheert SVRZ in het programma <i>'Facilitor'</i
</tr>
</xsl:for-each>
<tr>
<td colspan="4" class="tekst">
<td colspan="5" class="tekst">
<br/>Belangrijk: door middel van deze mail ga je automatisch akkoord met de regeling of gebruikersovereenkomst die voor de hier boven aangegeven producten geldt.
Deze regelingen zijn terug te vinden op ForUs en/of zijn meegeleverd bij de uitgifte.
<br/><br/><i>Is de registratie niet correct of ga je niet akkoord met de regeling van de goederen?</i>

View File

@@ -292,6 +292,8 @@
<td colspan="3" class="tekst" style="width:68%;font-size:12pt;vertical-align:bottom;"><b>Klacht <xsl:value-of select="melding/discipline/srtdiscipline/prefix"/><xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></b></td></xsl:if>
<xsl:if test="opdrachttype/key='422'"><!--Interne opdracht-->
<td colspan="3" class="tekst" style="width:68%;font-size:12pt;vertical-align:bottom;"><b>Interne opdracht <xsl:value-of select="melding/discipline/srtdiscipline/prefix"/><xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></b></td></xsl:if>
<xsl:if test="opdrachttype/key='881'"><!--Interne opdracht-->
<td colspan="3" class="tekst" style="width:68%;font-size:12pt;vertical-align:bottom;"><b>Interne opdracht toegangspas <xsl:value-of select="melding/discipline/srtdiscipline/prefix"/><xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></b></td></xsl:if>
</tr>
<tr><td colspan="4"><br/><br/><hr/></td></tr>
</table>
@@ -368,7 +370,7 @@
<td class="tekst" colspan="2"><xsl:if test="melding/plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr!=''">Ruimte: <xsl:value-of select="melding/plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/> (<xsl:value-of select="melding/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>)</xsl:if></td>
</tr>
<tr><td colspan="4"><hr/></td></tr>
<xsl:if test="opdrachttype/key='169'"><!--Offerte opdracht-->
@@ -464,18 +466,137 @@
<tr>
<td height="10px"/>
</tr>
<tr>
<td class="tekst">Omschrijving:</td>
</tr>
<tr>
<td colspan="4" class="tekst"><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="omschrijving"/></xsl:call-template><br/><br/></td></tr>
<xsl:if test="opdrachttype/key='5'"><!--Mandaat (standaard)-->
<xsl:if test="opdrachttype/key!=881"><!--Interne opdracht toegangspas-->
<tr>
<td class="tekst">Omschrijving:</td>
</tr>
<tr>
<td colspan="4" class="tekst"><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="omschrijving"/></xsl:call-template><br/><br/></td></tr></xsl:if>
<xsl:if test="opdrachttype/key=881"><!--Interne opdracht toegangspas-->
<xsl:if test="melding/stdmelding/key='901'">
<tr>
<td class="tekst">Mandaat:</td>
<td class="tekst"><xsl:choose>
<td class="tekst"><b>Omschrijving:</b></td>
</tr>
<tr>
<td class="tekst">Naam aanvrager:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=902]"/></td>
</tr>
<tr>
<td class="tekst">Datum aanvraag:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=843]"/></td>
</tr>
<tr>
<td class="tekst">Telefoonnummer:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=844]"/></td>
</tr>
<tr>
<td class="tekst">Bedrijf (*gevestigd op Pivot Park):<br/><br/></td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=845]"/><br/><br/></td>
</tr>
<tr>
<td class="tekst">Naam</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=848]"/></td>
</tr>
<tr>
<td class="tekst">Voorletters:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=842]"/></td>
</tr>
<tr>
<td class="tekst">Bedrijfsnaam:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=849]"/></td>
</tr>
<tr>
<td class="tekst">Adres werkgever:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=850]"/></td>
</tr>
<tr>
<td class="tekst">Vestigingsplaats:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=851]"/></td>
</tr>
<tr>
<td class="tekst">Contactpersoon (indien afwijkend pashouder):</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=852]"/></td>
</tr>
<tr>
<td class="tekst">Telefoonnummer Bedrijf:<br/><br/></td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=853]"/><br/><br/></td>
</tr>
<tr>
<td class="tekst">Toegangspas geldig van:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=854]"/></td>
</tr>
<tr>
<td class="tekst">Toegangspas geldig tot:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=855]"/></td>
</tr>
<tr>
<td class="tekst">Toegangspas geldig voor onbepaalde tijd:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=856]"/></td>
</tr>
<tr>
<td class="tekst">Akkoord voorwaarden:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=835]"/></td>
</tr>
<tr><td><br/><br/></td></tr>
</xsl:if>
<xsl:if test="melding/stdmelding/key='945'">
<tr>
<td class="tekst"><b>Omschrijving:</b></td>
</tr>
<tr>
<td class="tekst">Naam:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=822]"/></td>
</tr>
<tr>
<td class="tekst">Telefoonnummer:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=824]"/></td>
</tr>
<tr>
<td class="tekst">Datum:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=825]"/></td>
</tr>
<tr>
<td class="tekst">Bedrijf (*gevestigd op Pivot Park):<br/><br/></td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=826]"/><br/><br/></td>
</tr>
<tr>
<td class="tekst">Naam XS-pashouder</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=828]"/></td>
</tr>
<tr>
<td class="tekst">Voorletters XS-pashouder:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=823]"/></td>
</tr>
<tr>
<td class="tekst">Toegangspas geldig van:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=829]"/></td>
</tr>
<tr>
<td class="tekst">Toegangspas geldig tot:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=881]"/></td>
</tr>
<tr>
<td class="tekst">Toegangspas geldig voor onbepaalde tijd:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=830]"/></td>
</tr>
<tr>
<td class="tekst">Toegang buiten kantooruren gewenst:<br/><br/></td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=831]"/><br/><br/></td>
</tr>
<tr>
<td class="tekst">Akkoord voorwaarden:</td>
<td class="tekst"><xsl:value-of select="melding/kenmerk[@key=835]"/></td>
</tr>
<tr><td><br/><br/></td></tr>
</xsl:if>
</xsl:if>
<xsl:if test="opdrachttype/key='5'"><!--Mandaat (standaard)-->
<tr>
<td class="tekst">Mandaat:</td>
<td class="tekst"><xsl:choose>
<xsl:when test="$mandaat_leverancier!=''"><xsl:value-of select="$mandaat_leverancier"/>,00</xsl:when><xsl:otherwise><xsl:value-of select="$mandaat_district"/>,00</xsl:otherwise></xsl:choose></td>
</tr>
<xsl:when test="$mandaat_leverancier!=''"><xsl:value-of select="$mandaat_leverancier"/>,00</xsl:when><xsl:otherwise><xsl:value-of select="$mandaat_district"/>,00</xsl:otherwise></xsl:choose></td>
</tr>
</xsl:if>
<tr><td colspan="4"><hr/></td></tr>
</table>
@@ -1580,3 +1701,35 @@
</xsl:template>
</xsl:stylesheet>
<!-- Stylus Studio meta-information - (c) 2004-2009. Progress Software Corporation. All rights reserved.
<metaInformation>
<scenarios>
<scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\TEMP\KFPP_files\opdracht26532_20190212092216_276.xml" htmlbaseurl="" outputurl="" processortype="saxon8" useresolver="yes" profilemode="0"
profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" validateoutput="no"
validator="internal" customvalidator="">
<advancedProp name="bSchemaAware" value="true"/>
<advancedProp name="xsltVersion" value="2.0"/>
<advancedProp name="schemaCache" value="||"/>
<advancedProp name="iWhitespace" value="0"/>
<advancedProp name="bWarnings" value="true"/>
<advancedProp name="bXml11" value="false"/>
<advancedProp name="bUseDTD" value="false"/>
<advancedProp name="bXsltOneIsOkay" value="true"/>
<advancedProp name="bTinyTree" value="true"/>
<advancedProp name="bGenerateByteCode" value="true"/>
<advancedProp name="bExtensions" value="true"/>
<advancedProp name="iValidation" value="0"/>
<advancedProp name="iErrorHandling" value="fatal"/>
<advancedProp name="sInitialTemplate" value=""/>
<advancedProp name="sInitialMode" value=""/>
</scenario>
</scenarios>
<MapperMetaTag>
<MapperInfo srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
<MapperBlockPosition></MapperBlockPosition>
<TemplateContext></TemplateContext>
<MapperFilter side="source"></MapperFilter>
</MapperMetaTag>
</metaInformation>
-->

View File

@@ -980,7 +980,7 @@ Kempen &amp; Co N.V. is statutair gevestigd aan de Beethovenstraat 300, 1077 WZ
<td><br/><b><xsl:value-of select="//lcl/FAC/locatie"/>:</b></td>
<td><br/><xsl:value-of select="melding/plaats/regio/district/locatie/code"/> (<xsl:value-of select="melding/plaats/regio/district/locatie/omschrijving"/>)</td>
<td><br/><b><xsl:value-of select="//lcl/MLD/status"/>:</b></td>
<td><br/><xsl:value-of select="melding/status"/></td>
<td><br/><xsl:value-of select="//opdracht/status"/></td>
</tr>
<tr>
<td><b>Adres:</b></td>
@@ -1139,7 +1139,7 @@ Indien u verwacht dat de kosten >€500,- excl. BTW zullen zijn, dient u de opdr
<td><br/><b><xsl:value-of select="//lcl/FAC/locatie"/>:</b></td>
<td><br/><xsl:value-of select="melding/plaats/regio/district/locatie/code"/> (<xsl:value-of select="melding/plaats/regio/district/locatie/omschrijving"/>)</td>
<td><br/><b><xsl:value-of select="//lcl/MLD/status"/>:</b></td>
<td><br/><xsl:value-of select="melding/status"/></td>
<td><br/><xsl:value-of select="//opdracht/status"/></td>
</tr>
<tr>
<td><b>Adres:</b></td>
@@ -1327,7 +1327,7 @@ Indien u verwacht dat de kosten >€500,- excl. BTW zullen zijn, dient u de opdr
<td><br/><b><xsl:value-of select="//lcl/FAC/locatie"/>:</b></td>
<td><br/><xsl:value-of select="melding/plaats/regio/district/locatie/code"/> (<xsl:value-of select="melding/plaats/regio/district/locatie/omschrijving"/>)</td>
<td><br/><b><xsl:value-of select="//lcl/MLD/status"/>:</b></td>
<td><br/><xsl:value-of select="melding/status"/></td>
<td><br/><xsl:value-of select="//opdracht/status"/></td>
</tr>
<tr>
<td><b>Adres:</b></td>
@@ -1489,7 +1489,7 @@ Uw offerte dient uiterlijk 5 werkdagen na ontvangst van deze aanvraag ingediend
<td><br/><b><xsl:value-of select="//lcl/FAC/locatie"/>:</b></td>
<td><br/><xsl:value-of select="melding/plaats/regio/district/locatie/code"/> (<xsl:value-of select="melding/plaats/regio/district/locatie/omschrijving"/>)</td>
<td><br/><b><xsl:value-of select="//lcl/MLD/status"/>:</b></td>
<td><br/><xsl:value-of select="melding/status"/></td>
<td><br/><xsl:value-of select="//opdracht/status"/></td>
</tr>
<tr>
<td><b>Adres:</b></td>

View File

@@ -1165,7 +1165,31 @@ if you have any questions about your call, please contact the WTC Servicepoint v
<td width="30%"> Subtotaal ex BTW: <xsl:value-of select="kenmerk[@key='821']"/> </td>
<!--td> </td-->
</tr>
</xsl:if>
</xsl:if>
<xsl:if test="kenmerk[@naam='Extra parkeerkaart']!=''">
<tr>
<td width="60%"> Extra parkeerkaart<i>(1 stuk)</i> </td>
<td width="10%"><xsl:value-of select="kenmerk[@naam='Extra parkeerkaart']"/> </td>
<td width="30%"> Subtotaal ex BTW: 0.00 </td>
<!--td> </td-->
</tr>
</xsl:if>
<xsl:if test="kenmerk[@naam='Contractabonnement nieuw']!=''">
<tr>
<td width="60%"> Contractabonnement nieuw<i>(1 stuk)</i> </td>
<td width="10%"><xsl:value-of select="kenmerk[@naam='Contractabonnement nieuw']"/> </td>
<td width="30%"> Subtotaal ex BTW: 0.00 </td>
<!--td> </td-->
</tr>
</xsl:if>
<xsl:if test="kenmerk[@naam='Parkeerkaart defect']!=''">
<tr>
<td width="60%"> Parkeerkaart defect<i>(1 stuk)</i> </td>
<td width="10%"><xsl:value-of select="kenmerk[@naam='Parkeerkaart defect']"/> </td>
<td width="30%"> Subtotaal ex BTW: 0.00 </td>
<!--td> </td-->
</tr>
</xsl:if>
</table>
</td>
<td>

View File

@@ -218,6 +218,7 @@ function S(s, defval)
return settings.get_setting(s, defval)
}
// ASP-code heeft zijn eigen variant, deze is voor Putorders.bat/wsf
function tryOverrule(path)
{
var fso = new ActiveXObject("Scripting.FileSystemObject");
@@ -251,8 +252,11 @@ function tryOverrule(path)
var puo_data = { customerId: customerId,
custabspath: custabspath,
Computername: WshNetwork.Computername
Computername: WshNetwork.ComputerName,
Username: WshNetwork.UserName,
Userdomain: WshNetwork.UserDomain
};
hook.custenv(null, puo_data);
hook = null; // zorg dat de GC het object kan opruimen.
}