From e3af8aee6885573f23e95b16d00298cec55f8037 Mon Sep 17 00:00:00 2001
From: "Achraf (abz)" <abz@odoo.com>
Date: Tue, 28 Sep 2021 10:25:23 +0000
Subject: [PATCH] [FIX] account_edi_ubl: Make UBL template EFFF-compatible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since https://github.com/odoo/odoo/pull/69124,the UBL template is wrong because of the order of the elements in `PaymentMeans` because it is a sequence
`PaymentDueDate` must be in second position (before `InstructionId`)

https://www.w3schools.com/xml/el_sequence.asp
https://docs.oasis-open.org/ubl/prd1-UBL-2.1/xsd/common/UBL-CommonAggregateComponents-2.1.xsd
see `<xsd: complexType name = "PaymentMeansType">`

OPW-2468492

closes odoo/odoo#77560

X-original-commit: 8b20b130da9528e7c1cc12c1fb25b6c2632b00f7
Signed-off-by: Achraf <abz-odoo@users.noreply.github.com>
Signed-off-by: William André (wan) <wan@odoo.com>
---
 addons/account_edi_ubl/data/ubl_templates.xml | 2 +-
 addons/l10n_be_edi/tests/test_ubl.py          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_edi_ubl/data/ubl_templates.xml b/addons/account_edi_ubl/data/ubl_templates.xml
index ee1788af29b..786840f9594 100644
--- a/addons/account_edi_ubl/data/ubl_templates.xml
+++ b/addons/account_edi_ubl/data/ubl_templates.xml
@@ -131,8 +131,8 @@
                 </cac:AccountingCustomerParty>
                 <cac:PaymentMeans>
                     <cbc:PaymentMeansCode listID="UN/ECE 4461" t-esc="payment_means_code"/>
-                    <cbc:InstructionID t-esc="record.payment_reference"/>
                     <cbc:PaymentDueDate t-esc="record.invoice_date_due"/>
+                    <cbc:InstructionID t-esc="record.payment_reference"/>
                     <cac:PayeeFinancialAccount t-if="record.journal_id.bank_account_id">
                         <cbc:ID schemeName="IBAN" t-esc="record.journal_id.bank_account_id.acc_number"/>
                         <cac:FinancialInstitutionBranch t-if="record.journal_id.bank_account_id.bank_bic">
diff --git a/addons/l10n_be_edi/tests/test_ubl.py b/addons/l10n_be_edi/tests/test_ubl.py
index 59312df6325..920d0241a78 100644
--- a/addons/l10n_be_edi/tests/test_ubl.py
+++ b/addons/l10n_be_edi/tests/test_ubl.py
@@ -107,8 +107,8 @@ class TestL10nBeEdi(AccountEdiTestCommon):
                 </AccountingCustomerParty>
                 <PaymentMeans>
                     <PaymentMeansCode listID="UN/ECE 4461">31</PaymentMeansCode>
-                    <InstructionID>INV/2017/00001</InstructionID>
                     <PaymentDueDate>2017-01-01</PaymentDueDate>
+                    <InstructionID>INV/2017/00001</InstructionID>
                 </PaymentMeans>
                 <TaxTotal>
                     <TaxAmount currencyID="Gol">220.000</TaxAmount>