diff --git a/README.md b/README.md
index 165212d642..76ae6ad87d 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,10 @@ addon | version | maintainers | summary
 [account_edi_ubl_cii_additional_document](account_edi_ubl_cii_additional_document/) | 16.0.1.0.0 |  | Extends account_edi_ubl_cii to import all attachments from UBL invoices (not only PDFs) and link them to the vendor bill.
 [account_edi_ubl_cii_check_total](account_edi_ubl_cii_check_total/) | 16.0.1.0.0 | <a href='https://github.com/sbejaoui'><img src='https://github.com/sbejaoui.png' width='32' height='32' style='border-radius:50%;' alt='sbejaoui'/></a> | This addon extends the UBL invoice import process to automatically populate the suppliers check total field based on the value found in the XML file.
 [account_edi_ubl_cii_invoice_line_name_enhance](account_edi_ubl_cii_invoice_line_name_enhance/) | 16.0.1.0.0 |  | This module improves invoice line label generation when importing UBL vendor bills by including the product name when it is not already present.
+[account_edi_ubl_cii_purchase_match](account_edi_ubl_cii_purchase_match/) | 16.0.1.0.0 | <a href='https://github.com/sbejaoui'><img src='https://github.com/sbejaoui.png' width='32' height='32' style='border-radius:50%;' alt='sbejaoui'/></a> | Extend UBL vendor bill import to automatically match and link bill lines to purchase order lines using the OrderReference and product label.
+[account_edi_ubl_cii_retrieve_tax](account_edi_ubl_cii_retrieve_tax/) | 16.0.1.0.0 | <a href='https://github.com/sbejaoui'><img src='https://github.com/sbejaoui.png' width='32' height='32' style='border-radius:50%;' alt='sbejaoui'/></a> <a href='https://github.com/jbaudoux'><img src='https://github.com/jbaudoux.png' width='32' height='32' style='border-radius:50%;' alt='jbaudoux'/></a> | Match taxes on UBL import using UNECE tax codes
 [account_edi_ubl_cii_supplier_invoice_number](account_edi_ubl_cii_supplier_invoice_number/) | 16.0.1.0.0 |  | This addon extends the UBL invoice import process to automatically populate the suppliers invoice number based on the value found in the XML file.
+[account_edi_ubl_move_line_uom_and_packaging_unece](account_edi_ubl_move_line_uom_and_packaging_unece/) | 16.0.1.0.0 |  | Adds UNECE-based detection of UoM and packaging on invoice lines during UBL import.
 [account_einvoice_generate](account_einvoice_generate/) | 16.0.1.1.0 | <a href='https://github.com/alexis-via'><img src='https://github.com/alexis-via.png' width='32' height='32' style='border-radius:50%;' alt='alexis-via'/></a> | Technical module to generate PDF invoices with embedded XML file
 [account_invoice_download](account_invoice_download/) | 16.0.1.1.0 | <a href='https://github.com/alexis-via'><img src='https://github.com/alexis-via.png' width='32' height='32' style='border-radius:50%;' alt='alexis-via'/></a> | Auto-download supplier invoices and import them
 [account_invoice_download_ovh](account_invoice_download_ovh/) | 16.0.1.0.0 | <a href='https://github.com/alexis-via'><img src='https://github.com/alexis-via.png' width='32' height='32' style='border-radius:50%;' alt='alexis-via'/></a> | Get OVH Invoice via the API
