From 17d953ae7d6f017aa6bf72e1098df6517bed75f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 6 Jan 2026 17:42:51 +0100
Subject: [PATCH] Fill buyer's item identification in UBL invoice

Closes #14470
---
 modules/edocument_ubl/CHANGELOG                 |  1 +
 modules/edocument_ubl/template/2/CreditNote.xml | 11 +++++++----
 modules/edocument_ubl/template/2/Invoice.xml    | 11 +++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/modules/edocument_ubl/CHANGELOG b/modules/edocument_ubl/CHANGELOG
index ae8fc7ba72..2d549b8429 100644
--- a/modules/edocument_ubl/CHANGELOG
+++ b/modules/edocument_ubl/CHANGELOG
@@ -1,3 +1,4 @@
+* Fill buyer's item identification
 
 Version 7.8.0 - 2025-12-15
 --------------------------
diff --git a/modules/edocument_ubl/template/2/CreditNote.xml b/modules/edocument_ubl/template/2/CreditNote.xml
index cf89ca9f84..c9f7d9a19f 100644
--- a/modules/edocument_ubl/template/2/CreditNote.xml
+++ b/modules/edocument_ubl/template/2/CreditNote.xml
@@ -95,11 +95,14 @@ this repository contains the full copyright notices and license terms. -->
     <cbc:LineExtensionAmount py:attrs="{'currencyID': this.invoice.currency.code}">${-line.amount}</cbc:LineExtensionAmount>
     <cac:Item>
         <cbc:Description py:if="line.description">${line.description}</cbc:Description>
-        <cbc:Name>${line.product_name or line.summary}</cbc:Name>
+        <cbc:Name>${line.product.name if line.product else line.summary}</cbc:Name>
+        <cac:BuyersItemIdentification py:if="line.product_customer_code">
+            <cbc:ID>${line.product_customer_code}</cbc:ID>
+        </cac:BuyersItemIdentification>
+        <cac:SellersItemIdentification py:if="line.product_supplier_code">
+            <cbc:ID>${line.product_supplier_code}</cbc:ID>
+        </cac:SellersItemIdentification>
         <py:if test="line.product">
-            <cac:SellersItemIdentification py:if="line.product.code">
-                <cbc:ID>${line.product.code}</cbc:ID>
-            </cac:SellersItemIdentification>
             <py:with vars="gtin=line.product.identifier_get(['ean', 'isbn', 'ismn'])">
                 <cac:StandardItemIdentification py:if="gtin">
                     <cbc:ID schemeID="0160">${gtin}</cbc:ID>
diff --git a/modules/edocument_ubl/template/2/Invoice.xml b/modules/edocument_ubl/template/2/Invoice.xml
index 1b1a2ed8e8..1bd9683d0f 100644
--- a/modules/edocument_ubl/template/2/Invoice.xml
+++ b/modules/edocument_ubl/template/2/Invoice.xml
@@ -95,11 +95,14 @@ this repository contains the full copyright notices and license terms. -->
     <cbc:LineExtensionAmount py:attrs="{'currencyID': this.invoice.currency.code}">${line.amount}</cbc:LineExtensionAmount>
     <cac:Item>
         <cbc:Description py:if="line.description">${line.description}</cbc:Description>
-        <cbc:Name>${line.product_name or line.summary}</cbc:Name>
+        <cbc:Name>${line.product.name if line.product else line.summary}</cbc:Name>
+        <cac:BuyersItemIdentification py:if="line.product_customer_code">
+            <cbc:ID>${line.product_customer_code}</cbc:ID>
+        </cac:BuyersItemIdentification>
+        <cac:SellersItemIdentification py:if="line.product_supplier_code">
+            <cbc:ID>${line.product_supplier_code}</cbc:ID>
+        </cac:SellersItemIdentification>
         <py:if test="line.product">
-            <cac:SellersItemIdentification py:if="line.product.code">
-                <cbc:ID>${line.product.code}</cbc:ID>
-            </cac:SellersItemIdentification>
             <py:with vars="gtin=line.product.identifier_get(['ean', 'isbn', 'ismn'])">
                 <cac:StandardItemIdentification py:if="gtin">
                     <cbc:ID schemeID="0160">${gtin}</cbc:ID>