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

BLCC#37691 CFF en opmaak factuur+BLCC#36985 FIN-freeze/Terug naar 1e werkdag

Browse Source 
svn path=/Website/branches/v2017.2/; revision=35593
This commit is contained in:
Maarten van der Heide
2017-10-06 11:21:53 +00:00
parent cfe12a4aa4
commit 0f9458e168
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
CUST/BLCC/xsl/BLCC.xsl
View File

@@ -582,6 +582,7 @@
<xsl:variable name="sortfilter">
<xsl:for-each select="verkoopfactuurregel">
<xsl:sort select="substring-after(omschrijving, '/=')"/>
<xsl:sort select="btwpercentage"/>
<xsl:copy-of select="."/>
</xsl:for-each>
</xsl:variable>
@@ -658,14 +659,23 @@
<xsl:variable name="this_reg">
<xsl:value-of select="substring-after(omschrijving, '/=')"/>
</xsl:variable>
<xsl:variable name="prev_btw">
<xsl:choose>
<xsl:when test="position()=1">Quqelequ</xsl:when>
<xsl:otherwise><xsl:value-of select="preceding-sibling::verkoopfactuurregel[1]/btwpercentage"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="this_btw">
<xsl:value-of select="btwpercentage"/>
</xsl:variable>
<!-- Als 'this' != 'prev', dan nieuwe factuurregel! -->
<xsl:if test="$this_reg!=$prev_reg">
<xsl:if test="$this_reg!=$prev_reg or $this_btw!=$prev_btw">
<tr>
<td style="border-bottom:1px solid black;"><xsl:value-of select="substring-before(omschrijving, '/=')"/></td>
<td colspan="3" style="border-bottom:1px solid black;"><xsl:value-of select="substring($this_reg, 4)"/></td>
<td style="border-bottom:1px solid black;"><xsl:value-of select="btwpercentage"/> %</td>
<td style="text-align:right;border-bottom:1px solid black;"><xsl:value-of select="format-number(sum(msxml:node-set($sortfilter)/verkoopfactuurregel[substring-after(omschrijving, '/=')=$this_reg]/bedrag), '###.###.##0,00', 'european')"/></td>
<td style="text-align:right;border-bottom:1px solid black;"><xsl:value-of select="format-number(sum(msxml:node-set($sortfilter)/verkoopfactuurregel[substring-after(omschrijving, '/=')=$this_reg and btwpercentage=$this_btw]/bedrag), '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:if>
</xsl:for-each>
@@ -787,6 +797,7 @@
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="SORTERING"/>
<xsl:sort select="REGEL"/>
<xsl:sort select="FIN_BTWTABELWAARDE_PERC"/>
<xsl:if test="FIN_VERKOOPFACTUUR_ID=$max_factuur and PO_NR=$min_po and PRS_BEDRIJF_KEY=$min_bedrijf">
<xsl:copy-of select="."/>
</xsl:if>
@@ -850,14 +861,23 @@
<xsl:variable name="this_reg">
<xsl:value-of select="REGEL"/>
</xsl:variable>
<xsl:variable name="prev_btw">
<xsl:choose>
<xsl:when test="position()=1">Quqelequ</xsl:when>
<xsl:otherwise><xsl:value-of select="preceding-sibling::data_row[1]/FIN_BTWTABELWAARDE_PERC"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="this_btw">
<xsl:value-of select="FIN_BTWTABELWAARDE_PERC"/>
</xsl:variable>
<!-- Als 'this' != 'prev', dan nieuwe factuurregel! -->
<xsl:if test="$this_reg!=$prev_reg">
<xsl:if test="$this_reg!=$prev_reg or $this_btw!=$prev_btw">
<tr>
<td style="border-bottom:1px solid black;"><xsl:value-of select="CNT_CONTRACT_NUMMER"/></td>
<td colspan="3" style="border-bottom:1px solid black;"><xsl:value-of select="REGEL"/></td>
<td style="border-bottom:1px solid black;"><xsl:value-of select="FIN_BTWTABELWAARDE_PERC"/> %</td>
<td style="text-align:right;border-bottom:1px solid black;"><xsl:value-of select="format-number(sum(msxml:node-set($sortfilter)/data_row[REGEL=$this_reg]/MNDNET), '###.###.##0,00', 'european')"/></td>
<td style="text-align:right;border-bottom:1px solid black;"><xsl:value-of select="format-number(sum(msxml:node-set($sortfilter)/data_row[REGEL=$this_reg and FIN_BTWTABELWAARDE_PERC=$this_btw]/MNDNET), '###.###.##0,00', 'european')"/></td>
</tr>
</xsl:if>
</xsl:for-each>