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

MARX#58441: SALES005 Factuurbericht heeft geen FreeText meer

Browse Source 
svn path=/Website/branches/v2019.1/; revision=43287
This commit is contained in:
Marcel Bourseau
2019-07-09 15:38:02 +00:00
parent 05299a536c
commit 482b0e2362
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CUST/MARX/xsl/F_PutFactuurETIMSIDB.xsl
View File

@@ -25,7 +25,7 @@
<xsl:template match="sales005:Invoice">
<xsl:comment>woconr;leveranciernr;factuurnr;factuurdatum;onderwerp;opdrachtnr;omschrijving;bedrag;btwperc;btwbedrag;btw_verlegd;document;iban;G_iban;G_bedrag;kvk_nr;btw_nr;afleverdatum;locatie;kostensoort;opdrachtregelid;artikelnr;aantal;eenheid;naam;adres;postcode;plaats;pdf_scan</xsl:comment>
<xsl:for-each select="sales005:InvoiceLine">
<xsl:value-of select="../sales005:Invoicee/sales005:GLN"/>;<xsl:value-of select="../sales005:Invoicer/sales005:GLN"/>;<xsl:value-of select="../sales005:InvoiceNumber"/>;<xsl:value-of select="../sales005:InvoiceDate"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="../sales005:FreeText"/></xsl:call-template>;<xsl:value-of select="../sales005:BuyersOrderNumber"/>;<xsl:call-template name="construct_factuurregel_omschr_sales005"/>;<xsl:value-of select="sales005:NetLineAmount"/>;<xsl:apply-templates select="sales005:VATInformation"/>;<xsl:value-of select="../sales005:Attachment/sales005:FileName"/>;<xsl:value-of select="../sales005:Supplier/sales005:AccountInformation/sales005:IBAN"/>;<xsl:value-of select="../sales005:PaymentOnBlockedAccount/sales005:IBAN"/>;<xsl:value-of select="../sales005:PaymentOnBlockedAccount/sales005:Amount"/>;<xsl:value-of select="../sales005:Supplier/sales005:ChamberOfCommerceNumber"/>;<xsl:value-of select="../sales005:Supplier/sales005:VATRegistrationNumber"/>;<xsl:value-of select="../sales005:DeliveryDate"/>;<xsl:value-of select="sales005:MaintenanceInformation/sales005:Location"/>;<xsl:value-of select="sales005:MaintenanceInformation/sales005:ChargeTo"/>;<xsl:value-of select="sales005:OrderLineIdentification"/>;<xsl:call-template name="factuurregel_artnr_sales005"/>;<xsl:value-of select="sales005:DeliveredQuantity"/>;<xsl:call-template name="factuurregel_eenheid_sales005"/>;<xsl:value-of select="../sales005:Supplier/sales005:Name"/>;<xsl:call-template name="construct_StreetAndNumber_sales005"/>;<xsl:value-of select="../sales005:Supplier/sales005:PostalCode"/>;<xsl:value-of select="../sales005:Supplier/sales005:City"/>;;&#10;</xsl:for-each>
<xsl:value-of select="../sales005:Invoicee/sales005:GLN"/>;<xsl:value-of select="../sales005:Invoicer/sales005:GLN"/>;<xsl:value-of select="../sales005:InvoiceNumber"/>;<xsl:value-of select="../sales005:InvoiceDate"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="substring(../sales005:AdditionalInformation,1,255)"/></xsl:call-template>;<xsl:value-of select="../sales005:BuyersOrderNumber"/>;<xsl:call-template name="construct_factuurregel_omschr_sales005"/>;<xsl:value-of select="sales005:NetLineAmount"/>;<xsl:apply-templates select="sales005:VATInformation"/>;<xsl:value-of select="../sales005:Attachment/sales005:FileName"/>;<xsl:value-of select="../sales005:Supplier/sales005:AccountInformation/sales005:IBAN"/>;<xsl:value-of select="../sales005:PaymentOnBlockedAccount/sales005:IBAN"/>;<xsl:value-of select="../sales005:PaymentOnBlockedAccount/sales005:Amount"/>;<xsl:value-of select="../sales005:Supplier/sales005:ChamberOfCommerceNumber"/>;<xsl:value-of select="../sales005:Supplier/sales005:VATRegistrationNumber"/>;<xsl:value-of select="../sales005:DeliveryDate"/>;<xsl:value-of select="sales005:MaintenanceInformation/sales005:Location"/>;<xsl:value-of select="sales005:MaintenanceInformation/sales005:ChargeTo"/>;<xsl:value-of select="sales005:OrderLineIdentification"/>;<xsl:call-template name="factuurregel_artnr_sales005"/>;<xsl:value-of select="sales005:DeliveredQuantity"/>;<xsl:call-template name="factuurregel_eenheid_sales005"/>;<xsl:value-of select="../sales005:Supplier/sales005:Name"/>;<xsl:call-template name="construct_StreetAndNumber_sales005"/>;<xsl:value-of select="../sales005:Supplier/sales005:PostalCode"/>;<xsl:value-of select="../sales005:Supplier/sales005:City"/>;;&#10;</xsl:for-each>
</xsl:template>
<xsl:template match="VATInformation">
@@ -176,7 +176,7 @@
<xsl:call-template name="vrije_tekst">
<xsl:with-param name="p_string">
<xsl:if test="sales005:TradeItemIdentification/sales005:AdditionalItemIdentification/sales005:TradeItemDescription != ''"><xsl:text> </xsl:text><xsl:value-of select="sales005:TradeItemIdentification/sales005:AdditionalItemIdentification/sales005:TradeItemDescription"/></xsl:if>
<xsl:if test="sales005:FreeText != ''"><xsl:text> - </xsl:text><xsl:value-of select="sales005:FreeText"/></xsl:if>
<xsl:if test="sales005:AdditionalInformation != ''"><xsl:text> - </xsl:text><xsl:value-of select="sales005:AdditionalInformation"/></xsl:if>
</xsl:with-param>
</xsl:call-template>
</xsl:template>

