diff --git a/modules/edocument_ubl/CHANGELOG b/modules/edocument_ubl/CHANGELOG
index 63d5151e31..c0c50ba91b 100644
--- a/modules/edocument_ubl/CHANGELOG
+++ b/modules/edocument_ubl/CHANGELOG
@@ -1,3 +1,4 @@
+* Set BillingReference to Invoice and Credit Note
 * Render allowance and charge
 * Fill buyer's item identification
 
diff --git a/modules/edocument_ubl/template/2/CreditNote.xml b/modules/edocument_ubl/template/2/CreditNote.xml
index 742cee015b..a5fc9f1df0 100644
--- a/modules/edocument_ubl/template/2/CreditNote.xml
+++ b/modules/edocument_ubl/template/2/CreditNote.xml
@@ -24,6 +24,12 @@ this repository contains the full copyright notices and license terms. -->
     <cbc:ID>${this.sale_reference or 'NA'}</cbc:ID>
     <cbc:SalesOrderID py:if="this.sale_number">${this.sale_number}</cbc:SalesOrderID>
 </cac:OrderReference>
+<cac:BillingReference py:for="origin_invoice in this.invoice.origin_invoices">
+    <cac:InvoiceDocumentReference>
+        <cbc:ID>${origin_invoice.number}</cbc:ID>
+        <cbc:IssueDate>${origin_invoice.invoice_date}</cbc:IssueDate>
+    </cac:InvoiceDocumentReference>
+</cac:BillingReference>
 <cac:AdditionalDocumentReference py:for="document in this.additional_documents">
     <cbc:ID>${document['id']}</cbc:ID>
     <cbc:DocumentTypeCode py:if="document.get('code')">${document['code']}</cbc:DocumentTypeCode>
diff --git a/modules/edocument_ubl/template/2/Invoice.xml b/modules/edocument_ubl/template/2/Invoice.xml
index b90d149910..251594e190 100644
--- a/modules/edocument_ubl/template/2/Invoice.xml
+++ b/modules/edocument_ubl/template/2/Invoice.xml
@@ -24,6 +24,12 @@ this repository contains the full copyright notices and license terms. -->
     <cbc:ID>${this.sale_reference or 'NA'}</cbc:ID>
     <cbc:SalesOrderID py:if="this.sale_number">${this.sale_number}</cbc:SalesOrderID>
 </cac:OrderReference>
+<cac:BillingReference py:for="origin_invoice in this.invoice.origin_invoices">
+    <cac:InvoiceDocumentReference>
+        <cbc:ID>${origin_invoice.number}</cbc:ID>
+        <cbc:IssueDate>${origin_invoice.invoice_date}</cbc:IssueDate>
+    </cac:InvoiceDocumentReference>
+</cac:BillingReference>
 <cac:AdditionalDocumentReference py:for="document in this.additional_documents">
     <cbc:ID>${document['id']}</cbc:ID>
     <cbc:DocumentTypeCode py:if="document.get('code')">${document['code']}</cbc:DocumentTypeCode>