svn path=/Website/branches/v2017.2/; revision=37073

This commit is contained in:
Dennis Hartmann
2018-02-20 12:06:29 +00:00
parent b7b4f3251c
commit ac10cbe118

View File

@@ -243,7 +243,7 @@
<xsl:param name="btw" select="0"/>
<xsl:choose>
<xsl:when test="$prijsInc='NaN'">0</xsl:when>
<xsl:when test="$btw!='NaN'">
<xsl:when test="$btw!='NaN' and //res_artikel/btw!='' ">
<xsl:value-of select="$prijsInc * ((100 + $btw) div 100 )"/>
</xsl:when>
<xsl:otherwise>
@@ -252,6 +252,8 @@
</xsl:choose>
</xsl:template>
<xsl:template name="sumProducts">
<xsl:param name="pList"/>
<xsl:param name="pResult" select="0"/>
@@ -276,6 +278,10 @@
</xsl:choose>
</xsl:template>
<xsl:template name="res_begintext">
<!-- District 21 = Heerlen -->
<xsl:if test="//district/key=21">
@@ -787,13 +793,13 @@
<tr><td colspan="7"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></td></tr>
<tr><td colspan="7" style="border-top:1px solid #000;"/></tr>
<tr>
<th class="resth" width="20%" style="text-align:left"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th class="resth" width="12%" style="text-align:left"><xsl:value-of select="//lcl/RES/aantal"/></th>
<th class="resth" width="12%" style="text-align:right"><xsl:value-of select="//lcl/RES/begintijd"/></th>
<th class="resth" width="18%" style="text-align:left"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th class="resth" width="10%" style="text-align:left"><xsl:value-of select="//lcl/RES/aantal"/></th>
<th class="resth" width="11%" style="text-align:right"><xsl:value-of select="//lcl/RES/begintijd"/></th>
<th class="resth" width="12%" style="text-align:right"><xsl:value-of select="//lcl/RES/eindtijd"/></th>
<th class="resth" width="14%" style="text-align:center"><xsl:value-of select="//lcl/RES/opstelling"/></th>
<th class="resth" width="14%" style="text-align:center">Btw tarief</th>
<th class="resth" width="15%" style="text-align:right"><xsl:value-of select="//lcl/RES/prijs"/></th>
<th class="resth" width="12%" style="text-align:center"><xsl:value-of select="//lcl/RES/opstelling"/></th>
<th class="resth" width="10%" style="text-align:center">Btw tarief</th>
<th class="resth" width="12%" style="text-align:right"><xsl:value-of select="//lcl/RES/prijs"/></th>
</tr>
<xsl:if test="res_ruimte!=''">
<tr>
@@ -813,9 +819,14 @@
<td width="14%" class="resresult" style="text-align:center">
<xsl:value-of select="res_ruimte/opstelling"/>
</td>
<td width="14%" style="text-align:center">Hoog (21%)</td>
<td width="14%" style="text-align:center">Hoog (21%) <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="sum(prijs)*1.21 - prijs"/></xsl:call-template></td>
<td width="15%" class="resresult" style="text-align:right">
<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs"/></xsl:call-template>
</td>
</tr>
</xsl:if>
@@ -836,7 +847,7 @@
<xsl:value-of select="tot/tijd"/>
</td>
<td></td>
<td width="14%" style="text-align:center">Hoog (21%)</td>
<td width="14%" style="text-align:center">Hoog (21%) <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="sum(prijs)*1.21 - prijs"/></xsl:call-template></td>
<td class="resresult" style="text-align:right">
<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs"/></xsl:call-template>
@@ -860,8 +871,10 @@
<td></td>
<td class="resresult" style="text-align:center">
<xsl:if test="res_artikel/btw='6'">Laag (6%)
<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="sum(prijs)*1.06 - prijs"/></xsl:call-template>
</xsl:if>
<xsl:if test="res_artikel/btw='21'">Hoog (21%)
<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="sum(prijs)*1.21 - prijs"/></xsl:call-template>
</xsl:if>
</td>
<td class="resresult" style="text-align:right">
@@ -878,11 +891,15 @@
</xsl:variable>
<xsl:variable name="totaal_ex_btw" select="sum(//rsv_ruimte/prijs)*1.21 + sum(//rsv_deel/prijs)*1.21 + $catering_ex_btw"/>
<xsl:variable name="totaal_inc_btw">
<xsl:value-of select="sum(//rsv_ruimte/prijs) + sum(//rsv_deel/prijs) + sum(//rsv_artikel/prijs)"/>
</xsl:variable>
<xsl:variable name="totaal__btwlaag">
<xsl:if test="//res_artikel/btw='6'">
<xsl:value-of select="sum(//res_artikel/prijs) *1.06 - (//res_artikel/prijs)"/>
</xsl:if>
<xsl:value-of select="sum(//rsv_ruimte/prijs) + sum(//rsv_deel/prijs) + sum(//rsv_artikel/prijs)"/>
</xsl:variable>
</xsl:variable>
<!-- totaal per deelreservering -->
<!-- totaal per deelreservering -->
<tr><td colspan="7" style="border-top:1px solid #000;"/></tr>
@@ -911,6 +928,15 @@
</td>
</tr>
<tr>
<td class="tekst" colspan="4"></td>
<td class="tekst" colspan="3" style="text-align:right;">
test btw laag <xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="$totaal__btwlaag"/>
</xsl:call-template>
</td>
</tr>
<!-- afspraak-lijst gesorteerd op naam -->