admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DJIN#37776 Aanpassing prints, e-mails en e-mailnotificaties

Browse Source 
svn path=/Website/branches/v2016.2/; revision=31924
This commit is contained in:
Maarten van der Heide
2016-12-09 16:09:29 +00:00
parent cc72a99941
commit e38a552968
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
CUST/DJIN/xsl/cust.xsl
View File

@@ -7,7 +7,7 @@
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:variable name="Xsrtnotificatiecode">MLDNEW</xsl:variable>
<xsl:variable name="Xsrtnotificatiecode">RESNEW</xsl:variable>
<xsl:template name="stylesheet">
<style>
@@ -395,7 +395,7 @@
<xsl:template name="rsv_ruimte">
<xsl:param name="min_volgnr"/>
<tr>
<!--tr>
<td width="35%"><b><xsl:value-of select="//lcl/FAC/omschrijving"/></b></td>
<td width="15%"><b><xsl:value-of select="//lcl/RES/aantal"/></b></td>
<td width="10%"><b><xsl:value-of select="//lcl/RES/begintijd"/></b></td>
@@ -403,6 +403,15 @@
<td width="12%"><b><xsl:value-of select="//lcl/RES/opstelling"/></b></td>
<td width="8%" style="text-align:right;"><b><xsl:value-of select="//lcl/RES/prijs"/></b></td>
<td/>
</tr-->
<tr>
<td><b><xsl:value-of select="//lcl/FAC/omschrijving"/></b></td>
<td><b><xsl:value-of select="//lcl/RES/aantal"/></b></td>
<td><b><xsl:value-of select="//lcl/RES/begintijd"/></b></td>
<td><b><xsl:value-of select="//lcl/RES/eindtijd"/></b></td>
<td><b><xsl:value-of select="//lcl/RES/opstelling"/></b></td>
<td style="text-align:right;"><b><xsl:value-of select="//lcl/RES/prijs"/></b></td>
<td width="5%"/>
</tr>
<xsl:if test="res_ruimte!=''">
<tr>
@@ -418,6 +427,7 @@
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
<td/>
</tr>
</xsl:if>
<!-- rsv_deel-lijst gesorteerd op van-tijd -->
@@ -428,14 +438,15 @@
<xsl:value-of select="res_deel/deel/omschrijving"/>
</td>
<td><xsl:value-of select="aantal"/></td>
<td><xsl:value-of select="van/tijd"/></td>
<td><xsl:value-of select="tot/tijd"/></td>
<td><xsl:if test="van/datum!=tot/datum"><xsl:value-of select="van/datum"/>&#xA0;</xsl:if><xsl:value-of select="van/tijd"/></td>
<td><xsl:if test="van/datum!=tot/datum"><xsl:value-of select="tot/datum"/>&#xA0;</xsl:if><xsl:value-of select="tot/tijd"/></td>
<td/>
<td style="text-align:right">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
<td/>
</tr>
</xsl:for-each>
<!-- rsv_artikel-lijst gesorteerd op van-tijd -->
@@ -452,6 +463,7 @@
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
<td/>
</tr>
</xsl:for-each>
<tr><td colspan="7"><hr style="color:#000;height:1px;"/></td></tr>
@@ -463,9 +475,10 @@
<xsl:with-param name="prijs" select="sum(prijs[string(number(.))!='NaN'])+sum(rsv_deel/prijs[string(number(.))!='NaN'])+sum(rsv_artikel/prijs[string(number(.))!='NaN'])"/>
</xsl:call-template></b>
</td>
<td/>
</tr>
<!-- bezoeker-lijst gesorteerd op naam -->
<xsl:if test="bezoeker">
<xsl:if test="afspraak/bezoeker">
<tr><td colspan="7"><hr style="color:#000;height:1px;"/></td></tr>
<xsl:for-each select="afspraak/bezoeker">
<xsl:sort select="naam"/>