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

MARX#53106: Nieuwe onderdelen SALES005 in opdrachtverstrekking

Browse Source 
svn path=/Website/branches/v2018.1/; revision=39395
This commit is contained in:
Marcel Bourseau
2018-10-15 11:50:57 +00:00
parent 62ee4eb12f
commit 2841a0ee4c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
<xsl:apply-templates select="s:Envelope/s:Body"/>
</xsl:template>
<xsl:template match="s:Body">exec_code;ax_supplier_id;;;;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: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','')"/>;;;;;;;;;;;;;
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:location"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:element"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:oorzaak"/></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>

2
CUST/MARX/xsl/FCLT_GetOpdrachten.xsl
View File

@@ -12,7 +12,7 @@
<xsl:apply-templates select="mld_opdr"/>
</xsl:template>
<xsl:template match="mld_opdr">exec_code;ax_supplier_id;;;;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:template match="mld_opdr">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
1;<xsl:value-of select="ax_supplier_id"/>;;;;<xsl:value-of select="mld_melding_externnr"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string"><xsl:value-of select="mld_melding_discipline"/> - <xsl:value-of select="mld_stdmelding_omschrijving"/></xsl:with-param></xsl:call-template>;<xsl:value-of select="prs_afdeling_externnr"/>;<xsl:value-of select="prs_afdeling_externnr"/>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="mld_melding_cust_name"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="mld_melding_cust_straat"/></xsl:call-template>;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="mld_melding_cust_postcode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="mld_melding_cust_plaats"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="mld_melding_cust_telefoonnr"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="mld_melding_cust_mobielnr"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="mld_melding_cust_email"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="mld_melding_cust_object_omschr"/></xsl:call-template>;;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="substring(mld_melding_memo,1,3000)"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="mld_opdr_externnr"/></xsl:call-template>;<xsl:value-of select="mld_opdr_ordernr"/>;<xsl:value-of select="translate(mld_opdr_datumbegin,'zZ','')"/>;<xsl:call-template name="mld_opdr_plandatum"><xsl:with-param name="p_task_status" select="'Gepland'"/><xsl:with-param name="p_plan_datum" select="mld_opdr_datum_plan"/></xsl:call-template>;<xsl:value-of select="translate(mld_opdr_einddatum,'zZ','')"/>;;;;;;;;;;;;;
2;<xsl:value-of select="ax_supplier_id"/>;;;;<xsl:value-of select="mld_melding_externnr"/>;;<xsl:value-of select="prs_afdeling_externnr"/>;<xsl:value-of select="prs_afdeling_externnr"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="mld_opdr_opzichter"/></xsl:call-template>;;;;;;;;;;;;<xsl:value-of select="pandnummer"/>;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="mld_opdr_externnr"/></xsl:call-template>;<xsl:value-of select="mld_opdr_ordernr"/>;;;;<xsl:call-template name="ExternalURL"/>;;;;;;;;;;;;
<xsl:for-each select="mld_opdr_materialen/mld_opdr_materiaal">3;<xsl:value-of select="../../ax_supplier_id"/>;;;;<xsl:value-of select="../../mld_melding_externnr"/>;;<xsl:value-of select="../../prs_afdeling_externnr"/>;<xsl:value-of select="../../prs_afdeling_externnr"/>;;;;;;;;;;;;;;;;<xsl:value-of select="../../mld_opdr_externnr"/>;<xsl:value-of select="../../mld_opdr_ordernr"/>;;;;;<xsl:call-template name="Materiaal_regel"><xsl:with-param name="p_linenr" select="mld_opdr_mat_linenr"/><xsl:with-param name="p_linenr2" select="position()"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="mld_opdr_mat_code"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="mld_opdr_mat_naam"/></xsl:call-template>;;;;<xsl:call-template name="Materiaal_eenheidSidB"><xsl:with-param name="p_unit" select="''"/></xsl:call-template>;<xsl:value-of select="mld_opdr_mat_eenheid"/>;<xsl:value-of select="mld_opdr_mat_prijs"/>;<xsl:value-of select="mld_opdr_mat_aantal"/>;<xsl:call-template name="Mareon_btwperc"><xsl:with-param name="p_btwperc" select="mld_opdr_mat_btwperc"/></xsl:call-template>;;&#10;</xsl:for-each>

2
CUST/MARX/xsl/REMS_GetOpdrachten.xsl
View File

