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

SROZ#56684 Reserveringsbon/Maatschappelijk huurbedrag incorrect igv. status Verwerkt

Browse Source 
svn path=/Website/branches/v2018.2/; revision=41143
This commit is contained in:
Maarten van der Heide
2019-02-25 13:24:52 +00:00
parent fcab452627
commit 484a9e67a9
1 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
CUST/SROZ/xsl/SROZ.xsl
View File

@@ -374,14 +374,10 @@
<td width="8%" style="font-size:8pt;text-align:center;"><xsl:value-of select="tot/tijd"/></td>
<td width="26%" style="font-size:8pt;"><xsl:value-of select="res_ruimte/nr"/> / <xsl:value-of select="$r_duur"/> uur</td>
<td width="12%" style="font-size:8pt;text-align:right;">
<!--xsl:choose>
<xsl:when test="$tarief='Commercieel'">&#8364; <xsl:value-of select="format-number (res_ruimte/prijs, '0,00', 'european')"/></xsl:when>
<xsl:otherwise>&#8364; <xsl:value-of select="format-number (res_ruimte/prijs * 0.5, '0,00', 'european')"/></xsl:otherwise>
</xsl:choose-->
<xsl:choose>
<xsl:when test="ruimteprijs!=''">
<xsl:choose>
<xsl:when test="$tarief='Commercieel'">&#8364; <xsl:value-of select="format-number (ruimteprijs div $r_duur, '0,00', 'european')"/></xsl:when>
<xsl:when test="$tarief='Commercieel' or status_bokey=6">&#8364; <xsl:value-of select="format-number (ruimteprijs div $r_duur, '0,00', 'european')"/></xsl:when>
<xsl:otherwise>&#8364; <xsl:value-of select="format-number (0.5 * (ruimteprijs div $r_duur), '0,00', 'european')"/></xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -395,14 +391,10 @@
</td>
<td width="8%" style="font-size:8pt;text-align:center;">21%</td>
<td width="12%" style="font-size:8pt;text-align:right;">
<!--xsl:choose>
<xsl:when test="$tarief='Commercieel'">&#8364; <xsl:value-of select="format-number ((tot/timestamp - van/timestamp) div 3600 * res_ruimte/prijs, '0,00', 'european')"/></xsl:when>
<xsl:otherwise>&#8364; <xsl:value-of select="format-number ((tot/timestamp - van/timestamp) div 3600 * res_ruimte/prijs * 0.5, '0,00', 'european')"/></xsl:otherwise>
</xsl:choose-->
<xsl:choose>
<xsl:when test="ruimteprijs!=''">
<xsl:choose>
<xsl:when test="$tarief='Commercieel'">&#8364; <xsl:value-of select="format-number (ruimteprijs, '0,00', 'european')"/></xsl:when>
<xsl:when test="$tarief='Commercieel' or status_bokey=6">&#8364; <xsl:value-of select="format-number (ruimteprijs, '0,00', 'european')"/></xsl:when>
<xsl:otherwise>&#8364; <xsl:value-of select="format-number (0.5 * ruimteprijs, '0,00', 'european')"/></xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -440,14 +432,10 @@
<td width="8%" style="font-size:8pt;text-align:center;"><br/><xsl:value-of select="tot/tijd"/></td>
<td width="26%" style="font-size:8pt;"><br/><xsl:value-of select="res_ruimte/nr"/> / <xsl:value-of select="number ((tot/timestamp - van/timestamp) div 3600)"/> uur</td>
<td width="12%" style="font-size:8pt;text-align:right;">
<!--xsl:choose>
<xsl:when test="$tarief='Commercieel'"><br/>&#8364; <xsl:value-of select="format-number (res_ruimte/prijs, '0,00', 'european')"/></xsl:when>
<xsl:otherwise><br/>&#8364; <xsl:value-of select="format-number (res_ruimte/prijs * 0.5, '0,00', 'european')"/></xsl:otherwise>
</xsl:choose-->
<xsl:choose>
<xsl:when test="ruimteprijs!=''">
<xsl:choose>
<xsl:when test="$tarief='Commercieel'"><br/>&#8364; <xsl:value-of select="format-number (ruimteprijs div $r_duur, '0,00', 'european')"/></xsl:when>
<xsl:when test="$tarief='Commercieel' or status_bokey=6"><br/>&#8364; <xsl:value-of select="format-number (ruimteprijs div $r_duur, '0,00', 'european')"/></xsl:when>
<xsl:otherwise><br/>&#8364; <xsl:value-of select="format-number (0.5 * (ruimteprijs div $r_duur), '0,00', 'european')"/></xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -461,14 +449,10 @@
</td>
<td width="8%" style="font-size:8pt;text-align:center;"><br/>21%</td>
<td width="12%" style="font-size:8pt;text-align:right;">
<!--xsl:choose>
<xsl:when test="$tarief='Commercieel'"><br/>&#8364; <xsl:value-of select="format-number ((tot/timestamp - van/timestamp) div 3600 * res_ruimte/prijs, '0,00', 'european')"/></xsl:when>
<xsl:otherwise><br/>&#8364; <xsl:value-of select="format-number ((tot/timestamp - van/timestamp) div 3600 * res_ruimte/prijs * 0.5, '0,00', 'european')"/></xsl:otherwise>
</xsl:choose-->
<xsl:choose>
<xsl:when test="ruimteprijs!=''">
<xsl:choose>
<xsl:when test="$tarief='Commercieel'"><br/>&#8364; <xsl:value-of select="format-number (ruimteprijs, '0,00', 'european')"/></xsl:when>
<xsl:when test="$tarief='Commercieel' or status_bokey=6"><br/>&#8364; <xsl:value-of select="format-number (ruimteprijs, '0,00', 'european')"/></xsl:when>
<xsl:otherwise><br/>&#8364; <xsl:value-of select="format-number (0.5 * ruimteprijs, '0,00', 'european')"/></xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -570,7 +554,7 @@
<item>
<exclbtw>
<xsl:choose>
<xsl:when test="$tarief='Commercieel'">
<xsl:when test="$tarief='Commercieel' or status_bokey=6">
<xsl:choose>
<xsl:when test="prijs!=''"><xsl:value-of select="prijs"/></xsl:when>
<xsl:otherwise>0</xsl:otherwise>
@@ -587,7 +571,7 @@
<btw>21</btw>
<btwbedrag>
<xsl:choose>
<xsl:when test="$tarief='Commercieel'">
<xsl:when test="$tarief='Commercieel' or status_bokey=6">
<xsl:choose>
<xsl:when test="prijs!=''"><xsl:value-of select="round (100 * prijs * 0.21) div 100"/></xsl:when>
<xsl:otherwise>0</xsl:otherwise>
@@ -669,7 +653,7 @@
<item>
<exclbtw>
<xsl:choose>
<xsl:when test="kenmerk[@naam='Verhuur tarief']='Commercieel'">
<xsl:when test="kenmerk[@naam='Verhuur tarief']='Commercieel' or status_bokey=6">
<xsl:choose>
<xsl:when test="prijs!=''"><xsl:value-of select="prijs"/></xsl:when>
<xsl:otherwise>0</xsl:otherwise>
@@ -686,7 +670,7 @@
<btw>21</btw>
<btwbedrag>
<xsl:choose>
<xsl:when test="kenmerk[@naam='Verhuur tarief']='Commercieel'">
<xsl:when test="kenmerk[@naam='Verhuur tarief']='Commercieel' or status_bokey=6">
<xsl:choose>
<xsl:when test="prijs!=''"><xsl:value-of select="round (100 * prijs * 0.21) div 100"/></xsl:when>
<xsl:otherwise>0</xsl:otherwise>