From 35f945b8cfd22cb29c4500a6e24b343d775967dd Mon Sep 17 00:00:00 2001
From: Maarten van der Heide <maarten.vanderheide@aareon.nl>
Date: Wed, 15 Aug 2018 07:16:48 +0000
Subject: [PATCH] BLCC#53262 Facturatie additionele diensten (periode op
 factuur)

svn path=/Website/branches/v2018.1/; revision=38818
---
 CUST/BLCC/xsl/BLCC.xsl | 95 +++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 61 deletions(-)

diff --git a/CUST/BLCC/xsl/BLCC.xsl b/CUST/BLCC/xsl/BLCC.xsl
index aa08ccd70c..ff94f7328f 100644
--- a/CUST/BLCC/xsl/BLCC.xsl
+++ b/CUST/BLCC/xsl/BLCC.xsl
@@ -238,49 +238,32 @@
     </xsl:if>
   </xsl:template>
 
-    <xsl:template name="prijsEx">
-		<xsl:param name="prijsInc" select="0"/>
-		<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:choose>
-	</xsl:template>
-
-
-
-	<xsl:template name="sumProducts">
-		<xsl:param name="pList"/>
-		<xsl:param name="pResult" select="0"/>
-		<xsl:choose>
-			<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: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:when>
-					<xsl:otherwise>
-						<xsl:value-of select="$pResult"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:template>
-
-
-
+  <xsl:template name="prijsEx">
+    <xsl:param name="prijsInc" select="0"/>
+    <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:choose>
+  </xsl:template>
 
+  <xsl:template name="sumProducts">
+    <xsl:param name="pList"/>
+    <xsl:param name="pResult" select="0"/>
+    <xsl:choose>
+      <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: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:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$pResult"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
 
   <xsl:template name="res_begintext">
     <!-- District 21 = Heerlen -->
@@ -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>
@@ -872,13 +849,12 @@
         <td class="resresult" style="text-align:center">
           <xsl:if test="res_artikel/btw='6'">Laag (6%)
             <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="sum(prijs)*1.06 - prijs"/></xsl:call-template>
-            </xsl:if>
+          </xsl:if>
           <xsl:if test="res_artikel/btw='21'">Hoog (21%)
             <xsl:call-template name="europrijs"><xsl:with-param name="prijs" select="sum(prijs)*1.21 - prijs"/></xsl:call-template>
-            </xsl:if>
+          </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>
@@ -1844,11 +1819,11 @@ In het geval van een opdracht buiten contractuele afspraken (workorder) met hoge
     }
 
     @media all {
-	  .page-break { display:none; }
+      .page-break { display:none; }
     }
 
     @media print {
-	  .page-break { display:block;page-break-before:always; }
+      .page-break { display:block;page-break-before:always; }
     }</style>
     <xsl:choose>
       <xsl:when test="substring(verkoopfactuurregel/id, 5, 1)='1'">
@@ -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>
@@ -2224,11 +2198,11 @@ In het geval van een opdracht buiten contractuele afspraken (workorder) met hoge
     }
 
     @media all {
-	  .page-break { display:none; }
+      .page-break { display:none; }
     }
 
     @media print {
-	  .page-break { display:block;page-break-before:always; }
+      .page-break { display:block;page-break-before:always; }
     }</style>
     <xsl:if test="@view='BLCC_V_FACT_ACTUAL' or @view='BLCC_V_FACT_FROZEN'">
       <html>
@@ -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>