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 f435876d907d97f6d00409864632b2f2884b46c6..de627c482b1c31b95ff81a3350f5ded2057403f9 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 2eb016509d4342509927b06fdd055b1844938d58..4ad390b907bc71acf64a8393a5c28589ff34f5b2 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'],