MARX#53540: Ontblobben facturatie in Mareon verwerken

svn path=/Website/branches/v2018.2/; revision=40216
This commit is contained in:
Marcel Bourseau
2018-12-13 13:08:34 +00:00
parent 112a487427
commit e5cf82633b

View File

@@ -11,7 +11,7 @@
</xsl:variable>
<xsl:key name="GROUP_BY_fin_factuur_key" match="//data_row" use="FIN_FACTUUR_KEY"/>
<xsl:template match="rapport">
<!-- ******************************************************************* -->
<!-- *****Request: MAREONINFO -->
@@ -987,18 +987,26 @@
<xsl:element name="row">
<xsl:attribute name="nr"><xsl:value-of select="position()"/></xsl:attribute>
<col nr="1" id="ART">
<xsl:call-template name="OPDRACHTNR">
<xsl:with-param name="p_mld_opdr_id" select="MLD_OPDR_ID"/>
<xsl:with-param name="p_fin_factuur_ext_opdnr" select="FIN_FACTUUR_EXT_OPDNR"/>
</xsl:call-template>
<xsl:call-template name="OPDRACHTNR">
<xsl:with-param name="p_mld_opdr_id" select="MLD_OPDR_ID"/>
<xsl:with-param name="p_fin_factuur_ext_opdnr" select="FIN_FACTUUR_EXT_OPDNR"/>
</xsl:call-template>
</col>
<col nr="2" id="DESCR"><xsl:value-of select="FIN_FACTUURREGEL_OMSCHRIJVING"/></col>
<col nr="3" id="AMNT"><xsl:value-of select="format-number(FIN_FACTUURREGEL_TOTAAL, '0,00', 'format_xtractor')"/></col>
<col nr="4" id="BTW">
<xsl:call-template name="BTWCODE">
<xsl:with-param name="p_fin_btwtabelwaarde_btwcode" select="FIN_BTWTABELWAARDE_BTWCODE"/>
</xsl:call-template>
</col>
<xsl:call-template name="BTWCODE">
<xsl:with-param name="p_fin_btwtabelwaarde_btwcode" select="FIN_BTWTABELWAARDE_BTWCODE"/>
</xsl:call-template>
</col>
<col nr="5" id="BTWAMNT"><xsl:value-of select="format-number(FIN_FACTUURREGEL_BTW, '0,00', 'format_xtractor')"/></col>
<col nr="6" id="PRICEUNIT"></col>
<col nr="7" id="LINENUM"><xsl:value-of select="FIN_FACTUURREGEL_ID"/></col>
<col nr="8" id="ARTNR"><xsl:value-of select="FIN_FACTUURREGEL_CODE"/></col>
<col nr="9" id="ARTNRAMNT"><xsl:value-of select="FIN_FACTUURREGEL_AANTAL"/></col>
<col nr="10" id="ARTNRUNIT"><xsl:value-of select="FIN_FACTUURREGEL_EENHEID"/></col>
<col nr="11" id="ARTNRLOC"><xsl:value-of select="FIN_FACTUURREGEL_REFERENTIE"/></col>
<col nr="12" id="ARTNRCOST"><xsl:value-of select="PRS_KOSTENSOORT_REFCODE"/></col>
</xsl:element>
</xsl:for-each>
</xsl:template>
@@ -1007,10 +1015,10 @@
<xsl:param name="p_fin_factuur_key"/>
<xsl:for-each select="//data_row[FIN_FACTUUR_KEY = $p_fin_factuur_key]">
<xsl:sort select="FIN_FACTUURREGEL_NR"/>
<xsl:if test="position() != 1">;</xsl:if><xsl:call-template name="OPDRACHTNR">
<xsl:with-param name="p_mld_opdr_id" select="MLD_OPDR_ID"/>
<xsl:with-param name="p_fin_factuur_ext_opdnr" select="FIN_FACTUUR_EXT_OPDNR"/>
</xsl:call-template>
<xsl:if test="position() != 1">;</xsl:if><xsl:call-template name="OPDRACHTNR">
<xsl:with-param name="p_mld_opdr_id" select="MLD_OPDR_ID"/>
<xsl:with-param name="p_fin_factuur_ext_opdnr" select="FIN_FACTUUR_EXT_OPDNR"/>
</xsl:call-template>
</xsl:for-each>
</xsl:template>