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

MARX#38072 betere layout van opdrachtbon

Browse Source 
svn path=/Website/branches/v2016.2/; revision=31088
This commit is contained in:
Peter Feij
2016-10-13 15:32:34 +00:00
parent 32551b7027
commit a1912444e9
1 changed files with 83 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
CUST/MARX/xsl/mareon.xsl
View File

@@ -6,8 +6,8 @@
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:key name="GROUP_BY_materiaal_taskid" match="//facilitor/opdracht/materialen" use="extra1"/>
<xsl:template name="pageheader">
<table border="0" width="100%">
<tr>
@@ -34,10 +34,10 @@
</xsl:template>
<xsl:template match="opdracht" mode="include">
<table border="0" width="100%" cellpadding="2">
<tr>
<td colspan="4" class="caption" style="padding-top:20px;padding-bottom:20px">
@@ -47,51 +47,50 @@
<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>/?<xsl:value-of select="../bookmarks/opdracht"/><xsl:value-of select="key"/></xsl:attribute>
<xsl:value-of select="melding/stdmelding/discipline/srtdiscipline/prefix"/>
<xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/>
</xsl:element>
</b>
</td>
</xsl:element>
</b>
</td>
</tr>
<!-- MARX#36901 - Extra optionele tekst -->
<xsl:if test="melding/voor/afdeling/bedrijf/kenmerk[@key='6'] != ''">
<tr>
<td colspan="5" style="text-align:left; color:red">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="melding/voor/afdeling/bedrijf/kenmerk[@key='6']"/>
</xsl:call-template>
</xsl:call-template>
</td>
</tr>
</xsl:if>
<tr><td colspan="4" valign="center"><hr/></td></tr>
<tr>
<td colspan="4" height="10px" valign="center">
<hr/>
</td>
<td colspan="4" style="font-size:20px"><xsl:value-of select="melding/voor/afdeling/bedrijf/naam"/><xsl:if test="melding/voor/afdeling/bedrijf/leverancier_nr!=''"><span style="font-size:9px;float:right;"><b>GLN</b>: <xsl:value-of select="melding/voor/afdeling/bedrijf/leverancier_nr"/></span></xsl:if></td>
</tr>
<tr>
<td colspan="4" style="font-size:20px"><b><xsl:value-of select="melding/voor/afdeling/bedrijf/naam"/></b>&#160;&#160;&#160;&#160;<span style="font-size:9px">(<b>GLN</b>: <xsl:value-of select="melding/voor/afdeling/bedrijf/leverancier_nr"/>)</span></td>
</tr>
<tr>
<td><b>Post<xsl:value-of select="//lcl/FAC/adres"/>: </b></td>
<td><xsl:value-of select="melding/voor/afdeling/bedrijf/post_adres"/></td>
<td><b>Bezoek<xsl:value-of select="//lcl/FAC/adres"/>: </b></td>
<td><xsl:value-of select="melding/voor/afdeling/bedrijf/bezoek_adres"/></td>
</tr>
<tr>
<td/>
<td><xsl:value-of select="melding/voor/afdeling/bedrijf/post_postcode"/>&#160;&#160;<xsl:value-of select="melding/voor/afdeling/bedrijf/post_plaats"/></td>
<td/>
<td><xsl:value-of select="melding/voor/afdeling/bedrijf/bezoek_postcode"/>&#160;&#160;<xsl:value-of select="melding/voor/afdeling/bedrijf/bezoek_plaats"/></td>
</tr>
<tr>
<td><b><xsl:value-of select="//lcl/FAC/telefoon"/>: </b></td>
<td><xsl:value-of select="melding/voor/afdeling/bedrijf/telefoon"/></td>
<xsl:if test="melding/voor/afdeling/bedrijf/fax!=''">
<td><b>Fax: </b></td>
<td><xsl:value-of select="melding/voor/afdeling/bedrijf/fax"/></td>
</xsl:if>
</tr>
<tr>
<td><b><xsl:value-of select="//lcl/FAC/e-mail"/>: </b></td>
@@ -99,36 +98,34 @@
<td colspan="2"/>
</tr>
<tr><td colspan="4" valign="center"><hr style="border-style: dashed;"/></td></tr>
<tr>
<td colspan="4" height="10px" valign="center">
<hr/>
</td>
<td colspan="4" style="font-size:20px"><xsl:value-of select="uitvoerende/bedrijf/naam"/><xsl:if test="uitvoerende/bedrijf/leverancier_nr!=''"><span style="font-size:9px;float:right;"><b>GLN</b>: <xsl:value-of select="uitvoerende/bedrijf/leverancier_nr"/></span></xsl:if></td>
</tr>
<tr>
<td colspan="4" style="font-size:20px"><b><xsl:value-of select="uitvoerende/bedrijf/naam"/></b>&#160;&#160;&#160;&#160;<span style="font-size:9px">(<b>GLN</b>: <xsl:value-of select="uitvoerende/bedrijf/leverancier_nr"/>)</span></td>
</tr>
<tr>
<td><b>Post<xsl:value-of select="//lcl/FAC/adres"/>: </b></td>
<td><xsl:value-of select="uitvoerende/bedrijf/post_adres"/></td>
<td><b>Bezoek<xsl:value-of select="//lcl/FAC/adres"/>: </b></td>
<td><xsl:value-of select="uitvoerende/bedrijf/bezoek_adres"/></td>
</tr>
<tr>
<td/>
<td><xsl:value-of select="uitvoerende/bedrijf/post_postcode"/>&#160;&#160;<xsl:value-of select="uitvoerende/bedrijf/post_plaats"/></td>
<td/>
<td><xsl:value-of select="uitvoerende/bedrijf/bezoek_postcode"/>&#160;&#160;<xsl:value-of select="uitvoerende/bedrijf/bezoek_plaats"/></td>
</tr>
<tr>
<td><b><xsl:value-of select="//lcl/FAC/telefoon"/>: </b></td>
<td><xsl:value-of select="uitvoerende/bedrijf/telefoon"/></td>
<xsl:if test="uitvoerende/bedrijf/fax!=''">
<td><b>Fax: </b></td>
<td><xsl:value-of select="uitvoerende/bedrijf/fax"/></td>
</xsl:if>
</tr>
<tr>
<td><b><xsl:value-of select="//lcl/FAC/e-mail"/>: </b></td>
@@ -136,24 +133,21 @@
<td colspan="2"/>
</tr>
<tr><td colspan="4" valign="center"><hr/></td></tr>
<tr>
<td colspan="4" height="10px" valign="center">
<hr/>
</td>
<td colspan="4" style="font-size:20px">Algemene opdrachtgegevens</td>
</tr>
<tr>
<td colspan="4" style="font-size:20px"><b>Algemene opdrachtgegevens</b></td>
</tr>
<tr><td colspan="4" height="4px"></td></tr>
<tr>
<td colspan="2" style="font-size:14px"><b>MAREON NUMMER: </b>
<xsl:value-of select="melding/stdmelding/discipline/srtdiscipline/prefix"/>
<xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></td>
<td colspan="2" style="font-size:14px"><b>INKOOPORDER OPDRACHTGEVER: </b> <xsl:value-of select="opdr_id"/></td>
</tr>
<tr><td colspan="4" height="4px"></td></tr>
<tr>
<td><b>Status: </b></td>
<td><xsl:value-of select="status"/></td>
@@ -165,18 +159,16 @@
<td><b>Uitvoeren voor: </b></td>
<td><xsl:value-of select="einddatum/datum"/></td>
</tr>
<xsl:if test="plandatum/datum!=''">
<tr>
<td><b>Plandatum / tijd: </b></td>
<td><b>Plandatum/-tijd: </b></td>
<td><xsl:value-of select="plandatum/datum"/>&#160;<xsl:value-of select="plandatum/tijd"/></td>
<td colspan="2"/>
</tr>
<tr>
<td colspan="4" height="10px" valign="center">
</td>
</tr>
</xsl:if>
<tr><td colspan="4" height="4px"></td></tr>
<tr>
<td align="right">
<b><xsl:value-of select="melding/kenmerk[@key='1']/@naam"/>:</b>
@@ -184,14 +176,16 @@
<td>
<xsl:value-of select="melding/kenmerk[@key='1']"/>
</td>
<xsl:if test="melding/kenmerk[@key='5']!=''">
<td align="right">
<b>Telefoon:</b>
</td>
<td>
<xsl:value-of select="melding/kenmerk[@key='5']"/>
</td>
</xsl:if>
</tr>
<tr>
<td align="right">
<b>Adres:</b>
@@ -199,14 +193,16 @@
<td>
<xsl:value-of select="melding/kenmerk[@key='9']"/>&#160;<xsl:value-of select="melding/kenmerk[@key='10']"/>
</td>
<xsl:if test="melding/kenmerk[@key='8']!=''">
<td align="right">
<b>Mobiel:</b>
</td>
<td>
<xsl:value-of select="melding/kenmerk[@key='8']"/>
</td>
</xsl:if>
</tr>
<tr>
<td align="right">
<b>Plaats:</b>
@@ -215,7 +211,7 @@
<xsl:value-of select="melding/kenmerk[@key='3']"/>&#160;<xsl:value-of select="melding/kenmerk[@key='4']"/>
</td>
</tr>
<tr>
<td align="right">
<b>Object:</b>
@@ -224,7 +220,7 @@
<xsl:value-of select="melding/kenmerk[@key='6']"/>
</td>
</tr>
<tr>
<td align="right">
<b>Pandnummer:</b>
@@ -239,7 +235,7 @@
<xsl:value-of select="kenmerk[@key='16']"/>
</td>
</tr>
<tr>
<td align="right">
<b>Opzichter:</b>
@@ -248,9 +244,9 @@
<xsl:value-of select="kenmerk[@key=13]"/>
</td>
</tr>
<tr><td colspan="4" height="4px"></td></tr>
<tr>
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/FAC/omschrijving"/>:</b>
@@ -267,6 +263,7 @@
</xsl:choose>
</td>
</tr>
<xsl:if test="opmerking!=''">
<tr>
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/FAC/opmerking"/>:</b>
@@ -277,18 +274,19 @@
</xsl:call-template>
</td>
</tr>
</xsl:if>
<!-- Als er materialen zijn, dan gaan we deze in een tabel tonen -->
<xsl:if test="count(materialen) &gt; 0">
<tr>
<td colspan="4" height="10px" valign="center">
<hr/>
<hr style="border-style: dashed;"/>
</td>
</tr>
<tr>
<td colspan="4" style="font-size:20px"><b>Details</b></td>
<td colspan="4" style="font-size:20px">Details</td>
</tr>
<xsl:for-each select="materialen[generate-id(.)=generate-id(key('GROUP_BY_materiaal_taskid', extra1)[1])]">
<xsl:sort select="extra1"/>
<tr>
@@ -296,35 +294,32 @@
</tr>
<tr>
<td colspan="4"><xsl:value-of select="extra3"/></td>
</tr>
<tr>
<td colspan="4" style="font-size:16px">Opdrachtregels</td>
</tr>
<tr>
<td colspan="4">
<table cellpadding="0" cellspacing="0" border="1" bordercolor="#303030" width="100%">
<table cellpadding="2" cellspacing="0" border="1" bordercolor="#303030" width="100%">
<tr>
<td width="30%"><b>Omschrijving</b></td>
<td><b>Eenheid</b></td>
<td><b>Stuksprijs</b></td>
<td><b>Aantal</b></td>
<td><b>Totaalprijs<br/>excl. BTW</b></td>
<td><b>BTW<br/>percentage</b></td>
<td><b>Totaalprijs<br/>incl. BTW</b></td>
</tr>
<td style='text-align:right'><b>Stuksprijs</b></td>
<td style='text-align:right'><b>Aantal</b></td>
<td style='text-align:right'><b>Totaalprijs<br/>excl. BTW</b></td>
<td style='text-align:right'><b>BTW<br/>percentage</b></td>
<td style='text-align:right'><b>Totaalprijs<br/>incl. BTW</b></td>
</tr>
<xsl:call-template name="print_materiaal_regels"><xsl:with-param name="p_extra1" select="extra1"/></xsl:call-template>
</table>
</table>
</td>
</tr>
<tr>
<td colspan="4" height="20px" valign="center">
</td>
</tr>
</tr>
</xsl:for-each>
</xsl:if>
<tr>
<td colspan="4" height="10px" valign="center">
<hr/>
<hr style="border-style: dashed;"/>
</td>
</tr>
@@ -338,7 +333,7 @@
<b><xsl:value-of select="//lcl/FAC/totaal"/> (excl. BTW):</b>
</td>
<td style="width:1in;text-align:right">
<b>&#x20AC;&#xA0;<xsl:value-of select="format-number(kosten, '0,00', 'european')"/></b>
<b>&#x20AC;&#xA0;<xsl:value-of select="format-number(kosten, '0,00', 'european')"/></b>
</td>
<td/>
</tr>
@@ -349,7 +344,7 @@
</tr>
-->
<tr>
<td colspan="5" style="text-align:left; font-size:9px; color:red">
<td colspan="5" style="text-align:left; font-size:9px; color:red;font-weight:bold;">
<xsl:call-template name="escape_marnr_tobiasnr"><xsl:with-param name="string" select="melding/voor/afdeling/bedrijf/opmerking2"/></xsl:call-template>
</td>
</tr>
@@ -357,10 +352,10 @@
<td colspan="5" style="text-align:left; font-size:9px">
<xsl:value-of select="melding/voor/afdeling/bedrijf/opmerking"/>
</td>
</tr>
</tr>
</table>
</xsl:template>
<xsl:template name="escape_marnr_tobiasnr">
<xsl:param name="string"/>
<xsl:variable name="l_marnr" select="'MAR###'"/>
@@ -383,7 +378,7 @@
<xsl:otherwise><xsl:value-of select="$string"/></xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="print_materiaal_regels">
<xsl:param name="p_extra1"/>
<xsl:for-each select="//facilitor/opdracht/materialen[extra1=$p_extra1]">
@@ -391,14 +386,14 @@
<tr>
<td><xsl:value-of select="omschrijving"/></td>
<td><xsl:value-of select="eenheid"/></td>
<td>&#x20AC;&#xA0;<xsl:value-of select="format-number(stuksprijs, '0,00', 'european')"/></td>
<td><xsl:value-of select="aantal"/></td>
<td>&#x20AC;&#xA0;<xsl:value-of select="format-number(totaalprijs, '0,00', 'european')"/></td>
<td><xsl:value-of select="btwpercentage"/>%</td>
<td>&#x20AC;&#xA0;<xsl:value-of select="format-number(totaalprijs + btwbedrag, '0,00', 'european')"/></td>
<td style='text-align:right'>&#x20AC;&#xA0;<xsl:value-of select="format-number(stuksprijs, '0,00', 'european')"/></td>
<td style='text-align:right'><xsl:value-of select="aantal"/></td>
<td style='text-align:right'>&#x20AC;&#xA0;<xsl:value-of select="format-number(totaalprijs, '0,00', 'european')"/></td>
<td style='text-align:right'><xsl:value-of select="btwpercentage"/>%</td>
<td style='text-align:right'>&#x20AC;&#xA0;<xsl:value-of select="format-number(totaalprijs + btwbedrag, '0,00', 'european')"/></td>
</tr>
</xsl:for-each>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>