TWYN#52670 Rapport meer en minderwerk per contractant

svn path=/Website/branches/v2017.3/; revision=37475
This commit is contained in:
Erik Groener
2018-03-23 12:22:56 +00:00
parent d56f6eab63
commit d782361628

View File

@@ -16,6 +16,7 @@
<xsl:key name="GROUPBY_SOORTCODE" match="//data_row" use="SCODE"/>
<xsl:key name="GROUPBY_PRS_LEVERANCIER_NR" match="//data_row" use="PRS_LEVERANCIER_NR"/>
<xsl:key name="GROUPBY_CONTRACT" match="//data_row" use="MLD_OPDR_ORDERNR"/>
<xsl:key name="GROUPBY_BEDRIJF_SOORTCODE" match="//data_row" use="concat(PRS_BEDRIJF_KEY, '|', SCODE)"/>
<xsl:key name="GROUPBY_CONTRACTNR" match="//data_row" use="concat(MLD_OPDR_ORDERNR, '|', MLD_OPDR_BEDRIJFOPDR_VOLGNR)"/>
<xsl:key name="GROUPBY_ACCOUNTCODE" match="//data_row" use="ACCOUNTCODE"/>
<xsl:key name="GROUPBY_MLD_OPDR_DATUMBEGIN" match="//data_row" use="MLD_OPDR_DATUMBEGIN"/>
@@ -714,7 +715,7 @@
<td class="tdtr"><xsl:value-of select="format-number(BTW, '#.##0,00', 'euro')"/></td>
<td class="tdtr" style="padding-right:5px;"><xsl:value-of select="format-number(FACTUREN, '#.##0,00', 'euro')"/></td>
</tr>
</xsl:for-each>
</xsl:for-each>
<tr class="footer">
<td colspan="3"><b><xsl:value-of select="GCODE"/></b></td>
@@ -1639,7 +1640,7 @@
<tr class="trline"><td colspan="9">&#xA0;</td></tr>
<!-- kostensoorten met meerminderwerk voor een contractant -->
<xsl:for-each select="//data_row[generate-id(.)=generate-id(key('GROUPBY_SOORTCODE',SCODE)[1]) and PRS_BEDRIJF_KEY = $v_bedrijf_key]">
<xsl:for-each select="//data_row[generate-id(.)=generate-id(key('GROUPBY_BEDRIJF_SOORTCODE', concat(PRS_BEDRIJF_KEY, '|', SCODE))[1]) and PRS_BEDRIJF_KEY = $v_bedrijf_key]">
<xsl:sort select="SCODE"/>
<xsl:sort select="MLD_OPDR_ORDERNR" data-type="number"/>
<xsl:variable name="v_soortcode" select="SCODE"/>
@@ -1652,7 +1653,7 @@
</tr>
<!-- alle opdrachten per kostensoort -->
<xsl:for-each select="//data_row[SCODE = $v_soortcode]">
<xsl:for-each select="//data_row[SCODE = $v_soortcode and PRS_BEDRIJF_KEY = $v_bedrijf_key]">
<xsl:sort select="MLD_OPDR_BEDRIJFOPDR_VOLGNR" data-type="number"/>
<tr class="trline">
<td></td>
@@ -1681,7 +1682,6 @@
</xsl:for-each>
<!-- totaal per contractant -->
<tr style="page-break-after: always"/>
<tr class="subt2 trblk">
<td class="tdtl tdb"><xsl:value-of select="PRS_LEVERANCIER_NR"/></td>
<td></td>