diff --git a/addons/account_edi_ubl_cii/models/account_edi_xml_ubl_bis3.py b/addons/account_edi_ubl_cii/models/account_edi_xml_ubl_bis3.py
index 6b3fa75661a..569855bce23 100644
--- a/addons/account_edi_ubl_cii/models/account_edi_xml_ubl_bis3.py
+++ b/addons/account_edi_ubl_cii/models/account_edi_xml_ubl_bis3.py
@@ -151,9 +151,6 @@ class AccountEdiXmlUBLBIS3(models.AbstractModel):
and supplier.country_id.code in economic_area
and supplier.country_id != customer.country_id)
- if not intracom_delivery:
- return []
-
# [BR-IC-12]-In an Invoice with a VAT breakdown (BG-23) where the VAT category code (BT-118) is
# "Intra-community supply" the Deliver to country code (BT-80) shall not be blank.
@@ -161,17 +158,17 @@ class AccountEdiXmlUBLBIS3(models.AbstractModel):
# "Intra-community supply" the Actual delivery date (BT-72) or the Invoicing period (BG-14)
# shall not be blank.
- if 'partner_shipping_id' in invoice._fields:
- partner_shipping = invoice.partner_shipping_id
- else:
- partner_shipping = customer
+ if intracom_delivery:
+ partner_shipping = invoice.partner_shipping_id or customer
- return [{
- 'actual_delivery_date': invoice.invoice_date,
- 'delivery_location_vals': {
- 'delivery_address_vals': self._get_partner_address_vals(partner_shipping),
- },
- }]
+ return [{
+ 'actual_delivery_date': invoice.invoice_date,
+ 'delivery_location_vals': {
+ 'delivery_address_vals': self._get_partner_address_vals(partner_shipping),
+ },
+ }]
+
+ return super()._get_delivery_vals_list(invoice)
def _get_partner_address_vals(self, partner):
# EXTENDS account.edi.xml.ubl_21
diff --git a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/a_nz_out_invoice.xml b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/a_nz_out_invoice.xml
index cfbe093d067..e0a0d0df485 100644
--- a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/a_nz_out_invoice.xml
+++ b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/a_nz_out_invoice.xml
@@ -73,6 +73,18 @@
+
+
+
+ Parliament Dr
+ Canberra
+ 2600
+
+ AU
+
+
+
+
30
INV/2017/00001
diff --git a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/a_nz_out_refund.xml b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/a_nz_out_refund.xml
index cdc834c671c..1cf55c0f070 100644
--- a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/a_nz_out_refund.xml
+++ b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/a_nz_out_refund.xml
@@ -72,6 +72,18 @@
+
+
+
+ Parliament Dr
+ Canberra
+ 2600
+
+ AU
+
+
+
+
30
RINV/2017/00001
diff --git a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice.xml b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice.xml
index aebecfec20c..578df8a861c 100644
--- a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice.xml
+++ b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice.xml
@@ -71,6 +71,18 @@
+
+
+
+ Rue des Bourlottes 9
+ Ramillies
+ 1367
+
+ BE
+
+
+
+
30
+++000/0000/26268+++
diff --git a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_refund.xml b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_refund.xml
index 321d1705fa3..3a7e2fb9af9 100644
--- a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_refund.xml
+++ b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_refund.xml
@@ -70,6 +70,18 @@
+
+
+
+ Rue des Bourlottes 9
+ Ramillies
+ 1367
+
+ BE
+
+
+
+
30
RINV/2017/01/0001
diff --git a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/nlcius_out_invoice.xml b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/nlcius_out_invoice.xml
index 49ab54b6795..945d32b13d5 100644
--- a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/nlcius_out_invoice.xml
+++ b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/nlcius_out_invoice.xml
@@ -79,6 +79,18 @@
+
+
+
+ Europaweg, 2
+ Rotterdam
+ 1200
+
+ NL
+
+
+
+
30
INV/2017/00002
diff --git a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/nlcius_out_refund.xml b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/nlcius_out_refund.xml
index 798103575ce..95811e037f1 100644
--- a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/nlcius_out_refund.xml
+++ b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/nlcius_out_refund.xml
@@ -78,6 +78,18 @@
+
+
+
+ Europaweg, 2
+ Rotterdam
+ 1200
+
+ NL
+
+
+
+
30
RINV/2017/00001
diff --git a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/xrechnung_ubl_out_invoice.xml b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/xrechnung_ubl_out_invoice.xml
index 80bd4508720..9787179bbb1 100644
--- a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/xrechnung_ubl_out_invoice.xml
+++ b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/xrechnung_ubl_out_invoice.xml
@@ -73,6 +73,18 @@
+
+
+
+ Europa-Park-Straße 2
+ Rust
+ 77977
+
+ DE
+
+
+
+
30
INV/2017/01/0002
diff --git a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/xrechnung_ubl_out_refund.xml b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/xrechnung_ubl_out_refund.xml
index 345bc26dc7a..c1c6093a3f3 100644
--- a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/xrechnung_ubl_out_refund.xml
+++ b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/xrechnung_ubl_out_refund.xml
@@ -72,6 +72,18 @@
+
+
+
+ Europa-Park-Straße 2
+ Rust
+ 77977
+
+ DE
+
+
+
+
30
RINV/2017/01/0001