@@ -24,7 +24,7 @@
<!-- Prijs bestaat niey, aantal ook niet, die hard op 1 gezet -->
<!-- Er is geen BTW percentage, hier maar op HARD op 'Hoog' zetten -->
<xsl:template match="ServiceOpdracht">exec_code;ax_supplier_id;;;;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:template match="ServiceOpdracht">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="_OpdrachtUitvoerder/Opdracht">1;<xsl:value-of select="../Uitvoerder/Code_Uitvoerder"/>;;;;<xsl:call-template name="REMS_TaskId_DEFAULT"/>;<xsl:call-template name="REMS_Opdracht_Omschrijving"/>;<xsl:value-of select="../../header/ERP_id"/>;<xsl:value-of select="../../header/ERP_id"/>;;<xsl:call-template name="REMS_Opdracht_Contactpersoon"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Opdracht_Locatie/Opdracht_straat"/></xsl:call-template>;<xsl:value-of select="Opdracht_Locatie/Opdracht_huisnummer"/>;<xsl:value-of select="Opdracht_Locatie/Opdracht_volgletter"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Opdracht_Locatie/Opdracht_postcode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Opdracht_Locatie/Opdracht_plaats"/></xsl:call-template>;<xsl:call-template name="REMS_Opdracht_Contactpersoon_Tel1"/>;<xsl:call-template name="REMS_Opdracht_Contactpersoon_Tel2"/>;<xsl:call-template name="REMS_Opdracht_Contactpersoon_Email"/>;;<xsl:value-of select="../Gebouwenboom/Codes/Complex/Beheercode_volledig"/>;<xsl:value-of select="../Gebouwenboom/Codes/Subcomplex/Beheercode_volledig"/>;<xsl:value-of select="../Gebouwenboom/Codes/VHE/Beheercode_volledig"/>;<xsl:call-template name="REMS_Opdracht_Memo"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Opdrachtnummer"/></xsl:call-template>;<xsl:call-template name="REMS_TaskId_DEFAULT"/>;<xsl:value-of select="translate(Opdrachtdatum,'zZ','')"/>;<xsl:value-of select="translate(Plandatum,'zZ','')"/>;<xsl:value-of select="translate(Einddatum,'zZ','')"/>;;;;;;;;;;;;;
2;<xsl:value-of select="../Uitvoerder/Code_Uitvoerder"/>;;;;<xsl:call-template name="REMS_TaskId_DEFAULT"/>;;<xsl:value-of select="../../header/ERP_id"/>;<xsl:value-of select="../../header/ERP_id"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="../Opzichter/OpzichterInfo/Opzichtergegevens/Naam"/></xsl:call-template>;;;;;;;;;;;<xsl:value-of select="../Gebouwenboom/Codes/Complex/Beheercode_volledig"/>;<xsl:value-of select="../Gebouwenboom/Codes/Subcomplex/Beheercode_volledig"/>;<xsl:value-of select="../Gebouwenboom/Codes/VHE/Beheercode_volledig"/>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Opdrachtnummer"/></xsl:call-template>;<xsl:call-template name="REMS_TaskId_DEFAULT"/>;;;;<xsl:call-template name="ExternalURL"/>;;;;;;;;;;;;&#10;</xsl:for-each>
<xsl:for-each select="_OpdrachtUitvoerder/Opdracht/Opdracht_Budget">3;<xsl:value-of select="../../Uitvoerder/Code_Uitvoerder"/>;;;;<xsl:call-template name="REMS_TaskId_MATERIAALREGEL"/>;;<xsl:value-of select="../../../header/ERP_id"/>;<xsl:value-of select="../../../header/ERP_id"/>;;;;;;;;;;;;;;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="../Opdrachtnummer"/></xsl:call-template>;<xsl:call-template name="REMS_TaskId_MATERIAALREGEL"/>;;;;;<xsl:call-template name="Materiaal_regel"><xsl:with-param name="p_linenr" select="Budgetregel"/><xsl:with-param name="p_linenr2" select="position()"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Budgetcode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Omschrijving"/></xsl:call-template>;;;;<xsl:call-template name="Materiaal_eenheidSidB"><xsl:with-param name="p_unit" select="st."/></xsl:call-template>;<xsl:value-of select="'ST.'"/>;<xsl:value-of select="Budgetbedrag"/>;<xsl:value-of select="'1'"/>;<xsl:call-template name="Mareon_btwperc"><xsl:with-param name="p_btwperc" select="'Hoog'"/></xsl:call-template>;<xsl:value-of select="Budgetbedrag"/>;&#10;</xsl:for-each>