From 87787a3a7e3abc802a7653cc0ffc5c003eb51b69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABlle=20Tolner?= <notexist@aareon.nl>
Date: Tue, 2 Aug 2016 08:58:15 +0000
Subject: [PATCH] ZKHM#35802: Bestel bon opstellen vanuit AAXX omgeving

svn path=/Website/branches/v2016.1/; revision=30196
---
 CUST/AAZC/xsl/bestelopdr.xsl |  15 +++
 CUST/AAZC/xsl/cust.xsl       | 221 -----------------------------------
 2 files changed, 15 insertions(+), 221 deletions(-)
 create mode 100644 CUST/AAZC/xsl/bestelopdr.xsl
diff --git a/CUST/AAZC/xsl/bestelopdr.xsl b/CUST/AAZC/xsl/bestelopdr.xsl
new file mode 100644
index 0000000000..b313d4388f
--- /dev/null
+++ b/CUST/AAZC/xsl/bestelopdr.xsl
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="./cust.xsl"/>
+ 	<xsl:import href="../../aaxx/xsl/bestelopdr.xsl"/>
+ 	<xsl:import href="./cust_settings.xsl"/>
+	<xsl:variable name="Rev">
+		<!-- Revision van deze cust.xsl -->
+		<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
+	</xsl:variable>
+	
+  <xsl:template match="bestelopdracht" mode="full">
+    <xsl:apply-templates select="." mode="include"/>
+  </xsl:template>	
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/CUST/AAZC/xsl/cust.xsl b/CUST/AAZC/xsl/cust.xsl
index a80740b37e..e7d52edfbc 100644
--- a/CUST/AAZC/xsl/cust.xsl
+++ b/CUST/AAZC/xsl/cust.xsl
@@ -570,225 +570,4 @@ kostenspecificatie) dient ondertekend te worden geretourneerd ter attentie van d
 		</TABLE>
 	</xsl:template>	
 
