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

MARX#55638: Annuleren opdracht vanuit TobiasAX

Browse Source 
svn path=/Website/branches/v2018.2/; revision=40106
This commit is contained in:
Marcel Bourseau
2018-12-04 18:56:48 +00:00
parent dec5e9b057
commit d659f58637
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CUST/MARX/xsl/A_GetOpdrachten.xsl
View File

@@ -13,7 +13,7 @@
</xsl:template>
<xsl:template match="s:Body">exec_code;ax_supplier_id;mld_opdr_soort;mld_opdr_typering;mld_opdr_afspraak;mld_melding_externnr;mld_melding_omschrijving;prs_afdeling_externnr;mld_opdr_po_companyid;mld_opdr_opzichter;mld_melding_cust_name;mld_melding_cust_straat;mld_melding_cust_huisnr;mld_melding_cust_huisnr2;mld_melding_cust_postcode;mld_melding_cust_plaats;mld_melding_cust_telefoonnr;mld_melding_cust_mobielnr;mld_melding_cust_email;mld_melding_cust_object_omschr;complexnummer;pandnummer;VGEnummer;mld_melding_memo;mld_opdr_externnr;mld_opdr_ordernr;mld_opdr_datumbegin;mld_opdr_datum_plan;mld_opdr_einddatum;mld_opdr_url;mld_opdr_mat_linenr;mld_opdr_mat_code;mld_opdr_mat_naam;mld_opdr_mat_locatie(groep);mld_opdr_mat_element(extra2);mld_opdr_mat_oorzaak(extra4);mld_opdr_mat_eenheidcode;mld_opdr_mat_eenheid;mld_opdr_mat_prijs;mld_opdr_mat_aantal;mld_opdr_mat_btwperc;mld_opdr_mat_totaal
<xsl:for-each select="descendant::*/b:SupplierTaskSpec">1;<xsl:value-of select="b:vendAccountNum"/>;<xsl:value-of select="b:purchSoort"/>;<xsl:value-of select="b:purchType"/>;<xsl:value-of select="b:purchAfspraak"/>;<xsl:value-of select="b:requestId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:description"/></xsl:call-template>;<xsl:value-of select="b:companyId"/>;<xsl:value-of select="b:purchOrderCompanyId"/>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custName"/></xsl:call-template>;<xsl:call-template name="AX_Opdracht_Straatnaam"/>;<xsl:call-template name="AX_Opdracht_Huisnr"/>;<xsl:call-template name="AX_Opdracht_HuisnrToev"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custZipCode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custCity"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custPhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custMobilePhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custEmail"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:objectDescription"/></xsl:call-template>;;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="substring(b:memo,1,3000)"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;<xsl:value-of select="translate(b:registrationDate,'zZ','')"/>;<xsl:call-template name="mld_opdr_plandatum"><xsl:with-param name="p_task_status" select="b:taskStatus"/><xsl:with-param name="p_plan_datum" select="b:startDateTime"/></xsl:call-template>;<xsl:value-of select="translate(b:deadlineDate,'zZ','')"/>;;;;;;;;;;;;;
<xsl:for-each select="descendant::*/b:SupplierTaskSpec">1;<xsl:call-template name="mld_opdr_levID"/>;<xsl:value-of select="b:purchSoort"/>;<xsl:value-of select="b:purchType"/>;<xsl:value-of select="b:purchAfspraak"/>;<xsl:value-of select="b:requestId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:description"/></xsl:call-template>;<xsl:value-of select="b:companyId"/>;<xsl:value-of select="b:purchOrderCompanyId"/>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custName"/></xsl:call-template>;<xsl:call-template name="AX_Opdracht_Straatnaam"/>;<xsl:call-template name="AX_Opdracht_Huisnr"/>;<xsl:call-template name="AX_Opdracht_HuisnrToev"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custZipCode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custCity"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custPhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custMobilePhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custEmail"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:objectDescription"/></xsl:call-template>;;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="substring(b:memo,1,3000)"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;<xsl:value-of select="translate(b:registrationDate,'zZ','')"/>;<xsl:call-template name="mld_opdr_plandatum"><xsl:with-param name="p_task_status" select="b:taskStatus"/><xsl:with-param name="p_plan_datum" select="b:startDateTime"/></xsl:call-template>;<xsl:value-of select="translate(b:deadlineDate,'zZ','')"/>;;;;;;;;;;;;;
2;<xsl:value-of select="b:vendAccountNum"/>;;;;<xsl:value-of select="b:requestId"/>;;<xsl:value-of select="b:companyId"/>;<xsl:value-of select="b:purchOrderCompanyId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:supervisorName"/></xsl:call-template>;;;;;;;;;;;;;<xsl:value-of select="b:objectId"/>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;;;;<xsl:call-template name="ExternalURL"/>;;;;;;;;;;;;&#10;</xsl:for-each>
<xsl:for-each select="descendant::*/b:SupplierTaskSpec/b:SupplierPurchLines/b:SupplierPurchLine">3;<xsl:value-of select="../../b:vendAccountNum"/>;;;;<xsl:value-of select="../../b:requestId"/>;;<xsl:value-of select="../../b:companyId"/>;<xsl:value-of select="../../b:purchOrderCompanyId"/>;;;;;;;;;;;;;;;;<xsl:value-of select="../../b:purchId"/>;<xsl:value-of select="../../b:taskId"/>;;;;;<xsl:call-template name="Materiaal_regel"><xsl:with-param name="p_linenr" select="b:lineNum"/><xsl:with-param name="p_linenr2" select="position()"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:itemId"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:name"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:locationDescription"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:projIntegrationDescription"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:causeDescription"/></xsl:call-template>;<xsl:call-template name="Materiaal_eenheidSidB"><xsl:with-param name="p_unit" select="b:purchUnitGS1"/></xsl:call-template>;<xsl:value-of select="b:purchUnit"/>;<xsl:value-of select="b:purchPrice"/>;<xsl:value-of select="b:qtyOrdered"/>;<xsl:call-template name="Mareon_btwperc"><xsl:with-param name="p_btwperc" select="b:taxItemGroup"/></xsl:call-template>;<xsl:value-of select="b:lineAmount"/>;&#10;</xsl:for-each>
</xsl:template>
@@ -27,6 +27,15 @@
</xsl:choose>
</xsl:template>
<!-- Als de opdracht is geannuleerd, dan geven we op REGELNUMMER 1 (en alleen regelnummer 1) als leverancier-ID -1 door. als in opdracht is voor geen leverancier -->
<xsl:template name="mld_opdr_levID">
<xsl:choose>
<xsl:when test="b:purchStatus = 'Geannuleerd'">-1</xsl:when>
<xsl:otherwise><xsl:value-of select="b:vendAccountNum"/></xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="AX_Opdracht_Straatnaam">
<!-- MARX#51332: Adresgegevens uitsplitsen, en huisnummer toevoeging als kenmerk/soort erbij -->
<xsl:call-template name="coalesce">