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

MARX#58839: eCapture levert niet te scannen grondslagbedragen in vervolg leeg aan

Browse Source 
svn path=/Website/branches/v2019.1/; revision=43744
This commit is contained in:
Marcel Bourseau
2019-08-12 15:17:53 +00:00
parent d46c9d3b37
commit e433cf5c0f
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
CUST/MARX/xsl/F_PutFactuurUBL.xsl
View File

@@ -21,9 +21,14 @@
<xsl:when test="count(//cac:InvoiceLine) &gt; 0">
<xsl:for-each select="//cac:InvoiceLine">
<xsl:value-of select="../cac:AccountingCustomerParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID"/>;<xsl:value-of select="../cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID"/>;<xsl:value-of select="../cbc:ID"/>;<xsl:value-of select="../cbc:IssueDate"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="../cbc:Note"/></xsl:call-template>;<xsl:call-template name="get_customer_po_regelnivo"/>;<xsl:call-template name="construct_factuurregel_omschr"/>;<xsl:value-of select="cbc:LineExtensionAmount"/>;<xsl:call-template name="VATInformation_regelnivo"/>;<xsl:call-template name="get_filename_attachment_regelnivo"/>;<xsl:call-template name="IBAN_regelnivo"/>;<xsl:call-template name="G_IBAN_regelnivo"/>;<xsl:call-template name="G_Bedrag_regelnivo"/>;<xsl:value-of select="../cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID"/>;<xsl:value-of select="../cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme/cbc:CompanyID"/>;<xsl:value-of select="../cac:Delivery/cbc:ActualDeliveryDate"/>;;;<xsl:value-of select="cac:OrderLineReference/cbc:LineID"/>;<xsl:value-of select="cac:Item/cac:SellersItemIdentification/cbc:ID"/>;<xsl:value-of select="cbc:InvoicedQuantity"/>;<xsl:value-of select="cbc:InvoicedQuantity/@unitCode"/>;<xsl:call-template name="BedrijfNaam_regelnivo"/>;<xsl:call-template name="BedrijfAdres_regelnivo"/>;<xsl:call-template name="BedrijfPostcode_regelnivo"/>;<xsl:call-template name="BedrijfPlaats_regelnivo"/>;<xsl:call-template name="pdf_scan"/>;<xsl:call-template name="auto_incasso_regelnivo"/>;&#10;</xsl:for-each></xsl:when>
<!-- MARX#58839: eCapture levert niet te scannen grondslagbedragen in vervolg leeg aan, alleen die regels die niet leeg zijn, gaan we verwerken -->
<xsl:when test="count(//cac:TaxTotal/cac:TaxSubtotal[cbc:TaxableAmount != '']) != 0">
<xsl:for-each select="//cac:TaxTotal/cac:TaxSubtotal[cbc:TaxableAmount != '']">
<xsl:value-of select="../../cac:AccountingCustomerParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID"/>;<xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID"/>;<xsl:value-of select="../../cbc:ID"/>;<xsl:value-of select="../../cbc:IssueDate"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="../../cbc:Note"/></xsl:call-template>;<xsl:call-template name="get_customer_po_kopnivo"/>;<xsl:call-template name="construct_factuur_omschr"/>;<xsl:value-of select="cbc:TaxableAmount"/>;<xsl:call-template name="VATInformation_kopnivo"/>;<xsl:call-template name="get_filename_attachment_kopnivo"/>;<xsl:call-template name="IBAN_kopnivo"/>;<xsl:call-template name="G_IBAN_kopnivo"/>;<xsl:call-template name="G_Bedrag_kopnivo"/>;<xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID"/>;<xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme/cbc:CompanyID"/>;<xsl:value-of select="../../cac:Delivery/cbc:ActualDeliveryDate"/>;;;;;;;<xsl:call-template name="BedrijfNaam_kopnivo"/>;<xsl:call-template name="BedrijfAdres_kopnivo"/>;<xsl:call-template name="BedrijfPostcode_kopnivo"/>;<xsl:call-template name="BedrijfPlaats_kopnivo"/>;<xsl:call-template name="pdf_scan"/>;<xsl:call-template name="auto_incasso_kopnivo"/>;&#10;</xsl:for-each></xsl:when>
<!-- MARX#58839: eCapture levert niet te scannen grondslagbedragen in vervolg leeg aan, we doen bij alle lege waarden een fout BTW percentage, status wordt dan incompleet, en ten teken dat factuur wordt gemaild naar woco, BTW kon niet worden bepaald -->
<xsl:otherwise>
<xsl:for-each select="//cac:TaxTotal/cac:TaxSubtotal[cbc:TaxableAmount != '0,00']">
<xsl:value-of select="../../cac:AccountingCustomerParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID"/>;<xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID"/>;<xsl:value-of select="../../cbc:ID"/>;<xsl:value-of select="../../cbc:IssueDate"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="../../cbc:Note"/></xsl:call-template>;<xsl:call-template name="get_customer_po_kopnivo"/>;<xsl:call-template name="construct_factuur_omschr"/>;<xsl:value-of select="cbc:TaxableAmount"/>;<xsl:call-template name="VATInformation_kopnivo"/>;<xsl:call-template name="get_filename_attachment_kopnivo"/>;<xsl:call-template name="IBAN_kopnivo"/>;<xsl:call-template name="G_IBAN_kopnivo"/>;<xsl:call-template name="G_Bedrag_kopnivo"/>;<xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID"/>;<xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme/cbc:CompanyID"/>;<xsl:value-of select="../../cac:Delivery/cbc:ActualDeliveryDate"/>;;;;;;;<xsl:call-template name="BedrijfNaam_kopnivo"/>;<xsl:call-template name="BedrijfAdres_kopnivo"/>;<xsl:call-template name="BedrijfPostcode_kopnivo"/>;<xsl:call-template name="BedrijfPlaats_kopnivo"/>;<xsl:call-template name="pdf_scan"/>;<xsl:call-template name="auto_incasso_kopnivo"/>;&#10;</xsl:for-each></xsl:otherwise>
<xsl:for-each select="//cac:TaxTotal/cac:TaxSubtotal[1]">
<xsl:value-of select="../../cac:AccountingCustomerParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID"/>;<xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID"/>;<xsl:value-of select="../../cbc:ID"/>;<xsl:value-of select="../../cbc:IssueDate"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="../../cbc:Note"/></xsl:call-template>;<xsl:call-template name="get_customer_po_kopnivo"/>;<xsl:call-template name="construct_factuur_omschr"/>;<xsl:value-of select="cbc:TaxableAmount"/>;<xsl:call-template name="VATInformation_UNKNOWN"/>;<xsl:call-template name="get_filename_attachment_kopnivo"/>;<xsl:call-template name="IBAN_kopnivo"/>;<xsl:call-template name="G_IBAN_kopnivo"/>;<xsl:call-template name="G_Bedrag_kopnivo"/>;<xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID"/>;<xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme/cbc:CompanyID"/>;<xsl:value-of select="../../cac:Delivery/cbc:ActualDeliveryDate"/>;;;;;;;<xsl:call-template name="BedrijfNaam_kopnivo"/>;<xsl:call-template name="BedrijfAdres_kopnivo"/>;<xsl:call-template name="BedrijfPostcode_kopnivo"/>;<xsl:call-template name="BedrijfPlaats_kopnivo"/>;<xsl:call-template name="pdf_scan"/>;<xsl:call-template name="auto_incasso_kopnivo"/>;&#10;</xsl:for-each></xsl:otherwise>
</xsl:choose>
</xsl:template>
@@ -96,6 +101,18 @@
</xsl:choose>
</xsl:template>
<xsl:template name="VATInformation_UNKNOWN">
<!-- Deze template levert het gedeelte [btwperc;btwbedrag;btw_verlegd] op, waarvan het percentage onbekend is -->
<xsl:text>-1;</xsl:text>
<xsl:choose>
<!-- BTW verlegd = Ja -->
<xsl:when test="cac:TaxCategory/cbc:ID = 'AE' or
cac:TaxCategory/cac:TaxScheme/cbc:ID = 'AE'">;Ja</xsl:when>
<!-- BTW verlegd = Nee (Vatrate is dan S), veld btw_verlegd in CSV gewoon leeg laten-->
<xsl:otherwise>;</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="construct_factuurregel_omschr">
<xsl:call-template name="vrije_tekst">
<xsl:with-param name="p_string">