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

Merge 2016.3 Gold A patches

Browse Source 
svn path=/Website/trunk/; revision=32555
This commit is contained in:
Jos Groot Lipman
2017-01-25 20:52:34 +00:00
parent 0a6ab9ad0e bb353065c4
commit c35f7b8a16
18 changed files with 128 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
APPL/API2/api2.inc
View File

@@ -1247,9 +1247,12 @@ api2 = {
GENERIC_ONLY_WITH_AUTFUNCTION;
model.REST_GET = generic_REST_GET(model, gparams);
model.REST_POST = generic_REST_POST(model, gparams);
model.REST_PUT = generic_REST_PUT(model, gparams);
model.REST_DELETE = generic_REST_DELETE(model, gparams);
if (model.primary)
{
model.REST_POST = generic_REST_POST(model, gparams);
model.REST_PUT = generic_REST_PUT(model, gparams);
model.REST_DELETE = generic_REST_DELETE(model, gparams);
}
},
merge_disc_params_model: function(deze, template_model)
{
@@ -1338,7 +1341,14 @@ function generic_REST_GET(model, gparams)
}
if (!orderbys.length)
orderbys.push(model.fields.name?model.fields.name.dbs:model.fields.id.dbs);
{
if ("name" in model.fields)
orderbys.push(model.fields.name.dbs);
else if ("id" in model.fields)
orderbys.push(model.fields.id.dbs);
else
orderbys.push(1); // FAC_VERSION heeft niets van dit alles
}
sql += " ORDER BY " + orderbys.join(", "); // TODO: Altijd goed met includes?

35
APPL/API2/model_generic.inc
View File

@@ -26,6 +26,8 @@ function model_generic_template()
function _findseq(primary)
{
if (!primary)
return null;
var seq_name = primary.substr(0,3) + "_S_" + primary;
var seq = null;
var sql = "SELECT sequence_name"
@@ -51,28 +53,40 @@ function model_generic(table, autfunction)
model.record_name = table.substring(0,1).toUpperCase() + table.substring(1);
model.records_name = model.record_name + "s";
var sql = "SELECT LOWER(cols.column_name) column_name, cols.position, cons.status, cons.owner"
+ " FROM user_constraints cons, user_cons_columns cols"
+ " WHERE cols.table_name = " + safe.quoted_sql_upper(table)
var sql = "SELECT LOWER(cols.column_name) column_name, cols.position, cons.status, cons.owner, utc.data_type"
+ " FROM user_constraints cons, user_cons_columns cols, user_tab_columns utc"
+ " WHERE cons.table_name = " + safe.quoted_sql_upper(table)
+ " AND cols.table_name = cons.table_name"
+ " AND cons.constraint_type = 'P'"
+ " AND cons.constraint_name = cols.constraint_name"
+ " AND cons.owner = cols.owner"
+ " AND utc.table_name = cols.table_name"
+ " AND utc.column_name = cols.column_name"
+ " ORDER BY cols.table_name, cols.position";
var oRs = Oracle.Execute(sql);
if (oRs.Eof)
{
abort_with_warning("Unable to determine primary key for table {0}".format(table));
//abort_with_warning("Unable to determine primary key for table {0}".format(table));
model.primary = null;
}
model.primary = oRs("column_name").Value;
oRs.MoveNext();
if (!oRs.Eof)
else
{
abort_with_warning("Composite primary key not supported for table {0}".format(table));
model.primary = oRs("column_name").Value;
var data_type = oRs("data_type").Value;
if (data_type != 'NUMBER')
{
//abort_with_warning("Only NUMBER primary key supported, not {0} ({1})".format(data_type, model.primary));
model.primary = null;
}
oRs.MoveNext();
if (!oRs.Eof)
{
//abort_with_warning("Composite primary key not supported for table {0}".format(table));
model.primary = null;
}
}
oRs.Close();
var sql = "SELECT num_rows, last_analyzed"
+ " FROM user_tables"
+ " WHERE table_name = " + safe.quoted_sql_upper(table);
@@ -157,6 +171,7 @@ function model_generic(table, autfunction)
field.dbs == model.table + "_aanmaak")
field.filter = "range";
break;
case "CHAR":
case "VARCHAR2":
field.typ = 'varchar';
break;

