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

BLCC#55622 ADDD-factuurbon/Extra regels en VAT ipv. BTW

Browse Source 
svn path=/Website/branches/v2018.2/; revision=40501
This commit is contained in:
Maarten van der Heide
2019-01-10 16:42:14 +00:00
parent 72f1c89826
commit 3df4e845eb
1 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
CUST/BLCC/xsl/BLCC.xsl
View File

@@ -2167,7 +2167,7 @@ Beste campusbewoner,
<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>
<!--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>
@@ -2176,24 +2176,38 @@ Beste campusbewoner,
<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>
</tr-->
<xsl:choose>
<xsl:when test="msxml:node-set($sortfilter1)/verkoopfactuurregel/btwverlegd='1'">
<tr>
<td colspan="3"/>
<td colspan="2">BTW verlegd</td>
<td colspan="2">VAT verlegd</td>
<td style="text-align:right;">€ <xsl:value-of select="format-number(0, '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:when>
<xsl:otherwise>
<tr>
<!--tr>
<td colspan="3"/>
<td colspan="2">BTW 6%</td>
<td colspan="2">VAT 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 colspan="2">VAT 21%</td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndbtwh1 + $mndbtwh2, '###.###.##0,00', 'european')"/></td>
</tr-->
<tr>
<td><b>Total excl. VAT 6%</b></td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndnetl, '###.###.##0,00', 'european')"/></td>
<td/>
<td colspan="2">VAT 6%</td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndbtwl, '###.###.##0,00', 'european')"/></td>
</tr>
<tr>
<td><b>Total excl. VAT 21%</b></td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndneth1 + $mndneth2, '###.###.##0,00', 'european')"/></td>
<td/>
<td colspan="2">VAT 21%</td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndbtwh1 + $mndbtwh2, '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:otherwise>
@@ -2691,7 +2705,7 @@ Beste campusbewoner,
<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>
<!--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>
@@ -2700,24 +2714,38 @@ Beste campusbewoner,
<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>
</tr-->
<xsl:choose>
<xsl:when test="msxml:node-set($sortfilter1)/data_row/FIN_BTWTABELWAARDE_VERLEGD='1'">
<tr>
<td colspan="3"/>
<td colspan="2">BTW verlegd</td>
<td colspan="2">VAT verlegd</td>
<td style="text-align:right;">€ <xsl:value-of select="format-number(0, '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:when>
<xsl:otherwise>
<tr>
<!--tr>
<td colspan="3"/>
<td colspan="2">BTW 6%</td>
<td colspan="2">VAT 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 colspan="2">VAT 21%</td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndbtwh1 + $mndbtwh2, '###.###.##0,00', 'european')"/></td>
</tr-->
<tr>
<td><b>Total excl. VAT 6%</b></td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndnetl, '###.###.##0,00', 'european')"/></td>
<td/>
<td colspan="2">VAT 6%</td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndbtwl, '###.###.##0,00', 'european')"/></td>
</tr>
<tr>
<td><b>Total excl. VAT 21%</b></td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndneth1 + $mndneth2, '###.###.##0,00', 'european')"/></td>
<td/>
<td colspan="2">VAT 21%</td>
<td style="text-align:right;">€ <xsl:value-of select="format-number($mndbtwh1 + $mndbtwh2, '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:otherwise>