Index: _csp/admin1/Format GA TBX.xsl
===================================================================
diff -u -r757 -r1079
--- _csp/admin1/Format GA TBX.xsl	(.../Format GA TBX.xsl)	(revision 757)
+++ _csp/admin1/Format GA TBX.xsl	(.../Format GA TBX.xsl)	(revision 1079)
@@ -5,76 +5,63 @@
 
 <!--   =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=   -->
 <!--   +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+   -->
-<!--   Dubbel voor TBX binnenlades afdrukken                             -->
+<!--   Dubbel voor TBX binnenlades en spoelbak- en sifonlades afdrukken                             -->
 
 <xsl:template name="TBXZIFDubbelProd">
 	<xsl:apply-templates select="GAPROD[@TYPE='Tandembox'][ITEM[@Label='LT']/WAARDE='B']" mode="TBX">
 		<xsl:with-param name="pPosOL" select="1"/>						
 		<xsl:with-param name="pZIFDubbel" select="1"/>
 	</xsl:apply-templates>
 </xsl:template>
- 
-<xsl:template name="TBXZIFDubbel">
+
+ <xsl:template name="TBXZIFDubbel">
 	<xsl:apply-templates select="ORDERLIJN[PRODUCT/GAPROD[@TYPE='Tandembox'][ITEM[@Label='LT']/WAARDE='B']]" mode="TBXDubbel">
 		<xsl:sort select="SORTKEY" order="ascending"/>
+		<xsl:with-param name="pZIFDubbel" select="1"/>
 	</xsl:apply-templates>
 </xsl:template>
  
-<xsl:template match="ORDERLIJN" mode="TBXDubbel">	
-	<xsl:variable name="pTbxMultiple" select="0"/>      <!--   OOK AANPASSEN IN "Format GA Order.xsl"   -->
-	<xsl:if test="$pTbxMultiple">
-		<xsl:apply-templates select="PRODUCT" mode="TBX_MULTIPLE">
-			<xsl:with-param name="pPosOL" select="position()"/>
-			<xsl:with-param name="pZIFDubbel" select="1"/>
-			<xsl:with-param name="pMaxCount" select="QTY"/>		
-		</xsl:apply-templates>
-	</xsl:if>
-	<xsl:if test="not($pTbxMultiple)">
-		<xsl:apply-templates select="PRODUCT" mode="TBX">
-			<xsl:with-param name="pPosOL" select="position()"/>
-			<xsl:with-param name="pZIFDubbel" select="1"/>
-		</xsl:apply-templates>
-	</xsl:if>
+<xsl:template name="TBXSpoelbakDubbel">
+	<xsl:apply-templates select="ORDERLIJN[PRODUCT/GAPROD[@TYPE='Tandembox'][ITEM[@Label='KLAS']/WAARDE='SP2']]" mode="TBXDubbel">
+		<xsl:sort select="SORTKEY" order="ascending"/>
+		<xsl:with-param name="pZIFDubbel" select="0"/>
+	</xsl:apply-templates>
 </xsl:template>
 
-<!--   +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+   -->
-<!--   =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=   -->
+<xsl:template name="TBXSifonDubbel">
+	<xsl:apply-templates select="ORDERLIJN[PRODUCT/GAPROD[@TYPE='Tandembox'][ITEM[@Label='KLAS']/WAARDE='SY']]" mode="TBXDubbel">
+		<xsl:sort select="SORTKEY" order="ascending"/>
+		<xsl:with-param name="pZIFDubbel" select="0"/>
+	</xsl:apply-templates>
+</xsl:template>
 
-<xsl:template match="PRODUCT" mode="TBX_MULTIPLE">
-	<xsl:param name="pPosOL" select="''"/>	
+<xsl:template match="ORDERLIJN" mode="TBXDubbel">	
 	<xsl:param name="pZIFDubbel" select="0"/>   <!--  Default=0  -->
