SGGR#34664 prive lease bon

svn path=/Website/branches/v2015.2/; revision=27394
This commit is contained in:
Ruud Lipper
2015-12-10 13:15:01 +00:00
parent 69904a6f44
commit 081c221f02

View File

@@ -676,7 +676,7 @@
</tr>
</table>
</xsl:when>
<xsl:when test="discipline/srtdiscipline/prefix='HR' and stdmelding/key !=281">
<xsl:when test="discipline/srtdiscipline/prefix='HR'">
<xsl:choose>
<xsl:when test="discipline/key=561"> <!-- vakgroep verlof -->
<table border="0" width="100%" cellpadding="2">
@@ -843,7 +843,7 @@
</tr>
</table>
</xsl:when>
<xsl:when test="stdmelding/key=261"> <!-- stdmelding declaratie -->
<xsl:when test="discipline/key=601"> <!-- vakgroep declaratie -->
<style>
td.bedrag {
text-align: right;
@@ -896,7 +896,7 @@
<table border="0" width="100%" cellpadding="2">
<tr>
<td colspan="5" class="caption" style="padding-top:20px;padding-bottom:20px">
<b>Declaratieaanvraag&#xA0;<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/></b>
<b><xsl:value-of select="stdmelding/omschrijving"/>&#xA0;<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/></b>
</td>
</tr>
<tr>
@@ -925,6 +925,7 @@
<xsl:value-of select="gemeld/datum"/>
</td>
</tr>
<xsl:if test="stdmelding/key='261'">
<tr>
<td align="left">
<b>Betaald per bank d.d.:</b>
@@ -933,6 +934,7 @@
<xsl:value-of select="kenmerk[@volgnummer='920']"/>
</td>
</tr>
</xsl:if>
<tr height="20px">
<td/>
</tr>
@@ -944,14 +946,16 @@
<b>Datum</b>
</th>
<th align="left">
<b>Van-naar/Omschrijving</b>
<b><xsl:value-of select="kenmerk[@volgnummer='10']/@naam"/></b>
</th>
<xsl:if test="stdmelding/key='261'">
<th align="right">
<b>Km's</b>
</th>
<th align="right">
<b>à</b>
</th>
</xsl:if>
<th align="right">
<b>Totaal incl. BTW</b>
</th>
@@ -962,8 +966,10 @@
<tr>
<td align="left" width="12%"><xsl:value-of select="kenmerk[@volgnummer='5']"/></td>
<td align="left" width="32%"><xsl:value-of select="kenmerk[@volgnummer='10']"/></td>
<xsl:if test="stdmelding/key='261'">
<td align="left" width="8%" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='15'], '0,0', 'euro')"/></td>
<td align="left" width="8%" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='20'], '0,00', 'euro')"/></td>
</xsl:if>
<td align="left" class="bedrag">&#8364; <xsl:value-of select="format-number(kenmerk[@volgnummer='25'], '0,00', 'euro')"/></td>
<td align="left" width="25%"></td>
</tr>
@@ -971,8 +977,10 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer='30']"/></td>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer='35']"/></td>
<xsl:if test="stdmelding/key='261'">
<td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='40'], '0,0', 'euro')"/></td>
<td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='45'], '0,00', 'euro')"/></td>
</xsl:if>
<td align="left" class="bedrag">&#8364; <xsl:value-of select="format-number(kenmerk[@volgnummer='50'], '0,00', 'euro')"/></td>
<td align="left"></td>
</tr>
@@ -981,8 +989,10 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer='55']"/></td>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer='60']"/></td>
<xsl:if test="stdmelding/key='261'">
<td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='65'], '0,0', 'euro')"/></td>
<td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='70'], '0,00', 'euro')"/></td>
</xsl:if>
<td align="left" class="bedrag">&#8364; <xsl:value-of select="format-number(kenmerk[@volgnummer='75'], '0,00', 'euro')"/></td>
<td align="left"></td>
</tr>
@@ -991,8 +1001,10 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer='80']"/></td>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer='85']"/></td>
<xsl:if test="stdmelding/key='261'">
<td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='90'], '0,0', 'euro')"/></td>
<td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='95'], '0,00', 'euro')"/></td>
</xsl:if>
<td align="left" class="bedrag">&#8364; <xsl:value-of select="format-number(kenmerk[@volgnummer='100'], '0,00', 'euro')"/></td>
<td align="left"></td>
</tr>
@@ -1001,15 +1013,23 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer='105']"/></td>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer='110']"/></td>
<xsl:if test="stdmelding/key='261'">
<td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='115'], '0,0', 'euro')"/></td>
<td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='120'], '0,00', 'euro')"/></td>
</xsl:if>
<td align="left" class="bedrag">&#8364; <xsl:value-of select="format-number(kenmerk[@volgnummer='125'], '0,00', 'euro')"/></td>
<td align="left"></td>
</tr>
</xsl:if>
<tr>
<td colspan= "4" align="left"><b>Totaal:</b></td>
<xsl:choose>
<xsl:when test="stdmelding/key='261'">
<td colspan= "4" align="left"><b>Totaal:</b></td>
</xsl:when>
<xsl:otherwise>
<td colspan= "2" align="left"><b>Totaal:</b></td>
</xsl:otherwise>
</xsl:choose>
<td align="left" class="bedrag"><b>&#8364; <xsl:value-of select="format-number($tot_kosten, '0,00', 'euro')"/></b></td>
<td align="left"></td>
</tr>