BLCC#55535 ADDD-factuurbon/Extra regel

svn path=/Website/branches/v2018.2/; revision=40361
This commit is contained in:
Maarten van der Heide
2018-12-27 19:52:19 +00:00
parent 8261e8ca68
commit df753ace5a

View File

@@ -639,11 +639,11 @@
<td colspan="6" class="value">
<xsl:for-each select="rsv_artikel">
<xsl:sort select="levering/tijd"/>
<xsl:value-of select="aantal"/> x <xsl:value-of select="res_artikel/omschrijving"/> à <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="res_artikel/prijs"/></xsl:call-template><br/>
<xsl:value-of select="aantal"/> x <xsl:value-of select="res_artikel/omschrijving"/>&#xA0;à&#xA0;<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="res_artikel/prijs"/></xsl:call-template><br/>
</xsl:for-each>
<xsl:for-each select="rsv_deel">
<xsl:sort select="van/tijd"/>
<xsl:value-of select="res_deel/omschrijving"/> à <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs"/></xsl:call-template><br/>
<xsl:value-of select="res_deel/omschrijving"/>&#xA0;à&#xA0;<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs"/></xsl:call-template><br/>
</xsl:for-each>
</td>
</tr>
@@ -2133,6 +2133,15 @@ Beste campusbewoner,
<xsl:variable name="mndnet">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/verkoopfactuurregel/bedrag)"/>
</xsl:variable>
<xsl:variable name="mndnetl">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/verkoopfactuurregel[btwpercentage='6']/bedrag)"/>
</xsl:variable>
<xsl:variable name="mndneth1">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/verkoopfactuurregel[btwpercentage='21']/bedrag)"/>
</xsl:variable>
<xsl:variable name="mndneth2">
<xsl:value-of select="0.065 * $mndnet"/>
</xsl:variable>
<xsl:variable name="mndbtwl">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/verkoopfactuurregel[btwpercentage='6']/btwbedrag)"/>
</xsl:variable>
@@ -2153,10 +2162,20 @@ Beste campusbewoner,
<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>
<!--tr>
<td colspan="3"/>
<td colspan="2"><b>Total excl. VAT</b></td>
<td style="text-align:right;">€ <xsl:value-of select="format-number(1.065 * $mndnet, '###.###.##0,00', 'european')"/></td>
</tr-->
<tr>
<td colspan="3"/>
<td colspan="2"><b>Total excl. VAT 6%</b></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"><b>Total excl. VAT 21%</b></td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndbtwh1 + $mndbtwh2, '###.###.##0,00', 'european')"/></td>
</tr>
<xsl:choose>
<xsl:when test="msxml:node-set($sortfilter1)/verkoopfactuurregel/btwverlegd='1'">
@@ -2634,6 +2653,15 @@ Beste campusbewoner,
<xsl:variable name="mndnet">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/data_row/MNDNET)"/>
</xsl:variable>
<xsl:variable name="mndnetl">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/data_row[FIN_BTWTABELWAARDE_PERC='6']/MNDNET)"/>
</xsl:variable>
<xsl:variable name="mndneth1">
<xsl:value-of select="sum(msxml:node-set($sortfilter1)/data_row[FIN_BTWTABELWAARDE_PERC='21']/MNDNET)"/>
</xsl:variable>
<xsl:variable name="mndneth2">
<xsl:value-of select="0.065 * $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>
@@ -2654,10 +2682,20 @@ Beste campusbewoner,
<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>
<!--tr>
<td colspan="3"/>
<td colspan="2"><b>Total excl. VAT</b></td>
<td style="text-align:right;">€ <xsl:value-of select="format-number(1.065 * $mndnet, '###.###.##0,00', 'european')"/></td>
</tr-->
<tr>
<td colspan="3"/>
<td colspan="2"><b>Total excl. VAT 6%</b></td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndnetl, '###.###.##0,00', 'european')"/></td>
</tr>
<tr>
<td colspan="3"/>
<td colspan="2"><b>Total excl. VAT 21%</b></td>
<td style="text-align:right;"><xsl:value-of select="format-number($mndneth1 + $mndneth2, '###.###.##0,00', 'european')"/></td>
</tr>
<xsl:choose>
<xsl:when test="msxml:node-set($sortfilter1)/data_row/FIN_BTWTABELWAARDE_VERLEGD='1'">