-
-	<xsl:template match="bestelopdracht" mode="full">
-		<xsl:choose>
-			<xsl:when test="$mode='summary'"></xsl:when>
-			<xsl:otherwise>
-				<html>
-					<xsl:comment>================================ OPDRACHTEN ==============================</xsl:comment>
-					<xsl:comment>Facilitor new style default XSL template for opdracht</xsl:comment>
-					<xsl:call-template name="htmlhead"/>
-					<xsl:element name="body">
-						<xsl:if test="$mode!='email'">
-							<xsl:attribute name="onload">window.print();</xsl:attribute>
-						</xsl:if>
-						<xsl:call-template name="pageheader_opdr">
-          							<xsl:with-param name="opdr_type"
-							select="'Bestelopdracht'"/>
-							<xsl:with-param name="opdr_nummer" select="id"/>
-						</xsl:call-template>
-							<table border="0" width="100%">
-								<tr>
-									<td width="50%">
-										<span class="tekstkop">&#xA0;Prijsconditie:&#xA0;</span>B.T.W. Exclusief</td>
-									<td width="50%">
-										<span class="tekstkop">&#xA0;Betalingsconditie:&#xA0;</span>
-												60 dagen na einde maand
-									</td>
-								</tr>
-							</table>
-							<table border="1" width="100%" bordercolor="#000000">
-								<tr>
-									<td width="50%" height="100%" rowspan="4" style="border-left-style:none">
-										<table border="0" height="100%">
-											<tr>
-												<td height="50%">
-													<xsl:apply-templates select="bedrijf"/>
-												</td>
-											</tr>
-											<tr>
-												<td height="50%">
-													<xsl:apply-templates select="afleveradres"/>
-												</td>
-											</tr>
-
-										</table>
-									</td>
-									<td width="50%" style="border-right-style:none">
-										<xsl:call-template name="servicedesk"/>
-										  <xsl:if test="opdrachttype/omschrijving!='Contractorder' ">
-										    <xsl:call-template name="gereedmelden"/>
-										  </xsl:if>
-									</td>
-								</tr>
-								<tr>
-									<td style="border-right-style:none">
-										<xsl:call-template name="factuuradres">
-										<xsl:with-param name="opdr_type" select="opdrachttype/omschrijving"/>
-										</xsl:call-template>
-									</td>
-								</tr>
-								<tr>
-									<td style="border-right-style:none">
-										<table border="0" width="100%" cellspacing="0">
-											<tr>
-												<td>
-													<span class="tekstkopsmall">Verzenden binnen:</span>
-												</td>
-												<td>
-													<xsl:value-of select="bestelopdrachtitem/bestelitem/srtdeel/srtgroep/discipline/bes/leverdagen"/>&#xA0;werkdag(en)</td>
-											</tr>
-											<tr>
-												<td>
-													<span class="tekstkopsmall">Datum uitgegeven:</span>
-												</td>
-												<td>
-													<xsl:value-of select="bestelling/datum/datum"/>
-												</td>
-											</tr>
-											<tr>
-												<td>
-													<span class="tekstkopsmall">Uitgegeven door:</span>
-												</td>
-												<td>
-													<xsl:value-of select="besteller/naam_full"/>
-												</td>
-											</tr>
-											<tr>
-												<td>
-													<span class="tekstkopsmall">Ordernummer:</span>
-												</td>
-												<td>
-													LB <xsl:value-of select="id"/>
-												</td>
-											</tr>
-											<tr>
-												<td>
-													<span class="tekstkopsmall">Aanvrager:</span>
-												</td>
-												<td>
-													<xsl:value-of select="bestelling/aanvrager/naam_full"/>
-												</td>
-											</tr>
-											<tr>
-												<td>
-													<span class="tekstkopsmall">Telefoonnummer:</span>
-												</td>
-												<td>
-													<xsl:value-of select="bestelling/aanvrager/telefoonnr"/>
-												</td>
-											</tr>
-										</table>
-									</td>
-								</tr>
-							</table>
-							<table border="0" height="300">
-
-						<TR>
-							<TD colspan="5">
-								<TABLE cellpadding="0" cellspacing="0" border="1" bordercolor="#303030" width="100%">
-									<tr>
-										<th>Regel</th>
-										<th>Artikelnr</th>
-										<th>Omschrijving</th>
-										<th>Eenheid</th>
-										<th style="text-align:right">Aantal</th>
-										<xsl:if test="aantal_geleverd &gt; 0">
-											<th style="text-align:right">Delivered</th>
-										</xsl:if>
-										<th style="text-align:right">Prijs</th>
-										<th style="text-align:right">Totaal</th>
-									</tr>
-									<xsl:for-each select="bestelopdrachtitem">
-										<xsl:sort select="srtdeel/omschrijving"/>
-										<xsl:sort select="posnr" data-type="number"/>
-										<tr>
-											<td class="result">
-												<xsl:value-of select="posnr"/>
-											</td>
-											<td class="result">
-												<xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/>
-											</td>
-											<td class="result">
-												<xsl:value-of select="bestelitem/srtdeel/omschrijving"/>&#xA0;
-												<xsl:if test="contains(bestelitem/srtdeel/opmerking, 'OrPoIh')">
-													[Portie:<xsl:value-of select="substring-before(substring-after(bestelitem/srtdeel/opmerking, 'OrPoIh:'), 'EindOrPoIh')"/> 
-													<xsl:value-of select="substring-before(substring-after(bestelitem/srtdeel/opmerking, 'OrPoEh:'), 'EindOrPoEh')"/>]
-												</xsl:if>
-												<xsl:for-each select="bestelitem/kenmerk">
-												<xsl:if test="(@type!='L' and @type!='l')">
-													<br/>
-													<xsl:value-of select="@naam"/>: <xsl:value-of select="."/>
-    											</xsl:if>		
-													</xsl:for-each>
-											</td>
-											<td class="result">
-												<xsl:value-of select="bestelitem/srtdeel/eenheid"/>
-											</td>
-											<td class="result" style="text-align:right">
-												<xsl:value-of select="aantal"/>
-											</td>
-											<xsl:if test="../aantal_geleverd &gt; 0">
-												<td class="result" style="text-align:right">
-													<xsl:value-of select="aantalontv"/>
-												</td>
-											</xsl:if>
-											<td class="result" style="text-align:right">
-												<xsl:value-of select="format-number(prijs, '0,00', 'european')"/>
-											</td>
-											<td class="result" style="text-align:right">
-												<xsl:value-of select="format-number(totaal, '0,00', 'european')"/>
-											</td>
-										</tr>
-									</xsl:for-each>
-									<tr>
-										<td colspan="6"/>
-										<xsl:if test="aantal_geleverd &gt; 0">
-											<td/>
-										</xsl:if>
-										<td style="text-align:right">
-											<b>
-												<xsl:value-of select="format-number(sum(bestelopdrachtitem/totaal), '0,00', 'european')"/>
-											</b>
-										</td>
-									</tr>
-								</TABLE>
-								</TD>
-								</TR>
-<xsl:if test="bestelling/kenmerk">
-<tr>
-							<td colspan="5" style="height:20"/>
-														<td colspan="2" style="vertical-align:top">
-								<xsl:for-each select="bestelling/kenmerk">
-								<xsl:if test="(@type!='L' and @type!='l')">
-									<b>
-										<xsl:value-of select="@naam"/>:</b>
-									<xsl:value-of select="."/>
-									<br/>
-									</xsl:if>
-								</xsl:for-each>&#xA0;</td>
-						</tr>
-</xsl:if>
-
-
-								</table>
-	
-							<table border="0" width="100%" bordercolor="#000000">
-								<tr>
-									<td>
-										<xsl:call-template name="voorwaarden">
-										<xsl:with-param name="opdr_type" select="opdrachttype/omschrijving"/>
-										</xsl:call-template>
-									</td>
-								</tr>
-							</table>
-						<xsl:call-template name="pagefooter"/>
-					</xsl:element>
-				</html>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-
 </xsl:stylesheet><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. -->
\ No newline at end of file