2
APPL/FAC/fac_edit_template_save.asp
View File

@@ -151,7 +151,7 @@ if (previewmode == 2)
+ ", "+ lcl.xsql('rd.ins_discipline_omschrijving','rd.ins_discipline_key') +" omschrijving"
+ " FROM res_v_aanwezigdiscipline rd"
+ ", fac_v_webgebruiker fw"
+ ", fac_v_webfunctie fwf"
+ ", fac_functie fwf"
+ " WHERE rd.ins_discipline_min_level = 3"
+ " AND fw.ins_discipline_key = rd.ins_discipline_key"
+ " AND fw.fac_functie_key = fwf.fac_functie_key"

3
APPL/IMG/icons.inc
View File

@@ -77,6 +77,7 @@ var ICONS = {
"wall_brick.png" : "fa-key",
"wijzigen.png" : "fa-edit",
"zone.png" : "fa-map-marker",
"map.png" : "fa-map-marker",
"flike_none.png" : "fa-question-circle",
"doorvoeren.png" : "fa-cog",
"offerteok.png" : "fa-thumbs-up",
@@ -85,7 +86,7 @@ var ICONS = {
"sound.png" : "fa-volume-up",
"magnifier.png" : "fa-desktop",
"paste.png" : "fa-clipboard",
"xslpreview.png" : "fa-eye",
"xslpreview.png" : "fa-eye",
"palette.png" : "fa-file-image-o"
}

2
APPL/Localscripts/FcltJquery.js
View File

@@ -459,7 +459,7 @@ function updateTableHeaders() {
$(function() {
$("table thead").each(function() {
$("table:not(.tab_cat_sched) > thead").each(function() {
$(this).parent("table").wrap("<div class=\"divrstable\" style=\"position:relative\"></div>");
var originalHeaderRow = $(this);

29
APPL/MGT/mgt_generic.asp
View File

@@ -27,15 +27,28 @@
};
params.search = {};
if (model.fields["id"].seq)
if ("id" in model.fields)
{
var sql = "SELECT last_number currval"
+ " FROM all_sequences"
+ " WHERE sequence_name = " + safe.quoted_sql_upper(model.fields["id"].seq);
var oRs = Oracle.Execute(sql)
var curval = oRs(0).Value;
oRs.Close();
params.search.labels = [{ "lbl": "Sequence", "txt" : "{0} (next: {1})".format(model.fields["id"].seq, curval)}];
params.search.labels = [{ "lbl": "Primary key", "txt" : "{0}".format(model.fields["id"].dbs)}];
if (model.fields["id"].seq)
{
var sql = "SELECT last_number currval"
+ " FROM all_sequences"
+ " WHERE sequence_name = " + safe.quoted_sql_upper(model.fields["id"].seq);
var oRs = Oracle.Execute(sql)
var curval = oRs(0).Value;
oRs.Close();
params.search.labels.push({ "lbl": "Sequence", "txt" : "{0} (next: {1})".format(model.fields["id"].seq, curval)});
}
}
else // geen id. Dan kun je niet doorklikken. Toon dan maar alle kolommen
{
params.search.labels = [{ "lbl": "Primary key", "txt" : "No single NUMBER primary key detected. Record clicking not available."}];
params.list = { columns : [] };
for (var fld in model.fields)
{
params.list.columns.push(fld);
}
}
if ("estimated_rows" in model && model.estimated_rows < S("qp_maxrows"))

2
APPL/MLD/mld_edit_opdr.asp
View File

@@ -368,7 +368,7 @@ oRs.Close();
$('textarea').resize(function () { FcltMgr.resized(window) });
$('textarea').autogrow();
if (opdr_key == -1)
if (opdr_key == -1 && !copy)
{
$("#uren").val(null);
$("#uurtarief").val(null);

6
APPL/MLD/opdr_finish.asp
View File

@@ -39,12 +39,12 @@ for (var i = 0; i < opdr_key_arr.length; i++)
user.anything_todo_or_abort(multi || !costExceedsBC, L("lcl_opdr_cost_exceed") + S("mld_max_kosten_extern"));
var mld_opdr = mld.mld_opdr_info(opdr_key_arr[i]);
var kosten_verplicht_afr = mld_opdr.typeopdr_matchtype != 4 && (mld_opdr.typeopdr_kosten_verplicht & 4 || (mld_opdr.typeopdr_kosten_verplicht == 0 && mld_opdr.opdrkosten_verplicht & 4));
var opdr_kosten = opdr_kosten > 0? opdr_kosten : mld_opdr.t_cost;
var kosten_verplicht_afr = (mld_opdr.typeopdr_matchtype != 4) && ( (mld_opdr.typeopdr_kosten_verplicht & 4) || ( (mld_opdr.typeopdr_kosten_verplicht == 0) && (mld_opdr.opdrkosten_verplicht & 4)));
var opdr_kosten = opdr_kosten >= 0? opdr_kosten : mld_opdr.t_cost;
// Bij multi worden er geen bedragen aangepast door de contractpersoon van de uitvoerder.
// Als het bedrag van de opdracht dan hoger is dan de setting "mld_max_kosten_extern" dan is het ook legaal op dat bedrag gezet door een persoon.
// Dan mag de opdracht dus kostenklaar gemeld worden door de contactpersoon van de uitvoerden en hoeft de opdracht niet uitgesloten te worden.
if (this_opdr.canFinish && !(kosten_verplicht_afr && opdr_kosten == 0))
if (this_opdr.canFinish && !(kosten_verplicht_afr && opdr_kosten == null))
{
ingesloten.push(opdr_key_arr[i]);
tobefinish++;

8
APPL/RES/res_search.asp
View File

@@ -484,7 +484,7 @@ var authparams = user.checkAutorisation(autfunction);
+ ", "+ lcl.xsql('rd.ins_discipline_omschrijving','rd.ins_discipline_key') +" omschrijving"
+ " FROM res_v_aanwezigdiscipline rd"
+ ", fac_v_webgebruiker fw"
+ ", fac_v_webfunctie fwf"
+ ", fac_functie fwf"
+ " WHERE rd.ins_discipline_min_level = 3"
+ " AND fw.ins_discipline_key = rd.ins_discipline_key"
+ " AND fw.fac_functie_key = fwf.fac_functie_key"
@@ -522,7 +522,7 @@ var authparams = user.checkAutorisation(autfunction);
+ ", "+ lcl.xsql('rd.ins_discipline_omschrijving','rd.ins_discipline_key') +" omschrijving"
+ " FROM res_v_aanwezigdiscipline rd"
+ ", fac_v_webgebruiker fw"
+ ", fac_v_webfunctie fwf"
+ ", fac_functie fwf"
+ " WHERE rd.ins_discipline_min_level=1"
+ " AND fw.ins_discipline_key = rd.ins_discipline_key"
+ " AND fw.fac_functie_key = fwf.fac_functie_key"
@@ -543,7 +543,7 @@ var authparams = user.checkAutorisation(autfunction);
+ ", "+ lcl.xsql('rd.ins_discipline_omschrijving','rd.ins_discipline_key') +" omschrijving"
+ " FROM res_v_aanwezigdiscipline rd"
+ ", fac_v_webgebruiker fw"
+ ", fac_v_webfunctie fwf"
+ ", fac_functie fwf"
+ " WHERE rd.ins_discipline_min_level=2"
+ " AND fw.ins_discipline_key = rd.ins_discipline_key"
+ " AND fw.fac_functie_key = fwf.fac_functie_key"
@@ -568,7 +568,7 @@ var authparams = user.checkAutorisation(autfunction);
<% var sql_aut = " SELECT rd.ins_discipline_key ins_discipline_key"
+ " FROM res_v_aanwezigdiscipline rd"
+ ", fac_v_webgebruiker fw"
+ ", fac_v_webfunctie fwf"
+ ", fac_functie fwf"
+ " WHERE rd.ins_discipline_min_level = 2"
+ " AND fw.ins_discipline_key = rd.ins_discipline_key"
+ " AND fw.fac_functie_key = fwf.fac_functie_key"

2
APPL/RES/res_search_ppi.asp
View File

@@ -123,7 +123,7 @@ var authparams = user.checkAutorisation(autfunction);
+ ", "+ lcl.xsql('rd.ins_discipline_omschrijving','rd.ins_discipline_key') +" omschrijving"
+ " FROM res_v_aanwezigdiscipline rd"
+ ", fac_v_webgebruiker fw"
+ ", fac_v_webfunctie fwf"
+ ", fac_functie fwf"
+ " WHERE rd.ins_discipline_min_level = 3"
+ " AND fw.ins_discipline_key = rd.ins_discipline_key"
+ " AND fw.fac_functie_key = fwf.fac_functie_key"

4
APPL/SCF/scaffolding_list.inc
View File

@@ -57,7 +57,9 @@ function scaffolding_list(model, scf_params)
}
var default_url = model.list.default_url;
if (!default_url && ("show" in model ||"show" in scf_params || model["REST_PUT"] || model["REST_DELETE"]))
if (!default_url &&
"id" in model.fields &&
("show" in model || "show" in scf_params || model["REST_PUT"] || model["REST_DELETE"]))
{
if (modal)
default_url = scf_params.this_fullpath + "?mode=edit" + transit + "&id=";

2
APPL/Shared/loadArticle.asp
View File

@@ -20,7 +20,7 @@ var article_arr = getQParamIntArray("article_str", []); // Artikel string
var sql_aut = " SELECT rd.ins_discipline_key ins_discipline_key"
+ " FROM res_v_aanwezigdiscipline rd"
+ ", fac_v_webgebruiker fw"
+ ", fac_v_webfunctie fwf"
+ ", fac_functie fwf"
+ " WHERE rd.ins_discipline_min_level = 2"
+ " AND fw.ins_discipline_key = rd.ins_discipline_key"
+ " AND fw.fac_functie_key = fwf.fac_functie_key"

224
CUST/ARBO/cust.css
View File

@@ -11,18 +11,6 @@
#123088 (vulpen)
*/
html, body,
#showbody, #editbody,
#search,
.fcltframe {
background: none;
background-color: #fff;
}
div {
background: none;
background-color: transparent;
}
tr.trtrack { opacity: 0.3; font-style: italic;}
/* Titelbalk */
@@ -35,221 +23,17 @@ tr.trtrack { opacity: 0.3; font-style: italic;}
/* "Demonstratie" */
div#headerprefix {
color: #34b6e4;
text-align: left;
}
#headerprefix {
font-size: 1em;
}
/* 'Togglers' */
div.ui-layout-toggler {
background-color: #ccc;
}
/* Portal */
#mywelcometitle {
background-color: #34b6e4;
color: #fff;
}
#mywelcomeinfo {
background-color: #000;
color: #fff;
}
#nieuwsbody {
background-color: #fff;
}
.nieuwstitel {
color: #34b6e4;
}
.listbody tbody {
background-color: #fff;
}
/* Titels */
.fcltframeheader,
#search div.fcltblockhead {
background-image: none;
background-color: #34b6e4;
}
/* Tekst van titels (overzichten, mijn facilitor, etc */
.fcltframeheader,
#search div.fcltblockhead,
.fcltframeheader span,
#search div.fcltblockhead span,
#iframerextratitle {
color: #fff;
}
/* Kaders om invulvelden */
#showbody .fcltblockhead {
background-color: #ccedf8;
color: #000;
}
body.modal .fcltblock,
#editbody .fcltblock {
background-color: #fff;
}
body.modal .fcltblockhead,
#editbody .fcltblockhead {
background-color: #ccedf8;
color: #000;
}
/* Flexvelden type label */
td.flexlabel {
background-color: #fff200;
color: #000;
}
/* Selectiescherm */
#search div.fcltblock {
background-image: none;
background-color: #fff;
}
#search div.fcltblock label {
color: #000;
}
/* URLs in portal-blokken */
#portalmenu a {
text-decoration: none;
color: black;
}
#portalmenu a:hover {
text-decoration: underline;
}
/* Knoppen */
#search #buttons ul li {
background-color: #34b6e4;
color: #fff;
}
#search #buttons ul li:hover {
background-color: #fff;
color: #34b6e4;
}
#search #buttons .hiddenbutton {
background: none;
}
/* Verplichte velden */
* html .required, .required .required:focus, input.required{
background-color: #ffe3bf;
}
input[type=text].required,
input[type=password].required,
select.required, option.required,
textarea.required {
background-color: #ffe3bf;
}
/* Tabbladen */
.ui-widget-content {
background: none;
background-color: #fff;
}
.ui-tabs-nav {
background: none;
background-color: #fff;
}
.ui-widget-content .ui-state-default {
background: none;
background-color: #fff;
}
.ui-widget-content .ui-state-active,
.ui-widget-content .ui-tabs-selected {
background: none;
background-color: #fff;
border: 1px solid #34b6e4;
border-bottom: 0;
color: #000;
}
.ui-state-default a:link {
color: #34b6e4;
}
.ui-state-active a:link {
color: #000;
}
.tabcloseall {
color: #ccc;
}
/* Menu */
div#ProfFAC, div#PersFAC, div#MgtFAC {
background-color: #fff;
}
#ProfFAC .menukop,
div#PersFAC ul li span.menukop,
div#MgtFAC ul li span.menukop,
#MgtFAC .menukop {
color: #34b6e4;
}
.ui-layout-content,
#menutabs {
background: none;
background-color: #fff;
}
div#menutabs li.ui-state-active {
background-image: none;
background-color: #fff;
}
div#ProfFAC ul li,
div#PersFAC ul li,
div#MgtFAC ul li {
background-color: #fff;
}
div#MgtFAC ul li li,
div#ProfFAC ul li li,
li.mi {
background-color: #fff;
}
div#MgtFAC ul li li a {
color: #000;
}
/* Kalender */
.ui-datepicker-header.ui-widget-header {
background: none;
background-color: #fff;
}
.ui-widget-header.ui-dialog-titlebar {
background: none;
background-color: #34b6e4;
color: #fff;
}
.ui-datepicker-calendar .ui-state-highlight,
.ui-datepicker-calendar .ui-state-active {
background-color: #fff200;
}
.ui-datepicker-calendar th {
background-color: #34b6e4;
}
.ui-datepicker-calendar th.ui-datepicker-week-end {
background-color: #9adbf2;
}
input[readOnly], select[readOnly], textarea[readOnly] {
background-color: #F0F0F0;
}
input[type=checkbox], input[type=radio]{
background-color: #F0F0F0;
}
li.mk:hover span.menukop {
color: #fff!important;
}
#mod_prs_pwdchange {width:480px;}
.nomicon {
background-color: #78C8E6;
}

