diff --git a/l10n_es_edi_tbai_reagyp_recibidas/README.rst b/l10n_es_edi_tbai_reagyp_recibidas/README.rst
deleted file mode 100644
index fdcb176..0000000
--- a/l10n_es_edi_tbai_reagyp_recibidas/README.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-===================================
-TicketBAI REAGYP Facturas Recibidas
-===================================
-
-.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
-    :target: https://odoo-community.org/page/development-status
-    :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
-    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
-    :alt: License: AGPL-3
-
-|badge1| |badge2|
-
-This module fixes a bug in the native Odoo ``l10n_es_edi_tbai`` module when
-sending vendor bills under the special agriculture regime (REAGYP) to Batuz
-(Bizkaia LROE).
-
-**Problem Solved:**
-
-For REAGYP vendor bills, ``l10n_es_edi_tbai`` hardcodes the regime key
-``ClaveRegimenIvaOpTrascendencia`` to ``19``. Key ``19`` only exists in the
-issued-invoices book; the received-invoices (FacturasRecibidas) schema rejects
-it with::
-
-    cvc-enumeration-valid: Value '19' is not facet-valid with respect to
-    enumeration '[01, 02, 03, 04, 05, 06, 07, 08, 09, 12, 13]'
-
-The correct key for REAGYP compensations on purchases is ``02``.
-
-**Solution:**
-
-Overrides ``account.move._l10n_es_tbai_get_vendor_bill_values_batuz`` to remap
-the regime key from ``19`` to ``02`` for received invoices. The override is
-defensive: it only acts when the value is exactly ``['19']``, so it becomes a
-no-op once the upstream fix lands.
-
-Upstream tracking: https://github.com/odoo/odoo/pull/266214
-
-Bug Tracker
-===========
-
-Report issues at https://git.criptomart.net/criptomart/addons-cm
-
-Credits
-=======
-
-Authors
-~~~~~~~
-
-* Criptomart
-
-Maintainers
-~~~~~~~~~~~
-
-This module is maintained by Criptomart.
diff --git a/l10n_es_edi_tbai_reagyp_recibidas/__init__.py b/l10n_es_edi_tbai_reagyp_recibidas/__init__.py
deleted file mode 100644
index ce9807d..0000000
--- a/l10n_es_edi_tbai_reagyp_recibidas/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import models  # noqa: F401
diff --git a/l10n_es_edi_tbai_reagyp_recibidas/__manifest__.py b/l10n_es_edi_tbai_reagyp_recibidas/__manifest__.py
deleted file mode 100644
index eaa7574..0000000
--- a/l10n_es_edi_tbai_reagyp_recibidas/__manifest__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2026 - Today Criptomart
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-{  # noqa: B018
-    "name": "TicketBAI REAGYP Facturas Recibidas",
-    "version": "18.0.1.0.0",
-    "summary": "Fix ClaveRegimenIvaOpTrascendencia for REAGYP vendor bills (19 -> 02)",
-    "license": "AGPL-3",
-    "author": "Odoo Community Association (OCA), Criptomart",
-    "maintainers": ["Criptomart"],
-    "website": "https://git.criptomart.net/criptomart/addons-cm",
-    "depends": ["l10n_es_edi_tbai"],
-}
diff --git a/l10n_es_edi_tbai_reagyp_recibidas/models/__init__.py b/l10n_es_edi_tbai_reagyp_recibidas/models/__init__.py
deleted file mode 100644
index e89b491..0000000
--- a/l10n_es_edi_tbai_reagyp_recibidas/models/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import account_move  # noqa: F401
diff --git a/l10n_es_edi_tbai_reagyp_recibidas/models/account_move.py b/l10n_es_edi_tbai_reagyp_recibidas/models/account_move.py
deleted file mode 100644
index 0cf979b..0000000
--- a/l10n_es_edi_tbai_reagyp_recibidas/models/account_move.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2026 - Today Criptomart
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import models
-
-
-class AccountMove(models.Model):
-    _inherit = "account.move"
-
-    def _l10n_es_tbai_get_vendor_bill_values_batuz(self):
-        values = super()._l10n_es_tbai_get_vendor_bill_values_batuz()
-        # Clave 19 (REAGYP) sólo existe en el libro de facturas emitidas. En
-        # facturas recibidas, la compensación REAGYP se declara con la clave 02,
-        # única válida en el esquema LROE de recibidas.
-        if values.get("regime_key") == ["19"]:
-            values["regime_key"] = ["02"]
-        return values
diff --git a/website_sale_aplicoop/views/website_templates.xml b/website_sale_aplicoop/views/website_templates.xml
index fd2b1d2..dacc0c8 100644
--- a/website_sale_aplicoop/views/website_templates.xml
+++ b/website_sale_aplicoop/views/website_templates.xml
@@ -481,25 +481,20 @@
                                             </div>
                                             <div class="col-md-4">
                                                 <div class="info-item">
-                                                    <t t-if="group_order.pickup_slot_ids">
-                                                        <label t-att-class="'info-label'">Store Pickup Slots</label>
-                                                        <span class="info-value">
-                                                            <t t-foreach="group_order.pickup_slot_ids" t-as="slot">
-                                                                <div>
-                                                                    <t t-esc="day_names[int(slot.weekday) % 7]" />
-                                                                    &#160;
-                                                                    <t t-esc="('%02d:%02d–%02d:%02d' % (int(slot.start_hour or 0), int(((slot.start_hour or 0) % 1) * 60), int(slot.end_hour or 0), int(((slot.end_hour or 0) % 1) * 60)))" />
-                                                                    <t t-if="slot.label">&#160;(<t t-esc="slot.label" />)</t>
-                                                                </div>
-                                                            </t>
-                                                        </span>
-                                                    </t>
-                                                    <t t-elif="group_order.pickup_day and group_order.pickup_date">
+                                                    <t t-if="group_order.pickup_day and group_order.pickup_date">
                                                         <label t-att-class="'info-label'">Store Pickup Day</label>
-                                                        <span class="info-value" t-attf-data-pickup-date="{{ group_order.pickup_date }}">
-                                                            <t t-esc="day_names[int(group_order.pickup_day) % 7]" />
-                                                            <span class="info-date">(<t t-esc="group_order.pickup_date.strftime('%d/%m/%Y')" />)</span>
-                                                        </span>
+                                                        <t t-if="group_order.home_delivery">
+                                                            <span class="info-value" t-attf-data-pickup-date="{{ group_order.pickup_date }}" t-attf-data-delivery-date="{{ group_order.delivery_date }}">
+                                                                <t t-esc="day_names[int(group_order.pickup_day) % 7]" />
+                                                                <span class="info-date">(<t t-esc="group_order.pickup_date.strftime('%d/%m/%Y')" />)</span>
+                                                            </span>
+                                                        </t>
+                                                        <t t-else="">
+                                                            <span class="info-value" t-attf-data-pickup-date="{{ group_order.pickup_date }}">
+                                                                <t t-esc="day_names[int(group_order.pickup_day) % 7]" />
+                                                                <span class="info-date">(<t t-esc="group_order.pickup_date.strftime('%d/%m/%Y')" />)</span>
+                                                            </span>
+                                                        </t>
                                                     </t>
                                                 </div>
                                             </div>