TWYN#53633 betalingsadvies (vervolg)

svn path=/Website/trunk/; revision=38258
This commit is contained in:
Erik Groener
2018-06-19 14:13:55 +00:00
parent f22cde3cd6
commit 6572019b89

View File

@@ -2592,7 +2592,8 @@
<xsl:for-each select="//data_row[FACTUURSTATUS = 6]">
<xsl:sort select="FACTUURDATUM"/>
<xsl:sort select="CONTRACTANT"/>
<xsl:sort select="FACTUURNR"/>
<xsl:sort select="FACTUURNUMMER"/>
<xsl:sort select="FACTUURVOLGNR" data-type="number"/>
<xsl:variable name="v_bedrag_exc" select="BEDRAGEXCL"/>
<xsl:variable name="v_bedrag_btw" select="BEDRAGBTW"/>
<xsl:variable name="v_bedrag_inc" select="$v_bedrag_exc + $v_bedrag_btw"/>
@@ -2634,18 +2635,30 @@
<xsl:template name="GET_PERIODE">
<xsl:param name="p_periode_veld"/>
<xsl:variable name="v_default_van">
<xsl:value-of select="//data_row/STARTDATUM_P"/>
</xsl:variable>
<xsl:variable name="v_periode_all">
<xsl:if test="substring-after(//rapport/where, $p_periode_veld) != ''">
<xsl:value-of select="substring-after(//rapport/where, $p_periode_veld)"/>
</xsl:if>
</xsl:variable>
<xsl:variable name="v_periode_van">
<xsl:if test="contains($v_periode_all, 'BETWEEN') or contains($v_periode_all, '>=')">
<xsl:variable name="v_periode_start">
<xsl:if test="contains($v_periode_all, 'BETWEEN') or contains($v_periode_all, '&gt;=')">
<xsl:value-of select='substring-before(substring-after($v_periode_all, "to_date(&apos;") ," ")'/>
</xsl:if>
</xsl:variable>
<xsl:variable name="v_periode_van">
<xsl:if test="$v_periode_start != ''">
<xsl:value-of select="$v_periode_start"/>
</xsl:if>
<xsl:if test="$v_periode_start = '' and $v_default_van != ''">
<xsl:value-of select="$v_default_van"/>
</xsl:if>
</xsl:variable>
<xsl:variable name="v_periode_tot">
<xsl:if test="contains($v_periode_all, 'BETWEEN')">
<xsl:value-of select='substring-before(substring-after(substring-after($v_periode_all, "to_date"), "to_date(&apos;") ," ")'/>