svn path=/Website/branches/v5.4.4/; revision=24005
This commit is contained in:
Ruud Lipper
2015-01-29 14:31:52 +00:00
parent 7097c80407
commit 489ba4ca1c

View File

@@ -30,6 +30,12 @@
<xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></b>
</td>
</tr>
<tr>
<td colspan="4" style="font-size:12px;">
<b>Opdrachtnummer&#160;<xsl:value-of select="melding/stdmelding/discipline/srtdiscipline/prefix"/>
<xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/> verplicht vermelden op factuur</b>
</td>
</tr>
<tr>
<td colspan="4" height="50px" valign="center"></td>
</tr>
@@ -109,8 +115,8 @@
</td>
</tr>
<tr>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/adres"/>:</b></td>
<td width="34%"><xsl:value-of select="factuuradres/post_adres"/></td>
<td width="16%"></td>
<td width="34%"></td>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/status"/>:</b>
</td>
@@ -119,8 +125,8 @@
</td>
</tr>
<tr>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/plaats"/>:</b></td>
<td width="34%"><xsl:value-of select="factuuradres/post_postcode"/>&#160;<xsl:value-of select="factuuradres/post_plaats"/></td>
<td width="16%"></td>
<td width="34%"></td>
<td colspan="2"/>
</tr>
<tr>
@@ -225,15 +231,41 @@
<xsl:value-of select="kenmerk[@volgnummer = 89]"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
</xsl:variable>
<xsl:variable name="Kosten_verzend">
<xsl:choose>
<xsl:when test="string(number(kenmerk[@volgnummer = 93]))='NaN'">0</xsl:when>
<xsl:otherwise>
<xsl:value-of select="kenmerk[@volgnummer = 93]"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="Kosten_korting">
<xsl:choose>
<xsl:when test="string(number(kenmerk[@volgnummer = 94]))='NaN'">0</xsl:when>
<xsl:otherwise>
<xsl:value-of select="kenmerk[@volgnummer = 94]"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="Kosten_overig">
<xsl:choose>
<xsl:when test="string(number(kenmerk[@volgnummer = 95]))='NaN'">0</xsl:when>
<xsl:otherwise>
<xsl:value-of select="kenmerk[@volgnummer = 95]"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="tot_kosten" select="$Kosten_1 + $Kosten_2 + $Kosten_3 + $Kosten_4 + $Kosten_5 + $Kosten_6 + $Kosten_7 + $Kosten_8 + $Kosten_9 + $Kosten_10"/>
<xsl:variable name="tot_kosten" select="$Kosten_1 + $Kosten_2 + $Kosten_3 + $Kosten_4 + $Kosten_5 + $Kosten_6 + $Kosten_7 + $Kosten_8 + $Kosten_9 + $Kosten_10 + $Kosten_verzend + $Kosten_overig - $Kosten_korting"/>
<tr>
<td align="left"><b><u>Aantal</u></b></td>
<td align="right"><b><u>Artikel</u></b></td>
<td align="right"><b><u>Artikelnummer</u></b></td>
<td style="text-align:right"><b><u>Kosten totaal</u></b>
<xsl:if test="kosten != $tot_kosten">
<span style="font-size:8px; color:red"> (<xsl:value-of select="format-number($tot_kosten, '0,00', 'european')"/>) </span>
@@ -246,6 +278,7 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 22]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 20]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 23]"/></td>
<td style="text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(kenmerk[@volgnummer = 24], '0,00', 'european')"/></td>
<td></td>
</tr>
@@ -255,6 +288,7 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 32]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 30]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 33]"/></td>
<td style="text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(kenmerk[@volgnummer = 34], '0,00', 'european')"/></td>
<td></td>
</tr>
@@ -264,6 +298,7 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 42]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 40]"/></td>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 43]"/></td>
<td style="text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(kenmerk[@volgnummer = 44], '0,00', 'european')"/></td>
<td></td>
</tr>
@@ -273,6 +308,7 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 52]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 50]"/></td>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 53]"/></td>
<td style="text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(kenmerk[@volgnummer = 54], '0,00', 'european')"/></td>
<td></td>
</tr>
@@ -282,6 +318,7 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 62]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 60]"/></td>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 63]"/></td>
<td style="text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(kenmerk[@volgnummer = 64], '0,00', 'european')"/></td>
<td></td>
</tr>
@@ -291,6 +328,7 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 67]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 66]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 68]"/></td>
<td style="text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(kenmerk[@volgnummer = 69], '0,00', 'european')"/></td>
<td></td>
</tr>
@@ -300,6 +338,7 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 72]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 71]"/></td>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 73]"/></td>
<td style="text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(kenmerk[@volgnummer = 74], '0,00', 'european')"/></td>
<td></td>
</tr>
@@ -309,6 +348,7 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 77]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 76]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 78]"/></td>
<td style="text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(kenmerk[@volgnummer = 79], '0,00', 'european')"/></td>
<td></td>
</tr>
@@ -318,6 +358,7 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 82]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 81]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 83]"/></td>
<td style="text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(kenmerk[@volgnummer = 84], '0,00', 'european')"/></td>
<td></td>
</tr>
@@ -327,10 +368,39 @@
<tr>
<td align="left"><xsl:value-of select="kenmerk[@volgnummer = 87]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 86]"/></td>
<td align="right"><xsl:value-of select="kenmerk[@volgnummer = 88]"/></td>
<td style="text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(kenmerk[@volgnummer = 89], '0,00', 'european')"/></td>
<td></td>
</tr>
</xsl:if>
</xsl:if>
<xsl:if test="kenmerk[@volgnummer= 93] != '' or kenmerk[@volgnummer= 94] != '' or kenmerk[@volgnummer= 95] != ''">
<tr>
<td colspan="4" height="10px"/>
</tr>
</xsl:if>
<xsl:if test="kenmerk[@volgnummer= 93] != ''">
<tr>
<td colspan="3" align="right"><xsl:value-of select="kenmerk[@volgnummer = 93]/@naam"/></td>
<td style="text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(kenmerk[@volgnummer = 93], '0,00', 'european')"/></td>
<td></td>
</tr>
</xsl:if>
<xsl:if test="kenmerk[@volgnummer= 95] != ''">
<tr>
<td colspan="3" align="right"><xsl:value-of select="kenmerk[@volgnummer = 95]/@naam"/></td>
<td style="text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(kenmerk[@volgnummer = 95], '0,00', 'european')"/></td>
<td></td>
</tr>
</xsl:if>
<xsl:if test="kenmerk[@volgnummer= 94] != ''">
<tr>
<td colspan="3" align="right">Korting</td>
<td style="text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(kenmerk[@volgnummer = 94], '0,00', 'european')"/></td>
<td></td>
</tr>
</xsl:if>
<tr>
<td colspan="4" height="20px" valign="center">