Merge 2016.3 Gold D patches

svn path=/Website/trunk/; revision=33126

APPL/AUT/Login.inc

@@ -1085,6 +1085,12 @@ function jwt_decode(token)
   try
   {
       // base64 decode and parse JSON
+
+      // FSN#39763  SLNKDWF.DLL v4.16 heeft nog een bug in het decoderen van
+      //            url-safe encoded teksten. Daarom hier voor-corrigeren
+      result.headerSeg  = result.headerSeg.replace(/\-/g, "+").replace(/\_/g, "/");
+      result.payloadSeg = result.payloadSeg.replace(/\-/g, "+").replace(/\_/g, "/");
+
       result.header = JSON.parse(oCrypto.base64_decode(result.headerSeg));
       result.payload = JSON.parse(oCrypto.base64_decode(result.payloadSeg));
   }

APPL/BES/bes_bestelling.js

@@ -113,14 +113,14 @@ function show_item_details(bes_item_info)
         $("#photo").show();
         bes_supAddress = bes_item_info.prs_bedrijf_details_loc;
     }
-    imgObj.onclick = navigateToSupplier;
+    $("#fa_img").attr("onclick", "navigateToSupplier()");
   }
   else
   {
     $("#faicon").toggleClass("fa-question fa-file-pdf-o").hide();
+    $("#fa_img").attr("onclick", "");
     imgObj.src = "../Pictures/no_photo.gif";
     $("#photo").show();
-    imgObj.onclick = null;
   }
 
   $("#srtgroep_text").html(bes_item_info.srtgroup_text);

APPL/FIN/fin_list.inc

@@ -721,21 +721,18 @@ function fin_list (params)
         var eApprove  = !embedded &&
                         (canapprove &&
                          oRs("fin_factuur_statuses_key").Value == 2 &&
-                         oRs("opdrachtnr").Value != " " &&
+                         oRs("opdrachtnr").Value != " ") &&
-                         budgethouder > 0) &&
                          !deleted;
         var eUnapprove  = !embedded &&
                           (canapprove &&
                            oRs("fin_factuur_statuses_key").Value == 6 &&
-                           oRs("opdrachtnr").Value != " " &&
+                           oRs("opdrachtnr").Value != " ") &&
-                           budgethouder > 0) &&
                            !deleted;
         var eRejectApprove = eApprove;
         var eUnreject = !embedded &&
                         (eApprove &&
                          oRs("fin_factuur_statuses_key").Value == 1 &&
-                         oRs("opdrachtnr").Value != " " &&
+                         oRs("opdrachtnr").Value != " ") &&
-                         budgethouder > 0) &&
                          !deleted;
 
         var eGoedkeur =!embedded &&

APPL/RES/res.css

