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

Merge 2017.3 Gold F

Browse Source 
svn path=/Website/trunk/; revision=38429
This commit is contained in:
Jos Groot Lipman
2018-07-09 11:48:16 +00:00
parent c682fe0d68 fdedbff9fe
commit 5b57e20438
15 changed files with 794 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/MLD/mld.inc
View File

@@ -1302,6 +1302,9 @@ mld = {setmeldingstatus:
+ ", alg_v_allonrgoed_gegevens v"
+ ", alg_locatie l"
+ ", alg_district di"
+ ", (SELECT m1.mld_melding_key"
+ " , mld.getactualuitvoer (m1.mld_melding_key) actualuitvoertijd"
+ " FROM mld_melding m1) gau"
+ (verantw_key
? ", alg_gebouw g"
: "")
@@ -1374,6 +1377,7 @@ mld = {setmeldingstatus:
? " AND p.prs_afdeling_key = b.prs_afdeling_key"
: "")
+ " AND std.mld_stdmelding_key = m.mld_stdmelding_key"
+ " AND m.mld_melding_key = gau.mld_melding_key"
+ (perform && srtdisc_key
? " AND sd.ins_srtdiscipline_key = md.ins_srtdiscipline_key"
: "")

BIN
CUST/AAAH/tmpl_logo.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

251
CUST/BLCC/xsl/BLCC.xsl
View File

@@ -6,7 +6,7 @@
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:variable name="Xsrtnotificatiecode">ORDXXX</xsl:variable>
<xsl:variable name="srtnotificatiecode">ORDMAI</xsl:variable>
<xsl:template name="stylesheet">
<style>
@@ -1476,6 +1476,7 @@ Indien u aanvullende vragen heeft of een toelichting wenst, kunt u contact op te
<u>Opdracht: <xsl:value-of select="melding/stdmelding/discipline/srtdiscipline/prefix"/><xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></u>
</xsl:otherwise>
</xsl:choose>
</td>
</tr>
<tr>
@@ -1582,7 +1583,7 @@ Hierbij de WO nav jullie offerte voor onderstaande werkzaamheden.
</td>
</tr>
</xsl:if>
<tr>
<td><xsl:value-of select="//lcl/FAC/aanvrager"/>:</td>
<td colspan="3"><xsl:value-of select="melding/voor/naam_friendly"/></td>
@@ -2102,7 +2103,7 @@ In het geval van een opdracht buiten contractuele afspraken (workorder) met hoge
</td>
</tr>
<tr><td colspan="6" style="text-align:right;"><br/>Page: 1/1</td></tr>
<tr>
<tr>
<td>
Terms of payment:
<br/>Payment method:
@@ -2197,5 +2198,249 @@ In het geval van een opdracht buiten contractuele afspraken (workorder) met hoge
</body>
</html>
</xsl:if>
<xsl:if test="@view='BLCC_V_ADDD_ACTUAL' or @view='BLCC_V_ADDD_FROZEN'">
<html>
<xsl:call-template name="htmlhead"/>
<body>
<table border="0" style="width:100%;border-collapse:collapse;" cellpadding="3" cellspacing="3">
<colgroup>
<col width="10%"/>
<col width="20%"/>
<col width="20%"/>
<col width="20%"/>
<col width="15%"/>
<col width="15%"/>
</colgroup>
<tr>
<td colspan="3">
<b>Chemelot Campus Vastgoed C.V.</b>
<br/>Urmonderbaan 22, 6167 RD Geleen
<br/>Phone: +31 (0) 88 99 95705
<br/>Mail: <a href="mailto:accounting1@brightlands.com"><nobr>accounting1@brightlands.com</nobr></a>
<br/>Chamber of Commerce: 56268556
</td>
<td colspan="3" style="text-align:right;">
<xsl:choose>
<xsl:when test="$mode='email'"><img src="cid:tmpl_logo.gif"/></xsl:when>
<xsl:otherwise><xsl:element name="img"><xsl:attribute name="src">../../cust/<xsl:value-of select="//header/custId"/>/tmpl_logo.gif</xsl:attribute></xsl:element></xsl:otherwise>
</xsl:choose>
</td>
</tr>
<xsl:choose>
<xsl:when test="count(rapport_data/data_row)=0">
<tr><td class="tekst"><center><br/><b>Geen gegevens gevonden</b></center></td></tr>
</xsl:when>
<xsl:otherwise>
<xsl:variable name="max_factuur">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="FIN_VERKOOPFACTUUR_ID" order="descending"/>
<xsl:if test="position()=1">
<xsl:value-of select="FIN_VERKOOPFACTUUR_ID"/>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<xsl:variable name="min_po">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="FIN_VERKOOPFACTUUR_ID" order="descending"/>
<xsl:sort select="PO_NR"/>
<xsl:if test="position()=1">
<xsl:value-of select="PO_NR"/>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<xsl:variable name="min_bedrijf">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="FIN_VERKOOPFACTUUR_ID" order="descending"/>
<xsl:sort select="PO_NR"/>
<xsl:sort select="PRS_BEDRIJF_KEY"/>
<xsl:if test="position()=1">
<xsl:value-of select="PRS_BEDRIJF_KEY"/>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<xsl:variable name="sortfilter1">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="REGEL"/>
<xsl:sort select="FIN_BTWTABELWAARDE_PERC" data-type="number"/>
<xsl:if test="FIN_VERKOOPFACTUUR_ID=$max_factuur and PO_NR=$min_po and PRS_BEDRIJF_KEY=$min_bedrijf">
<xsl:copy-of select="."/>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<tr>
<td colspan="3">
<b>
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/data_row/PRS_DEBITEUR_NAAM"/>
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/data_row/ADRES"/>
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/data_row/POSTCODE"/><xsl:text> </xsl:text><xsl:value-of select="msxml:node-set($sortfilter1)/data_row/PLAATS"/>
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/data_row/LAND"/>
</b>
</td>
<td>
<br/>Invoice number:
<br/>Date:
<br/><br/>Customer number:
<!--br/>Your VAT number:-->
<br/>Your reference:
<xsl:if test="msxml:node-set($sortfilter1)/data_row/CONTACTPERSOON!=''"><br/>Your contact person:</xsl:if>
</td>
<td colspan="2">
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/data_row/FIN_VERKOOPFACTUUR_ID"/>
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/data_row/FACTUURDATUM"/>
<br/><br/><xsl:value-of select="msxml:node-set($sortfilter1)/data_row/DEBITEUR_NR"/>
<!--br/><xsl:value-of select="msxml:node-set($sortfilter1)/data_row/BTW_NR"/-->
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/data_row/PO_NR"/>
<xsl:if test="msxml:node-set($sortfilter1)/data_row/CONTACTPERSOON!=''"><br/><xsl:value-of select="msxml:node-set($sortfilter1)/data_row/CONTACTPERSOON"/></xsl:if>
</td>
</tr>
<!--tr><td colspan="6" style="text-align:right;"><br/>Page: 1/1</td></tr-->
<tr>
<td>
<br/>Terms of payment:
<br/>Payment method:
<br/>Due date:
</td>
<td colspan="5">
<br/>Within 30 days Due net
<br/>Bank Transfer
<br/><xsl:value-of select="msxml:node-set($sortfilter1)/data_row/VERVALDATUM"/>
</td>
</tr>
<tr><td colspan="6"><br/><b>INVOICE</b></td></tr>
<!--tr><td colspan="6"><br/>Period from - to: <xsl:value-of select="msxml:node-set($sortfilter1)/data_row/MNDBEGIN"/> - <xsl:value-of select="msxml:node-set($sortfilter1)/data_row/MNDEINDE"/></td></tr-->
<tr><td colspan="6"><br/>Period from - to: 01-05-2018 - <xsl:value-of select="msxml:node-set($sortfilter1)/data_row/MNDEINDE"/></td></tr>
<tr>
<td colspan="4" style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>Description</b></td>
<td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>VAT</b></td>
<td style="text-align:center;vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>Amount excl.<br/>VAT</b></td>
</tr>
<xsl:for-each select="msxml:node-set($sortfilter1)/data_row">
<xsl:variable name="prev_reg">
<xsl:choose>
<xsl:when test="position()=1">Quqelequ</xsl:when>
<xsl:otherwise><xsl:value-of select="preceding-sibling::data_row[1]/REGEL"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="this_reg">
<xsl:value-of select="REGEL"/>
</xsl:variable>
<xsl:variable name="prev_btw">
<xsl:choose>
<xsl:when test="position()=1">Quqelequ</xsl:when>
<xsl:otherwise><xsl:value-of select="preceding-sibling::data_row[1]/FIN_BTWTABELWAARDE_PERC"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="this_btw">
<xsl:value-of select="FIN_BTWTABELWAARDE_PERC"/>
</xsl:variable>
<!-- Als 'this' != 'prev', dan nieuwe factuurregel! -->
<xsl:if test="$this_reg!=$prev_reg or $this_btw!=$prev_btw">
<tr>
<td colspan="4" style="border-bottom:1px solid black;"><xsl:value-of select="REGEL"/></td>
<td style="border-bottom:1px solid black;"><xsl:value-of select="FIN_BTWTABELWAARDE_PERC"/> %</td>
<td style="text-align:right;border-bottom:1px solid black;">€ <xsl:value-of select="format-number(sum(msxml:node-set($sortfilter1)/data_row[REGEL=$this_reg and FIN_BTWTABELWAARDE_PERC=$this_btw]/MNDNET), '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:if>
</xsl:for-each>
<xsl:variable name="mndnet">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/data_row/MNDNET)"/>
</xsl:variable>
<xsl:variable name="mndbtwl">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/data_row[FIN_BTWTABELWAARDE_PERC='6']/MNDBTW)"/>
</xsl:variable>
<xsl:variable name="mndbtwh1">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/data_row[FIN_BTWTABELWAARDE_PERC='21']/MNDBTW)"/>
</xsl:variable>
<xsl:variable name="mndbtwh2">
<xsl:value-of select="0.21 * 0.065 * $mndnet"/>
</xsl:variable>
<tr>
<td colspan="3"/>
<td colspan="2"><b>Subtotal</b></td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndnet, '###.###.##0,00', 'european')"/></td>
</tr>
<tr>
<td colspan="3"/>
<td colspan="2"><b>Managementfee 6,5%</b></td>
<td style="text-align:right;">€ <xsl:value-of select="format-number(0.065 * $mndnet, '###.###.##0,00', 'european')"/></td>
</tr>
<tr>
<td colspan="3"/>
<td colspan="2">BTW 6%</td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndbtwl, '###.###.##0,00', 'european')"/></td>
</tr>
<tr>
<td colspan="3"/>
<td colspan="2">BTW 21%</td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndbtwh1 + $mndbtwh2, '###.###.##0,00', 'european')"/></td>
</tr>
<tr>
<td colspan="3" style="background-color:#AAA;"/>
<td colspan="2" style="vertical-align:middle;background-color:#AAA;"><b>Total</b></td>
<td style="text-align:right;vertical-align:middle;background-color:#AAA;">€ <xsl:value-of select="format-number((1.065 * $mndnet) + $mndbtwl + $mndbtwh1 + $mndbtwh2, '###.###.##0,00', 'european')"/></td>
</tr>
<tr><td colspan="6"><br/>If you have questions regarding this invoice, please contact <a href="mailto:invoices.ccv@brightlands.com"><nobr>invoices.ccv@brightlands.com</nobr></a>.</td></tr>
<tr>
<td colspan="6" style="font-size:8pt;">
<br/><b>Please mention invoice number <xsl:value-of select="msxml:node-set($sortfilter1)/data_row/FIN_VERKOOPFACTUUR_ID"/> and customer number <xsl:value-of select="msxml:node-set($sortfilter1)/data_row/DEBITEUR_NR"/> with your payment.</b>
<br/>Rabobank (EUR) Geleen Netherlands
<br/>Bank account 1716.02.161
<br/>IBAN&#xA0;&#xA0;&#xA0;NL 33 RABO 01716 02 161
<br/>BIC&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;RABONL2U
<br/><b>Our VAT number: NL852049511B01</b>
</td>
</tr>
<tr style="page-break-before:always;"/>
<xsl:variable name="sortfilter2">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="SORTERING"/>
<xsl:if test="FIN_VERKOOPFACTUUR_ID=$max_factuur and PO_NR=$min_po and PRS_BEDRIJF_KEY=$min_bedrijf">
<xsl:copy-of select="."/>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<tr><td colspan="6"><br/><b>SPECIFICATION</b></td></tr>
<tr>
<td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>ID</b></td>
<td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>Issuer</b></td>
<td colspan="2" style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>Description</b></td>
<td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>VAT</b></td>
<td style="text-align:center;vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>Amount excl.<br/>VAT</b></td>
</tr>
<xsl:for-each select="msxml:node-set($sortfilter2)/data_row">
<tr>
<td style="border-bottom:1px solid black;font-size:8pt;"><xsl:value-of select="REGEL_ID"/></td>
<td style="border-bottom:1px solid black;font-size:8pt;"><xsl:value-of select="AANVRAGER"/></td>
<td colspan="2" style="border-bottom:1px solid black;font-size:8pt;"><xsl:value-of select="REGEL_OMS"/></td>
<td style="border-bottom:1px solid black;font-size:8pt;"><xsl:value-of select="FIN_BTWTABELWAARDE_PERC"/> %</td>
<td style="text-align:right;border-bottom:1px solid black;font-size:8pt;">€ <xsl:value-of select="format-number(MNDNET, '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:for-each>
<tr>
<td colspan="3" style="background-color:#AAA;"/>
<td colspan="2" style="vertical-align:middle;background-color:#AAA;"><b>Total</b></td>
<td style="text-align:right;vertical-align:middle;background-color:#AAA;">€ <xsl:value-of select="format-number(sum(msxml:node-set($sortfilter1)/data_row/MNDNET), '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:otherwise>
</xsl:choose>
</table>
</body>
</html>
</xsl:if>
</xsl:template>
</xsl:stylesheet>