4
CUST/MARX/xsl/F_PutFactuur_SALES005_1.0.xsl
View File

@@ -8,7 +8,7 @@
<xsl:comment>woconr;leveranciernr;factuurnr;factuurdatum;onderwerp;opdrachtnr;omschrijving;bedrag;btwperc;btwbedrag;btw_verlegd;document;iban;G_iban;G_bedrag;kvk_nr;btw_nr;afleverdatum;locatie;kostensoort;opdrachtregelid;artikelnr;aantal;eenheid;naam;adres;postcode;plaats;pdf_scan</xsl:comment>
<xsl:for-each select="sales005:Invoice">
<xsl:for-each select="sales005:InvoiceLine">
<xsl:value-of select="../sales005:Invoicee/sales005:GLN"/>;<xsl:value-of select="../sales005:Invoicer/sales005:GLN"/>;<xsl:value-of select="../sales005:InvoiceNumber"/>;<xsl:value-of select="../sales005:InvoiceDate"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="../sales005:FreeText"/></xsl:call-template>;<xsl:value-of select="../sales005:BuyersOrderNumber"/>;<xsl:call-template name="construct_factuurregel_omschr"/>;<xsl:value-of select="sales005:NetLineAmount"/>;<xsl:apply-templates select="sales005:VATInformation"/>;<xsl:value-of select="../sales005:Attachment/sales005:FileName"/>;<xsl:value-of select="../sales005:Supplier/sales005:AccountInformation/sales005:IBAN"/>;<xsl:value-of select="../sales005:PaymentOnBlockedAccount/sales005:IBAN"/>;<xsl:value-of select="../sales005:PaymentOnBlockedAccount/sales005:Amount"/>;<xsl:value-of select="../sales005:Supplier/sales005:ChamberOfCommerceNumber"/>;<xsl:value-of select="../sales005:Supplier/sales005:VATRegistrationNumber"/>;<xsl:value-of select="../sales005:DeliveryDate"/>;<xsl:value-of select="sales005:MaintenanceInformation/sales005:Location"/>;<xsl:value-of select="sales005:MaintenanceInformation/sales005:ChargeTo"/>;<xsl:value-of select="sales005:OrderLineIdentification"/>;<xsl:call-template name="factuurregel_artnr"/>;<xsl:value-of select="sales005:DeliveredQuantity"/>;<xsl:call-template name="factuurregel_eenheid"/>;<xsl:value-of select="../sales005:Supplier/sales005:Name"/>;<xsl:call-template name="construct_StreetAndNumber_sales005"/>;<xsl:value-of select="../sales005:Supplier/sales005:PostalCode"/>;<xsl:value-of select="../sales005:Supplier/sales005:City"/>;;&#10;</xsl:for-each></xsl:for-each>
<xsl:value-of select="../sales005:Invoicee/sales005:GLN"/>;<xsl:value-of select="../sales005:Invoicer/sales005:GLN"/>;<xsl:value-of select="../sales005:InvoiceNumber"/>;<xsl:value-of select="../sales005:InvoiceDate"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="substring(../sales005:AdditionalInformation,1,255)"/></xsl:call-template>;<xsl:value-of select="../sales005:BuyersOrderNumber"/>;<xsl:call-template name="construct_factuurregel_omschr"/>;<xsl:value-of select="sales005:NetLineAmount"/>;<xsl:apply-templates select="sales005:VATInformation"/>;<xsl:value-of select="../sales005:Attachment/sales005:FileName"/>;<xsl:value-of select="../sales005:Supplier/sales005:AccountInformation/sales005:IBAN"/>;<xsl:value-of select="../sales005:PaymentOnBlockedAccount/sales005:IBAN"/>;<xsl:value-of select="../sales005:PaymentOnBlockedAccount/sales005:Amount"/>;<xsl:value-of select="../sales005:Supplier/sales005:ChamberOfCommerceNumber"/>;<xsl:value-of select="../sales005:Supplier/sales005:VATRegistrationNumber"/>;<xsl:value-of select="../sales005:DeliveryDate"/>;<xsl:value-of select="sales005:MaintenanceInformation/sales005:Location"/>;<xsl:value-of select="sales005:MaintenanceInformation/sales005:ChargeTo"/>;<xsl:value-of select="sales005:OrderLineIdentification"/>;<xsl:call-template name="factuurregel_artnr"/>;<xsl:value-of select="sales005:DeliveredQuantity"/>;<xsl:call-template name="factuurregel_eenheid"/>;<xsl:value-of select="../sales005:Supplier/sales005:Name"/>;<xsl:call-template name="construct_StreetAndNumber_sales005"/>;<xsl:value-of select="../sales005:Supplier/sales005:PostalCode"/>;<xsl:value-of select="../sales005:Supplier/sales005:City"/>;;&#10;</xsl:for-each></xsl:for-each>
</xsl:template>
<xsl:template match="sales005:VATInformation">
@@ -58,7 +58,7 @@
<xsl:call-template name="vrije_tekst">
<xsl:with-param name="p_string">
<xsl:if test="sales005:TradeItemIdentification/sales005:AdditionalItemIdentification/sales005:TradeItemDescription != ''"><xsl:text> </xsl:text><xsl:value-of select="sales005:TradeItemIdentification/sales005:AdditionalItemIdentification/sales005:TradeItemDescription"/></xsl:if>
<xsl:if test="sales005:FreeText != ''"><xsl:text> - </xsl:text><xsl:value-of select="sales005:FreeText"/></xsl:if>
<xsl:if test="sales005:AdditionalInformation != ''"><xsl:text> - </xsl:text><xsl:value-of select="sales005:AdditionalInformation"/></xsl:if>
</xsl:with-param>
</xsl:call-template>
</xsl:template>