From aed2f6a61e2e382fd0c30a5798c64a1291564369 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Sun, 18 Jun 2023 20:09:54 +0000
Subject: [PATCH] [FIX] l10n_sa_edi: tests
closes odoo/odoo#124901
Signed-off-by: Josse Colpaert <jco@odoo.com>
---
addons/l10n_sa_edi/models/account_edi_xml_ubl_21_zatca.py | 8 +++-----
addons/l10n_sa_edi/tests/common.py | 6 +++---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/addons/l10n_sa_edi/models/account_edi_xml_ubl_21_zatca.py b/addons/l10n_sa_edi/models/account_edi_xml_ubl_21_zatca.py
index f435876d907d..de627c482b1c 100644
--- a/addons/l10n_sa_edi/models/account_edi_xml_ubl_21_zatca.py
+++ b/addons/l10n_sa_edi/models/account_edi_xml_ubl_21_zatca.py
@@ -90,11 +90,9 @@ class AccountEdiXmlUBL21Zatca(models.AbstractModel):
def _get_delivery_vals_list(self, invoice):
""" Override to include/update values specific to ZATCA's UBL 2.1 specs """
- res = super()._get_delivery_vals_list(invoice)
- if 'partner_shipping_id' in invoice._fields:
- for vals in res:
- vals['actual_delivery_date'] = invoice.l10n_sa_delivery_date
- return res
+ shipping_address = invoice.partner_shipping_id
+ return [{'actual_delivery_date': invoice.l10n_sa_delivery_date,
+ 'delivery_address_vals': self._get_partner_address_vals(shipping_address) if shipping_address else {},}]
def _get_partner_party_identification_vals_list(self, partner):
""" Override to include/update values specific to ZATCA's UBL 2.1 specs """
diff --git a/addons/l10n_sa_edi/tests/common.py b/addons/l10n_sa_edi/tests/common.py
index 2eb016509d43..4ad390b907bc 100644
--- a/addons/l10n_sa_edi/tests/common.py
+++ b/addons/l10n_sa_edi/tests/common.py
@@ -200,11 +200,11 @@ class TestSaEdiCommon(AccountEdiTestCommon):
vals = {
'name': kwargs['name'],
'move_type': 'out_invoice',
- 'company_id': self.company,
- 'partner_id': kwargs['partner_id'],
+ 'company_id': self.company.id,
+ 'partner_id': kwargs['partner_id'].id,
'invoice_date': kwargs['date'],
'invoice_date_due': kwargs['date_due'],
- 'currency_id': self.company.currency_id,
+ 'currency_id': self.company.currency_id.id,
'invoice_line_ids': [Command.create({
'product_id': kwargs['product_id'].id,
'price_unit': kwargs['price'],
--
GitLab