-	<xsl:param name="pMaxCount" select="1"/>   <!--  Default=1  -->
-    <xsl:param name="pCounter" select="1"/>
-	<xsl:variable name="pPrintMultiple" select="not(GAPROD/ITEM[@Label='VERPAK']/WAARDE='P')"/>
-    <xsl:if test="$pCounter &lt;= $pMaxCount">
-	  <xsl:apply-templates select="GAPROD" mode="TBX">
-		<xsl:with-param name="pPosOL" select="$pPosOL"/>						
+	<xsl:apply-templates select="PRODUCT" mode="TBX">
+		<xsl:with-param name="pPosOL" select="position()"/>
+		<xsl:with-param name="pDubbel" select="1"/>
 		<xsl:with-param name="pZIFDubbel" select="$pZIFDubbel"/>
-		<xsl:with-param name="pCounter"><xsl:if test="$pPrintMultiple"><xsl:value-of select="$pCounter"/></xsl:if></xsl:with-param>
-	  </xsl:apply-templates>
-	  <xsl:if test="$pPrintMultiple">
-		<xsl:apply-templates select="." mode="TBX_MULTIPLE">  <!--  Recursief oproepen tot pCounter=pMaxCount  -->
-		  <xsl:with-param name="pPosOL" select="$pPosOL"/>						
-		  <xsl:with-param name="pZIFDubbel" select="$pZIFDubbel"/>
-		  <xsl:with-param name="pMaxCount" select="$pMaxCount"/>
-		  <xsl:with-param name="pCounter" select="$pCounter+1"/>
-		</xsl:apply-templates>
-	  </xsl:if>
-    </xsl:if>
+	</xsl:apply-templates>
 </xsl:template>
 
+<!--   +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+   -->
+<!--   =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=   -->
+
 <xsl:template match="PRODUCT" mode="TBX">
 	<xsl:param name="pPosOL" select="''"/>	
+	<xsl:param name="pDubbel" select="0"/>   <!--  Default=0  -->
 	<xsl:param name="pZIFDubbel" select="0"/>   <!--  Default=0  -->
 	<xsl:apply-templates select="GAPROD" mode="TBX">
 		<xsl:with-param name="pPosOL" select="$pPosOL"/>						
 		<xsl:with-param name="pZIFDubbel" select="$pZIFDubbel"/>
+		<xsl:with-param name="pDubbel" select="$pDubbel"/>
 	</xsl:apply-templates>
 </xsl:template>
 
 <xsl:template match="GAPROD" mode="TBX">
 	<xsl:param name="pPosOL" select="''"/>	
 	<xsl:param name="pZIFDubbel"/>
+	<xsl:param name="pDubbel"/>
 	<xsl:param name="pCounter" select="0"/>	
 	<xsl:variable name="PosOL">
 		<xsl:if test="$pPosOL !=''"><xsl:value-of select="$pPosOL"/></xsl:if>
@@ -105,7 +92,7 @@
 
 
 <TABLE border="0" bordercolor="#707070" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF" WIDTH="650">
-	<xsl:if test="($PosOL &gt; 1) or ($pCounter &gt; 1) or ($pZIFDubbel)"><xsl:attribute name="STYLE">page-break-before:always</xsl:attribute></xsl:if>
+	<xsl:if test="($PosOL &gt; 1) or ($pCounter &gt; 1) or ($pDubbel)"><xsl:attribute name="STYLE">page-break-before:always</xsl:attribute></xsl:if>
 	<TR>
 		<TD><img src="spacer.gif"/></TD>
 	</TR>
@@ -124,7 +111,7 @@
 		<TD align="center">
 	<table border="0" cellpadding="2" cellspacing="0" class="clsNormalFont" width="100%">
 		<TR>
-			<TD width="180"><xsl:if test="$pZIFDubbel">DUBBEL</xsl:if><xsl:if test="not($pZIFDubbel)"><xsl:call-template name="INFOVERPAK_TBX"/></xsl:if></TD>
+			<TD width="180"><xsl:if test="$pDubbel">DUBBEL</xsl:if><xsl:if test="not(pDubbel)"><xsl:call-template name="INFOVERPAK_TBX"/></xsl:if></TD>
 			<TD align="center">
 				<font class="clsProdTitle"><xsl:value-of select="@OMS"/></font>
 				<xsl:if test="TEMPLATE != ''"><xsl:apply-templates select="TEMPLATECODE"/></xsl:if>