IVET#39511 ontbreken van belijning bij bestellingen
svn path=/Website/branches/v2016.3/; revision=32837
This commit is contained in:
Ruud Lipper
@@ -1784,5 +1784,478 @@ Servicepoint
|
||||
</tr>
|
||||
</table>
|
||||
</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" CELLPADDING="2">
|
||||
<tr>
|
||||
<td align="left" width="100%" class="caption" colspan="4"><xsl:value-of select="//lcl/BES/bestelaanvraag"/> <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="13%" class="label" align="left"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
|
||||
<td width="33%" class="value" align="right">: <xsl:value-of select="aanvrager/naam_full"/></td>
|
||||
<td width="20%" class="label" align="left"><xsl:value-of select="//lcl/BES/aanvraagdatum"/></td>
|
||||
<td width="32%" class="value" align="right">:
|
||||
<xsl:value-of select="datum/datum"/> 
|
||||
<xsl:value-of select="datum/tijd"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label"><xsl:value-of select="//lcl/BES/bestelvoor"/></td>
|
||||
<td class="value">: <xsl:value-of select="voor/naam_full"/></td>
|
||||
<td colspan="2"/>
|
||||
</tr>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<tr>
|
||||
<td width="13%" class="label" align="left"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
|
||||
<td width="33%" class="value" align="right">: <xsl:value-of select="voor/naam_full"/></td>
|
||||
<td width="20%" class="label" align="left"><xsl:value-of select="//lcl/BES/aanvraagdatum"/></td>
|
||||
<td width="32%" class="value" align="right">:
|
||||
<xsl:value-of select="datum/datum"/> 
|
||||
<xsl:value-of select="datum/tijd"/>
|
||||
</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>
|
||||
<td colspan="2"/>
|
||||
</tr>
|
||||
</xsl:if>
|
||||
<xsl:choose>
|
||||
<xsl:when 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>
|
||||
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
|
||||
<td class="value">:
|
||||
<xsl:value-of select="leverdatum/datum"/>
|
||||
</td>
|
||||
</tr>
|
||||
</xsl:when>
|
||||
<xsl:when test="voor/mobiel!=''">
|
||||
<tr>
|
||||
<td class="label"><xsl:value-of select="//lcl/FAC/telefoon"/></td>
|
||||
<td class="value">: <xsl:value-of select="voor/mobiel"/></td>
|
||||
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
|
||||
<td class="value">:
|
||||
<xsl:value-of select="leverdatum/datum"/>
|
||||
</td>
|
||||
</tr>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<tr>
|
||||
<td class="label"><xsl:value-of select="//lcl/FAC/telefoon"/></td>
|
||||
<td class="value">: -</td>
|
||||
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
|
||||
<td class="value">:
|
||||
<xsl:value-of select="leverdatum/datum"/>
|
||||
</td>
|
||||
</tr>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
<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>
|
||||
<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"><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>
|
||||
<td colspan="2"/>
|
||||
</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"/>
|
||||
<xsl:if test="afleveradres/bezoek_adres">
|
||||
<br/> 
|
||||
<xsl:value-of select="afleveradres/bezoek_adres"/>
|
||||
<br/> 
|
||||
<xsl:value-of select="afleveradres/bezoek_postcode"/> 
|
||||
<xsl:value-of select="afleveradres/bezoek_plaats"/>
|
||||
<br/> 
|
||||
<xsl:value-of select="afleveradres/bezoek_land"/>
|
||||
</xsl:if>
|
||||
</td>
|
||||
<td colspan="2"/>
|
||||
</tr>
|
||||
<xsl:if test="bestel_opm">
|
||||
<tr>
|
||||
<td height="10px" colspan="4"/>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label" style="vertical-align:top"><xsl:value-of select="//lcl/FAC/opmerkingen"/></td>
|
||||
<td class="value" colspan="3">:
|
||||
<xsl:call-template name="linebreaks">
|
||||
<xsl:with-param name="string" select="bestel_opm"/>
|
||||
</xsl:call-template>
|
||||
</td>
|
||||
</tr>
|
||||
</xsl:if>
|
||||
<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" colspan="3">: <xsl:value-of select="."/></td>
|
||||
</tr>
|
||||
</xsl:if>
|
||||
</xsl:for-each>
|
||||
<tr>
|
||||
<td height="20px"/>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4" style="border-top:0px solid #000;"/>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<table cellpadding="1" cellspacing="0" border="1" bordercolor="#000000" frame="box" width="99%">
|
||||
<tr>
|
||||
<th class="besth" style="text-align:left"><xsl:value-of select="//lcl/BES/artikelnr"/></th>
|
||||
<th class="besth"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
|
||||
<th class="besth"><xsl:value-of select="//lcl/FAC/opmerkingen"/></th>
|
||||
<th class="besth" style="text-align:right"><xsl:value-of select="//lcl/FAC/aantal"/></th>
|
||||
<th class="besth" style="text-align:right"><xsl:value-of select="//lcl/FAC/prijs"/></th>
|
||||
<th class="besth" style="text-align:right"><xsl:value-of select="//lcl/FAC/totaal"/></th>
|
||||
</tr>
|
||||
<xsl:for-each select="bestelitem">
|
||||
<tr>
|
||||
<td class="besresult" style="text-align:left">
|
||||
 <xsl:value-of select="srtdeel/artikel_nummer"/>