55
CUST/IVET/cust.css
View File

@@ -8,27 +8,6 @@
background: url(header.gif) no-repeat;
}
/* Dunne lijntjes om menu en/of header in te klappen */
span.ui-layout-resizer {
background-color: #37424A;
}
div.ui-layout-toggler {
background-color: #bcbdbc;
}
/* Kopbalk met tabbladen (menu- en werkbladen) */
.ui-tabs .ui-tabs-nav {
background-color: #37424A;
background-image: none;
}
/* Koppen in tabbladen die zijn in/uit te klappen door aan te klikken */
div.fcltframeheader {
background-color: #c7ecea;
background-image: none;
color: #37424A;
}
/* zoek en bestelveld */
#productsearch {
background-color: orange;
@@ -37,40 +16,6 @@ div.fcltframeheader {
height:15px;
}
/* Kader (gegevens)onderdelen in tabbladen */
#showbody .fcltblockhead, #editbody .fcltblockhead {
background-color: #00877c;
color: white;
}
#search div.fcltblockhead {
background-color: #00877c;
border: 1px solid #00877c;
color: white;
}
.ui-widget-header.ui-datepicker-header,
.ui-widget-header.ui-dialog-titlebar {
color: #fff;
}
body.modal .fcltblockhead {
background-color: #00877c;
}
/* Kop- en voetbalk in resultaatset na zoeken */
.rstable THEAD TH {
background-color: #37424A;
}
.sortable.rstable TFOOT TD {
background-color: #37424A;
}
/* Menu achtergrond (Service, Zelfservice en Beheer) */
.ui-layout-content {
background-color: #e7f8f5;
}
li.mk:hover span.menukop {
color: #fff!important;
}