@@ -295,12 +295,14 @@ input[type=text].button.required.res_fatal
 
 @media print
   { /* in print-mode doe we de kleuren als border. Daarmee geeft cleaning wel rare 'punten'. Het zij zo. */
-    div.res_optie      { height:0px!important; border-top:7px solid #31398C; border-bottom:7px solid #31398C; } /* Optie: blauw */
+  	div.res_optie_eigen { height:0px!important; border-top:7px solid #E37B00; border-bottom:7px solid #E37B00; } /* Optie eigen reservering: lichtblauw */
-    div.res_definitief { height:0px!important; border-top:7px solid #990000; border-bottom:7px solid #990000; } /* Definitief: rood */
+  	div.res_definitief_eigen { height:0px!important; border-top:7px solid #009979; border-bottom:7px solid #009979; } /* Definitief eigen reservering: lichtrood */
-    div.res_blok       { height:0px!important; border-top:7px solid #000000; border-bottom:7px solid #000000; } /* Blokkade: zwart */
+    div.res_optie      { height:0px!important; border-top:7px solid rgb(238,176,102); border-bottom:7px solid rgb(238,176,102); } /* Optie: blauw ORANJE */
-    div.res_vervallen  { height:0px!important; border-top:7px solid #990099; border-bottom:7px solid #990099; } /* Vervallen: paars */
+    div.res_definitief { height:0px!important; border-top:7px solid #66C2AF; border-bottom:7px solid #66C2AF; } /* Definitief: rood */
-    div.res_nietvrij   { height:0px!important; border-top:7px solid #D6D80E; border-bottom:7px solid #D6D80E; } /* Niet beschikbaar: geel */
+    div.res_blok       { height:0px!important; border-top:7px solid #747578; border-bottom:7px solid #747578; } /* Blokkade: zwart GRIJS*/
+    div.res_vervallen  { height:0px!important; border-top:7px solid #AB1455; border-bottom:7px solid #AB1455; } /* Vervallen: paars */
+    div.res_nietvrij   { height:0px!important; border-top:7px solid #B1B3B4; border-bottom:7px solid #B1B3B4; } /* Niet beschikbaar: oranje LICHTGROEN */
+  
     table.planbord td.reserv { border:1px solid #888;}
     .plancad           { display: none; }
   }
-

APPL/RES/res_edit_rsv_ruimte.asp

@@ -919,8 +919,8 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
         }
         else
         {
-            var oms_verplicht = $("#sel_activity").attr("res_activiteit_omsverplicht")
+            var oms_verplicht = $("#sel_activity").attr("res_activiteit_omsverplicht");
-            var bez_verplicht = $("#sel_activity").attr("res_activiteit_aantalverplicht")
+            var bez_verplicht = $("#sel_activity").attr("res_activiteit_aantalverplicht");
         }
         $("#descript").toggleClass("required", oms_verplicht == "1");
         $("#bezoekers").toggleClass("required", bez_verplicht == 1);
@@ -1141,8 +1141,8 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
           <input type="hidden" id="sel_activity" name="sel_activity"
                  value="<%=rrr.res_ruimte_extern? rrr.activiteit_key : getQParamInt("activiteit_key",rrr.activiteit_key)%>"
                  res_activiteit_duur="<%=safe.jsfloat(resDuur)%>"
-                 res_activiteit_omsverplicht="<%=rrr.descript_required%>"
+                 res_activiteit_omsverplicht="<%=rrr.descript_required? 1 : 0%>"
-                 res_activiteit_aantalverplicht="<%=rrr.aantal_verplicht%>"
+                 res_activiteit_aantalverplicht="<%=rrr.aantal_verplicht? 1 : 0%>"
                  res_activiteit_meteindtijd="<%=rrr.met_eindtijd? 1 : 0%>">
 <%
         }

APPL/Shared/Suggest/stdmeldingFilter.inc

@@ -53,7 +53,17 @@ function getFiltClauseStdmelding(pfiltcode, params, init)
     lfiltClause.where += " AND di.ins_srtdiscipline_key = " + params.srtdisc_key;
   }
 
-  if (params.autfunctionKey > -1) // Efficiente versie van FAC_V_MY_PR**S_AFDELINGEN_WRITE
+  // params.autfunctionKey kan een key of een array met keys zijn. Maak hier altijd een array van.
+  var autfunctionkeys = [];
+  if (typeof params.autfunctionKey === "object")
+    autfunctionkeys = params.autfunctionKey;
+  else
+  {
+    if (params.autfunctionKey != -1)
+      autfunctionkeys.push(params.autfunctionKey);
+  }
+
+  if (autfunctionkeys.length)
   {
     if (user_key == params.perslidKey)
       var same_level = 9;
@@ -66,7 +76,7 @@ function getFiltClauseStdmelding(pfiltcode, params, init)
     }
     lfiltClause.where += " AND di.ins_discipline_key IN"
                        + " (SELECT ins_discipline_key FROM fac_v_webgebruiker fw"
-                       + "   WHERE fac_functie_key = " + params.autfunctionKey
+                       + "   WHERE fac_functie_key IN (" + autfunctionkeys.join(",") + ")"
                        + "     AND fac_gebruiker_prs_level_write <= " + same_level
                        + "     AND fac_gebruiker_alg_level_write < 9" // extra: Vooral voor MLDUSE gebruikers met alleen PRS-leesrechten
                        + "     AND prs_perslid_key = " + user_key

APPL/Shared/User.inc

@@ -1723,6 +1723,7 @@ function Werkplek(wpKey)
           + "      , w.prs_werkplek_volgnr"
           + "      , w.alg_ruimte_aanduiding"
           + "      , w.prs_werkplek_aanduiding"
+          + "      , w.alg_locatie_code"
           + "      , w.prs_werkplek_virtueel"
           + "      , w.prs_werkplek_type"
           + "      , pw.prs_perslidwerkplek_bezetting"
@@ -1748,6 +1749,7 @@ function Werkplek(wpKey)
     this._prs_werkplek_volgnr = oRs("prs_werkplek_volgnr").value;
     this._alg_ruimte_aanduiding = oRs("alg_ruimte_aanduiding").value;
     this._prs_werkplek_aanduiding = oRs("prs_werkplek_aanduiding").value;
+    this._alg_locatie_code = oRs("alg_locatie_code").Value;
     this._bezetting = oRs("prs_perslidwerkplek_bezetting").value;
     this._alg_gebouw_bezoekbaar = oRs("alg_gebouw_bez").value || 0;
   }
@@ -1864,8 +1866,21 @@ Werkplek.prototype.prs_werkplek_volgnr = function()
 
 Werkplek.prototype.prs_werkplek_aanduiding = function()
 {
-  return   (S("prs_werkplek_implicit")==1?this._alg_ruimte_aanduiding:this._prs_werkplek_aanduiding)
+  var wp_aanduiding;
-         + (this._type==1?L("lcl_flexwp_suffix"):"");
+  if (S("prs_werkplek_implicit") == 1)
+  {
+    if (this._alg_ruimte_aanduiding == null)
+      wp_aanduiding = this._alg_locatie_code; // Dan maar locatiecode tonen;
+    else
+      wp_aanduiding = this._alg_ruimte_aanduiding
+  }
+  else
+    wp_aanduiding = this._prs_werkplek_aanduiding;
+
+  if (this._type == 1)
+    wp_aanduiding += L("lcl_flexwp_suffix");
+
+  return wp_aanduiding;
 }
 
 Werkplek.prototype.alg_gebouw_bezoekbaar = function()

APPL/Shared/default.csx

@@ -1588,10 +1588,10 @@ border-spacing: 1px;
 .mldflag0, .resflag0 { color: #eee;}
 .mldflag1, .resflag1 { color: #4d4d4d; }
 .mldflag2, .resflag2 { color: #f15854; }
-.mldflag3, .resflag3 { color: #decf3f; }
+.mldflag3, .resflag3 { color: #ffd600; }
 .mldflag4, .resflag4 { color: #5da5da; }
 .mldflag5, .resflag5 { color: #60bd68; }
-.mldflag6, .resflag6 { color: #111; }
+.mldflag6, .resflag6 { color: #673ab7; }
 .mldflag7, .resflag7 { color: #faa43a; }
 .mldflag8, .resflag8 { color: #b276b2; }
 .mldflag9, .resflag9 { color: #b2912f; }
@@ -2046,7 +2046,7 @@ border-color: #ddd;
     display: inline;
 }
 #phonebookteaser a {
-    color: white;
+    color: ==blockheadercolor==;
 }
 #ph_gotoFgraph { text-decoration: underline; cursor: pointer; background-color: transparent; }
 
@@ -2672,7 +2672,9 @@ input.materiaal
   max-width: 50px;
 }
 
-@media all and (min-width: 68em){
+/* van 68 naar 69 gezet vanwege problemen met resotie 1366*768 => FSN#39605 
+   eventueel nog een keer een tussenwidth definieren? */
+@media all and (min-width: 69em){
      /* inputs en suggests */
     .fld, .fldkp,
     .fldreg, .flddis, .fldloc, .fldbld, .fldflr, .fldroom, .fldworklocation, .fldwpl, .fldpers, .fldcontactpers, .flduitvoerende,

CUST/AAZC/xsl/cust_settings.xsl

@@ -4,7 +4,7 @@
 
 	<xsl:variable name="logo_file">../../cust/aaxx/aafm_banner.gif</xsl:variable>
 
-	<xsl:template name="customer">ZGN Zorggroep Noorderboog</xsl:template>
+	<xsl:template name="customer">Zorggroep Noorderboog</xsl:template>
 	<xsl:template name="customer_code">ZGN</xsl:template>
 	<xsl:template name="customer_email">servicedesknoorderboog@aa-fm.com</xsl:template>
 	<xsl:template name="invoice_email">invoices.vvt@aa-fm.com</xsl:template>

CUST/ALLI/xsl/cust.xsl

@@ -75,7 +75,7 @@
             </tr>
             <xsl:if test="status_key != 1">
                 <tr>
-                  <td class="label">Afleverdatum</td>
+                  <td class="label">Verwachte afleverdatum*</td>
                   <td class="value">: <xsl:value-of select="leverdatum/datum"/></td>
                 </tr>
             </xsl:if>
@@ -104,6 +104,9 @@
                     <xsl:value-of select="afleveradres/bezoek_land"/>
                   </td>
                 </tr>
+                 <tr>
+                  <td style="padding-top:20px" colspan="3" class="label"><i>*Er wordt contact met je opgenomen als jouw bestelling binnen is.</i></td>
+                </tr>
             </xsl:if>
             <tr>
               <td height="20px"/>

CUST/BLCC/xsl/cust.xsl

@@ -6,7 +6,7 @@
     <xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
   </xsl:variable>
 
-	<xsl:variable name="Xsrtnotificatiecode">MLDAFM</xsl:variable>
+	<xsl:variable name="Xsrtnotificatiecode">ORDUPD</xsl:variable>
 
   <xsl:template name="stylesheet">
     <style>
@@ -359,4 +359,266 @@
       </tr>
     </table>
   </xsl:template>
+  
+  <xsl:template match="opdracht" mode="include">
+  	
+ 
+    <table border="0" width="100%" cellpadding="2">
+      <tr>
+        <td colspan="4" class="caption" style="padding-top:20px;padding-bottom:20px">
+          <b>
+            <xsl:choose>
+              <xsl:when test="statusopdr_key = 10 and statusopdr_key_refiat &gt; 0">
+                <xsl:value-of select="//lcl/MLD/hergoedkeuring"/>:&#xA0;
+              </xsl:when>
+              <xsl:when test="(statusopdr_key = 3 or statusopdr_key = 4) and statusopdr_key_refiat &gt; 0">
+                <xsl:value-of select="//lcl/MLD/herfiattering"/>:&#xA0;
+              </xsl:when>
+            </xsl:choose>
+            <xsl:value-of select="opdrachttype/omschrijving"/>&#160;
+            <xsl:value-of select="melding/stdmelding/discipline/srtdiscipline/prefix"/>
+            <xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></b>
+        </td>
+      </tr>
+      <xsl:if test="extra_key">
+        <xsl:variable name="ox_key"><xsl:value-of select="extra_key"/></xsl:variable>
+        <tr>
+          <td align="right" valign="top" style="padding-top:15px;padding-bottom:10px;">
+            <b><xsl:value-of select="//lcl/FAC/bericht"/>:</b>
+          </td>
+          <td colspan="5" style="padding-top:15px;padding-bottom:10px;">
+            <xsl:call-template name="linebreaks">
+              <xsl:with-param name="string" select="notes/note[key=$ox_key]/omschrijving"/>
+            </xsl:call-template>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="6" style="padding-bottom:15px;">
+            <hr/>
+          </td>
+        </tr>
+      </xsl:if>
+      <tr>
+        <td width="16%"/>
+        <td width="17%"/>
+        <td width="17%"/>
+        <td width="16%" align="right">
+          <b><xsl:value-of select="//lcl/FAC/bedrijf"/>:</b>
+        </td>
+        <td width="17%">
+          <xsl:value-of select="uitvoerende/bedrijf/naam"/>
+        </td>
+        <td width="17%">
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/contactpersoon"/>:</b>
+        </td>
+        <td>
+          <xsl:value-of select="contactpersoon/naam_full"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b>
+        </td>
+        <td>
+          <xsl:value-of select="contactpersoon/telefoon1"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/adres"/>:</b>
+        </td>
+        <td>
+          <xsl:value-of select="uitvoerende/bedrijf/post_adres"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/plaats"/>:</b>
+        </td>
+        <td>
+          <xsl:value-of select="uitvoerende/bedrijf/post_plaats"/>
+        </td>
+      </tr>
+      <tr>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/contactpersoon"/>:</b>
+        </td>
+        <td align="left">
+          <xsl:value-of select="backoffice_contact/naam_full"/>
+        </td>
+        <td colspan="3"/>
+      </tr>
+      <tr>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b>
+        </td>
+        <td align="left">
+          <xsl:value-of select="backoffice_contact/telefoonnr"/>
+        </td>
+        <td align="left">
+        </td>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/kostenplaats"/>:</b>
+        </td>
+        <td align="left">
+          <xsl:value-of select="kostenplaats/nr"/>
+        </td>
+      </tr>
+      <xsl:if test="melding/kenmerk[@naam='Ordernr']!=''">
+        <tr>
+          <td colspan="3"/>
+          <td align="right">
+            <b><xsl:value-of select="//lcl/MLD/ordernr"/>:</b>
+          </td>
+          <td align="left">
+            <xsl:value-of select="melding/kenmerk[@naam='Ordernr']"/>
+          </td>
+        </tr>
+      </xsl:if>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/datum_gereed"/></b>
+        </td>
+        <td align="left">
+          <xsl:value-of select="datumgereed/datum"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/datum_verzonden"/>:</b>
+        </td>
+        <td align="left">
+          <xsl:value-of select="datumverzonden/datum"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/status"/>:</b>
+        </td>
+        <td align="left">
+          <xsl:value-of select="status"/>
+        </td>
+      </tr>
+      <tr>
+        <td align="right" valign="top">
+          <b><xsl:value-of select="//lcl/FAC/omschrijving"/>:</b>
+        </td>
+        <td align="left" colspan="3">
+          <xsl:call-template name="linebreaks">
+            <xsl:with-param name="string" select="omschrijving"/>
+          </xsl:call-template>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="6">
+          <hr/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="6" align="center">
+          <table width="100%" style="background-color:#EEEEEE;border: 1px solid blue">
+            <tr>
+              <td>
+                <xsl:apply-templates select="melding" mode="include"/>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="6" height="30px" valign="center">
+          <hr/>
+        </td>
+      </tr>
+      <xsl:variable name="arbeid" select="uren*uurloon"/>
+      <xsl:variable name="arbeid_refiat" select="uren_refiat*uurloon_refiat"/>
+      <tr>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/uren"/>:</b>
+        </td>
+        <td>
+          <xsl:value-of select="format-number(uren, '0,00', 'european')"/>
+          <b>&#xA0;à&#xA0;</b>&#x20AC;&#xA0;<xsl:value-of select="format-number(uurloon, '0,00', 'european')"/></td>
+        <td style="width:2in;text-align:left">
+          <xsl:if test="statusopdr_key_refiat &gt; 0">
+            (<xsl:value-of select="//lcl/MLD/was"/>&#xA0;<xsl:value-of select="format-number(uren, '0,00', 'european')"/>
+            <b>&#xA0;à&#xA0;</b>&#x20AC;&#xA0;<xsl:value-of select="format-number(uurloon, '0,00', 'european')"/>)
+          </xsl:if>
+        </td>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/arbeid"/>:</b>
+        </td>
+        <td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number($arbeid, '0,00', 'european')"/></td>
+        <td style="width:1in;text-align:right">
+          <xsl:if test="statusopdr_key_refiat &gt; 0">
+            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number($arbeid_refiat, '0,00', 'european')"/>)
+          </xsl:if>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/materiaal"/>:</b>
+        </td>
+        <td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(materiaal, '0,00', 'european')"/></td>
+        <td style="width:1in;text-align:right">
+          <xsl:if test="statusopdr_key_refiat &gt; 0">
+            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number(materiaal_refiat, '0,00', 'european')"/>)
+          </xsl:if>
+        </td>
+      </tr>
+      <xsl:variable name="correctie0" select="$arbeid + materiaal"/>
+      <xsl:variable name="correctie" select="kosten - $correctie0"/>
+      <xsl:variable name="correctie0_refiat" select="$arbeid_refiat + materiaal_refiat"/>
+      <xsl:variable name="correctie_refiat" select="kosten_refiat - $correctie0_refiat"/>
+      <xsl:if test="$correctie!=0">
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/correctie"/>:</b>
+        </td>
+        <td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number($correctie, '0,00', 'european')"/></td>
+        <td style="width:1in;text-align:right">
+          <xsl:if test="statusopdr_key_refiat &gt; 0">
+            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number($correctie_refiat, '0,00', 'european')"/>)
+          </xsl:if>
+        </td>
+      </tr>
+      </xsl:if>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/totaal"/>:</b>
+        </td>
+        <td style="width:1in;text-align:right">
+          <b>&#x20AC;&#xA0;<xsl:value-of select="format-number(kosten, '0,00', 'european')"/></b>
+        </td>
+        <td style="width:1in;text-align:right">
+          <xsl:if test="statusopdr_key_refiat &gt; 0">
+            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number(kosten_refiat, '0,00', 'european')"/>)
+          </xsl:if>
+        </td>
+      </tr>
+      <xsl:if test="$srtnotificatiecode='MLDAP1' or $srtnotificatiecode='ORDGOE'">
+      <tr>
+
+
+      	<td colspan="6" style="padding-top:20px;"> 
+      		<xsl:element name="a">
+  				<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>?<xsl:value-of select="../bookmarks/opdracht"/><xsl:value-of select="key"/>&amp;sso=2</xsl:attribute><span style="font-size:15px;">klik hier om de opdracht goed te keuren</span></xsl:element>
+      	</td>
+      </tr>
+      </xsl:if>
+    </table>
   </xsl:template>

CUST/HOUT/xsl/cust.xsl

@@ -44,6 +44,24 @@
 					</xsl:element>
                 </td>
                 </tr>
+      <xsl:if test="not(//opdracht/extra_key) and extra_key">
+        <xsl:variable name="mx_key"><xsl:value-of select="extra_key"/></xsl:variable>
+        <tr>
+          <td align="right" valign="top" style="padding-top:10px;">
+            <b><xsl:value-of select="//lcl/FAC/bericht"/>:</b>
+          </td>
+          <td colspan="3" style="padding-top:10px;">
+            <xsl:call-template name="linebreaks">
+              <xsl:with-param name="string" select="notes/note[key=$mx_key]/omschrijving"/>
+            </xsl:call-template>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="4" style="padding-bottom:20px;">
+            <hr/>
+          </td>
+        </tr>
+      </xsl:if>                
       <xsl:choose>
       <!-- Met HOUT#22944 CUST01/02-noti vervallen!!!   -->
       <xsl:when test="$srtnotificatiecode='CUSTXX'">
@@ -314,6 +332,31 @@ as defined in our General Terms and Conditions.<br/>
           </tr>
         </xsl:if>
       </xsl:for-each>
+        <td>
+        	<xsl:if test="behandelwijze=2 and not(/facilitor/opdracht)">
+        <xsl:for-each select="notes/note[flag=1]">
+		      <xsl:sort select="aanmaak/timestamp" order="ascending"/>
+          <tr>
+            <xsl:choose>
+              <xsl:when test="position() = 1">
+                <td align="right" valign="top">
+                  <b><xsl:value-of select="//lcl/MLD/behandeling"/>:</b>
+                </td>
+              </xsl:when>
+              <xsl:otherwise>
+                <td/>
+              </xsl:otherwise>
+            </xsl:choose>
+            <td colspan="3">
+              <span class="mldbeh"><xsl:value-of select="aanmaak/datum"/>&#xA0;<xsl:value-of select="aanmaak/tijd"/>&#xA0;-&#xA0;<xsl:value-of select="noteur/naam_friendly"/></span>&#xA0;
+              <xsl:call-template name="linebreaks">
+                <xsl:with-param name="string" select="omschrijving"/>
+              </xsl:call-template>
+            </td>
+          </tr>
+        </xsl:for-each>
+      		</xsl:if>
+        </td>
         <td colspan="4">
           <hr/>
         </td>

CUST/KIBE/xsl/cust.xsl

@@ -6,6 +6,22 @@
     <xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
   </xsl:variable>
   
+	<xsl:template match="melding" mode="include">
+		<table>
+		<tbody>
+		<tr>
+			<td class="tekst">
+			<xsl:element name="a">
+				<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>?<xsl:value-of select="//bookmarks/melding"/>
+					<xsl:value-of select="key"/>
+				</xsl:attribute>Klik hier om de melding in te zien</xsl:element>
+				</td>
+		</tr>
+		</tbody>
+		</table>
+		<xsl:apply-imports/>
+	</xsl:template>  
+
 	<xsl:template match="rapport">
     <xsl:if test="@view='kibe_v_rap_cntkst_unitgemloc'">
       <table class="rstable">

CUST/MARX/xsl/AX_TU.xsl

@@ -37,6 +37,10 @@
 				<xsl:element name="OrderLine">
 					<LineItemNumber><xsl:value-of select="bestelitem/kenmerk[@key='8']"/></LineItemNumber>
 					<GTIN><xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/></GTIN>
+          <TradeItemId>
+            <TradeItemNumber><xsl:value-of select="bestelitem/kenmerk[@key='9']"/></TradeItemNumber>
+            <TradeItemNumberTypeCode>SA</TradeItemNumberTypeCode>
+          </TradeItemId>
 					<OrderedQuantity>
 						<Quantity><xsl:value-of select="aantal"/></Quantity>
 			      <MeasureUnitQualifier><xsl:value-of select="bestelitem/srtdeel/eenheid"/></MeasureUnitQualifier>

CUST/MARX/xsl/A_GetBestelOpdracht.xsl

@@ -12,7 +12,7 @@
 
 <!-- Let op: namespace ns1 is zomaar een naam, en is nodig vanwege die default lege namespace die in de input XML staat -->
 <xsl:template match="ns1:Order">gln_supplier;gln_buyer;bes_afleveradres_code;bes_afleveradres_straat_huisnr;bes_afleveradres_postcode;bes_afleveradres_plaats;bes_bestelling_memo;bes_ordernr;bes_aflever_datumbes_orderline_nr;bes_orderline_gtin;bes_orderline_art_code;bes_orderline_art_descr;bes_orderline_art_eenheid;bes_orderline_art_aantal;bes_orderline_art_prijs;bes_orderline_art_btw
-<xsl:for-each select="ns1:OrderLine"><xsl:value-of select="../ns1:OrderHeader/ns1:Supplier/ns1:GLN"/>;<xsl:value-of select="../ns1:OrderHeader/ns1:Buyer/ns1:GLN"/>;<xsl:value-of select="../ns1:OrderHeader/ns1:DeliveryParty/ns1:PartyName"/>;<xsl:value-of select="../ns1:OrderHeader/ns1:DeliveryParty/ns1:StreetAndNumber"/>;<xsl:value-of select="../ns1:OrderHeader/ns1:DeliveryParty/ns1:Postcode"/>;<xsl:value-of select="../ns1:OrderHeader/ns1:DeliveryParty/ns1:CityName"/>;;<xsl:value-of select="../ns1:OrderHeader/ns1:Document/ns1:DocumentNumber"/>;<xsl:value-of select="../ns1:OrderHeader/ns1:Document/ns1:Date"/>;<xsl:value-of select="ns1:LineItemNumber"/>;<xsl:value-of select="ns1:GTIN"/>;<xsl:value-of select="ns1:SuppliersTradeItemId"/>;;<xsl:value-of select="ns1:OrderedQuantity/ns1:MeasureUnitQualifier"/>;<xsl:value-of select="ns1:OrderedQuantity/ns1:Quantity"/>;;21;&#10;</xsl:for-each>
+<xsl:for-each select="ns1:OrderLine"><xsl:value-of select="../ns1:OrderHeader/ns1:Supplier/ns1:GLN"/>;<xsl:value-of select="../ns1:OrderHeader/ns1:Buyer/ns1:GLN"/>;<xsl:value-of select="../ns1:OrderHeader/ns1:DeliveryParty/ns1:PartyName"/>;<xsl:value-of select="../ns1:OrderHeader/ns1:DeliveryParty/ns1:StreetAndNumber"/>;<xsl:value-of select="../ns1:OrderHeader/ns1:DeliveryParty/ns1:Postcode"/>;<xsl:value-of select="../ns1:OrderHeader/ns1:DeliveryParty/ns1:CityName"/>;;<xsl:value-of select="../ns1:OrderHeader/ns1:Document/ns1:DocumentNumber"/>;<xsl:value-of select="../ns1:OrderHeader/ns1:Document/ns1:Date"/>;<xsl:value-of select="ns1:LineItemNumber"/>;<xsl:value-of select="ns1:GTIN"/>;<xsl:value-of select="ns1:TradeItemId/ns1:TradeItemNumber"/>;;<xsl:value-of select="ns1:OrderedQuantity/ns1:MeasureUnitQualifier"/>;<xsl:value-of select="ns1:OrderedQuantity/ns1:Quantity"/>;;21;&#10;</xsl:for-each>
 </xsl:template>
 
 

CUST/MARX/xsl/F_GetBestelOpdracht_SIDB_INSBOU004.xsl

@@ -37,6 +37,7 @@
 					<LineIdentification><xsl:value-of select="bestelitem/kenmerk[@key='8']"/></LineIdentification>
 					<TradeItemIdentification>
 			      <GTIN><xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/></GTIN>
+			      <SuppliersTradeItemId><xsl:value-of select="bestelitem/kenmerk[@key='9']"/></SuppliersTradeItemId>
 		      </TradeItemIdentification>
 					<DeliveryDateTimeInformation>
 			      <RequiredDeliveryDate><xsl:value-of select="../bestelling/leverdatum/jaar"/>-<xsl:value-of select="../bestelling/leverdatum/maand"/>-<xsl:value-of select="../bestelling/leverdatum/dag"/></RequiredDeliveryDate>			      

CUST/MARX/xsl/cXML.xsl

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:output method="xml" encoding="UTF-8"/>
+	<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
 
 	<xsl:decimal-format name="european" decimal-separator="." grouping-separator=","/>
 
@@ -132,7 +132,10 @@
 							</xsl:attribute>
 							<ItemID>
 								<SupplierPartID>
-									<xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/>
+								  <!-- GTIN is in cXML geen node, wel het leveranciers artikelnummer, dus die pakken we dan uit flexprop key 9 -->
+								  <!-- Wanneer opdrachtgever wel GTIN codes gebruikt, zal dan wellicht niet voor een leverancier zijn die cXML wil of kan ontvangen -->
+								  <!-- Oftewel dit uitwisselformaat is alleen geschikt voor leveranciers met een eigen artikelnummer (hetgeen best gangbaar is) -->
+									<xsl:value-of select="bestelitem/kenmerk[@key='9']"/>
 								</SupplierPartID>
 							</ItemID>
 							<ItemDetail>

CUST/MARX/xsl/mareon.xsl

@@ -353,7 +353,7 @@
       -->
       <tr>
         <td colspan="5" style="text-align:left; font-size:9px; color:red;font-weight:bold;">
-        <xsl:call-template name="escape_marnr_tobiasnr"><xsl:with-param name="string" select="melding/voor/afdeling/bedrijf/opmerking2"/></xsl:call-template>
+        <xsl:call-template name="escape_marnr_tobiasnr"><xsl:with-param name="string" select="melding/voor/afdeling/bedrijf/opmerking2"/><xsl:with-param name="mld_or_bes" select="'MLD'"/></xsl:call-template>
 				</td>
       </tr>
       <tr>
@@ -364,23 +364,576 @@
     </table>
   </xsl:template>
 
+
+  <!--                                                                                                         -->
+  <!--                                                                                                         -->
+  <!--               BESTELOPDRACHT         BESTELOPDRACHT         BESTELOPDRACHT       BESTELOPDRACHT         -->
+  <!--                                                                                                         -->
+  <!--                                                                                                         -->
+
+
+  <xsl:template match="bestelopdracht" mode="include">
+
+
+    <table border="0" width="100%" cellpadding="2">
+
+
+      <tr>
+        <td colspan="4" class="caption" style="padding-top:20px;padding-bottom:20px">
+          <b>
+            Bestelopdracht&#160;
+            <xsl:element name="a">
+            	<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>/?<xsl:value-of select="../bookmarks/bestelopdr"/><xsl:value-of select="key"/>&amp;urole=bo</xsl:attribute>
+		            <xsl:value-of select="id"/>
+            </xsl:element>
+          </b>
+        </td>
+      </tr>
+
+      <!-- MARX#36901 - Extra optionele tekst, doen we bij bestellingen toch ook maar -->
+      <xsl:if test="bestelling/voor/afdeling/bedrijf/kenmerk[@key='6'] != ''">
+	      <tr>
+	        <td colspan="5" style="text-align:left; color:red">
+	         <xsl:call-template name="linebreaks">
+	            <xsl:with-param name="string" select="bestelling/voor/afdeling/bedrijf/kenmerk[@key='6']"/>
+	         </xsl:call-template>
+					</td>
+	      </tr>
+      </xsl:if>
+
+      <tr><td colspan="4" valign="center"><hr/></td></tr>
+
+
+      <tr>
+      	<td colspan="4" style="font-size:20px"><xsl:value-of select="bestelling/voor/afdeling/bedrijf/naam"/><xsl:if test="bestelling/voor/afdeling/bedrijf/leverancier_nr!=''"><span style="font-size:9px;float:right;"><b>GLN</b>: <xsl:value-of select="bestelling/voor/afdeling/bedrijf/leverancier_nr"/></span></xsl:if></td>
+      </tr>
+
+      <tr>
+      	<td><b>Post<xsl:value-of select="//lcl/FAC/adres"/>: </b></td>
+      	<td><xsl:value-of select="bestelling/voor/afdeling/bedrijf/post_adres"/></td>
+        <td><b>Bezoek<xsl:value-of select="//lcl/FAC/adres"/>: </b></td>
+      	<td><xsl:value-of select="bestelling/voor/afdeling/bedrijf/bezoek_adres"/></td>
+      </tr>
+
+      <tr>
+      	<td/>
+      	<td><xsl:value-of select="bestelling/voor/afdeling/bedrijf/post_postcode"/>&#160;&#160;<xsl:value-of select="bestelling/voor/afdeling/bedrijf/post_plaats"/></td>
+        <td/>
+        <td><xsl:value-of select="bestelling/voor/afdeling/bedrijf/bezoek_postcode"/>&#160;&#160;<xsl:value-of select="bestelling/voor/afdeling/bedrijf/bezoek_plaats"/></td>
+      </tr>
+
+      <tr>
+      	<td><b><xsl:value-of select="//lcl/FAC/telefoon"/>: </b></td>
+      	<td><xsl:value-of select="bestelling/voor/afdeling/bedrijf/telefoon"/></td>
+      	<xsl:if test="bestelling/voor/afdeling/bedrijf/fax!=''">
+        <td><b>Fax: </b></td>
+      	<td><xsl:value-of select="bestelling/voor/afdeling/bedrijf/fax"/></td>
+      	</xsl:if>
+      </tr>
+      <tr>
+      	<td><b><xsl:value-of select="//lcl/FAC/e-mail"/>: </b></td>
+      	<td><xsl:value-of select="bestelling/voor/afdeling/bedrijf/email"/></td>
+        <td colspan="2"/>
+      </tr>
+
+      <tr><td colspan="4" valign="center"><hr style="border-style: dashed;"/></td></tr>
+
+
+      <tr>
+      	<td colspan="4" style="font-size:20px"><xsl:value-of select="bedrijf/naam"/><xsl:if test="bedrijf/leverancier_nr!=''"><span style="font-size:9px;float:right;"><b>GLN</b>: <xsl:value-of select="bedrijf/leverancier_nr"/></span></xsl:if></td>
+      </tr>
+
+      <tr>
+      	<td><b>Post<xsl:value-of select="//lcl/FAC/adres"/>: </b></td>
+      	<td><xsl:value-of select="bedrijf/post_adres"/></td>
+        <td><b>Bezoek<xsl:value-of select="//lcl/FAC/adres"/>: </b></td>
+      	<td><xsl:value-of select="bedrijf/bezoek_adres"/></td>
+      </tr>
+
+      <tr>
+      	<td/>
+      	<td><xsl:value-of select="bedrijf/post_postcode"/>&#160;&#160;<xsl:value-of select="bedrijf/post_plaats"/></td>
+        <td/>
+        <td><xsl:value-of select="bedrijf/bezoek_postcode"/>&#160;&#160;<xsl:value-of select="bedrijf/bezoek_plaats"/></td>
+      </tr>
+
+      <tr>
+      	<td><b><xsl:value-of select="//lcl/FAC/telefoon"/>: </b></td>
+      	<td><xsl:value-of select="bedrijf/telefoon"/></td>
+      	<xsl:if test="bedrijf/fax!=''">
+        <td><b>Fax: </b></td>
+      	<td><xsl:value-of select="bedrijf/fax"/></td>
+      	</xsl:if>
+      </tr>
+      <tr>
+      	<td><b><xsl:value-of select="//lcl/FAC/e-mail"/>: </b></td>
+      	<td><xsl:value-of select="bedrijf/email"/></td>
+        <td colspan="2"/>
+      </tr>
+
+      <tr><td colspan="4" valign="center"><hr/></td></tr>
+
+      <tr>
+      	<td colspan="4" style="font-size:20px">Algemene opdrachtgegevens</td>
+      </tr>
+      <tr><td colspan="4" height="4px"></td></tr>
+      <tr>
+      	<td colspan="2" style="font-size:14px"><b>MAREON NUMMER: </b>
+            <xsl:value-of select="id"/>
+        </td>
+        <td colspan="2" style="font-size:14px"><b>INKOOPORDER OPDRACHTGEVER: </b> <xsl:value-of select="bestelling/kenmerk[@key=6]"/></td>
+      </tr>
+      <tr><td colspan="4" height="4px"></td></tr>
+
+      <tr>
+        <td><b>Opdrachtdatum: </b></td>
+        <td><xsl:value-of select="datum/datum"/></td>
+        <td><b>Status: </b></td>
+        <td><xsl:value-of select="status"/></td>
+      </tr>
+      <tr>
+        <td><b>Afleverdatum: </b></td>
+        <td><xsl:value-of select="bestelling/leverdatum/datum"/></td>
+        <td colspan="2"/>
+      </tr>
+
+
+      <tr><td colspan="4" height="4px"></td></tr>
+
+			<tr>
+        <td align="right">
+          <b>Aflevernaam/object:</b>
+        </td>
+        <td>
+          <xsl:value-of select='bestelling/kenmerk[@key=1]'/>
+        </td>
+        <td/>
+      </tr>
+
+      <tr>
+        <td align="right">
+          <b>Adres:</b>
+        </td>
+        <td>
+         <xsl:value-of select='bestelling/kenmerk[@key=3]'/>
+        </td>
+        <td/>
+      </tr>
+
+      <tr>
+        <td align="right">
+          <b>Plaats:</b>
+        </td>
+        <td>
+          <xsl:value-of select="bestelling/kenmerk[@key=4]"/>&#160;<xsl:value-of select="bestelling/kenmerk[@key=5]"/>
+        </td>
+         <td/>
+      </tr>
+      
+      <xsl:if test="bestelling/bestel_opm">
+        <tr>
+          <td height="10px" colspan="4"/>
+        </tr>      
+        <tr>
+          <td class="label" style="vertical-align:top"><b><xsl:value-of select="//lcl/FAC/opmerkingen"/></b></td>
+          <td class="value" colspan="3">:
+          <xsl:call-template name="linebreaks">
+            <xsl:with-param name="string" select="bestelling/bestel_opm"/>
+          </xsl:call-template>
+          </td>
+        </tr>
+      </xsl:if> 
+			 
+			<tr><td colspan="4" valign="center"><hr/></td></tr>
+			<tr>
+      	<td colspan="4" style="font-size:20px">Bestellijst</td>
+      </tr>
+      <tr><td colspan="4" height="4px"></td></tr>
+         <TR>
+            <TD colspan="8">
+              <TABLE cellpadding="1" cellspacing="0" border="0" bordercolor="#000000" frame="box" width="99%">
+                <tr>
+                  <th class="besth" style="width:5%; text-align:left"><b><xsl:value-of select="//lcl/BES/regel"/></b></th>
+                  <th class="besth" style="width:13%; text-align:left"><b>GTIN</b></th>
+                  <th class="besth" style="width:12%; text-align:left"><b>Artikelnr</b></th>
+                  <th class="besth" style="width:25%"><b><xsl:value-of select="//lcl/FAC/omschrijving"/></b></th>
+                  <th class="besth" style="width:10%; text-align:left"><b><xsl:value-of select="//lcl/FAC/eenheid"/></b></th>
+                  <th class="besth" style="width:5; text-align:right"><b><xsl:value-of select="//lcl/FAC/aantal"/></b></th>
+                  <th class="besth" style="width:15%; text-align:right"><b><xsl:value-of select="//lcl/FAC/prijs"/></b></th>
+                  <th class="besth" style="width:15%; text-align:right"><b><xsl:value-of select="//lcl/FAC/totaal"/></b></th>
+                </tr>
+                <xsl:for-each select="bestelopdrachtitem">
+                  <xsl:sort select="bestelitem/kenmerk[@key='8']" data-type="number"/>
+                  <tr>
+                    <td class="besresult">
+                      <xsl:value-of select="bestelitem/kenmerk[@key='8']"/>
+                    </td>
+                    <td class="besresult">
+                      <xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/>
+                    </td>
+                    <td class="besresult">
+                      <xsl:value-of select="bestelitem/kenmerk[@key='9']"/>
+                    </td>
+                    <td class="besresult">
+                      <xsl:value-of select="bestelitem/srtdeel/omschrijving"/>&#xA0;
+                      <xsl:for-each select="bestelitem/kenmerk[@key != 8 and key != 9]">
+                        <br/>
+                        <xsl:value-of select="@naam"/>: <xsl:value-of select="."/></xsl:for-each>
+                    </td>
+                    <td class="besresult">
+                      <xsl:value-of select="bestelitem/srtdeel/eenheid"/>
+                    </td>
+                    <td class="besresult" style="text-align:right">
+                      <xsl:value-of select="aantal"/>
+                    </td>
+                    <td class="besresult" style="text-align:right">
+                      &#x20AC;&#xA0;<xsl:value-of select="format-number(prijs, '0,00', 'european')"/>
+                    </td>
+                    <td class="besresult" style="text-align:right">
+                      &#x20AC;&#xA0;<xsl:value-of select="format-number(totaal, '0,00', 'european')"/>
+                    </td>
+                  </tr>
+                </xsl:for-each>
+                <tr>
+                  <td colspan="8" height="6px" style="border-top:1px solid #000;"/>
+                </tr>
+                <tr>
+                  <td colspan="7"/>
+                  <td style="text-align:right">
+                    <b>
+                      &#x20AC;&#xA0;<xsl:value-of select="format-number(sum(bestelopdrachtitem/totaal), '0,00', 'european')"/>
+                    </b>
+                  </td>
+                </tr>
+              </TABLE>
+            </TD>
+          </TR>
+          <tr>
+            <td colspan="4" style="height:40px"/>
+          </tr>
+
+      <tr>
+        <td colspan="4" height="10px" valign="center">
+          <hr style="border-style: dashed;"/>
+        </td>
+      </tr>
+
+      <tr>
+        <td colspan="5" style="text-align:left; font-size:9px; color:red;font-weight:bold;">
+        <xsl:call-template name="escape_marnr_tobiasnr"><xsl:with-param name="string" select="bestelling/voor/afdeling/bedrijf/opmerking2"/><xsl:with-param name="mld_or_bes" select="'BES'"/></xsl:call-template>
+      </td>
+      </tr>
+      <tr>
+			    <td colspan="5" style="text-align:left; font-size:9px">
+			    <xsl:value-of select="bestelling/voor/afdeling/bedrijf/opmerking"/>
+			    </td>
+			</tr>
+    </table>
+  </xsl:template>
+  
+  <!--                                                                                                         -->
+  <!--                                                                                                         -->
+  <!--            BESTELAANVRAAG         BESTELAANVRAAG         BESTELAANVRAAG       BESTELAANVRAAG            -->
+  <!--                                                                                                         -->
+  <!--                                                                                                         -->
+
+
+  <xsl:template match="bestelling" mode="include">
+    <xsl:for-each select="bestelopdracht">
+      <xsl:apply-templates select="." mode="bestelaanvraag"/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="bestelopdracht" mode="bestelaanvraag">
+    <table border="0" width="100%" cellpadding="2">
+      <tr>
+        <td colspan="4" class="caption" style="padding-top:20px;padding-bottom:20px">
+          <b>
+            Bestelopdracht&#160;
+            <xsl:element name="a">
+            	<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>/?u=bestelopdr&amp;k=<xsl:value-of select="key"/>&amp;urole=bo</xsl:attribute>
+		            <xsl:value-of select="id"/>
+            </xsl:element>
+          </b>
+        </td>
+      </tr>
+
+      <!-- MARX#36901 - Extra optionele tekst, doen we bij bestellingen toch ook maar -->
+      <xsl:if test="../voor/afdeling/bedrijf/kenmerk[@key='6'] != ''">
+	      <tr>
+	        <td colspan="5" style="text-align:left; color:red">
+	         <xsl:call-template name="linebreaks">
+	            <xsl:with-param name="string" select="../voor/afdeling/bedrijf/kenmerk[@key='6']"/>
+	         </xsl:call-template>
+					</td>
+	      </tr>
+      </xsl:if>
+
+      <tr><td colspan="4" valign="center"><hr/></td></tr>
+
+
+      <tr>
+      	<td colspan="4" style="font-size:20px"><xsl:value-of select="../voor/afdeling/bedrijf/naam"/><xsl:if test="../voor/afdeling/bedrijf/leverancier_nr!=''"><span style="font-size:9px;float:right;"><b>GLN</b>: <xsl:value-of select="../voor/afdeling/bedrijf/leverancier_nr"/></span></xsl:if></td>
+      </tr>
+
+      <tr>
+      	<td><b>Post<xsl:value-of select="//lcl/FAC/adres"/>: </b></td>
+      	<td><xsl:value-of select="../voor/afdeling/bedrijf/post_adres"/></td>
+        <td><b>Bezoek<xsl:value-of select="//lcl/FAC/adres"/>: </b></td>
+      	<td><xsl:value-of select="../voor/afdeling/bedrijf/bezoek_adres"/></td>
+      </tr>
+
+      <tr>
+      	<td/>
+      	<td><xsl:value-of select="../voor/afdeling/bedrijf/post_postcode"/>&#160;&#160;<xsl:value-of select="../voor/afdeling/bedrijf/post_plaats"/></td>
+        <td/>
+        <td><xsl:value-of select="../voor/afdeling/bedrijf/bezoek_postcode"/>&#160;&#160;<xsl:value-of select="../voor/afdeling/bedrijf/bezoek_plaats"/></td>
+      </tr>
+
+      <tr>
+      	<td><b><xsl:value-of select="//lcl/FAC/telefoon"/>: </b></td>
+      	<td><xsl:value-of select="../voor/afdeling/bedrijf/telefoon"/></td>
+      	<xsl:if test="../voor/afdeling/bedrijf/fax!=''">
+        <td><b>Fax: </b></td>
+      	<td><xsl:value-of select="../voor/afdeling/bedrijf/fax"/></td>
+      	</xsl:if>
+      </tr>
+      <tr>
+      	<td><b><xsl:value-of select="//lcl/FAC/e-mail"/>: </b></td>
+      	<td><xsl:value-of select="../voor/afdeling/bedrijf/email"/></td>
+        <td colspan="2"/>
+      </tr>
+
+      <tr><td colspan="4" valign="center"><hr style="border-style: dashed;"/></td></tr>
+
+
+      <tr>
+      	<td colspan="4" style="font-size:20px"><xsl:value-of select="bedrijf/naam"/><xsl:if test="bedrijf/leverancier_nr!=''"><span style="font-size:9px;float:right;"><b>GLN</b>: <xsl:value-of select="bedrijf/leverancier_nr"/></span></xsl:if></td>
+      </tr>
+
+      <tr>
+      	<td><b>Post<xsl:value-of select="//lcl/FAC/adres"/>: </b></td>
+      	<td><xsl:value-of select="bedrijf/post_adres"/></td>
+        <td><b>Bezoek<xsl:value-of select="//lcl/FAC/adres"/>: </b></td>
+      	<td><xsl:value-of select="bedrijf/bezoek_adres"/></td>
+      </tr>
+
+      <tr>
+      	<td/>
+      	<td><xsl:value-of select="bedrijf/post_postcode"/>&#160;&#160;<xsl:value-of select="bedrijf/post_plaats"/></td>
+        <td/>
+        <td><xsl:value-of select="bedrijf/bezoek_postcode"/>&#160;&#160;<xsl:value-of select="bedrijf/bezoek_plaats"/></td>
+      </tr>
+
+      <tr>
+      	<td><b><xsl:value-of select="//lcl/FAC/telefoon"/>: </b></td>
+      	<td><xsl:value-of select="bedrijf/telefoon"/></td>
+      	<xsl:if test="bedrijf/fax!=''">
+        <td><b>Fax: </b></td>
+      	<td><xsl:value-of select="bedrijf/fax"/></td>
+      	</xsl:if>
+      </tr>
+      <tr>
+      	<td><b><xsl:value-of select="//lcl/FAC/e-mail"/>: </b></td>
+      	<td><xsl:value-of select="bedrijf/email"/></td>
+        <td colspan="2"/>
+      </tr>
+
+      <tr><td colspan="4" valign="center"><hr/></td></tr>
+
+      <tr>
+      	<td colspan="4" style="font-size:20px">Algemene opdrachtgegevens</td>
+      </tr>
+      <tr><td colspan="4" height="4px"></td></tr>
+      <tr>
+      	<td colspan="2" style="font-size:14px"><b>MAREON NUMMER: </b>
+            <xsl:value-of select="id"/>
+        </td>
+        <td colspan="2" style="font-size:14px"><b>INKOOPORDER OPDRACHTGEVER: </b> <xsl:value-of select="../kenmerk[@key=6]"/></td>
+      </tr>
+      <tr><td colspan="4" height="4px"></td></tr>
+
+      <tr>
+        <td><b>Opdrachtdatum: </b></td>
+        <td><xsl:value-of select="datum/datum"/></td>
+        <td><b>Status: </b></td>
+        <td><xsl:value-of select="status"/></td>
+      </tr>
+      <tr>
+        <td><b>Afleverdatum: </b></td>
+        <td><xsl:value-of select="../leverdatum/datum"/></td>
+        <td colspan="2"/>
+      </tr>
+
+
+      <tr><td colspan="4" height="4px"></td></tr>
+
+			<tr>
+        <td align="right">
+          <b>Aflevernaam/object:</b>
+        </td>
+        <td>
+          <xsl:value-of select='../kenmerk[@key=1]'/>
+        </td>
+        <td/>
+      </tr>
+
+      <tr>
+        <td align="right">
+          <b>Adres:</b>
+        </td>
+        <td>
+         <xsl:value-of select='../kenmerk[@key=3]'/>
+        </td>
+        <td/>
+      </tr>
+
+      <tr>
+        <td align="right">
+          <b>Plaats:</b>
+        </td>
+        <td>
+          <xsl:value-of select="../kenmerk[@key=4]"/>&#160;<xsl:value-of select="../kenmerk[@key=5]"/>
+        </td>
+         <td/>
+      </tr>
+      
+      <xsl:if test="../bestel_opm">
+        <tr>
+          <td height="10px" colspan="4"/>
+        </tr>      
+        <tr>
+          <td class="label" style="vertical-align:top"><b><xsl:value-of select="//lcl/FAC/opmerkingen"/></b></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 colspan="4" valign="center"><hr/></td></tr>
+			<tr>
+      	<td colspan="4" style="font-size:20px">Bestellijst</td>
+      </tr>
+      <tr><td colspan="4" height="4px"></td></tr>
+         <TR>
+            <TD colspan="8">
+              <TABLE cellpadding="1" cellspacing="0" border="0" bordercolor="#000000" frame="box" width="99%">
+                <tr>
+                  <th class="besth" style="width:5%; text-align:left"><b><xsl:value-of select="//lcl/BES/regel"/></b></th>
+                  <th class="besth" style="width:13%; text-align:left"><b>GTIN</b></th>
+                  <th class="besth" style="width:12%; text-align:left"><b>Artikelnr</b></th>
+                  <th class="besth" style="width:25%"><b><xsl:value-of select="//lcl/FAC/omschrijving"/></b></th>
+                  <th class="besth" style="width:10%; text-align:left"><b><xsl:value-of select="//lcl/FAC/eenheid"/></b></th>
+                  <th class="besth" style="width:5; text-align:right"><b><xsl:value-of select="//lcl/FAC/aantal"/></b></th>
+                  <th class="besth" style="width:15%; text-align:right"><b><xsl:value-of select="//lcl/FAC/prijs"/></b></th>
+                  <th class="besth" style="width:15%; text-align:right"><b><xsl:value-of select="//lcl/FAC/totaal"/></b></th>
+                </tr>
+                <xsl:for-each select="../bestelitem">
+                  <xsl:sort select="kenmerk[@key='8']" data-type="number"/>
+                  <tr>
+                    <td class="besresult">
+                      <xsl:value-of select="kenmerk[@key='8']"/>
+                    </td>
+                    <td class="besresult">
+                      <xsl:value-of select="srtdeel/artikel_nummer"/>
+                    </td>
+                    <td class="besresult">
+                      <xsl:value-of select="kenmerk[@key='9']"/>
+                    </td>
+                    <td class="besresult">
+                      <xsl:value-of select="srtdeel/omschrijving"/>&#xA0;
+                      <xsl:for-each select="kenmerk[@key != 8 and key != 9]">
+                        <br/>
+                        <xsl:value-of select="@naam"/>: <xsl:value-of select="."/></xsl:for-each>
+                    </td>
+                    <td class="besresult">
+                      <xsl:value-of select="srtdeel/eenheid"/>
+                    </td>
+                    <td class="besresult" style="text-align:right">
+                      <xsl:value-of select="aantal"/>
+                    </td>
+                    <td class="besresult" style="text-align:right">
+                      &#x20AC;&#xA0;<xsl:value-of select="format-number(srtdeel/prijs, '0,00', 'european')"/>
+                    </td>
+                    <td class="besresult" style="text-align:right">
+                      &#x20AC;&#xA0;<xsl:value-of select="format-number(aantal * srtdeel/prijs, '0,00', 'european')"/>
+                    </td>
+                  </tr>
+                </xsl:for-each>
+                <tr>
+                  <td colspan="8" height="6px" style="border-top:1px solid #000;"/>
+                </tr>
+                <tr>
+                  <td colspan="7"/>
+                  <td style="text-align:right">
+                    <b>
+                      &#x20AC;&#xA0;<xsl:value-of select="format-number(sum(../bestelitem/totaal), '0,00', 'european')"/>
+                    </b>
+                  </td>
+                </tr>
+              </TABLE>
+            </TD>
+          </TR>
+          <tr>
+            <td colspan="4" style="height:40px"/>
+          </tr>
+
+      <tr>
+        <td colspan="4" height="10px" valign="center">
+          <hr style="border-style: dashed;"/>
+        </td>
+      </tr>
+
+      <tr>
+        <td colspan="5" style="text-align:left; font-size:9px; color:red;font-weight:bold;">
+        <xsl:call-template name="escape_marnr_tobiasnr"><xsl:with-param name="string" select="../voor/afdeling/bedrijf/opmerking2"/><xsl:with-param name="mld_or_bes" select="'BES'"/></xsl:call-template>
+      </td>
+      </tr>
+      <tr>
+			    <td colspan="5" style="text-align:left; font-size:9px">
+			    <xsl:value-of select="../voor/afdeling/bedrijf/opmerking"/>
+			    </td>
+			</tr>
+    </table>
+  </xsl:template>
+
+
 	<xsl:template name="escape_marnr_tobiasnr">
 		<xsl:param name="string"/>
+		<xsl:param name="mld_or_bes"/>
 		<xsl:variable name="l_marnr" select="'MAR###'"/>
 		<xsl:variable name="l_tobiasnr" select="'TOBIAS###'"/>
 		<xsl:choose>
 			<xsl:when test="contains($string, $l_marnr)">
 				<xsl:value-of select="substring-before($string, $l_marnr)"/>
+				<xsl:choose>
+          <xsl:when test="$mld_or_bes='MLD'">
             <xsl:value-of select="melding/stdmelding/discipline/srtdiscipline/prefix"/><xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/>
+          </xsl:when>
+          <xsl:when test="$mld_or_bes='BES'">
+            <xsl:value-of select="id"/>
+          </xsl:when>
+				</xsl:choose>
 				<xsl:call-template name="escape_marnr_tobiasnr">
 						<xsl:with-param name="string" select="substring-after($string, $l_marnr)"/>
+						<xsl:with-param name="mld_or_bes" select="$mld_or_bes"/>
 				</xsl:call-template>
 			</xsl:when>
 			<xsl:when test="contains($string, $l_tobiasnr)">
 				<xsl:value-of select="substring-before($string, $l_tobiasnr)"/>
+				<xsl:choose>
+          <xsl:when test="$mld_or_bes='MLD'">
             <xsl:value-of select="opdr_id"/>
+          </xsl:when>
+          <xsl:when test="$mld_or_bes='BES'">
+            <xsl:value-of select="bestelling/kenmerk[@key=6]"/>
+          </xsl:when>
+				</xsl:choose>
 				<xsl:call-template name="escape_marnr_tobiasnr">
 					<xsl:with-param name="string" select="substring-after($string, $l_tobiasnr)"/>
+					<xsl:with-param name="mld_or_bes" select="$mld_or_bes"/>
 				</xsl:call-template>
 			</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$string"/></xsl:otherwise>
@@ -389,16 +942,17 @@
 
 	<xsl:template name="print_materiaal_regels">
 		<xsl:param name="p_extra1"/>
+    <xsl:variable name="l_verwerk_prijzen"><xsl:value-of select="//facilitor/opdracht/melding/voor/afdeling/bedrijf/kenmerk[@key='13']"/></xsl:variable>
  		<xsl:for-each select="//facilitor/opdracht/materialen[extra1=$p_extra1]">
  			<xsl:sort select="volgnr" data-type="number"/>
 				<tr>
           <td><xsl:value-of select="omschrijving"/></td>
           <td><xsl:value-of select="eenheid"/></td>
-          <td style='text-align:right'>&#x20AC;&#xA0;<xsl:value-of select="format-number(stuksprijs, '0,00', 'european')"/></td>
+          <td style='text-align:right'><xsl:if test="stuksprijs != '' and ($l_verwerk_prijzen = '' or $l_verwerk_prijzen = '0')">&#x20AC;&#xA0;<xsl:value-of select="format-number(stuksprijs, '0,00', 'european')"/></xsl:if></td>
           <td style='text-align:right'><xsl:value-of select="aantal"/></td>
-          <td style='text-align:right'>&#x20AC;&#xA0;<xsl:value-of select="format-number(totaalprijs, '0,00', 'european')"/></td>
+          <td style='text-align:right'><xsl:if test="totaalprijs != '' and ($l_verwerk_prijzen = '' or $l_verwerk_prijzen = '0')">&#x20AC;&#xA0;<xsl:value-of select="format-number(totaalprijs, '0,00', 'european')"/></xsl:if></td>
           <td style='text-align:right'><xsl:value-of select="btwpercentage"/>%</td>
-          <td style='text-align:right'>&#x20AC;&#xA0;<xsl:value-of select="format-number(totaalprijs + btwbedrag, '0,00', 'european')"/></td>
+          <td style='text-align:right'><xsl:if test="totaalprijs != '' and ($l_verwerk_prijzen = '' or $l_verwerk_prijzen = '0')">&#x20AC;&#xA0;<xsl:value-of select="format-number(totaalprijs + btwbedrag, '0,00', 'european')"/></xsl:if></td>
         </tr>
 		</xsl:for-each>
 	</xsl:template>

CUST/MDUX/xsl/cust.xsl

@@ -6,6 +6,13 @@
   <xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
 </xsl:variable>
 
+<xsl:template name="opdr_endtext">
+  <tr>
+    <td colspan="5" style="text-align:left; font-size:9px" class="tekst">REAGEER A.U.B. NIET OP DEZE MAIL, DIT IS EEN NO-REPLY E-MAILADRES. VOOR VRAGEN KAN ER CONTACT WORDEN GEZOCHT MET FACILITAIRE ZAKEN, VIA FACILITAIR@MEDUX.NL.</td>
+  </tr>
+</xsl:template>
+
+
 
 <xsl:template match="opdracht" mode="include">
     <xsl:choose>
@@ -254,10 +261,11 @@
 				<br/>
 				<br/>
 				DE FACTUREN DIENEN IN PDF-FORMAAT GEMAILD TE WORDEN NAAR: CREDITEURENFACTUUR@MEDUX.NL
+				<br/>
+				<br/>
         </td>
       </tr>
-      
+      <xsl:call-template name="opdr_endtext"/>
-      
 			<tr>
 			    <td colspan="5" style="text-align:left; font-size:7px">
 			    <br/><br/>
@@ -440,10 +448,11 @@
 				<br/>
 				<br/>
 				DE FACTUREN DIENEN IN PDF-FORMAAT GEMAILD TE WORDEN NAAR: CREDITEURENFACTUUR@MEDUX.NL
+				<br/>
+				<br/>
         </td>
       </tr>
-      
+      <xsl:call-template name="opdr_endtext"/>
-      
 			<tr>
 			    <td colspan="5" style="text-align:left; font-size:7px">
 			    <br/><br/>
@@ -624,6 +633,8 @@
 				<br/>
 				KOSTENDRAGER : <xsl:value-of select="substring-after(melding/kostenplaats/nr,'.')"/>
 				<br/>
+				<br/>
+				<xsl:call-template name="opdr_endtext"/>
         </td>
       </tr>
       
@@ -980,6 +991,9 @@
       				<br/>
       				<br/>
       				DE FACTUREN DIENEN IN PDF-FORMAAT GEMAILD TE WORDEN NAAR: CREDITEURENFACTUUR@MEDUX.NL
+      				<br/>
+      				<br/>
+      				<xsl:call-template name="opdr_endtext"/>
               </td>
             </tr>
             <tr>

CUST/MNNL/xsl/cust.xsl

@@ -773,7 +773,7 @@
               </tr>
                 <tr>
                 	<td colspan="6" class="label">Klik hier voor uw <a href="http://www.mn.nl/media/1511/routebeschrijving-mn-den-haag.pdf">pdf routebeschrijving</a> met OV of auto,
-                  voor de looproute van en naar het station op <a href="http://www.greenbusinessclub.nl/nl/beatrixkwartier/loopt"> www.lopeninhetbeatrixkwartier.nl. </a>
+                  voor de looproute van en naar het NS station kijk op <a href="http://www.greenbusinessclub.nl/nl/beatrixkwartier/loopt"> www.lopeninhetbeatrixkwartier.nl. </a>
                 	</td>
                 </tr>		
                 <tr>

CUST/NYBU/xsl/cust.xsl

@@ -24,7 +24,7 @@
 	<xsl:template name="pageheader">
 		<table border="0" width="100%">
 			<tr>
-				<td width="34%" bordercolor="#FFFFFF" align="center">
+				<td width="34%" align="center">
 					<xsl:choose>
 						<xsl:when test="$mode='email'">
 							<img src="cid:tmpl_logo.gif"/>
@@ -1764,7 +1764,7 @@
 					<xsl:value-of select="//lcl/FAC/prijs"/>
 				</th>
 			</tr>
-			<tr height="1">
+			<tr>
 				<td colspan="10" style="border-top:1px solid #000;"/>
 			</tr>
 
@@ -1861,7 +1861,7 @@
 			</xsl:for-each>
 
 			<!-- totaal per deelreservering -->
-			<tr height="1">
+			<tr>
 				<td colspan="10" style="border-top:1px solid #000;"/>
 			</tr>
 			<tr>
@@ -2024,6 +2024,7 @@
 
 	<xsl:template match="reservering" mode="include">
 		<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
+			<TBODY>
 			<TR>
 				<TD WIDTH="40" ROWSPAN="30" ID="LINKERMARGE"/>
 				<TD>
@@ -2049,7 +2050,7 @@
 						<xsl:value-of select="//reservering/rsv_ruimte/volgnr[not(. &gt; //reservering/rsv_ruimte/volgnr)]"/>
 					</xsl:variable>
 
-					<table border="0" bordercolor="#000000" width="100%">
+					<table border="0" width="100%">
 						<tr>
 
 							<xsl:if test="$srtnotificatiecode='RESINF' or $srtnotificatiecode='RESDEL' or $srtnotificatiecode='RESNEW'or $srtnotificatiecode='RESBEV'">
@@ -2065,7 +2066,7 @@
 								&#xA0;</td>
 							</xsl:if>
 							<xsl:if test="string(rsv_ruimte[volgnr=$min_volgnr]/omschrijving)!='' and $srtnotificatiecode='RESINF' or $srtnotificatiecode='RESDEL' or $srtnotificatiecode='RESNEW'or $srtnotificatiecode='RESBEV'">
-								<td class="caption" valign="top" colspan="4">&#xA0;-&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/omschrijving"/>&#xA0;</td>
+								<td class="caption" valign="top" colspan="4">-&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/omschrijving"/>&#xA0;</td>
 							</xsl:if>
 
 						</tr>
@@ -2236,7 +2237,7 @@
 						</xsl:if>
 
 	<tr>
-		<td height="25px"/>
+		<td colspan="2" height="25px"/>
 	</tr>
 	<xsl:if test="rsv_ruimte[volgnr=$min_volgnr]/contact_user/key!=ingevoerd_user/key">
 		<tr>
@@ -2251,18 +2252,12 @@
 		</tr>
 	</xsl:if>
 	<tr>
-		<td colspan="2" class="tekst">
+		<td colspan="2" class="tekst">&#xA0;</td>
-			<xsl:choose>
-				<xsl:when test="$srtnotificatiecode='RESNEW'"/>
-				<xsl:otherwise>
-					<xsl:call-template name="res_begintext"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</td>
 	</tr>
+	</table>
 	<xsl:choose>
 		<xsl:when test="$srtnotificatiecode!='RESDEL' and $srtnotificatiecode!='CUST01'and $srtnotificatiecode!='RESNEW'and $srtnotificatiecode!='RESINF'and $srtnotificatiecode!='RESBEV'">
-			<table border="0" bordercolor="#000000" width="99%">
+			<table border="0" width="99%">
 				<tr>
 					<td/>
 					<td style="text-align:right">
@@ -2278,9 +2273,10 @@
 					<td style="text-align:left">
 						<b>Gegevens bijeenkomst</b>
 					</td>
+					<td/>
 				</tr>
 			</table>
-			<table cellpadding="1" border="0" WIDTH="99%" bordercolor="#000000" frame="box">
+			<table cellpadding="1" border="0" WIDTH="99%" frame="box">
 				<tr>
 					<td colspan="10" style="border-top:1px solid #000;"/>
 				</tr>
@@ -2289,6 +2285,7 @@
 					<td class="resresult" width="80%" align="left">
 						<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/omschrijving"/>
 					</td>
+					<td colspan="8"/>
 				</tr>
 				<tr>
 					<td colspan="10" style="border-top:1px solid #000;"/>
@@ -2298,6 +2295,7 @@
 					<td>
 						<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/kenmerk[@naam='External contact']"/>
 					</td>
+					<td colspan="8"/>
 				</tr>
 				<!-- Alleen interne kostenplaatsen vermelden op de bon -->
 				<xsl:if test="rsv_ruimte/kostenplaats/extern='0'">
@@ -2306,6 +2304,7 @@
 						<td>
 							<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/kostenplaats/nr"/> - <xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/kostenplaats/omschrijving"/>
 						</td>
+						<td colspan="8"/>
 					</tr>
 				</xsl:if>
 				<tr>
@@ -2313,6 +2312,7 @@
 					<td>
 						<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/kenmerk[@naam='Referentie klant']"/>
 					</td>
+					<td colspan="8"/>					
 				</tr>
 				<tr>
 					<td>Factuuradres</td>
@@ -2329,6 +2329,7 @@
 							<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/kenmerk[@naam='Company']/bedrijf/post_land"/>
 						</strong>
 					</td>
+					<td colspan="8"/>					
 				</tr>
 				<tr>
 					<td>Begindatum</td>
@@ -2343,12 +2344,14 @@
 						<xsl:text>&#xA0;</xsl:text>
 						<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/van/jaar"/>
 					</td>
+					<td colspan="8"/>					
 				</tr>
 				<tr>
 					<td>Aantal personen</td>
 					<td>
 						<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/bezoekers"/>
 					</td>
+					<td colspan="8"/>					
 				</tr>
 				<tr>
 					<td>Programma</td>
@@ -2357,6 +2360,7 @@
 							<xsl:with-param name="string" select="rsv_ruimte[volgnr=$min_volgnr]/kenmerk[@naam='Programmatijden']"/>
 						</xsl:call-template>
 					</td>
+					<td colspan="8"/>					
 				</tr>
 				<tr>
 					<td colspan="10" height="30" style="border-top:1px solid #000;"/>
@@ -2364,7 +2368,7 @@
 			</table>
 			<strong>Kostenoverzicht</strong>
 
-			<table cellpadding="1" border="0" WIDTH="99%" bordercolor="#000000" frame="box">
+			<table cellpadding="1" border="0" WIDTH="99%" frame="box">
 				<tr>
 					<td colspan="10" style="border-top:1px solid #000;"/>
 				</tr>
@@ -2379,11 +2383,11 @@
 					<td class="resresult" width="12%" style="text-align:right">Begintijd</td>
 					<td class="resresult" width="12%" style="text-align:right">Eindtijd</td>
 					<td class="resresult" width="14%" style="text-align:center">Opstelling</td>
-					<td class="resresresultth" width="17%" style="text-align:right">
+					<td colspan="4" class="resresresultth" width="17%" style="text-align:right">
 						<xsl:value-of select="//lcl/FAC/prijs"/>
 					</td>
 				</tr>
-				<tr height="1">
+				<tr>
 					<td colspan="10" style="border-top:1px solid #000;"/>
 				</tr>
 
@@ -2411,7 +2415,7 @@
 							<td width="12%" class="resresult" style="text-align:center">
 								<xsl:value-of select="res_ruimte/opstelling"/>
 							</td>
-							<td width="17%" class="resresult" style="text-align:right">
+							<td width="17%" colspan="4" class="resresult" style="text-align:right">
 								<xsl:call-template name="europrijs">
 									<xsl:with-param name="prijs" select="prijs"/>
 								</xsl:call-template>
@@ -2554,31 +2558,31 @@
 					</xsl:choose>
 				</xsl:variable>
 				<!-- totaal per deelreservering -->
-				<tr height="1">
+				<tr>
 					<td colspan="10" style="border-top:1px solid #000;"/>
 				</tr>
 				<tr>
-					<td class="tekst" colspan="4" style="border-style:solid;border-width:0px;"></td>
+					<td class="tekst" colspan="5" style="border-style:solid;border-width:0px;"></td>
-					<td class="tekst" colspan="2" style="text-align:right;border-style:solid;border-width:0px;font-size:8pt;">Totaal excl. BTW</td>
+					<td class="tekst" colspan="3" style="text-align:right;border-style:solid;border-width:0px;font-size:8pt;">Totaal excl. BTW</td>
-					<td class="tekst" colspan="1" style="text-align:right;border-style:solid;border-width:0px;">
+					<td class="tekst" colspan="2" style="text-align:right;border-style:solid;border-width:0px;">
 						<xsl:call-template name="europrijs">
 							<xsl:with-param name="prijs" select="$totaal_ex_btw"/>
 						</xsl:call-template>
 					</td>
 				</tr>
 				<tr>
-					<td class="tekst" colspan="4" style="border-style:solid;border-width:0px;"></td>
+					<td class="tekst" colspan="5" style="border-style:solid;border-width:0px;"></td>
-					<td class="tekst" colspan="2" style="text-align:right;border-style:solid;border-width:0px;font-size:8pt;">BTW</td>
+					<td class="tekst" colspan="3" style="text-align:right;border-style:solid;border-width:0px;font-size:8pt;">BTW</td>
-					<td class="tekst" colspan="1" style="text-align:right;border-style:solid;border-width:0px;">
+					<td class="tekst" colspan="2" style="text-align:right;border-style:solid;border-width:0px;">
 						<xsl:call-template name="europrijs">
 							<xsl:with-param name="prijs" select="$totaal_inc_btw - $totaal_ex_btw"/>
 						</xsl:call-template>
 					</td>
 				</tr>
 				<tr>
-					<td class="tekst" colspan="4" style="border-style:solid;border-width:0px;"></td>
+					<td class="tekst" colspan="5" style="border-style:solid;border-width:0px;"></td>
-					<td class="tekst" colspan="2" style="text-align:right;border-style:solid;border-width:0px;font-size:8pt;">Totaal incl. BTW</td>
+					<td class="tekst" colspan="3" style="text-align:right;border-style:solid;border-width:0px;font-size:8pt;">Totaal incl. BTW</td>
-					<td class="tekst" colspan="1" style="text-align:right;border-style:solid;border-width:0px;">
+					<td class="tekst" colspan="2" style="text-align:right;border-style:solid;border-width:0px;">
 						<b>
 							<xsl:call-template name="europrijs">
 								<xsl:with-param name="prijs" select="$totaal_inc_btw"/>
@@ -2630,7 +2634,7 @@
 					</xsl:otherwise>
 				</xsl:choose>
 				<tr>
-					<td height="40"/>
+					<td colspan="2" height="40"/>
 				</tr>
 				<tr>
 					<td colspan="2" style="font-size:7pt;">
@@ -2647,14 +2651,13 @@
 								<li>Het hijsen van uw bedrijfsvlag</li>
 							</ul>
 						</p>
-
 						<p>
 							<em>Verder kunnen wij een scala aan producten en diensten voor u verzorgen die  kunnen bijdragen aan een succesvol verloop van uw bijeenkomst. U kunt hierbij denken aan bloemen in de zaal, een registratiebalie, stands, personele ondersteuning, inzet van docenten en gastsprekers en AV-ondersteuning. Wij informeren u graag over de verschillende mogelijkheden en de eventuele extra kosten die daarmee gemoeid zijn.</em>
 						</p>
 					</td>
 				</tr>
 				<tr>
-					<td height="50"/>
+					<td colspan="2" height="50"/>
 				</tr>
 			</table>
 
@@ -2726,11 +2729,11 @@
 
 		</xsl:when>
 	</xsl:choose>
-</table>
 <!-- Bevestiging reservering -->
 </TD>
 <TD WIDTH="30" ROWSPAN="30" ID="RECHTERMARGE"/>
 </TR>
+</TBODY>
 </TABLE>
 </xsl:template>
 

CUST/PCHX/xsl/default.xsl

@@ -3,6 +3,24 @@
 
   <xsl:variable name="Xsrtnotificatiecode">FININF</xsl:variable>
   
+	<xsl:template name="numberNaN">
+		<xsl:param name="nanOrNr"/>
+		<xsl:param name="format"/>
+	  <xsl:choose>
+	    <xsl:when test="string(number($nanOrNr))='NaN'">0</xsl:when>
+	    <xsl:otherwise>
+	    	<xsl:choose>
+	    		<xsl:when test="$format= 'cur'">
+	    			<xsl:value-of select="format-number($nanOrNr, '0,00', 'european')"/>
+	    		</xsl:when>
+	    		<xsl:otherwise>
+	      		<xsl:value-of select="$nanOrNr" />
+	      	</xsl:otherwise>
+	    	</xsl:choose>  	
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:template>	
+
   <xsl:template match="factuur" mode="fininf">
     <table border="0" width="100%" cellpadding="2" style="padding-left:10px;">
       <tr>
@@ -411,20 +429,39 @@
 						<xsl:otherwise>0</xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable>
-				<xsl:variable name="arbeid" select="uren*$uurloon"/>
+				<xsl:variable name="uren">
+						<xsl:call-template name="numberNaN">
+							<xsl:with-param name="nanOrNr" select="uren"/>
+						</xsl:call-template>
+				</xsl:variable>
+				<xsl:variable name="materiaal">
+						<xsl:call-template name="numberNaN">
+							<xsl:with-param name="nanOrNr" select="materiaal"/>
+						</xsl:call-template>
+				</xsl:variable>
+				<xsl:variable name="kosten">
+						<xsl:call-template name="numberNaN">
+							<xsl:with-param name="nanOrNr" select="kosten"/>
+						</xsl:call-template>
+				</xsl:variable>							
+				<xsl:variable name="arbeid" select="$uren*$uurloon"/>
 				<tr>
 					<td align="right">
 						<b>
 							<xsl:value-of select="//lcl/MLD/uren"/>:</b>
 					</td>
 					<td>
-						<xsl:value-of select="format-number(uren, '0,00', 'european')"/>
+						<xsl:call-template name="numberNaN">
+							<xsl:with-param name="nanOrNr" select="uren"/>
+							<xsl:with-param name="format" select="'cur'"/>
+						</xsl:call-template>
 						<b>&#xA0;à&#xA0;</b>&#x20AC;&#xA0;<xsl:value-of select="format-number($uurloon, '0,00', 'european')"/></td>
 					<td align="right">
 						<b>
 							<xsl:value-of select="//lcl/MLD/arbeid"/>:</b>
 					</td>
-					<td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number($arbeid, '0,00', 'european')"/></td>
+					<td style="width:1in;text-align:right">&#x20AC;&#xA0;
+						<xsl:value-of select="format-number($arbeid, '0,00', 'european')"/></td>
 				</tr>
 				<tr>
 					<td colspan="2"/>
@@ -432,10 +469,11 @@
 						<b>
 							<xsl:value-of select="//lcl/MLD/materiaal"/>:</b>
 					</td>
-					<td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(materiaal, '0,00', 'european')"/></td>
+					<td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number($materiaal, '0,00', 'european')"/>
+					</td>
 				</tr>
-				<xsl:variable name="correctie0" select="$arbeid + materiaal"/>
+				<xsl:variable name="correctie0" select="$arbeid + $materiaal"/>
-				<xsl:variable name="correctie" select="kosten - $correctie0"/>
+				<xsl:variable name="correctie" select="$kosten - $correctie0"/>
 				<xsl:if test="$correctie!=0">
 					<tr>
 						<td colspan="2"/>
@@ -454,7 +492,7 @@
 							<xsl:if test="kenmerk[@key=41] = 'Ja'">&#xA0;(indicatief)</xsl:if>:</b>
 					</td>
 					<td style="width:1in;text-align:right">
-						<b>&#x20AC;&#xA0;<xsl:value-of select="format-number(kosten, '0,00', 'european')"/></b>
+						<b>&#x20AC;&#xA0;<xsl:value-of select="format-number($kosten, '0,00', 'european')"/></b>
 					</td>
 				</tr>
 				<tr>

CUST/SKAF/cust.css

@@ -8,7 +8,8 @@
  */
 #headerblok
 {
-    background: url(fac_head_skaf.jpg) no-repeat;
+    background: url(fac_head_skaf.png) no-repeat;
+    background-position: 50px 0px;
 }
 
 #mywelcome , #mymessages, #myactions{

CUST/SKAF/xsl/cust.xsl

@@ -6,6 +6,49 @@
   <xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
 </xsl:variable>
 
+  <xsl:template name="stylesheet">
+    <style>body {
+       font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;
+       font-size: 11pt;
+    }
+
+    th {
+      font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;
+      font-size: 11pt;
+    }
+
+    th.resth, th.besth {
+      font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;
+      font-size: 11pt;
+    }
+
+    td, p {
+      font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;
+      font-size: 10pt;
+    }
+
+    td.sec_heading {
+      font-size: 11pt;
+    }
+
+    td.caption {
+      font-size:   22pt;
+    }
+
+    td.subcaption, td.label, td.value, td.tekst, td.tekstkop {
+      font-size: 12pt;
+    }
+
+    td.adres {
+      font-size: 10pt;
+    }
+
+    td.tiny {
+      font-size: 8pt;
+    }
+    </style>
+  </xsl:template>
+
 
 <xsl:template match="bestelopdracht" mode="include">
 		<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">

CUST/STAM/xsl/cust.xsl

@@ -8,356 +8,6 @@
 
 	<xsl:variable name="Xsrtnotificatiecode">MLD2B3</xsl:variable>  
 
-	<xsl:template match="melding" mode="include">
-		<table border="0" width="100%" cellpadding="2">
-			<tr>
-				<td colspan="4" class="caption" style="padding-top:15px;padding-bottom:20px">
-					<b>
-						<xsl:element name="a">
-							<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>/cust/stam/saml/?<xsl:value-of select="../bookmarks/melding"/><xsl:value-of select="key"/>
-							</xsl:attribute>
-							<xsl:value-of select="//lcl/MLD/melding"/>&#160;<xsl:value-of select="discipline/srtdiscipline/prefix"/>
-							<xsl:value-of select="key"/>
-							<xsl:if test="stdmelding/omschrijving!=''"> - </xsl:if>
-							<xsl:value-of select="stdmelding/omschrijving"/>
-							<xsl:if test="onderwerp != ''">:&#160;<xsl:value-of select="onderwerp"/>
-							</xsl:if>
-						</xsl:element>
-					</b>
-				</td>
-				<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
-					<xsl:if test="spoed&lt;3">
-						<b>
-							<xsl:value-of select="//lcl/MLD/spoed"/>
-						</b>
-					</xsl:if>
-				</td>
-			</tr>
-			<xsl:if test="not(//opdracht/extra_key) and extra_key">
-				<xsl:variable name="mx_key">
-					<xsl:value-of select="extra_key"/>
-				</xsl:variable>
-				<tr>
-					<td align="right" valign="top" style="padding-top:10px;">
-						<b>
-						<xsl:value-of select="//lcl/FAC/bericht"/>:</b>
-					</td>
-					<td colspan="3" style="padding-top:10px;">
-						<xsl:call-template name="linebreaks">
-							<xsl:with-param name="string" select="notes/note[key=$mx_key]/omschrijving"/>
-						</xsl:call-template>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="4" style="padding-bottom:20px;">
-						<hr/>
-					</td>
-				</tr>
-			</xsl:if>
-		  <xsl:if test="$srtnotificatiecode='MLD2B3'">
-				<tr>
-						<td colspan="4" style="padding-top:20px">
-						Dear manager,
-						</td>
-				</tr>
-				<tr> </tr>
-				<tr>
-						<td colspan="4" style="padding-bottom:20px;">
-						You and your peers have received a request for approval in the service center. If the requestor mentioned below is your direct report, please approve or reject the request. If the requestor is not a direct report, you are notified so you can approve as a back-up in case of urgent requests.
-					  </td>	
-				</tr>
-			</xsl:if>	
-			<xsl:if test="opmerking!=''">
-				<tr>
-					<td align="right" valign="top">
-						<b>
-						<xsl:value-of select="//lcl/MLD/afhandeling"/>:</b>
-					</td>
-					<td colspan="3">
-						<xsl:call-template name="linebreaks">
-							<xsl:with-param name="string" select="opmerking"/>
-						</xsl:call-template>
-					</td>
-				</tr>
-			</xsl:if>
-			<xsl:if test="behandelwijze=2 and not(/facilitor/opdracht)">
-				<xsl:for-each select="notes/note[flag=1]">
-					<xsl:sort select="aanmaak/timestamp" order="ascending"/>
-					<tr>
-						<xsl:choose>
-							<xsl:when test="position() = 1">
-								<td align="right" valign="top">
-									<b>Update:</b>
-								</td>
-							</xsl:when>
-							<xsl:otherwise>
-								<td/>
-							</xsl:otherwise>
-						</xsl:choose>
-						<td colspan="3">
-							<span class="mldbeh">
-								<xsl:value-of select="aanmaak/datum"/>&#xA0;<xsl:value-of select="aanmaak/tijd"/>&#xA0;-&#xA0;<xsl:value-of select="noteur/naam_friendly"/>
-							</span>&#xA0;
-							<xsl:call-template name="linebreaks">
-								<xsl:with-param name="string" select="omschrijving"/>
-							</xsl:call-template>
-						</td>
-					</tr>
-				</xsl:for-each>
-				<tr height="20px">
-				<td colspan="4"/>
-			</tr>
-			</xsl:if>
-			<xsl:comment>als we binnen een opdracht zijn, tonen we de meldingtekst niet</xsl:comment>
-			<tr>
-				<td align="right" valign="top">
-					<b>
-					<xsl:value-of select="//lcl/FAC/omschrijving"/>:</b>
-				</td>
-				<td align="left" colspan="3">
-					<xsl:call-template name="linebreaks">
-						<xsl:with-param name="string" select="omschrijving"/>
-					</xsl:call-template>
-				</td>
-			</tr>
-			<xsl:for-each select="kenmerk[@type!='L' and @type!='l' and @type!='Q' and count(@xmlnode)=0]">
-				<xsl:sort select="@volgnummer" data-type="number"/>
-				<xsl:if test=".!=''">
-					<tr>
-						<td align="right">
-							<b>
-							<xsl:value-of select="@naam"/>:</b>
-						</td>
-						<td colspan="3">
-							<xsl:value-of select="."/>
-						</td>
-					</tr>
-				</xsl:if>
-			</xsl:for-each>
-			<xsl:if test="count(deel)&gt;0">
-				<xsl:for-each select="deel">
-					<xsl:sort select="omschrijving"/>
-					<tr>
-						<xsl:choose>
-							<xsl:when test="position()=1">
-								<td align="right" valign="top">
-									<b>
-									<xsl:value-of select="//lcl/MLD/objecten"/>:</b>
-								</td>
-							</xsl:when>
-							<xsl:otherwise>
-								<td/>
-							</xsl:otherwise>
-						</xsl:choose>
-						<td align="left" valign="top">
-							<xsl:value-of select="omschrijving"/>
-						</td>
-						<td colspan="2" valign="top">
-							<xsl:comment>NADER TE DEFINIEREN</xsl:comment>
-						</td>
-					</tr>
-				</xsl:for-each>
-			</xsl:if>
-			<tr height="20px">
-				<td colspan="4"/>
-			</tr>
-			<tr>
-				<td align="right">
-					<b>
-					<xsl:value-of select="//lcl/FAC/locatie"/>:</b>
-				</td>
-				<td align="left">
-					<xsl:value-of select="plaats/regio/district/locatie/code"/>&#xA0;
-					<xsl:if test="plaats/regio/district/locatie/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/omschrijving"/>)</xsl:if>
-				</td>
-				<td align="right">
-					<b>
-					<xsl:value-of select="//lcl/MLD/status"/>:</b>
-				</td>
-				<td align="left">
-					<xsl:value-of select="status"/>
-				</td>
-			</tr>
-			<tr>
-				<xsl:choose>
-					<xsl:when test="plaats/@type='T'">
-						<td align="right">
-							<b>
-							<xsl:value-of select="//lcl/FAC/terrein"/>:</b>
-						</td>
-						<td align="left">
-							<xsl:value-of select="plaats/regio/district/locatie/terrein/code"/>-<xsl:value-of select="plaats/regio/district/locatie/terrein/naam"/>
-						</td>
-					</xsl:when>
-					<xsl:otherwise>
-						<td align="right">
-							<b>
-							<xsl:value-of select="//lcl/FAC/gebouw"/>:</b>
-						</td>
-						<td align="left">
-							<xsl:value-of select="plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="plaats/regio/district/locatie/gebouw/naam"/>
-						</td>
-					</xsl:otherwise>
-				</xsl:choose>
-				<td align="right">
-					<b>
-					<xsl:value-of select="//lcl/MLD/melddatum"/>:</b>
-				</td>
-				<td align="left">
-					<xsl:value-of select="gemeld/datum"/>&#xA0;
-					<xsl:value-of select="gemeld/tijd"/>
-				</td>
-			</tr>
-			<tr>
-				<xsl:if test="plaats/@type='T' or plaats/@type='G'">
-					<td colspan="2"/>
-				</xsl:if>
-				<xsl:if test="plaats/@type!='T' and plaats/@type!='G'">
-					<td align="right">
-						<b>
-						<xsl:value-of select="//lcl/FAC/bouwlaag"/>:</b>
-					</td>
-					<td align="left">
-						<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/code"/>&#xA0;
-						<xsl:if test="plaats/regio/district/locatie/gebouw/verdieping/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/omschrijving"/>)</xsl:if>
-					</td>
-				</xsl:if>
-				<xsl:choose>
-					<xsl:when test="uitvoertijd[@eenheid='U']">
-						<td width="16%" align="right">
-							<b>
-							<xsl:value-of select="//lcl/MLD/uitvoertijd"/>:</b>
-						</td>
-						<td width="34%">
-							<xsl:value-of select="uitvoertijd"/>&#160;<xsl:value-of select="//lcl/MLD/uren"/>
-						</td>
-					</xsl:when>
-					<xsl:otherwise>
-						<td width="16%" align="right">
-							<b>
-							<xsl:value-of select="//lcl/MLD/uitvoertijd"/>:</b>
-						</td>
-						<td width="34%">
-							<xsl:value-of select="uitvoertijd"/>&#160;<xsl:value-of select="//lcl/FAC/dagen"/>
-						</td>
-					</xsl:otherwise>
-				</xsl:choose>
-			</tr>
-			<tr>
-				<xsl:if test="plaats/@type='R'">
-					<td align="right" valign="top">
-						<b>
-						<xsl:value-of select="//lcl/FAC/ruimte"/>:</b>
-					</td>
-					<td align="left">
-						<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>&#xA0;
-						<xsl:if test="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>)</xsl:if>
-					</td>
-				</xsl:if>
-				<xsl:if test="plaats/@type!='R'">
-					<td colspan="2"/>
-				</xsl:if>
-				<td align="right">
-					<b>
-					<xsl:value-of select="//lcl/MLD/datum_gereed"/>:</b>
-				</td>
-				<td align="left">
-					<xsl:value-of select="datum_gepland/datum"/>&#xA0;<xsl:value-of select="datum_gepland/tijd"/>
-				</td>
-			</tr>
-			<xsl:if test="kenmerk[@naam='Ordernr']!=''">
-				<tr>
-					<td colspan="2"/>
-					<td align="right">
-						<b>
-						<xsl:value-of select="//lcl/MLD/ordernr"/>:</b>
-					</td>
-					<td align="left">
-						<xsl:value-of select="kenmerk[@naam='Ordernr']"/>
-					</td>
-				</tr>
-			</xsl:if>
-			<tr height="20px">
-				<td colspan="4">
-					<hr/>
-				</td>
-			</tr>
-			<tr>
-				<td align="right" width="16%">
-					<b>
-					<xsl:value-of select="//lcl/FAC/aanvrager"/>:</b>
-				</td>
-				<td align="left" width="34%">
-					<xsl:value-of select="voor/naam_full"/>
-				</td>
-				<td align="right" width="16%">
-					<b>
-					<xsl:value-of select="//lcl/FAC/telefoon"/>:</b>
-				</td>
-				<td align="left" width="34%">
-					<xsl:if test="voor/telefoonnr=''">-</xsl:if>
-					<xsl:value-of select="voor/telefoonnr"/>
-				</td>
-			</tr>
-			<xsl:if test="string(voor/naam_full)!=string(voor/naam_full)">
-				<tr>
-					<td align="right" width="16%">
-						<b>
-						<xsl:value-of select="//lcl/MLD/meldingvoor"/>:</b>
-					</td>
-					<td align="left" width="34%">
-						<xsl:value-of select="voor/naam_full"/>
-					</td>
-				</tr>
-			</xsl:if>
-			<tr>
-				<td align="right">
-					<b>
-					<xsl:value-of select="//lcl/FAC/locatie"/>:</b>
-				</td>
-				<td align="left">
-					<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/code"/>&#xA0;
-					<xsl:if test="voor/werkplek/plaats/regio/district/locatie/omschrijving!=''">(<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/omschrijving"/>)</xsl:if>
-				</td>
-				<td align="right" valign="top">
-					<b>
-					<xsl:value-of select="//lcl/FAC/afdeling"/>:</b>
-				</td>
-				<td align="left">
-					<xsl:value-of select="voor/afdeling/omschrijving"/>
-				</td>
-			</tr>
-			<xsl:if test="voor/werkplek/plaats/regio/district/locatie/gebouw/code!=''">
-				<tr>
-					<td align="right" valign="top">
-						<b>
-						<xsl:value-of select="//lcl/FAC/werkplek"/>:</b>
-					</td>
-					<td align="left">
-						<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/naam"/>
-						<br/>
-						<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/code"/>&#xA0;<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>&#xA0;
-						<xsl:if test="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving!=''">(<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>)</xsl:if>
-					</td>
-					<td colspan="2"/>
-				</tr>
-			</xsl:if>
-			<tr height="20px">
-				<td/>
-			</tr>
-			<tr>
-				<td colspan="2">
-					<xsl:element name="a">
-						<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>/cust/stam/saml/?<xsl:value-of select="../bookmarks/melding"/>
-							<xsl:value-of select="key"/>
-						</xsl:attribute>Click here to view this call in the service center</xsl:element>
-					</td>
-				</tr>
-
-			</table>
-		</xsl:template>
-
-
 		<!-- ******************************************************************************************************************  -->
 
 		<!--                                        Hier komen de USER-rapportage functies                                       -->

CUST/STAM/xsl/deel.xsl

@@ -0,0 +1,181 @@
+<?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:import href="./cust.xsl"/>
+    
+  <xsl:template match="deel" mode="include">
+    <table border="0" cellpadding="1" width="100%">
+      <tr>
+        <td colspan="3" class="caption"><strong><xsl:value-of select="srtdeel/omschrijving"/>&#160;<xsl:value-of select="omschrijving"/></strong></td>
+        <td style="text-align:right"><xsl:element name="img">
+            <xsl:attribute name="width">140px</xsl:attribute>
+            <xsl:attribute name="src">../../appl/shared/barcode.asp?text=<xsl:value-of select="key"/>&amp;height=50&amp;narrow=1&amp;wide=3</xsl:attribute>
+          </xsl:element>
+                </td>
+      </tr>
+      <tr>
+        <td class="label" width="20%"><xsl:value-of select="//lcl/CNT/groep"/></td>
+        <td class="value" colspan="2"><xsl:value-of select="srtdeel/srtgroep/discipline/omschrijving"/>/<xsl:value-of select="srtdeel/srtgroep/omschrijving"/></td>
+        <td></td>
+      </tr>
+        <xsl:if test="binding='R'">
+          <tr>
+            <td class="label"><xsl:value-of select="//lcl/CNT/plaats"/></td>
+            <td class="value" colspan="2"><xsl:value-of select="plaats/plaatsaanduiding"/>&#160;
+                                      <xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/></td>
+            <td></td>
+          </tr>
+      </xsl:if>
+        <xsl:if test="binding='T'">
+          <tr>
+            <td class="label"><xsl:value-of select="//lcl/CNT/plaats"/></td>
+            <td class="value" colspan="2"><xsl:value-of select="terreinsector/naam"/></td>
+            <td></td>
+          </tr>
+      </xsl:if>
+        <xsl:if test="binding='P'">
+          <tr>
+            <td class="label"><xsl:value-of select="//lcl/CNT/eigenaar"/></td>
+            <td class="value" colspan="2"><xsl:value-of select="persoon/naam_full"/></td>
+            <td></td>
+          </tr>
+      </xsl:if>
+        <xsl:if test="binding='A'">
+          <tr>
+            <td class="label"><xsl:value-of select="//lcl/CNT/eigenaar"/></td>
+            <td class="value" colspan="2"><xsl:value-of select="afdeling/omschrijving"/></td>
+            <td></td>
+          </tr>
+      </xsl:if>
+        <xsl:if test="binding='W'">
+          <tr>
+            <td class="label"><xsl:value-of select="//lcl/CNT/plaats"/></td>
+            <td class="value" colspan="2"><xsl:value-of select="werkplek/plaats/plaatsaanduiding"/>/<xsl:value-of select="werkplek/volgnr"/></td>
+            <td></td>
+          </tr>
+      </xsl:if>
+      <xsl:for-each select="srtdeel/kenmerk[count(@xmlnode)=0]">
+        <xsl:sort select="@volgnummer" data-type="number"/>
+        <xsl:if test=".!=''">
+          <tr>
+            <td class="label">
+              <xsl:value-of select="@naam"/>:</td>
+            <td class="value" colspan="2">
+                  <xsl:call-template name="linebreaks">
+                      <xsl:with-param name="string" select="."/>
+                  </xsl:call-template>
+            </td>
+                <td></td>
+          </tr>
+        </xsl:if>
+      </xsl:for-each>
+      <xsl:for-each select="kenmerk[count(@xmlnode)=0]">
+        <xsl:sort select="@volgnummer" data-type="number"/>
+        <xsl:if test=".!=''">
+          <tr>
+            <td class="label">
+              <xsl:value-of select="@naam"/>:</td>
+            <td class="value" colspan="2">
+                  <xsl:call-template name="linebreaks">
+                      <xsl:with-param name="string" select="."/>
+                  </xsl:call-template>
+            </td>
+                <td></td>
+          </tr>
+        </xsl:if>
+      </xsl:for-each>
+            <tr><td></td><td colspan="3"><table border="1">
+      <xsl:for-each select="deel">
+          <xsl:apply-templates select="." mode="include"/>
+      </xsl:for-each>
+      </table></td></tr>
+    </table>
+  </xsl:template>
+
+  <xsl:template match="deel" mode="out">
+    <table border="0" cellpadding="1" width="100%">
+      <tr>
+        <td colspan="3" class="caption"><strong><xsl:value-of select="//lcl/INS/uitgiftebewijs"/></strong></td>
+      </tr>
+            <tr><td colspan="3"><xsl:value-of select="//lcl/INS/ins_lendbegintext1"/><xsl:value-of select="persoon/naam_full"/><xsl:value-of select="//lcl/INS/ins_lendbegintext2"/>
+            <br/><strong><xsl:value-of select="srtdeel/omschrijving"/>&#160;<xsl:value-of select="omschrijving"/></strong><br/></td>
+      </tr>
+      <xsl:for-each select="kenmerk[count(@xmlnode)=0]">
+        <xsl:sort select="@volgnummer" data-type="number"/>
+        <xsl:if test=".!=''">
+          <tr>
+            <td class="label">
+              <xsl:value-of select="@naam"/>:</td>
+            <td class="value">
+              <xsl:value-of select="."/>
+            </td>
+          </tr>
+        </xsl:if>
+      </xsl:for-each>
+            <tr><td></td><td colspan="3"><table border="1">
+      <xsl:for-each select="deel">
+          <xsl:apply-templates select="." mode="include"/>
+      </xsl:for-each>
+      </table></td></tr>
+            <tr><td colspan="3"><xsl:value-of select="//lcl/INS/ins_lendeindtext1"/><xsl:value-of select="//lcl/INS/ins_lendeindtext2"/></td></tr>
+    </table>
+  </xsl:template>
+
+
+  <xsl:template match="deel" mode="full">
+       <xsl:choose>
+            <xsl:when test="$mode='summary'"></xsl:when>
+       <xsl:otherwise>
+    <html>
+      <xsl:comment>================================ DEEL (OBJECT)===========================</xsl:comment>
+      <xsl:comment>FACILITOR default XSL template for deel</xsl:comment>
+      <xsl:call-template name="htmlhead"/>
+      <xsl:element name="body">
+        <xsl:if test="$mode!='email'">
+          <xsl:attribute name="onload">window.print();</xsl:attribute>
+        </xsl:if>
+        <xsl:call-template name="pageheader"/>
+        <xsl:choose>
+             <xsl:when test="$srtnotificatiecode = 'INSOUT'">
+               <xsl:apply-templates select="." mode="out"/>
+             </xsl:when>
+            <xsl:otherwise>
+                <xsl:apply-templates select="." mode="include"/>
+             </xsl:otherwise>
+            </xsl:choose>
+        <xsl:call-template name="pagefooter"/>
+      </xsl:element>
+    </html>
+       </xsl:otherwise>
+      </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

CUST/STAM/xsl/melding.xsl

@@ -0,0 +1,411 @@
+<?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:import href="./cust.xsl"/>
+    
+	<xsl:template match="melding" mode="include">
+		<table border="0" width="100%" cellpadding="2">
+			<tr>
+				<td colspan="4" class="caption" style="padding-top:15px;padding-bottom:20px">
+					<b>
+						<xsl:element name="a">
+							<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>/cust/stam/saml/?<xsl:value-of select="../bookmarks/melding"/><xsl:value-of select="key"/>
+							</xsl:attribute>
+							<xsl:value-of select="//lcl/MLD/melding"/>&#160;<xsl:value-of select="discipline/srtdiscipline/prefix"/>
+							<xsl:value-of select="key"/>
+							<xsl:if test="stdmelding/omschrijving!=''"> - </xsl:if>
+							<xsl:value-of select="stdmelding/omschrijving"/>
+							<xsl:if test="onderwerp != ''">:&#160;<xsl:value-of select="onderwerp"/>
+							</xsl:if>
+						</xsl:element>
+					</b>
+				</td>
+				<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
+					<xsl:if test="spoed&lt;3">
+						<b>
+							<xsl:value-of select="//lcl/MLD/spoed"/>
+						</b>
+					</xsl:if>
+				</td>
+			</tr>
+			<xsl:if test="not(//opdracht/extra_key) and extra_key">
+				<xsl:variable name="mx_key">
+					<xsl:value-of select="extra_key"/>
+				</xsl:variable>
+				<tr>
+					<td align="right" valign="top" style="padding-top:10px;">
+						<b>
+						<xsl:value-of select="//lcl/FAC/bericht"/>:</b>
+					</td>
+					<td colspan="3" style="padding-top:10px;">
+						<xsl:call-template name="linebreaks">
+							<xsl:with-param name="string" select="notes/note[key=$mx_key]/omschrijving"/>
+						</xsl:call-template>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="4" style="padding-bottom:20px;">
+						<hr/>
+					</td>
+				</tr>
+			</xsl:if>
+		  <xsl:if test="$srtnotificatiecode='MLD2B3'">
+				<tr>
+						<td colspan="4" style="padding-top:20px">
+						Dear manager,
+						</td>
+				</tr>
+				<tr> </tr>
+				<tr>
+						<td colspan="4" style="padding-bottom:20px;">
+						You and your peers have received a request for approval in the service center. If the requestor mentioned below is your direct report, please approve or reject the request. If the requestor is not a direct report, you are notified so you can approve as a back-up in case of urgent requests.
+					  </td>	
+				</tr>
+			</xsl:if>	
+			<xsl:if test="opmerking!=''">
+				<tr>
+					<td align="right" valign="top">
+						<b>
+						<xsl:value-of select="//lcl/MLD/afhandeling"/>:</b>
+					</td>
+					<td colspan="3">
+						<xsl:call-template name="linebreaks">
+							<xsl:with-param name="string" select="opmerking"/>
+						</xsl:call-template>
+					</td>
+				</tr>
+			</xsl:if>
+			<xsl:if test="behandelwijze=2 and not(/facilitor/opdracht)">
+				<xsl:for-each select="notes/note[flag=1]">
+					<xsl:sort select="aanmaak/timestamp" order="ascending"/>
+					<tr>
+						<xsl:choose>
+							<xsl:when test="position() = 1">
+								<td align="right" valign="top">
+									<b>Update:</b>
+								</td>
+							</xsl:when>
+							<xsl:otherwise>
+								<td/>
+							</xsl:otherwise>
+						</xsl:choose>
+						<td colspan="3">
+							<span class="mldbeh">
+								<xsl:value-of select="aanmaak/datum"/>&#xA0;<xsl:value-of select="aanmaak/tijd"/>&#xA0;-&#xA0;<xsl:value-of select="noteur/naam_friendly"/>
+							</span>&#xA0;
+							<xsl:call-template name="linebreaks">
+								<xsl:with-param name="string" select="omschrijving"/>
+							</xsl:call-template>
+						</td>
+					</tr>
+				</xsl:for-each>
+				<tr height="20px">
+				<td colspan="4"/>
+			</tr>
+			</xsl:if>
+			<xsl:comment>als we binnen een opdracht zijn, tonen we de meldingtekst niet</xsl:comment>
+			<tr>
+				<td align="right" valign="top">
+					<b>
+					<xsl:value-of select="//lcl/FAC/omschrijving"/>:</b>
+				</td>
+				<td align="left" colspan="3">
+					<xsl:call-template name="linebreaks">
+						<xsl:with-param name="string" select="omschrijving"/>
+					</xsl:call-template>
+				</td>
+			</tr>
+			<xsl:for-each select="kenmerk[@type!='L' and @type!='l' and @type!='Q' and count(@xmlnode)=0]">
+				<xsl:sort select="@volgnummer" data-type="number"/>
+				<xsl:if test=".!=''">
+					<tr>
+						<td align="right">
+							<b>
+							<xsl:value-of select="@naam"/>:</b>
+						</td>
+						<td colspan="3">
+							<xsl:value-of select="."/>
+						</td>
+					</tr>
+				</xsl:if>
+			</xsl:for-each>
+			<xsl:if test="count(deel)&gt;0">
+				<xsl:for-each select="deel">
+					<xsl:sort select="omschrijving"/>
+					<tr>
+						<xsl:choose>
+							<xsl:when test="position()=1">
+								<td align="right" valign="top">
+									<b>
+									<xsl:value-of select="//lcl/MLD/objecten"/>:</b>
+								</td>
+							</xsl:when>
+							<xsl:otherwise>
+								<td/>
+							</xsl:otherwise>
+						</xsl:choose>
+						<td align="left" valign="top">
+							<xsl:value-of select="omschrijving"/>
+						</td>
+						<td colspan="2" valign="top">
+							<xsl:comment>NADER TE DEFINIEREN</xsl:comment>
+						</td>
+					</tr>
+				</xsl:for-each>
+			</xsl:if>
+			<tr height="20px">
+				<td colspan="4"/>
+			</tr>
+			<tr>
+				<td align="right">
+					<b>
+					<xsl:value-of select="//lcl/FAC/locatie"/>:</b>
+				</td>
+				<td align="left">
+					<xsl:value-of select="plaats/regio/district/locatie/code"/>&#xA0;
+					<xsl:if test="plaats/regio/district/locatie/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/omschrijving"/>)</xsl:if>
+				</td>
+				<td align="right">
+					<b>
+					<xsl:value-of select="//lcl/MLD/status"/>:</b>
+				</td>
+				<td align="left">
+					<xsl:value-of select="status"/>
+				</td>
+			</tr>
+			<tr>
+				<xsl:choose>
+					<xsl:when test="plaats/@type='T'">
+						<td align="right">
+							<b>
+							<xsl:value-of select="//lcl/FAC/terrein"/>:</b>
+						</td>
+						<td align="left">
+							<xsl:value-of select="plaats/regio/district/locatie/terrein/code"/>-<xsl:value-of select="plaats/regio/district/locatie/terrein/naam"/>
+						</td>
+					</xsl:when>
+					<xsl:otherwise>
+						<td align="right">
+							<b>
+							<xsl:value-of select="//lcl/FAC/gebouw"/>:</b>
+						</td>
+						<td align="left">
+							<xsl:value-of select="plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="plaats/regio/district/locatie/gebouw/naam"/>
+						</td>
+					</xsl:otherwise>
+				</xsl:choose>
+				<td align="right">
+					<b>
+					<xsl:value-of select="//lcl/MLD/melddatum"/>:</b>
+				</td>
+				<td align="left">
+					<xsl:value-of select="gemeld/datum"/>&#xA0;
+					<xsl:value-of select="gemeld/tijd"/>
+				</td>
+			</tr>
+			<tr>
+				<xsl:if test="plaats/@type='T' or plaats/@type='G'">
+					<td colspan="2"/>
+				</xsl:if>
+				<xsl:if test="plaats/@type!='T' and plaats/@type!='G'">
+					<td align="right">
+						<b>
+						<xsl:value-of select="//lcl/FAC/bouwlaag"/>:</b>
+					</td>
+					<td align="left">
+						<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/code"/>&#xA0;
+						<xsl:if test="plaats/regio/district/locatie/gebouw/verdieping/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/omschrijving"/>)</xsl:if>
+					</td>
+				</xsl:if>
+				<xsl:choose>
+					<xsl:when test="uitvoertijd[@eenheid='U']">
+						<td width="16%" align="right">
+							<b>
+							<xsl:value-of select="//lcl/MLD/uitvoertijd"/>:</b>
+						</td>
+						<td width="34%">
+							<xsl:value-of select="uitvoertijd"/>&#160;<xsl:value-of select="//lcl/MLD/uren"/>
+						</td>
+					</xsl:when>
+					<xsl:otherwise>
+						<td width="16%" align="right">
+							<b>
+							<xsl:value-of select="//lcl/MLD/uitvoertijd"/>:</b>
+						</td>
+						<td width="34%">
+							<xsl:value-of select="uitvoertijd"/>&#160;<xsl:value-of select="//lcl/FAC/dagen"/>
+						</td>
+					</xsl:otherwise>
+				</xsl:choose>
+			</tr>
+			<tr>
+				<xsl:if test="plaats/@type='R'">
+					<td align="right" valign="top">
+						<b>
+						<xsl:value-of select="//lcl/FAC/ruimte"/>:</b>
+					</td>
+					<td align="left">
+						<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>&#xA0;
+						<xsl:if test="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>)</xsl:if>
+					</td>
+				</xsl:if>
+				<xsl:if test="plaats/@type!='R'">
+					<td colspan="2"/>
+				</xsl:if>
+				<td align="right">
+					<b>
+					<xsl:value-of select="//lcl/MLD/datum_gereed"/>:</b>
+				</td>
+				<td align="left">
+					<xsl:value-of select="datum_gepland/datum"/>&#xA0;<xsl:value-of select="datum_gepland/tijd"/>
+				</td>
+			</tr>
+			<xsl:if test="kenmerk[@naam='Ordernr']!=''">
+				<tr>
+					<td colspan="2"/>
+					<td align="right">
+						<b>
+						<xsl:value-of select="//lcl/MLD/ordernr"/>:</b>
+					</td>
+					<td align="left">
+						<xsl:value-of select="kenmerk[@naam='Ordernr']"/>
+					</td>
+				</tr>
+			</xsl:if>
+			<tr height="20px">
+				<td colspan="4">
+					<hr/>
+				</td>
+			</tr>
+			<tr>
+				<td align="right" width="16%">
+					<b>
+					<xsl:value-of select="//lcl/FAC/aanvrager"/>:</b>
+				</td>
+				<td align="left" width="34%">
+					<xsl:value-of select="voor/naam_full"/>
+				</td>
+				<td align="right" width="16%">
+					<b>
+					<xsl:value-of select="//lcl/FAC/telefoon"/>:</b>
+				</td>
+				<td align="left" width="34%">
+					<xsl:if test="voor/telefoonnr=''">-</xsl:if>
+					<xsl:value-of select="voor/telefoonnr"/>
+				</td>
+			</tr>
+			<xsl:if test="string(voor/naam_full)!=string(voor/naam_full)">
+				<tr>
+					<td align="right" width="16%">
+						<b>
+						<xsl:value-of select="//lcl/MLD/meldingvoor"/>:</b>
+					</td>
+					<td align="left" width="34%">
+						<xsl:value-of select="voor/naam_full"/>
+					</td>
+				</tr>
+			</xsl:if>
+			<tr>
+				<td align="right">
+					<b>
+					<xsl:value-of select="//lcl/FAC/locatie"/>:</b>
+				</td>
+				<td align="left">
+					<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/code"/>&#xA0;
+					<xsl:if test="voor/werkplek/plaats/regio/district/locatie/omschrijving!=''">(<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/omschrijving"/>)</xsl:if>
+				</td>
+				<td align="right" valign="top">
+					<b>
+					<xsl:value-of select="//lcl/FAC/afdeling"/>:</b>
+				</td>
+				<td align="left">
+					<xsl:value-of select="voor/afdeling/omschrijving"/>
+				</td>
+			</tr>
+			<xsl:if test="voor/werkplek/plaats/regio/district/locatie/gebouw/code!=''">
+				<tr>
+					<td align="right" valign="top">
+						<b>
+						<xsl:value-of select="//lcl/FAC/werkplek"/>:</b>
+					</td>
+					<td align="left">
+						<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/naam"/>
+						<br/>
+						<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/code"/>&#xA0;<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>&#xA0;
+						<xsl:if test="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving!=''">(<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>)</xsl:if>
+					</td>
+					<td colspan="2"/>
+				</tr>
+			</xsl:if>
+			<tr height="20px">
+				<td/>
+			</tr>
+			<tr>
+				<td colspan="2">
+					<xsl:element name="a">
+						<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>/cust/stam/saml/?<xsl:value-of select="../bookmarks/melding"/>
+							<xsl:value-of select="key"/>
+						</xsl:attribute>Click here to view this call in the service center</xsl:element>
+					</td>
+				</tr>
+
+			</table>
+		</xsl:template>
+		
+  <xsl:template match="melding" mode="full">
+       <xsl:choose>
+            <xsl:when test="$mode='summary'"></xsl:when>
+       <xsl:otherwise>
+    <html>
+      <xsl:comment>================================ MELDINGEN ==============================</xsl:comment>
+      <xsl:comment>FACILITOR default XSL template for melding</xsl:comment>
+      <xsl:call-template name="htmlhead"/>
+      <xsl:element name="body">
+        <xsl:if test="$mode!='email'">
+          <xsl:attribute name="onload">window.print();</xsl:attribute>
+        </xsl:if>
+        <xsl:call-template name="pageheader"/>
+        <xsl:choose>
+             <xsl:when test="$srtnotificatiecode = 'MLDKTO'">
+               <xsl:apply-templates select="." mode="kto"/>
+             </xsl:when>
+            <xsl:otherwise>
+                <xsl:apply-templates select="." mode="include"/>
+             </xsl:otherwise>
+            </xsl:choose>
+          <xsl:call-template name="pagefooter"/>
+      </xsl:element>
+    </html>
+       </xsl:otherwise>
+      </xsl:choose>
+  </xsl:template>		
+    
+</xsl:stylesheet>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

CUST/STAM/xsl/opdracht.xsl

@@ -0,0 +1,306 @@
+<?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:import href="./cust.xsl"/>
+    
+  <xsl:template match="opdracht" mode="include">
+    <table border="0" width="100%" cellpadding="2">
+      <tr>
+        <td colspan="4" class="caption" style="padding-top:20px;padding-bottom:20px">
+          <b>
+            <xsl:choose>
+              <xsl:when test="statusopdr_key = 10 and statusopdr_key_refiat &gt; 0">
+                <xsl:value-of select="//lcl/MLD/hergoedkeuring"/>:&#xA0;
+              </xsl:when>
+              <xsl:when test="(statusopdr_key = 3 or statusopdr_key = 4) and statusopdr_key_refiat &gt; 0">
+                <xsl:value-of select="//lcl/MLD/herfiattering"/>:&#xA0;
+              </xsl:when>
+            </xsl:choose>
+            <xsl:value-of select="opdrachttype/omschrijving"/>&#160;
+            <xsl:value-of select="melding/stdmelding/discipline/srtdiscipline/prefix"/>
+            <xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></b>
+        </td>
+      </tr>
+      <xsl:if test="extra_key">
+        <xsl:variable name="ox_key"><xsl:value-of select="extra_key"/></xsl:variable>
+        <tr>
+          <td align="right" valign="top" style="padding-top:15px;padding-bottom:10px;">
+            <b><xsl:value-of select="//lcl/FAC/bericht"/>:</b>
+          </td>
+          <td colspan="5" style="padding-top:15px;padding-bottom:10px;">
+            <xsl:call-template name="linebreaks">
+              <xsl:with-param name="string" select="notes/note[key=$ox_key]/omschrijving"/>
+            </xsl:call-template>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="6" style="padding-bottom:15px;">
+            <hr/>
+          </td>
+        </tr>
+      </xsl:if>
+      <tr>
+        <td width="16%"/>
+        <td width="17%"/>
+        <td width="17%"/>
+        <td width="16%" align="right">
+          <b><xsl:value-of select="//lcl/FAC/bedrijf"/>:</b>
+        </td>
+        <td width="17%">
+          <xsl:value-of select="uitvoerende/bedrijf/naam"/>
+        </td>
+        <td width="17%">
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/contactpersoon"/>:</b>
+        </td>
+        <td>
+          <xsl:value-of select="contactpersoon/naam_full"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b>
+        </td>
+        <td>
+          <xsl:value-of select="contactpersoon/telefoon1"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/adres"/>:</b>
+        </td>
+        <td>
+          <xsl:value-of select="uitvoerende/bedrijf/post_adres"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/plaats"/>:</b>
+        </td>
+        <td>
+          <xsl:value-of select="uitvoerende/bedrijf/post_plaats"/>
+        </td>
+      </tr>
+      <tr>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/contactpersoon"/>:</b>
+        </td>
+        <td align="left">
+          <xsl:value-of select="backoffice_contact/naam_full"/>
+        </td>
+        <td colspan="3"/>
+      </tr>
+      <tr>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b>
+        </td>
+        <td align="left">
+          <xsl:value-of select="backoffice_contact/telefoonnr"/>
+        </td>
+        <td align="left">
+        </td>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/kostenplaats"/>:</b>
+        </td>
+        <td align="left">
+          <xsl:value-of select="kostenplaats/nr"/>
+        </td>
+      </tr>
+      <xsl:if test="melding/kenmerk[@naam='Ordernr']!=''">
+        <tr>
+          <td colspan="3"/>
+          <td align="right">
+            <b><xsl:value-of select="//lcl/MLD/ordernr"/>:</b>
+          </td>
+          <td align="left">
+            <xsl:value-of select="melding/kenmerk[@naam='Ordernr']"/>
+          </td>
+        </tr>
+      </xsl:if>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/datum_gereed"/>:</b>
+        </td>
+        <td align="left">
+          <xsl:value-of select="datumgereed/datum"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/datum_verzonden"/>:</b>
+        </td>
+        <td align="left">
+          <xsl:value-of select="datumverzonden/datum"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/status"/>:</b>
+        </td>
+        <td align="left">
+          <xsl:value-of select="status"/>
+        </td>
+      </tr>
+      <tr>
+        <td align="right" valign="top">
+          <b><xsl:value-of select="//lcl/FAC/omschrijving"/>:</b>
+        </td>
+        <td align="left" colspan="3">
+          <xsl:call-template name="linebreaks">
+            <xsl:with-param name="string" select="omschrijving"/>
+          </xsl:call-template>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="6">
+          <hr/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="6" align="center">
+          <table width="100%" style="background-color:#EEEEEE;border: 1px solid blue">
+            <tr>
+              <td>
+                <xsl:apply-templates select="melding" mode="include"/>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="6" height="30px" valign="center">
+          <hr/>
+        </td>
+      </tr>
+      <xsl:variable name="arbeid" select="uren*uurloon"/>
+      <xsl:variable name="arbeid_refiat" select="uren_refiat*uurloon_refiat"/>
+      <tr>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/uren"/>:</b>
+        </td>
+        <td>
+          <xsl:value-of select="format-number(uren, '0,00', 'european')"/>
+          <b>&#xA0;à&#xA0;</b>&#x20AC;&#xA0;<xsl:value-of select="format-number(uurloon, '0,00', 'european')"/></td>
+        <td style="width:2in;text-align:left">
+          <xsl:if test="statusopdr_key_refiat &gt; 0">
+            (<xsl:value-of select="//lcl/MLD/was"/>&#xA0;<xsl:value-of select="format-number(uren, '0,00', 'european')"/>
+            <b>&#xA0;à&#xA0;</b>&#x20AC;&#xA0;<xsl:value-of select="format-number(uurloon, '0,00', 'european')"/>)
+          </xsl:if>
+        </td>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/arbeid"/>:</b>
+        </td>
+        <td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number($arbeid, '0,00', 'european')"/></td>
+        <td style="width:1in;text-align:right">
+          <xsl:if test="statusopdr_key_refiat &gt; 0">
+            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number($arbeid_refiat, '0,00', 'european')"/>)
+          </xsl:if>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/materiaal"/>:</b>
+        </td>
+        <td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(materiaal, '0,00', 'european')"/></td>
+        <td style="width:1in;text-align:right">
+          <xsl:if test="statusopdr_key_refiat &gt; 0">
+            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number(materiaal_refiat, '0,00', 'european')"/>)
+          </xsl:if>
+        </td>
+      </tr>
+      <xsl:variable name="correctie0" select="$arbeid + materiaal"/>
+      <xsl:variable name="correctie" select="kosten - $correctie0"/>
+      <xsl:variable name="correctie0_refiat" select="$arbeid_refiat + materiaal_refiat"/>
+      <xsl:variable name="correctie_refiat" select="kosten_refiat - $correctie0_refiat"/>
+      <xsl:if test="$correctie!=0">
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/MLD/correctie"/>:</b>
+        </td>
+        <td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number($correctie, '0,00', 'european')"/></td>
+        <td style="width:1in;text-align:right">
+          <xsl:if test="statusopdr_key_refiat &gt; 0">
+            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number($correctie_refiat, '0,00', 'european')"/>)
+          </xsl:if>
+        </td>
+      </tr>
+      </xsl:if>
+      <tr>
+        <td colspan="3"/>
+        <td align="right">
+          <b><xsl:value-of select="//lcl/FAC/totaal"/>:</b>
+        </td>
+        <td style="width:1in;text-align:right">
+          <b>&#x20AC;&#xA0;<xsl:value-of select="format-number(kosten, '0,00', 'european')"/></b>
+        </td>
+        <td style="width:1in;text-align:right">
+          <xsl:if test="statusopdr_key_refiat &gt; 0">
+            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number(kosten_refiat, '0,00', 'european')"/>)
+          </xsl:if>
+        </td>
+      </tr>
+    </table>
+  </xsl:template>
+
+  <xsl:template match="opdracht" mode="full">
+       <xsl:choose>
+            <xsl:when test="$mode='summary'"></xsl:when>
+       <xsl:otherwise>
+    <html>
+      <xsl:comment>================================ OPDRACHTEN ==============================</xsl:comment>
+      <xsl:comment>FACILITOR default XSL template for opdracht</xsl:comment>
+      <xsl:call-template name="htmlhead"/>
+      <xsl:element name="body">
+        <xsl:if test="$mode!='email'">
+          <xsl:attribute name="onload">window.print();</xsl:attribute>
+        </xsl:if>
+        <xsl:call-template name="pageheader"/>
+        <xsl:apply-templates select="." mode="include"/>
+        <xsl:call-template name="pagefooter"/>
+      </xsl:element>
+    </html>
+       </xsl:otherwise>
+      </xsl:choose>
+  </xsl:template>    
+    
+</xsl:stylesheet>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

CUST/STAM/xsl/reservering.xsl

@@ -0,0 +1,436 @@
+<?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:import href="./cust.xsl"/>
+    
+  <xsl:template name="res_begintext">
+    <tr>
+      <td colspan="2" class="tekst">&#xA0;</td>
+    </tr>
+  </xsl:template>
+
+  <xsl:template name="res_endtext">
+    <tr>
+      <td colspan="2" class="tekst">&#xA0;</td>
+    </tr>
+  </xsl:template>    
+    
+  <xsl:template name="rsv_ruimte">
+    <xsl:param name="min_volgnr"/>
+    <tr>
+      <xsl:choose>
+        <xsl:when test="res_ruimte!=''">
+          <td class="tekstkop" colspan="10" frame="box"><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"/>&#xA0;/<xsl:value-of select="volgnr"/>&#xA0;
+            <xsl:if test="string(res_activiteit/omschrijving)!=''">(<xsl:value-of select="res_activiteit/omschrijving"/>)&#xA0;</xsl:if>
+            <xsl:value-of select="res_ruimte/plaats/regio/district/locatie/omschrijving"/></u>
+          </td>
+        </xsl:when>
+        <!-- "roomservice" -->
+        <xsl:otherwise>
+          <td class="tekstkop" colspan="10" frame="box" style="border-style:solid;border-width:0px;"><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)">
+                &#xA0;-&#xA0;<xsl:value-of select="tot/datum"/>
+            </xsl:if>&#xA0;
+            <xsl:value-of select="//lcl/RES/deelreservering"/>&#xA0;<xsl:value-of select="../key"/>&#xA0;/<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" frame="box" style="border-style:solid;border-width:0px;"><xsl:value-of select="//lcl/FAC/omschrijving"/></td>
+        <td class="value" colspan="9" frame="box" style="border-style:solid;border-width:0px;">
+          : <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" frame="box" style="border-style:solid;border-width:0px;"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
+        <td class="value" colspan="9" frame="box" style="border-style:solid;border-width:0px;">
+          : <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="5">: <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="5">: <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="5">: <xsl:value-of select="kostenplaats/nr"/>&#xA0;
+      <xsl:value-of select="kostenplaats/omschrijving"/>
+    </td>
+  </tr>
+  <xsl:if test="string(opmerking)!=''">
+      <tr>
+        <td class="label" frame="box" style="border-style:solid;border-width:0px;"> <xsl:value-of select="//lcl/FAC/opmerking"/></td>
+        <td class="value" colspan="9" frame="box" style="border-style:solid;border-width:0px;">
+          : <xsl:call-template name="linebreaks">
+            <xsl:with-param name="string" select="opmerking"/>
+          </xsl:call-template>
+        </td>
+      </tr>
+   </xsl:if>
+    <tr>
+        <td colspan="10" style="border-top:1px solid #000;"/>
+    </tr>
+    <tr>
+      <th class="resth" width="24%" align="left"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
+      <th class="resth" width="14%" align="left"><xsl:value-of select="//lcl/RES/aantal"/></th>
+      <!--<th width="80">Datum</th>-->
+      <th class="resth" width="14%" style="text-align:right"><xsl:value-of select="//lcl/RES/begintijd"/></th>
+      <th class="resth" width="14%" style="text-align:right"><xsl:value-of select="//lcl/RES/eindtijd"/></th>
+      <th class="resth" width="16%" align="center"><xsl:value-of select="//lcl/RES/opstelling"/></th>
+      <th class="resth" width="17%" style="text-align:right"><xsl:value-of select="//lcl/RES/prijs"/></th>
+    </tr>
+    <xsl:if test="res_ruimte!=''">
+      <tr>
+        <td width="24%" 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="14%" class="resresult" style="text-align:left">
+          <xsl:value-of select="bezoekers"/>&#xA0;<xsl:value-of select="//lcl/FAC/personen"/></td>
+        <!--<td class="result" style="text-align:right">
+          <xsl:value-of select="van/datum"/>
+        </td>-->
+        <td width="14%" class="resresult" style="text-align:right">
+          <xsl:value-of select="van/tijd"/>
+        </td>
+        <td width="14%" class="resresult" style="text-align:right">
+          <xsl:value-of select="tot/tijd"/>
+        </td>
+        <td width="16%" class="resresult" style="text-align:center">
+          <xsl:value-of select="res_ruimte/opstelling"/>
+        </td>
+        <td width="17%" 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/deel/omschrijving"/>
+        </td>
+        <td class="resresult">
+          <xsl:value-of select="aantal"/>
+        </td>
+        <!--<td class="result" style="text-align:right">
+          <xsl:value-of select="van/datum"/>
+        </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 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="result" style="text-align:right">
+          <xsl:value-of select="levering/datum"/>
+        </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:right">
+          <xsl:call-template name="europrijs">
+            <xsl:with-param name="prijs" select="prijs"/>
+          </xsl:call-template>
+        </td>
+      </tr>
+    </xsl:for-each>
+    <!-- totaal per deelreservering -->
+    <tr  height="1">
+      <td colspan="10" style="border-top:1px solid #000;"/>
+    </tr>
+    <tr>
+      <td class="tekst" colspan="4" style="border-style:solid;border-width:0px;"></td>
+      <td class="tekst" colspan="2" style="text-align:right;border-style:solid;border-width:0px;"><b>
+             <xsl:call-template name="europrijs">
+               <xsl:with-param name="prijs" select="sum(prijs[string(number(.))!='NaN'])+sum(rsv_deel/prijs[string(number(.))!='NaN'])+sum(rsv_artikel/prijs[string(number(.))!='NaN'])"/>
+             </xsl:call-template></b>
+      </td>
+    </tr>
+    <!-- afspraak-lijst gesorteerd op naam -->
+    <xsl:for-each select="afspraak/bezoeker">
+      <xsl:sort select="naam"/>
+      <xsl:choose>
+        <xsl:when test="position() = 1">
+          <tr>
+            <td class="tekst" style="border-style:solid;border-width:0px;">
+              <br/><xsl:value-of select="//lcl/BEZ/bezoekers"/></td>
+          </tr>
+          <tr>
+            <th><xsl:value-of select="//lcl/FAC/naam"/></th>
+            <th colspan="3"><xsl:value-of select="//lcl/FAC/bedrijf"/></th>
+            <th colspan="4"><xsl:value-of select="//lcl/BEZ/parkeerplaats"/></th>
+          </tr>
+        </xsl:when>
+      </xsl:choose>
+      <tr>
+        <td class="result">
+          <xsl:value-of select="naam"/>
+        </td>
+        <td class="result" colspan="3">
+          <xsl:value-of select="bedrijf"/>
+        </td>
+        <td class="result" colspan="4">
+          <xsl:value-of select="deel/omschrijving"/>
+        </td>
+      </tr>
+    </xsl:for-each>
+
+    <!-- kenmerk -->
+    <xsl:if test="kenmerk">
+    <tr>
+    <td colspan="5">
+    <table>
+      <xsl:for-each select="kenmerk[count(@xmlnode)=0]">
+        <xsl:sort select="@volgnummer" data-type="number"/>
+        <xsl:if test=".!=''">
+          <tr>
+            <td class="label">
+              <xsl:value-of select="@naam"/></td>
+            <td class="value">
+              : <xsl:value-of select="."/>
+            </td>
+          </tr>
+        </xsl:if>
+      </xsl:for-each>
+    </table>
+    </td>
+    </tr>
+    </xsl:if>
+
+  </xsl:template>    
+
+  <xsl:template match="reservering" mode="include">
+    <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
+      <TR>
+        <TD WIDTH="40" ROWSPAN="30" ID="LINKERMARGE"/>
+        <TD>
+          <xsl:choose>
+             <xsl:when test="$srtnotificatiecode='RESDEL' and verwijder">
+              <table>
+                <tr>
+                  <td height="20"/>
+                </tr>
+                <tr>
+                  <td class="caption" style="color: red"><xsl:value-of select="//lcl/RES/annulering"/></td>
+                </tr>
+              </table>
+            </xsl:when>
+          </xsl:choose>
+            <!-- Bevestiging reservering -->
+            <!-- Ook tonen voor verwijderde reserveringen -->
+
+            <!-- De algemene gegevens van de deelreservering met het laagste volgnummer worden gebruikt als referentie gegevens! -->
+            <xsl:variable name="min_volgnr">
+              <xsl:value-of select="//reservering/rsv_ruimte/volgnr[not(. &gt; //reservering/rsv_ruimte/volgnr)]"/>
+            </xsl:variable>
+
+            <table border="0" bordercolor="#000000" width="100%">
+              <tr>
+                <td class="caption" valign="top" colspan="4">
+                  <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>&#xA0;</td>
+              </tr>
+                <tr>
+                <td class="tekstkop" colspan="4" 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="15%" 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="20%" class="label"><xsl:value-of select="//lcl/RES/begintijd"/></td>
+                <td width="80%" 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="25px"/>
+              </tr>
+              <xsl:if test="rsv_ruimte[volgnr=$min_volgnr]/contact_user/key!=ingevoerd_user/key">
+                <tr>
+                  <td width="20%" class="label"><xsl:value-of select="//lcl/RES/behandeld_door"/></td>
+                  <td width="80%" class="value">: <xsl:value-of select="ingevoerd_user/naam_full"/></td>
+                </tr>
+                <tr>
+                  <td height="30px"/>
+                </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 cellpadding="1" border="0" WIDTH="99%" bordercolor="#000000" frame="box">
+                    <!-- rsv_ruimte -->
+                    <xsl:for-each select="rsv_ruimte">
+                      <xsl:sort select="van/timestamp"/>
+                      <xsl:call-template name="rsv_ruimte">
+                        <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="9" height="15px" style="border-bottom:1px solid #000;"/>
+                    </tr>
+                    <tr>
+                      <td class="tekstkop" align="right" colspan="5" style="border-width:0px;"><xsl:value-of select="//lcl/RES/totaalprijs_reservering"/>:</td>
+                      <td class="tekstkop" colspan="2" style="text-align:right;border-width:0px;">
+                                              <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:call-template name="res_endtext">
+                <xsl:with-param name="min_volgnr" select="$min_volgnr"/>
+              </xsl:call-template>
+                </xsl:when>
+              </xsl:choose>
+            </table>
+            <!-- Bevestiging reservering -->
+        </TD>
+        <TD WIDTH="30" ROWSPAN="30" ID="RECHTERMARGE"/>
+      </TR>
+    </TABLE>
+  </xsl:template>
+  
+  <xsl:template match="reservering" mode="full">
+       <xsl:choose>
+            <xsl:when test="$mode='summary'"></xsl:when>
+       <xsl:otherwise>
+      <xsl:choose>
+        <xsl:when test="$srtnotificatiecode = 'OUTLOOK'">
+          <xsl:apply-templates select="." mode="outlook"/>
+        </xsl:when>
+        <xsl:otherwise>
+    <html>
+      <xsl:comment>================================ RESERVERINGEN ==============================</xsl:comment>
+      <xsl:comment>FACILITOR default XSL template for reservering</xsl:comment>
+      <xsl:call-template name="htmlhead"/>
+      <xsl:element name="body">
+        <xsl:if test="$mode!='email'">
+          <xsl:attribute name="onload">window.print();</xsl:attribute>
+        </xsl:if>
+            <xsl:call-template name="pageheader"/>
+            <xsl:choose>
+                   <xsl:when test="$srtnotificatiecode = 'RESKTO'">
+                     <xsl:apply-templates select="." mode="kto"/>
+                   </xsl:when>
+                  <xsl:otherwise>
+                      <xsl:apply-templates select="." mode="include"/>
+                   </xsl:otherwise>
+                  </xsl:choose>
+            <xsl:call-template name="pagefooter"/>
+      </xsl:element>
+    </html>
+      </xsl:otherwise>
+    </xsl:choose>
+       </xsl:otherwise>
+      </xsl:choose>
+  </xsl:template>  
+
+</xsl:stylesheet>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

CUST/STPH/xsl/medeco.xsl

@@ -58,6 +58,7 @@
 										<xsl:when test="bestelling/kostenplaats/nr = '0000'">14010141</xsl:when>
 										<xsl:when test="bestelling/kostenplaats/nr = '6661'">14000749</xsl:when>
 										<xsl:when test="bestelling/kostenplaats/nr = '6663'">14005949</xsl:when>
+										<xsl:when test="bestelling/kostenplaats/nr = '6551'">14005598</xsl:when>
 										<xsl:when test="bestelling/voor/afdeling/kenmerk[@key=1000] != ''">
 												<xsl:value-of select="bestelling/voor/afdeling/kenmerk[@key=1000]"/>
 										</xsl:when>

CUST/SUTF/xsl/cust.xsl

@@ -419,7 +419,7 @@
 					<b>Adres:</b>
 				</td>
 				<td align="left">
-					<xsl:value-of select="melding/plaats/regio/district/locatie/omschrijving"/>
+					De Lunette
 				</td>
 				<td align="right">
 					<b><xsl:value-of select="//lcl/MLD/datum_gereed"/>:</b>
@@ -432,7 +432,7 @@
 				<td align="right">				
 				</td>
 				<td align="left">
-					<xsl:value-of select="melding/plaats/regio/district/locatie/adres"/>
+					Coehoornsingel 3
 				</td>
 				<td align="right">
 					<b><xsl:value-of select="//lcl/MLD/datum_verzonden"/>:</b>
@@ -445,7 +445,7 @@
 				<td align="right">				
 				</td>
 				<td align="left">
-					<xsl:value-of select="melding/plaats/regio/district/locatie/postcode"/>&#xA0;&#xA0;<xsl:value-of select="melding/plaats/regio/district/locatie/plaats"/>
+					7201 AA&#xA0;&#xA0;Zutphen
 				</td>
 				<td align="right">
 					<b><xsl:value-of select="//lcl/MLD/status"/>:</b>

CUST/UWVA/cust.css

@@ -1,3 +1,9 @@
-#mod_mldfixsla .label {
+/* UWVA#39752 Opmerkingen bij aanvraag verstoppen */
-    width: 124px !important;
+
+#lev_opm, label[for="lev_opm"] {
+	display:none;
+}
+
+.ui-datepicker-today {
+    background-color: green;
 }

CUST/VENR/export/gen_export_fact.bat

@@ -0,0 +1,17 @@
+REM GEN_EXPORT_FACT.BAT
+REM
+REM VENR
+REM
+REM Bevriest kosten en exporteert feitelijk niets
+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) 2017 Facilitor B.V.
+REM
+
+REM ================================================== create exportfile
+CALL ..\..\..\utils\gen_export\gen_export.bat FACT

CUST/VGLD/xsl/Huuskes.xsl

@@ -15,6 +15,7 @@
   	<username>facilitor</username>
   	<password>vogel01</password>
   	<orderid><xsl:value-of select="bestelling/kenmerk[@naam='Orderid']"/></orderid>
+  	<reference><xsl:value-of select="bestelling/key"/></reference>
 	</ordervalidaterequest>
 
 	</xsl:template>

CUST/YKPN/SAML/default.asp

@@ -0,0 +1,53 @@
+<%@ language = "JavaScript" %>
+<% /*
+    $Revision$
+    $Id$
+    File:        cust/ykpn/saml/default.asp
+    Description:    Single Sign On script
+    Parameters:
+    Context:        
+    Note:
+*/ %>
+<%
+    Response.Expires=-1;
+    Session("customerId") = "YKPN";
+    ANONYMOUS_Allowed = 1;
+%>
+<!-- #include file="../../../appl/Shared/common.inc" -->
+<!-- #include file="../../../appl/shared/login.inc" -->
+<%
+    //for (i=1; i <= Request.ServerVariables.Count; i++)
+    //{
+    //    __DoLog(Request.ServerVariables.key(i) + ": " + Request.ServerVariables(i));
+    //}
+
+    var uname = String(Request.ServerVariables("HTTP_FCLTACCOUNT"));
+
+    var newUrl = rooturl + "/";
+    if (Session("SSO_URL")) // binnen via sso=1 route
+    {                       // met 2016.2 moet dit eigenlijk via een JWT
+        var sso_qs = Session("SSO_QUERYSTRING")||"";
+        var sso_url = Session("SSO_URL");
+        sso_url = sso_url.replace(/^\/default.asp/i, "/"); // default.asp vooraan hoeft niet, ik wil cleane url
+
+        Session.Contents.Remove("SSO_QUERYSTRING");
+        Session.Contents.Remove("SSO_URL");
+        newUrl = sso_url + (sso_qs?"?":"") + sso_qs;
+    }
+    else
+    {
+        var sso_qs = String(Request.ServerVariables("QUERY_STRING"));
+        if (sso_qs)
+            newUrl += "?" + sso_qs;
+    }
+
+    if (tryLogin(uname, null))
+    {
+        //Response.Write("Hoera: je bent user: " + user_key);
+    }
+    else
+    {   // Automatisch naar het inlogscherm
+        __DoLog("SAML inlog niet gelukt (Login:" + uname);
+    }
+    Response.Redirect(newUrl);
+%>

CUST/YKPN/xsl/cust.xsl

@@ -0,0 +1,32 @@
+<?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:import href="../../../appl/shared/default.xsl"/>
+
+ <xsl:template match="bezoeker" mode="badge">
+    <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
+      <tr>
+        <td style="text-align:left; font-size:10px; font-weight: normal;">Naam bezoeker:</td>
+      </tr>
+      <tr>
+        <td style="text-align:left; font-size:14px; font-weight: bold;"><xsl:value-of select="naam"/></td>
+      </tr>
+      <tr>
+        <td style="height: 20px"></td>
+      </tr>
+      <tr>
+        <td style="text-align:left; font-size:10px; font-weight: ">Firma:</td>
+      </tr>
+      <tr>
+        <td style="text-align:left; font-size:14px; font-weight: bold; height:20px;"><xsl:value-of select="bedrijf"/></td>
+      </tr>
+      <tr>
+        <td style="height: 20px"></td>
+      </tr>
+      <tr>
+        <td style="text-align:left; font-size:10px; font-weight: normal;">Datum: <xsl:value-of select="afspraak/datum/datum"/></td>
+      </tr>
+    </TABLE>
+  </xsl:template>
+
+
+</xsl:stylesheet><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. -->