|
||||
</td>
|
||||
<td class="besresult" style="text-align:left">
|
||||
<xsl:value-of select="srtdeel/omschrijving"/>
|
||||
</td>
|
||||
<td class="besresult">
|
||||
<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> </td>
|
||||
<td class="besresult" style="text-align:right">
|
||||
<xsl:value-of select="aantal"/>
|
||||
</td>
|
||||
<td class="besresult" style="text-align:right">
|
||||
<xsl:value-of select="format-number(prijs, '0,00', 'european')"/>
|
||||
</td>
|
||||
<td class="besresult" style="text-align:right">
|
||||
<xsl:value-of select="format-number(aantal*prijs, '0,00', 'european')"/>
|
||||
</td>
|
||||
</tr>
|
||||
</xsl:for-each>
|
||||
<tr>
|
||||
<td height="20px" colspan="6" style="border:none;"/>
|
||||
</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>
|
||||
<TD WIDTH="40" ROWSPAN="30" ID="LINKERMARGE"></TD>
|
||||
<TD>
|
||||
<!-- Bestelopdracht -->
|
||||
<table border="0" bordercolor="#ffffff" width="100%">
|
||||
<tr>
|
||||
<td colspan="4" class="caption" style="text-align:center">
|
||||
<b><xsl:value-of select="//lcl/BES/inkooporder"/></b>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4" style="height:30px"/>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" class="label" style="width:50%">
|
||||
<b><xsl:value-of select="//lcl/BES/factuur_aan"/>:</b>
|
||||
</td>
|
||||
<td class="label" colspan="2" style="width:50%">
|
||||
<b><xsl:value-of select="//lcl/BES/leverancier"/>:</b>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" class="value">
|
||||
<xsl:value-of select="factuuradres/naam"/>
|
||||
<br/>
|
||||
<xsl:value-of select="factuuradres/post_adres"/>
|
||||
<br/>
|
||||
<xsl:value-of select="factuuradres/post_postcode"/> 
|
||||
<xsl:value-of select="factuuradres/post_plaats"/>
|
||||
<br/>
|
||||
<xsl:value-of select="factuuradres/post_land"/>
|
||||
</td>
|
||||
<td colspan="2" class="value">
|
||||
<xsl:value-of select="bedrijf/naam"/>
|
||||
<br/>
|
||||
<xsl:value-of select="bedrijf/post_adres"/>
|
||||
<br/>
|
||||
<xsl:value-of select="bedrijf/post_postcode"/> 
|
||||
<xsl:value-of select="bedrijf/post_plaats"/>
|
||||
<br/>
|
||||
<xsl:value-of select="bedrijf/post_land"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4" style="height:20px"/>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" class="label">
|
||||
<b><xsl:value-of select="//lcl/FAC/contactgegevens"/>:</b>
|
||||
</td>
|
||||
<td/>
|
||||
<td colspan="2">
|
||||
<b/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="vertical-align:top" class="label" width="20%">
|
||||
<b><xsl:value-of select="//lcl/BES/besteller"/></b>
|
||||
</td>
|
||||
<td class="value" width="30%">:
|
||||
<xsl:value-of select="bestelling/aanvrager/naam_full"/>
|
||||
</td>
|
||||
<td class="label" width="22%">
|
||||
<b><xsl:value-of select="//lcl/BES/aanvraagnummers"/></b>
|
||||
</td>
|
||||
<td class="value" width="28%">:
|
||||
<xsl:value-of select="bestelling/key"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label">
|
||||
<b><xsl:value-of select="//lcl/FAC/e-mail"/></b>
|
||||
</td>
|
||||
<td class="value">:
|
||||
<xsl:value-of select="bestelling/aanvrager/email"/>
|
||||
</td>
|
||||
<td class="label">
|
||||
<b><xsl:value-of select="//lcl/BES/opdrachtnummer"/></b>
|
||||
</td>
|
||||
<td class="value">:
|
||||
<xsl:value-of select="id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label">
|
||||
<b><xsl:value-of select="//lcl/FAC/telefoon"/></b>
|
||||
</td>
|
||||
<td class="value">:
|
||||
<xsl:choose>
|
||||
<xsl:when test="bestelling/aanvrager/telefoonnr">
|
||||
<xsl:value-of select="bestelling/aanvrager/telefoonnr"/>
|
||||
</xsl:when>
|
||||
<xsl:when test="bestelling/aanvrager/mobiel!=''">
|
||||
<xsl:value-of select="bestelling/aanvrager/mobiel"/>
|
||||
</xsl:when>
|
||||
</xsl:choose>
|
||||
</td>
|
||||
<td class="label">
|
||||
<b><xsl:value-of select="//lcl/BES/orderdatum"/></b>
|
||||
</td>
|
||||
<td class="value">:
|
||||
<xsl:value-of select="datum/datum"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label">
|
||||
<b><xsl:value-of select="//lcl/FAC/kostenplaats"/></b>
|
||||
</td>
|
||||
<td class="value">:
|
||||
<xsl:value-of select="bestelling/kostenplaats/nr"/>
|
||||
</td>
|
||||
<td colspan="2"/>
|
||||
<xsl:comment>
|
||||
<td class="label">
|
||||
<b><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></b>
|
||||
</td>
|
||||
<td class="value">
|
||||
<xsl:value-of select="bestelling/leverdatum/datum"/>
|
||||
</td>
|
||||
</xsl:comment>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label">
|
||||
<b><xsl:value-of select="//lcl/FAC/werkplek"/></b>
|
||||
</td>
|
||||
<td class="value">:
|
||||
<xsl:value-of select="bestelling/plaats"/>
|
||||
</td>
|
||||
<td colspan="2"/>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4" style="height:20px"/>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" class="label">
|
||||
<b><xsl:value-of select="//lcl/BES/afleveradres"/>:</b>
|
||||
</td>
|
||||
<td colspan="2">
|
||||
<b/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="vertical-align:top" class="value">
|
||||
<xsl:value-of select="afleveradres/naam"/>
|
||||
<xsl:if test="afleveradres/bezoek_adres">
|
||||
<br/>
|
||||
<xsl:value-of select="afleveradres/bezoek_adres"/>
|
||||
<br/>
|
||||
<xsl:value-of select="afleveradres/bezoek_postcode"/> 
|
||||
<xsl:value-of select="afleveradres/bezoek_plaats"/>
|
||||
<br/>
|
||||
<xsl:value-of select="afleveradres/bezoek_land"/>
|
||||
</xsl:if>
|
||||
</td>
|
||||
<td colspan="2"/>
|
||||
</tr>
|
||||
<xsl:if test="bestelling/bestel_opm">
|
||||
<tr>
|
||||
<td height="10px" colspan="4"/>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label" style="vertical-align:top"><b><xsl:value-of select="//lcl/FAC/opmerkingen"/></b></td>
|
||||
<td class="value" colspan="3">:
|
||||
<xsl:call-template name="linebreaks">
|
||||
<xsl:with-param name="string" select="bestelling/bestel_opm"/>
|
||||
</xsl:call-template>
|
||||
</td>
|
||||
</tr>
|
||||
</xsl:if>
|
||||
<tr>
|
||||
<td colspan="4" style="height:20px"/>
|
||||
</tr>
|
||||
<tr>
|
||||
<xsl:for-each select="bestelling/kenmerk[@type!='L' and @type!='l' and @type!='Q']">
|
||||
<td class="label" style="vertical-align:top">
|
||||
<b><xsl:value-of select="@naam"/></b>
|
||||
</td>
|
||||
<td class="value">:
|
||||
<xsl:value-of select="."/>
|
||||
</td>
|
||||
</xsl:for-each>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4" style="height:20px"/>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4" style="border-top:0px solid #000;"/>
|
||||
</tr>
|
||||
<TR>
|
||||
<TD colspan="7">
|
||||
<TABLE cellpadding="1" cellspacing="1" border="1" bordercolor="#000000" frame="box" width="99%">
|
||||
<tr>
|
||||
<th class="besth" style="width:9%; text-align:left"><xsl:value-of select="//lcl/BES/regel"/></th>
|
||||
<th class="besth" style="width:13%; text-align:left"><xsl:value-of select="//lcl/BES/artikelnr"/></th>
|
||||
<th class="besth" style="width:36%"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
|
||||
<th class="besth" style="width:11%; text-align:left"><xsl:value-of select="//lcl/FAC/eenheid"/></th>
|
||||
<th class="besth" style="width:9%; text-align:right"><xsl:value-of select="//lcl/FAC/aantal"/></th>
|
||||
<th class="besth" style="width:11%; text-align:right"><xsl:value-of select="//lcl/FAC/prijs"/></th>
|
||||
<th class="besth" style="width:11%; 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"/>
|
||||
<tr>
|
||||
<td class="besresult">
|
||||
<xsl:value-of select="posnr"/>
|
||||
</td>
|
||||
<td class="besresult">
|
||||
<xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/>
|
||||
</td>
|
||||
<td class="besresult">
|
||||
<xsl:value-of select="bestelitem/srtdeel/omschrijving"/> 
|
||||
<xsl:for-each select="bestelitem/kenmerk">
|
||||
<br/>
|
||||
<xsl:value-of select="@naam"/>: <xsl:value-of select="."/></xsl:for-each>
|
||||
</td>
|
||||
<td class="besresult">
|
||||
<xsl:value-of select="bestelitem/srtdeel/eenheid"/>
|
||||
</td>
|
||||
<td class="besresult" style="text-align:right">
|
||||
<xsl:value-of select="aantal"/>
|
||||
</td>
|
||||
<td class="besresult" style="text-align:right">
|
||||
<xsl:value-of select="format-number(prijs, '0,00', 'european')"/>
|
||||
</td>
|
||||
<td class="besresult" style="text-align:right">
|
||||
<xsl:value-of select="format-number(totaal, '0,00', 'european')"/>
|
||||
</td>
|
||||
</tr>
|
||||
</xsl:for-each>
|
||||
<tr>
|
||||
<td height="20px" style="border:none;"/>
|
||||
</tr>
|
||||
<tr>
|
||||
<td height="20px" colspan="6" style="border:none;"/>
|
||||
<td style="text-align:right; border:none;">
|
||||
<b>
|
||||
<xsl:value-of select="format-number(sum(bestelopdrachtitem/totaal), '0,00', 'european')"/>
|
||||
</b>
|
||||
</td>
|
||||
</tr>
|
||||
</TABLE>
|
||||
</TD>
|
||||
</TR>
|
||||
<tr>
|
||||
<td colspan="4" style="height:40px"/>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4" style="text-align:center; font-size:9px"><xsl:value-of select="//lcl/BES/order_disclaimer1"/>(<xsl:value-of select="id"/>)<xsl:value-of select="//lcl/BES/order_disclaimer2"/></td>
|
||||
</tr>
|
||||
</table>
|
||||
</TD>
|
||||
<TD WIDTH="30" ROWSPAN="30" ID="RECHTERMARGE"/>
|
||||
</TR>
|
||||
</TABLE>
|
||||
</xsl:template>
|
||||
|
||||
</xsl:stylesheet>
|
||||
|
||||
Reference in New Issue
Block a user