VLKC#52593 FACTUUR-import/Zetten verdeelperiode (bugfix)

svn path=/Website/branches/v2017.3/; revision=38418

CUST/VLKC/import/readsoft.xsl

@@ -20,15 +20,15 @@
   </xsl:variable>
   <xsl:variable name="ordernr">
     <xsl:choose>
-      <xsl:when test="substring(Invoice/Fields/Field[@Name='OrderNummer'],1,1)!='C'"><xsl:value-of select="translate(Invoice/Fields/Field[@Name='OrderNummer'], '.', '/')"/></xsl:when>
-      <xsl:otherwise><xsl:value-of select="Invoice/Fields/Field[@Name='OrderNummer']"/></xsl:otherwise>
+      <xsl:when test="substring(Invoice/Fields/Field[@Name='OrderNummer'],1,1)='C'"><xsl:value-of select="Invoice/Fields/Field[@Name='OrderNummer']"/></xsl:when>
+      <xsl:otherwise><xsl:value-of select="translate(Invoice/Fields/Field[@Name='OrderNummer'],'.','/')"/></xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
   <xsl:variable name="kostprijs">
     <xsl:choose>
       <xsl:when test="Invoice/Fields/Field[@Name='NettoBedrag']!=''">
         <!--xsl:choose>
-          <xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'"><xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='NettoBedrag']), '0.00')"/></xsl:when>
+          <xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'"><xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='NettoBedrag']),'0.00')"/></xsl:when>
           <xsl:otherwise><xsl:value-of select="Invoice/Fields/Field[@Name='NettoBedrag']"/></xsl:otherwise>
         </xsl:choose-->
         <xsl:value-of select="Invoice/Fields/Field[@Name='NettoBedrag']"/>
@@ -37,13 +37,13 @@
     </xsl:choose>
   </xsl:variable>
   <xsl:variable name="btwpct">
-    <xsl:value-of select="substring-before(concat(Invoice/Fields/Field[@Name='BTW%'], '%'), '%')"/>
+    <xsl:value-of select="substring-before(concat(Invoice/Fields/Field[@Name='BTW%'],'%'),'%')"/>
   </xsl:variable>
   <xsl:variable name="btwbedrag">
     <xsl:choose>
       <xsl:when test="Invoice/Fields/Field[@Name='BTWBedrag']!=''">
         <!--xsl:choose>
-          <xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'"><xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='BTWBedrag']), '0.00')"/></xsl:when>
+          <xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'"><xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='BTWBedrag']),'0.00')"/></xsl:when>
           <xsl:otherwise><xsl:value-of select="Invoice/Fields/Field[@Name='BTWBedrag']"/></xsl:otherwise>
         </xsl:choose-->
         <xsl:value-of select="Invoice/Fields/Field[@Name='BTWBedrag']"/>
@@ -60,12 +60,11 @@
   <xsl:variable name="ref">ReadSoft ScanID: <xsl:value-of select="Invoice/Supplier/Identifier"/></xsl:variable>
   <xsl:variable name="verdeelperiode">
     <!--xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],1,4)"/>-<xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],5,2)"/-->
-    <xsl:if test="Invoice/Fields/Field[@Name='Periode']!=''">
-      <xsl:choose>
-        <xsl:when test="substring(Invoice/Fields/Field[@Name='OrderNummer'],1,1)!='C'"><xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],1,4)"/>-<xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],5,2)"/></xsl:when>
-        <xsl:otherwise></xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
+    <!--Ignore verdeelperiode op facturen tegen Bestelopdrachten of Opdrachten (niet beginnend met een 'C')!-->
+    <xsl:choose>
+      <xsl:when test="substring(Invoice/Fields/Field[@Name='OrderNummer'],1,1)='C'"><xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],1,4)"/>-<xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],5,2)"/></xsl:when>
+      <xsl:otherwise></xsl:otherwise>
+    </xsl:choose>
   </xsl:variable>
 
   <xsl:choose>
@@ -74,17 +73,25 @@
 <xsl:for-each select="Invoice/Tables/Table[@Type='LineItem']/TableRow">
   <xsl:variable name="li_ordernr">
     <xsl:choose>
-      <xsl:when test="substring(Field[@Name='LI_OrderNummer'], 1, 1)!='C'"><xsl:value-of select="translate(Field[@Name='LI_OrderNummer'], '.', '/')"/></xsl:when>
-      <xsl:otherwise><xsl:value-of select="Field[@Name='LI_OrderNummer']"/></xsl:otherwise>
+      <xsl:when test="substring(Field[@Name='LI_OrderNummer'],1,1)='C'"><xsl:value-of select="Field[@Name='LI_OrderNummer']"/></xsl:when>
+      <xsl:otherwise><xsl:value-of select="translate(Field[@Name='LI_OrderNummer'],'.','/')"/></xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
   <xsl:variable name="li_kostprijs">
     <xsl:value-of select="Field[@Name='LI_Bedrag']"/>
   </xsl:variable>
   <xsl:variable name="li_btwpct">
-    <xsl:value-of select="substring-before(concat(Field[@Name='LI_BTWCode'], '%'), '%')"/>
+    <xsl:value-of select="substring-before(concat(Field[@Name='LI_BTWCode'],'%'),'%')"/>
   </xsl:variable>
-<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$li_ordernr"/>;;;<xsl:value-of select="Field[@Name='LI_ArtikelOmschrijving']"/><xsl:if test="Field[@Name='LI_Aantal']!='' and Field[@Name='LI_EenheidsPrijs']!='' and Field[@Name='LI_EenheidsPrijs']!=Field[@Name='LI_Bedrag']"> (<xsl:value-of select="Field[@Name='LI_Aantal']"/> * <xsl:value-of select="Field[@Name='LI_EenheidsPrijs']"/>)</xsl:if>;;<xsl:value-of select="$li_kostprijs"/>;;<xsl:value-of select="$li_btwpct"/>;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$verdeelperiode"/><xsl:value-of select="$new_line"/>
+  <xsl:variable name="li_verdeelperiode">
+    <!--xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],1,4)"/>-<xsl:value-of select="substring(Invoice/Fields/Field[@Name='Periode'],5,2)"/-->
+    <!--Ignore verdeelperiode op regels tegen Bestelopdrachten of Opdrachten (niet beginnend met een 'C')!-->
+    <xsl:choose>
+      <xsl:when test="substring(Field[@Name='LI_OrderNummer'],1,1)='C'"><xsl:value-of select="substring(//Invoice/Fields/Field[@Name='Periode'],1,4)"/>-<xsl:value-of select="substring(//Invoice/Fields/Field[@Name='Periode'],5,2)"/></xsl:when>
+      <xsl:otherwise></xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$li_ordernr"/>;;;<xsl:value-of select="Field[@Name='LI_ArtikelOmschrijving']"/><xsl:if test="Field[@Name='LI_Aantal']!='' and Field[@Name='LI_EenheidsPrijs']!='' and Field[@Name='LI_EenheidsPrijs']!=Field[@Name='LI_Bedrag']"> (<xsl:value-of select="Field[@Name='LI_Aantal']"/> * <xsl:value-of select="Field[@Name='LI_EenheidsPrijs']"/>)</xsl:if>;;<xsl:value-of select="$li_kostprijs"/>;;<xsl:value-of select="$li_btwpct"/>;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$li_verdeelperiode"/><xsl:value-of select="$new_line"/>
 </xsl:for-each>
     </xsl:when>
     <!--Enkelv. factuur-->