4
CUST/MARX/xsl/A_GetOpdrachten.xsl
View File

@@ -13,7 +13,7 @@
</xsl:template>
<xsl:template match="s:Body">exec_code;ax_supplier_id;mld_melding_externnr;mld_melding_omschrijving;prs_afdeling_externnr;mld_opdr_po_companyid;mld_opdr_opzichter;mld_melding_cust_name;mld_melding_cust_straat;mld_melding_cust_huisnr;mld_melding_cust_huisnr2;mld_melding_cust_postcode;mld_melding_cust_plaats;mld_melding_cust_telefoonnr;mld_melding_cust_mobielnr;mld_melding_cust_email;mld_melding_cust_object_omschr;complexnummer;pandnummer;VGEnummer;mld_melding_memo;mld_opdr_externnr;mld_opdr_ordernr;mld_opdr_datumbegin;mld_opdr_datum_plan;mld_opdr_einddatum;mld_opdr_mat_linenr;mld_opdr_mat_naam;mld_opdr_mat_eenheidcode;mld_opdr_mat_eenheid;mld_opdr_mat_prijs;mld_opdr_mat_aantal;mld_opdr_mat_btwperc;mld_opdr_mat_totaal
<xsl:for-each select="descendant::*/b:SupplierTaskSpec">1;<xsl:value-of select="b:vendAccountNum"/>;<xsl:value-of select="b:requestId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:description"/></xsl:call-template>;<xsl:value-of select="b:companyId"/>;<xsl:value-of select="b:purchOrderCompanyId"/>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custName"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custStreet"/></xsl:call-template>;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custZipCode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custCity"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custPhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custMobilePhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custEmail"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:objectDescription"/></xsl:call-template>;;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="substring(b:memo,1,3000)"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;<xsl:value-of select="b:registrationDate"/>;<xsl:call-template name="mld_opdr_plandatum"><xsl:with-param name="p_task_status" select="b:taskStatus"/><xsl:with-param name="p_plan_datum" select="b:startDateTime"/></xsl:call-template>;<xsl:value-of select="b:deadlineDate"/>;;;;;;;;
<xsl:for-each select="descendant::*/b:SupplierTaskSpec">1;<xsl:value-of select="b:vendAccountNum"/>;<xsl:value-of select="b:requestId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:description"/></xsl:call-template>;<xsl:value-of select="b:companyId"/>;<xsl:value-of select="b:purchOrderCompanyId"/>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custName"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custStreet"/></xsl:call-template>;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custZipCode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custCity"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custPhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custMobilePhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custEmail"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:objectDescription"/></xsl:call-template>;;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="substring(b:memo,1,3000)"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;<xsl:value-of select="translate(b:registrationDate,'zZ','')"/>;<xsl:call-template name="mld_opdr_plandatum"><xsl:with-param name="p_task_status" select="b:taskStatus"/><xsl:with-param name="p_plan_datum" select="b:startDateTime"/></xsl:call-template>;<xsl:value-of select="translate(b:deadlineDate,'zZ','')"/>;;;;;;;;
2;<xsl:value-of select="b:vendAccountNum"/>;<xsl:value-of select="b:requestId"/>;;<xsl:value-of select="b:companyId"/>;<xsl:value-of select="b:purchOrderCompanyId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:supervisorName"/></xsl:call-template>;;;;;;;;;;;;<xsl:value-of select="b:objectId"/>;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;;;;;;;;;;;&#10;</xsl:for-each>
<xsl:for-each select="descendant::*/b:SupplierTaskSpec/b:SupplierPurchLines/b:SupplierPurchLine">3;<xsl:value-of select="../../b:vendAccountNum"/>;<xsl:value-of select="../../b:requestId"/>;;<xsl:value-of select="../../b:companyId"/>;<xsl:value-of select="../../b:purchOrderCompanyId"/>;;;;;;;;;;;;;;;;<xsl:value-of select="../../b:purchId"/>;<xsl:value-of select="../../b:taskId"/>;;;;<xsl:call-template name="Materiaal_regel"><xsl:with-param name="p_linenr" select="b:lineNum"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:name"/></xsl:call-template>;<xsl:call-template name="Materiaal_eenheidSidB"><xsl:with-param name="p_unit" select="b:purchUnitGS1"/></xsl:call-template>;<xsl:value-of select="b:purchUnit"/>;<xsl:value-of select="b:purchPrice"/>;<xsl:value-of select="b:qtyOrdered"/>;<xsl:call-template name="Mareon_btwperc"><xsl:with-param name="p_btwperc" select="b:taxItemGroup"/></xsl:call-template>;<xsl:value-of select="b:lineAmount"/>;&#10;</xsl:for-each>
</xsl:template>
@@ -55,7 +55,7 @@
<xsl:template name="mld_opdr_plandatum">
<xsl:param name="p_task_status"/>
<xsl:param name="p_plan_datum"/>
<xsl:if test="$p_task_status='Gepland'"><xsl:value-of select="$p_plan_datum"/></xsl:if>
<xsl:if test="$p_task_status='Gepland'"><xsl:value-of select="translate($p_plan_datum,'zZ','')"/></xsl:if>
</xsl:template>
<xsl:template name="Materiaal_regel">

