FSN#34593 bestelopdrachtbon verfraaid

svn path=/Website/trunk/; revision=31279
This commit is contained in:
Ruud Lipper
2016-10-28 10:12:42 +00:00
parent 9cf31ed253
commit 52da7ec757

View File

@@ -669,24 +669,23 @@
<!-- Bestelopdracht -->
<table border="0" bordercolor="#ffffff" width="100%">
<tr>
<td colspan="5" class="caption" style="text-align:center">
<td colspan="4" class="caption" style="text-align:center">
<b><xsl:value-of select="//lcl/BES/inkooporder"/></b>
</td>
</tr>
<tr>
<td colspan="5" style="height:30"/>
<td colspan="4" style="height:30px"/>
</tr>
<tr>
<td colspan="2" style="width:47%">
<td colspan="2" class="label" style="width:50%">
<b><xsl:value-of select="//lcl/BES/factuur_aan"/>:</b>
</td>
<td style="width:6%"></td>
<td colspan="2" style="width:47%">
<td class="label" colspan="2" style="width:50%">
<b><xsl:value-of select="//lcl/BES/leverancier"/>:</b>
</td>
</tr>
<tr>
<td colspan="2">
<td colspan="2" class="value">
<xsl:value-of select="factuuradres/naam"/>
<br/>
<xsl:value-of select="factuuradres/post_adres"/>
@@ -696,8 +695,7 @@
<br/>
<xsl:value-of select="factuuradres/post_land"/>
</td>
<td/>
<td colspan="2">
<td colspan="2" class="value">
<xsl:value-of select="bedrijf/naam"/>
<br/>
<xsl:value-of select="bedrijf/post_adres"/>
@@ -709,10 +707,10 @@
</td>
</tr>
<tr>
<td colspan="5" style="height:20"/>
<td colspan="4" style="height:20px"/>
</tr>
<tr>
<td colspan="2">
<td colspan="2" class="label">
<b><xsl:value-of select="//lcl/FAC/contactgegevens"/>:</b>
</td>
<td/>
@@ -721,113 +719,183 @@
</td>
</tr>
<tr>
<td colspan="2" style="vertical-align:top">
<b><xsl:value-of select="//lcl/BES/besteller"/>: </b>
<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"/>
<br/>
<b><xsl:value-of select="//lcl/FAC/e-mail"/>: </b>
</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"/>
<br/>
<b><xsl:value-of select="//lcl/FAC/telefoon"/>: </b>
<xsl:value-of select="bestelling/aanvrager/telefoonnr"/>
<br/>
<b><xsl:value-of select="//lcl/FAC/kostenplaats"/>: </b>
</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"/>
<br/>
<b><xsl:value-of select="//lcl/FAC/werkplek"/>: </b>
</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/>
<td colspan="2" style="vertical-align:top">
<b><xsl:value-of select="//lcl/BES/aanvraagnummers"/>: </b>
<xsl:value-of select="bestelling/key"/>
<br/>
<b><xsl:value-of select="//lcl/BES/opdrachtnummer"/>: </b>
<xsl:value-of select="id"/>
<br/>
<b><xsl:value-of select="//lcl/BES/orderdatum"/>: </b>
<xsl:value-of select="datum/datum"/>
<br/>
<xsl:comment><b><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/>: </b><xsl:value-of select="bestelling/leverdatum/datum"/></xsl:comment>
</td>
<td colspan="2"/>
</tr>
<tr>
<td colspan="5" style="height:20"/>
<td colspan="4" style="height:20px"/>
</tr>
<tr>
<td colspan="2">
<td colspan="2" class="label">
<b><xsl:value-of select="//lcl/BES/afleveradres"/>:</b>
</td>
<td/>
<td colspan="2">
<b/>
</td>
</tr>
<tr>
<td colspan="2" style="vertical-align:top">
<td colspan="2" style="vertical-align:top" class="value">
<xsl:value-of select="afleveradres/naam"/>
<br/>
<xsl:value-of select="afleveradres/bezoek_adres"/>
<br/>
<xsl:value-of select="afleveradres/bezoek_postcode"/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_plaats"/>
<br/>
<xsl:value-of select="afleveradres/bezoek_land"/>
</td>
<td/>
<td colspan="2" style="vertical-align:top">
<xsl:for-each select="bestelling/kenmerk[@type!='L' and @type!='l' and @type!='Q']">
<b>
<xsl:value-of select="@naam"/>: </b>
<xsl:value-of select="."/>
<xsl:if test="afleveradres/bezoek_adres">
<br/>
</xsl:for-each>&#xA0;</td>
<xsl:value-of select="afleveradres/bezoek_adres"/>
<br/>
<xsl:value-of select="afleveradres/bezoek_postcode"/>&#xA0;
<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="5" style="height:20"/>
<td colspan="4" style="height:20px"/>
</tr>
<tr>
<td colspan="4" style="border-top:1px solid #000;"/>
</tr>
<TR>
<TD colspan="5">
<TABLE cellpadding="0" cellspacing="0" border="1" bordercolor="#303030" width="100%">
<TD colspan="7">
<TABLE cellpadding="1" cellspacing="0" border="0" bordercolor="#000000" frame="box" width="99%">
<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: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>
<th style="width:20; text-align:right"><xsl:value-of select="//lcl/FAC/prijs"/></th>
<th style="width:20; text-align:right"><xsl:value-of select="//lcl/FAC/totaal"/></th>
<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="result">
<td class="besresult">
<xsl:value-of select="posnr"/>
</td>
<td class="result">
<td class="besresult">
<xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/>
</td>
<td class="result">
<td class="besresult">
<xsl:value-of select="bestelitem/srtdeel/omschrijving"/>&#xA0;
<xsl:for-each select="bestelitem/kenmerk">
<br/>
<xsl:value-of select="@naam"/>: <xsl:value-of select="."/></xsl:for-each>
</td>
<td class="result">
<td class="besresult">
<xsl:value-of select="bestelitem/srtdeel/eenheid"/>
</td>
<td class="result" style="text-align:right">
<td class="besresult" style="text-align:right">
<xsl:value-of select="aantal"/>
</td>
<td class="result" style="text-align:right">
<td class="besresult" style="text-align:right">
<xsl:value-of select="format-number(prijs, '0,00', 'european')"/>
</td>
<td class="result" style="text-align:right">
<td class="besresult" style="text-align:right">
<xsl:value-of select="format-number(totaal, '0,00', 'european')"/>
</td>
</tr>
</xsl:for-each>
<tr>
<td colspan="7" height="6px" style="border-top:1px solid #000;"/>
</tr>
<tr>
<td colspan="6"/>
<td style="text-align:right">
@@ -840,10 +908,10 @@
</TD>
</TR>
<tr>
<td colspan="5" style="height:40"/>
<td colspan="4" style="height:40px"/>
</tr>
<tr>
<td colspan="5" 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>
<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>