BIN
CUST/CEVA/flexfiles/ALG/A0000___/A136/1000/Projecten.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 38 KiB

13
CUST/DEMO/DEMO.css
View File

@@ -26,4 +26,15 @@
}
.floorscreen #verdiepingen .selected {
background-color: #004f80;
}
}
div.wbackground {
background-position:center;
background-size: cover;
padding:10px 20px 10px 20px;
}

8
CUST/HOUT/Export/gen_export_MI.bat
View File

@@ -2,7 +2,7 @@ REM GEN_EXPORT_MI.BAT
REM
REM HOUT
REM
REM Exporteert 5-tal MI-bestanden als CSV (HOUT#37759).
REM Exporteert 9-tal MI-bestanden als CSV.
REM
REM Context : roep deze file aan indien nodig, of schedule deze
REM Vereist : de randvoorwaarde voor het gebruik van gen_export
@@ -25,3 +25,9 @@ CALL ..\..\..\utils\gen_export\gen_export.bat ICT_ORD
CALL ..\..\..\utils\gen_export\gen_export.bat ICT_ORDTRK
CALL ..\..\..\utils\gen_export\gen_export.bat ICT_ORDNOT
CALL ..\..\..\utils\gen_export\gen_export.bat RESBASIS
CALL ..\..\..\utils\gen_export\gen_export.bat RESVOORZ
CALL ..\..\..\utils\gen_export\gen_export.bat RESTRK

16
CUST/INLO/xsl/cust_settings.xsl Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:variable name="logo_file">../../cust/aaxx/aafm_banner.gif</xsl:variable>
<xsl:template name="customer">INLO</xsl:template>
<xsl:template name="customer_code">INLO</xsl:template>
<xsl:template name="customer_email">facilitydeskinlo@heydayfm.nl</xsl:template>
<xsl:template name="invoice_email">invoices.inlo@heydayfm.nl</xsl:template>
<xsl:template name="servicedesk_telefoon">+31 (0) 40 2332800</xsl:template>
<xsl:template name="opdracht_qr_bookmark"></xsl:template>
</xsl:stylesheet><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. -->

2
CUST/MARX/xsl/F_PutOpdrachtSIDB_MS31.xsl
View File

@@ -29,7 +29,7 @@
<xsl:if test="returncode='0'">
<!-- Alleen bij OKE een PostMessageResponse, bij NOT OKE alleen bovenstaande Fault-gedeelte -->
<mes31:MessageResponse>
<MessageResult>true</MessageResult>
<mes31:MessageResult>true</mes31:MessageResult>
</mes31:MessageResponse>
</xsl:if>
</soap:Body>

2
CUST/MARX/xsl/F_ResponseFactuur_MS31.xsl
View File

@@ -30,7 +30,7 @@
<xsl:if test="count(//details/detail[status='W' or status='E']) = 0">
<!-- Alleen bij OKE een PostMessageResponse, bij NOT OKE alleen bovenstaande Fault-gedeelte -->
<mes31:MessageResponse>
<MessageResult>true</MessageResult>
<mes31:MessageResult>true</mes31:MessageResult>
</mes31:MessageResponse>
</xsl:if>
</soap:Body>

11
CUST/NYBU/xsl/NYBU.xsl
View File

@@ -16,7 +16,7 @@
</xsl:choose>
</xsl:variable>
<xsl:variable name="Xsrtnotificatiecode">MLDAFM</xsl:variable>
<xsl:variable name="Xsrtnotificatiecode">RESBEV</xsl:variable>
<xsl:key name="regel" match="//facilitor/rapport/rapport_data/data_row" use="HIDE_F_REGEL"/>
<xsl:key name="catalogus" match="//facilitor/rapport/rapport_data/data_row" use="FCLT_F_CATALOGUS"/>
@@ -2538,7 +2538,10 @@
<p>U heeft een reservering geplaatst voor <xsl:value-of select="rsv_ruimte/van/datum"/>.</p>
<p> Mocht de reservering niet meer van toepassing zijn, horen wij dat graag zo spoedig mogelijk.</p>
<p>Mocht de reservering niet meer van toepassing zijn, horen wij dat graag zo spoedig mogelijk.</p>
<p>Zijn er ook <b> hotelkamers </b> gereserveerd? <br></br>
Hierbij het verzoek om het daadwerkelijk aantal benodigde hotelkamers aan de Servicedesk door te geven. </p>
<p>Mocht u vragen hebben omtrent uw reservering, neemt u dan contact op met onze Servicedesk via servicedesk@nyenrode.nl of telefoonnummer 0346-291234.</p>
@@ -2602,11 +2605,11 @@
<p>U heeft een reservering geplaatst op <xsl:value-of select="rsv_ruimte/van/datum"/>.</p>
<p> Wij hebben de volgende ruimte definitief voor u gereserveerd: </p>
<p>Wij hebben de volgende ruimte definitief voor u gereserveerd: </p>
<p> <b> <xsl:value-of select="rsv_ruimte/res_ruimte/nr"/> </b> </p>
<p> Vergeet u niet uw reservering te controleren en eventuele cateringwensen en voorzieningen kenbaar te maken in Facilitor? </p>
<p>Vergeet u niet uw reservering te controleren en eventuele cateringwensen en voorzieningen kenbaar te maken in Facilitor? Ook verzoeken wij u de reservering van uw <b> hotelkamers </b> te controleren.</p>
<p>Mocht u vragen hebben omtrent uw reservering, neemt u dan contact op met onze Servicedesk via servicedesk@nyenrode.nl of telefoonnummer 0346-291234.</p>

48
CUST/PCHA/mld_statusupdate_svd.asp Normal file
View File

@@ -0,0 +1,48 @@
<%@ language = "JavaScript" %>
<% /*
$Revision$
$Modtime: 2-02-12 12:25 $
File: mld_statusupdate_svd.asp
Description: A deeplink call from the reports section of Facilitor to finalize SVD orders.
Parameters:
opdr_key Key of de order
opdr_id Id of the order
Context: Client specific file to handle a deeplink call.
Note:
*/ %>
<%
var JSON_Result = true;
%>
<!-- #include file="../../appl/Shared/common.inc"-->
<!-- #include file="../../appl/Shared/json2.js" -->
<%
message = "Opdracht is niet aangepast";
var mld_opdr_key = getQParamInt("opdr_key", -1);
var mld_opdr_id = getQParam("opdr_id", "");
var prs_perslid_key = getQParamInt("perslid_key", -1);
sql = " SELECT mld_kenmerkopdr_key FROM mld_kenmerkopdr WHERE mld_opdr_key = " + mld_opdr_key + " AND mld_kenmerk_key = 281";
oRs = Oracle.Execute(sql);
if ((user.has("WEB_USER06") ||
(user.has("WEB_USER08") && prs_perslid_key == user_key)) &&
oRs.eof)
{
message = "SVD Opdracht is goedgekeurd.";
// Set kenmerk dat de opdracht is goedgekeurd
sql = "BEGIN FLX.setflex ('OPD', 281, " + mld_opdr_key + ", '1'); END;";
Oracle.Execute(sql);
sql = "BEGIN fac.trackaction('ORDUPD', " + mld_opdr_key + ", " + user_key + ", NULL, 'Opdracht ' || " + safe.quoted_sql(mld_opdr_id) + " || ' is gewijzigd\nGoedgekeurd door aanvrager: (leeg) --> 1'); END;";
Oracle.Execute(sql);
// En set de status op verwerkt
sql = "BEGIN mld.setopdrachtstatus("+ mld_opdr_key +", 7, " + user_key + "); END;";
Oracle.Execute(sql);
}
else
{
message = "U heeft onvoldoende rechten.";
}
result = { success : true, message : message };
Response.Write(JSON.stringify(result));
%>

4
CUST/PCHA/xsl/PCHA.xsl
View File

@@ -807,7 +807,7 @@
<xsl:element name="td">
<xsl:attribute name="title">Goedkeuren van de melding</xsl:attribute>
<xsl:attribute name="style">{border:none; text-align:right; }</xsl:attribute>
<xsl:attribute name="onclick">$.post('../../cust/pcha/mld_statusupdate_svd.asp?opdr_key=<xsl:value-of select="MLD_OPDR_KEY"/>&amp;opdr_id=<xsl:value-of select="ID"/>', {}, FcltCallbackRefresh, "json");</xsl:attribute>
<xsl:attribute name="onclick">$.post('../../cust/pcha/mld_statusupdate_svd.asp?opdr_key=<xsl:value-of select="MLD_OPDR_KEY"/>&amp;perslid_key=<xsl:value-of select="PRS_PERSLID_KEY"/>&amp;opdr_id=<xsl:value-of select="ID"/>', {}, FcltCallbackRefresh, "json");</xsl:attribute>
<span style="cursor:pointer; text-decoration: underline;">Goedkeuren</span>
</xsl:element>
</tr>
@@ -819,4 +819,4 @@
</xsl:stylesheet>
<!-- Stylesheet edited using Stylus Studio - (c) 2004-2009. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2009. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2009. Progress Software Corporation. All rights reserved. -->
<!-- Stylesheet edited using Stylus Studio - (c) 2004-2009. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2009. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2009. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2009. Progress Software Corporation. All rights reserved. -->

444
CUST/PCHH/xsl/PCHH.xsl
View File

@@ -9,17 +9,17 @@
border: 1px solid #808080;
}
</style>
<xsl:if test="@view='PCHH_V_BULKUPLOAD_ELEKTRA'">
<style>
.num0dec {mso-number-format:0;} .num2dec {mso-number-format:Fixed;} .tekst {mso-number-format:"\@";} .date {mso-number-format:"Short Date";}
</style>
<table border="0" bordercolor="#ffffff" width="100%">
<xsl:for-each select="//facilitor/rapport/rapport_data/data_row">
<xsl:if test="position() = 1">
<tr>
<th>start_date</th>
@@ -96,7 +96,7 @@
<td class="tekst"><xsl:value-of select="ZZALTINV_POSTC"/></td>
<td class="tekst"><xsl:value-of select="ZZALTINV_CITY"/></td>
<td class="tekst"><xsl:value-of select="ZZALTINV_COUNTRY"/></td>
<td class="tekst"><xsl:value-of select="ZZDL_CONNECTION"/></td>
<td class="tekst"><xsl:value-of select="ZZDL_CONNECTION"/></td>
<td class="tekst"><xsl:value-of select="ZZTXT_CONNECTION"/></td>
<td class="tekst"><xsl:value-of select="ZZALTMDBADDR"/></td>
<td class="tekst"><xsl:value-of select="ZZALTMDB_EMAIL"/></td>
@@ -112,13 +112,13 @@
<td class="tekst"><xsl:value-of select="ZZALTVKO_HSNUM1"/></td>
<td class="tekst"><xsl:value-of select="ZZALTVKO_HSNUM2"/></td>
<td class="tekst"><xsl:value-of select="ZZALTVKO_POSTC"/></td>
<td class="tekst"><xsl:value-of select="ZZALTVKO_CITY"/></td>
<td class="tekst"><xsl:value-of select="ZZALTVKO_CITY"/></td>
<td class="tekst"><xsl:value-of select="ZZALTVKO_COUNTRY"/></td>
<td class="tekst"><xsl:value-of select="ZZALTVKOFREQ"/></td>
<td class="tekst"><xsl:value-of select="ZZTELWERK1_E"/></td>
<td class="tekst"><xsl:value-of select="ZZTELWERK2_E"/></td>
<td class="tekst"><xsl:value-of select="ZZTELWERK3_E"/></td>
<td class="tekst"><xsl:value-of select="ZZTELWERK4_E"/></td>
<td class="tekst"><xsl:value-of select="ZZTELWERK4_E"/></td>
<td class="tekst"><xsl:value-of select="ZZTERUGLEV"/></td>
<td class="tekst"><xsl:value-of select="ZZDUURZAAM"/></td>
</tr>
@@ -131,11 +131,11 @@
<style>
.num0dec {mso-number-format:0;} .num2dec {mso-number-format:Fixed;} .tekst {mso-number-format:"\@";} .date {mso-number-format:"Short Date";}
</style>
<table border="0" bordercolor="#ffffff" width="100%">
<xsl:for-each select="//facilitor/rapport/rapport_data/data_row">
<xsl:if test="position() = 1">
<tr>
<th>START_DATE</th>
@@ -208,7 +208,7 @@
<td class="tekst"><xsl:value-of select="ZZ_TUIN"/></td>
<td class="tekst"><xsl:value-of select="ZZ_TUIN_FROM"/></td>
<td class="tekst"><xsl:value-of select="ZZ_TUIN_TO"/></td>
<td class="tekst"><xsl:value-of select="ZZ_TUIN_PERC"/></td>
<td class="tekst"><xsl:value-of select="ZZ_TUIN_PERC"/></td>
<td class="tekst"><xsl:value-of select="ZZ_TUIN_WH"/></td>
<td class="tekst"><xsl:value-of select="ZZ_TUIN_BTW"/></td>
<td class="tekst"><xsl:value-of select="ZZALTMDBADDR"/></td>
@@ -224,7 +224,7 @@
<td class="tekst"><xsl:value-of select="ZZALTVKO_STREET"/></td>
<td class="tekst"><xsl:value-of select="ZZALTVKO_HSNUM1"/></td>
<td class="tekst"><xsl:value-of select="ZZALTVKO_HSNUM2"/></td>
<td class="tekst"><xsl:value-of select="ZZALTVKO_POSTC"/></td>
<td class="tekst"><xsl:value-of select="ZZALTVKO_POSTC"/></td>
<td class="tekst"><xsl:value-of select="ZZALTVKO_CITY"/></td>
<td class="tekst"><xsl:value-of select="ZZALTVKO_COUNTRY"/></td>
<td class="tekst"><xsl:value-of select="ZZALTVKOFREQ"/></td>
@@ -239,11 +239,11 @@
<style>
.num0dec {mso-number-format:0;} .num2dec {mso-number-format:Fixed;} .tekst {mso-number-format:"\@";} .date {mso-number-format:"Short Date";}
</style>
<table border="0" bordercolor="#ffffff" width="100%">
<xsl:for-each select="//facilitor/rapport/rapport_data/data_row">
<xsl:if test="position() = 1">
<tr>
<th>END_DATE</th>
@@ -273,7 +273,413 @@
</table>
</xsl:if>
</xsl:template>
</xsl:template>
<xsl:template match="contract" mode="include">
<table border="0" cellpadding="1">
<xsl:if test="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;" class="label">
<b><xsl:value-of select="//lcl/FAC/bericht"/>:</b>
</td>
<td colspan="3" style="padding-top:10px;" class="value">
<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>
<tr>
<td colspan="4" class="caption"><strong><xsl:value-of select="//header/custId"/>-<xsl:value-of select="//lcl/CNT/contract"/>&#xA0;<xsl:value-of select="nummer_intern"/><xsl:if test="versie!=''">.<xsl:value-of select="versie"/></xsl:if></strong>
&#xA0;<xsl:value-of select="eigenaar_afd/omschrijving"/>/<xsl:value-of select="bedrijf/naam"/></td>
</tr>
<xsl:call-template name="cnt_begintext"/>
<tr>
<td class="subcaption" colspan="2" width="50%"><xsl:value-of select="//lcl/CNT/algemene_gegevens"/></td>
<td class="subcaption" colspan="2" width="50%"><xsl:value-of select="//lcl/CNT/data"/></td>
</tr>
<tr>
<td colspan="2">
<table border="0" id="administratief" width="100%">
<tr>
<td class="label" width="30%"><xsl:value-of select="//lcl/CNT/contractsoort"/>:</td>
<td class="value">
<xsl:value-of select="discipline/omschrijving"/>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/CNT/beschrijving"/>:</td>
<td class="value">
<xsl:value-of select="omschrijving"/>
</td>
</tr>
<xsl:if test="nummer!=''">
<tr>
<td class="label"><xsl:value-of select="//lcl/CNT/extern_nr"/>:</td>
<td class="value">
<xsl:value-of select="nummer"/>
</td>
</tr>
</xsl:if>
<xsl:if test="contract">
<tr>
<td class="label"><xsl:value-of select="//lcl/CNT/mantel"/>:</td>
<td class="value">
<xsl:value-of select="contract/nummer_intern"/>
</td>
</tr>
</xsl:if>
<xsl:if test="document!=''">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/omschrijving"/>:</td>
<td class="value">
<xsl:value-of select="document"/>
</td>
</tr>
</xsl:if>
</table>
</td>
<td colspan="2">
<table border="0" width="100%" id="datums">
<tr>
<td class="label" width="30%"><xsl:value-of select="//lcl/CNT/ingangsdatum"/>:</td>
<td class="value">
<xsl:value-of select="looptijd_van/datum"/>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/CNT/rappeldatum"/>:</td>
<td class="value">
<xsl:value-of select="rappeldatum/datum"/>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/CNT/opzegdatum"/>:</td>
<td class="value">
<xsl:value-of select="opzegdatum/datum"/>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/CNT/einddatum"/>:</td>
<td class="value">
<xsl:value-of select="looptijd_tot/datum"/>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td height="10px"/>
</tr>
<tr>
<td class="subcaption" colspan="2"><xsl:value-of select="//lcl/CNT/eigenaar"/></td>
<td class="subcaption" colspan="2"><xsl:value-of select="//lcl/CNT/contractpartij"/></td>
</tr>
<tr>
<td colspan="2">
<table border="0" id="eigenaar" width="100%">
<tr>
<td class="label" width="30%"><xsl:value-of select="//lcl/CNT/eigenaar"/>:</td>
<td class="value">
<xsl:value-of select="eigenaar_afd/omschrijving"/>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/CNT/beheerder"/>:</td>
<td class="value">
<xsl:value-of select="beheerder/naam_full"/>
</td>
</tr>
<xsl:if test="kostenplaats">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/kostenplaats"/>:</td>
<td class="value">
<xsl:value-of select="kostenplaats/nr"/>&#xA0;
<xsl:value-of select="kostenplaats/omschrijving"/>
</td>
</tr>
</xsl:if>
</table>
</td>
<td colspan="2">
<table border="0" id="contractant" width="100%">
<tr>
<td class="label" width="30%"><xsl:value-of select="//lcl/CNT/uitvoerder"/>:</td>
<td class="value">
<xsl:value-of select="bedrijf/naam"/>
<xsl:if test="bedrijf/bezoek_plaats!=''">&#xA0;
-&#xA0;<xsl:value-of select="bedrijf/bezoek_plaats"/></xsl:if>
<xsl:if test="bedrijf/leverancier_nr!=''">&#xA0;
(<xsl:value-of select="bedrijf/leverancier_nr"/>)</xsl:if>
</td>
</tr>
<tr>
<td/>
<td class="value">
<xsl:value-of select="bedrijf/post_adres"/>
</td>
</tr>
<tr>
<td/>
<td class="value">
<xsl:value-of select="bedrijf/post_postcode"/>&#xA0;
<xsl:value-of select="bedrijf/post_plaats"/>
</td>
</tr>
<xsl:if test="contactpersoon">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/contactpersoon"/>:</td>
<td class="value">
<xsl:value-of select="contactpersoon/naam_full"/>
</td>
</tr>
</xsl:if>
<xsl:if test="contactpersoon/telefoon1!=''">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/telefoon"/>:</td>
<td class="value">
<xsl:value-of select="contactpersoon/telefoon1"/>
</td>
</tr>
</xsl:if>
</table>
</td>
</tr>
<tr>
<td height="10px"/>
</tr>
<tr>
<td class="subcaption" colspan="2"><xsl:value-of select="//lcl/FAC/opmerkingen"/></td>
<td class="subcaption" colspan="2"><xsl:value-of select="//lcl/CNT/financieel"/></td>
</tr>
<tr>
<td colspan="2">
<xsl:value-of select="opmerking"/>
</td>
<td colspan="2">
<table border="0" id="financieel" width="100%">
<xsl:if test="termijnkosten!=''">
<tr>
<td class="label" width="30%"><xsl:value-of select="//lcl/CNT/termijnbedrag"/>:</td>
<td class="value">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="termijnkosten"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
<tr>
<td class="label"><xsl:value-of select="//lcl/CNT/contractbedrag"/>:</td>
<td class="value">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="kosten"/>
</xsl:call-template>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td height="10px"/>
</tr>
<tr>
<td class="subcaption" colspan="4"><xsl:value-of select="//lcl/FAC/details"/></td>
</tr>
<tr>
<td colspan="4">
<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>
<tr>
<td height="10px"/>
</tr>
<tr>
<td class="subcaption" colspan="4"><xsl:value-of select="//lcl/CNT/scope"/></td>
</tr>
<tr>
<td colspan="4">
<xsl:if test="contract_plaats/plaats">
<table cellspacing="1" width="100%">
<tr>
<td>
<strong><xsl:value-of select="//lcl/CNT/scope"/></strong>
</td>
<td></td>
<td>
<strong><xsl:value-of select="//lcl/FAC/locatie"/></strong>
</td>
<td>
<strong><xsl:value-of select="//lcl/FAC/adres"/></strong>
</td>
<td>
<strong><xsl:value-of select="//lcl/FAC/plaats"/></strong>
</td>
<td style="text-align:right">
<strong><xsl:value-of select="//lcl/CNT/bedrag"/></strong>
</td>
</tr>
<xsl:for-each select="contract_plaats/plaats">
<xsl:sort select="regio/district/locatie/omschrijving"/>
<tr>
<xsl:if test="@type='L'">
<td><xsl:value-of select="//lcl/FAC/locatie"/></td>
<td><xsl:value-of select="plaatsaanduiding"/></td>
<td><xsl:value-of select="regio/district/locatie/omschrijving"/></td>
</xsl:if>
<xsl:if test="@type='G'">
<td><xsl:value-of select="//lcl/FAC/gebouw"/></td>
<td><xsl:value-of select="plaatsaanduiding"/></td>
<td><xsl:value-of select="regio/district/locatie/gebouw/omschrijving"/></td>
</xsl:if>
<xsl:if test="@type='T'">
<td><xsl:value-of select="//lcl/FAC/terrein"/></td>
<td><xsl:value-of select="plaatsaanduiding"/></td>
<td><xsl:value-of select="regio/district/locatie/omschrijving"/></td>
</xsl:if>
<xsl:if test="@type='V'">
<td><xsl:value-of select="//lcl/FAC/bouwlaag"/></td>
<td><xsl:value-of select="plaatsaanduiding"/></td>
<td><xsl:value-of select="regio/district/locatie/gebouw/omschrijving"/></td>
</xsl:if>
<xsl:if test="@type='R'">
<td><xsl:value-of select="//lcl/FAC/ruimte"/></td>
<td><xsl:value-of select="plaatsaanduiding"/>&#160;<xsl:value-of select="regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/></td>
<td><xsl:value-of select="regio/district/locatie/gebouw/omschrijving"/>
</td>
</xsl:if>
<td>
<xsl:value-of select="regio/district/locatie/adres"/>
</td>
<td>
<xsl:value-of select="regio/district/locatie/plaats"/>
</td>
<td style="text-align:right">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="../kosten"/>
</xsl:call-template>
</td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
<xsl:if test="contract_object/srtdeel">
<table cellspacing="1">
<tr>
<td>
<strong><xsl:value-of select="//lcl/CNT/betreft"/>:</strong>
</td>
</tr>
<xsl:for-each select="contract_object/srtdeel">
<xsl:sort select="omschrijving"/>
<tr>
<td>
<xsl:value-of select="omschrijving"/>
</td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
<xsl:if test="contract_object/deel">
<table cellspacing="1">
<tr>
<td>
<strong><xsl:value-of select="//lcl/CNT/objecten"/>:</strong>
</td>
</tr>
<xsl:for-each select="contract_object/deel">
<xsl:sort select="omschrijving"/>
<tr>
<td>
<xsl:value-of select="omschrijving"/>
</td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
<!-- moet nog voor terreinen -->
<xsl:if test="contract_onrgoed">
<table cellspacing="1">
<tr>
<td>
<strong><xsl:value-of select="//lcl/CNT/gehuurd"/>:</strong>
</td>
</tr>
<xsl:for-each select="contract_onrgoed">
<xsl:sort select="ruimte/srtruimte/omschrijving"/>
<tr>
<td>
<xsl:value-of select="ruimte/srtruimte/omschrijving"/>
</td>
<td>
<xsl:value-of select="ruimte/nr"/>
</td>
<td>
<xsl:value-of select="ruimte/omschrijving"/>
</td>
<td>
<xsl:value-of select="ruimte/prijs"/>
</td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
</td>
</tr>
<xsl:call-template name="cnt_endtext"/>
</table>
</xsl:template>
<xsl:template match="contract" mode="full">
<xsl:choose>
<xsl:when test="$mode='summary'"></xsl:when>
<xsl:otherwise>
<html>
<xsl:comment>================================ CONTRACT ==============================</xsl:comment>
<xsl:comment>FACILITOR default XSL template for contract</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>

