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

BLCC#53262 Facturatie additionele diensten (periode op factuur)

Browse Source 
svn path=/Website/branches/v2018.1/; revision=38818
This commit is contained in:
Maarten van der Heide
2018-08-15 07:16:48 +00:00
parent ed9a8ef2cf
commit 35f945b8cf
1 changed files with 34 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
CUST/BLCC/xsl/BLCC.xsl
View File

@@ -243,17 +243,11 @@
<xsl:param name="btw" select="0"/>
<xsl:choose>
<xsl:when test="$prijsInc='NaN'">0</xsl:when>
<xsl:when test="$btw!='NaN' and //res_artikel/btw!='' ">
<xsl:value-of select="$prijsInc * ((100 + $btw) div 100 )"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$prijsInc"/>
</xsl:otherwise>
<xsl:when test="$btw!='NaN' and //res_artikel/btw!=''"><xsl:value-of select="$prijsInc * ((100 + $btw) div 100 )"/></xsl:when>
<xsl:otherwise><xsl:value-of select="$prijsInc"/></xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="sumProducts">
<xsl:param name="pList"/>
<xsl:param name="pResult" select="0"/>
@@ -261,16 +255,9 @@
<xsl:when test="$pList">
<xsl:variable name="vHead" select="$pList[1]"/>
<xsl:variable name="vPrice">
<xsl:call-template name="prijsEx">
<xsl:with-param name="prijsInc" select="$vHead/prijs"/>
<xsl:with-param name="btw" select="$vHead/res_artikel/btw"/>
</xsl:call-template>
<xsl:call-template name="prijsEx"><xsl:with-param name="prijsInc" select="$vHead/prijs"/><xsl:with-param name="btw" select="$vHead/res_artikel/btw"/></xsl:call-template>
</xsl:variable>
<xsl:call-template name="sumProducts">
<xsl:with-param name="pList" select="$pList[position() > 1]"/>
<xsl:with-param name="pResult"
select="$pResult + $vPrice"/>
</xsl:call-template>
<xsl:call-template name="sumProducts"><xsl:with-param name="pList" select="$pList[position()>1]"/><xsl:with-param name="pResult" select="$pResult + $vPrice"/></xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$pResult"/>
@@ -278,10 +265,6 @@
</xsl:choose>
</xsl:template>
<xsl:template name="res_begintext">
<!-- District 21 = Heerlen -->
<xsl:if test="//district/key=21">
@@ -820,13 +803,8 @@
<xsl:value-of select="res_ruimte/opstelling"/>
</td>
<td width="14%" style="text-align:center">Hoog (21%) <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="sum(prijs)*1.21 - prijs"/></xsl:call-template></td>
<td width="15%" class="resresult" style="text-align:right">
<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs"/></xsl:call-template>
</td>
</tr>
</xsl:if>
@@ -848,7 +826,6 @@
</td>
<td></td>
<td width="14%" style="text-align:center">Hoog (21%) <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="sum(prijs)*1.21 - prijs"/></xsl:call-template></td>
<td class="resresult" style="text-align:right">
<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs"/></xsl:call-template>
</td>
@@ -878,7 +855,6 @@
</xsl:if>
</td>
<td class="resresult" style="text-align:right">
<xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="prijs"/></xsl:call-template>
</td>
</tr>
@@ -966,6 +942,7 @@
<td colspan="3" class="result"><xsl:value-of select="deel/omschrijving"/></td>
</tr>
</xsl:for-each>
<!-- kenmerk-lijst gesorteerd op volgnummer (en gevuld) --><!--@type!='L' and // weggehaald-->
<xsl:for-each select="kenmerk[ @type!='l' and @type!='Q' and count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
@@ -1476,7 +1453,6 @@ Indien u aanvullende vragen heeft of een toelichting wenst, kunt u contact op te
<u>Opdracht: <xsl:value-of select="melding/stdmelding/discipline/srtdiscipline/prefix"/><xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></u>
</xsl:otherwise>
</xsl:choose>
</td>
</tr>
<tr>
@@ -1583,7 +1559,6 @@ Hierbij de WO nav jullie offerte voor onderstaande werkzaamheden.
</td>
</tr>
</xsl:if>
<tr>
<td><xsl:value-of select="//lcl/FAC/aanvrager"/>:</td>
<td colspan="3"><xsl:value-of select="melding/voor/naam_friendly"/></td>
@@ -2085,8 +2060,7 @@ In het geval van een opdracht buiten contractuele afspraken (workorder) met hoge
</td>
</tr>
<tr><td colspan="6"><br/><b>INVOICE</b></td></tr>
<!--tr><td colspan="6"><br/>Period from - to: <xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/datum2/datum"/> - <xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/datum3/datum"/></td></tr-->
<tr><td colspan="6"><br/>Period from - to: 01-05-2018 - <xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/datum3/datum"/></td></tr>
<tr><td colspan="6"><br/>Period from - to: <xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/datum2/datum"/> - <xsl:value-of select="msxml:node-set($sortfilter1)/verkoopfactuurregel/datum3/datum"/></td></tr>
<tr>
<td colspan="4" style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>Description</b></td>
<td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>VAT</b></td>
@@ -2545,8 +2519,7 @@ In het geval van een opdracht buiten contractuele afspraken (workorder) met hoge
</td>
</tr>
<tr><td colspan="6"><br/><b>INVOICE</b></td></tr>
<!--tr><td colspan="6"><br/>Period from - to: <xsl:value-of select="msxml:node-set($sortfilter1)/data_row/MNDBEGIN"/> - <xsl:value-of select="msxml:node-set($sortfilter1)/data_row/MNDEINDE"/></td></tr-->
<tr><td colspan="6"><br/>Period from - to: 01-05-2018 - <xsl:value-of select="msxml:node-set($sortfilter1)/data_row/MNDEINDE"/></td></tr>
<tr><td colspan="6"><br/>Period from - to: <xsl:value-of select="msxml:node-set($sortfilter1)/data_row/MNDBEGIN"/> - <xsl:value-of select="msxml:node-set($sortfilter1)/data_row/MNDEINDE"/></td></tr>
<tr>
<td colspan="4" style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>Description</b></td>
<td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>VAT</b></td>