BLCC#39847 contracten ook met ruimte/verdiepingscope

svn path=/Website/trunk/; revision=33149
This commit is contained in:
Peter Feij
2017-03-15 09:05:27 +00:00
parent ec22035242
commit df6333117a

View File

@@ -417,7 +417,7 @@
<td width="32%" class="value" align="right">:
<xsl:value-of select="datum/datum"/>&#xA0;
<xsl:value-of select="datum/tijd"/>
</td>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/BES/bestelvoor"/></td>
@@ -433,7 +433,7 @@
<td width="32%" class="value" align="right">:
<xsl:value-of select="datum/datum"/>&#xA0;
<xsl:value-of select="datum/tijd"/>
</td>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
@@ -452,7 +452,7 @@
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</td>
</tr>
</xsl:when>
<xsl:when test="voor/mobiel!=''">
@@ -462,7 +462,7 @@
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</td>
</tr>
</xsl:when>
<xsl:otherwise>
@@ -472,7 +472,7 @@
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
@@ -483,7 +483,7 @@
<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>
<td class="value">: <xsl:value-of select="status"/></td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/kostenplaats"/></td>
@@ -505,14 +505,14 @@
<xsl:value-of select="afleveradres/bezoek_plaats"/>
<br/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_land"/>
</xsl:if>
</xsl:if>
</td>
<td colspan="2"/>
</tr>
</tr>
<xsl:if test="bestel_opm">
<tr>
<td height="10px" colspan="4"/>
</tr>
</tr>
<tr>
<td class="label" style="vertical-align:top"><xsl:value-of select="//lcl/FAC/opmerkingen"/></td>
<td class="value" colspan="3">:
@@ -540,7 +540,7 @@
</tr>
<tr>
<td colspan="4" style="border-top:1px solid #000;"/>
</tr>
</tr>
<tr>
<td colspan="4">
<table cellpadding="1" cellspacing="0" border="0" bordercolor="#000000" frame="box" width="99%">
@@ -733,9 +733,9 @@
<td class="value" width="28%">:
<xsl:value-of select="bestelling/key"/>
</td>
</tr>
</tr>
<tr>
<td class="label">
<td class="label">
<b><xsl:value-of select="//lcl/FAC/e-mail"/></b>
</td>
<td class="value">:
@@ -746,31 +746,31 @@
</td>
<td class="value">:
<xsl:value-of select="id"/>
</td>
</td>
</tr>
<tr>
<td class="label">
<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>
<xsl:when test="bestelling/aanvrager/mobiel!=''">
<xsl:value-of select="bestelling/aanvrager/mobiel"/>
</xsl:when>
</xsl:choose>
</xsl:choose>
</td>
<td class="label">
<td class="label">
<b><xsl:value-of select="//lcl/BES/orderdatum"/></b>
</td>
<td class="value">:
<xsl:value-of select="datum/datum"/>
</td>
</td>
</tr>
<tr>
<td class="label">
<tr>
<td class="label">
<b><xsl:value-of select="//lcl/FAC/kostenplaats"/></b>
</td>
<td class="value">:
@@ -780,17 +780,17 @@
<xsl:comment>
<td class="label">
<b><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></b>
</td>
<td class="value">
</td>
<td class="value">
<xsl:value-of select="bestelling/leverdatum/datum"/>
</td>
</xsl:comment>
</tr>
<tr>
<td class="label">
<td class="label">
<b><xsl:value-of select="//lcl/FAC/werkplek"/></b>
</td>
<td class="value">:
<td class="value">:
<xsl:value-of select="bestelling/plaats"/>
</td>
<td colspan="2"/>
@@ -817,14 +817,14 @@
<xsl:value-of select="afleveradres/bezoek_plaats"/>
<br/>
<xsl:value-of select="afleveradres/bezoek_land"/>
</xsl:if>
</xsl:if>
</td>
<td colspan="2"/>
</tr>
<xsl:if test="bestelling/bestel_opm">
<tr>
<td height="10px" colspan="4"/>
</tr>
</tr>
<tr>
<td class="label" style="vertical-align:top"><b><xsl:value-of select="//lcl/FAC/opmerkingen"/></b></td>
<td class="value" colspan="3">:
@@ -833,18 +833,18 @@
</xsl:call-template>
</td>
</tr>
</xsl:if>
</xsl:if>
<tr>
<td colspan="4" style="height:20px"/>
</tr>
<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>
</td>
</xsl:for-each>
</tr>
<tr>
@@ -852,7 +852,7 @@
</tr>
<tr>
<td colspan="4" style="border-top:1px solid #000;"/>
</tr>
</tr>
<TR>
<TD colspan="7">
<TABLE cellpadding="1" cellspacing="0" border="0" bordercolor="#000000" frame="box" width="99%">
@@ -2962,14 +2962,18 @@ END:VCALENDAR
<tr>
<td class="label" width="30%"><xsl:value-of select="//lcl/CNT/termijnbedrag"/>:</td>
<td class="value">
<xsl:value-of select="termijnkosten"/>
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="termijnkosten"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
<tr>
<td class="label"><xsl:value-of select="//lcl/CNT/contractbedrag"/>:</td>
<td class="value">
<xsl:value-of select="kosten"/>
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="kosten"/>
</xsl:call-template>
</td>
</tr>
</table>
@@ -3014,6 +3018,10 @@ END:VCALENDAR
<xsl:if test="contract_plaats/plaats">
<table cellspacing="1" width="100%">
<tr>
<td>
<strong><xsl:value-of select="//lcl/CNT/scope"/></strong>
</td>
<td></td>
<td>
<strong><xsl:value-of select="//lcl/FAC/locatie"/></strong>
</td>
@@ -3030,9 +3038,32 @@ END:VCALENDAR
<xsl:for-each select="contract_plaats/plaats">
<xsl:sort select="regio/district/locatie/omschrijving"/>
<tr>
<td>
<xsl:value-of select="regio/district/locatie/omschrijving"/>&#xA0;<xsl:value-of select="regio/district/locatie/gebouw/omschrijving"/>
</td>
<xsl:if test="@type='L'">
<td><xsl:value-of select="//lcl/FAC/locatie"/></td>
<td><xsl:value-of select="plaatsaanduiding"/></td>
<td><xsl:value-of select="regio/district/locatie/omschrijving"/></td>
</xsl:if>
<xsl:if test="@type='G'">
<td><xsl:value-of select="//lcl/FAC/gebouw"/></td>
<td><xsl:value-of select="plaatsaanduiding"/></td>
<td><xsl:value-of select="regio/district/locatie/gebouw/omschrijving"/></td>
</xsl:if>
<xsl:if test="@type='T'">
<td><xsl:value-of select="//lcl/FAC/terrein"/></td>
<td><xsl:value-of select="plaatsaanduiding"/></td>
<td><xsl:value-of select="regio/district/locatie/omschrijving"/></td>
</xsl:if>
<xsl:if test="@type='V'">
<td><xsl:value-of select="//lcl/FAC/bouwlaag"/></td>
<td><xsl:value-of select="plaatsaanduiding"/></td>
<td><xsl:value-of select="regio/district/locatie/gebouw/omschrijving"/></td>
</xsl:if>
<xsl:if test="@type='R'">
<td><xsl:value-of select="//lcl/FAC/ruimte"/></td>
<td><xsl:value-of select="plaatsaanduiding"/>&#160;<xsl:value-of select="regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/></td>
<td><xsl:value-of select="regio/district/locatie/gebouw/omschrijving"/>
</td>
</xsl:if>
<td>
<xsl:value-of select="regio/district/locatie/adres"/>
</td>