From 9b3c545470baf88617e9c3ef4695366e228f1bc6 Mon Sep 17 00:00:00 2001 From: Souheil Bejaoui Date: Mon, 30 Mar 2026 14:04:49 +0200 Subject: [PATCH 1/2] [DON'T MERGE] add test requirements --- test-requirements.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index 0ffc43b83b..d88aba4ae0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1 +1,6 @@ freezegun==1.2.2 +odoo-addon-account-edi-ubl-cii-purchase-match @ git+https://github.com/OCA/edi.git@refs/pull/1267/head#subdirectory=setup/account_edi_ubl_cii_purchase_match +odoo-addon-account_edi_ubl_move_line_uom_and_packaging_unece@ git+https://github.com/OCA/edi.git@refs/pull/1311/head#subdirectory=setup/account_edi_ubl_move_line_uom_and_packaging_unece +odoo-addon-account_move_line_packaging @ git+https://github.com/OCA/account-invoicing.git@refs/pull/2297/head#subdirectory=setup/account_move_line_packaging +odoo-addon-uom_unece @ git+https://github.com/oca/community-data-files@refs/pull/270/head#subdirectory=setup/uom_unece +odoo-addon-product_packaging_unece @ git+https://github.com/oca/community-data-files@refs/pull/271/head#subdirectory=setup/product_packaging_unece From 73e1aa50846653d4dc342850b8986fea9725d63c Mon Sep 17 00:00:00 2001 From: Souheil Bejaoui Date: Mon, 30 Mar 2026 14:05:17 +0200 Subject: [PATCH 2/2] [ADD] account_edi_ubl_cii_purchase_match_product_packaging Allows retrieving the correct UoM and packaging from UNECE codes when matching invoice lines with purchase orders --- .../README.rst | 95 ++++ .../__init__.py | 1 + .../__manifest__.py | 19 + .../models/__init__.py | 2 + .../models/account_edi_xml_ubl_20.py | 18 + .../models/account_move_line.py | 20 + .../readme/CONTRIBUTORS.md | 1 + .../readme/DESCRIPTION.md | 7 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 438 ++++++++++++++++++ .../tests/__init__.py | 1 + ...bl_cii_purchase_match_product_packaging.py | 197 ++++++++ .../bis3_bill_example_packaging_pallet.xml | 144 ++++++ .../bis3_bill_example_uom_dozen.xml | 144 ++++++ ...i_ubl_cii_purchase_match_product_packaging | 1 + .../setup.py | 6 + 16 files changed, 1094 insertions(+) create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/README.rst create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/__init__.py create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/__manifest__.py create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/models/__init__.py create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/models/account_edi_xml_ubl_20.py create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/models/account_move_line.py create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/readme/CONTRIBUTORS.md create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/readme/DESCRIPTION.md create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/static/description/icon.png create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/static/description/index.html create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/tests/__init__.py create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/tests/test_account_edi_ubl_cii_purchase_match_product_packaging.py create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/tests/test_files/bis3_bill_example_packaging_pallet.xml create mode 100644 account_edi_ubl_cii_purchase_match_product_packaging/tests/test_files/bis3_bill_example_uom_dozen.xml create mode 120000 setup/account_edi_ubl_cii_purchase_match_product_packaging/odoo/addons/account_edi_ubl_cii_purchase_match_product_packaging create mode 100644 setup/account_edi_ubl_cii_purchase_match_product_packaging/setup.py diff --git a/account_edi_ubl_cii_purchase_match_product_packaging/README.rst b/account_edi_ubl_cii_purchase_match_product_packaging/README.rst new file mode 100644 index 0000000000..3b3d36d96f --- /dev/null +++ b/account_edi_ubl_cii_purchase_match_product_packaging/README.rst @@ -0,0 +1,95 @@ +.. 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 Product Packaging +==================================================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:aa1bb8c238590904cd7495d3d7e66d15c29020fd61c29dad0c06f3f06ec467cd + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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_product_packaging + :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_product_packaging + :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 provides a fallback mechanism to recover the Unit of Measure +(UoM) and product packaging during purchase line reconciliation of +vendor bills imported from UBL/CII files. + +It is a glue module between: + +- Account Edi Ubl Cii Purchase Match +- Account EDI UBL move line uom and packaging By UNECE + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub 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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +------- + +* ACSONE SA/NV + +Contributors +------------ + +- Souheil Bejaoui - ACSONE SA/NV 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 `__: + +|maintainer-sbejaoui| + +This module is part of the `OCA/edi `_ 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_product_packaging/__init__.py b/account_edi_ubl_cii_purchase_match_product_packaging/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/account_edi_ubl_cii_purchase_match_product_packaging/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_edi_ubl_cii_purchase_match_product_packaging/__manifest__.py b/account_edi_ubl_cii_purchase_match_product_packaging/__manifest__.py new file mode 100644 index 0000000000..b63949b2da --- /dev/null +++ b/account_edi_ubl_cii_purchase_match_product_packaging/__manifest__.py @@ -0,0 +1,19 @@ +# Copyright 2026 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Account Edi Ubl Cii Purchase Match Product Packaging", + "summary": """Allows retrieving the correct UoM and packaging from UNECE codes + when matching invoice lines with purchase orders""", + "version": "16.0.1.0.0", + "license": "AGPL-3", + "author": "ACSONE SA/NV,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/edi", + "maintainers": ["sbejaoui"], + "depends": [ + "account_edi_ubl_cii_purchase_match", + "account_edi_ubl_move_line_uom_and_packaging_unece", + ], + "data": [], + "demo": [], +} diff --git a/account_edi_ubl_cii_purchase_match_product_packaging/models/__init__.py b/account_edi_ubl_cii_purchase_match_product_packaging/models/__init__.py new file mode 100644 index 0000000000..5226bd6496 --- /dev/null +++ b/account_edi_ubl_cii_purchase_match_product_packaging/models/__init__.py @@ -0,0 +1,2 @@ +from . import account_move_line +from . import account_edi_xml_ubl_20 diff --git a/account_edi_ubl_cii_purchase_match_product_packaging/models/account_edi_xml_ubl_20.py b/account_edi_ubl_cii_purchase_match_product_packaging/models/account_edi_xml_ubl_20.py new file mode 100644 index 0000000000..4084d493fc --- /dev/null +++ b/account_edi_ubl_cii_purchase_match_product_packaging/models/account_edi_xml_ubl_20.py @@ -0,0 +1,18 @@ +# Copyright 2026 ACSONE SA/NV +# 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 _import_fill_invoice_line_packaging(self, invoice_line): + res = super()._import_fill_invoice_line_packaging(invoice_line) + # force recomputation of the quantity + # this is needed because after a second reconciliation with a purchase line, + # the packaging may remain the same while the underlying quantity changes + # without this explicit call, the computed quantity may become inconsistent + invoice_line._compute_quantity() + return res diff --git a/account_edi_ubl_cii_purchase_match_product_packaging/models/account_move_line.py b/account_edi_ubl_cii_purchase_match_product_packaging/models/account_move_line.py new file mode 100644 index 0000000000..8eec6c2d2a --- /dev/null +++ b/account_edi_ubl_cii_purchase_match_product_packaging/models/account_move_line.py @@ -0,0 +1,20 @@ +# Copyright 2026 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class AccountMoveLine(models.Model): + + _inherit = "account.move.line" + + def _set_product(self, product): + self.ensure_one() + res = super()._set_product(product) + + if self.ubl_unece_unit_code: + if not self.env[ + "account.edi.xml.ubl_20" + ]._import_fill_invoice_line_packaging(self): + self.env["account.edi.xml.ubl_20"]._import_fill_invoice_line_uom(self) + return res diff --git a/account_edi_ubl_cii_purchase_match_product_packaging/readme/CONTRIBUTORS.md b/account_edi_ubl_cii_purchase_match_product_packaging/readme/CONTRIBUTORS.md new file mode 100644 index 0000000000..18f298014b --- /dev/null +++ b/account_edi_ubl_cii_purchase_match_product_packaging/readme/CONTRIBUTORS.md @@ -0,0 +1 @@ +- Souheil Bejaoui - ACSONE SA/NV \ No newline at end of file diff --git a/account_edi_ubl_cii_purchase_match_product_packaging/readme/DESCRIPTION.md b/account_edi_ubl_cii_purchase_match_product_packaging/readme/DESCRIPTION.md new file mode 100644 index 0000000000..fb16853871 --- /dev/null +++ b/account_edi_ubl_cii_purchase_match_product_packaging/readme/DESCRIPTION.md @@ -0,0 +1,7 @@ +This module provides a fallback mechanism to recover the Unit of Measure (UoM) +and product packaging during purchase line reconciliation of vendor bills +imported from UBL/CII files. + +It is a glue module between: +- Account Edi Ubl Cii Purchase Match +- Account EDI UBL move line uom and packaging By UNECE diff --git a/account_edi_ubl_cii_purchase_match_product_packaging/static/description/icon.png b/account_edi_ubl_cii_purchase_match_product_packaging/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/account_edi_ubl_cii_purchase_match_product_packaging/static/description/index.html b/account_edi_ubl_cii_purchase_match_product_packaging/static/description/index.html new file mode 100644 index 0000000000..8ad9f5bc40 --- /dev/null +++ b/account_edi_ubl_cii_purchase_match_product_packaging/static/description/index.html @@ -0,0 +1,438 @@ + + + + + +README.rst + + + +
+ + + +Odoo Community Association + +
+

Account Edi Ubl Cii Purchase Match Product Packaging

+ +

Beta License: AGPL-3 OCA/edi Translate me on Weblate Try me on Runboat

+

This module provides a fallback mechanism to recover the Unit of Measure +(UoM) and product packaging during purchase line reconciliation of +vendor bills imported from UBL/CII files.

+

It is a glue module between:

+
    +
  • Account Edi Ubl Cii Purchase Match
    • +
  • Account EDI UBL move line uom and packaging By UNECE
    • +
+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub 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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • ACSONE SA/NV
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+ +Odoo Community Association + +

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.

+

Current maintainer:

+

sbejaoui

+

This module is part of the OCA/edi 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_product_packaging/tests/__init__.py b/account_edi_ubl_cii_purchase_match_product_packaging/tests/__init__.py new file mode 100644 index 0000000000..3dfdaec930 --- /dev/null +++ b/account_edi_ubl_cii_purchase_match_product_packaging/tests/__init__.py @@ -0,0 +1 @@ +from . import test_account_edi_ubl_cii_purchase_match_product_packaging diff --git a/account_edi_ubl_cii_purchase_match_product_packaging/tests/test_account_edi_ubl_cii_purchase_match_product_packaging.py b/account_edi_ubl_cii_purchase_match_product_packaging/tests/test_account_edi_ubl_cii_purchase_match_product_packaging.py new file mode 100644 index 0000000000..7206bdbf63 --- /dev/null +++ b/account_edi_ubl_cii_purchase_match_product_packaging/tests/test_account_edi_ubl_cii_purchase_match_product_packaging.py @@ -0,0 +1,197 @@ +# 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 TestAccountEdiUblCiiPurchaseMatchProductPackaging(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.env["ir.sequence"].search( + [("code", "=", "purchase.order")], limit=1 + ).prefix = "PO" + cls.partner = cls.env["res.partner"].create( + {"name": "ALD Automotive LU", "vat": "LU25587702"} + ) + cls.uom_unit = cls.env.ref("uom.product_uom_unit") + cls.uom_dozen = cls.env.ref("uom.product_uom_dozen") + 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.product = cls.env["product.product"].create( + { + "name": "Locations and leasing", + "type": "consu", + "uom_id": cls.uom_unit.id, + } + ) + cls.purchase_order = cls.env["purchase.order"].create( + { + "partner_id": cls.partner.id, + "name": "PO00101", + "order_line": [ + Command.create( + { + "name": cls.product.name, + "product_id": cls.product.id, + "product_qty": 1, + "price_unit": 1000, + } + ), + ], + } + ) + cls.purchase_order.button_confirm() + cls.po_line = cls.purchase_order.order_line + + 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): + """ + the UNECE unit code from the UBL file is stored on the invoice inv_line during import + """ + file_path = ( + "account_edi_ubl_cii_purchase_match_product_packaging/tests/test_files/" + "bis3_bill_example_uom_dozen.xml" + ) + bill = self._import_invoice( + self.company_data["default_journal_purchase"], file_path + ) + inv_line = bill.invoice_line_ids + self.assertEqual(inv_line.ubl_unece_unit_code, "DPC") + self.assertAlmostEqual(inv_line.ubl_price_unit, 657.0) + self.assertAlmostEqual(inv_line.price_unit, 657.0) + + def test_1(self): + """ + If the UNECE code can't be matched to a uom at import time, + it is still stored and later used during reconciliation to recover and apply + the correct uom once available + """ + self.uom_dozen.unece_code = False + file_path = ( + "account_edi_ubl_cii_purchase_match_product_packaging/tests/test_files/" + "bis3_bill_example_uom_dozen.xml" + ) + bill = self._import_invoice( + self.company_data["default_journal_purchase"], file_path + ) + inv_line = bill.invoice_line_ids + self.assertEqual(inv_line.ubl_unece_unit_code, "DPC") + self.assertEqual(inv_line.product_uom_id, self.uom_unit) + 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) + self.uom_dozen.unece_code = "DPC" + wizard.select_purchase_line() + self.assertEqual(inv_line.product_uom_id, self.uom_dozen) + self.assertAlmostEqual(inv_line.ubl_price_unit, 657.0) + self.assertAlmostEqual(inv_line.price_unit, 657.0) + + def test_2(self): + """ + check that packaging is correctly applied during reconciliation when available + """ + file_path = ( + "account_edi_ubl_cii_purchase_match_product_packaging/tests/test_files/" + "bis3_bill_example_packaging_pallet.xml" + ) + bill = self._import_invoice( + self.company_data["default_journal_purchase"], file_path + ) + inv_line = bill.invoice_line_ids + self.assertEqual(inv_line.ubl_unece_unit_code, "X8A") + self.assertEqual(inv_line.quantity, 1) + self.assertEqual(inv_line.product_uom_id, self.uom_unit) + self.assertFalse(inv_line.product_packaging_qty) + self.assertFalse(inv_line.product_packaging_id) + 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) + packaging = self.env["product.packaging"].create( + { + "name": "pallet 72", + "product_id": self.product.id, + "qty": 72.0, + "packaging_level_id": self.packaging_level.id, + } + ) + wizard.select_purchase_line() + self.assertEqual(inv_line.quantity, 72) + self.assertEqual(inv_line.product_uom_id, self.uom_unit) + self.assertEqual(inv_line.product_packaging_qty, 1) + self.assertEqual(inv_line.product_packaging_id, packaging) + self.assertAlmostEqual(inv_line.ubl_price_unit, 657.0) + self.assertAlmostEqual(inv_line.price_unit, 9.13) + return inv_line + + def test_3(self): + inv_line = self.test_2() + packaging = inv_line.product_packaging_id + packaging.qty = 100 + action = inv_line.action_select_purchase_line() + wizard = ( + self.env[action.get("res_model")] + .with_context(**action.get("context")) + .create({}) + ) + wizard.select_purchase_line() + self.assertEqual(inv_line.quantity, 100) + self.assertEqual(inv_line.product_uom_id, self.uom_unit) + self.assertEqual(inv_line.product_packaging_qty, 1) + self.assertEqual(inv_line.product_packaging_id, packaging) + self.assertAlmostEqual(inv_line.ubl_price_unit, 657.0) + self.assertAlmostEqual(inv_line.price_unit, 6.57) diff --git a/account_edi_ubl_cii_purchase_match_product_packaging/tests/test_files/bis3_bill_example_packaging_pallet.xml b/account_edi_ubl_cii_purchase_match_product_packaging/tests/test_files/bis3_bill_example_packaging_pallet.xml new file mode 100644 index 0000000000..fbb6da05d8 --- /dev/null +++ b/account_edi_ubl_cii_purchase_match_product_packaging/tests/test_files/bis3_bill_example_packaging_pallet.xml @@ -0,0 +1,144 @@ + + + urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0 + urn:fdc:peppol.eu:2017:poacc:billing:01:1.0 + PO00101 + 2023-08-04 + 2023-09-04 + 380 + EUR + + PO00101 + S00012 + + + FAC_2023_00052.pdf + + + + + + LU25587702 + + ALD Automotive LU + + + 270 rte d'Arlon + Strassen + 8010 + + LU + + + + LU12977109 + + VAT + + + + ALD Automotive LU + LU12977109 + + + ALD Automotive LU + adl@test.com + + + + + + LU25587702 + + Odoo Lu + + + Rue de l'industrie 13 + Windhof + + LU + + + + LU25587702 + + VAT + + + + Odoo Lu + LU25587702 + + + Odoo Lu + odoo@test.com + + + + + + + Rue de l'industrie 13 + Windhof + + LU + + + + + + 30 + PO00101 + + LU071241358706500000 + + + + 105.12 + + 657.00 + 105.12 + + S + 16.0 + + VAT + + + + + + 657.00 + 657.00 + 762.12 + 0.00 + 762.12 + + + 1 + 1.0 + 657.00 + + Locations and leasing + Locations and leasing + + leasing001 + + + S + 16.0 + + VAT + + + + + 657.00 + + + diff --git a/account_edi_ubl_cii_purchase_match_product_packaging/tests/test_files/bis3_bill_example_uom_dozen.xml b/account_edi_ubl_cii_purchase_match_product_packaging/tests/test_files/bis3_bill_example_uom_dozen.xml new file mode 100644 index 0000000000..6f50857660 --- /dev/null +++ b/account_edi_ubl_cii_purchase_match_product_packaging/tests/test_files/bis3_bill_example_uom_dozen.xml @@ -0,0 +1,144 @@ + + + urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0 + urn:fdc:peppol.eu:2017:poacc:billing:01:1.0 + PO00101 + 2023-08-04 + 2023-09-04 + 380 + EUR + + PO00101 + S00012 + + + FAC_2023_00052.pdf + + + + + + LU25587702 + + ALD Automotive LU + + + 270 rte d'Arlon + Strassen + 8010 + + LU + + + + LU12977109 + + VAT + + + + ALD Automotive LU + LU12977109 + + + ALD Automotive LU + adl@test.com + + + + + + LU25587702 + + Odoo Lu + + + Rue de l'industrie 13 + Windhof + + LU + + + + LU25587702 + + VAT + + + + Odoo Lu + LU25587702 + + + Odoo Lu + odoo@test.com + + + + + + + Rue de l'industrie 13 + Windhof + + LU + + + + + + 30 + PO00101 + + LU071241358706500000 + + + + 105.12 + + 657.00 + 105.12 + + S + 16.0 + + VAT + + + + + + 657.00 + 657.00 + 762.12 + 0.00 + 762.12 + + + 1 + 1.0 + 657.00 + + Locations and leasing + Locations and leasing + + leasing001 + + + S + 16.0 + + VAT + + + + + 657.00 + + + diff --git a/setup/account_edi_ubl_cii_purchase_match_product_packaging/odoo/addons/account_edi_ubl_cii_purchase_match_product_packaging b/setup/account_edi_ubl_cii_purchase_match_product_packaging/odoo/addons/account_edi_ubl_cii_purchase_match_product_packaging new file mode 120000 index 0000000000..f3e4e2b93c --- /dev/null +++ b/setup/account_edi_ubl_cii_purchase_match_product_packaging/odoo/addons/account_edi_ubl_cii_purchase_match_product_packaging @@ -0,0 +1 @@ +../../../../account_edi_ubl_cii_purchase_match_product_packaging \ No newline at end of file diff --git a/setup/account_edi_ubl_cii_purchase_match_product_packaging/setup.py b/setup/account_edi_ubl_cii_purchase_match_product_packaging/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/account_edi_ubl_cii_purchase_match_product_packaging/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)