37
CUST/VLKC/import/readsoft.xsl
View File

@@ -20,15 +20,15 @@
</xsl:variable>
<xsl:variable name="ordernr">
<xsl:choose>
<xsl:when test="substring(Invoice/Fields/Field[@Name='OrderNummer'],1,1)!='C'"><xsl:value-of select="translate(Invoice/Fields/Field[@Name='OrderNummer'], '.', '/')"/></xsl:when>
<xsl:otherwise><xsl:value-of select="Invoice/Fields/Field[@Name='OrderNummer']"/></xsl:otherwise>
<xsl:when test="substring(Invoice/Fields/Field[@Name='OrderNummer'],1,1)='C'"><xsl:value-of select="Invoice/Fields/Field[@Name='OrderNummer']"/></xsl:when>
<xsl:otherwise><xsl:value-of select="translate(Invoice/Fields/Field[@Name='OrderNummer'],'.','/')"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="kostprijs">
<xsl:choose>
<xsl:when test="Invoice/Fields/Field[@Name='NettoBedrag']!=''">
<!--xsl:choose>
<xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'"><xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='NettoBedrag']), '0.00')"/></xsl:when>
<xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'"><xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='NettoBedrag']),'0.00')"/></xsl:when>
<xsl:otherwise><xsl:value-of select="Invoice/Fields/Field[@Name='NettoBedrag']"/></xsl:otherwise>
</xsl:choose-->
<xsl:value-of select="Invoice/Fields/Field[@Name='NettoBedrag']"/>
@@ -37,13 +37,13 @@
</xsl:choose>
</xsl:variable>
<xsl:variable name="btwpct">
<xsl:value-of select="substring-before(concat(Invoice/Fields/Field[@Name='BTW%'], '%'), '%')"/>
<xsl:value-of select="substring-before(concat(Invoice/Fields/Field[@Name='BTW%'],'%'),'%')"/>
</xsl:variable>
<xsl:variable name="btwbedrag">
<xsl:choose>
<xsl:when test="Invoice/Fields/Field[@Name='BTWBedrag']!=''">
<!--xsl:choose>
<xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'"><xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='BTWBedrag']), '0.00')"/></xsl:when>
<xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'"><xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='BTWBedrag']),'0.00')"/></xsl:when>
<xsl:otherwise><xsl:value-of select="Invoice/Fields/Field[@Name='BTWBedrag']"/></xsl:otherwise>
</xsl:choose-->
<xsl:value-of select="Invoice/Fields/Field[@Name='BTWBedrag']"/>
@@ -60,12 +60,11 @@
<xsl:variable name="ref">ReadSoft ScanID: <xsl:value-of select="Invoice/Supplier/Identifier"/></xsl:variable>
<xsl:variable name="verdeelperiode">
<!--xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],1,4)"/>-<xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],5,2)"/-->
<xsl:if test="Invoice/Fields/Field[@Name='Periode']!=''">
<xsl:choose>
<xsl:when test="substring(Invoice/Fields/Field[@Name='OrderNummer'],1,1)!='C'"><xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],1,4)"/>-<xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],5,2)"/></xsl:when>
<xsl:otherwise></xsl:otherwise>
</xsl:choose>
</xsl:if>
<!--Ignore verdeelperiode op facturen tegen Bestelopdrachten of Opdrachten (niet beginnend met een 'C')!-->
<xsl:choose>
<xsl:when test="substring(Invoice/Fields/Field[@Name='OrderNummer'],1,1)='C'"><xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],1,4)"/>-<xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],5,2)"/></xsl:when>
<xsl:otherwise></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:choose>
@@ -74,17 +73,25 @@
<xsl:for-each select="Invoice/Tables/Table[@Type='LineItem']/TableRow">
<xsl:variable name="li_ordernr">
<xsl:choose>
<xsl:when test="substring(Field[@Name='LI_OrderNummer'], 1, 1)!='C'"><xsl:value-of select="translate(Field[@Name='LI_OrderNummer'], '.', '/')"/></xsl:when>
<xsl:otherwise><xsl:value-of select="Field[@Name='LI_OrderNummer']"/></xsl:otherwise>
<xsl:when test="substring(Field[@Name='LI_OrderNummer'],1,1)='C'"><xsl:value-of select="Field[@Name='LI_OrderNummer']"/></xsl:when>
<xsl:otherwise><xsl:value-of select="translate(Field[@Name='LI_OrderNummer'],'.','/')"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="li_kostprijs">
<xsl:value-of select="Field[@Name='LI_Bedrag']"/>
</xsl:variable>
<xsl:variable name="li_btwpct">
<xsl:value-of select="substring-before(concat(Field[@Name='LI_BTWCode'], '%'), '%')"/>
<xsl:value-of select="substring-before(concat(Field[@Name='LI_BTWCode'],'%'),'%')"/>
</xsl:variable>
<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$li_ordernr"/>;;;<xsl:value-of select="Field[@Name='LI_ArtikelOmschrijving']"/><xsl:if test="Field[@Name='LI_Aantal']!='' and Field[@Name='LI_EenheidsPrijs']!='' and Field[@Name='LI_EenheidsPrijs']!=Field[@Name='LI_Bedrag']"> (<xsl:value-of select="Field[@Name='LI_Aantal']"/> * <xsl:value-of select="Field[@Name='LI_EenheidsPrijs']"/>)</xsl:if>;;<xsl:value-of select="$li_kostprijs"/>;;<xsl:value-of select="$li_btwpct"/>;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$verdeelperiode"/><xsl:value-of select="$new_line"/>
<xsl:variable name="li_verdeelperiode">
<!--xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],1,4)"/>-<xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],5,2)"/-->
<!--Ignore verdeelperiode op regels tegen Bestelopdrachten of Opdrachten (niet beginnend met een 'C')!-->
<xsl:choose>
<xsl:when test="substring(Field[@Name='LI_OrderNummer'],1,1)='C'"><xsl:value-of select="substring(//Invoice/Fields/Field[@Name='Periode'],1,4)"/>-<xsl:value-of select="substring(//Invoice/Fields/Field[@Name='Periode'],5,2)"/></xsl:when>
<xsl:otherwise></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$li_ordernr"/>;;;<xsl:value-of select="Field[@Name='LI_ArtikelOmschrijving']"/><xsl:if test="Field[@Name='LI_Aantal']!='' and Field[@Name='LI_EenheidsPrijs']!='' and Field[@Name='LI_EenheidsPrijs']!=Field[@Name='LI_Bedrag']"> (<xsl:value-of select="Field[@Name='LI_Aantal']"/> * <xsl:value-of select="Field[@Name='LI_EenheidsPrijs']"/>)</xsl:if>;;<xsl:value-of select="$li_kostprijs"/>;;<xsl:value-of select="$li_btwpct"/>;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$li_verdeelperiode"/><xsl:value-of select="$new_line"/>
</xsl:for-each>
</xsl:when>
<!--Enkelv. factuur-->

2
CUST/YKPN/xsl/ykpn.xsl
View File

@@ -1676,7 +1676,7 @@ th {
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
<td class="DRR" style="text-align:left">
<xsl:value-of select="ALG_LOCATIE_OMSCHRIJVING"/>
<xsl:value-of select="ALG_GEBOUW_NAAM"/>
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
<td class="DRR" style="text-align:left">Reden voor afwijzing:<br/>