VLKC#40324 Import enkelvoudige factuur met totaalbedrag als kostprijs tegen 0%

svn path=/Website/branches/v2017.1/; revision=34162
This commit is contained in:
Maarten van der Heide
2017-06-07 14:48:10 +00:00
parent 0da72d5c23
commit d069e2584e

View File

@@ -81,14 +81,16 @@
<!--Enkelv. factuur-->
<xsl:otherwise>
<xsl:choose>
<!--Incl. vrachtkosten, dan Bedrag en BTWCode (en geen BTWBedrag)!-->
<!--Incl. vrachtkosten, dan - per VLKC#40821 - Kostprijs = NettoBedrag + BTWBedrag + Vrachtkosten en BTWCode = 0% (en geen BTWBedrag)!-->
<xsl:when test="$vrachtkosten!=''">
<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$ordernr"/>;;;<xsl:value-of select="$ref"/>;;<xsl:value-of select="$kostprijs"/>;;<xsl:value-of select="$btwpct"/>;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$new_line"/>
<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$ordernr"/>;;;Additionele kosten (vracht);;<xsl:value-of select="$vrachtkosten"/>;;<xsl:value-of select="$btwpct"/>;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$new_line"/>
<!--xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$ordernr"/>;;;<xsl:value-of select="$ref"/>;;<xsl:value-of select="$kostprijs"/>;;<xsl:value-of select="$btwpct"/>;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$new_line"/>
<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$ordernr"/>;;;Additionele kosten (vracht);;<xsl:value-of select="$vrachtkosten"/>;;<xsl:value-of select="$btwpct"/>;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$new_line"/-->
<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$ordernr"/>;;;<xsl:value-of select="$ref"/>;;<xsl:value-of select="$kostprijs+$btwbedrag+$vrachtkosten"/>;;0;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$new_line"/>
</xsl:when>
<!--Excl. vrachtkosten, dan Bedrag en BTWBedrag (en geen BTWCode)!-->
<!--Excl. vrachtkosten, dan - per VLKC#40821 - Kostprijs = NettoBedrag + BTWBedrag en BTWCode = 0% (en geen BTWBedrag)!-->
<xsl:otherwise>
<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$ordernr"/>;;;<xsl:value-of select="$ref"/>;;<xsl:value-of select="$kostprijs"/>;<xsl:value-of select="$btwbedrag"/>;;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$new_line"/>
<!--xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$ordernr"/>;;;<xsl:value-of select="$ref"/>;;<xsl:value-of select="$kostprijs"/>;<xsl:value-of select="$btwbedrag"/>;;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$new_line"/-->
<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$ordernr"/>;;;<xsl:value-of select="$ref"/>;;<xsl:value-of select="$kostprijs+$btwbedrag"/>;;0;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$new_line"/>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>