13
CUST/RABO/import/RaboAxxerionAtt.xsl Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="Windows-1252"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="text" encoding="Windows-1252"/>
<xsl:variable name="new_line" select="'&#xA;'"/>
<xsl:template match="/">
DOCUMENTNAME;EXTENSIE;REFERENTIE;FILENAME;<xsl:value-of select="$new_line"/>
<xsl:for-each select="Export/AAFMDOC">
<xsl:value-of select="DocumentName"/>;<xsl:value-of select="Extensie"/>;<xsl:value-of select="Referentie"/>;<xsl:value-of select="Filename"/>;<xsl:value-of select="$new_line"/>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. -->

8
CUST/RABO/import/gen_import_mld_axxerion.bat
View File

@@ -14,9 +14,15 @@ REM (c) 2010, SG|facilitor bv, +31 (53) 4800700, support@sgfacilitor.nl
REM
REM melding toevoegen
cscript .\api_mldsoap_axxerion.js MLD_AXXERION d:\Apps\Facilitor\ftp_sites\RABO\meldingen\ "https://rabo.facilitor.nl/default.asp?fac_id=RABO&API=MLD_AXXERION&APIKEY=EH-XITJvuCMmmQ6O9EqOr8Ed1mXHYooo" >>genimport.log 2>>&1
REM bijlagen toevoegen
move D:\Apps\Facilitor\ftp_sites\RABO\bijlagen\bijlagen*.xml .
cscript ..\..\..\utils\gen_import\gen_import.wsf RABO BIJLAGEN >>genimport.log 2>>&1
CALL ..\..\..\utils\gen_export\gen_export.bat BIJLAGEN >>genimport.log 2>>&1
CALL AxxerionBijlagen.bat >>genimport.log 2>>&1
REM @Work
REM cscript .\api_mldsoap_axxerion.js MLD_AXXERION w:\Branch20161\CUST\RABO\import\ "http://facws001/branch20161/default.asp?fac_id=RABO&API=MLD_AXXERION&APIKEY=EH-XITJvuCMmmQ6O9EqOr8Ed1mXHYooo" >>genimport.log 2>>&1

