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

MARX#54121: De status VER - verlengen (het gaat langer duren)

Browse Source 
svn path=/Website/branches/v2018.1/; revision=38625
This commit is contained in:
Marcel Bourseau
2018-07-24 13:06:57 +00:00
parent 7816f5de1b
commit accb7a1b68
2 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
CUST/MARX/xsl/F_GetApiXML.xsl
View File

@@ -145,6 +145,31 @@
</xsl:choose>
</xsl:if>
<!-- ******************************************************************* -->
<!-- *****Request: EINDEGEPLANDE_OPDR_4AX -->
<!-- ******************************************************************* -->
<xsl:if test="@view='mar_v_opdr_plandatum2_ax'">
<xsl:choose>
<xsl:when test="$mode='EINDEGEPLANDE_OPDR_4AX'">
<xml>
<xsl:for-each select="//data_row">
<xsl:sort select="MLD_OPDR_KEY"/>
<mld_ordr>
<mld_opdr_key><xsl:value-of select="MLD_OPDR_KEY"/></mld_opdr_key>
<ax_company_id><xsl:value-of select="AX_COMPANY_ID"/></ax_company_id>
<mld_melding_externnr><xsl:value-of select="MLD_MELDING_EXTERNNR"/></mld_melding_externnr>
<mld_opdr_externnr><xsl:value-of select="MLD_OPDR_EXTERNNR"/></mld_opdr_externnr>
<mld_opdr_ordernr><xsl:value-of select="MLD_OPDR_ORDERNR"/></mld_opdr_ordernr>
<mld_opdr_plandatum><xsl:value-of select="MLD_OPDR_PLANDATUM2"/></mld_opdr_plandatum>
<mld_opdr_opmerking><xsl:value-of select="MLD_OPDR_OPMERKING"/></mld_opdr_opmerking>
</mld_ordr>
</xsl:for-each>
</xml>
</xsl:when>
<xsl:otherwise>
</xsl:otherwise>
</xsl:choose>
</xsl:if>
<!-- ******************************************************************* -->
<!-- *****Request: ACCEPT_REFUSED_OPDR_4AX -->
<!-- ******************************************************************* -->
<xsl:if test="@view='mar_v_opdr_accept_refused_ax'">

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

@@ -159,12 +159,27 @@
<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><xsl:value-of select="plandatum/datum"/>&#160;<xsl:value-of select="plandatum/tijd"/></td>
<td colspan="2"/>
</tr>
<xsl:if test="plandatum/datum!='' or plandatum2/datum!=''">
<tr>
<xsl:choose>
<xsl:when test="plandatum/datum!=''">
<td><b>Plan/afspraak datum: </b></td>
<td><xsl:value-of select="plandatum/datum"/>&#160;<xsl:value-of select="plandatum/tijd"/></td>
</xsl:when>
<xsl:otherwise>
<td colspan="2"/>
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
<xsl:when test="plandatum2/datum!=''">
<td><b>Geplande einddatum: </b></td>
<td><xsl:value-of select="plandatum2/datum"/>&#160;<xsl:value-of select="plandatum2/tijd"/></td>
</xsl:when>
<xsl:otherwise>
<td colspan="2"/>
</xsl:otherwise>
</xsl:choose>
</tr>
</xsl:if>
<tr><td colspan="4" height="4px"></td></tr>