diff --git a/account_edi_ubl_cii_purchase_match/README.rst b/account_edi_ubl_cii_purchase_match/README.rst
new file mode 100644
index 0000000000..2ebaeb65ba
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/README.rst
@@ -0,0 +1,190 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
+==================================
+Account Edi Ubl Cii Purchase Match
+==================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:6638e97230ca6d958934a20e04e9fc3db628053d14a6015261c3d062be6dbed1
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fedi-lightgray.png?logo=github
+    :target: https://github.com/OCA/edi/tree/16.0/account_edi_ubl_cii_purchase_match
+    :alt: OCA/edi
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/edi-16-0/edi-16-0-account_edi_ubl_cii_purchase_match
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/edi&target_branch=16.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This module extends the UBL vendor bill import process to improve how
+vendor bill lines are linked to purchase order lines.
+
+Instead of replacing the imported UBL lines with the purchase order
+lines (standard behavior), this module:
+
+1. **Reads the OrderReference** in the UBL document.
+
+2. **Identifies the corresponding Purchase Order** using the vendor
+   reference (``partner_ref``) or the purchase order ref.
+
+3. **Matches each UBL line** with a purchase order line based on:
+
+   - product name,
+   - supplier product name
+
+4. **Links the vendor bill line** to the matched PO line
+
+5. When a user manually selects a purchase order line from the bill:
+
+   - the system stores the supplier product name,
+   - future imports will auto-match using that supplier information.
+
+This ensures accurate line-level linking while preserving the supplier’s
+invoice data.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Use Cases / Context
+===================
+
+In the standard behavior, when importing a vendor bill from a UBL
+document:
+
+- If a Purchase Order is found, **all imported UBL lines are replaced**
+  by the Purchase Order lines.
+- This causes a **loss of original UBL data**, such as:
+
+  - line-level descriptions,
+  - quantities,
+  - pricing,
+  - tax information received from the supplier.
+
+- Additionally, the standard flow performs **no matching based on
+  product labels**, so incorrect PO lines may be added if PO content
+  does not reflect what is actually on the invoice.
+
+Configuration
+=============
+
+No configuration is required to use this module.
+
+However, for optimal matching:
+
+- Ensure that *OrderReference* in the vendor UBL document corresponds to
+  the Purchase Order Ref or the **Vendor Reference** (``partner_ref``).
+- Maintain consistent **product names** or **supplier product names** so
+  that UBL line descriptions can be matched to the correct purchase
+  order line.
+
+Optional but recommended:
+
+- Define supplier product names (``product.supplierinfo``) to improve
+  matching accuracy.
+
+Usage
+=====
+
+1. Import a vendor bill in UBL format through: Accounting / Vendors /
+   Bills / Upload
+2. The module will automatically:
+
+   - Extract the OrderReference from the UBL.
+   - Find the matching purchase order via ``partner_ref`` or purchase
+     order ref.
+   - Attempt to match each UBL line with the correct purchase order line
+     using:
+
+     - product name,
+     - supplier product name
+
+3. When a match is found: the vendor bill line is linked to the purchase
+   order line.
+4. If no match is found:
+
+   - Click "Select purchase line" button in invoice line
+   - Select a purchase order and a purchase order line
+
+Known issues / Roadmap
+======================
+
+This module implements custom purchase order line matching and replaces
+the standard behavior of linking vendor bills to purchase orders via
+UBL.
+
+Before migrating to future versions, it is recommended to verify
+whether:
+
+- Odoo natively supports precise line-level matching,
+- supplier product names and UBL descriptions are matched out of the
+  box,
+- and the original UBL lines are preserved.
+
+If the standard behavior evolves to fully cover this business
+requirement, this module may become unnecessary.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/edi/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/edi/issues/new?body=module:%20account_edi_ubl_cii_purchase_match%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* ACSONE SA/NV
+
+Contributors
+------------
+
+- Souheil Bejaoui souheil.bejaoui@acsone.eu
+
+Maintainers
+-----------
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+.. |maintainer-sbejaoui| image:: https://github.com/sbejaoui.png?size=40px
+    :target: https://github.com/sbejaoui
+    :alt: sbejaoui
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-sbejaoui| 
+
+This module is part of the `OCA/edi <https://github.com/OCA/edi/tree/16.0/account_edi_ubl_cii_purchase_match>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/account_edi_ubl_cii_purchase_match/__init__.py b/account_edi_ubl_cii_purchase_match/__init__.py
new file mode 100644
index 0000000000..aee8895e7a
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/__init__.py
@@ -0,0 +1,2 @@
+from . import models
+from . import wizards
diff --git a/account_edi_ubl_cii_purchase_match/__manifest__.py b/account_edi_ubl_cii_purchase_match/__manifest__.py
new file mode 100644
index 0000000000..e52db29bb2
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/__manifest__.py
@@ -0,0 +1,21 @@
+# Copyright 2025 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Account Edi Ubl Cii Purchase Match",
+    "summary": """Extend UBL vendor bill import to automatically match and link bill
+    lines to purchase order lines using the OrderReference and product label.""",
+    "version": "16.0.1.0.0",
+    "license": "AGPL-3",
+    "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/edi",
+    "depends": ["account_edi_ubl_cii", "purchase"],
+    "data": [
+        "security/account_move_line_select_purchase_line_wizard.xml",
+        "wizards/account_move_line_select_purchase_line_wizard.xml",
+        "views/account_move.xml",
+        "views/purchase_order_line.xml",
+    ],
+    "demo": [],
+    "maintainers": ["sbejaoui"],
+}
diff --git a/account_edi_ubl_cii_purchase_match/i18n/account_edi_ubl_cii_purchase_match.pot b/account_edi_ubl_cii_purchase_match/i18n/account_edi_ubl_cii_purchase_match.pot
new file mode 100644
index 0000000000..e3521e9bf7
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/i18n/account_edi_ubl_cii_purchase_match.pot
@@ -0,0 +1,300 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* account_edi_ubl_cii_purchase_match
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_edi_ubl_cii_purchase_match
+#. odoo-python
+#: code:addons/account_edi_ubl_cii_purchase_match/models/account_move_line.py:0
+#, python-format
+msgid "- Invoiced quantity exceeds the ordered quantity."
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#. odoo-python
+#: code:addons/account_edi_ubl_cii_purchase_match/models/account_move_line.py:0
+#, python-format
+msgid "- Invoiced quantity exceeds the received quantity."
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#. odoo-python
+#: code:addons/account_edi_ubl_cii_purchase_match/models/account_move_line.py:0
+#, python-format
+msgid "- Unit price differs from the purchase order line."
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__po_line_qty_invoiced
+msgid "Billed Qty"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_line_select_purchase_line_wizard_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_bank_statement_line__purchase_mismatch
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_move__purchase_mismatch
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_payment__purchase_mismatch
+msgid ""
+"Checked when this invoice has at least one line that does not fully match "
+"its related purchase order line."
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_move_line__purchase_line_mismatch
+msgid ""
+"Checked when this invoice line does not fully match its related purchase "
+"order line."
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.purchase_order_line_form_view
+msgid "Close"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_bank_statement_line__purchase_mismatch_details
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_move__purchase_mismatch_details
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_payment__purchase_mismatch_details
+msgid ""
+"Human-readable description of the differences between invoice lines and "
+"their related purchase order lines."
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_move_line__purchase_line_mismatch_details
+msgid ""
+"Human-readable description of the differences between this invoice line and "
+"the related purchase order line."
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__id
+msgid "ID"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.purchase_order_line_form_view
+msgid "Invoice"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_line_select_purchase_line_wizard_form_view
+msgid "Invoice line"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model,name:account_edi_ubl_cii_purchase_match.model_account_move
+msgid "Journal Entry"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model,name:account_edi_ubl_cii_purchase_match.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__description
+msgid "Label"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__purchase_order_line_id
+msgid "Line"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__move_line_id
+msgid "Move Line"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__move_line_price_subtotal
+msgid "Move line Subtotal"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__move_line_price_unit
+msgid "Move line Unit Price"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#. odoo-python
+#: code:addons/account_edi_ubl_cii_purchase_match/models/account_move.py:0
+#, python-format
+msgid "No product"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__po_line_product_uom_qty
+msgid "Ordered Qty"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__po_line_price_subtotal
+msgid "PO line Subtotal"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__po_line_price_unit
+msgid "PO line Unit Price"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__partner_id
+msgid "Partner"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__product_id
+msgid "Product"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__product_domain
+msgid "Product Domain"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_form_view
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_line_select_purchase_line_wizard_form_view
+msgid "Purchase Line"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line__purchase_line_mismatch
+msgid "Purchase Line Mismatch"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line__purchase_line_mismatch_details
+msgid "Purchase Line Mismatch Details"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_bank_statement_line__purchase_mismatch
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move__purchase_mismatch
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_payment__purchase_mismatch
+msgid "Purchase Mismatch"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_bank_statement_line__purchase_mismatch_details
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move__purchase_mismatch_details
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_payment__purchase_mismatch_details
+msgid "Purchase Mismatch Details"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__purchase_order_ids
+msgid "Purchase Order"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__move_line_quantity
+msgid "Quantity"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__po_line_qty_received
+msgid "Received Qty"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_form_view
+msgid "Select Purchase Line"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_line_select_purchase_line_wizard_form_view
+msgid "Select The Purchase Line"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_line_select_purchase_line_wizard_form_view
+msgid "Subtotal"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line__supplier_product_code
+msgid "Supplier Product Code"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#. odoo-python
+#: code:addons/account_edi_ubl_cii_purchase_match/models/account_move.py:0
+#, python-format
+msgid ""
+"The following differences were detected between this invoice and its related"
+" purchase order lines:\n"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__move_line_quantity
+msgid ""
+"The optional quantity expressed by this line, eg: number of product sold. "
+"The quantity is not a legal requirement but is very useful for some reports."
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model,name:account_edi_ubl_cii_purchase_match.model_account_edi_xml_ubl_20
+msgid "UBL 2.0"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_line_select_purchase_line_wizard_form_view
+msgid "Unit Price"
+msgstr ""
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model,name:account_edi_ubl_cii_purchase_match.model_account_move_line_select_purchase_line_wizard
+msgid "account move line select purchase line wizard"
+msgstr ""
diff --git a/account_edi_ubl_cii_purchase_match/i18n/fr.po b/account_edi_ubl_cii_purchase_match/i18n/fr.po
new file mode 100644
index 0000000000..0c69aadb48
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/i18n/fr.po
@@ -0,0 +1,315 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* account_edi_ubl_cii_purchase_match
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2026-05-27 15:10+0000\n"
+"PO-Revision-Date: 2026-05-27 15:10+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_edi_ubl_cii_purchase_match
+#. odoo-python
+#: code:addons/account_edi_ubl_cii_purchase_match/models/account_move_line.py:0
+#, python-format
+msgid "- Invoiced quantity exceeds the ordered quantity."
+msgstr "- La quantité facturée dépasse la quantité commandée."
+
+#. module: account_edi_ubl_cii_purchase_match
+#. odoo-python
+#: code:addons/account_edi_ubl_cii_purchase_match/models/account_move_line.py:0
+#, python-format
+msgid "- Invoiced quantity exceeds the received quantity."
+msgstr "- La quantité facturée dépasse la quantité reçue."
+
+#. module: account_edi_ubl_cii_purchase_match
+#. odoo-python
+#: code:addons/account_edi_ubl_cii_purchase_match/models/account_move_line.py:0
+#, python-format
+msgid "- Unit price differs from the purchase order line."
+msgstr "- Le prix unitaire diffère de celui de la ligne de commande."
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__po_line_qty_invoiced
+msgid "Billed Qty"
+msgstr "Qté facturée"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_line_select_purchase_line_wizard_form_view
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_bank_statement_line__purchase_mismatch
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_move__purchase_mismatch
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_payment__purchase_mismatch
+msgid ""
+"Checked when this invoice has at least one line that does not fully match "
+"its related purchase order line."
+msgstr ""
+"Coché lorsque cette facture comporte au moins une ligne ne correspondant pas "
+"entièrement à sa ligne de commande d'achat associée."
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_move_line__purchase_line_mismatch
+msgid ""
+"Checked when this invoice line does not fully match its related purchase "
+"order line."
+msgstr ""
+"Coché lorsque cette ligne de facture ne correspond pas entièrement à sa "
+"ligne de commande d'achat associée."
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.purchase_order_line_form_view
+msgid "Close"
+msgstr "Fermer"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__create_uid
+msgid "Created by"
+msgstr "Créé par"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__create_date
+msgid "Created on"
+msgstr "Créé le"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__currency_id
+msgid "Currency"
+msgstr "Devise"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__display_name
+msgid "Display Name"
+msgstr "Nom affiché"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_bank_statement_line__purchase_mismatch_details
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_move__purchase_mismatch_details
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_payment__purchase_mismatch_details
+msgid ""
+"Human-readable description of the differences between invoice lines and "
+"their related purchase order lines."
+msgstr ""
+"Description lisible des différences entre les lignes de facture et leurs "
+"lignes de commande d'achat associées."
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_move_line__purchase_line_mismatch_details
+msgid ""
+"Human-readable description of the differences between this invoice line and "
+"the related purchase order line."
+msgstr ""
+"Description lisible des différences entre cette ligne de facture et la ligne "
+"de commande d'achat associée."
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__id
+msgid "ID"
+msgstr "ID"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.purchase_order_line_form_view
+msgid "Invoice"
+msgstr "Facture"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_line_select_purchase_line_wizard_form_view
+msgid "Invoice line"
+msgstr "Ligne de facture"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model,name:account_edi_ubl_cii_purchase_match.model_account_move
+msgid "Journal Entry"
+msgstr "Pièce comptable"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model,name:account_edi_ubl_cii_purchase_match.model_account_move_line
+msgid "Journal Item"
+msgstr "Écriture comptable"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__description
+msgid "Label"
+msgstr "Libellé"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard____last_update
+msgid "Last Modified on"
+msgstr "Dernière modification le"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__write_uid
+msgid "Last Updated by"
+msgstr "Mis à jour par"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__write_date
+msgid "Last Updated on"
+msgstr "Mis à jour le"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__purchase_order_line_id
+msgid "Line"
+msgstr "Ligne"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__move_line_id
+msgid "Move Line"
+msgstr "Ligne d'écriture"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__move_line_price_subtotal
+msgid "Move line Subtotal"
+msgstr "Sous-total de la ligne d'écriture"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__move_line_price_unit
+msgid "Move line Unit Price"
+msgstr "Prix unitaire de la ligne d'écriture"
+
+#. module: account_edi_ubl_cii_purchase_match
+#. odoo-python
+#: code:addons/account_edi_ubl_cii_purchase_match/models/account_move.py:0
+#, python-format
+msgid "No product"
+msgstr "Aucun produit"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__po_line_product_uom_qty
+msgid "Ordered Qty"
+msgstr "Qté commandée"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__po_line_price_subtotal
+msgid "PO line Subtotal"
+msgstr "Sous-total de la ligne de commande"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__po_line_price_unit
+msgid "PO line Unit Price"
+msgstr "Prix unitaire de la ligne de commande"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__partner_id
+msgid "Partner"
+msgstr "Partenaire"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__product_id
+msgid "Product"
+msgstr "Produit"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__product_domain
+msgid "Product Domain"
+msgstr "Domaine produit"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_form_view
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_line_select_purchase_line_wizard_form_view
+msgid "Purchase Line"
+msgstr "Ligne d'achat"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line__purchase_line_mismatch
+msgid "Purchase Line Mismatch"
+msgstr "Incohérence ligne d'achat"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line__purchase_line_mismatch_details
+msgid "Purchase Line Mismatch Details"
+msgstr "Détails de l'incohérence ligne d'achat"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_bank_statement_line__purchase_mismatch
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move__purchase_mismatch
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_payment__purchase_mismatch
+msgid "Purchase Mismatch"
+msgstr "Incohérence d'achat"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_bank_statement_line__purchase_mismatch_details
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move__purchase_mismatch_details
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_payment__purchase_mismatch_details
+msgid "Purchase Mismatch Details"
+msgstr "Détails de l'incohérence d'achat"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__purchase_order_ids
+msgid "Purchase Order"
+msgstr "Commande d'achat"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__move_line_quantity
+msgid "Quantity"
+msgstr "Quantité"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__po_line_qty_received
+msgid "Received Qty"
+msgstr "Qté reçue"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_form_view
+msgid "Select Purchase Line"
+msgstr "Sélectionner une ligne d'achat"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_line_select_purchase_line_wizard_form_view
+msgid "Select The Purchase Line"
+msgstr "Sélectionner la ligne d'achat"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_line_select_purchase_line_wizard_form_view
+msgid "Subtotal"
+msgstr "Sous-total"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,field_description:account_edi_ubl_cii_purchase_match.field_account_move_line__supplier_product_code
+msgid "Supplier Product Code"
+msgstr "Référence produit fournisseur"
+
+#. module: account_edi_ubl_cii_purchase_match
+#. odoo-python
+#: code:addons/account_edi_ubl_cii_purchase_match/models/account_move.py:0
+#, python-format
+msgid ""
+"The following differences were detected between this invoice and its related"
+" purchase order lines:\n"
+msgstr ""
+"Les différences suivantes ont été détectées entre cette facture et ses "
+"lignes de commande d'achat associées :\n"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model.fields,help:account_edi_ubl_cii_purchase_match.field_account_move_line_select_purchase_line_wizard__move_line_quantity
+msgid ""
+"The optional quantity expressed by this line, eg: number of product sold. "
+"The quantity is not a legal requirement but is very useful for some reports."
+msgstr ""
+"La quantité facultative exprimée par cette ligne, par exemple le nombre de "
+"produits vendus. La quantité n'est pas une obligation légale, mais elle est "
+"très utile pour certains rapports."
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model,name:account_edi_ubl_cii_purchase_match.model_account_edi_xml_ubl_20
+msgid "UBL 2.0"
+msgstr "UBL 2.0"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model_terms:ir.ui.view,arch_db:account_edi_ubl_cii_purchase_match.account_move_line_select_purchase_line_wizard_form_view
+msgid "Unit Price"
+msgstr "Prix unitaire"
+
+#. module: account_edi_ubl_cii_purchase_match
+#: model:ir.model,name:account_edi_ubl_cii_purchase_match.model_account_move_line_select_purchase_line_wizard
+msgid "account move line select purchase line wizard"
+msgstr "assistant de sélection de ligne d'achat pour ligne d'écriture"
\ No newline at end of file
diff --git a/account_edi_ubl_cii_purchase_match/models/__init__.py b/account_edi_ubl_cii_purchase_match/models/__init__.py
new file mode 100644
index 0000000000..7a5c2f77f1
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/models/__init__.py
@@ -0,0 +1,3 @@
+from . import account_edi_xml_ubl_20
+from . import account_move
+from . import account_move_line
diff --git a/account_edi_ubl_cii_purchase_match/models/account_edi_xml_ubl_20.py b/account_edi_ubl_cii_purchase_match/models/account_edi_xml_ubl_20.py
new file mode 100644
index 0000000000..a7af12713b
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/models/account_edi_xml_ubl_20.py
@@ -0,0 +1,149 @@
+# Copyright 2025 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class AccountEdiXmlUBL20(models.AbstractModel):
+
+    _inherit = "account.edi.xml.ubl_20"
+
+    def _import_fill_invoice_form(self, journal, tree, invoice, qty_factor):
+        """
+        automatically match the invoice with a purchase order
+
+        - disable standard purchase matching to avoid conflicts
+        - only apply for vendor bills
+        - use invoice_origin (UBL OrderReference) to find the related PO
+        """
+        invoice = invoice.with_context(no_purchase_set=True)
+        res = super()._import_fill_invoice_form(journal, tree, invoice, qty_factor)
+        if journal.type != "purchase":
+            return res
+        if not invoice.invoice_origin:
+            return res
+        self._match_invoice_to_purchase_order(invoice)
+        return res
+
+    def _match_invoice_to_purchase_order(self, invoice):
+        """
+        match the invoice with a purchase order using the order ref
+
+        matching is done on:
+        - PO name
+        - Vendor reference (partner_ref)
+        -o nly confirmed POs are considered
+        """
+        po_candidates = invoice._extract_purchase_references_from_origin()
+        purchase_orders = self.env["purchase.order"].search(
+            [
+                ("name", "in", po_candidates),
+                ("state", "in", ("purchase", "done")),
+            ]
+        )
+        if not purchase_orders:
+            return False
+        for invoice_line in invoice.invoice_line_ids:
+            self._match_invoice_line_to_purchase_order_line(
+                invoice_line, purchase_orders.order_line
+            )
+        return True
+
+    def _match_invoice_line_to_purchase_order_line(self, invoice_line, purchase_lines):
+        """Match an invoice line to a purchase order line
+
+        A match is considered when at least one of these conditions is true:
+        - same product
+        - same description
+        - invoice line description matches the purchase line product name
+        - supplier product code matches one of the vendor codes of the product
+        - invoice line description matches one of the vendor product names
+        """
+        if invoice_line.purchase_line_id:
+            return False
+        for purchase_line in purchase_lines:
+            product = purchase_line.product_id
+            seller_product_codes = product.seller_ids.mapped("product_code")
+            seller_product_names = product.seller_ids.mapped("product_name")
+
+            same_product = product == invoice_line.product_id
+            same_description = purchase_line.name == invoice_line.name
+            matches_product_name = product.name == invoice_line.name
+            matches_supplier_code = bool(invoice_line.supplier_product_code) and (
+                invoice_line.supplier_product_code in seller_product_codes
+            )
+            matches_supplier_name = (
+                bool(invoice_line.name) and invoice_line.name in seller_product_names
+            )
+
+            if any(
+                [
+                    same_product,
+                    same_description,
+                    matches_product_name,
+                    matches_supplier_code,
+                    matches_supplier_name,
+                ]
+            ):
+                invoice_line._set_product(product)
+                invoice_line.purchase_line_id = purchase_line
+                break
+
+        return True
+
+    def _import_fill_invoice_line_form(
+        self, journal, tree, invoice, invoice_line, qty_factor
+    ):
+        """
+        add a fallback product lookup based on the supplier product code.
+
+        the standard import logic doesn't cover this matching path, so if no product
+        was found after the super call, try to resolve it from supplierinfo using the
+        UBL SellerItemIdentification value
+        """
+        res = super()._import_fill_invoice_line_form(
+            journal, tree, invoice, invoice_line, qty_factor
+        )
+        if invoice_line.product_id:
+            return res
+        supplier_product_code = self._find_value(
+            "./cac:Item/cac:SellersItemIdentification/cbc:ID", tree
+        )
+        if not supplier_product_code:
+            return res
+        invoice_line.supplier_product_code = supplier_product_code
+        product = self._retrieve_product_by_supplierinfo(
+            invoice.partner_id, supplier_product_code
+        )
+        if not product:
+            return res
+        invoice_line._set_product(product)
+        return res
+
+    def _retrieve_product_by_supplierinfo(self, partner, supplier_product_code):
+        """
+        retrieve a product using supplierinfo based on:
+        - supplier (partner)
+        - supplier product code
+
+        returns:
+        - product variant if directly linked
+        - single variant if template has only one variant
+        - empty recordset otherwise
+        """
+        product_sinfo = self.env["product.supplierinfo"].search(
+            [
+                ("product_code", "=", supplier_product_code),
+                ("partner_id", "=", partner.id),
+            ],
+            limit=1,
+        )
+        if product_sinfo and product_sinfo.product_id:
+            return product_sinfo.product_id
+        if (
+            product_sinfo
+            and product_sinfo.product_tmpl_id
+            and len(product_sinfo.product_tmpl_id.product_variant_ids) == 1
+        ):
+            return product_sinfo.product_tmpl_id.product_variant_ids
+        return self.env["product.product"]
diff --git a/account_edi_ubl_cii_purchase_match/models/account_move.py b/account_edi_ubl_cii_purchase_match/models/account_move.py
new file mode 100644
index 0000000000..8a20149659
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/models/account_move.py
@@ -0,0 +1,88 @@
+# Copyright 2025 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+import re
+
+from odoo import _, api, fields, models
+
+
+class AccountMove(models.Model):
+
+    _inherit = "account.move"
+
+    purchase_mismatch = fields.Boolean(
+        compute="_compute_purchase_mismatch",
+        help=(
+            "Checked when this invoice has at least one line that does not fully "
+            "match its related purchase order line."
+        ),
+    )
+    purchase_mismatch_details = fields.Text(
+        compute="_compute_purchase_mismatch",
+        help=(
+            "Human-readable description of the differences between invoice lines "
+            "and their related purchase order lines."
+        ),
+    )
+
+    @api.depends(
+        "invoice_line_ids.purchase_line_mismatch",
+        "invoice_line_ids.purchase_line_mismatch_details",
+        "invoice_line_ids.product_id",
+        "invoice_line_ids.name",
+    )
+    def _compute_purchase_mismatch(self):
+        for rec in self:
+            mismatch_lines = rec.invoice_line_ids.filtered("purchase_line_mismatch")
+
+            if not mismatch_lines:
+                rec.purchase_mismatch = False
+                rec.purchase_mismatch_details = False
+                continue
+
+            rec.purchase_mismatch = True
+
+            purchase_mismatch_details = _(
+                "The following differences were detected between this invoice and its "
+                "related purchase order lines:\n"
+            )
+            for line in mismatch_lines:
+                product_label = (
+                    line.product_id.display_name or line.name or _("No product")
+                )
+                purchase_mismatch_details += product_label + "\n"
+                purchase_mismatch_details += line.purchase_line_mismatch_details + "\n"
+            rec.purchase_mismatch_details = purchase_mismatch_details
+
+    def _link_invoice_origin_to_purchase_orders(self, timeout=10):
+        # disable standard purchase linking
+        return self
+
+    def _get_po_sequence_prefix(self):
+        """return the prefix used by purchase order sequence"""
+        seq = (
+            self.env["ir.sequence"]
+            .sudo()
+            .search([("code", "=", "purchase.order")], limit=1)
+        )
+        if not seq:
+            return "PO"
+        prefix = seq.prefix or ""
+        match = re.match(r"([A-Za-z]+)", prefix)
+        if match:
+            return match.group(1)
+        return "PO"
+
+    def _extract_purchase_references_from_origin(self, invoice_origin=None):
+        invoice_origin = invoice_origin if invoice_origin else self.invoice_origin
+        if not invoice_origin:
+            return []
+        prefix = self._get_po_sequence_prefix()
+        # flake8: noqa: E231
+        pattern = rf"(?:#)?({re.escape(prefix)}[-/\s]?\d+(?:[-/\s]?\d+)*)"
+        matches = re.findall(pattern, invoice_origin, flags=re.IGNORECASE)
+        normalized = []
+        for match in matches:
+            value = re.sub(r"[\s#]", "", match).upper()
+            normalized.append(value)
+        return list(dict.fromkeys(normalized))
diff --git a/account_edi_ubl_cii_purchase_match/models/account_move_line.py b/account_edi_ubl_cii_purchase_match/models/account_move_line.py
new file mode 100644
index 0000000000..2d4488076a
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/models/account_move_line.py
@@ -0,0 +1,154 @@
+# Copyright 2025 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import Command, _, api, fields, models
+from odoo.tools import float_compare
+
+
+class AccountMoveLine(models.Model):
+
+    _inherit = "account.move.line"
+    supplier_product_code = fields.Char(readonly=True)
+    purchase_line_mismatch = fields.Boolean(
+        compute="_compute_purchase_line_mismatch",
+        help="Checked when this invoice line does not fully match its related purchase"
+        " order line.",
+    )
+    purchase_line_mismatch_details = fields.Text(
+        compute="_compute_purchase_line_mismatch",
+        help="Human-readable description of the differences between this invoice line"
+        " and the related purchase order line.",
+    )
+
+    @api.depends(
+        "purchase_line_id", "move_id.state", "price_unit", "price_subtotal", "quantity"
+    )
+    def _compute_purchase_line_mismatch(self):
+        for rec in self:
+            if not rec.purchase_line_id or rec.move_id.state != "draft":
+                rec.purchase_line_mismatch = False
+                rec.purchase_line_mismatch_details = False
+                continue
+
+            differences = []
+            po_line = rec.purchase_line_id
+            precision = rec.currency_id.rounding or 0.01
+            if (
+                float_compare(
+                    rec.price_unit,
+                    po_line.price_unit,
+                    precision_rounding=precision,
+                )
+                != 0
+            ):
+                differences.append(
+                    _("- Unit price differs from the purchase order line.")
+                )
+            if (
+                float_compare(
+                    po_line.qty_invoiced,
+                    po_line.product_uom_qty,
+                    precision_rounding=po_line.product_uom.rounding or 0.01,
+                )
+                > 0
+            ):
+                differences.append(
+                    _("- Invoiced quantity exceeds the ordered quantity.")
+                )
+            if (
+                po_line.product_id.purchase_method == "receive"
+                and float_compare(
+                    po_line.qty_received,
+                    po_line.qty_invoiced,
+                    precision_rounding=po_line.product_uom.rounding or 0.01,
+                )
+                < 0
+            ):
+                differences.append(
+                    _("- Invoiced quantity exceeds the received quantity.")
+                )
+            if differences:
+                rec.purchase_line_mismatch = True
+                rec.purchase_line_mismatch_details = "\n".join(differences)
+            else:
+                rec.purchase_line_mismatch = False
+                rec.purchase_line_mismatch_details = False
+
+    def _update_product_supplier_name(self):
+        for rec in self:
+            if not rec.name or not rec.product_id:
+                continue
+            seller = rec.product_id.seller_ids.filtered(
+                lambda s: s.partner_id == rec.move_id.partner_id
+                and (
+                    s.product_id == rec.product_id
+                    or s.product_tmpl_id == rec.product_id.product_tmpl_id
+                )
+            )
+            if not seller:
+                rec.product_id.seller_ids.create(
+                    {
+                        "product_id": rec.product_id.id,
+                        "product_code": rec.supplier_product_code,
+                        "price": rec.price_unit,
+                    }
+                )
+            else:
+                if rec.supplier_product_code:
+                    seller.product_code = rec.supplier_product_code
+
+    def action_select_purchase_line(self):
+        self.ensure_one()
+        purchase_orders = self.purchase_line_id.order_id
+        partner = self.move_id.partner_id
+        if not purchase_orders and self.move_id.invoice_origin:
+            po_candidates = self.move_id._extract_purchase_references_from_origin()
+            purchase_orders = self.env["purchase.order"].search(
+                [
+                    ("name", "in", po_candidates),
+                    ("state", "in", ("purchase", "done")),
+                    ("partner_id", "=", partner.id),
+                ]
+            )
+        context = {
+            **self.env.context,
+            **{
+                "default_move_line_id": self.id,
+                "default_partner_id": partner.id,
+                "default_purchase_order_ids": [Command.set(purchase_orders.ids)],
+                "default_purchase_order_line_id": self.purchase_line_id.id,
+            },
+        }
+        return {
+            "type": "ir.actions.act_window",
+            "name": "Select Purchase Line",
+            "res_model": "account.move.line.select.purchase.line.wizard",
+            "view_mode": "form",
+            "target": "new",
+            "context": context,
+        }
+
+    def action_show_purchase_line(self):
+        self.ensure_one()
+        if not self.purchase_line_id:
+            return {}
+        form = self.env.ref(
+            "account_edi_ubl_cii_purchase_match.purchase_order_line_form_view"
+        )
+        return {
+            "type": "ir.actions.act_window",
+            "name": self.purchase_line_id.display_name,
+            "res_model": self.purchase_line_id._name,
+            "view_mode": "form",
+            "views": [(form.id, "form")],
+            "view_id": form.id,
+            "res_id": self.purchase_line_id.id,
+            "target": "new",
+            "context": self.env.context,
+        }
+
+    def _set_product(self, product):
+        self.ensure_one()
+        price_unit = self.price_unit
+        self.product_id = product
+        self.price_unit = price_unit
diff --git a/account_edi_ubl_cii_purchase_match/readme/CONFIGURE.md b/account_edi_ubl_cii_purchase_match/readme/CONFIGURE.md
new file mode 100644
index 0000000000..dbefa8c9d6
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/readme/CONFIGURE.md
@@ -0,0 +1,12 @@
+No configuration is required to use this module.
+
+However, for optimal matching:
+
+- Ensure that *OrderReference* in the vendor UBL document corresponds to the 
+Purchase Order Ref or the **Vendor Reference** (`partner_ref`).
+- Maintain consistent **product names** or **supplier product names** so 
+that UBL line descriptions can be matched to the correct purchase order line.
+
+Optional but recommended:
+- Define supplier product names (`product.supplierinfo`) to improve matching
+accuracy.
\ No newline at end of file
diff --git a/account_edi_ubl_cii_purchase_match/readme/CONTEXT.md b/account_edi_ubl_cii_purchase_match/readme/CONTEXT.md
new file mode 100644
index 0000000000..ad026776f5
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/readme/CONTEXT.md
@@ -0,0 +1,12 @@
+In the standard behavior, when importing a vendor bill from a UBL document:
+
+- If a Purchase Order is found, **all imported UBL lines are replaced** by 
+the Purchase Order lines.
+- This causes a **loss of original UBL data**, such as:
+  - line-level descriptions,
+  - quantities,
+  - pricing,
+  - tax information received from the supplier.
+- Additionally, the standard flow performs **no matching based on product labels**, 
+so incorrect PO lines may be added if PO content does not reflect what is 
+actually on the invoice.
diff --git a/account_edi_ubl_cii_purchase_match/readme/CONTRIBUTORS.md b/account_edi_ubl_cii_purchase_match/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000000..dbdd727b4a
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/readme/CONTRIBUTORS.md
@@ -0,0 +1 @@
+- Souheil Bejaoui <souheil.bejaoui@acsone.eu>
diff --git a/account_edi_ubl_cii_purchase_match/readme/DESCRIPTION.md b/account_edi_ubl_cii_purchase_match/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..ae1764786e
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/readme/DESCRIPTION.md
@@ -0,0 +1,20 @@
+This module extends the UBL vendor bill import process to improve how vendor
+bill lines are linked to purchase order lines.
+
+Instead of replacing the imported UBL lines with the purchase order lines
+(standard behavior), this module:
+
+1. **Reads the OrderReference** in the UBL document.
+2. **Identifies the corresponding Purchase Order** using the vendor reference
+(`partner_ref`) or the purchase order ref.
+3. **Matches each UBL line** with a purchase order line based on:
+   - product name,
+   - supplier product name
+
+4. **Links the vendor bill line** to the matched PO line
+5. When a user manually selects a purchase order line from the bill:
+   - the system stores the supplier product name,
+   - future imports will auto-match using that supplier information.
+
+This ensures accurate line-level linking while preserving the supplier’s
+invoice data.
\ No newline at end of file
diff --git a/account_edi_ubl_cii_purchase_match/readme/ROADMAP.md b/account_edi_ubl_cii_purchase_match/readme/ROADMAP.md
new file mode 100644
index 0000000000..b5071ac30d
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/readme/ROADMAP.md
@@ -0,0 +1,10 @@
+This module implements custom purchase order line matching and replaces
+the standard behavior of linking vendor bills to purchase orders via UBL.
+
+Before migrating to future versions, it is recommended to verify whether:
+- Odoo natively supports precise line-level matching,
+- supplier product names and UBL descriptions are matched out of the box,
+- and the original UBL lines are preserved.
+
+If the standard behavior evolves to fully cover this business requirement,
+this module may become unnecessary.
diff --git a/account_edi_ubl_cii_purchase_match/readme/USAGE.md b/account_edi_ubl_cii_purchase_match/readme/USAGE.md
new file mode 100644
index 0000000000..fb514c3940
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/readme/USAGE.md
@@ -0,0 +1,11 @@
+1. Import a vendor bill in UBL format through: Accounting / Vendors / Bills / Upload
+2. The module will automatically:
+   - Extract the OrderReference from the UBL.
+   - Find the matching purchase order via `partner_ref` or purchase order ref.
+   - Attempt to match each UBL line with the correct purchase order line using:
+     - product name,
+     - supplier product name
+3. When a match is found: the vendor bill line is linked to the purchase order line.
+4. If no match is found:
+   - Click "Select purchase line" button in invoice line 
+   - Select a purchase order and a purchase order line
\ No newline at end of file
diff --git a/account_edi_ubl_cii_purchase_match/security/account_move_line_select_purchase_line_wizard.xml b/account_edi_ubl_cii_purchase_match/security/account_move_line_select_purchase_line_wizard.xml
new file mode 100644
index 0000000000..b55260f160
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/security/account_move_line_select_purchase_line_wizard.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2025 ACSONE SA/NV
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record
+        model="ir.model.access"
+        id="account_move_line_select_purchase_line_wizard_access_all"
+    >
+        <field
+            name="name"
+        >account.move.line.select.purchase.line.wizard access all</field>
+        <field
+            name="model_id"
+            ref="model_account_move_line_select_purchase_line_wizard"
+        />
+        <field name="group_id" ref="account.group_account_invoice" />
+        <field name="perm_read" eval="1" />
+        <field name="perm_create" eval="1" />
+        <field name="perm_write" eval="1" />
+        <field name="perm_unlink" eval="1" />
+    </record>
+
+</odoo>
diff --git a/account_edi_ubl_cii_purchase_match/static/description/icon.png b/account_edi_ubl_cii_purchase_match/static/description/icon.png
new file mode 100644
index 0000000000..3a0328b516
Binary files /dev/null and b/account_edi_ubl_cii_purchase_match/static/description/icon.png differ
diff --git a/account_edi_ubl_cii_purchase_match/static/description/index.html b/account_edi_ubl_cii_purchase_match/static/description/index.html
new file mode 100644
index 0000000000..da7cd91db8
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/static/description/index.html
@@ -0,0 +1,534 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>README.rst</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document">
+
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="account-edi-ubl-cii-purchase-match">
+<h1>Account Edi Ubl Cii Purchase Match</h1>
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:6638e97230ca6d958934a20e04e9fc3db628053d14a6015261c3d062be6dbed1
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/edi/tree/16.0/account_edi_ubl_cii_purchase_match"><img alt="OCA/edi" src="https://img.shields.io/badge/github-OCA%2Fedi-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/edi-16-0/edi-16-0-account_edi_ubl_cii_purchase_match"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/edi&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This module extends the UBL vendor bill import process to improve how
+vendor bill lines are linked to purchase order lines.</p>
+<p>Instead of replacing the imported UBL lines with the purchase order
+lines (standard behavior), this module:</p>
+<ol class="arabic simple">
+<li><strong>Reads the OrderReference</strong> in the UBL document.</li>
+<li><strong>Identifies the corresponding Purchase Order</strong> using the vendor
+reference (<tt class="docutils literal">partner_ref</tt>) or the purchase order ref.</li>
+<li><strong>Matches each UBL line</strong> with a purchase order line based on:<ul>
+<li>product name,</li>
+<li>supplier product name</li>
+</ul>
+</li>
+<li><strong>Links the vendor bill line</strong> to the matched PO line</li>
+<li>When a user manually selects a purchase order line from the bill:<ul>
+<li>the system stores the supplier product name,</li>
+<li>future imports will auto-match using that supplier information.</li>
+</ul>
+</li>
+</ol>
+<p>This ensures accurate line-level linking while preserving the supplier’s
+invoice data.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#use-cases-context" id="toc-entry-1">Use Cases / Context</a></li>
+<li><a class="reference internal" href="#configuration" id="toc-entry-2">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="toc-entry-3">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-4">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-5">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-6">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-7">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-8">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-9">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="use-cases-context">
+<h2><a class="toc-backref" href="#toc-entry-1">Use Cases / Context</a></h2>
+<p>In the standard behavior, when importing a vendor bill from a UBL
+document:</p>
+<ul class="simple">
+<li>If a Purchase Order is found, <strong>all imported UBL lines are replaced</strong>
+by the Purchase Order lines.</li>
+<li>This causes a <strong>loss of original UBL data</strong>, such as:<ul>
+<li>line-level descriptions,</li>
+<li>quantities,</li>
+<li>pricing,</li>
+<li>tax information received from the supplier.</li>
+</ul>
+</li>
+<li>Additionally, the standard flow performs <strong>no matching based on
+product labels</strong>, so incorrect PO lines may be added if PO content
+does not reflect what is actually on the invoice.</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h2><a class="toc-backref" href="#toc-entry-2">Configuration</a></h2>
+<p>No configuration is required to use this module.</p>
+<p>However, for optimal matching:</p>
+<ul class="simple">
+<li>Ensure that <em>OrderReference</em> in the vendor UBL document corresponds to
+the Purchase Order Ref or the <strong>Vendor Reference</strong> (<tt class="docutils literal">partner_ref</tt>).</li>
+<li>Maintain consistent <strong>product names</strong> or <strong>supplier product names</strong> so
+that UBL line descriptions can be matched to the correct purchase
+order line.</li>
+</ul>
+<p>Optional but recommended:</p>
+<ul class="simple">
+<li>Define supplier product names (<tt class="docutils literal">product.supplierinfo</tt>) to improve
+matching accuracy.</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h2><a class="toc-backref" href="#toc-entry-3">Usage</a></h2>
+<ol class="arabic simple">
+<li>Import a vendor bill in UBL format through: Accounting / Vendors /
+Bills / Upload</li>
+<li>The module will automatically:<ul>
+<li>Extract the OrderReference from the UBL.</li>
+<li>Find the matching purchase order via <tt class="docutils literal">partner_ref</tt> or purchase
+order ref.</li>
+<li>Attempt to match each UBL line with the correct purchase order line
+using:<ul>
+<li>product name,</li>
+<li>supplier product name</li>
+</ul>
+</li>
+</ul>
+</li>
+<li>When a match is found: the vendor bill line is linked to the purchase
+order line.</li>
+<li>If no match is found:<ul>
+<li>Click “Select purchase line” button in invoice line</li>
+<li>Select a purchase order and a purchase order line</li>
+</ul>
+</li>
+</ol>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h2><a class="toc-backref" href="#toc-entry-4">Known issues / Roadmap</a></h2>
+<p>This module implements custom purchase order line matching and replaces
+the standard behavior of linking vendor bills to purchase orders via
+UBL.</p>
+<p>Before migrating to future versions, it is recommended to verify
+whether:</p>
+<ul class="simple">
+<li>Odoo natively supports precise line-level matching,</li>
+<li>supplier product names and UBL descriptions are matched out of the
+box,</li>
+<li>and the original UBL lines are preserved.</li>
+</ul>
+<p>If the standard behavior evolves to fully cover this business
+requirement, this module may become unnecessary.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h2><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h2>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/edi/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/edi/issues/new?body=module:%20account_edi_ubl_cii_purchase_match%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h2><a class="toc-backref" href="#toc-entry-6">Credits</a></h2>
+<div class="section" id="authors">
+<h3><a class="toc-backref" href="#toc-entry-7">Authors</a></h3>
+<ul class="simple">
+<li>ACSONE SA/NV</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h3><a class="toc-backref" href="#toc-entry-8">Contributors</a></h3>
+<ul class="simple">
+<li>Souheil Bejaoui <a class="reference external" href="mailto:souheil.bejaoui&#64;acsone.eu">souheil.bejaoui&#64;acsone.eu</a></li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h3><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h3>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
+<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.</p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
+<p><a class="reference external image-reference" href="https://github.com/sbejaoui"><img alt="sbejaoui" src="https://github.com/sbejaoui.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/edi/tree/16.0/account_edi_ubl_cii_purchase_match">OCA/edi</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/account_edi_ubl_cii_purchase_match/tests/__init__.py b/account_edi_ubl_cii_purchase_match/tests/__init__.py
new file mode 100644
index 0000000000..df41f3af05
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_account_edi_ubl_cii_purchase_match
diff --git a/account_edi_ubl_cii_purchase_match/tests/test_account_edi_ubl_cii_purchase_match.py b/account_edi_ubl_cii_purchase_match/tests/test_account_edi_ubl_cii_purchase_match.py
new file mode 100644
index 0000000000..755e3d03cd
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/tests/test_account_edi_ubl_cii_purchase_match.py
@@ -0,0 +1,423 @@
+# Copyright 2025 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import Command
+from odoo.tests import tagged
+from odoo.tools import file_open
+
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+
+@tagged("post_install", "-at_install")
+class TestAccountEdiUblCiiPurchaseMatch(AccountTestInvoicingCommon):
+    @classmethod
+    def setUpClass(cls, chart_template_ref=None):
+        super().setUpClass()
+        cls.env["ir.config_parameter"].sudo().set_param(
+            "account_edi.product_name_match", True
+        )
+        cls.env["ir.sequence"].search(
+            [("code", "=", "purchase.order")], limit=1
+        ).prefix = "PO"
+        cls.product = cls.env["product.product"].create(
+            {"name": "test_product", "standard_price": 100}
+        )
+        cls.partner = cls.env["res.partner"].create(
+            {"name": "ALD Automotive LU", "vat": "LU25587702"}
+        )
+        cls.purchase_order = cls.env["purchase.order"].create(
+            {
+                "name": "PO0032",
+                "partner_id": cls.partner.id,
+                "order_line": [
+                    Command.create(
+                        {
+                            "name": cls.product.name,
+                            "product_id": cls.product.id,
+                            "product_qty": 1,
+                            "price_unit": 657,
+                        }
+                    ),
+                ],
+            }
+        )
+        cls.po_line = cls.purchase_order.order_line
+        cls.purchase_order.button_confirm()
+
+    def _import_invoice(self, journal, file_path=None):
+        if file_path is None:
+            file_path = (
+                "account_edi_ubl_cii_purchase_match/tests/test_files/"
+                "bis3_bill_example.xml"
+            )
+        with file_open(file_path, "rb") as file:
+            xml_attachment = self.env["ir.attachment"].create(
+                {
+                    "mimetype": "application/xml",
+                    "name": "test_invoice.xml",
+                    "raw": file.read(),
+                }
+            )
+        move = (
+            self.env["account.journal"]
+            .with_context(default_journal_id=journal.id)
+            ._create_document_from_attachment(xml_attachment.id)
+        )
+        return move
+
+    def _create_purchase_order(self, product, name=None):
+        po = self.env["purchase.order"].create(
+            {
+                "partner_id": self.partner.id,
+                "order_line": [
+                    Command.create(
+                        {
+                            "name": product.name,
+                            "product_id": product.id,
+                            "product_qty": 1,
+                            "price_unit": 1000,
+                        }
+                    ),
+                ],
+            }
+        )
+        if name:
+            po.name = name
+        po.button_confirm()
+        return po
+
+    def test_0(self):
+        """
+        Default behavior
+        without matching criteria, no purchase line or product
+        is assigned. Sale journals are also ignored
+        """
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        self.assertEqual(bill.partner_id, self.partner)
+        inv_line = bill.invoice_line_ids
+        self.assertFalse(inv_line.purchase_line_id)
+        self.assertFalse(inv_line.product_id)
+        invoice = self._import_invoice(self.company_data["default_journal_sale"])
+        self.assertEqual(invoice.partner_id, self.partner)
+        inv_line = invoice.invoice_line_ids
+        self.assertFalse(inv_line.purchase_line_id)
+        self.assertFalse(inv_line.product_id)
+
+    def test_1(self):
+        """
+        OrderReference matches a purchase order, but no product match is found.
+        Standard behavior is disabled: no PO lines are created from the PO, only the
+        UBL invoice line is imported
+        """
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(len(inv_line), 1)  # standard behavior is desabled
+        self.assertFalse(inv_line.purchase_line_id)
+        self.assertFalse(inv_line.product_id)
+
+    def test_2(self):
+        """
+        The product name matches the UBL line description, so the vendor bill line is
+        linked to the PO line and the product is set accordingly
+        """
+        self.product.name = "Locations and leasing"
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.purchase_line_id, self.po_line)
+        self.assertEqual(inv_line.product_id, self.product)
+        return inv_line
+
+    def test_3(self):
+        """
+        The supplier product name (defined on the product variant via supplierinfo)
+        matches the UBL line description, so the bill line is correctly linked to the
+        PO line and product
+        """
+
+        self.env["product.supplierinfo"].create(
+            {
+                "partner_id": self.partner.id,
+                "product_name": "Locations and leasing",
+                "product_id": self.product.id,
+            }
+        )
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.purchase_line_id, self.po_line)
+        self.assertEqual(inv_line.product_id, self.product)
+
+    def test_4(self):
+        """
+        The supplier product name (defined on the product template via supplierinfo)
+        matches the UBL line description, so the bill line is linked to the PO line and
+        product
+        """
+
+        self.env["product.supplierinfo"].create(
+            {
+                "partner_id": self.partner.id,
+                "product_name": "Locations and leasing",
+                "product_tmpl_id": self.product.product_tmpl_id.id,
+            }
+        )
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.purchase_line_id, self.po_line)
+        self.assertEqual(inv_line.product_id, self.product)
+
+    def test_5(self):
+        """
+        When no product match is found, the user manually links the bill line to the PO
+        line, the supplier info is updated with the product supplier name
+        On the next import, the supplierinfo is used to automatically match the
+        bill line with the correct PO line
+        """
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertFalse(inv_line.purchase_line_id)
+        self.assertEqual(inv_line.price_unit, 657.0)
+        action = inv_line.action_select_purchase_line()
+        wizard = (
+            self.env[action.get("res_model")]
+            .with_context(**action.get("context"))
+            .create({})
+        )
+        self.assertEqual(wizard.move_line_id, inv_line)
+        self.assertEqual(wizard.purchase_order_ids, self.purchase_order)
+        wizard.product_id = self.product
+        wizard.select_purchase_line()
+        self.assertEqual(inv_line.purchase_line_id, self.po_line)
+        bill.unlink()
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.purchase_line_id, self.po_line)
+
+    def test_6(self):
+        """
+        price unit imported from file is unchanged after po auto match
+        """
+        inv_line = self.test_2()
+        self.assertEqual(inv_line.price_unit, 657.0)
+        inv_line.product_id = False
+        inv_line.product_id = self.product
+        self.assertEqual(inv_line.price_unit, 100)
+
+    def test_7(self):
+        """
+        price unit imported from file is unchanged after po manual match
+        """
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.price_unit, 657.0)
+        action = inv_line.action_select_purchase_line()
+        wizard = (
+            self.env[action.get("res_model")]
+            .with_context(**action.get("context"))
+            .create({})
+        )
+        wizard.product_id = self.product
+        wizard.select_purchase_line()
+        self.assertEqual(inv_line.price_unit, 657.0)
+
+    def test_8(self):
+        """match product by default_code"""
+        self.product.default_code = "leasing001"
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.purchase_line_id, self.po_line)
+        self.assertEqual(inv_line.product_id, self.product)
+
+    def test_9(self):
+        """match product by supplier code"""
+        self.env["product.supplierinfo"].create(
+            {
+                "partner_id": self.partner.id,
+                "product_code": "leasing001",
+                "product_id": self.product.id,
+            }
+        )
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.purchase_line_id, self.po_line)
+        self.assertEqual(inv_line.product_id, self.product)
+
+    def test_10(self):
+        """match product by supplier code for product template suuplierinfo"""
+        self.env["product.supplierinfo"].create(
+            {
+                "partner_id": self.partner.id,
+                "product_code": "leasing001",
+                "product_tmpl_id": self.product.product_tmpl_id.id,
+            }
+        )
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.purchase_line_id, self.po_line)
+        self.assertEqual(inv_line.product_id, self.product)
+
+    def test_11(self):
+        """
+        product supplier code is stored in seller information at manual match
+        """
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.supplier_product_code, "leasing001")
+        self.assertEqual(inv_line.price_unit, 657.0)
+        action = inv_line.action_select_purchase_line()
+        wizard = (
+            self.env[action.get("res_model")]
+            .with_context(**action.get("context"))
+            .create({})
+        )
+        wizard.product_id = self.product
+        wizard.select_purchase_line()
+        self.assertEqual(self.product.seller_ids.product_code, "leasing001")
+
+    def test_12(self):
+        """test purchase price unit mismatch warning"""
+        self.product.default_code = "leasing001"
+        bill = self._import_invoice(
+            self.company_data["default_journal_purchase"],
+            file_path="account_edi_ubl_cii_purchase_match/tests/test_files/"
+            "bis3_bill_example_price_unit_mismatch.xml",
+        )
+        self.assertTrue(bill.purchase_mismatch)
+        self.assertIn(
+            "Unit price differs from the purchase order line",
+            bill.purchase_mismatch_details,
+        )
+        bill.action_post()
+        self.assertFalse(bill.purchase_mismatch)
+        self.assertFalse(bill.purchase_mismatch_details)
+
+    def test_13(self):
+        """test purchase invoiced qty mismatch warning"""
+        self.product.default_code = "leasing001"
+        bill = self._import_invoice(
+            self.company_data["default_journal_purchase"],
+            file_path="account_edi_ubl_cii_purchase_match/tests/test_files/"
+            "bis3_bill_example_invoiced_qty_mismatch.xml",
+        )
+        self.assertTrue(bill.purchase_mismatch)
+        self.assertIn(
+            "Invoiced quantity exceeds the ordered quantity",
+            bill.purchase_mismatch_details,
+        )
+        bill.action_post()
+        self.assertFalse(bill.purchase_mismatch)
+        self.assertFalse(bill.purchase_mismatch_details)
+
+    def _extract_refs(self, invoice_origin):
+        return self.env["account.move"]._extract_purchase_references_from_origin(
+            invoice_origin
+        )
+
+    def test_14(self):
+        """extract multiple purchase order references"""
+
+        # single PO reference
+        refs = self._extract_refs("PO0001")
+        self.assertSetEqual(set(refs), {"PO0001"})
+
+        # multiple references separated by comma
+        refs = self._extract_refs("PO0001,PO0002")
+        self.assertSetEqual(set(refs), {"PO0001", "PO0002"})
+
+        # multiple references separated by semicolon
+        refs = self._extract_refs("PO0001;PO0002")
+        self.assertSetEqual(set(refs), {"PO0001", "PO0002"})
+
+        # references prefixed with '#'
+        refs = self._extract_refs("#PO0001,#PO0002")
+        self.assertSetEqual(set(refs), {"PO0001", "PO0002"})
+
+        # mixed separators and '#' prefix
+        refs = self._extract_refs("#PO0001 ; PO0002 / #PO0003")
+        self.assertSetEqual(set(refs), {"PO0001", "PO0002", "PO0003"})
+
+        # references embedded in free text
+        refs = self._extract_refs("invoice related to PO0001 and PO0002")
+        self.assertSetEqual(set(refs), {"PO0001", "PO0002"})
+
+        # deduplicate extracted purchase order references
+        refs = self._extract_refs("PO0001,#PO0001,PO0002,PO0001")
+        self.assertSetEqual(set(refs), {"PO0001", "PO0002"})
+
+        # empty string should return no references
+        refs = self._extract_refs("")
+        self.assertSetEqual(set(refs), set())
+
+        # falsy value should return no references
+        refs = self._extract_refs(False)
+        self.assertSetEqual(set(refs), set())
+
+        # extraction with custom static prefix
+        self.env["ir.sequence"].search(
+            [("code", "=", "purchase.order")], limit=1
+        ).prefix = "ACH"
+        refs = self._extract_refs("ACH0001,#ACH0001,ACH0002,ACH0001")
+        self.assertSetEqual(set(refs), {"ACH0001", "ACH0002"})
+
+        # extraction with dynamic prefix including year (ACH%(year)s/)
+        self.env["ir.sequence"].search(
+            [("code", "=", "purchase.order")], limit=1
+        ).prefix = "ACH%(year)s/"
+        refs = self._extract_refs(
+            "ACH2026/0001,#ACH2026/0001,ACH2026/0002,ACH2026/0001"
+        )
+        self.assertSetEqual(set(refs), {"ACH2026/0001", "ACH2026/0002"})
+
+    def test_15(self):
+        """import with multi po"""
+        self.product.default_code = "leasing001"
+        product2 = self.env["product.product"].create(
+            {
+                "name": "test_product",
+                "standard_price": 100,
+                "default_code": "leasing002",
+            }
+        )
+        self._create_purchase_order(self.product, name="PO0001")
+        self._create_purchase_order(product2, name="PO0002")
+        bill = self._import_invoice(
+            self.company_data["default_journal_purchase"],
+            file_path="account_edi_ubl_cii_purchase_match/tests/test_files/"
+            "bis3_bill_example_multi_po.xml",
+        )
+        inv_l1 = bill.invoice_line_ids.filtered(
+            lambda line: line.product_id.code == "leasing001"
+        )
+        inv_l2 = bill.invoice_line_ids.filtered(
+            lambda line: line.product_id.code == "leasing002"
+        )
+        self.assertEqual(inv_l1.product_id, self.product)
+        self.assertEqual(inv_l2.product_id, product2)
+        self.assertEqual(inv_l1.purchase_line_id.order_id.name, "PO0001")
+        self.assertEqual(inv_l2.purchase_line_id.order_id.name, "PO0002")
+
+    def test_16(self):
+        """match wizard should propose multiple PO"""
+        product2 = self.env["product.product"].create(
+            {"name": "test_product", "standard_price": 100}
+        )
+        self._create_purchase_order(self.product, name="PO0001")
+        self._create_purchase_order(product2, name="PO0002")
+        bill = self._import_invoice(
+            self.company_data["default_journal_purchase"],
+            file_path="account_edi_ubl_cii_purchase_match/tests/test_files/"
+            "bis3_bill_example_multi_po.xml",
+        )
+        self.assertEqual(len(bill.invoice_line_ids), 2)
+        self.assertFalse(bill.invoice_line_ids.product_id)
+        self.assertFalse(bill.invoice_line_ids.purchase_line_id)
+        inv_l1 = bill.invoice_line_ids[0]
+        action = inv_l1.action_select_purchase_line()
+        wizard = (
+            self.env[action.get("res_model")]
+            .with_context(**action.get("context"))
+            .create({})
+        )
+        self.assertEqual(len(wizard.purchase_order_ids), 2)
+        self.assertSetEqual(
+            set(wizard.purchase_order_ids.mapped("name")), {"PO0002", "PO0001"}
+        )
diff --git a/account_edi_ubl_cii_purchase_match/tests/test_files/bis3_bill_example.xml b/account_edi_ubl_cii_purchase_match/tests/test_files/bis3_bill_example.xml
new file mode 100644
index 0000000000..0bdbb74fed
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/tests/test_files/bis3_bill_example.xml
@@ -0,0 +1,144 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+    xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+    xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+>
+  <cbc:CustomizationID
+    >urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>PO0032</cbc:ID>
+  <cbc:IssueDate>2023-08-04</cbc:IssueDate>
+  <cbc:DueDate>2023-09-04</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cac:OrderReference>
+    <cbc:ID>PO0032</cbc:ID>
+    <cbc:SalesOrderID>S00012</cbc:SalesOrderID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>FAC_2023_00052.pdf</cbc:ID>
+    <cac:Attachment>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>270 rte d'Arlon</cbc:StreetName>
+        <cbc:CityName>Strassen</cbc:CityName>
+        <cbc:PostalZone>8010</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>ALD Automotive LU</cbc:RegistrationName>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+        <cbc:ElectronicMail>adl@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>Odoo Lu</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Odoo Lu</cbc:RegistrationName>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>Odoo Lu</cbc:Name>
+        <cbc:ElectronicMail>odoo@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentID>PO0032</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>LU071241358706500000</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">657.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">657.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">762.12</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="EUR">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">762.12</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Locations and leasing</cbc:Description>
+      <cbc:Name>Locations and leasing</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>leasing001</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">657.00</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/account_edi_ubl_cii_purchase_match/tests/test_files/bis3_bill_example_invoiced_qty_mismatch.xml b/account_edi_ubl_cii_purchase_match/tests/test_files/bis3_bill_example_invoiced_qty_mismatch.xml
new file mode 100644
index 0000000000..9c9e4ac1b3
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/tests/test_files/bis3_bill_example_invoiced_qty_mismatch.xml
@@ -0,0 +1,144 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+    xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+    xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+>
+  <cbc:CustomizationID
+    >urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>PO0032</cbc:ID>
+  <cbc:IssueDate>2023-08-04</cbc:IssueDate>
+  <cbc:DueDate>2023-09-04</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cac:OrderReference>
+    <cbc:ID>PO0032</cbc:ID>
+    <cbc:SalesOrderID>S00012</cbc:SalesOrderID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>FAC_2023_00052.pdf</cbc:ID>
+    <cac:Attachment>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>270 rte d'Arlon</cbc:StreetName>
+        <cbc:CityName>Strassen</cbc:CityName>
+        <cbc:PostalZone>8010</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>ALD Automotive LU</cbc:RegistrationName>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+        <cbc:ElectronicMail>adl@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>Odoo Lu</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Odoo Lu</cbc:RegistrationName>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>Odoo Lu</cbc:Name>
+        <cbc:ElectronicMail>odoo@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentID>PO0032</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>LU071241358706500000</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">160</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">1000</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">160</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">1000</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">1000</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">1160</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="EUR">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">1160</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">10.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">1000</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Locations and leasing</cbc:Description>
+      <cbc:Name>Locations and leasing</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>leasing001</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">1000</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/account_edi_ubl_cii_purchase_match/tests/test_files/bis3_bill_example_multi_po.xml b/account_edi_ubl_cii_purchase_match/tests/test_files/bis3_bill_example_multi_po.xml
new file mode 100644
index 0000000000..023209b8cb
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/tests/test_files/bis3_bill_example_multi_po.xml
@@ -0,0 +1,166 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+    xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+    xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+>
+  <cbc:CustomizationID
+    >urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>#PO0001,#PO0002</cbc:ID>
+  <cbc:IssueDate>2023-08-04</cbc:IssueDate>
+  <cbc:DueDate>2023-09-04</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cac:OrderReference>
+    <cbc:ID>#PO0001,#PO0002</cbc:ID>
+    <cbc:SalesOrderID>S00012</cbc:SalesOrderID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>FAC_2023_00052.pdf</cbc:ID>
+    <cac:Attachment>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>270 rte d'Arlon</cbc:StreetName>
+        <cbc:CityName>Strassen</cbc:CityName>
+        <cbc:PostalZone>8010</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>ALD Automotive LU</cbc:RegistrationName>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+        <cbc:ElectronicMail>adl@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>Odoo Lu</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Odoo Lu</cbc:RegistrationName>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>Odoo Lu</cbc:Name>
+        <cbc:ElectronicMail>odoo@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentID>#PO0001,#PO0002</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>LU071241358706500000</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">657.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">657.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">762.12</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="EUR">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">762.12</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Locations and leasing</cbc:Description>
+      <cbc:Name>Locations and leasing</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>leasing001</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">657.00</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+  <cac:InvoiceLine>
+    <cbc:ID>2</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Locations and leasing</cbc:Description>
+      <cbc:Name>Locations and leasing</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>leasing002</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">657.00</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/account_edi_ubl_cii_purchase_match/tests/test_files/bis3_bill_example_price_unit_mismatch.xml b/account_edi_ubl_cii_purchase_match/tests/test_files/bis3_bill_example_price_unit_mismatch.xml
new file mode 100644
index 0000000000..d9e6ccac4e
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/tests/test_files/bis3_bill_example_price_unit_mismatch.xml
@@ -0,0 +1,144 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+    xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+    xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+>
+  <cbc:CustomizationID
+    >urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>PO0032</cbc:ID>
+  <cbc:IssueDate>2023-08-04</cbc:IssueDate>
+  <cbc:DueDate>2023-09-04</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cac:OrderReference>
+    <cbc:ID>PO0032</cbc:ID>
+    <cbc:SalesOrderID>S00012</cbc:SalesOrderID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>FAC_2023_00052.pdf</cbc:ID>
+    <cac:Attachment>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>270 rte d'Arlon</cbc:StreetName>
+        <cbc:CityName>Strassen</cbc:CityName>
+        <cbc:PostalZone>8010</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>ALD Automotive LU</cbc:RegistrationName>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+        <cbc:ElectronicMail>adl@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>Odoo Lu</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Odoo Lu</cbc:RegistrationName>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>Odoo Lu</cbc:Name>
+        <cbc:ElectronicMail>odoo@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentID>PO0032</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>LU071241358706500000</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">160</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">1000</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">160</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">1000</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">1000</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">1160</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="EUR">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">1160</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">1000</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Locations and leasing</cbc:Description>
+      <cbc:Name>Locations and leasing</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>leasing001</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">1000</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/account_edi_ubl_cii_purchase_match/views/account_move.xml b/account_edi_ubl_cii_purchase_match/views/account_move.xml
new file mode 100644
index 0000000000..2ae7a31cf9
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/views/account_move.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2025 ACSONE SA/NV
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record id="account_move_form_view" model="ir.ui.view">
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_move_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//header" position="after">
+                <div
+                    role="alert"
+                    class="alert alert-danger"
+                    attrs="{'invisible': [('purchase_mismatch', '=', False)]}"
+                >
+                    <field name="purchase_mismatch" invisible="1" />
+                    <field name="purchase_mismatch_details" />
+                </div>
+            </xpath>
+            <xpath
+                expr="//field[@name='invoice_line_ids']//tree//field[@name='product_id']"
+                position="after"
+            >
+                <button
+                    name="action_show_purchase_line"
+                    type="object"
+                    class="fa fa-fw fa-credit-card text-primary"
+                    title="Purchase Line"
+                    attrs="{'invisible': [('purchase_line_id', '=', False)]}"
+                />
+                <button
+                    name="action_select_purchase_line"
+                    type="object"
+                    class="fa fa-fw fa-refresh text-primary"
+                    title="Select Purchase Line"
+                    attrs="{'invisible': [('parent.state', '!=', 'draft')]}"
+                />
+                <field name="purchase_line_id" invisible="1" />
+            </xpath>
+            <xpath expr="//field[@name='invoice_line_ids']//tree" position="inside">
+                <field name="purchase_line_mismatch" invisible="1" />
+            </xpath>
+            <xpath expr="//field[@name='invoice_line_ids']//tree" position="attributes">
+                <attribute name="decoration-danger">purchase_line_mismatch</attribute>
+            </xpath>
+        </field>
+    </record>
+
+
+
+</odoo>
diff --git a/account_edi_ubl_cii_purchase_match/views/purchase_order_line.xml b/account_edi_ubl_cii_purchase_match/views/purchase_order_line.xml
new file mode 100644
index 0000000000..dcedcb7fbe
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/views/purchase_order_line.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2025 ACSONE SA/NV
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record id="purchase_order_line_form_view" model="ir.ui.view">
+        <field name="model">purchase.order.line</field>
+        <field name="inherit_id" ref="purchase.purchase_order_line_form2" />
+        <field name="mode">primary</field>
+        <field name="priority">1</field>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="before">
+                <group>
+                    <group>
+                        <field name="qty_received" readonly="1" />
+                    </group>
+                    <group>
+                        <field name="qty_invoiced" readonly="1" />
+                    </group>
+                    <group>
+                        <field name="price_subtotal" readonly="1" />
+                    </group>
+                </group>
+            </xpath>
+            <xpath expr="//field[@name='invoice_lines']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='invoice_lines']" position="after">
+                <field name="invoice_lines" readonly="1">
+                    <tree>
+                        <field name="move_id" string="Invoice" />
+                        <field name="name" />
+                        <field name="quantity" />
+                        <field name="price_unit" />
+                        <field name="discount" />
+                        <field name="tax_ids" widget="many2many_tags" />
+                        <field name="price_subtotal" />
+                    </tree>
+                </field>
+            </xpath>
+            <xpath expr="//field[@name='price_unit']" position="attributes">
+                <attribute name="readonly">1</attribute>
+            </xpath>
+            <xpath expr="//separator" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//label[@for='date_order']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='date_order']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//label[@for='partner_id']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='partner_id']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='partner_id']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//form" position="inside">
+                <footer>
+                    <button string="Close" class="btn-primary" special="cancel" />
+                </footer>
+            </xpath>
+        </field>
+    </record>
+
+
+
+</odoo>
diff --git a/account_edi_ubl_cii_purchase_match/wizards/__init__.py b/account_edi_ubl_cii_purchase_match/wizards/__init__.py
new file mode 100644
index 0000000000..acbdc56303
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/wizards/__init__.py
@@ -0,0 +1 @@
+from . import account_move_line_select_purchase_line_wizard
diff --git a/account_edi_ubl_cii_purchase_match/wizards/account_move_line_select_purchase_line_wizard.py b/account_edi_ubl_cii_purchase_match/wizards/account_move_line_select_purchase_line_wizard.py
new file mode 100644
index 0000000000..80ab94a891
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/wizards/account_move_line_select_purchase_line_wizard.py
@@ -0,0 +1,77 @@
+# Copyright 2025 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class AccountMoveLineSelectPurchaseLineWizard(models.TransientModel):
+
+    _name = "account.move.line.select.purchase.line.wizard"
+    _description = "account move line select purchase line wizard"
+    partner_id = fields.Many2one(comodel_name="res.partner", readonly=True)
+    description = fields.Char(related="move_line_id.name")
+    move_line_id = fields.Many2one(
+        comodel_name="account.move.line", readonly=True, required=True
+    )
+    currency_id = fields.Many2one(related="move_line_id.currency_id")
+
+    move_line_quantity = fields.Float(related="move_line_id.quantity")
+    move_line_price_unit = fields.Float(
+        related="move_line_id.price_unit", string="Move line Unit Price"
+    )
+    move_line_price_subtotal = fields.Monetary(
+        related="move_line_id.price_subtotal", string="Move line Subtotal"
+    )
+
+    product_id = fields.Many2one(
+        comodel_name="product.product", domain="product_domain"
+    )
+    product_domain = fields.Binary(compute="_compute_product_domain")
+    purchase_order_ids = fields.Many2many(
+        comodel_name="purchase.order",
+        domain="[('partner_id', '=', partner_id), ('state', 'in', ('purchase', 'done'))]",
+        relation="account_move_line_purchase_match_wizard_rel",
+    )
+    purchase_order_line_id = fields.Many2one(
+        comodel_name="purchase.order.line",
+        string="Line",
+        domain="[('order_id', 'in', purchase_order_ids), ('product_id', '=', product_id)]",
+        compute="_compute_purchase_order_line_id",
+        store=True,
+        readonly=False,
+    )
+    po_line_product_uom_qty = fields.Float(
+        related="purchase_order_line_id.product_uom_qty", string="Ordered Qty"
+    )
+    po_line_qty_received = fields.Float(related="purchase_order_line_id.qty_received")
+    po_line_qty_invoiced = fields.Float(related="purchase_order_line_id.qty_invoiced")
+    po_line_price_unit = fields.Float(
+        related="purchase_order_line_id.price_unit", string="PO line Unit Price"
+    )
+    po_line_price_subtotal = fields.Monetary(
+        related="purchase_order_line_id.price_subtotal", string="PO line Subtotal"
+    )
+
+    @api.depends("purchase_order_ids")
+    def _compute_product_domain(self):
+        for rec in self:
+            rec.product_domain = [
+                ("id", "in", rec.purchase_order_ids.order_line.product_id.ids)
+            ]
+
+    def select_purchase_line(self):
+        for rec in self:
+            rec.move_line_id._set_product(rec.purchase_order_line_id.product_id)
+            rec.move_line_id.purchase_line_id = rec.purchase_order_line_id
+            rec.move_line_id._update_product_supplier_name()
+
+    @api.depends("product_id", "purchase_order_ids")
+    def _compute_purchase_order_line_id(self):
+        for rec in self:
+            line = rec.purchase_order_ids.order_line.filtered(
+                lambda pl: pl.product_id == rec.product_id
+            )
+            if len(line) == 1:
+                rec.purchase_order_line_id = line
+            else:
+                rec.purchase_order_line_id = False
diff --git a/account_edi_ubl_cii_purchase_match/wizards/account_move_line_select_purchase_line_wizard.xml b/account_edi_ubl_cii_purchase_match/wizards/account_move_line_select_purchase_line_wizard.xml
new file mode 100644
index 0000000000..771748d6b1
--- /dev/null
+++ b/account_edi_ubl_cii_purchase_match/wizards/account_move_line_select_purchase_line_wizard.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2025 ACSONE SA/NV
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record
+        model="ir.ui.view"
+        id="account_move_line_select_purchase_line_wizard_form_view"
+    >
+        <field name="model">account.move.line.select.purchase.line.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <p>
+                    <field name="description" />
+                </p>
+                <group string="Invoice line">
+                    <group>
+                        <field name="move_line_quantity" />
+                    </group>
+                    <group>
+                        <field name="move_line_price_unit" string="Unit Price" />
+                    </group>
+                    <group>
+                        <field name="move_line_price_subtotal" string="Subtotal" />
+                    </group>
+                </group>
+                <group>
+                    <field name="move_line_id" invisible="1" />
+                    <field name="partner_id" invisible="1" />
+                    <field name="product_domain" invisible="1" />
+                    <field
+                        name="purchase_order_ids"
+                        required="1"
+                        widget="many2many_tags"
+                    />
+                    <field name="product_id" required="1" />
+                    <field name="purchase_order_line_id" required="1" />
+                </group>
+                <group string="Purchase Line">
+                    <group>
+                        <field name="po_line_product_uom_qty" />
+                        <field name="po_line_qty_received" />
+                    </group>
+                    <group>
+                        <field name="po_line_price_unit" string="Unit Price" />
+                        <field name="po_line_qty_invoiced" />
+                    </group>
+                    <group>
+                        <field name="po_line_price_subtotal" string="Subtotal" />
+                    </group>
+                </group>
+                <footer>
+                    <button
+                        name="select_purchase_line"
+                        string="Select The Purchase Line"
+                        class="btn-primary"
+                        type="object"
+                    />
+                    <button string="Cancel" class="btn-default" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+
+
+
+</odoo>
diff --git a/account_edi_ubl_cii_retrieve_tax/README.rst b/account_edi_ubl_cii_retrieve_tax/README.rst
new file mode 100644
index 0000000000..501875f3a6
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/README.rst
@@ -0,0 +1,94 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
+================================
+Account Edi Ubl Cii Retrieve Tax
+================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:3e826ac2a3de80b777ece1348b41faf74fb57d2891ae4197e8b6b27dc32305df
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fedi-lightgray.png?logo=github
+    :target: https://github.com/OCA/edi/tree/16.0/account_edi_ubl_cii_retrieve_tax
+    :alt: OCA/edi
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/edi-16-0/edi-16-0-account_edi_ubl_cii_retrieve_tax
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/edi&target_branch=16.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This addon improves UBL invoice import by matching taxes using the UNECE
+tax category/code instead of relying on rates, ensuring more accurate
+and consistent tax retrieval across companies and localizations.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/edi/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/edi/issues/new?body=module:%20account_edi_ubl_cii_retrieve_tax%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* ACSONE SA/NV
+* BCIM
+
+Contributors
+------------
+
+- Souheil Bejaoui souheil.bejaoui@acsone.eu
+
+Maintainers
+-----------
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+.. |maintainer-sbejaoui| image:: https://github.com/sbejaoui.png?size=40px
+    :target: https://github.com/sbejaoui
+    :alt: sbejaoui
+.. |maintainer-jbaudoux| image:: https://github.com/jbaudoux.png?size=40px
+    :target: https://github.com/jbaudoux
+    :alt: jbaudoux
+
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-sbejaoui| |maintainer-jbaudoux| 
+
+This module is part of the `OCA/edi <https://github.com/OCA/edi/tree/16.0/account_edi_ubl_cii_retrieve_tax>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/account_edi_ubl_cii_retrieve_tax/__init__.py b/account_edi_ubl_cii_retrieve_tax/__init__.py
new file mode 100644
index 0000000000..0650744f6b
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/account_edi_ubl_cii_retrieve_tax/__manifest__.py b/account_edi_ubl_cii_retrieve_tax/__manifest__.py
new file mode 100644
index 0000000000..2dfb84465a
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/__manifest__.py
@@ -0,0 +1,15 @@
+# Copyright 2026 ACSONE SA/NV,BCIM
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Account Edi Ubl Cii Retrieve Tax",
+    "summary": """Match taxes on UBL import using UNECE tax codes""",
+    "version": "16.0.1.0.0",
+    "license": "AGPL-3",
+    "author": "ACSONE SA/NV,BCIM,Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/edi",
+    "depends": ["account_edi_ubl_cii", "account_edi_ubl_cii_tax_extension"],
+    "data": [],
+    "demo": [],
+    "maintainers": ["sbejaoui", "jbaudoux"],
+}
diff --git a/account_edi_ubl_cii_retrieve_tax/i18n/account_edi_ubl_cii_retrieve_tax.pot b/account_edi_ubl_cii_retrieve_tax/i18n/account_edi_ubl_cii_retrieve_tax.pot
new file mode 100644
index 0000000000..2edee002d3
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/i18n/account_edi_ubl_cii_retrieve_tax.pot
@@ -0,0 +1,19 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* account_edi_ubl_cii_retrieve_tax
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_edi_ubl_cii_retrieve_tax
+#: model:ir.model,name:account_edi_ubl_cii_retrieve_tax.model_account_edi_xml_ubl_20
+msgid "UBL 2.0"
+msgstr ""
diff --git a/account_edi_ubl_cii_retrieve_tax/models/__init__.py b/account_edi_ubl_cii_retrieve_tax/models/__init__.py
new file mode 100644
index 0000000000..bb546b5d27
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/models/__init__.py
@@ -0,0 +1 @@
+from . import account_edi_xml_ubl_20
diff --git a/account_edi_ubl_cii_retrieve_tax/models/account_edi_xml_ubl_20.py b/account_edi_ubl_cii_retrieve_tax/models/account_edi_xml_ubl_20.py
new file mode 100644
index 0000000000..e4a2e3c4a3
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/models/account_edi_xml_ubl_20.py
@@ -0,0 +1,115 @@
+# Copyright 2026 ACSONE SA/NV,BCIM
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import models
+from odoo.osv.expression import AND
+
+
+class AccountEdiXmlUBL20(models.AbstractModel):
+    _inherit = "account.edi.xml.ubl_20"
+
+    def _get_tax_exemption_reason_code(self, tax_exemption_reason_code):
+        """
+        Map a UBL tax exemption reason code to a valid selection key for
+        ubl_cii_tax_exemption_reason_code field
+
+        handles formatting differences (e.g. '_' vs '-') by trying normalized
+        variants of the input code
+
+        :return: matching selection key or False if not found
+        """
+        tax_exemption_reason_codes = dict(
+            self.env["account.tax"]
+            ._fields.get("ubl_cii_tax_exemption_reason_code")
+            .selection
+        )
+        if tax_exemption_reason_codes.get(tax_exemption_reason_code):
+            return tax_exemption_reason_code
+        if tax_exemption_reason_codes.get(tax_exemption_reason_code.replace("-", "_")):
+            return tax_exemption_reason_code.replace("-", "_")
+        if tax_exemption_reason_codes.get(tax_exemption_reason_code.replace("_", "-")):
+            return tax_exemption_reason_code.replace("_", "-")
+        return False
+
+    def _import_fill_invoice_line_form(
+        self, journal, tree, invoice, invoice_line, qty_factor
+    ):
+        res = super()._import_fill_invoice_line_form(
+            journal, tree, invoice, invoice_line, qty_factor
+        )
+        if journal.type != "purchase" or len(invoice_line.tax_ids) > 1:
+            # this addon targets purchase imports only
+            # UBL are expected to produce a single tax per line, if multiple taxes
+            # were already assigned, keep the standard result to avoid unexpected
+            # changes
+            return res
+        tax_type = tree.find(".//{*}Item/{*}ClassifiedTaxCategory/{*}TaxScheme/{*}ID")
+        if tax_type is None or not tax_type.text or tax_type.text.upper() != "VAT":
+            return res
+        tax_unece_code_node = tree.find(".//{*}Item/{*}ClassifiedTaxCategory/{*}ID")
+        tax_exemption_reason_code_node = tree.find(
+            ".//{*}Item/{*}ClassifiedTaxCategory/{*}TaxExemptionReasonCode"
+        )
+        tax_exemption_reason_code = False
+        if tax_exemption_reason_code_node is not None:
+            tax_exemption_reason_code = self._get_tax_exemption_reason_code(
+                tax_exemption_reason_code_node.text
+            )
+        tax_amount_node = tree.find(".//{*}Item/{*}ClassifiedTaxCategory/{*}Percent")
+        if tax_amount_node is None or tax_unece_code_node is None:
+            # stop if the file doesn't provide the UNECE tax code
+            return res
+        amount = float(tax_amount_node.text)
+        tax_unece_code = tax_unece_code_node.text
+        if (
+            invoice_line.tax_ids.amount == amount
+            and invoice_line.tax_ids.ubl_cii_tax_category_code == tax_unece_code
+            and invoice_line.tax_ids.ubl_cii_tax_exemption_reason_code
+            == tax_exemption_reason_code
+        ):
+            # stop if the result already matches the UNECE code
+            return res
+        taxes = self._get_tax_by_ubl_values(
+            journal,
+            amount,
+            tax_unece_code,
+            tax_exemption_reason_code=tax_exemption_reason_code,
+            invoice_line=invoice_line,
+        )
+        if taxes:
+            invoice_line.tax_ids = taxes[0]
+        return res
+
+    def _get_tax_by_ubl_values(
+        self, journal, amount, tax_unece_code, tax_exemption_reason_code=False, **kwargs
+    ):
+        return self.env["account.tax"].search(
+            self._get_tax_by_ubl_values_domain(
+                journal, amount, tax_unece_code, tax_exemption_reason_code
+            )
+        )
+
+    def _get_tax_by_ubl_values_domain(
+        self, journal, amount, tax_unece_code, tax_exemption_reason_code=False
+    ):
+        domain = [
+            ("company_id", "=", journal.company_id.id),
+            ("amount_type", "=", "percent"),
+            ("type_tax_use", "=", journal.type),
+            ("ubl_cii_tax_category_code", "=", tax_unece_code),
+            ("amount", "=", amount),
+        ]
+        if tax_exemption_reason_code:
+            domain = AND(
+                [
+                    domain,
+                    [
+                        (
+                            "ubl_cii_tax_exemption_reason_code",
+                            "=",
+                            tax_exemption_reason_code,
+                        )
+                    ],
+                ]
+            )
+        return domain
diff --git a/account_edi_ubl_cii_retrieve_tax/readme/CONTRIBUTORS.md b/account_edi_ubl_cii_retrieve_tax/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000000..b9a2f0a4d2
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/readme/CONTRIBUTORS.md
@@ -0,0 +1 @@
+- Souheil Bejaoui <souheil.bejaoui@acsone.eu>
\ No newline at end of file
diff --git a/account_edi_ubl_cii_retrieve_tax/readme/DESCRIPTION.md b/account_edi_ubl_cii_retrieve_tax/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..3ad0359dfc
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/readme/DESCRIPTION.md
@@ -0,0 +1,3 @@
+This addon improves UBL invoice import by matching taxes using the UNECE tax
+category/code instead of relying on rates, ensuring more accurate and
+consistent tax retrieval across companies and localizations.
diff --git a/account_edi_ubl_cii_retrieve_tax/static/description/icon.png b/account_edi_ubl_cii_retrieve_tax/static/description/icon.png
new file mode 100644
index 0000000000..3a0328b516
Binary files /dev/null and b/account_edi_ubl_cii_retrieve_tax/static/description/icon.png differ
diff --git a/account_edi_ubl_cii_retrieve_tax/static/description/index.html b/account_edi_ubl_cii_retrieve_tax/static/description/index.html
new file mode 100644
index 0000000000..680d31c9c4
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/static/description/index.html
@@ -0,0 +1,434 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>README.rst</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document">
+
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="account-edi-ubl-cii-retrieve-tax">
+<h1>Account Edi Ubl Cii Retrieve Tax</h1>
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:3e826ac2a3de80b777ece1348b41faf74fb57d2891ae4197e8b6b27dc32305df
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/edi/tree/16.0/account_edi_ubl_cii_retrieve_tax"><img alt="OCA/edi" src="https://img.shields.io/badge/github-OCA%2Fedi-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/edi-16-0/edi-16-0-account_edi_ubl_cii_retrieve_tax"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/edi&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This addon improves UBL invoice import by matching taxes using the UNECE
+tax category/code instead of relying on rates, ensuring more accurate
+and consistent tax retrieval across companies and localizations.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h2><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h2>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/edi/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/edi/issues/new?body=module:%20account_edi_ubl_cii_retrieve_tax%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h2><a class="toc-backref" href="#toc-entry-2">Credits</a></h2>
+<div class="section" id="authors">
+<h3><a class="toc-backref" href="#toc-entry-3">Authors</a></h3>
+<ul class="simple">
+<li>ACSONE SA/NV</li>
+<li>BCIM</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h3><a class="toc-backref" href="#toc-entry-4">Contributors</a></h3>
+<ul class="simple">
+<li>Souheil Bejaoui <a class="reference external" href="mailto:souheil.bejaoui&#64;acsone.eu">souheil.bejaoui&#64;acsone.eu</a></li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h3><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h3>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
+<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.</p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
+<p><a class="reference external image-reference" href="https://github.com/sbejaoui"><img alt="sbejaoui" src="https://github.com/sbejaoui.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/jbaudoux"><img alt="jbaudoux" src="https://github.com/jbaudoux.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/edi/tree/16.0/account_edi_ubl_cii_retrieve_tax">OCA/edi</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/account_edi_ubl_cii_retrieve_tax/tests/__init__.py b/account_edi_ubl_cii_retrieve_tax/tests/__init__.py
new file mode 100644
index 0000000000..4e666024c0
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_account_edi_ubl_cii_retrieve_tax
diff --git a/account_edi_ubl_cii_retrieve_tax/tests/test_account_edi_ubl_cii_retrieve_tax.py b/account_edi_ubl_cii_retrieve_tax/tests/test_account_edi_ubl_cii_retrieve_tax.py
new file mode 100644
index 0000000000..e2d529de51
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/tests/test_account_edi_ubl_cii_retrieve_tax.py
@@ -0,0 +1,146 @@
+# Copyright 2026 ACSONE SA/NV,BCIM
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+
+from odoo.tests import tagged
+from odoo.tools import file_open
+
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+TEST_FILES_DIR = "account_edi_ubl_cii_retrieve_tax/tests/test_files"
+
+
+@tagged("post_install", "-at_install")
+class TestAccountEdiUblCiiRetrieveTax(AccountTestInvoicingCommon):
+    @classmethod
+    def setUpClass(cls, chart_template_ref=None):
+        super().setUpClass()
+        cls.tax_33_no_code = cls.env["account.tax"].create(
+            {
+                "name": "33% no code",
+                "type_tax_use": "purchase",
+                "amount_type": "percent",
+                "amount": 33,
+                "sequence": 10,
+            }
+        )
+        cls.tax_33_code_s = cls.env["account.tax"].create(
+            {
+                "name": "33%",
+                "type_tax_use": "purchase",
+                "amount_type": "percent",
+                "amount": 33,
+                "sequence": 100,
+                "ubl_cii_tax_category_code": "S",
+            }
+        )
+        cls.tax_33_code_k_no_reason = cls.env["account.tax"].create(
+            {
+                "name": "21% K",
+                "type_tax_use": "purchase",
+                "amount_type": "percent",
+                "amount": 33,
+                "sequence": 110,
+                "ubl_cii_tax_category_code": "K",
+            }
+        )
+        cls.tax_33_code_k = cls.env["account.tax"].create(
+            {
+                "name": "21% K",
+                "type_tax_use": "purchase",
+                "amount_type": "percent",
+                "amount": 33,
+                "sequence": 110,
+                "ubl_cii_tax_category_code": "K",
+                "ubl_cii_tax_exemption_reason_code": "VATEX_EU_IC",
+            }
+        )
+
+    def _import_invoice(self, journal, file_name=None):
+        if not file_name:
+            file_name = "bis3_bill_example.xml"
+        file_path = f"{TEST_FILES_DIR}/{file_name}"
+        with file_open(file_path, "rb") as file:
+            xml_attachment = self.env["ir.attachment"].create(
+                {
+                    "mimetype": "application/xml",
+                    "name": "test_invoice.xml",
+                    "raw": file.read(),
+                }
+            )
+        move = (
+            self.env["account.journal"]
+            .with_context(default_journal_id=journal.id)
+            ._create_document_from_attachment(xml_attachment.id)
+        )
+        return move
+
+    def test_0(self):
+        """
+        default behavior
+        If no ubl_cii_tax_category_code, take the first tax that match the amount and type
+        """
+        self.tax_33_code_s.ubl_cii_tax_category_code = False
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.tax_ids, self.tax_33_no_code)
+
+    def test_1(self):
+        """
+        match tax by unece_categ code
+        """
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.tax_ids, self.tax_33_code_s)
+
+    def test_2(self):
+        """
+        match tax by unece code
+        """
+        bill = self._import_invoice(self.company_data["default_journal_purchase"])
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.tax_ids, self.tax_33_code_s)
+
+    def test_3(self):
+        """
+        no unece code in the file
+        """
+        bill = self._import_invoice(
+            self.company_data["default_journal_purchase"], "bis3_bill_no_code.xml"
+        )
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.tax_ids, self.tax_33_no_code)
+
+    def test_4(self):
+        """
+        no change in sale behavior
+        """
+        bill = self._import_invoice(
+            self.company_data["default_journal_sale"], "bis3_bill_example.xml"
+        )
+        inv_line = bill.invoice_line_ids
+        self.assertNotEqual(inv_line.tax_ids, self.tax_33_no_code)
+
+    def test_5(self):
+        """
+        default behavior if tax type is not vat
+        """
+        bill = self._import_invoice(
+            self.company_data["default_journal_purchase"], "bis3_bill_not_vat.xml"
+        )
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.tax_ids, self.tax_33_no_code)
+
+    def test_6(self):
+        """
+        import with exemption reason
+        """
+        bill = self._import_invoice(
+            self.company_data["default_journal_purchase"],
+            "bis3_bill_k_vatex_eu_ic.xml",
+        )
+        inv_line = bill.invoice_line_ids
+        self.assertEqual(inv_line.tax_ids, self.tax_33_code_k)
+        self.assertEqual(
+            inv_line.tax_ids.ubl_cii_tax_exemption_reason_code, "VATEX_EU_IC"
+        )
diff --git a/account_edi_ubl_cii_retrieve_tax/tests/test_files/bis3_bill_example.xml b/account_edi_ubl_cii_retrieve_tax/tests/test_files/bis3_bill_example.xml
new file mode 100644
index 0000000000..774103850f
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/tests/test_files/bis3_bill_example.xml
@@ -0,0 +1,144 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+    xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+    xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+>
+  <cbc:CustomizationID
+    >urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>FAC/2023/00052</cbc:ID>
+  <cbc:IssueDate>2023-08-04</cbc:IssueDate>
+  <cbc:DueDate>2023-09-04</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cac:OrderReference>
+    <cbc:ID>FAC/2023/00052</cbc:ID>
+    <cbc:SalesOrderID>S00012</cbc:SalesOrderID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>FAC_2023_00052.pdf</cbc:ID>
+    <cac:Attachment>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>270 rte d'Arlon</cbc:StreetName>
+        <cbc:CityName>Strassen</cbc:CityName>
+        <cbc:PostalZone>8010</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>ALD Automotive LU</cbc:RegistrationName>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+        <cbc:ElectronicMail>adl@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>Odoo Lu</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Odoo Lu</cbc:RegistrationName>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>Odoo Lu</cbc:Name>
+        <cbc:ElectronicMail>odoo@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentID>FAC/2023/00052</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>LU071241358706500000</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">657.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>33.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">657.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">762.12</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="EUR">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">762.12</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Locations and leasing</cbc:Description>
+      <cbc:Name>Locations et leasing opérationnel</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>leasing001</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>33.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">657.00</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/account_edi_ubl_cii_retrieve_tax/tests/test_files/bis3_bill_k_vatex_eu_ic.xml b/account_edi_ubl_cii_retrieve_tax/tests/test_files/bis3_bill_k_vatex_eu_ic.xml
new file mode 100644
index 0000000000..73244c50db
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/tests/test_files/bis3_bill_k_vatex_eu_ic.xml
@@ -0,0 +1,147 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+    xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+    xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+>
+    <cbc:CustomizationID
+    >urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0
+    </cbc:CustomizationID>
+    <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+    <cbc:ID>FAC/2023/00052</cbc:ID>
+    <cbc:IssueDate>2023-08-04</cbc:IssueDate>
+    <cbc:DueDate>2023-09-04</cbc:DueDate>
+    <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+    <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+    <cac:OrderReference>
+        <cbc:ID>FAC/2023/00052</cbc:ID>
+        <cbc:SalesOrderID>S00012</cbc:SalesOrderID>
+    </cac:OrderReference>
+    <cac:AdditionalDocumentReference>
+        <cbc:ID>FAC_2023_00052.pdf</cbc:ID>
+        <cac:Attachment>
+        </cac:Attachment>
+    </cac:AdditionalDocumentReference>
+    <cac:AccountingSupplierParty>
+        <cac:Party>
+            <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+            <cac:PartyName>
+                <cbc:Name>ALD Automotive LU</cbc:Name>
+            </cac:PartyName>
+            <cac:PostalAddress>
+                <cbc:StreetName>270 rte d'Arlon</cbc:StreetName>
+                <cbc:CityName>Strassen</cbc:CityName>
+                <cbc:PostalZone>8010</cbc:PostalZone>
+                <cac:Country>
+                    <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+                </cac:Country>
+            </cac:PostalAddress>
+            <cac:PartyTaxScheme>
+                <cbc:CompanyID>LU12977109</cbc:CompanyID>
+                <cac:TaxScheme>
+                    <cbc:ID>VAT</cbc:ID>
+                </cac:TaxScheme>
+            </cac:PartyTaxScheme>
+            <cac:PartyLegalEntity>
+                <cbc:RegistrationName>ALD Automotive LU</cbc:RegistrationName>
+                <cbc:CompanyID>LU12977109</cbc:CompanyID>
+            </cac:PartyLegalEntity>
+            <cac:Contact>
+                <cbc:Name>ALD Automotive LU</cbc:Name>
+                <cbc:ElectronicMail>adl@test.com</cbc:ElectronicMail>
+            </cac:Contact>
+        </cac:Party>
+    </cac:AccountingSupplierParty>
+    <cac:AccountingCustomerParty>
+        <cac:Party>
+            <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+            <cac:PartyName>
+                <cbc:Name>Odoo Lu</cbc:Name>
+            </cac:PartyName>
+            <cac:PostalAddress>
+                <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+                <cbc:CityName>Windhof</cbc:CityName>
+                <cac:Country>
+                    <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+                </cac:Country>
+            </cac:PostalAddress>
+            <cac:PartyTaxScheme>
+                <cbc:CompanyID>LU25587702</cbc:CompanyID>
+                <cac:TaxScheme>
+                    <cbc:ID>VAT</cbc:ID>
+                </cac:TaxScheme>
+            </cac:PartyTaxScheme>
+            <cac:PartyLegalEntity>
+                <cbc:RegistrationName>Odoo Lu</cbc:RegistrationName>
+                <cbc:CompanyID>LU25587702</cbc:CompanyID>
+            </cac:PartyLegalEntity>
+            <cac:Contact>
+                <cbc:Name>Odoo Lu</cbc:Name>
+                <cbc:ElectronicMail>odoo@test.com</cbc:ElectronicMail>
+            </cac:Contact>
+        </cac:Party>
+    </cac:AccountingCustomerParty>
+    <cac:Delivery>
+        <cac:DeliveryLocation>
+            <cac:Address>
+                <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+                <cbc:CityName>Windhof</cbc:CityName>
+                <cac:Country>
+                    <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+                </cac:Country>
+            </cac:Address>
+        </cac:DeliveryLocation>
+    </cac:Delivery>
+    <cac:PaymentMeans>
+        <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+        <cbc:PaymentID>FAC/2023/00052</cbc:PaymentID>
+        <cac:PayeeFinancialAccount>
+            <cbc:ID>LU071241358706500000</cbc:ID>
+        </cac:PayeeFinancialAccount>
+    </cac:PaymentMeans>
+    <cac:TaxTotal>
+        <cbc:TaxAmount currencyID="EUR">0.00</cbc:TaxAmount>
+        <cac:TaxSubtotal>
+            <cbc:TaxableAmount currencyID="EUR">657.00</cbc:TaxableAmount>
+            <cbc:TaxAmount currencyID="EUR">0.00</cbc:TaxAmount>
+            <cac:TaxCategory>
+              <cbc:ID>K</cbc:ID>
+              <cbc:Percent>33</cbc:Percent>
+              <cbc:TaxExemptionReasonCode>VATEX-EU-IC</cbc:TaxExemptionReasonCode>
+              <cac:TaxScheme>
+                <cbc:ID>VAT</cbc:ID>
+              </cac:TaxScheme>
+            </cac:TaxCategory>
+        </cac:TaxSubtotal>
+    </cac:TaxTotal>
+    <cac:LegalMonetaryTotal>
+        <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+        <cbc:TaxExclusiveAmount currencyID="EUR">657.00</cbc:TaxExclusiveAmount>
+        <cbc:TaxInclusiveAmount currencyID="EUR">762.12</cbc:TaxInclusiveAmount>
+        <cbc:PrepaidAmount currencyID="EUR">0.00</cbc:PrepaidAmount>
+        <cbc:PayableAmount currencyID="EUR">762.12</cbc:PayableAmount>
+    </cac:LegalMonetaryTotal>
+    <cac:InvoiceLine>
+        <cbc:ID>1</cbc:ID>
+        <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
+        <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+        <cac:Item>
+            <cbc:Description>Locations and leasing</cbc:Description>
+            <cbc:Name>Locations et leasing opérationnel</cbc:Name>
+            <cac:SellersItemIdentification>
+                <cbc:ID>leasing001</cbc:ID>
+            </cac:SellersItemIdentification>
+            <cac:ClassifiedTaxCategory>
+              <cbc:ID>K</cbc:ID>
+              <cbc:Percent>33</cbc:Percent>
+              <cbc:TaxExemptionReasonCode>VATEX-EU-IC</cbc:TaxExemptionReasonCode>
+              <cac:TaxScheme>
+                <cbc:ID>VAT</cbc:ID>
+              </cac:TaxScheme>
+            </cac:ClassifiedTaxCategory>
+        </cac:Item>
+        <cac:Price>
+            <cbc:PriceAmount currencyID="EUR">657.00</cbc:PriceAmount>
+        </cac:Price>
+    </cac:InvoiceLine>
+</Invoice>
diff --git a/account_edi_ubl_cii_retrieve_tax/tests/test_files/bis3_bill_no_code.xml b/account_edi_ubl_cii_retrieve_tax/tests/test_files/bis3_bill_no_code.xml
new file mode 100644
index 0000000000..89fa9daa5b
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/tests/test_files/bis3_bill_no_code.xml
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+    xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+    xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+>
+  <cbc:CustomizationID
+    >urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>FAC/2023/00052</cbc:ID>
+  <cbc:IssueDate>2023-08-04</cbc:IssueDate>
+  <cbc:DueDate>2023-09-04</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cac:OrderReference>
+    <cbc:ID>FAC/2023/00052</cbc:ID>
+    <cbc:SalesOrderID>S00012</cbc:SalesOrderID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>FAC_2023_00052.pdf</cbc:ID>
+    <cac:Attachment>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>270 rte d'Arlon</cbc:StreetName>
+        <cbc:CityName>Strassen</cbc:CityName>
+        <cbc:PostalZone>8010</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>ALD Automotive LU</cbc:RegistrationName>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+        <cbc:ElectronicMail>adl@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>Odoo Lu</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Odoo Lu</cbc:RegistrationName>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>Odoo Lu</cbc:Name>
+        <cbc:ElectronicMail>odoo@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentID>FAC/2023/00052</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>LU071241358706500000</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">657.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:Percent>33.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">657.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">762.12</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="EUR">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">762.12</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Locations and leasing</cbc:Description>
+      <cbc:Name>Locations et leasing opérationnel</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>leasing001</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:Percent>33.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">657.00</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/account_edi_ubl_cii_retrieve_tax/tests/test_files/bis3_bill_not_vat.xml b/account_edi_ubl_cii_retrieve_tax/tests/test_files/bis3_bill_not_vat.xml
new file mode 100644
index 0000000000..8e75d75386
--- /dev/null
+++ b/account_edi_ubl_cii_retrieve_tax/tests/test_files/bis3_bill_not_vat.xml
@@ -0,0 +1,144 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+    xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+    xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+>
+  <cbc:CustomizationID
+    >urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>FAC/2023/00052</cbc:ID>
+  <cbc:IssueDate>2023-08-04</cbc:IssueDate>
+  <cbc:DueDate>2023-09-04</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cac:OrderReference>
+    <cbc:ID>FAC/2023/00052</cbc:ID>
+    <cbc:SalesOrderID>S00012</cbc:SalesOrderID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>FAC_2023_00052.pdf</cbc:ID>
+    <cac:Attachment>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>270 rte d'Arlon</cbc:StreetName>
+        <cbc:CityName>Strassen</cbc:CityName>
+        <cbc:PostalZone>8010</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>ALD Automotive LU</cbc:RegistrationName>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+        <cbc:ElectronicMail>adl@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>Odoo Lu</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Odoo Lu</cbc:RegistrationName>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>Odoo Lu</cbc:Name>
+        <cbc:ElectronicMail>odoo@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentID>FAC/2023/00052</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>LU071241358706500000</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">657.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>33.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">657.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">762.12</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="EUR">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">762.12</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Locations and leasing</cbc:Description>
+      <cbc:Name>Locations et leasing opérationnel</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>leasing001</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>33.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>NOT VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">657.00</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/README.rst b/account_edi_ubl_move_line_uom_and_packaging_unece/README.rst
new file mode 100644
index 0000000000..bba205b52d
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/README.rst
@@ -0,0 +1,88 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
+====================================================
+Account EDI UBL move line uom and packaging By UNECE
+====================================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:46bb2013185b99605b11e87c2dd788ad28b5a8dfd50ccf2903ad029113929f5a
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fedi-lightgray.png?logo=github
+    :target: https://github.com/OCA/edi/tree/16.0/account_edi_ubl_move_line_uom_and_packaging_unece
+    :alt: OCA/edi
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/edi-16-0/edi-16-0-account_edi_ubl_move_line_uom_and_packaging_unece
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/edi&target_branch=16.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+Adds support for UNECE unit codes during UBL invoice import to
+automatically detect and assign the appropriate unit of measure or
+product packaging on invoice lines.
+
+When a UNECE code matches a product packaging, the packaging is set with
+priority. Otherwise, the corresponding unit of measure is applied based
+on the UNECE code.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/edi/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/edi/issues/new?body=module:%20account_edi_ubl_move_line_uom_and_packaging_unece%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* ACSONE SA/NV
+* BCIM
+
+Contributors
+------------
+
+- Souheil Bejaoui - ACSONE SA/NV souheil.bejaoui@acsone.eu
+- Jacques-Etienne Baudoux - BCIM je@bcim.be
+
+Maintainers
+-----------
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+This module is part of the `OCA/edi <https://github.com/OCA/edi/tree/16.0/account_edi_ubl_move_line_uom_and_packaging_unece>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/__init__.py b/account_edi_ubl_move_line_uom_and_packaging_unece/__init__.py
new file mode 100644
index 0000000000..0650744f6b
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/__manifest__.py b/account_edi_ubl_move_line_uom_and_packaging_unece/__manifest__.py
new file mode 100644
index 0000000000..2ae79955bd
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/__manifest__.py
@@ -0,0 +1,20 @@
+# Copyright 2026 ACSONE SA/NV, BCIM
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Account EDI UBL move line uom and packaging By UNECE",
+    "summary": """Adds UNECE-based detection of UoM and packaging on invoice
+    lines during UBL import.""",
+    "version": "16.0.1.0.0",
+    "license": "AGPL-3",
+    "author": "ACSONE SA/NV, BCIM,Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/edi",
+    "depends": [
+        "account_move_line_packaging",
+        "account_edi_ubl_cii",
+        "uom_unece",
+        "product_packaging_unece",
+    ],
+    "data": ["views/account_move.xml"],
+    "demo": [],
+}
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/i18n/account_edi_ubl_move_line_uom_and_packaging_unece.pot b/account_edi_ubl_move_line_uom_and_packaging_unece/i18n/account_edi_ubl_move_line_uom_and_packaging_unece.pot
new file mode 100644
index 0000000000..c7b3cdef10
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/i18n/account_edi_ubl_move_line_uom_and_packaging_unece.pot
@@ -0,0 +1,60 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* account_edi_ubl_move_line_uom_and_packaging_unece
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_edi_ubl_move_line_uom_and_packaging_unece
+#: model:ir.model,name:account_edi_ubl_move_line_uom_and_packaging_unece.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: account_edi_ubl_move_line_uom_and_packaging_unece
+#: model:ir.model.fields,help:account_edi_ubl_move_line_uom_and_packaging_unece.field_account_move_line__ubl_unece_unit_code
+msgid ""
+"Technical field storing the UNECE unit code from UBL import. Used during "
+"purchase reconciliation to identify the corresponding packaging when a "
+"purchase order line is manually selected."
+msgstr ""
+
+#. module: account_edi_ubl_move_line_uom_and_packaging_unece
+#: model:ir.model.fields,help:account_edi_ubl_move_line_uom_and_packaging_unece.field_account_move_line__ubl_billed_quantity
+msgid ""
+"Technical field storing the billed quantity from the UBL import. During "
+"purchase reconciliation, it allows restoring the original supplier quantity "
+"when the quantity has been altered by packaging selection."
+msgstr ""
+
+#. module: account_edi_ubl_move_line_uom_and_packaging_unece
+#: model:ir.model.fields,help:account_edi_ubl_move_line_uom_and_packaging_unece.field_account_move_line__ubl_price_unit
+msgid "Technical field storing the unit price from the UBL import."
+msgstr ""
+
+#. module: account_edi_ubl_move_line_uom_and_packaging_unece
+#: model:ir.model,name:account_edi_ubl_move_line_uom_and_packaging_unece.model_account_edi_xml_ubl_20
+msgid "UBL 2.0"
+msgstr ""
+
+#. module: account_edi_ubl_move_line_uom_and_packaging_unece
+#: model:ir.model.fields,field_description:account_edi_ubl_move_line_uom_and_packaging_unece.field_account_move_line__ubl_price_unit
+msgid "UBL P.U"
+msgstr ""
+
+#. module: account_edi_ubl_move_line_uom_and_packaging_unece
+#: model:ir.model.fields,field_description:account_edi_ubl_move_line_uom_and_packaging_unece.field_account_move_line__ubl_billed_quantity
+msgid "Ubl Billed Quantity"
+msgstr ""
+
+#. module: account_edi_ubl_move_line_uom_and_packaging_unece
+#: model:ir.model.fields,field_description:account_edi_ubl_move_line_uom_and_packaging_unece.field_account_move_line__ubl_unece_unit_code
+msgid "Unece Unit Code"
+msgstr ""
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/models/__init__.py b/account_edi_ubl_move_line_uom_and_packaging_unece/models/__init__.py
new file mode 100644
index 0000000000..0390032f1d
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/models/__init__.py
@@ -0,0 +1,2 @@
+from . import account_edi_xml_ubl_20
+from . import account_move_line
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/models/account_edi_xml_ubl_20.py b/account_edi_ubl_move_line_uom_and_packaging_unece/models/account_edi_xml_ubl_20.py
new file mode 100644
index 0000000000..7010678da4
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/models/account_edi_xml_ubl_20.py
@@ -0,0 +1,92 @@
+# Copyright 2026 ACSONE SA/NV, BCIM
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class AccountEdiXmlUbl_20(models.AbstractModel):
+
+    _inherit = "account.edi.xml.ubl_20"
+
+    def _set_invoice_line_ubl_billed_quantity_and_unece_unit_code(
+        self, tree, invoice_line
+    ):
+        billed_quantity_xpath = (
+            "./{*}InvoicedQuantity"
+            if invoice_line.move_id.move_type in ("in_invoice", "out_invoice")
+            else "./{*}CreditedQuantity"
+        )
+        billed_quantity_node = tree.find(billed_quantity_xpath)
+        if billed_quantity_node is None:
+            return
+        invoice_line.ubl_billed_quantity = float(billed_quantity_node.text)
+        unit_code = billed_quantity_node.attrib.get("unitCode")
+        if unit_code:
+            invoice_line.ubl_unece_unit_code = unit_code
+
+    def _set_invoice_ubl_price_unit(self, tree, invoice_line):
+        price_unit_node = tree.find("./{*}Price/{*}PriceAmount")
+        if price_unit_node is None:
+            return
+        invoice_line.ubl_price_unit = float(price_unit_node.text)
+
+    def _import_fill_invoice_line_form(
+        self, journal, tree, invoice, invoice_line, qty_factor
+    ):
+        res = super()._import_fill_invoice_line_form(
+            journal, tree, invoice, invoice_line, qty_factor
+        )
+        self._set_invoice_line_ubl_billed_quantity_and_unece_unit_code(
+            tree, invoice_line
+        )
+        self._set_invoice_ubl_price_unit(tree, invoice_line)
+        if not invoice_line.ubl_unece_unit_code:
+            return res
+        if not self._import_fill_invoice_line_packaging(invoice_line):
+            self._import_fill_invoice_line_uom(invoice_line)
+        return res
+
+    def _import_fill_invoice_line_uom(self, invoice_line):
+        uom_id = self.env["uom.uom"].get_uom_id_by_unece_code(
+            invoice_line.ubl_unece_unit_code
+        )
+        if not uom_id:
+            return False
+        uom = self.env["uom.uom"].browse(uom_id)
+        if (
+            invoice_line.product_id
+            and uom.category_id
+            != invoice_line.product_id.product_tmpl_id.uom_id.category_id
+        ):
+            return False
+        invoice_line.product_uom_id = uom
+        invoice_line.price_unit = invoice_line.ubl_price_unit
+        return True
+
+    def _import_fill_invoice_line_packaging(self, invoice_line):
+        # the unitCode attr is based on UNECE Rec 20 (UoM)
+        # when Rec 21 (packaging) codes are used, they may be prefixed with "X"
+        # we therefore check both formats (e.g. "8A" and "X8A")
+        pl_model = self.env["product.packaging.level"]
+        packaging_level_ids = pl_model.get_packaging_level_ids_for_codes(
+            invoice_line.ubl_unece_unit_code,
+            invoice_line.ubl_unece_unit_code.lstrip("X"),
+        )
+        if not packaging_level_ids:
+            return False
+        product_packaging = self.env["product.packaging"].search(
+            [
+                ("product_id", "=", invoice_line.product_id.id),
+                ("packaging_level_id", "in", packaging_level_ids),
+            ],
+            limit=1,
+        )
+        if product_packaging:
+            invoice_line.product_packaging_id = product_packaging
+            invoice_line.product_packaging_qty = invoice_line.ubl_billed_quantity
+            if product_packaging.qty > 0 and invoice_line.ubl_price_unit:
+                invoice_line.price_unit = (
+                    invoice_line.ubl_price_unit / product_packaging.qty
+                )
+            return True
+        return False
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/models/account_move_line.py b/account_edi_ubl_move_line_uom_and_packaging_unece/models/account_move_line.py
new file mode 100644
index 0000000000..ec6ce58fdb
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/models/account_move_line.py
@@ -0,0 +1,30 @@
+# Copyright 2026 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class AccountMoveLine(models.Model):
+
+    _inherit = "account.move.line"
+
+    ubl_unece_unit_code = fields.Char(
+        readonly=True,
+        string="Unece Unit Code",
+        help=(
+            "Technical field storing the UNECE unit code from UBL import. "
+            "Used during purchase reconciliation to identify the corresponding "
+            "packaging when a purchase order line is manually selected."
+        ),
+    )
+    ubl_billed_quantity = fields.Float(
+        readonly=True,
+        help="Technical field storing the billed quantity from the UBL import. "
+        "During purchase reconciliation, it allows restoring the original supplier quantity "
+        "when the quantity has been altered by packaging selection.",
+    )
+    ubl_price_unit = fields.Float(
+        string="UBL P.U",
+        readonly=True,
+        help="Technical field storing the unit price from the UBL import.",
+    )
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/readme/CONTRIBUTORS.md b/account_edi_ubl_move_line_uom_and_packaging_unece/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000000..d31c6619c1
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/readme/CONTRIBUTORS.md
@@ -0,0 +1,2 @@
+- Souheil Bejaoui - ACSONE SA/NV <souheil.bejaoui@acsone.eu>
+- Jacques-Etienne Baudoux - BCIM <je@bcim.be>
\ No newline at end of file
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/readme/DESCRIPTION.md b/account_edi_ubl_move_line_uom_and_packaging_unece/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..732b8d58e7
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/readme/DESCRIPTION.md
@@ -0,0 +1,5 @@
+Adds support for UNECE unit codes during UBL invoice import to automatically detect and
+assign the appropriate unit of measure or product packaging on invoice lines.
+
+When a UNECE code matches a product packaging, the packaging is set with priority.
+Otherwise, the corresponding unit of measure is applied based on the UNECE code.
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/static/description/icon.png b/account_edi_ubl_move_line_uom_and_packaging_unece/static/description/icon.png
new file mode 100644
index 0000000000..3a0328b516
Binary files /dev/null and b/account_edi_ubl_move_line_uom_and_packaging_unece/static/description/icon.png differ
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/static/description/index.html b/account_edi_ubl_move_line_uom_and_packaging_unece/static/description/index.html
new file mode 100644
index 0000000000..464ed5adaf
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/static/description/index.html
@@ -0,0 +1,436 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>README.rst</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document">
+
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="account-edi-ubl-move-line-uom-and-packaging-by-unece">
+<h1>Account EDI UBL move line uom and packaging By UNECE</h1>
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:46bb2013185b99605b11e87c2dd788ad28b5a8dfd50ccf2903ad029113929f5a
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/edi/tree/16.0/account_edi_ubl_move_line_uom_and_packaging_unece"><img alt="OCA/edi" src="https://img.shields.io/badge/github-OCA%2Fedi-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/edi-16-0/edi-16-0-account_edi_ubl_move_line_uom_and_packaging_unece"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/edi&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>Adds support for UNECE unit codes during UBL invoice import to
+automatically detect and assign the appropriate unit of measure or
+product packaging on invoice lines.</p>
+<p>When a UNECE code matches a product packaging, the packaging is set with
+priority. Otherwise, the corresponding unit of measure is applied based
+on the UNECE code.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h2><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h2>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/edi/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/edi/issues/new?body=module:%20account_edi_ubl_move_line_uom_and_packaging_unece%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h2><a class="toc-backref" href="#toc-entry-2">Credits</a></h2>
+<div class="section" id="authors">
+<h3><a class="toc-backref" href="#toc-entry-3">Authors</a></h3>
+<ul class="simple">
+<li>ACSONE SA/NV</li>
+<li>BCIM</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h3><a class="toc-backref" href="#toc-entry-4">Contributors</a></h3>
+<ul class="simple">
+<li>Souheil Bejaoui - ACSONE SA/NV <a class="reference external" href="mailto:souheil.bejaoui&#64;acsone.eu">souheil.bejaoui&#64;acsone.eu</a></li>
+<li>Jacques-Etienne Baudoux - BCIM <a class="reference external" href="mailto:je&#64;bcim.be">je&#64;bcim.be</a></li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h3><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h3>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
+<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/edi/tree/16.0/account_edi_ubl_move_line_uom_and_packaging_unece">OCA/edi</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/tests/__init__.py b/account_edi_ubl_move_line_uom_and_packaging_unece/tests/__init__.py
new file mode 100644
index 0000000000..9049d261ce
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_account_edi_ubl_move_line_packaging
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_account_edi_ubl_move_line_packaging.py b/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_account_edi_ubl_move_line_packaging.py
new file mode 100644
index 0000000000..6e4043100a
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_account_edi_ubl_move_line_packaging.py
@@ -0,0 +1,165 @@
+# Copyright 2026 ACSONE SA/NV, BCIM
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import Command
+from odoo.tests import tagged
+from odoo.tools import file_open
+
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+
+@tagged("post_install", "-at_install")
+class TestAccountEdiUblMoveLinePackaging(AccountTestInvoicingCommon):
+    @classmethod
+    def setUpClass(cls, chart_template_ref=None):
+        super().setUpClass()
+        cls.env.user.groups_id += cls.env.ref("product.group_stock_packaging")
+        cls.env["ir.config_parameter"].set_param(
+            "account_edi.product_name_match", "True"
+        )
+        cls.uom_unit = cls.env.ref("uom.product_uom_unit")
+
+        cls.product = cls.env["product.product"].create(
+            {
+                "name": "Locations and leasing",
+                "type": "consu",
+                "uom_id": cls.uom_unit.id,
+            }
+        )
+        cls.unece_packaging_type_x8a = cls.env["unece.code.list"].create(
+            {
+                "type": "packaging_type",
+                "code": "X8A",
+                "name": "Pallet, wooden",
+                "description": "Wooden pallet.",
+            }
+        )
+        cls.packaging_level = cls.env["product.packaging.level"].create(
+            {
+                "name": "Pallet",
+                "code": "PAL",
+                "sequence": 2,
+                "unece_type_ids": [Command.set(cls.unece_packaging_type_x8a.ids)],
+            }
+        )
+        cls.packaging = cls.env["product.packaging"].create(
+            {
+                "name": "pallet 72",
+                "product_id": cls.product.id,
+                "qty": 72.0,
+                "packaging_level_id": cls.packaging_level.id,
+            }
+        )
+
+    def _import_invoice(self, journal, file_path):
+        with file_open(file_path, "rb") as file:
+            xml_attachment = self.env["ir.attachment"].create(
+                {
+                    "mimetype": "application/xml",
+                    "name": "test_invoice.xml",
+                    "raw": file.read(),
+                }
+            )
+        move = (
+            self.env["account.journal"]
+            .with_context(default_journal_id=journal.id)
+            ._create_document_from_attachment(xml_attachment.id)
+        )
+        return move
+
+    def test_0(self):
+        """uom dozen"""
+        file_path = (
+            "account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/"
+            "bis3_bill_example_uom_dozen.xml"
+        )
+        bill = self._import_invoice(
+            self.company_data["default_journal_purchase"], file_path
+        )
+        line = bill.invoice_line_ids
+        self.assertEqual(line.product_uom_id.name, "Dozens")
+        self.assertFalse(line.product_packaging_qty)
+        self.assertFalse(line.product_packaging_id)
+
+    def test_1(self):
+        """uom unit"""
+        file_path = (
+            "account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/"
+            "bis3_bill_example_uom_unit.xml"
+        )
+        bill = self._import_invoice(
+            self.company_data["default_journal_purchase"], file_path
+        )
+        line = bill.invoice_line_ids
+        self.assertEqual(line.product_uom_id.name, "Units")
+        self.assertFalse(line.product_packaging_qty)
+        self.assertFalse(line.product_packaging_id)
+        self.assertEqual(line.price_unit, 657.0)
+
+    def test_2(self):
+        """no uom"""
+        file_path = (
+            "account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/"
+            "bis3_bill_example_no_uom.xml"
+        )
+        bill = self._import_invoice(
+            self.company_data["default_journal_purchase"], file_path
+        )
+        line = bill.invoice_line_ids
+        self.assertEqual(line.product_uom_id.name, "Units")
+        self.assertFalse(line.product_packaging_qty)
+        self.assertFalse(line.product_packaging_id)
+        self.assertEqual(line.price_unit, 657.0)
+
+    def test_3(self):
+        """packaging pallet"""
+        file_path = (
+            "account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/"
+            "bis3_bill_example_packaging_pallet.xml"
+        )
+        bill = self._import_invoice(
+            self.company_data["default_journal_purchase"], file_path
+        )
+        line = bill.invoice_line_ids
+        self.assertEqual(line.product_id, self.product)
+        self.assertEqual(line.product_uom_id.name, "Units")
+        self.assertEqual(line.quantity, 72)
+        self.assertEqual(line.product_packaging_qty, 1)
+        self.assertEqual(line.product_packaging_id, self.packaging)
+        self.assertEqual(line.price_unit, 9.13)
+
+    def test_4(self):
+        """packaging unknown"""
+        self.packaging_level.unece_type_ids = False
+        file_path = (
+            "account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/"
+            "bis3_bill_example_packaging_pallet.xml"
+        )
+        bill = self._import_invoice(
+            self.company_data["default_journal_purchase"], file_path
+        )
+        line = bill.invoice_line_ids
+        self.assertEqual(line.product_id, self.product)
+        self.assertEqual(line.product_uom_id.name, "Units")
+        self.assertEqual(line.quantity, 1)
+        self.assertFalse(line.product_packaging_qty)
+        self.assertFalse(line.product_packaging_id)
+        self.assertEqual(line.price_unit, 657.0)
+
+    def test_5(self):
+        """package code 8A, X8A in ubl"""
+        self.unece_packaging_type_x8a.code = "8A"
+        file_path = (
+            "account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/"
+            "bis3_bill_example_packaging_pallet.xml"
+        )
+        bill = self._import_invoice(
+            self.company_data["default_journal_purchase"], file_path
+        )
+        line = bill.invoice_line_ids
+        self.assertEqual(line.product_id, self.product)
+        self.assertEqual(line.product_uom_id.name, "Units")
+        self.assertEqual(line.quantity, 72)
+        self.assertEqual(line.product_packaging_qty, 1)
+        self.assertEqual(line.product_packaging_id, self.packaging)
+        self.assertEqual(line.price_unit, 9.13)
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/bis3_bill_example_no_uom.xml b/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/bis3_bill_example_no_uom.xml
new file mode 100644
index 0000000000..98ec413857
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/bis3_bill_example_no_uom.xml
@@ -0,0 +1,144 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+    xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+    xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+>
+  <cbc:CustomizationID
+    >urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>FAC/2023/00052</cbc:ID>
+  <cbc:IssueDate>2023-08-04</cbc:IssueDate>
+  <cbc:DueDate>2023-09-04</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cac:OrderReference>
+    <cbc:ID>FAC/2023/00052</cbc:ID>
+    <cbc:SalesOrderID>S00012</cbc:SalesOrderID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>FAC_2023_00052.pdf</cbc:ID>
+    <cac:Attachment>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>270 rte d'Arlon</cbc:StreetName>
+        <cbc:CityName>Strassen</cbc:CityName>
+        <cbc:PostalZone>8010</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>ALD Automotive LU</cbc:RegistrationName>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+        <cbc:ElectronicMail>adl@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>Odoo Lu</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Odoo Lu</cbc:RegistrationName>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>Odoo Lu</cbc:Name>
+        <cbc:ElectronicMail>odoo@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentID>FAC/2023/00052</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>LU071241358706500000</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">657.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">657.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">762.12</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="EUR">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">762.12</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity>1.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Locations and leasing</cbc:Description>
+      <cbc:Name>Locations and leasing</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>leasing001</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">657.00</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/bis3_bill_example_packaging_pallet.xml b/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/bis3_bill_example_packaging_pallet.xml
new file mode 100644
index 0000000000..f210b9ff11
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/bis3_bill_example_packaging_pallet.xml
@@ -0,0 +1,144 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+    xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+    xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+>
+  <cbc:CustomizationID
+    >urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>FAC/2023/00052</cbc:ID>
+  <cbc:IssueDate>2023-08-04</cbc:IssueDate>
+  <cbc:DueDate>2023-09-04</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cac:OrderReference>
+    <cbc:ID>FAC/2023/00052</cbc:ID>
+    <cbc:SalesOrderID>S00012</cbc:SalesOrderID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>FAC_2023_00052.pdf</cbc:ID>
+    <cac:Attachment>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>270 rte d'Arlon</cbc:StreetName>
+        <cbc:CityName>Strassen</cbc:CityName>
+        <cbc:PostalZone>8010</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>ALD Automotive LU</cbc:RegistrationName>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+        <cbc:ElectronicMail>adl@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>Odoo Lu</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Odoo Lu</cbc:RegistrationName>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>Odoo Lu</cbc:Name>
+        <cbc:ElectronicMail>odoo@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentID>FAC/2023/00052</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>LU071241358706500000</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">657.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">657.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">762.12</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="EUR">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">762.12</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="X8A">1.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Locations and leasing</cbc:Description>
+      <cbc:Name>Locations and leasing</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>leasing001</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">657.00</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/bis3_bill_example_uom_dozen.xml b/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/bis3_bill_example_uom_dozen.xml
new file mode 100644
index 0000000000..d86b7777cb
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/bis3_bill_example_uom_dozen.xml
@@ -0,0 +1,144 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+    xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+    xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+>
+  <cbc:CustomizationID
+    >urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>FAC/2023/00052</cbc:ID>
+  <cbc:IssueDate>2023-08-04</cbc:IssueDate>
+  <cbc:DueDate>2023-09-04</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cac:OrderReference>
+    <cbc:ID>FAC/2023/00052</cbc:ID>
+    <cbc:SalesOrderID>S00012</cbc:SalesOrderID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>FAC_2023_00052.pdf</cbc:ID>
+    <cac:Attachment>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>270 rte d'Arlon</cbc:StreetName>
+        <cbc:CityName>Strassen</cbc:CityName>
+        <cbc:PostalZone>8010</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>ALD Automotive LU</cbc:RegistrationName>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+        <cbc:ElectronicMail>adl@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>Odoo Lu</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Odoo Lu</cbc:RegistrationName>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>Odoo Lu</cbc:Name>
+        <cbc:ElectronicMail>odoo@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentID>FAC/2023/00052</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>LU071241358706500000</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">657.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">657.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">762.12</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="EUR">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">762.12</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="DPC">1.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Locations and leasing</cbc:Description>
+      <cbc:Name>Locations and leasing</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>leasing001</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">657.00</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/bis3_bill_example_uom_unit.xml b/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/bis3_bill_example_uom_unit.xml
new file mode 100644
index 0000000000..aeffe1855c
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/tests/test_files/bis3_bill_example_uom_unit.xml
@@ -0,0 +1,144 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+    xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+    xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+>
+  <cbc:CustomizationID
+    >urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>FAC/2023/00052</cbc:ID>
+  <cbc:IssueDate>2023-08-04</cbc:IssueDate>
+  <cbc:DueDate>2023-09-04</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cac:OrderReference>
+    <cbc:ID>FAC/2023/00052</cbc:ID>
+    <cbc:SalesOrderID>S00012</cbc:SalesOrderID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>FAC_2023_00052.pdf</cbc:ID>
+    <cac:Attachment>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>270 rte d'Arlon</cbc:StreetName>
+        <cbc:CityName>Strassen</cbc:CityName>
+        <cbc:PostalZone>8010</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>ALD Automotive LU</cbc:RegistrationName>
+        <cbc:CompanyID>LU12977109</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>ALD Automotive LU</cbc:Name>
+        <cbc:ElectronicMail>adl@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="9938">LU25587702</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>Odoo Lu</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Odoo Lu</cbc:RegistrationName>
+        <cbc:CompanyID>LU25587702</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>Odoo Lu</cbc:Name>
+        <cbc:ElectronicMail>odoo@test.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue de l'industrie 13</cbc:StreetName>
+        <cbc:CityName>Windhof</cbc:CityName>
+        <cac:Country>
+          <cbc:IdentificationCode>LU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentID>FAC/2023/00052</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>LU071241358706500000</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">657.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">105.12</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">657.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">762.12</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="EUR">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">762.12</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">657.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Locations and leasing</cbc:Description>
+      <cbc:Name>Locations and leasing</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>leasing001</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>16.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">657.00</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/account_edi_ubl_move_line_uom_and_packaging_unece/views/account_move.xml b/account_edi_ubl_move_line_uom_and_packaging_unece/views/account_move.xml
new file mode 100644
index 0000000000..a2baaac91f
--- /dev/null
+++ b/account_edi_ubl_move_line_uom_and_packaging_unece/views/account_move.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2026 ACSONE SA/NV
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record id="account_move_form_view" model="ir.ui.view">
+        <field name="model">account.move</field>
+        <field
+            name="inherit_id"
+            ref="account_move_line_packaging.account_move_form_view"
+        />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='product_packaging_id']" position="before">
+                <field
+                    name="ubl_unece_unit_code"
+                    optional="hide"
+                    attrs="{'column_invisible': [('parent.move_type', '!=', 'in_invoice')], 'invisible': [('product_id', '=', False)]}"
+                    groups="product.group_stock_packaging"
+                />
+            </xpath>
+            <xpath expr="//field[@name='price_unit']" position="before">
+                <field
+                    name="ubl_price_unit"
+                    attrs="{'column_invisible': [('parent.move_type', '!=', 'in_invoice')]}"
+                    optional="hide"
+                />
+            </xpath>
+        </field>
+    </record>
+
+
+
+</odoo>
diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 1e3a0aed5b..a87e2a67b1 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-16.0.20260603.3
\ No newline at end of file
+16.0.20260605.2
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index dd50ed307b..17a122ecf1 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -14,7 +14,10 @@
         'odoo-addon-account_edi_ubl_cii_additional_document>=16.0dev,<16.1dev',
         'odoo-addon-account_edi_ubl_cii_check_total>=16.0dev,<16.1dev',
         'odoo-addon-account_edi_ubl_cii_invoice_line_name_enhance>=16.0dev,<16.1dev',
+        'odoo-addon-account_edi_ubl_cii_purchase_match>=16.0dev,<16.1dev',
+        'odoo-addon-account_edi_ubl_cii_retrieve_tax>=16.0dev,<16.1dev',
         'odoo-addon-account_edi_ubl_cii_supplier_invoice_number>=16.0dev,<16.1dev',
+        'odoo-addon-account_edi_ubl_move_line_uom_and_packaging_unece>=16.0dev,<16.1dev',
         'odoo-addon-account_einvoice_generate>=16.0dev,<16.1dev',
         'odoo-addon-account_invoice_download>=16.0dev,<16.1dev',
         'odoo-addon-account_invoice_download_ovh>=16.0dev,<16.1dev',
diff --git a/setup/account_edi_ubl_cii_purchase_match/odoo/addons/account_edi_ubl_cii_purchase_match b/setup/account_edi_ubl_cii_purchase_match/odoo/addons/account_edi_ubl_cii_purchase_match
new file mode 120000
index 0000000000..9c9e64d35e
--- /dev/null
+++ b/setup/account_edi_ubl_cii_purchase_match/odoo/addons/account_edi_ubl_cii_purchase_match
@@ -0,0 +1 @@
+../../../../account_edi_ubl_cii_purchase_match
\ No newline at end of file
diff --git a/setup/account_edi_ubl_cii_purchase_match/setup.py b/setup/account_edi_ubl_cii_purchase_match/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/account_edi_ubl_cii_purchase_match/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/account_edi_ubl_cii_retrieve_tax/odoo/addons/account_edi_ubl_cii_retrieve_tax b/setup/account_edi_ubl_cii_retrieve_tax/odoo/addons/account_edi_ubl_cii_retrieve_tax
new file mode 120000
index 0000000000..ab2e3a1f01
--- /dev/null
+++ b/setup/account_edi_ubl_cii_retrieve_tax/odoo/addons/account_edi_ubl_cii_retrieve_tax
@@ -0,0 +1 @@
+../../../../account_edi_ubl_cii_retrieve_tax
\ No newline at end of file
diff --git a/setup/account_edi_ubl_cii_retrieve_tax/setup.py b/setup/account_edi_ubl_cii_retrieve_tax/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/account_edi_ubl_cii_retrieve_tax/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/account_edi_ubl_move_line_uom_and_packaging_unece/odoo/addons/account_edi_ubl_move_line_uom_and_packaging_unece b/setup/account_edi_ubl_move_line_uom_and_packaging_unece/odoo/addons/account_edi_ubl_move_line_uom_and_packaging_unece
new file mode 120000
index 0000000000..bd74136d23
--- /dev/null
+++ b/setup/account_edi_ubl_move_line_uom_and_packaging_unece/odoo/addons/account_edi_ubl_move_line_uom_and_packaging_unece
@@ -0,0 +1 @@
+../../../../account_edi_ubl_move_line_uom_and_packaging_unece
\ No newline at end of file
diff --git a/setup/account_edi_ubl_move_line_uom_and_packaging_unece/setup.py b/setup/account_edi_ubl_move_line_uom_and_packaging_unece/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/account_edi_ubl_move_line_uom_and_packaging_unece/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)