27
CUST/STPH/xsl/cust.xsl
View File

@@ -6,7 +6,7 @@
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:variable name="Xsrtnotificatiecode">BESAP1</xsl:variable>
<xsl:variable name="Xsrtnotificatiecode">MLDAP1</xsl:variable>
<xsl:template name="cnt_endtext">
<tr>
@@ -138,7 +138,30 @@
<xsl:template match="opdracht" mode="include">
<xsl:choose>
<xsl:choose>
<xsl:when test="$srtnotificatiecode = 'MLDAP1'">
<table border="0" width="100%" cellpadding="2">
<tr>
<td>
<br/>
<br/>
Beste budgethouder,<br/>
<br/>
Er ligt een fiatteringsverzoek voor je klaar waarvoor jouw goedkeuring is vereist.<br/>
<br/>
Druk op
<xsl:element name="a">
<xsl:attribute name="href">
https://<xsl:value-of select="$FacilitorRoot"/>?<xsl:value-of select="../bookmarks/bestelling"/><xsl:value-of select="key"/>
</xsl:attribute>deze link</xsl:element> om direct te fiatteren. Of log in bij Facilitor, en bekijk in de linkerkolom onder Fiatteringsverzoeken.<br/>
<br/>
<hr/>
</td>
</tr>
</table>
</xsl:when>
</xsl:choose>
<xsl:choose>
<!-- "opdrachten bij melding "Incidentele bestelling (key=2)" -->
<xsl:when test="melding/discipline/srtdiscipline/key='2'">
<xsl:apply-templates select="." mode="include_inkooporder"/>