diff --git a/addons/l10n_es/__manifest__.py b/addons/l10n_es/__manifest__.py
index c13345aa50f80..7ae38f6f4bd05 100644
--- a/addons/l10n_es/__manifest__.py
+++ b/addons/l10n_es/__manifest__.py
@@ -27,6 +27,7 @@
         'base_iban',
         'base_vat',
         'account_edi_ubl_cii',
+        'web'
     ],
     'auto_install': ['account'],
     'data': [
diff --git a/addons/l10n_es/models/account_move.py b/addons/l10n_es/models/account_move.py
index 5116bacce3373..437a35f8884d9 100644
--- a/addons/l10n_es/models/account_move.py
+++ b/addons/l10n_es/models/account_move.py
@@ -29,3 +29,11 @@ def _compute_l10n_es_is_simplified(self):
     def _l10n_es_is_dua(self):
         self.ensure_one()
         return any(t.l10n_es_type == 'dua' for t in self.invoice_line_ids.tax_ids.flatten_taxes_hierarchy())
+
+    @api.depends('state')
+    def _compute_delivery_date(self):
+        super()._compute_delivery_date()
+        for record in self:
+            if record.state == 'posted' and not record.delivery_date:
+                record.delivery_date = record.invoice_date
+                
\ No newline at end of file
diff --git a/addons/l10n_es/views/account_move_views.xml b/addons/l10n_es/views/account_move_views.xml
index 9ac07b1c7b67e..cec3c2bc76861 100644
--- a/addons/l10n_es/views/account_move_views.xml
+++ b/addons/l10n_es/views/account_move_views.xml
@@ -5,6 +5,9 @@
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_move_form"/>
         <field name="arch" type="xml">
+            <xpath expr="//field[@name='delivery_date']" position="attributes">
+                <attribute name="invisible"></attribute>
+            </xpath>
             <xpath expr="//page[@id='other_tab']//field[@name='delivery_date']" position="after">
                 <field name="l10n_es_is_simplified"/>
             </xpath>
diff --git a/addons/l10n_es/views/report_invoice.xml b/addons/l10n_es/views/report_invoice.xml
index 3fc7e8bbb3229..891ef86764917 100644
--- a/addons/l10n_es/views/report_invoice.xml
+++ b/addons/l10n_es/views/report_invoice.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+
+    <template id="report_header_invoice_document" inherit_id="web.external_layout_standard">
+        <xpath expr="//div[@name='company_address']" position="after">
+            <div class="col-6" name="delivery_date_company_header">
+                <t t-if="docs and docs._name == 'account.move' and docs.company_id.country_code == 'ES' and docs.delivery_date">
+                    <strong>Delivery Date:</strong>
+                    <span t-esc="docs.delivery_date"/>
+                </t>
+                <t t-else="">
+                    <strong>Invoice Date:</strong>
+                    <span t-esc="docs.invoice_date"/>
+                </t>
+            </div>
+        </xpath>
+    </template>
+
+
     <template id="report_invoice_document" inherit_id="account.report_invoice_document">
         <!-- add company id -->
         <xpath expr="//div[@id='partner_vat_address_not_same_as_shipping']" position="after">