STPH#35495: Artikelvolgorde weergave

svn path=/Website/branches/v2015.3/; revision=28393
This commit is contained in:
Daniëlle Tolner
2016-03-08 13:13:25 +00:00
parent 9e11a38e0e
commit dea3093f8c

View File

@@ -888,6 +888,179 @@
</xsl:choose>
</xsl:template>
<xsl:template match="bestelling" mode="include">
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
<TR>
<TD WIDTH="40" ROWSPAN="30" ID="LINKERMARGE"></TD>
<TD>
<table border="0" width="100%" bordercolor="#000000">
<tr>
<td align="left" width="100%" class="caption" colspan="2"><xsl:value-of select="//lcl/BES/bestelaanvraag"/>&#xA0;<xsl:value-of select="key"/>
<xsl:if test="ismutatie=1"> (WIJZIGING)</xsl:if>
<xsl:if test="isretour=1"> (RETOUR)</xsl:if>
</td>
</tr>
<xsl:choose>
<xsl:when test="string(aanvrager/naam_full)!=string(voor/naam_full)">
<tr>
<td width="20%" class="label"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
<td width="80%" class="value">: <xsl:value-of select="aanvrager/naam_full"/></td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/BES/bestelvoor"/></td>
<td width="80%" class="value">: <xsl:value-of select="voor/naam_full"/></td>
</tr>
</xsl:when>
<xsl:otherwise>
<tr>
<td width="20%" class="label"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
<td width="80%" class="value">: <xsl:value-of select="voor/naam_full"/></td>
</tr>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="string(voor/email)!=''">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/e-mail"/></td>
<td class="value">: <xsl:value-of select="voor/email"/></td>
</tr>
</xsl:if>
<xsl:if test="voor/telefoonnr!=''">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/telefoon"/></td>
<td class="value">: <xsl:value-of select="voor/telefoonnr"/></td>
</tr>
</xsl:if>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/afdeling"/></td>
<td class="value">:
<xsl:if test="voor/afdeling/omschrijving=''">-</xsl:if>
<xsl:value-of select="voor/afdeling/omschrijving"/>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/kostenplaats"/></td>
<td class="value">:
<xsl:if test="kostenplaats/nr=''">-</xsl:if>
<xsl:value-of select="kostenplaats/nr"/>
</td>
</tr>
<tr>
<td height="20px"/>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/BES/aanvraagdatum"/></td>
<td class="value">:
<xsl:value-of select="datum/datum"/>&#xA0;
<xsl:value-of select="datum/tijd"/>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/BES/aanvraagstatus"/></td>
<td class="value">: <xsl:value-of select="status"/></td>
</tr>
<tr>
<td class="label" style="vertical-align:top"><xsl:value-of select="//lcl/BES/afleveradres"/></td>
<td class="value">:
<xsl:value-of select="afleveradres/naam"/>
<br/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_adres"/>
<br/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_postcode"/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_plaats"/>
<br/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_land"/>
</td>
</tr>
<tr>
<td height="20px"/>
</tr>
<xsl:for-each select="kenmerk[count(@xmlnode)=0]">
<xsl:if test="(@type!='L' and @type!='l' and @type!='Q')">
<tr>
<td class="label">
<xsl:value-of select="@naam"/>
</td>
<td class="value">: <xsl:value-of select="."/></td>
</tr>
</xsl:if>
</xsl:for-each>
<tr>
<td height="20px"/>
</tr>
<tr>
<td colspan="2">
<table cellpadding="0" cellspacing="0" border="1" bordercolor="#303030" width="100%">
<tr>
<th style="text-align:center"><xsl:value-of select="//lcl/BES/artikelnr"/></th>
<th><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th><xsl:value-of select="//lcl/FAC/opmerkingen"/></th>
<th style="text-align:right"><xsl:value-of select="//lcl/FAC/aantal"/></th>
<th style="text-align:right"><xsl:value-of select="//lcl/FAC/prijs"/></th>
<th style="text-align:right"><xsl:value-of select="//lcl/FAC/totaal"/></th>
</tr>
<xsl:for-each select="bestelitem">
<xsl:sort select="srtdeel/artikel_nummer"/>
<tr>
<td class="result" style="text-align:center">
&#xA0;<xsl:value-of select="srtdeel/artikel_nummer"/>
</td>
<td class="result" style="text-align:left">
<xsl:value-of select="srtdeel/omschrijving"/>
</td>
<td class="result">
<xsl:for-each select="kenmerk[count(@xmlnode)=0]">
<xsl:if test="(@type!='L' and @type!='l' and @type!='Q')">
<xsl:value-of select="@naam"/>:
<xsl:value-of select="."/>
<br/>
</xsl:if>
</xsl:for-each>&#xA0;</td>
<td class="result" style="text-align:right">
<xsl:value-of select="aantal"/>
</td>
<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(aantal*prijs, '0,00', 'european')"/>
</td>
</tr>
</xsl:for-each>
<tr>
<td height="6px" style="border-style:solid;border-width:0px;"/>
</tr>
<xsl:if test="/facilitor/bestelling/levkosten != '0'">
<tr>
<td class="label" style="text-align:right;border-style:solid;border-width:0px;" colspan="5"><xsl:value-of select="//lcl/BES/transportkosten"/>:</td>
<td class="label" style="text-align:right;border-style:solid;border-width:0px;">
<xsl:value-of select="format-number(/facilitor/bestelling/levkosten, '0,00', 'european')"/>
</td>
</tr>
</xsl:if>
<tr>
<td class="tekstkop" style="text-align:right;border-style:solid;border-width:0px;" colspan="5"><xsl:value-of select="//lcl/FAC/totaal"/>:</td>
<td class="tekstkop" style="text-align:right;border-style:solid;border-width:0px;">
<xsl:value-of select="format-number(sum(/facilitor/bestelling/bestelitem/totaal)+ /facilitor/bestelling/levkosten, '0,00', 'european')"/>
</td>
</tr>
</table>
</td>
</tr>
</table>
</TD>
<TD WIDTH="30" ROWSPAN="30" ID="RECHTERMARGE"/>
</TR>
</TABLE>
</xsl:template>
<xsl:template match="bestelopdracht" mode="include">
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
<TR>
@@ -1023,8 +1196,7 @@
<TD colspan="5">
<TABLE cellpadding="0" cellspacing="0" border="1" bordercolor="#303030" width="100%">
<tr>
<th style="width:20"><xsl:value-of select="//lcl/BES/regel"/></th>
<th style="width:20"><xsl:value-of select="//lcl/BES/artikelnr"/></th>
<th style="width:20; text-align:center"><xsl:value-of select="//lcl/BES/artikelnr"/></th>
<th style="width:200"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th style="width:20"><xsl:value-of select="//lcl/FAC/eenheid"/></th>
<th style="width:20; text-align:right"><xsl:value-of select="//lcl/FAC/aantal"/></th>
@@ -1032,13 +1204,9 @@
<th style="width:20; text-align:right"><xsl:value-of select="//lcl/FAC/totaal"/></th>
</tr>
<xsl:for-each select="bestelopdrachtitem">
<xsl:sort select="srtdeel/omschrijving"/>
<xsl:sort select="posnr" data-type="number"/>
<xsl:sort select="bestelitem/srtdeel/artikel_nummer"/>
<tr>
<td class="result">
<xsl:value-of select="posnr"/>
</td>
<td class="result">
<td class="result" style="text-align:center">
<xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/>
</td>
<td class="result">
@@ -1062,7 +1230,7 @@
</tr>
</xsl:for-each>
<tr>
<td colspan="6"/>
<td colspan="5"/>
<td style="text-align:right">
<b>
<xsl:value-of select="format-number(sum(bestelopdrachtitem/totaal), '0,00', 'european')"/>
@@ -1087,3 +1255,8 @@
</xsl:stylesheet>
<!-- Stylus Studio meta-information - (c) 2004-2007. Progress Software Corporation. All rights reserved.
<metaInformation>
<scenarios ><scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\TEMP\STPH_files\bestelopdr4945_20160307121543.xml" htmlbaseurl="" outputurl="" processortype="internal" useresolver="yes" profilemode="0" profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" validateoutput="no" validator="internal" customvalidator=""/></scenarios><MapperMetaTag><MapperInfo srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/><MapperBlockPosition></MapperBlockPosition><TemplateContext></TemplateContext><MapperFilter side="source"></MapperFilter></MapperMetaTag>
</metaInformation>
-->