diff --git a/CUST/MARX/xsl/F_PutFactuurUBL.xsl b/CUST/MARX/xsl/F_PutFactuurUBL.xsl
index 79e65f0947..9ba122e12a 100644
--- a/CUST/MARX/xsl/F_PutFactuurUBL.xsl
+++ b/CUST/MARX/xsl/F_PutFactuurUBL.xsl
@@ -13,14 +13,14 @@
 
 
 <xsl:template match="/">
-<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</xsl:comment>
+<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</xsl:comment>
 <xsl:choose>
 <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:value-of select="../cac:PaymentMeans/cac:PayeeFinancialAccount/cbc:ID"/>;;;<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"/>;&#10;</xsl:for-each></xsl:when>
+<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:value-of select="../cac:PaymentMeans/cac:PayeeFinancialAccount/cbc:ID"/>;;;<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: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"/>;&#10;</xsl:for-each></xsl:when>
 <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:value-of select="../../cac:PaymentMeans/cac:PayeeFinancialAccount/cbc:ID"/>;;;<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"/>;&#10;</xsl:for-each></xsl:otherwise>
+<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:value-of select="../../cac:PaymentMeans/cac:PayeeFinancialAccount/cbc:ID"/>;;;<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"/>;&#10;</xsl:for-each></xsl:otherwise>
 </xsl:choose>
 </xsl:template>
 
@@ -95,10 +95,7 @@
 
 <xsl:template name="construct_factuurregel_omschr">
   <xsl:call-template name="vrije_tekst">
-    <xsl:with-param name="p_string">
-      <xsl:if test="cbc:InvoicedQuantity != ''"><xsl:value-of select="cbc:InvoicedQuantity"/><xsl:text> </xsl:text></xsl:if>
-      <xsl:if test="cbc:InvoicedQuantity/@unitCode != ''"><xsl:value-of select="cbc:InvoicedQuantity/@unitCode"/><xsl:text> </xsl:text></xsl:if>
-      <xsl:if test="cac:Item/cac:SellersItemIdentification/cbc:ID != ''"><xsl:value-of select="cac:Item/cac:SellersItemIdentification/cbc:ID"/><xsl:text> - </xsl:text></xsl:if>
+    <xsl:with-param name="p_string">      
       <xsl:if test="cac:Item/cbc:Name != ''"><xsl:value-of select="cac:Item/cbc:Name"/><xsl:text> </xsl:text></xsl:if>
       <xsl:if test="cac:Item/cbc:Description != ''"><xsl:value-of select="cac:Item/cbc:Description"/></xsl:if>      
     </xsl:with-param>
@@ -107,6 +104,50 @@
 
 <xsl:template name="construct_factuur_omschr">Subtotaal</xsl:template>
 
+<xsl:template name="BedrijfNaam_kopnivo">
+  <xsl:call-template name="vrije_tekst">
+    <xsl:with-param name="p_string"><xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PartyName/cbc:Name"/></xsl:with-param>
+   </xsl:call-template>
+</xsl:template>
+<xsl:template name="BedrijfNaam_regelnivo">
+  <xsl:call-template name="vrije_tekst">
+    <xsl:with-param name="p_string"><xsl:value-of select="../cac:AccountingSupplierParty/cac:Party/cac:PartyName/cbc:Name"/></xsl:with-param>
+   </xsl:call-template>
+</xsl:template>
+
+<xsl:template name="BedrijfAdres_kopnivo">
+  <xsl:call-template name="vrije_tekst">
+    <xsl:with-param name="p_string"><xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cbc:StreetName"/><xsl:text> </xsl:text><xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cbc:BuildingNumber"/></xsl:with-param>
+   </xsl:call-template>
+</xsl:template>
+<xsl:template name="BedrijfAdres_regelnivo">
+  <xsl:call-template name="vrije_tekst">
+    <xsl:with-param name="p_string"><xsl:value-of select="../cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cbc:StreetName"/><xsl:text> </xsl:text><xsl:value-of select="../cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cbc:BuildingNumber"/></xsl:with-param>
+   </xsl:call-template>
+</xsl:template>
+
+<xsl:template name="BedrijfPostcode_kopnivo">
+  <xsl:call-template name="vrije_tekst">
+    <xsl:with-param name="p_string"><xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cbc:Postbox"/></xsl:with-param>
+   </xsl:call-template>
+</xsl:template>
+<xsl:template name="BedrijfPostcode_regelnivo">
+  <xsl:call-template name="vrije_tekst">
+    <xsl:with-param name="p_string"><xsl:value-of select="../cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cbc:Postbox"/></xsl:with-param>
+   </xsl:call-template>
+</xsl:template>
+
+<xsl:template name="BedrijfPlaats_kopnivo">
+  <xsl:call-template name="vrije_tekst">
+    <xsl:with-param name="p_string"><xsl:value-of select="../../cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cbc:CityName"/></xsl:with-param>
+   </xsl:call-template>
+</xsl:template>
+<xsl:template name="BedrijfPlaats_regelnivo">
+  <xsl:call-template name="vrije_tekst">
+    <xsl:with-param name="p_string"><xsl:value-of select="../cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cbc:CityName"/></xsl:with-param>
+   </xsl:call-template>
+</xsl:template>
+
 
 <xsl:template name="vrije_tekst">
 <xsl:param name="p_string"/>